diff --git a/src/routes.js b/src/routes.js index 715634f..6b9cef4 100644 --- a/src/routes.js +++ b/src/routes.js @@ -57,6 +57,7 @@ const routes = [ { path: '/dashboard-project/:PROJECT_ID/:GANTT_ID', exact: true, name: 'Dashboard Project', component: DashboardProject }, { path: '/projects', exact: true, name: 'Projects', component: CreatedProyek }, { path: '/projects/:id/import/activity', exact: true, name: 'Gantt Import Activity', component: GanttImportActivity }, + { path: '/projects/:id/:project/import/activity', exact: true, name: 'Gantt Import Activity', component: GanttImportActivity }, { path: '/projects/:id/:project/gantt', exact: true, name: 'Gantt', component: Gantt }, { path: '/human-resource', exact: true, name: 'Human Resource', component: ResourceWorker }, { path: '/material-resource', exact: true, name: 'Material Resource', component: ResourceMaterial }, diff --git a/src/views/Dashboard/Components/index.js b/src/views/Dashboard/Components/index.js index 3310481..ab99df1 100644 --- a/src/views/Dashboard/Components/index.js +++ b/src/views/Dashboard/Components/index.js @@ -64,8 +64,13 @@ export const ProgressPlanningBar = ({progress}) => { ) } } - else { - return null; + else { + return ( +
+
+ Planning : 0% +
+ ) } } @@ -88,7 +93,12 @@ export const ProgressActualBar = ({progress}) => { } } else { - return null; + return ( +
+
+ Actual : 0% +
+ ) } } @@ -163,4 +173,4 @@ export const PopupContent = (item) => { ${item.report_notes} `; -} \ No newline at end of file +} diff --git a/src/views/SimproV2/CreatedProyek/DialogGantt.js b/src/views/SimproV2/CreatedProyek/DialogGantt.js index d52819f..7fb98d7 100644 --- a/src/views/SimproV2/CreatedProyek/DialogGantt.js +++ b/src/views/SimproV2/CreatedProyek/DialogGantt.js @@ -130,7 +130,7 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName {" "} - + {" "}