|
|
|
@ -57,9 +57,8 @@ const columnToIndexs = {
|
|
|
|
|
weight: 4, |
|
|
|
|
start_date: 5, |
|
|
|
|
end_date: 6, |
|
|
|
|
picKit: 7, |
|
|
|
|
picOwner: 8, |
|
|
|
|
duration: 9 |
|
|
|
|
nik: 7, |
|
|
|
|
duration: 8 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const ExcelDateToJSDate = (date) => { |
|
|
|
@ -133,7 +132,10 @@ const ImportActivity = ({ params }) => {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(prop == 'weight'){ |
|
|
|
|
columnData = Math.round(columnData * 100) |
|
|
|
|
if (columnData == null) { |
|
|
|
|
columnData = 0; |
|
|
|
|
} |
|
|
|
|
columnData = columnData * 100 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
extractedRow[prop] = columnData |
|
|
|
@ -238,18 +240,13 @@ const ImportActivity = ({ params }) => {
|
|
|
|
|
title: 'Duration', |
|
|
|
|
dataIndex: 'duration', |
|
|
|
|
key: 'duration', |
|
|
|
|
align: 'right', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: 'PIC KIT', |
|
|
|
|
dataIndex: 'picKit', |
|
|
|
|
key: 'picKit', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
title: 'PIC Owner', |
|
|
|
|
dataIndex: 'picOwner', |
|
|
|
|
key: 'picOwner', |
|
|
|
|
}, |
|
|
|
|
title: 'NIK', |
|
|
|
|
dataIndex: 'nik', |
|
|
|
|
key: 'nik', |
|
|
|
|
align: 'right', |
|
|
|
|
} |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
if (isMovePage) { |
|
|
|
|