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; } 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 }