Skip to content

T
Tia-dev
Commit f003bcdd authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

tambahan column Progress Report

See merge request !2401
parents b469bc45 d645da3b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 23 deletions
src/container/ProgressReport/ProgressReport.js
View file @ f003bcdd
......@@ -183,7 +183,9 @@ class ReportProgress extends Component {
})
report.push(
{report_name: 'Operating Indicator', status_report: statusOI},
{report_name: 'Submission Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission})
{report_name: 'Report Finance Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission},
{report_name: 'Report CAT Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission}
)
dataTable.push([
item.company_name,
report,
......@@ -239,7 +241,11 @@ class ReportProgress extends Component {
let data = response.data.data
data.map((item,index) => {
let report = item.report
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: 'Report Finance Status', status_report: item.monthly_status},
{report_name: 'Report CAT Status', status_report: item.monthly_status}
)
dataTable.push([
item.company_name,
report,
......@@ -277,7 +283,11 @@ class ReportProgress extends Component {
let data = response.data.data
data.map((item,index) => {
let report = item.report
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: 'Report Finance Status', status_report: item.rolling_status},
{report_name: 'Report CAT Status', status_report: item.rolling_status}
)
dataTable.push([
item.company_name,
report,
......@@ -323,7 +333,9 @@ class ReportProgress extends Component {
})
report.push(
{report_name: 'Operating Indicator', status_report: statusOI},
{report_name: 'OLPA Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission})
{report_name: 'Report Finance Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission},
{report_name: 'Report CAT Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission}
)
dataTable.push([
item.company_name,
report,
......
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