bug fix

src/components/BottomModal/BottomModal.js

@@ -44,8 +44,9 @@ const BottomModal = ({title, tableHeader, tableData, closeModal, isReady}) => {
             if (key === 'project_name') {
                 let URL = `/#/dashboard-project/${item['id']}/${item['last_gantt_id']}`;
                 row.push(<td><a href={URL}>{item[key]}</a></td>)
-            }
+			} else if(key === 'last_gantt_id') {
-            else {
+			} else if(key === 'id') {
+			} else {
                 row.push(<td>{item[key]}</td>)
             }
         })
@@ -58,7 +59,6 @@ const BottomModal = ({title, tableHeader, tableData, closeModal, isReady}) => {
                 <Table size='sm'>
                     <thead style={{margin: 0, backgroundColor: '#888888', color: '#FFFFFF', fontSize: 12}}>
                         <tr key={'thead'}>
-                            <th>#</th>
                             {tableHeader && tableHeader.length > 0 &&
                                 tableHeader.map((item, idx) => (
                                     <th key={idx}>{item.title}</th>
@@ -78,7 +78,7 @@ const BottomModal = ({title, tableHeader, tableData, closeModal, isReady}) => {
                 </Table>
             )
         }
-        
+
         return (
             // <Table>
             //     <tr>
@@ -174,4 +174,4 @@ const BottomModal = ({title, tableHeader, tableData, closeModal, isReady}) => {
     )
 }
 
-export default BottomModal;
+export default BottomModal;

src/views/Dashboard/DashboardCustomer.js

@@ -115,7 +115,7 @@ const DashboardCustomer = () => {
         const payload = {
             "project_id": PROJECT_ID.toString(),
             "period": "week",
-            "end_date": moment(new Date()).format('YYYY-MM-DD')
+            // "end_date": moment(new Date()).format('YYYY-MM-DD')
         }
         const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response)
         console.log('getSCurve', result);