Browse Source

Merge pull request 'staging' (#73) from staging into master

Reviewed-on: ordo/adw-frontend#73
pull/2/head
ibnu 1 year ago
parent
commit
58b63b0d9a
  1. 2
      src/views/Dashboard/DashboardProject.js
  2. 11
      src/views/SimproV2/CreatedProyek/ImportActivity/index.js

2
src/views/Dashboard/DashboardProject.js

@ -289,7 +289,7 @@ const DashboardProject = () => {
} }
let now = new Date().toISOString().slice(0, 10); let now = new Date().toISOString().slice(0, 10);
let dates = result.data.data[0].data?.date; 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) { if (n < 0) {
n = dates.length - 1; n = dates.length - 1;
} }

11
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 extractedRow[prop] = columnData
} }

Loading…
Cancel
Save