diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
index 2d7f62f9894b16c283435d6a7fd2f3a3909df957..6948ab85a4d1b0ce987dc50f7e3e81454287b5c3 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
@@ -12,7 +12,7 @@ export default ({ title, subTitle, actions, ...props}) => {
return;
}
setPage(currentRoute);
- }, []);
+ }, [props.location.pathname]);
const onClickLink = (action) => {
console.log('Hi')
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 ee21f248086f1890419c0b3f8bb3370625da0ad2..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,12 +1,12 @@
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';
import {Dropdown} from 'primereact/dropdown';
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 moment from 'moment'
import _ from 'lodash';
@@ -327,9 +327,8 @@ export class CycleCreate extends Component {
return (
<React.Fragment>
+ <Growl ref={(el) => this.growl = el} />
{ /*<div className="p-grid">
- <Growl ref={(el) => this.growl = el} />
-
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Cycle - Add</h2>
</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 86e0e445fbf039ae556a1570dd52260ec0a88501..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'
@@ -361,9 +361,9 @@ export class CycleEdit extends Component {
}
return (
<React.Fragment>
+ <Growl ref={(el) => this.growl = el} />
{/*} <div className="p-grid">
- <Growl ref={(el) => this.growl = el} />
-
+
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Cycle - Edit</h2>
</div>
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 817365c3eb4119f8a2b4828fc74166d34d3df838..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,6 +1,6 @@
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';
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 0329334665dc4b04cced14d8d5c64e72eec69a3a..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';
@@ -336,9 +336,9 @@ export class ProjectCreate extends Component {
return (
<React.Fragment>
+ <Growl ref={(el) => this.growl = el} />
{ /* <div className="p-grid">
- <Growl ref={(el) => this.growl = el} />
-
+
<div className="p-col-10 p-lg-10 p-md-10">
<h2>Project - Add</h2>
</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 f86c6f208e36d45e0e62b18ec05c56eaf5f8ee62..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';
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 02782b0b0e190dbd75febb2ed11c592f462ef122..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,7 +1,7 @@
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';
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 b12040919f2f4faa1ca1424ebdc0ce06a05342f0..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,5 +1,5 @@
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';