Skip to content
Snippets Groups Projects
Commit 0270dc9b authored by Ramesh Kumar's avatar Ramesh Kumar
Browse files

Merge branch 'TMSS-376' into TMSS-378

parents f41b3f3f 83e52b9a
No related branches found
No related tags found
1 merge request!271Sprint-15 Front End Merge
......@@ -45,6 +45,7 @@
"react-transition-group": "^2.5.1",
"reactstrap": "^8.5.1",
"styled-components": "^5.1.1",
"suneditor-react": "^2.14.4",
"typescript": "^3.9.5",
"yup": "^0.29.1"
},
......
......@@ -109,8 +109,34 @@
.hide {
display: none !important;
}
.grouping {
padding: 0 15px;
}
.grouping fieldset {
border-width: 1px;
border-style: double;
border-color: #ccc;
border-image: initial;
padding: 10px;
width: 100%;
}
.grouping legend {
width: auto;
}
.comments{
margin: 90px;
position: absolute;
margin-left: 15px;
}
.qaButton{
margin-left: 0;
position: relative;
top: 350px;
}
.plots{
padding-left: 2px;
}
......
......@@ -83,6 +83,7 @@ class ViewSchedulingUnit extends Component{
this.actions.unshift({icon: 'fa-edit', title: 'Click to edit', props : { pathname:`/schedulingunit/edit/${ this.props.match.params.id}`}
});
} else {
this.actions.unshift({icon: 'fa-sitemap',title :'View Workflow',props :{pathname:`/schedulingunit/${this.props.match.params.id}/workflow`}});
this.actions.unshift({icon: 'fa-lock', title: 'Cannot edit blueprint'});
}
if (this.props.match.params.id) {
......
import React, { Component } from 'react';
import PageHeader from '../../layout/components/PageHeader';
import {Growl} from 'primereact/components/growl/Growl';
import { Button } from 'primereact/button';
// import AppLoader from '../../layout/components/AppLoader';
import SunEditor from 'suneditor-react';
import 'suneditor/dist/css/suneditor.min.css'; // Import Sun Editor's CSS File
import {Dropdown} from 'primereact/dropdown';
// import {InputText} from 'primereact/inputtext';
import ScheduleService from '../../services/schedule.service';
import { Link } from 'react-router-dom';
class QAreporting extends Component{
constructor(props) {
super(props);
this.state={};
}
componentDidMount() {
ScheduleService.getSchedulingUnitBlueprintById(this.props.match.params.id)
.then(schedulingUnit => {
this.setState({schedulingUnit: schedulingUnit});
})
}
render() {
return (
<React.Fragment>
<Growl ref={(el) => this.growl = el} />
<PageHeader location={this.props.location} title={'QA Reporting (TO)'} actions={[{icon:'fa-window-close',link:this.props.history.goBack, title:'Click to Close Workflow', props:{ pathname: '/schedulingunit/view'}}]}/>
{this.state.schedulingUnit &&
<>
<div>
<div className="p-fluid">
<div className="p-field p-grid">
<label htmlFor="suStatus" 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/${this.state.schedulingUnit.id}`}}>{this.state.schedulingUnit.name}</Link>
</div>
<div className="col-lg-1 col-md-1 col-sm-12"></div>
<label htmlFor="suStatus" className="col-lg-2 col-md-2 col-sm-12">Scheduling Unit Status</label>
<div className="col-lg-3 col-md-3 col-sm-12">
{/* <InputText id="suStatus" data-testid="name" disabled
value={this.state.schedulingUnit.status}/> */}
<span>{this.state.schedulingUnit.status}</span>
</div>
</div>
<div className="p-field p-grid">
<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" >
<Dropdown inputId="projCat" optionLabel="value" optionValue="value"
options={[{value: 'User 1'},{value: 'User 2'},{value: 'User 3'}]}
placeholder="Assign To" />
</div>
<div className="col-lg-1 col-md-1 col-sm-12"></div>
<label htmlFor="viewPlots" className="col-lg-2 col-md-2 col-sm-12">View Plots</label>
<div className="col-lg-3 col-md-3 col-sm-12" style={{paddingLeft:'2px'}}>
<label className="col-sm-10 " >
<a href="https://proxy.lofar.eu/inspect/HTML/" target="_blank">Inspection plots</a>
</label>
<label className="col-sm-10 ">
<a href="https://proxy.lofar.eu/qa" target="_blank">Adder plots</a>
</label>
<label className="col-sm-10 ">
<a href=" https://proxy.lofar.eu/lofmonitor/" target="_blank">Station Monitor</a>
</label>
</div>
</div>
<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}
setOptions={{
buttonList: [
['undo', 'redo', 'bold', 'underline', 'fontColor', 'table', 'link', 'image', 'video','italic', 'strike', 'subscript',
'superscript','outdent', 'indent','fullScreen', 'showBlocks', 'codeView','preview', 'print','removeFormat']
]
}} />
</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" />
</div>
<div className="p-col-1">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" />
</div>
</div>
</div>
</>
}
</React.Fragment>
)};
}
export default QAreporting;
\ No newline at end of file
......@@ -15,7 +15,8 @@ import SchedulingUnitCreate from './Scheduling/create';
import EditSchedulingUnit from './Scheduling/edit';
import { CycleList, CycleCreate, CycleView, CycleEdit } from './Cycle';
import {TimelineView, WeekTimelineView} from './Timeline';
import SchedulingSetCreate from './Scheduling/create.scheduleset'
import SchedulingSetCreate from './Scheduling/create.scheduleset';
import QAreporting from './Workflow/QAreporting';
export const routes = [
{
......@@ -150,7 +151,13 @@ export const routes = [
path: "/schedulingset/schedulingunit/create",
component: SchedulingSetCreate,
name: 'Scheduling Set Add'
}
},
{
path: "/schedulingunit/:id/workflow",
component: QAreporting,
name: 'QA Reporting (TO)',
title: 'QA Reporting (TO)'
}
];
export const RoutedContent = () => {
......
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