Skip to content
Snippets Groups Projects
Commit 2f9673ec authored by Nithya Santhanam's avatar Nithya Santhanam
Browse files

TMSS-228 

changes updated
parent a819f30a
No related branches found
No related tags found
1 merge request!435TMSS-228
Hide whitespace changes
Inline Side-by-side
Showing
with 149 additions and 61 deletions
SAS/TMSS/frontend/tmss_webapp/src/App.css
+ 5
− 0
View file @ 2f9673ec
...@@ -241,3 +241,8 @@ div[data-schemapath='root.$schema'] { ...@@ -241,3 +241,8 @@ div[data-schemapath='root.$schema'] {
.today-calendar-btn { .today-calendar-btn {
display: none; display: none;
} }
.disableContainer {
pointer-events: none;
opacity: 0.7;
}
\ No newline at end of file
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/Scheduled.js
+ 2
− 2
View file @ 2f9673ec
...@@ -47,12 +47,12 @@ class Scheduled extends Component { ...@@ -47,12 +47,12 @@ class Scheduled extends Component {
</div> </div>
</div> </div>
<div className="p-grid p-justify-start"> {!this.props.readOnly && <div className="p-grid p-justify-start">
<div className="p-col-1"> <div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width: '90px' }} <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width: '90px' }}
onClick={(e) => {this.props.onCancel()}} /> onClick={(e) => {this.props.onCancel()}} />
</div> </div>
</div> </div>}
</div> </div>
</> </>
) )
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/decide.acceptance.js
+ 21
− 6
View file @ 2f9673ec
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
import SunEditor from 'suneditor-react'; import SunEditor from 'suneditor-react';
...@@ -17,14 +18,28 @@ class DecideAcceptance extends Component { ...@@ -17,14 +18,28 @@ class DecideAcceptance extends Component {
this.Next = this.Next.bind(this); this.Next = this.Next.bind(this);
this.handleChange = this.handleChange.bind(this); this.handleChange = this.handleChange.bind(this);
this.onChangePIComment = this.onChangePIComment.bind(this); this.onChangePIComment = this.onChangePIComment.bind(this);
this.getQADecideAcceptance = this.getQADecideAcceptance.bind(this);
} }
async componentDidMount() { async componentDidMount() {
if (this.props.readOnly) {
this.getQADecideAcceptance();
}
const qaSOSResponse = await WorkflowService.getQAReportingSOS(this.props.process.qa_reporting_sos); const qaSOSResponse = await WorkflowService.getQAReportingSOS(this.props.process.qa_reporting_sos);
const piVerificationResponse = await WorkflowService.getQAPIverification(this.props.process.pi_verification); const piVerificationResponse = await WorkflowService.getQAPIverification(this.props.process.pi_verification);
this.setState({ this.setState({
content: qaSOSResponse.sos_report, content: qaSOSResponse.sos_report,
comment: piVerificationResponse.pi_report comment: qaSOSResponse.pi_report
});
}
async getQADecideAcceptance() {
if (!this.props.process.decide_acceptance) {
return
}
const decideAcceptanceResponse = await WorkflowService.getQADecideAcceptance(this.props.process.decide_acceptance);
this.setState({
sos_accept_after_pi: decideAcceptanceResponse.sos_accept_after_pi
}); });
} }
...@@ -70,8 +85,8 @@ class DecideAcceptance extends Component { ...@@ -70,8 +85,8 @@ class DecideAcceptance extends Component {
return ( return (
<> <>
<div> <div>
<div className="p-fluid"> <div className={`p-fluid-grid ${this.props.readOnly ? 'disableContainer' : ''}`}>
<div className="p-grid" style={{ padding: '15px' }}> <div className="p-fluid-grid" style={{ padding: '10px' }}>
<label htmlFor="operatorReport" >Operator Report</label> <label htmlFor="operatorReport" >Operator Report</label>
<div className="col-lg-12 col-md-12 col-sm-12"></div> <div className="col-lg-12 col-md-12 col-sm-12"></div>
{this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto;" enableToolbar={true} {this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto;" enableToolbar={true}
...@@ -111,15 +126,15 @@ class DecideAcceptance extends Component { ...@@ -111,15 +126,15 @@ class DecideAcceptance extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="p-grid" style={{ marginTop: '20px' }}> {!this.props.readOnly && <div className="p-grid" style={{ marginTop: '20px' }}>
<div className="p-col-1"> <div className="p-col-1">
<Button label="Next" className="p-button-primary" icon="pi pi-check" onClick = { this.Next } disabled={this.props.disableNextButton} /> <Button label="Next" className="p-button-primary" icon="pi pi-check" onClick = { this.Next } disabled={!this.state.content || this.props.readOnly}/>
</div> </div>
<div className="p-col-1"> <div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => { this.props.onCancel()}} /> onClick={(e) => { this.props.onCancel()}} />
</div> </div>
</div> </div>}
</div> </div>
</> </>
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
+ 38
− 18
View file @ 2f9673ec
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { TabView,TabPanel } from 'primereact/tabview';
import PageHeader from '../../layout/components/PageHeader'; import PageHeader from '../../layout/components/PageHeader';
import {Growl} from 'primereact/components/growl/Growl'; import {Growl} from 'primereact/components/growl/Growl';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
...@@ -24,12 +25,12 @@ const RedirectionMap = { ...@@ -24,12 +25,12 @@ const RedirectionMap = {
'qa reporting sos':4, 'qa reporting sos':4,
'pi verification':5, 'pi verification':5,
'decide acceptance':6, 'decide acceptance':6,
'ingest done':7, 'ingesting':7,
'unpin data':8 'unpin data':8
}; };
//Workflow Page Title //Workflow Page Title
const pageTitle = ['Waiting To Be Scheduled','Scheduled','QA Reporting (TO)', 'QA Reporting (SDCO)', 'PI Verification', 'Decide Acceptance','Ingest','Unpin Data']; const pageTitle = ['Waiting To Be Scheduled','Scheduled','QA Reporting (TO)', 'QA Reporting (SDCO)', 'PI Verification', 'Decide Acceptance','Ingesting','Unpin Data'];
export default (props) => { export default (props) => {
let growl; let growl;
...@@ -178,25 +179,44 @@ export default (props) => { ...@@ -178,25 +179,44 @@ export default (props) => {
</label> </label>
</div> </div>
</div>} </div>}
{currentStep === 1 && <Scheduled onNext={onNext} onCancel={onCancel} <TabView activeIndex={currentStep - 1}>
schedulingUnit={schedulingUnit} /*disableNextButton={disableNextButton}*/ />} <TabPanel header="Waiting To Be Scheduled" disabled={currentStep < 1} headerClassName="workflow-header">
{currentStep === 2 && <ProcessingDone onNext={onNext} onCancel={onCancel} <Scheduled onNext={onNext} onCancel={onCancel} readOnly={ currentStep !== 1 }
schedulingUnit={schedulingUnit} />} schedulingUnit={schedulingUnit} /*disableNextButton={disableNextButton}*/ />
{currentStep === 3 && <QAreporting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} </TabPanel>
getCurrentTaskDetails={getCurrentTaskDetails} onError={showMessage} />} <TabPanel header="Scheduled" disabled={currentStep < 2} headerClassName="workflow-header">
{currentStep === 4 && <QAsos onNext={onNext} onCancel={onCancel} id={QASUProcess.id} <ProcessingDone onNext={onNext} onCancel={onCancel} readOnly={ currentStep !== 2 }
schedulingUnit={schedulingUnit} />
</TabPanel>
<TabPanel header="QA Reporting (TO)" disabled={currentStep < 3} headerClassName="workflow-header">
<QAreporting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 3 }
process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
onError={showMessage} />
</TabPanel>
<TabPanel header="QA Reporting (SDCO)" disabled={currentStep < 4} headerClassName="workflow-header">
<QAsos onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 4 }
process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails} process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
onError={showMessage} />} onError={showMessage} />
{currentStep === 5 && <PIverification onNext={onNext} onCancel={onCancel} id={QASUProcess.id} </TabPanel>
<TabPanel header="PI Verification" disabled={currentStep < 5} headerClassName="workflow-header">
<PIverification onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 5 }
process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails} process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
onError={showMessage} />} onError={showMessage} />
{currentStep === 6 && <DecideAcceptance onNext={onNext} onCancel={onCancel} id={QASUProcess.id} </TabPanel>
<TabPanel header="Decide Acceptance" disabled={currentStep < 6} headerClassName="workflow-header">
<DecideAcceptance onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 6 }
process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails} process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
onError={showMessage} />} onError={showMessage} />
{currentStep === 7 && <Ingesting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} </TabPanel>
onError={showMessage} task={getIngestTask()} />} <TabPanel header="Ingest" disabled={currentStep < 7} headerClassName="workflow-header">
{currentStep === 8 && <DataProduct onNext={onNext} onCancel={onCancel} onError={showMessage} <Ingesting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 7 }
tasks={tasks} schedulingUnit={schedulingUnit} />} onError={showMessage} task={getIngestTask()} />
</TabPanel>
<TabPanel header="Unpin Data" disabled={currentStep < 8} headerClassName="workflow-header">
<DataProduct onNext={onNext} onCancel={onCancel} onError={showMessage} readOnly={ currentStep !== 8 }
tasks={tasks} schedulingUnit={schedulingUnit} />
</TabPanel>
</TabView>
</div> </div>
</> </>
} }
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/ingesting.js
+ 8
− 8
View file @ 2f9673ec
...@@ -15,15 +15,15 @@ class Ingesting extends Component { ...@@ -15,15 +15,15 @@ class Ingesting extends Component {
render(){ render(){
return( return(
<> <>
<div className="p-fluid">
<div className="p-field p-grid"> <div className={`p-fluid-grid ${this.props.readOnly ? 'disableContainer' : ''}`}>
<label htmlFor="ingestTaskStatus" className="col-lg-2 col-md-2 col-sm-12">Ingest Task Status</label> <label htmlFor="ingestTaskStatus" className="col-lg-2 col-md-2 col-sm-12">Ingest Task Status</label>
<div className="col-lg-3 col-md-3 col-sm-12"> <div className="col-lg-2 col-md-2 col-sm-12">
<span>{this.props.task.status}</span> <span>{this.props.task.status}</span>
</div> </div>
<div className="col-lg-1 col-md-1 col-sm-12"></div> <div className="col-lg-1 col-md-1 col-sm-12"></div>
<label htmlFor="ingestTask" className="col-lg-2 col-md-2 col-sm-12">Ingest Task</label> <label htmlFor="ingestTask" className="col-lg-2 col-md-2 col-sm-12">Ingest Task</label>
<div className="col-lg-3 col-md-3 col-sm-12"> <div className="col-lg-3 col-md-4 col-sm-12">
<a rel="noopener noreferrer" href={`${window.location.origin}/task/view/blueprint/${this.props.task.id}`}>{this.props.task.name}</a> <a rel="noopener noreferrer" href={`${window.location.origin}/task/view/blueprint/${this.props.task.id}`}>{this.props.task.name}</a>
</div> </div>
<label htmlFor="ingestMonitoring" className="col-lg-2 col-md-2 col-sm-12">Ingest Monitoring</label> <label htmlFor="ingestMonitoring" className="col-lg-2 col-md-2 col-sm-12">Ingest Monitoring</label>
...@@ -31,16 +31,16 @@ class Ingesting extends Component { ...@@ -31,16 +31,16 @@ class Ingesting extends Component {
<a rel="noopener noreferrer" href="http://lexar003.control.lofar:9632/" target="_blank">View Ingest Monitoring &nbsp;<span class="fas fa-desktop"></span></a> <a rel="noopener noreferrer" href="http://lexar003.control.lofar:9632/" target="_blank">View Ingest Monitoring &nbsp;<span class="fas fa-desktop"></span></a>
</label> </label>
</div> </div>
<div className="p-grid p-justify-start"> {!this.props.readOnly &&<div className="p-grid p-justify-start">
<div className="p-col-1"> <div className="p-col-1">
<Button label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.onSave }/> <Button label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.onSave } disabled={!this.state.content || this.props.readOnly}/>
</div> </div>
<div className="p-col-1"> <div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => { this.props.onCancel()}} /> onClick={(e) => { this.props.onCancel()}} />
</div> </div>
</div> </div>}
</div>
</> </>
) )
}; };
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js
+ 22
− 6
View file @ 2f9673ec
...@@ -18,14 +18,30 @@ class PIverification extends Component { ...@@ -18,14 +18,30 @@ class PIverification extends Component {
this.Next = this.Next.bind(this); this.Next = this.Next.bind(this);
this.handleChange = this.handleChange.bind(this); this.handleChange = this.handleChange.bind(this);
this.onChangePIComment = this.onChangePIComment.bind(this); this.onChangePIComment = this.onChangePIComment.bind(this);
this.getPIVerificationDetails = this.getPIVerificationDetails.bind(this);
} }
async componentDidMount() { async componentDidMount() {
if (this.props.readOnly) {
this.getPIVerificationDetails();
}
const response = await WorkflowService.getQAReportingSOS(this.props.process.qa_reporting_sos); const response = await WorkflowService.getQAReportingSOS(this.props.process.qa_reporting_sos);
this.setState({ this.setState({
content: response.sos_report content: response.sos_report
}); });
} }
async getPIVerificationDetails() {
if (!this.props.process.pi_verification) {
return
}
const piVerificationResponse = await WorkflowService.getQAPIverification(this.props.process.pi_verification);
this.setState({
comment: piVerificationResponse.pi_report,
pi_accept: piVerificationResponse.pi_accept
});
}
/** /**
* Method will trigger on change of operator report sun-editor * Method will trigger on change of operator report sun-editor
...@@ -73,8 +89,8 @@ class PIverification extends Component { ...@@ -73,8 +89,8 @@ class PIverification extends Component {
return ( return (
<> <>
<div> <div>
<div className="p-fluid"> <div className={`p-fluid-grid ${this.props.readOnly ? 'disableContainer' : ''}`}>
<div className="p-grid" style={{ padding: '10px' }}> <div className="p-fluid-grid" style={{ padding: '10px' }}>
<label htmlFor="operatorReport" >Operator Report</label> <label htmlFor="operatorReport" >Operator Report</label>
<div className="col-lg-12 col-md-12 col-sm-12"></div> <div className="col-lg-12 col-md-12 col-sm-12"></div>
{this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto;" enableToolbar={true} {this.state.showEditor && <SunEditor setDefaultStyle="min-height: 250px; height: auto;" enableToolbar={true}
...@@ -108,19 +124,19 @@ class PIverification extends Component { ...@@ -108,19 +124,19 @@ class PIverification extends Component {
<Checkbox inputId="binary" checked={this.state.pi_accept} onChange={e => this.setState({ pi_accept: e.checked })} /> <Checkbox inputId="binary" checked={this.state.pi_accept} onChange={e => this.setState({ pi_accept: e.checked })} />
</div> </div>
</div> </div>
<div className="p-grid" style={{ marginTop: '20px' }}> {!this.props.readOnly && <div className="p-grid" style={{ marginTop: '20px' }}>
<div className="p-col-1"> <div className="p-col-1">
<Button disabled= {!this.state.comment} label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } /> <Button disabled={!this.state.content || this.props.readOnly} label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
</div> </div>
<div className="p-col-1"> <div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => { this.props.onCancel()}} /> onClick={(e) => { this.props.onCancel()}} />
</div> </div>
</div> </div>}
</div> </div>
</div> </div>
</> </>
) )
}; };
} }
export default PIverification; export default PIverification;
\ No newline at end of file
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/processing.done.js
+ 7
− 8
View file @ 2f9673ec
...@@ -39,17 +39,16 @@ class ProcessingDone extends Component { ...@@ -39,17 +39,16 @@ class ProcessingDone extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="p-grid p-justify-start"> {!this.props.readOnly && <div className="p-grid p-justify-start">
<div className="p-col-1"> <div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => {this.props.onCancel()}} /> onClick={(e) => {this.props.onCancel()}} />
</div> </div>
</div> </div>}
</> </>
) )
}; };
} }
export default ProcessingDone export default ProcessingDone
\ No newline at end of file
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js
+ 15
− 4
View file @ 2f9673ec
...@@ -21,6 +21,16 @@ class QAreporting extends Component{ ...@@ -21,6 +21,16 @@ class QAreporting extends Component{
this.handleChange = this.handleChange.bind(this); this.handleChange = this.handleChange.bind(this);
} }
async componentDidMount() {
if (this.props.readOnly) {
const QAreportingresponse = await WorkflowService.getQAReportingTo(this.props.process.qa_reporting_to);
this.setState({
content: QAreportingresponse.operator_report,
operator_accept: QAreportingresponse.operator_accept
});
}
}
/** /**
* Method will trigger on click next buton * Method will trigger on click next buton
* here onNext props coming from parent, where will handle redirection to other page * here onNext props coming from parent, where will handle redirection to other page
...@@ -55,7 +65,7 @@ class QAreporting extends Component{ ...@@ -55,7 +65,7 @@ class QAreporting extends Component{
render() { render() {
return ( return (
<> <>
<div className="p-fluid"> <div className={`p-fluid-grid ${this.props.readOnly ? 'disableContainer' : ''}`}>
<div className="p-field p-grid"> <div className="p-field p-grid">
<label htmlFor="assignTo" className="col-lg-2 col-md-2 col-sm-12">Assign To</label> <label htmlFor="assignTo" className="col-lg-2 col-md-2 col-sm-12">Assign To</label>
<div className="col-lg-3 col-md-3 col-sm-12" data-testid="assignTo" > <div className="col-lg-3 col-md-3 col-sm-12" data-testid="assignTo" >
...@@ -70,6 +80,7 @@ class QAreporting extends Component{ ...@@ -70,6 +80,7 @@ class QAreporting extends Component{
<SunEditor enableToolbar={true} <SunEditor enableToolbar={true}
setDefaultStyle="min-height: 250px; height: auto;" setDefaultStyle="min-height: 250px; height: auto;"
onChange={ this.handleChange } onChange={ this.handleChange }
setContents={this.state.content}
setOptions={{ setOptions={{
buttonList: [ buttonList: [
['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript', ['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video', 'italic', 'strike', 'subscript',
...@@ -84,15 +95,15 @@ class QAreporting extends Component{ ...@@ -84,15 +95,15 @@ class QAreporting extends Component{
<label htmlFor="operator_accept " className="p-checkbox-label">Operator Accept</label> <label htmlFor="operator_accept " className="p-checkbox-label">Operator Accept</label>
</div> </div>
</div> </div>
<div className="p-grid p-justify-start"> {!this.props.readOnly && <div className="p-grid p-justify-start">
<div className="p-col-1"> <div className="p-col-1">
<Button disabled= {!this.state.content} label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } /> <Button disabled={!this.state.content || this.props.readOnly} label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
</div> </div>
<div className="p-col-1"> <div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '88px' }} <Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '88px' }}
onClick={(e) => { this.props.onCancel()}} /> onClick={(e) => { this.props.onCancel()}} />
</div> </div>
</div> </div>}
</> </>
) )
}; };
......
SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.sos.js
+ 22
− 8
View file @ 2f9673ec
...@@ -16,12 +16,26 @@ class QAreportingSDCO extends Component { ...@@ -16,12 +16,26 @@ class QAreportingSDCO extends Component {
}; };
this.Next = this.Next.bind(this); this.Next = this.Next.bind(this);
this.handleChange = this.handleChange.bind(this); this.handleChange = this.handleChange.bind(this);
this.getQASOSDetails = this.getQASOSDetails.bind(this);
} }
async componentDidMount() { async componentDidMount() {
const response = await WorkflowService.getQAReportingTo(this.props.process.qa_reporting_to); if (this.props.readOnly) {
this.getQASOSDetails()
} else {
const response = await WorkflowService.getQAReportingTo(this.props.process.qa_reporting_to);
this.setState({
content: response.operator_report
});
}
}
async getQASOSDetails() {
const QASOSresponse = await WorkflowService.getQAReportingSOS(this.props.process.qa_reporting_sos);
this.setState({ this.setState({
content: response.operator_report content: QASOSresponse.sos_report,
quality_within_policy: QASOSresponse.quality_within_policy,
sos_accept_show_pi: QASOSresponse.sos_accept_show_pi
}); });
} }
...@@ -66,7 +80,7 @@ class QAreportingSDCO extends Component { ...@@ -66,7 +80,7 @@ class QAreportingSDCO extends Component {
<> <>
<div> <div>
<div className="p-fluid"> <div className="p-fluid">
<div className="p-field p-grid"> <div className={`p-fluid-grid ${this.props.readOnly ? 'disableContainer' : ''}`}>
<label htmlFor="qualityPolicy" className="col-lg-2 col-md-2 col-sm-12">Quality Policy</label> <label htmlFor="qualityPolicy" className="col-lg-2 col-md-2 col-sm-12">Quality Policy</label>
<div className="col-lg-3 col-md-3 col-sm-12"> <div className="col-lg-3 col-md-3 col-sm-12">
<div className="p-field-checkbox"> <div className="p-field-checkbox">
...@@ -97,18 +111,18 @@ class QAreportingSDCO extends Component { ...@@ -97,18 +111,18 @@ class QAreportingSDCO extends Component {
] ]
}} }}
/>} />}
{!this.state.showEditor && <div onClick={() => this.setState({ showEditor: !this.state.showEditor })} className="operator-report" dangerouslySetInnerHTML={{ __html: this.state.content }}></div>} {!this.state.showEditor && <div onClick={() => !this.props.readOnly && this.setState({ showEditor: !this.state.showEditor })} className="operator-report" dangerouslySetInnerHTML={{ __html: this.state.content }}></div>}
</div> </div>
</div> </div>
<div className="p-grid" style={{ marginTop: '20px' }}> {!this.props.readOnly && <div className="p-grid" style={{ marginTop: '20px' }}>
<div className="p-col-1"> <div className="p-col-1">
<Button label="Next" disabled= {!this.state.content} className="p-button-primary" icon="pi pi-check" onClick={ this.Next } /> <Button label="Next" disabled={!this.state.content || this.props.readOnly} className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
</div> </div>
<div className="p-col-1"> <div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }} <Button label="Cancel" disabled={this.props.readOnly} className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => { this.props.onCancel()}} /> onClick={(e) => { this.props.onCancel()}} />
</div> </div>
</div> </div>}
</div> </div>
</> </>
) )
......
SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js
+ 9
− 1
View file @ 2f9673ec
...@@ -92,7 +92,15 @@ const WorkflowService = { ...@@ -92,7 +92,15 @@ const WorkflowService = {
} catch(error) { } catch(error) {
console.error('[workflow.services.qa_pi_verification]',error); console.error('[workflow.services.qa_pi_verification]',error);
} }
},
getQADecideAcceptance: async (id) => {
try {
const response = await axios.get(`/workflow_api/scheduling_unit_flow/qa_decide_acceptance/${id}`);
return response.data;
} catch(error) {
console.error('[workflow.services.qa_decide_acceptance]',error);
}
} }
} }
export default WorkflowService; export default WorkflowService;
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment