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

TMSS-1005: Addd WeekView in Sidebar and made Weekview as default start page

parent 19ff618e
No related branches found
No related tags found
2 merge requests!634WIP: COBALT commissioning delta,!564Resolves TMSS-945
...@@ -49,7 +49,7 @@ class App extends Component { ...@@ -49,7 +49,7 @@ class App extends Component {
mobileMenuActive: localStorage.getItem('mobileMenuActive') === 'true' ? true : false, mobileMenuActive: localStorage.getItem('mobileMenuActive') === 'true' ? true : false,
authenticated: true, authenticated: true,
findObjectPlaceholder: 'Sub Task', findObjectPlaceholder: 'Sub Task',
redirect: window.location.pathname, redirect: window.location.pathname === '/'? '/su/timelineview/week': window.location.pathname,
isLogin: true isLogin: true
}; };
this.onWrapperClick = this.onWrapperClick.bind(this); this.onWrapperClick = this.onWrapperClick.bind(this);
...@@ -68,6 +68,7 @@ class App extends Component { ...@@ -68,6 +68,7 @@ class App extends Component {
{label: 'Scheduling Units', icon: 'pi pi-fw pi-calendar', to:'/schedulingunit',section: 'schedulingunit'}, {label: 'Scheduling Units', icon: 'pi pi-fw pi-calendar', to:'/schedulingunit',section: 'schedulingunit'},
{label: 'Tasks', icon: 'pi pi-fw pi-check-square', to:'/task'}, {label: 'Tasks', icon: 'pi pi-fw pi-check-square', to:'/task'},
{label: 'Workflow', icon: 'pi pi-sitemap', to:'/su/workflow',section: 'workflow'}, {label: 'Workflow', icon: 'pi pi-sitemap', to:'/su/workflow',section: 'workflow'},
{label: 'Week View', icon: 'fab fa fa-calendar-alt', to:'/su/timelineview/week',section: 'su/timelineview/week'},
{label: 'Timeline', icon: 'pi pi-fw pi-clock', to:'/su/timelineview',section: 'su/timelineview'}, {label: 'Timeline', icon: 'pi pi-fw pi-clock', to:'/su/timelineview',section: 'su/timelineview'},
{label: 'Reports', icon: 'pi pi-fw pi-chart-bar', to:'/reports',section: 'reports'}, {label: 'Reports', icon: 'pi pi-fw pi-chart-bar', to:'/reports',section: 'reports'},
]; ];
...@@ -183,6 +184,12 @@ class App extends Component { ...@@ -183,6 +184,12 @@ class App extends Component {
}; };
} }
componentDidUpdate(prevProps, prevState) {
if(window.location.pathname === '/'){
this.setState({redirect : '/su/timelineview/week'})
}
}
onBackButtonEvent = (e) => { onBackButtonEvent = (e) => {
e.preventDefault(); e.preventDefault();
if (this.state.isEditDirty) { if (this.state.isEditDirty) {
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
i { i {
font-size: 18px; font-size: 18px;
vertical-align: middle; vertical-align: middle;
font-weight:lighter;
} }
span { span {
......
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