Browse Source

Merge pull request 'Update template' (#42) from dev-wahyu into staging

Reviewed-on: ordo/adw-frontend#42
Reviewed-by: ibnu <ibnu@mail.com>
pull/2/head
ibnu 2 years ago
parent
commit
7cc8d501e9
  1. BIN
      public/template/template_activity.xlsx
  2. BIN
      public/template/template_activity_old.xlsx
  3. 14
      src/views/SimproV2/CreatedProyek/ImportActivity/index.js

BIN
public/template/template_activity.xlsx

Binary file not shown.

BIN
public/template/template_activity_old.xlsx

Binary file not shown.

14
src/views/SimproV2/CreatedProyek/ImportActivity/index.js

@ -141,11 +141,15 @@ const ImportActivity = ({ params }) => {
// convert excel's DATEVALUE // convert excel's DATEVALUE
if(["start_date"].includes(prop)){ if(["start_date"].includes(prop)){
columnData = ExcelDateToJSDate(columnData) if (columnData) {
columnData = ExcelDateToJSDate(columnData)
}
} }
if(["end_date"].includes(prop)){ if(["end_date"].includes(prop)){
columnData = ExcelDateToJSDateEndDay(columnData) if (columnData) {
columnData = ExcelDateToJSDateEndDay(columnData)
}
} }
if(prop == 'weight'){ if(prop == 'weight'){
@ -253,7 +257,11 @@ const ImportActivity = ({ params }) => {
dataIndex: 'end_date', dataIndex: 'end_date',
key: 'end_date', key: 'end_date',
render: (text, record) => { render: (text, record) => {
return <span>{text.substring(0,8)}</span> if(text){
return <span>{text.substring(0,8)}</span>
} else {
return <span></span>
}
} }
}, },
{ {

Loading…
Cancel
Save