Skip to content

T
Tia-dev
Commit 404c3a3e authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'dev/riri' into 'ENV-DEV' 

Fixing CF dan Reminder

See merge request !1770
parents 9101378a d93582f2
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 47 deletions
src/container/ProgressReport/ProgressReport.js
View file @ 404c3a3e
...@@ -187,6 +187,7 @@ class ReportProgress extends Component { ...@@ -187,6 +187,7 @@ class ReportProgress extends Component {
item.automatic_reminder_report_date, item.automatic_reminder_report_date,
item.manual_reminder_report_status, item.manual_reminder_report_status,
item.manual_reminder_report_date, item.manual_reminder_report_date,
item.submission_status,
item.company_id, item.company_id,
]) ])
}) })
...@@ -241,6 +242,7 @@ class ReportProgress extends Component { ...@@ -241,6 +242,7 @@ class ReportProgress extends Component {
item.automatic_reminder_report_date, item.automatic_reminder_report_date,
item.manual_reminder_report_status, item.manual_reminder_report_status,
item.manual_reminder_report_date, item.manual_reminder_report_date,
item.monthly_status,
item.company_id, item.company_id,
]) ])
}) })
...@@ -277,6 +279,7 @@ class ReportProgress extends Component { ...@@ -277,6 +279,7 @@ class ReportProgress extends Component {
item.automatic_reminder_report_date, item.automatic_reminder_report_date,
item.manual_reminder_report_status, item.manual_reminder_report_status,
item.manual_reminder_report_date, item.manual_reminder_report_date,
item.rolling_status,
item.company_id, item.company_id,
]) ])
}) })
...@@ -321,6 +324,7 @@ class ReportProgress extends Component { ...@@ -321,6 +324,7 @@ class ReportProgress extends Component {
item.automatic_reminder_report_date, item.automatic_reminder_report_date,
item.manual_reminder_report_status, item.manual_reminder_report_status,
item.manual_reminder_report_date, item.manual_reminder_report_date,
item.outlook_status,
item.company_id, item.company_id,
]) ])
}) })
......
src/container/ProgressReport/TableProgressReport.js
View file @ 404c3a3e
...@@ -123,7 +123,7 @@ export default class TableProgressReport extends Component { ...@@ -123,7 +123,7 @@ export default class TableProgressReport extends Component {
render() { render() {
let dataTable2 = this.props.dataTable; let dataTable2 = this.props.dataTable;
// console.log(this.props); // console.log(dataTable2);
const handleValue = (tableMeta, itemName) => { const handleValue = (tableMeta, itemName) => {
let value = tableMeta.rowData[1].filter((val) => val.report_name == itemName) let value = tableMeta.rowData[1].filter((val) => val.report_name == itemName)
// console.log(itemName) // console.log(itemName)
...@@ -201,7 +201,6 @@ export default class TableProgressReport extends Component { ...@@ -201,7 +201,6 @@ export default class TableProgressReport extends Component {
), ),
setCellProps: () => ({ style2 }), setCellProps: () => ({ style2 }),
customBodyRender: (value, tableMeta, updateValue) => { customBodyRender: (value, tableMeta, updateValue) => {
// console.log(tableMeta);
return ( return (
<div className="grid grid-3x"> <div className="grid grid-3x">
<div className="column-1 grid grid-4x" style={{ ...style2, fontSize: 12, position: "sticky" }}> <div className="column-1 grid grid-4x" style={{ ...style2, fontSize: 12, position: "sticky" }}>
...@@ -237,6 +236,7 @@ export default class TableProgressReport extends Component { ...@@ -237,6 +236,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div> </div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
<button <button
type="button" type="button"
...@@ -248,6 +248,10 @@ export default class TableProgressReport extends Component { ...@@ -248,6 +248,10 @@ export default class TableProgressReport extends Component {
</div> </div>
</button> </button>
</div> </div>
:
"-"
}
</div> </div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div>
...@@ -399,6 +403,7 @@ export default class TableProgressReport extends Component { ...@@ -399,6 +403,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div> </div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
<button <button
type="button" type="button"
...@@ -410,6 +415,10 @@ export default class TableProgressReport extends Component { ...@@ -410,6 +415,10 @@ export default class TableProgressReport extends Component {
</div> </div>
</button> </button>
</div> </div>
:
"-"
}
</div> </div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div>
...@@ -545,6 +554,7 @@ export default class TableProgressReport extends Component { ...@@ -545,6 +554,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div> </div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
<button <button
type="button" type="button"
...@@ -556,6 +566,10 @@ export default class TableProgressReport extends Component { ...@@ -556,6 +566,10 @@ export default class TableProgressReport extends Component {
</div> </div>
</button> </button>
</div> </div>
:
"-"
}
</div> </div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div>
...@@ -691,6 +705,7 @@ export default class TableProgressReport extends Component { ...@@ -691,6 +705,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div> </div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
<button <button
type="button" type="button"
...@@ -702,6 +717,10 @@ export default class TableProgressReport extends Component { ...@@ -702,6 +717,10 @@ export default class TableProgressReport extends Component {
</div> </div>
</button> </button>
</div> </div>
:
"-"
}
</div> </div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}> <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div> <div style={{ textAlign: 'center' }}>{tableMeta.rowData[4]}</div>
......
src/container/Reports/TableSubHolding.js
View file @ 404c3a3e
...@@ -19053,7 +19053,8 @@ export default class TableSubHolding extends Component { ...@@ -19053,7 +19053,8 @@ export default class TableSubHolding extends Component {
else { else {
persenOl = ol / fy persenOl = ol / fy
} }
value = String(type).includes('MTD') ? persenMtd : String(type).includes('YTD') ? persenYtd : String(type).includes('Quarter') ? persenQuarter : persenFy // console.log(type);
value = String(type).includes('MTD') ? persenMtd : String(type).includes('YTD') ? persenYtd : String(type).includes('Quarter') ? persenQuarter : String(type).includes('OL') ? persenOl : persenFy
value = (value == null || value == Infinity || value == -Infinity || isNaN(value) ? 0 : Number(value * 100).toFixed(1)) value = (value == null || value == Infinity || value == -Infinity || isNaN(value) ? 0 : Number(value * 100).toFixed(1))
// value = isNaN(value) || value == 'Infinity' || value == '-Infinity' ? (value == '' || value == 0 ? -0 : 0) : (value== '' || value == 0 ? persenFy * -100 : persenFy * 100) // value = isNaN(value) || value == 'Infinity' || value == '-Infinity' ? (value == '' || value == 0 ? -0 : 0) : (value== '' || value == 0 ? persenFy * -100 : persenFy * 100)
} else { } else {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment