From 62ac39ef6e131f01473272931d6eff2ad481446b Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 1 Aug 2023 15:30:12 +0700 Subject: [PATCH 1/2] Fix handling default value --- .../SimproV2/CreatedProyek/ImportActivity/index.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js index 2307554..4e20276 100644 --- a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js +++ b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js @@ -203,6 +203,17 @@ const ImportActivity = ({ params }) => { } } + if (prop == 'level') { + if (columnData == null) { + columnData = 1; + } + } + + if (prop == 'name') { + if (columnData == null) { + columnData = "New Activity"; + } + } extractedRow[prop] = columnData } From cacc6cc7c5c2ed7fbb3537b3f3a9e869288bac0f Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Thu, 3 Aug 2023 08:34:44 +0700 Subject: [PATCH 2/2] Fix planning progress bar range --- src/views/Dashboard/DashboardProject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js index 24b6428..d59f04d 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -289,7 +289,7 @@ const DashboardProject = () => { } let now = new Date().toISOString().slice(0, 10); let dates = result.data.data[0].data?.date; - let n = dates.findIndex(element => new Date(now) < new Date(element[0])) - 1; + let n = dates.findIndex(element => new Date(now) < new Date(element[0])); if (n < 0) { n = dates.length - 1; }