Browse Source

bug fix

pull/2/head
Muhammad Sulaiman Yusuf 2 years ago
parent
commit
38a63f9e5d
  1. 6
      src/components/BottomModal/BottomModal.js
  2. 2
      src/views/Dashboard/DashboardCustomer.js

6
src/components/BottomModal/BottomModal.js

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

2
src/views/Dashboard/DashboardCustomer.js

@ -115,7 +115,7 @@ const DashboardCustomer = () => {
const payload = { const payload = {
"project_id": PROJECT_ID.toString(), "project_id": PROJECT_ID.toString(),
"period": "week", "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) const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response)
console.log('getSCurve', result); console.log('getSCurve', result);

Loading…
Cancel
Save