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
Show whitespace changes
Inline Side-by-side
Showing
with 311 additions and 157 deletions
SAS/TMSS/frontend/tmss_webapp/src/App.css
+ 5
− 0
View file @ 4abd82ba
...@@ -321,3 +321,8 @@ body > iframe { ...@@ -321,3 +321,8 @@ body > iframe {
max-height: 50px; max-height: 50px;
} }
.tablewrapperext {
height:calc(100vh - 148px);
}
SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable/ViewTableExt.js
+ 5
− 2
View file @ 4abd82ba
...@@ -116,7 +116,7 @@ export function ViewTableExt({ data, defaultcolumns, optionalcolumns, columnclas ...@@ -116,7 +116,7 @@ export function ViewTableExt({ data, defaultcolumns, optionalcolumns, columnclas
const GetColumns = (newColumns,tableConfigData) => { const GetColumns = (newColumns,tableConfigData) => {
let filters = {}; let filters = {};
let isFirst=true
const Columns = Object.entries(newColumns).map(([key, column]) => { const Columns = Object.entries(newColumns).map(([key, column]) => {
const field = key; const field = key;
const header = column?.name || column; const header = column?.name || column;
...@@ -135,7 +135,10 @@ export function ViewTableExt({ data, defaultcolumns, optionalcolumns, columnclas ...@@ -135,7 +135,10 @@ export function ViewTableExt({ data, defaultcolumns, optionalcolumns, columnclas
showFilterMenu: false, showFilterMenu: false,
}; };
if (isFirst) {
columnProps.frozen = true;
isFirst=false;
}
// Add filterElement attribute conditionally // Add filterElement attribute conditionally
if (filterHeader) { if (filterHeader) {
columnProps.filterElement = filterHeader; columnProps.filterElement = filterHeader;
......
SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
+ 4
− 0
View file @ 4abd82ba
...@@ -59,3 +59,7 @@ ul { ...@@ -59,3 +59,7 @@ ul {
color: #3F51B5; color: #3F51B5;
font-weight: 700; font-weight: 700;
} }
.p-slider .p-slider-handle {
z-index: unset;
}
\ No newline at end of file
SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_timeline.scss
+ 5
− 1
View file @ 4abd82ba
...@@ -1165,3 +1165,7 @@ body .p-multiselect-panel .p-multiselect-header .p-multiselect-filter-container ...@@ -1165,3 +1165,7 @@ body .p-multiselect-panel .p-multiselect-header .p-multiselect-filter-container
{ {
font-size:12px; font-size:12px;
} }
.p-datatable.p-datatable-striped .p-datatable-tbody > tr.p-row-odd {
background-color: var(--blue-50);
}
SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
+ 3
− 1
View file @ 4abd82ba
...@@ -55,7 +55,7 @@ function createStandardPageMocks() { ...@@ -55,7 +55,7 @@ function createStandardPageMocks() {
return Promise.resolve(SUServiceMock.templateStates) return Promise.resolve(SUServiceMock.templateStates)
}); });
}
async function setSchedulingUnitBasics(pageContent) { async function setSchedulingUnitBasics(pageContent) {
const nameElement = pageContent.queryByTestId('name'); const nameElement = pageContent.queryByTestId('name');
...@@ -140,6 +140,8 @@ test("Selects a project, loads the project's sets and selects the test schedulin ...@@ -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) // TODO : Fix Unit Test Scheduling Unit create page with an observation strategy template (multiple)
describe('Scheduling Unit create page with an observation strategy template', () => { describe('Scheduling Unit create page with an observation strategy template', () => {
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/WeekView.js
+ 1
− 1
View file @ 4abd82ba
...@@ -91,7 +91,7 @@ function getTimelineMarkers(setCursorDate) { ...@@ -91,7 +91,7 @@ function getTimelineMarkers(setCursorDate) {
{({ styles }) => { {({ styles }) => {
const customStyles = { const customStyles = {
...styles, ...styles,
backgroundColor: 'var(--green)', backgroundColor: 'var(--green-400)',
zIndex: 998 zIndex: 998
} }
return <div style={customStyles} /> return <div style={customStyles} />
......
SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/workflow.list.test.js.snap
+ 288
− 150
View file @ 4abd82ba
...@@ -60,7 +60,15 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = ` ...@@ -60,7 +60,15 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = `
> >
<span <span
class="p-float-label" class="p-float-label"
style="display: flex;"
> >
<div
class="label"
style="min-width: 120px; padding-top: 4px;"
>
Show Workflow
</div>
<div>
<div <div
class="p-dropdown p-component p-inputwrapper p-inputwrapper-filled" class="p-dropdown p-component p-inputwrapper p-inputwrapper-filled"
data-p-disabled="false" data-p-disabled="false"
...@@ -68,7 +76,7 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = ` ...@@ -68,7 +76,7 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = `
data-pc-name="dropdown" data-pc-name="dropdown"
data-pc-section="root" data-pc-section="root"
id="workflowoverview" id="workflowoverview"
style="width: 10em; margin-left: 0.5em;" style="width: 20em; height: 33px; line-height: 0;"
> >
<div <div
class="p-hidden-accessible" class="p-hidden-accessible"
...@@ -133,14 +141,12 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = ` ...@@ -133,14 +141,12 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = `
</svg> </svg>
</div> </div>
</div> </div>
<label </div>
for="workflowoverview"
>
Show Workflow
</label>
</span> </span>
</div> </div>
<div> <div
style="margin-left: 225px;"
>
<label <label
class="p-checkbox-label" class="p-checkbox-label"
for="cb1" for="cb1"
...@@ -467,13 +473,13 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = ` ...@@ -467,13 +473,13 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = `
class="viewtable" class="viewtable"
data-testid="viewtable" data-testid="viewtable"
role="table" role="table"
style="min-width: 600px;" style="min-width: 660px;"
> >
<thead> <thead>
<tr <tr
data-testid="tablerows" data-testid="tablerows"
role="row" role="row"
style="display: flex; flex: 1 0 auto; min-width: 600px;" style="display: flex; flex: 1 0 auto; min-width: 660px;"
> >
<th <th
class="fixed-column-td" class="fixed-column-td"
...@@ -980,6 +986,60 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = ` ...@@ -980,6 +986,60 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = `
/> />
</div> </div>
</th> </th>
<th
class="notfixed-column-td-ProjectCategory"
role="tablehead"
>
<div
style="display: flex; flex-direction: row; height: 100%;"
>
<div
style="display: flex;"
>
<div
style="display: grid; vertical-align: bottom;"
>
<div
class=""
colspan="1"
role="columnheader"
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
aria-describedby="rbd-hidden-text-0-hidden-text-0"
data-rbd-drag-handle-context-id="0"
data-rbd-drag-handle-draggable-id="Project Category"
data-rbd-draggable-context-id="0"
data-rbd-draggable-id="Project Category"
draggable="false"
role="button"
style="transform: translate(0,0); user-select: none; cursor: default;"
tabindex="0"
>
Project Category
</div>
</div>
<div>
<div
class="table-filter"
style="margin-right: 5px;"
>
<input
title="Enter few characters and press ‘Enter’ key to search"
value=""
/>
</div>
</div>
</div>
</div>
<div
class="resizer "
draggable="false"
role="separator"
style="cursor: col-resize;"
/>
</div>
</th>
</tr> </tr>
</thead> </thead>
<tbody <tbody
...@@ -989,7 +1049,7 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = ` ...@@ -989,7 +1049,7 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = `
class="" class=""
data-testid="tablerow" data-testid="tablerow"
role="row" role="row"
style="display: flex; flex: 1 0 auto; min-width: 600px;" style="display: flex; flex: 1 0 auto; min-width: 660px;"
> >
<td <td
class="fixed-column-td" class="fixed-column-td"
...@@ -1087,6 +1147,15 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = ` ...@@ -1087,6 +1147,15 @@ exports[`Workflow List Workflow List correctly with data and security 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
> >
</div>
</td>
<td
class="notfixed-column-td-ProjectCategory"
>
<div
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -1377,7 +1446,15 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1377,7 +1446,15 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
> >
<span <span
class="p-float-label" class="p-float-label"
style="display: flex;"
> >
<div
class="label"
style="min-width: 120px; padding-top: 4px;"
>
Show Workflow
</div>
<div>
<div <div
class="p-dropdown p-component p-inputwrapper p-inputwrapper-filled" class="p-dropdown p-component p-inputwrapper p-inputwrapper-filled"
data-p-disabled="false" data-p-disabled="false"
...@@ -1385,7 +1462,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1385,7 +1462,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
data-pc-name="dropdown" data-pc-name="dropdown"
data-pc-section="root" data-pc-section="root"
id="workflowoverview" id="workflowoverview"
style="width: 10em; margin-left: 0.5em;" style="width: 20em; height: 33px; line-height: 0;"
> >
<div <div
class="p-hidden-accessible" class="p-hidden-accessible"
...@@ -1450,14 +1527,12 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1450,14 +1527,12 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
</svg> </svg>
</div> </div>
</div> </div>
<label </div>
for="workflowoverview"
>
Show Workflow
</label>
</span> </span>
</div> </div>
<div> <div
style="margin-left: 225px;"
>
<label <label
class="p-checkbox-label" class="p-checkbox-label"
for="cb1" for="cb1"
...@@ -1784,13 +1859,13 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1784,13 +1859,13 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
class="viewtable" class="viewtable"
data-testid="viewtable" data-testid="viewtable"
role="table" role="table"
style="min-width: 600px;" style="min-width: 660px;"
> >
<thead> <thead>
<tr <tr
data-testid="tablerows" data-testid="tablerows"
role="row" role="row"
style="display: flex; flex: 1 0 auto; min-width: 600px;" style="display: flex; flex: 1 0 auto; min-width: 660px;"
> >
<th <th
class="fixed-column-td" class="fixed-column-td"
...@@ -1844,7 +1919,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1844,7 +1919,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Scheduling Unit Name" data-rbd-drag-handle-draggable-id="Scheduling Unit Name"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -1888,7 +1963,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1888,7 +1963,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Scheduling Unit ID" data-rbd-drag-handle-draggable-id="Scheduling Unit ID"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -1932,7 +2007,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1932,7 +2007,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Scheduling Unit Status" data-rbd-drag-handle-draggable-id="Scheduling Unit Status"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -1976,7 +2051,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -1976,7 +2051,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Project" data-rbd-drag-handle-draggable-id="Project"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -2020,7 +2095,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -2020,7 +2095,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Assigned To" data-rbd-drag-handle-draggable-id="Assigned To"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -2075,7 +2150,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -2075,7 +2150,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
title="Toggle SortBy" title="Toggle SortBy"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Current Workflow Stage" data-rbd-drag-handle-draggable-id="Current Workflow Stage"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -2190,7 +2265,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -2190,7 +2265,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
title="Toggle SortBy" title="Toggle SortBy"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Updated At" data-rbd-drag-handle-draggable-id="Updated At"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -2273,7 +2348,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -2273,7 +2348,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
> >
<div <div
aria-describedby="rbd-hidden-text-1-hidden-text-11" aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1" data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Accepted" data-rbd-drag-handle-draggable-id="Accepted"
data-rbd-draggable-context-id="1" data-rbd-draggable-context-id="1"
...@@ -2297,6 +2372,60 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -2297,6 +2372,60 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
/> />
</div> </div>
</th> </th>
<th
class="notfixed-column-td-ProjectCategory"
role="tablehead"
>
<div
style="display: flex; flex-direction: row; height: 100%;"
>
<div
style="display: flex;"
>
<div
style="display: grid; vertical-align: bottom;"
>
<div
class=""
colspan="1"
role="columnheader"
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
aria-describedby="rbd-hidden-text-1-hidden-text-12"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Project Category"
data-rbd-draggable-context-id="1"
data-rbd-draggable-id="Project Category"
draggable="false"
role="button"
style="transform: translate(0,0); user-select: none; cursor: default;"
tabindex="0"
>
Project Category
</div>
</div>
<div>
<div
class="table-filter"
style="margin-right: 5px;"
>
<input
title="Enter few characters and press ‘Enter’ key to search"
value=""
/>
</div>
</div>
</div>
</div>
<div
class="resizer "
draggable="false"
role="separator"
style="cursor: col-resize;"
/>
</div>
</th>
</tr> </tr>
</thead> </thead>
<tbody <tbody
...@@ -2306,7 +2435,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -2306,7 +2435,7 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
class="" class=""
data-testid="tablerow" data-testid="tablerow"
role="row" role="row"
style="display: flex; flex: 1 0 auto; min-width: 600px;" style="display: flex; flex: 1 0 auto; min-width: 660px;"
> >
<td <td
class="fixed-column-td" class="fixed-column-td"
...@@ -2404,6 +2533,15 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve ...@@ -2404,6 +2533,15 @@ exports[`Workflow List handle WebSocket Workflow handles correctly Websocket Eve
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;" style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
> >
</div>
</td>
<td
class="notfixed-column-td-ProjectCategory"
>
<div
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
</div> </div>
</td> </td>
</tr> </tr>
......
SAS/TMSS/frontend/tmss_webapp/src/utils/pageheaderactions.util.js
+ 0
− 2
View file @ 4abd82ba
const PageHeaderActions = { const PageHeaderActions = {
actionObject(title, icon, classes, className, callbackProp, content, type, actOn, options, selected,optionvalue,optionlabel,optionSelectionLabel,style) { actionObject(title, icon, classes, className, callbackProp, content, type, actOn, options, selected,optionvalue,optionlabel,optionSelectionLabel,style) {
console.log ( " actionObjecti have style",style)
return { return {
title: title, title: title,
icon: icon, icon: icon,
...@@ -21,7 +20,6 @@ const PageHeaderActions = { ...@@ -21,7 +20,6 @@ const PageHeaderActions = {
actionButtonObject(title, icon, classes, callbackProp,style) { 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); return this.actionObject(title, icon, classes, undefined, callbackProp, undefined, "buttonv2", "click", undefined, undefined,undefined,undefined,undefined,style);
}, },
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment