Skip to content
Snippets Groups Projects
Commit 4abd82ba authored by Reinder Kraaij's avatar Reinder Kraaij :eye:
Browse files

Merge branch 'TMSS-2948-Front-End-Only-P2' into 'master'

Resolve TMSS-2948 "Front end only p2" - Fixes the Green Time Line

Closes TMSS-2948

See merge request !1362
parents 19750e07 969c0821
No related branches found
No related tags found
1 merge request!1362Resolve TMSS-2948 "Front end only p2" - Fixes the Green Time Line
......@@ -321,3 +321,8 @@ body > iframe {
max-height: 50px;
}
.tablewrapperext {
height:calc(100vh - 148px);
}
......@@ -116,7 +116,7 @@ export function ViewTableExt({ data, defaultcolumns, optionalcolumns, columnclas
const GetColumns = (newColumns,tableConfigData) => {
let filters = {};
let isFirst=true
const Columns = Object.entries(newColumns).map(([key, column]) => {
const field = key;
const header = column?.name || column;
......@@ -135,7 +135,10 @@ export function ViewTableExt({ data, defaultcolumns, optionalcolumns, columnclas
showFilterMenu: false,
};
if (isFirst) {
columnProps.frozen = true;
isFirst=false;
}
// Add filterElement attribute conditionally
if (filterHeader) {
columnProps.filterElement = filterHeader;
......
......@@ -58,4 +58,8 @@ ul {
.je-header span {
color: #3F51B5;
font-weight: 700;
}
.p-slider .p-slider-handle {
z-index: unset;
}
\ No newline at end of file
......@@ -1164,4 +1164,8 @@ body .p-multiselect-panel .p-multiselect-header .p-multiselect-filter-container
.smalldatatable
{
font-size:12px;
}
\ No newline at end of file
}
.p-datatable.p-datatable-striped .p-datatable-tbody > tr.p-row-odd {
background-color: var(--blue-50);
}
......@@ -55,7 +55,7 @@ function createStandardPageMocks() {
return Promise.resolve(SUServiceMock.templateStates)
});
}
async function setSchedulingUnitBasics(pageContent) {
const nameElement = pageContent.queryByTestId('name');
......@@ -140,6 +140,8 @@ test("Selects a project, loads the project's sets and selects the test schedulin
});
});
/*
// TODO : Fix Unit Test Scheduling Unit create page with an observation strategy template (multiple)
describe('Scheduling Unit create page with an observation strategy template', () => {
......
......@@ -91,7 +91,7 @@ function getTimelineMarkers(setCursorDate) {
{({ styles }) => {
const customStyles = {
...styles,
backgroundColor: 'var(--green)',
backgroundColor: 'var(--green-400)',
zIndex: 998
}
return <div style={customStyles} />
......
const PageHeaderActions = {
actionObject(title, icon, classes, className, callbackProp, content, type, actOn, options, selected,optionvalue,optionlabel,optionSelectionLabel,style) {
console.log ( " actionObjecti have style",style)
return {
title: title,
icon: icon,
......@@ -21,7 +20,6 @@ const PageHeaderActions = {
actionButtonObject(title, icon, classes, callbackProp,style) {
console.log ( " actionButtonObject have style",style)
return this.actionObject(title, icon, classes, undefined, callbackProp, undefined, "buttonv2", "click", undefined, undefined,undefined,undefined,undefined,style);
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment