Commit d93582f2 authored by Riri Novita's avatar Riri Novita

Fixing CF dan Reminder

parent 9101378a
...@@ -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,
]) ])
}) })
......
...@@ -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