diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.css b/SAS/TMSS/frontend/tmss_webapp/src/App.css
index 8f8060fe51b3fa34406ae0a9d7f7ef95f388201e..32f05ad2e240c048576131b367528ede7d947971 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/App.css
+++ b/SAS/TMSS/frontend/tmss_webapp/src/App.css
@@ -53,6 +53,10 @@ a{
margin-bottom: 10px;
}
+.main-content {
+ margin-top:20px;
+}
+
.main-content span,a{
font-size: 14px;
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.js b/SAS/TMSS/frontend/tmss_webapp/src/App.js
index af0b8d760c3c17348d38f349362ee983a10dbc1b..9342bcab807245624c5b5fa4c081e95ca81bea5d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/App.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/App.js
@@ -23,6 +23,7 @@ class App extends Component {
layoutMode: 'static',
currentMenu: '',
currentPath: '/',
+ PageTitle:'',
staticMenuInactive: false,
overlayMenuActive: false,
mobileMenuActive: false,
@@ -31,6 +32,7 @@ class App extends Component {
this.onToggleMenu = this.onToggleMenu.bind(this);
this.onSidebarClick = this.onSidebarClick.bind(this);
this.onMenuItemClick = this.onMenuItemClick.bind(this);
+ this.setPageTitle = this.setPageTitle.bind(this);
this.menu = [
{label: 'Dashboard', icon: 'pi pi-fw pi-home', to:'/dashboard'},
@@ -90,6 +92,12 @@ class App extends Component {
isDesktop() {
return window.innerWidth > 1024;
}
+
+ setPageTitle(PageTitle) {
+ if (PageTitle !== this.state.PageTitle) {
+ this.setState({ PageTitle })
+ }
+ }
render() {
const wrapperClass = classNames('layout-wrapper', {
@@ -99,7 +107,8 @@ class App extends Component {
'layout-overlay-sidebar-active': this.state.overlayMenuActive && this.state.layoutMode === 'overlay',
'layout-mobile-sidebar-active': this.state.mobileMenuActive
});
- const AppBreadCrumbWithRouter = withRouter(AppBreadcrumb);
+ const AppBreadCrumbWithRouter = withRouter(AppBreadcrumb);
+
return (
<React.Fragment>
@@ -108,10 +117,10 @@ class App extends Component {
<div className={wrapperClass}>
<AppTopbar onToggleMenu={this.onToggleMenu}></AppTopbar>
<Router basename={ this.state.currentPath }>
- <AppMenu model={this.menu} onMenuItemClick={this.onMenuItemClick} />
+ <AppMenu model={this.menu} onMenuItemClick={this.onMenuItemClick} />
<div className="layout-main">
- <AppBreadCrumbWithRouter/>
- <RoutedContent />
+ <AppBreadCrumbWithRouter setPageTitle={this.setPageTitle} />
+ <RoutedContent />
</div>
</Router>
<AppFooter></AppFooter>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
index ddf77d3e4b228914fd7fc97e74cb11820d821755..0fd0c0c45c82a891cf3f768fdaa0e1850baa130d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
@@ -22,4 +22,4 @@
.layout-sidebar-dark .layout-menu li a {
border-top: none;
}
-}
\ No newline at end of file
+}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js
index 0abba394b1c1190aa1c84bf7ec20af19f97c720c..7c966d34bb8190efdab77a9c5211691f48ce2a77 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js
@@ -27,11 +27,13 @@ export class AppBreadcrumb extends Component {
onRoute() {
const { breadcrumbs } = this.state;
+ const { setPageTitle } = this.props;
const currentRoute = routes.find(route => matchPath(this.props.location.pathname, {path: route.path, exact: true, strict: true}));
//for intial route ,there wont be any route object so it failed
if(!currentRoute){
return;
- }
+ }
+ setPageTitle(currentRoute.pageTitle);
if (!breadcrumbs.length) {
this.setState({ breadcrumbs: [{...this.props.location, name: currentRoute.name}] });
return;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
new file mode 100644
index 0000000000000000000000000000000000000000..6948ab85a4d1b0ce987dc50f7e3e81454287b5c3
--- /dev/null
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
@@ -0,0 +1,40 @@
+import React, { useEffect, useState } from 'react';
+import { routes } from '../../routes';
+import {matchPath, Link} from 'react-router-dom';
+
+export default ({ title, subTitle, actions, ...props}) => {
+ const [page, setPage] = useState({});
+
+ useEffect(() => {
+ const currentRoute = routes.find(route => matchPath(props.location.pathname, {path: route.path, exact: true, strict: true}));
+ //for intial route ,there wont be any route object so it failed
+ if(!currentRoute){
+ return;
+ }
+ setPage(currentRoute);
+ }, [props.location.pathname]);
+
+ const onClickLink = (action) => {
+ console.log('Hi')
+ if (action.link) {
+ action.link();
+ }
+ };
+
+ return (
+ <div className="page-header">
+ <div className="title">
+ <h2 className="page-title">{title || page.title}</h2>
+ {(page.subTitle || subTitle) && <h6 className="page-subtitle">{subTitle || page.subTitle}</h6>}
+ </div>
+ <div className="page-action-menu">
+ {(actions || []).map(action => {
+ return (
+ <Link to={{ ...action.props }} title={action.title || ''} onClick={() => onClickLink(action)}>
+ <i className={`fa ${action.icon}`}></i>
+ </Link>
+ )})}
+ </div>
+ </div>
+ );
+}
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss
index 79f22ea107106c4e26e10b2cc375414ea77b293d..7f1c64219e88a4c1101b7d7b68dc20a6d7f19050 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss
@@ -12,3 +12,4 @@
@import "./_dashboard";
@import "./_breadcrumb";
@import "./_viewtable";
+@import "./_pageheader";
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_pageheader.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_pageheader.scss
new file mode 100644
index 0000000000000000000000000000000000000000..fd360e6aaaefa18b093d946c5cfeacd662745b15
--- /dev/null
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_pageheader.scss
@@ -0,0 +1,20 @@
+.page-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: baseline;
+ border-bottom: 1px solid #e0e0e0;
+ margin-bottom: 10px;
+ padding-bottom: 5px;
+}
+.page-title {
+ margin-bottom: 0;
+}
+.page-subtitle {
+ color: #b4b2b2;
+ font-size: 100%;
+ font-weight: 400;
+ margin-bottom: 0px;
+}
+.page-action-menu i {
+ margin-left: 5px;
+}
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
index 79ddd60b6b80b15e064ae8a60df296ff6b51674b..29568c138c88fc43d4cd37e7936f5b4a0b813db9 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
-import { Link, Redirect } from 'react-router-dom';
+import { Redirect } from 'react-router-dom';
import {InputText} from 'primereact/inputtext';
import {Calendar} from 'primereact/calendar';
import {InputTextarea} from 'primereact/inputtextarea';
@@ -12,6 +12,7 @@ import moment from 'moment'
import _ from 'lodash';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
import CycleService from '../../services/cycle.service';
import UnitConverter from '../../utils/unit.converter';
import UIConstants from '../../utils/ui.constants';
@@ -326,9 +327,8 @@ export class CycleCreate extends Component {
return (
<React.Fragment>
- <div className="p-grid">
- <Growl ref={(el) => this.growl = el} />
-
+ <Growl ref={(el) => this.growl = el} />
+ { /*<div className="p-grid">
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Cycle - Add</h2>
</div>
@@ -337,7 +337,9 @@ export class CycleCreate extends Component {
<i className="fa fa-window-close" style={{marginTop: "10px"}}></i>
</Link>
</div>
- </div>
+ </div> */ }
+
+ <PageHeader location={this.props.location} title={'Cycle - Add'} actions={[{icon:'fa-window-close',title:'Click to Close Add Cycle',props:{pathname: '/cycle' }}]}/>
{ this.state.isLoading ? <AppLoader /> :
<>
<div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
index 4d599c33ef64cd790084b5f0012a3c2ad3fde1e4..f0c8a30a14cf449356b2f4ae8872517d49e9a93e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
-import { Link, Redirect } from 'react-router-dom';
+import { Redirect } from 'react-router-dom';
import _ from 'lodash';
import moment from 'moment'
@@ -14,6 +14,7 @@ import {Growl} from 'primereact/components/growl/Growl';
import {ResourceInputList} from './ResourceInputList';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
import CycleService from '../../services/cycle.service';
import UnitConverter from '../../utils/unit.converter';
import UIConstants from '../../utils/ui.constants';
@@ -360,9 +361,9 @@ export class CycleEdit extends Component {
}
return (
<React.Fragment>
- <div className="p-grid">
- <Growl ref={(el) => this.growl = el} />
-
+ <Growl ref={(el) => this.growl = el} />
+ {/*} <div className="p-grid">
+
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Cycle - Edit</h2>
</div>
@@ -371,7 +372,8 @@ export class CycleEdit extends Component {
<i className="fa fa-window-close" style={{marginTop: "10px"}}></i>
</Link>
</div>
- </div>
+ </div> */}
+ <PageHeader location={this.props.location} title={'Cycle - Edit'} actions={[{icon:'fa-window-close',title:'Click to Close Cycle-Edit', props:{ pathname: `/cycle/view/${this.state.cycle.name}`}}]}/>
{ this.state.isLoading ? <AppLoader/> :
<>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
index 6fe6f2cb46c4cd10e7e64362b08ad553f6e64b2e..e4438cfd5b9cc69ff7e2116bdb4bff0bd9acf7e8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.js
@@ -1,12 +1,13 @@
import React, { Component } from 'react'
import 'primeflex/primeflex.css';
-import { Link } from 'react-router-dom/cjs/react-router-dom.min';
+// import { Link } from 'react-router-dom/cjs/react-router-dom.min';
import _ from 'lodash';
import ViewTable from '../../components/ViewTable';
import CycleService from '../../services/cycle.service';
import UnitConversion from '../../utils/unit.converter';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
class CycleList extends Component{
constructor(props){
@@ -111,7 +112,7 @@ class CycleList extends Component{
render(){
return (
<>
- <div className="p-grid">
+ { /*<div className="p-grid">
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Cycle - List </h2>
</div>
@@ -120,7 +121,15 @@ class CycleList extends Component{
<i className="fa fa-plus-square" style={{marginTop: "10px"}}></i>
</Link>
</div>
- </div>
+ </div> */}
+ {/*
+ * Call View table to show table data, the parameters are,
+ data - Pass API data
+ defaultcolumns - This colum will be populate by default in table with header mentioned
+ showaction - {true/false} -> to show the action column
+ paths - specify the path for navigation - Table will set "id" value for each row in action button
+ */}
+ <PageHeader location={this.props.location} title={'Cycle - List'} actions={[{icon:'fa-plus-square',title:'Click to Add Cycle', props:{ pathname: '/cycle/create'}}]}/>
{/*
* Call View table to show table data, the parameters are,
data - Pass API data
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
index 55430cc1fd440589988e30d2a1e13aa1e91c4d51..7932c68177614ea0cb5085e74d41d073069d56c7 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
@@ -8,6 +8,7 @@ import { Chips } from 'primereact/chips';
import ResourceDisplayList from './ResourceDisplayList';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
import CycleService from '../../services/cycle.service';
import UnitConverter from '../../utils/unit.converter';
@@ -20,6 +21,7 @@ export class CycleView extends Component {
super(props);
this.state = {
isLoading: true,
+ cycle:'',
};
if (this.props.match.params.id) {
this.state.cycleId = this.props.match.params.id;
@@ -75,7 +77,7 @@ export class CycleView extends Component {
return (
<React.Fragment>
- <div className="p-grid">
+ {/* <div className="p-grid">
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Cycle - Details </h2>
</div>
@@ -90,7 +92,8 @@ export class CycleView extends Component {
</Link>
</div>
}
- </div>
+ </div> */ }
+ <PageHeader location={this.props.location} title={'Cycle - View'} actions={[{icon:'fa-edit',title:'Click to Edit Cycle', props:{ pathname: `/cycle/edit/${this.state.cycle.name}`, state: {id: this.state.cycle?this.state.cycle.name:''}}},{name: 'fa-times',props:{ pathname: `/cycle`}}]}/>
{ this.state.isLoading && <AppLoader /> }
{ this.state.cycle &&
<React.Fragment>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js
index a0a798161d65edf83901902a88e3957569741bd8..409176dce304825d2cc252ec3482e0cec2ee2291 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js
@@ -1,16 +1,14 @@
import React, {Component} from 'react';
+import PageHeader from '../../layout/components/PageHeader';
export class Dashboard extends Component {
- constructor(props){
- super(props)
- console.log(this.props)
- }
render() {
+
return (
- <h1>Dashboard</h1>
- );
+ <PageHeader location={this.props.location} title={'Dashboard'} />
+ )
}
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/ResourceInputList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/ResourceInputList.js
index d074a38c1eec2c23f9434dbe30475822cca302e9..3d6ead61a870c889a801b9093f6a19fa13e01d70 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/ResourceInputList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/ResourceInputList.js
@@ -40,7 +40,7 @@ export class ResourceInputList extends Component {
<div key={'div1-'+ index} className="col-lg-3 col-md-3 col-sm-12">
<InputNumber key={'item1-'+ index} id={'item1-'+ index} name={'item1-'+ index}
suffix={` ${this.props.unitMap[item.quantity_value]?this.props.unitMap[item.quantity_value].display:''}`}
- placeholder={` ${this.props.unitMap[item.quantity_value]?this.props.unitMap[item.quantity_value].display:item.name}`} min={0} useGrouping={false}
+ placeholder={` ${this.props.unitMap[item.quantity_value]?this.props.unitMap[item.quantity_value].display:item.name}`}
inputId={`${item.name}`} min={0} useGrouping={false}
value={this.state.projectQuota[item.name]}
onChange={(e) => this.onInputChange(item.name, e)}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
index 64a96b3f0a9b6ba7ff8a99cf52d416e0e49a23a0..bc55f4dd20415f977128ce93c86597967b440a99 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
-import { Link, Redirect } from 'react-router-dom';
+import { Redirect } from 'react-router-dom';
import _ from 'lodash';
import {InputText} from 'primereact/inputtext';
@@ -15,6 +15,7 @@ import {Growl} from 'primereact/components/growl/Growl';
import {ResourceInputList} from './ResourceInputList';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
import CycleService from '../../services/cycle.service';
import ProjectService from '../../services/project.service';
import UnitConverter from '../../utils/unit.converter';
@@ -335,9 +336,9 @@ export class ProjectCreate extends Component {
return (
<React.Fragment>
- <div className="p-grid">
- <Growl ref={(el) => this.growl = el} />
-
+ <Growl ref={(el) => this.growl = el} />
+ { /* <div className="p-grid">
+
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Project - Add</h2>
</div>
@@ -346,7 +347,8 @@ export class ProjectCreate extends Component {
<i className="fa fa-window-close" style={{marginTop: "10px"}}></i>
</Link>
</div>
- </div>
+ </div> */ }
+ <PageHeader location={this.props.location} title={'Project - Add'} actions={[{icon:'fa-window-close',title:'Click to Close Project', props:{ pathname: '/project'}}]}/>
{ this.state.isLoading ? <AppLoader /> :
<>
<div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
index 78b443a5c2d1eb457b3806a0cc4fe89e3fd2ab99..a1f48c927de8d73a0acbd2090c0892ad09ed6896 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
-import { Link, Redirect } from 'react-router-dom';
+import { Redirect } from 'react-router-dom';
import _ from 'lodash';
import {InputText} from 'primereact/inputtext';
@@ -10,11 +10,12 @@ import {Dropdown} from 'primereact/dropdown';
import {MultiSelect} from 'primereact/multiselect';
import { Button } from 'primereact/button';
import {Dialog} from 'primereact/components/dialog/Dialog';
-import {Growl} from 'primereact/components/growl/Growl';
+//import {Growl} from 'primereact/components/growl/Growl';
import {ResourceInputList} from './ResourceInputList';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
import CycleService from '../../services/cycle.service';
import ProjectService from '../../services/project.service';
import UnitConverter from '../../utils/unit.converter';
@@ -356,7 +357,7 @@ export class ProjectEdit extends Component {
return (
<React.Fragment>
- <div className="p-grid">
+ {/*} <div className="p-grid">
<Growl ref={(el) => this.growl = el} />
<div className="p-col-10 p-lg-10 p-md-10">
@@ -367,7 +368,8 @@ export class ProjectEdit extends Component {
<i className="fa fa-window-close" style={{marginTop: "10px"}}></i>
</Link>
</div>
- </div>
+ </div> */}
+ <PageHeader location={this.props.location} title={'Project - Edit'} actions={[{icon:'fa-window-close',title:'Click to Close Project Edit Page', props : { pathname: `/project/view/${this.state.project.name}`}}]}/>
{ this.state.isLoading ? <AppLoader/> :
<>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
index c26a43fa9bfbf24144be35f8b1208c154b3391df..4aa4e98a8cd8485d58fb75da63c8f29f8a8eea44 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
@@ -1,8 +1,9 @@
import React, {Component} from 'react';
import ProjectService from '../../services/project.service';
import ViewTable from '../../components/ViewTable';
-import { Link } from 'react-router-dom/cjs/react-router-dom.min';
+// import { Link } from 'react-router-dom/cjs/react-router-dom.min';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
export class ProjectList extends Component{
constructor(props){
@@ -71,7 +72,7 @@ export class ProjectList extends Component{
render(){
return(
<>
- <div className="p-grid">
+ {/*<div className="p-grid">
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Project - List </h2>
</div>
@@ -80,7 +81,8 @@ export class ProjectList extends Component{
<i className="fa fa-plus-square" style={{marginTop: "10px"}}></i>
</Link>
</div>
- </div>
+ </div> */}
+ <PageHeader location={this.props.location} title={'Project - List'} actions={[{icon: 'fa-plus-square',title:'Click to Add Project', props:{pathname: '/project/create' }}]}/>
{this.state.isLoading? <AppLoader /> : this.state.isprocessed &&
<ViewTable
data={this.state.projectlist}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
index 2ede26034deb218bf3ba36f0049ada765236d2a9..37c03871c0e9d32442349be2a94466be8efe7f47 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
@@ -8,6 +8,7 @@ import { Chips } from 'primereact/chips';
import ResourceDisplayList from './ResourceDisplayList';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
import ProjectService from '../../services/project.service';
import UnitConverter from '../../utils/unit.converter';
@@ -20,6 +21,7 @@ export class ProjectView extends Component {
super(props);
this.state = {
isLoading: true,
+ project:'',
};
if (this.props.match.params.id) {
this.state.projectId = this.props.match.params.id;
@@ -75,7 +77,7 @@ export class ProjectView extends Component {
return (
<React.Fragment>
- <div className="p-grid">
+ { /*} <div className="p-grid">
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Project - Details </h2>
</div>
@@ -90,7 +92,8 @@ export class ProjectView extends Component {
</Link>
</div>
}
- </div>
+ </div> */}
+ <PageHeader location={this.props.location} title={'Project - View'} actions={[{icon: 'fa-edit',title:'Click to Edit Project', props : { pathname: `/project/edit/${this.state.project.name}`, state: {id: this.state.project?this.state.project.name:''&& this.state.project}}},{icon:'fa-times',title: 'Click to Close Project View', props : { pathname: `/project`}}]}/>
{ this.state.isLoading && <AppLoader /> }
{ this.state.project &&
<React.Fragment>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index 94684738c10cb3f98a51e90306d7bc27c3cfd3f1..0a6258a315d9c1b44aeed07cf9dbefdcd497b5fc 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -36,9 +36,11 @@ class SchedulingUnitList extends Component{
"Duration":"filter-input-50",
"Type": "filter-input-75"
}],
- defaultSortColumn: [{id: "Name", desc: false},{id: "Created Date", desc: false}],
+ defaultSortColumn: [{id: "Name", desc: false}],
}
}
+
+
async getSchedulingUnitList () {
const bluePrint = await ScheduleService.getSchedulingUnitBlueprint();
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index 85fe51d31a33c8bc1ece62bb0c882394be43f44c..a2af2edb155edd28f6de0001ee375d029fcd359f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -1,9 +1,10 @@
import React, { Component } from 'react'
-import {Link} from 'react-router-dom'
+// import {Link} from 'react-router-dom'
import 'primeflex/primeflex.css';
import { Chips } from 'primereact/chips';
import AppLoader from "./../../layout/components/AppLoader";
+import PageHeader from '../../layout/components/PageHeader';
import ViewTable from './../../components/ViewTable';
import ScheduleService from '../../services/schedule.service';
@@ -105,7 +106,7 @@ class ViewSchedulingUnit extends Component{
render(){
return(
<>
- <div className="p-grid">
+ {/*} <div className="p-grid">
<div className="p-col-10">
<h2>Scheduling Unit - Details </h2>
</div>
@@ -114,12 +115,13 @@ class ViewSchedulingUnit extends Component{
style={{float:'right'}}>
<i className="fa fa-times" style={{marginTop: "10px", marginLeft: '5px'}}></i>
</Link>
- {/* <Link to={{ pathname: '/schedulingunit/edit', state: {id: this.state.scheduleunit?this.state.scheduleunit.id:''}}} title="Edit"
+ <Link to={{ pathname: '/schedulingunit/edit', state: {id: this.state.scheduleunit?this.state.scheduleunit.id:''}}} title="Edit"
style={{float:'right'}}>
<i className="fa fa-edit" style={{marginTop: "10px"}}></i>
- </Link> */}
- </div>
+ </Link>
</div>
+ </div> */}
+ <PageHeader location={this.props.location} title={'Scheduling Unit - Details'} actions={[{icon: 'fa-times',title:'Click to Close Scheduling Unit View', props : { pathname: '/schedulingunit'}}]}/>
{ this.state.isLoading ? <AppLoader/> :this.state.scheduleunit &&
<>
<div className="main-content">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js
index 062317b2127f42ca3115e39fba3964121f83f3c4..2d0364fdcf3d74ea08a0c3fd29031fdc36b7fc03 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js
@@ -1,5 +1,6 @@
import React, {Component} from 'react';
import SchedulingUnitList from './SchedulingUnitList';
+import PageHeader from '../../layout/components/PageHeader';
export class Scheduling extends Component {
constructor(props){
@@ -14,7 +15,7 @@ export class Scheduling extends Component {
render() {
return (
<>
- <h2>Scheduling Unit - List</h2>
+ <PageHeader location={this.props.location} title={'Scheduling Unit - List'}/>
{this.state.scheduleunit &&
<SchedulingUnitList /> }
</>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
index f978f5907620d28130f89f5893c110d3344ca6ba..e27a10133358176a42bc1e5fd38154c1eee6fff9 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
@@ -12,6 +12,7 @@ import Jeditor from '../../components/JSONEditor/JEditor';
import TaskService from '../../services/task.service';
import AppLoader from "./../../layout/components/AppLoader";
+import PageHeader from '../../layout/components/PageHeader';
export class TaskEdit extends Component {
@@ -190,7 +191,7 @@ export class TaskEdit extends Component {
return (
<React.Fragment>
- <div className="p-grid">
+ {/*} <div className="p-grid">
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Task - Edit</h2>
</div>
@@ -200,8 +201,8 @@ export class TaskEdit extends Component {
<i className="fa fa-window-close" style={{marginTop: "10px"}}></i>
</Link>
</div>
- </div>
-
+ </div> */}
+ <PageHeader location={this.props.location} title={'Task - Edit'} actions={[{icon: 'fa-window-close',title:'Click to Close Task Edit Page' ,props : { pathname: `/task/view/draft/${this.state.task?this.state.task.id:''}`}}]}/>
{isLoading ? <AppLoader/> :
<div>
<div className="p-fluid">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
index 920698a47e5783b9dbf2504896800f60100d98b1..d17d9aeeef26500df5affb2114f2aaf0dc89b904 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -7,6 +7,7 @@ import Jeditor from '../../components/JSONEditor/JEditor';
import TaskService from '../../services/task.service';
import { Chips } from 'primereact/chips';
import AppLoader from '../../layout/components/AppLoader';
+import PageHeader from '../../layout/components/PageHeader';
export class TaskView extends Component {
DATE_FORMAT = 'YYYY-MMM-DD HH:mm:ss';
@@ -114,6 +115,22 @@ export class TaskView extends Component {
});
}
+ let actions = [ ];
+ if (this.state.taskType === 'draft') {
+ actions = [{ icon: 'fa-edit',
+ title:'Click to Edit Task',
+ props : { pathname:'/task/edit',
+ state: {taskId: this.state.task?this.state.task.id:''}
+ }
+ },
+ { icon: 'fa-times',
+ title:'Click to Close Task',
+ props : { pathname:'/task' }}];
+ } else {
+ actions = [{ icon: 'fa-lock',
+ title: 'Cannot edit blueprint'}];
+ }
+
// Child component to render predecessors and successors list
const TaskRelationList = ({ list }) => (
<ul className="task-list">
@@ -127,7 +144,7 @@ export class TaskView extends Component {
);
return (
<React.Fragment>
- <div className="p-grid">
+ {/* <div className="p-grid">
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Task - Details </h2>
</div>
@@ -148,7 +165,9 @@ export class TaskView extends Component {
<i className="fa fa-lock" style={{float:"right", marginTop: "10px"}}></i>
}
</div>
- </div>
+ </div> */}
+ <PageHeader location={this.props.location} title={'Task - View'}
+ actions={actions}/>
{ this.state.isLoading? <AppLoader /> : this.state.task &&
<React.Fragment>
<div className="main-content">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
index ffb2aab25212969cdc62f3a7e6855e2ba7e03d1c..82b793387cdfa9072288db1069874521d8ed8d7b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
@@ -16,35 +16,43 @@ import { CycleList, CycleCreate, CycleView, CycleEdit } from './Cycle';
export const routes = [
{
path: "/not-found",
- component: NotFound
+ component: NotFound,
+
},{
path: "/dashboard",
component: Dashboard,
- name: 'Dashboard'
+ name: 'Dashboard',
+ title: 'Dashboard'
},{
path: "/schedulingunit",
component: Scheduling,
- name: 'Scheduling Unit'
+ name: 'Scheduling Unit',
+ title: 'Scheduling Unit - List'
},{
path: "/task",
component: TaskView,
- name: 'Task'
+ name: 'Task',
+ title: 'Task-View'
},{
path: "/task/view",
component: TaskView,
- name: 'Task'
+ name: 'Task',
+ title: 'Task View'
},{
path: "/task/view/:type/:id",
component: TaskView,
- name: 'Task Details'
+ name: 'Task Details',
+ title: 'Task Details'
},{
path: "/task/edit",
component: TaskEdit,
- name: 'Task Edit'
+ name: 'Task Edit',
+ title: 'Task-Edit'
},{
path: "/schedulingunit/view",
component: ViewSchedulingUnit,
- name: 'Scheduling View'
+ name: 'Scheduling View',
+ title: 'Scheduling Unit - Details'
},{
path: "/schedulingunit/view/:type/:id",
component: ViewSchedulingUnit,
@@ -52,44 +60,56 @@ export const routes = [
},{
path: "/project",
component: ProjectList,
- name: 'Project List'
+ name: 'Project List',
+ title: 'Project - List'
},{
path: "/project/create",
component: ProjectCreate,
- name: 'Project Add'
+ name: 'Project Add',
+ title: 'Project - Add'
},{
path: "/project/view",
component: ProjectView,
- name: 'Project View'
+ name: 'Project View',
+ title: 'Project - Details '
},{
path: "/project/view/:id",
component: ProjectView,
- name: 'Project View'
- },{
+ name: 'Project View',
+ title: 'Project - View'
+ },
+ {
path: "/project/edit/:id",
component: ProjectEdit,
- name: 'Project Edit'
- },{
+ name: 'Project Edit',
+ title: 'Project Edit'
+ },
+ {
path: "/cycle/edit/:id",
component: CycleEdit,
- name: 'Cycle Edit'
+ name: 'Cycle Edit',
+ title:'Cycle-Edit'
},{
path: "/cycle/view",
component: CycleView,
- name: 'Cycle View'
+ name: 'Cycle View',
+ title:'Cycle-View'
},{
path: "/cycle/view/:id",
component: CycleView,
- name: 'Cycle View'
+ name: 'Cycle View',
+ title:'Cycle-View'
}, {
path: "/cycle/create",
component: CycleCreate,
- name: 'Cycle Add'
+ name: 'Cycle Add',
+ title:'Cycle-Add'
},
{
path: "/cycle",
component: CycleList,
- name: 'Cycle List'
+ name: 'Cycle List',
+ title:'Cycle-List'
},
];