Skip to content

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

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

Binding Manual Reminder

See merge request !1671
parents 20594a10 bce4d631
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 15 deletions
src/container/ProgressReport/ProgressReport.js
View file @ f4b22c3e
...@@ -178,9 +178,10 @@ class ReportProgress extends Component { ...@@ -178,9 +178,10 @@ class ReportProgress extends Component {
dataTable.push([ dataTable.push([
item.company_name, item.company_name,
report, report,
"Sent, 17 Oct 2022", item.automatic_reminder_report_date,
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.company_id, item.company_id,
"19 Oct 2022"
]) ])
}) })
// data.map((item,index) => { // data.map((item,index) => {
...@@ -230,7 +231,11 @@ class ReportProgress extends Component { ...@@ -230,7 +231,11 @@ class ReportProgress extends Component {
report.push({report_name: 'Operating Indicator', status_report: item.operating_indicator}, {report_name: 'Monthly Status', status_report: item.monthly_status}) report.push({report_name: 'Operating Indicator', status_report: item.operating_indicator}, {report_name: 'Monthly Status', status_report: item.monthly_status})
dataTable.push([ dataTable.push([
item.company_name, item.company_name,
report report,
item.automatic_reminder_report_date,
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.company_id,
]) ])
}) })
this.setState({dataTable, loading: false}) this.setState({dataTable, loading: false})
...@@ -262,7 +267,11 @@ class ReportProgress extends Component { ...@@ -262,7 +267,11 @@ class ReportProgress extends Component {
report.push({report_name: 'Operating Indicator', status_report: item.operating_indicator}, {report_name: 'Rolling Status', status_report: item.rolling_status}) report.push({report_name: 'Operating Indicator', status_report: item.operating_indicator}, {report_name: 'Rolling Status', status_report: item.rolling_status})
dataTable.push([ dataTable.push([
item.company_name, item.company_name,
report report,
item.automatic_reminder_report_date,
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.company_id,
]) ])
}) })
this.setState({dataTable, loading: false}) this.setState({dataTable, loading: false})
...@@ -302,7 +311,11 @@ class ReportProgress extends Component { ...@@ -302,7 +311,11 @@ class ReportProgress extends Component {
{report_name: 'OLPA Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission}) {report_name: 'OLPA Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission})
dataTable.push([ dataTable.push([
item.company_name, item.company_name,
report report,
item.automatic_reminder_report_date,
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.company_id,
]) ])
}) })
// data.map((item,index) => { // data.map((item,index) => {
......
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