Merge pull request 'staging upload 23-05-19' (#43) from staging into master

Reviewed-on: ordo/adw-frontend#43

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

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