From c5f9128a6938aceaa6c483da51dd9e8aba42e063 Mon Sep 17 00:00:00 2001
From: unknown <n.santhanam@redkarma.eu>
Date: Tue, 1 Dec 2020 15:58:24 +0530
Subject: [PATCH] Merge branch 'TMSS-376' into TMSS-470
---
.../tmss_webapp/src/layout/_overrides.scss | 34 ++++++
.../src/routes/Workflow/DecideAcceptance.js | 100 ++++++++--------
.../src/routes/Workflow/PIverification.js | 108 ++++++++++--------
.../src/routes/Workflow/Processing.js | 18 +--
.../src/routes/Workflow/QAreporting.js | 29 +++--
.../tmss_webapp/src/routes/Workflow/QAsos.js | 32 ++++--
.../src/routes/Workflow/Scheduled.js | 17 +--
.../tmss_webapp/src/routes/Workflow/index.js | 6 +-
.../frontend/tmss_webapp/src/routes/index.js | 4 +-
9 files changed, 200 insertions(+), 148 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
index ec4dbe72f72..a56057179c4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
@@ -147,6 +147,40 @@
+.se-resizing-bar .se-navigation.sun-editor-common {
+ display: none;
+}
+.se-component.se-image-container {
+ img {
+ width: 100%;
+ }
+}
+.p-button.tooltip-wrapper {
+ margin: 0;
+ padding: 0;
+ border: none;
+ background: none;
+ background-color: transparent;
+ box-shadow: none;
+ font-size: 1rem;
+ text-align: left;
+ color: #000;
+ .p-button-text.p-c{
+ display: none;
+ }
+}
+.p-button.tooltip-wrapper:enabled:hover {
+ background-color: transparent;
+ color: #000;
+ border: none;
+}
+
+
+
+
+
+
+
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/DecideAcceptance.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/DecideAcceptance.js
index 5a0a7536c46..76bdc4d9c4d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/DecideAcceptance.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/DecideAcceptance.js
@@ -19,20 +19,13 @@ class DecideAcceptance extends Component {
this.onChangePIComment = this.onChangePIComment.bind(this);
}
- handleChange(e) {
+ // Method will trigger on change of operator report sun-editor
+ handleChange(e) {
this.setState({
content: e
});
localStorage.setItem('report_qa', e);
}
-
- onSave(){
- this.props.onNext({
- report: this.state.content,
- picomment: this.state.picomment
-
- });
- }
//PI Comment Editor
onChangePIComment(e) {
@@ -42,60 +35,60 @@ class DecideAcceptance extends Component {
localStorage.setItem('pi_comment', e.target.value);
}
+ /**
+ * Method will trigger on click save buton
+ * here onNext props coming from parent, where will handle redirection to other page
+ */
+ onSave() {
+ this.props.onNext({
+ report: this.state.content,
+ picomment: this.state.picomment
+ })
+ }
+
+ // Not using at present
cancelCreate() {
this.props.history.goBack();
}
-
render() {
return (
<>
<div>
<div className="p-fluid">
- <div className="p-field p-grid">
- <label htmlFor="piReport" className="col-lg-2 col-md-2 col-sm-12">PI Report</label>
- <div className="col-lg-12 col-md-12 col-sm-12">
- {this.state.showEditor && <SunEditor height="250" enableToolbar={true}
- onChange={this.onChangePIComment}
- setContents={this.state.picomment}
- setOptions={{
- buttonList: [
- ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
- 'superscript', 'outdent', 'indent', 'fullScreen', 'showBlocks', 'codeView', 'preview', 'print', 'removeFormat']
- ]
- }}
- />}
- <div dangerouslySetInnerHTML={{ __html: this.state.picomment }}></div>
- </div>
- </div>
<div className="p-grid" style={{ padding: '15px' }}>
- <label htmlFor="operatorReport" >Operator Report</label>
- <div className="col-lg-12 col-md-12 col-sm-12"></div>
- {this.state.showEditor && <SunEditor height="250" enableToolbar={true}
- onChange={this.handleChange}
- setContents={this.state.content}
- setOptions={{
- buttonList: [
- ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
- 'superscript', 'outdent', 'indent', 'fullScreen', 'showBlocks', 'codeView', 'preview', 'print', 'removeFormat']
- ]
- }}
- />}
- <div dangerouslySetInnerHTML={{ __html: this.state.content }}></div>
- </div>
- <div className="p-field p-grid">
- <label htmlFor="operatorAccept" className="col-lg-2 col-md-2 col-sm-12">Operator Accept</label>
- <div className="col-lg-3 col-md-3 col-sm-12">
- <Checkbox inputId="binary" checked={this.state.checked} onChange={e => this.setState({ checked: e.checked })} />
+ <label htmlFor="operatorReport" >Operator Report</label>
+ <div className="col-lg-12 col-md-12 col-sm-12"></div>
+ {this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto;" enableToolbar={true}
+ onChange={this.handleChange}
+ setContents={this.state.content}
+ setOptions={{
+ buttonList: [
+ ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
+ 'superscript', 'outdent', 'indent', 'fullScreen', 'showBlocks', 'codeView', 'preview', 'print', 'removeFormat']
+ ]
+ }}
+ />}
+ <div dangerouslySetInnerHTML={{ __html: this.state.content }}></div>
+ </div>
+ <div className="p-field p-grid">
+ <label htmlFor="piReport" className="col-lg-2 col-md-2 col-sm-12">PI Report</label>
+ <div className="col-lg-12 col-md-12 col-sm-12">
+ {this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto;" enableToolbar={true}
+ onChange={this.onChangePIComment}
+ setContents={this.state.picomment}
+ setOptions={{
+ buttonList: [
+ ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
+ 'superscript', 'outdent', 'indent', 'fullScreen', 'showBlocks', 'codeView', 'preview', 'print', 'removeFormat']
+ ]
+ }}
+ />}
+ <div dangerouslySetInnerHTML={{ __html: this.state.picomment }}></div>
+ </div>
</div>
- <div className="col-lg-1 col-md-1 col-sm-12"></div>
- <label htmlFor="sdcoAccept" className="col-lg-2 col-md-2 col-sm-12">SDCO Accept</label>
- <div className="col-lg-3 col-md-3 col-sm-12">
- <Checkbox inputId="binary" checked={this.state.checked} onChange={e => this.setState({ checked: e.checked })} />
- </div>
- </div>
<div className="p-field p-grid">
- <label htmlFor="piAccept" className="col-lg-2 col-md-2 col-sm-12">PI Accept</label>
+ <label htmlFor="piAccept" className="col-lg-2 col-md-2 col-sm-12">SDCO accepts after PI</label>
<div className="col-lg-3 col-md-3 col-sm-6">
<div className="p-field-checkbox">
<Checkbox inputId="binary" checked={this.state.checked} onChange={e => this.setState({ checked: e.checked })} />
@@ -105,16 +98,15 @@ class DecideAcceptance extends Component {
</div>
<div className="p-grid" style={{ marginTop: '20px' }}>
<div className="p-col-1">
- <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.onSave} />
+ <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={ this.onSave } />
</div>
<div className="p-col-1">
- <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} onClick={this.cancelCreate} />
+ <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} />
</div>
</div>
</div>
</>
-
)
};
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/PIverification.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/PIverification.js
index 9fdf239a332..c00c9fd3be0 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/PIverification.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/PIverification.js
@@ -2,14 +2,13 @@ import React, { Component } from 'react';
import { Button } from 'primereact/button';
import SunEditor from 'suneditor-react';
import 'suneditor/dist/css/suneditor.min.css'; // Import Sun Editor's CSS File
-import {Checkbox} from 'primereact/checkbox';
+import { Checkbox } from 'primereact/checkbox';
//import {InputTextarea} from 'primereact/inputtextarea';
-
-class PIverification extends Component{
+class PIverification extends Component {
constructor(props) {
super(props);
- this.state={
+ this.state = {
content: props.report,
showEditor: false,
@@ -18,7 +17,10 @@ class PIverification extends Component{
this.handleChange = this.handleChange.bind(this);
this.onChangePIComment = this.onChangePIComment.bind(this);
}
-
+
+ /**
+ * Method wiill trigger on change of operator report sun-editor
+ */
handleChange(e) {
this.setState({
content: e
@@ -26,6 +28,10 @@ class PIverification extends Component{
localStorage.setItem('report_qa', e);
}
+ /**
+ * Method will trigger on click save buton
+ * here onNext props coming from parent, where will handle redirection to other page
+ */
onSave(){
this.props.onNext({
report: this.state.content,
@@ -33,12 +39,17 @@ class PIverification extends Component{
});
}
+ /**
+ * Method wiill triigger on change of pi report sun-editor
+ */
onChangePIComment(a) {
this.setState({
comment: a
});
localStorage.setItem('comment_pi', a);
}
+
+ // Not using at present
cancelCreate() {
this.props.history.goBack();
}
@@ -47,56 +58,57 @@ class PIverification extends Component{
return (
<>
<div>
- <div className="p-fluid">
- <div className="p-grid" style={{ padding: '10px' }}>
- <label htmlFor="operatorReport" >Operator Report</label>
- <div className="col-lg-12 col-md-12 col-sm-12"></div>
- {this.state.showEditor && <SunEditor height="250" enableToolbar={true}
- onChange={this.handleChange}
- setContents={this.state.content}
- setOptions={{
- buttonList: [
- ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
- 'superscript', 'outdent', 'indent', 'fullScreen', 'showBlocks', 'codeView', 'preview', 'print', 'removeFormat']
- ]
- }}
- />}
- <div dangerouslySetInnerHTML={{ __html: this.state.content }}></div>
- </div>
- <div className="p-grid" style={{ padding: '10px' }}>
- <label htmlFor="piReport" >PI Report</label>
- <div className="col-lg-12 col-md-12 col-sm-12"></div>
- <SunEditor height="150" enableToolbar={true}
- setContents={this.state.comment}
- onChange={this.onChangePIComment}
- setOptions={{
- buttonList: [
- ['undo', 'redo', 'bold', 'underline', 'link','italic']
- ]
- }} />
- {/* <InputTextarea rows={3} cols={30}
+ <div className="p-fluid">
+ <div className="p-grid" style={{ padding: '10px' }}>
+ <label htmlFor="operatorReport" >Operator Report</label>
+ <div className="col-lg-12 col-md-12 col-sm-12"></div>
+ {this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto;" enableToolbar={true}
+ onChange={this.handleChange}
+ setContents={this.state.content}
+ setOptions={{
+ buttonList: [
+ ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
+ 'superscript', 'outdent', 'indent', 'fullScreen', 'showBlocks', 'codeView', 'preview', 'print', 'removeFormat']
+ ]
+ }}
+ />}
+ <div dangerouslySetInnerHTML={{ __html: this.state.content }}></div>
+ </div>
+ <div className="p-grid" style={{ padding: '10px' }}>
+ <label htmlFor="piReport" >PI Report</label>
+ <div className="col-lg-12 col-md-12 col-sm-12"></div>
+ <SunEditor setDefaultStyle="min-height: 150px; height: auto;" enableToolbar={true}
+ setContents={this.state.comment}
+ onChange={this.onChangePIComment}
+ setOptions={{
+ buttonList: [
+ ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
+ 'superscript', 'outdent', 'indent', 'fullScreen', 'showBlocks', 'codeView', 'preview', 'print', 'removeFormat']
+ ]
+ }} />
+ {/* <InputTextarea rows={3} cols={30}
tooltip="PIReport" tooltipOptions={this.tooltipOptions} maxLength="128"
data-testid="PIReport"
value={this.state.piComment}
onChange={this.onChangePIComment}
/> */}
- </div>
- <div className="p-field p-grid">
- <label htmlFor="piAccept" className="col-lg-2 col-md-2 col-sm-12">PI Accept</label>
- <div className="p-field-checkbox">
- <Checkbox inputId="binary" checked={this.state.checked} onChange={e => this.setState({ checked: e.checked })} />
- </div>
- </div>
- <div className="p-grid" style={{ marginTop: '20px' }}>
- <div className="p-col-1">
- <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.onSave} />
+ </div>
+ <div className="p-field p-grid">
+ <label htmlFor="piAccept" className="col-lg-2 col-md-2 col-sm-12">PI Accept</label>
+ <div className="p-field-checkbox">
+ <Checkbox inputId="binary" checked={this.state.checked} onChange={e => this.setState({ checked: e.checked })} />
+ </div>
</div>
- <div className="p-col-1">
- <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} onClick={this.cancelCreate} />
+ <div className="p-grid" style={{ marginTop: '20px' }}>
+ <div className="p-col-1">
+ <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={ this.onSave } />
+ </div>
+ <div className="p-col-1">
+ <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} />
+ </div>
</div>
- </div>
- </div>
- </div>
+ </div>
+ </div>
</>
)
};
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Processing.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Processing.js
index 641a3e6826e..56f2881a3ab 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Processing.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Processing.js
@@ -6,15 +6,15 @@ class ProcessingDone extends Component {
render(){
return(
<>
- <div className="p-grid p-justify-start">
- <div className="p-col-1">
- <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.onSave} />
- </div>
- <div className="p-col-1">
- <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} onClick={this.cancelCreate} />
- </div>
- </div>
-
+ <div className="p-grid p-justify-start">
+ <div className="p-col-1">
+ <Button label="Save" className="p-button-primary" icon="pi pi-check" />
+ </div>
+ <div className="p-col-1">
+ <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} />
+ </div>
+ </div>
+
</>
)
};
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAreporting.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAreporting.js
index 0c30789274d..973a2393322 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAreporting.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAreporting.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { Button } from 'primereact/button';
import SunEditor from 'suneditor-react';
import 'suneditor/dist/css/suneditor.min.css'; // Import Sun Editor's CSS File
-import {Dropdown} from 'primereact/dropdown';
+import { Dropdown } from 'primereact/dropdown';
import katex from 'katex' // for mathematical operations on sun editor this component should be added
import 'katex/dist/katex.min.css'
@@ -17,20 +17,30 @@ class QAreporting extends Component{
this.handleChange = this.handleChange.bind(this);
}
- onSave() {
- this.props.onNext({report: this.state.content});
+ /**
+ * Method will trigger on click save buton
+ * here onNext props coming from parent, where will handle redirection to other page
+ */
+ onSave() {
+ this.props.onNext({ report: this.state.content });
}
+ /**
+ * Method will trigger on change of operator report sun-editor
+ */
handleChange(e) {
- localStorage.setItem('report_qa', e); //QA report on editor
+ localStorage.setItem('report_qa', e);
this.setState({ content: e });
}
+
+ //Not using at present
cancelCreate() {
this.props.history.goBack();
}
render() {
- return (<>
+ return (
+ <>
<div className="p-fluid">
<div className="p-field p-grid">
<label htmlFor="assignTo" className="col-lg-2 col-md-2 col-sm-12">Assign To </label>
@@ -43,8 +53,9 @@ class QAreporting extends Component{
<div className="p-grid" style={{ padding: '10px' }}>
<label htmlFor="comments" >Comments</label>
<div className="col-lg-12 col-md-12 col-sm-12"></div>
- <SunEditor height="250" enableToolbar={true}
- onChange={this.handleChange}
+ <SunEditor enableToolbar={true}
+ setDefaultStyle="min-height: 250px; height: auto;"
+ onChange={ this.handleChange }
setOptions={{
buttonList: [
['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
@@ -55,10 +66,10 @@ class QAreporting extends Component{
</div>
<div className="p-grid p-justify-start">
<div className="p-col-1">
- <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.onSave} />
+ <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={ this.onSave } />
</div>
<div className="p-col-1">
- <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '88px' }} onClick={this.cancelCreate} />
+ <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '88px' }}/>
</div>
</div>
</>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAsos.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAsos.js
index 395b529d5d1..f8cfb04a2b3 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAsos.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/QAsos.js
@@ -2,22 +2,25 @@ import React, { Component } from 'react';
import { Button } from 'primereact/button';
import SunEditor from 'suneditor-react';
import 'suneditor/dist/css/suneditor.min.css'; // Import Sun Editor's CSS File
-import {Checkbox} from 'primereact/checkbox';
+import { Checkbox } from 'primereact/checkbox';
-class QAreportingSDCO extends Component{
+class QAreportingSDCO extends Component {
constructor(props) {
super(props);
- this.state={
+ this.state = {
content: props.report,
showEditor: false,
checked: false,
- pichecked:false
+ pichecked: false
};
this.onSave = this.onSave.bind(this);
this.handleChange = this.handleChange.bind(this);
}
-
+
+ /**
+ * Method will trigger on change of sun-editor
+ */
handleChange(e) {
this.setState({
content: e
@@ -25,6 +28,10 @@ class QAreportingSDCO extends Component{
localStorage.setItem('report_qa', e);
}
+ /**
+ * Method will trigger on click save buton
+ * here onNext props coming from parent, where will handle redirection to other page
+ */
onSave() {
this.props.onNext({
report: this.state.content,
@@ -32,6 +39,7 @@ class QAreportingSDCO extends Component{
})
}
+ //Not using at present
cancelCreate() {
this.props.history.goBack();
}
@@ -59,7 +67,7 @@ class QAreportingSDCO extends Component{
<div className="p-grid" style={{ padding: '10px' }}>
<label htmlFor="operatorReport" >Operator Report</label>
<div className="col-lg-12 col-md-12 col-sm-12"></div>
- {this.state.showEditor && <SunEditor height="250" enableToolbar={true}
+ {this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto" enableToolbar={true}
onChange={this.handleChange}
setContents={this.state.content}
setOptions={{
@@ -69,18 +77,18 @@ class QAreportingSDCO extends Component{
]
}}
/>}
- {!this.state.showEditor && <div onClick={() => this.setState({ showEditor: !this.state.showEditor })} dangerouslySetInnerHTML={{ __html: this.state.content }}></div>}
+ {!this.state.showEditor && <Button onClick={() => this.setState({ showEditor: !this.state.showEditor })} className="tooltip-wrapper" tooltip="Click to Edit" tooltipOptions={{ position: 'top' }}><div dangerouslySetInnerHTML={{ __html: this.state.content }}></div></Button>}
</div>
</div>
<div className="p-grid" style={{ marginTop: '20px' }}>
<div className="p-col-1">
- <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.onSave} />
+ <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={ this.onSave } />
</div>
<div className="p-col-1">
- <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} onClick={this.cancelCreate} />
- </div>
- </div>
- </div>
+ <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} />
+ </div>
+ </div>
+ </div>
</>
)
};
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Scheduled.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Scheduled.js
index 1b2c9cdeec8..52b558a4d74 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Scheduled.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Scheduled.js
@@ -14,41 +14,36 @@ class Scheduled extends Component {
* Method will trigger on click save buton
* here onNext props coming from parent, where will handle redirection to other page
*/
- onSave(){
+ onSave() {
this.props.onNext({
report: this.props.report,
picomment: this.props.picomment
});
}
- //Not using this present
- cancelCreate() {
- this.props.history.goBack();
- }
-
render() {
return (
<>
<div>
<div className="p-fluid">
<div className="p-field p-grid">
- <label htmlFor="startTime" className="col-lg-2 col-md-2 col-sm-12">Start Time</label>
+ <label htmlFor="suStatus" className="col-lg-2 col-md-2 col-sm-12">Start Time</label>
<div className="col-lg-3 col-md-3 col-sm-12">
<span>{this.props.schedulingUnit.start_time && moment(this.props.schedulingUnit.start_time).format("YYYY-MMM-DD HH:mm:SS")}</span>
</div>
<div className="col-lg-1 col-md-1 col-sm-12"></div>
- <label htmlFor="endTime" className="col-lg-2 col-md-2 col-sm-12">End Time</label>
+ <label htmlFor="suStatus" className="col-lg-2 col-md-2 col-sm-12">End Time</label>
<div className="col-lg-3 col-md-3 col-sm-12">
<span>{this.props.schedulingUnit.stop_time && moment(this.props.schedulingUnit.stop_time).format("YYYY-MMM-DD HH:mm:SS")}</span>
</div>
<div className="col-lg-1 col-md-1 col-sm-12"></div>
- <label htmlFor="timeLine" className="col-lg-2 col-md-2 col-sm-12">Timeline</label>
+ <label htmlFor="suStatus" className="col-lg-2 col-md-2 col-sm-12">Timeline</label>
<div className="col-lg-3 col-md-3 col-sm-12 block-list">
<Link to={{ pathname: '/su/timelineview' }}>TimeLine View <span class="fas fa-clock"></span></Link>
<Link to={{ pathname: '/su/timelineview/week' }}>Week Overview <span class="fas fa-calendar-alt"></span></Link>
</div>
<div className="col-lg-1 col-md-1 col-sm-12"></div>
- <label htmlFor="schedulingMethod" className="col-lg-2 col-md-2 col-sm-12">Scheduling Method</label>
+ <label htmlFor="suStatus" className="col-lg-2 col-md-2 col-sm-12">Scheduling Method</label>
<div className="col-lg-3 col-md-3 col-sm-12 block-list">
<span>{this.props.schedulingUnit.scheduling_constraints_doc.scheduler}</span>
</div>
@@ -57,7 +52,7 @@ class Scheduled extends Component {
<div className="p-grid p-justify-start">
<div className="p-col-1">
- <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={ this.onSave } />
+ <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.onSave} />
</div>
<div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width: '90px' }} />
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
index 2204b94010f..4ff76e19ed0 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
@@ -46,7 +46,7 @@ export default (props) => {
<>
<div className="p-fluid">
<div className="p-field p-grid">
- <label htmlFor="suName" className="col-lg-2 col-md-2 col-sm-12">Scheduling Unit</label>
+ <label htmlFor="suName" className="col-lg-2 col-md-2 col-sm-12">Scheduling Unit</label>
<div className="col-lg-3 col-md-3 col-sm-12">
<Link to={{ pathname: `/schedulingunit/view/blueprint/${schedulingUnit.id}` }}>{schedulingUnit.name}</Link>
</div>
@@ -72,8 +72,8 @@ export default (props) => {
{currentStep === 2 && <QAsos onNext={onNext} {...state} />}
{currentStep === 3 && <PIverification onNext={onNext} {...state} />}
{currentStep === 4 && <DecideAcceptance onNext={onNext} {...state} />}
- {currentStep === 5 && <Scheduled onNext={onNext}{...state} schedulingUnit={schedulingUnit} />}
- {currentStep === 6 && <ProcessingDone onNext={onNext}{...state} />}
+ {currentStep === 5 && <Scheduled onNext={onNext} {...state} schedulingUnit={schedulingUnit} />}
+ {currentStep === 6 && <ProcessingDone onNext={onNext} {...state} />}
</div>
</>
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
index c45f39fd8ae..56f033fda19 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
@@ -24,8 +24,8 @@ export const routes = [
{
path: "/not-found",
component: NotFound,
-
- },{
+ },
+ {
path: "/dashboard",
component: Dashboard,
name: 'Dashboard',
--
GitLab