Skip to content

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

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

Fix Progress Report

See merge request !2404
parents 3111c9f1 62a65736
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 13 deletions
src/container/ProgressReport/ProgressReport.js
View file @ efb27b7f
......@@ -175,7 +175,8 @@ class ReportProgress extends Component {
let data = response.data.data
data.map((item,index) => {
let report = []
let statusSubmission = String(item.submission_status).toLocaleUpperCase()
let statusSubmissionCAT = String(item.submission_status_cat).toLocaleUpperCase()
let statusSubmissionFinance = String(item.submission_status_finance).toLocaleUpperCase()
let statusOI = String(item.operating_indicator).toLocaleUpperCase()
item.report.map((items,index) => {
let statusReport = String(items.status_report).toLocaleUpperCase()
......@@ -183,8 +184,8 @@ class ReportProgress extends Component {
})
report.push(
{report_name: 'Operating Indicator', status_report: statusOI},
{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}
{report_name: 'Report Finance Status', status_report: (statusSubmissionFinance == 'APPROVED' || statusSubmissionFinance == 'REVISION' || statusSubmissionFinance == 'COMPLETED') ? (statusSubmissionFinance + ' - ' + item.submissionStatusDate) : statusSubmissionFinance},
{report_name: 'Report CAT Status', status_report: (statusSubmissionCAT == 'APPROVED' || statusSubmissionCAT == 'REVISION' || statusSubmissionCAT == 'COMPLETED') ? (statusSubmissionCAT + ' - ' + item.submissionStatusDate) : statusSubmissionCAT}
)
dataTable.push([
item.company_name,
......@@ -243,8 +244,8 @@ class ReportProgress extends Component {
let report = item.report
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}
{report_name: 'Report Finance Status', status_report: item.monthly_status_finance},
{report_name: 'Report CAT Status', status_report: item.monthly_status_cat}
)
dataTable.push([
item.company_name,
......@@ -285,8 +286,8 @@ class ReportProgress extends Component {
let report = item.report
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}
{report_name: 'Report Finance Status', status_report: item.rolling_status_finance},
{report_name: 'Report CAT Status', status_report: item.rolling_status_cat}
)
dataTable.push([
item.company_name,
......@@ -325,7 +326,8 @@ class ReportProgress extends Component {
let data = response.data.data
data.map((item,index) => {
let report = []
let statusSubmission = String(item.outlook_status).toLocaleUpperCase()
let statusSubmissionFinance = String(item.outlook_status_finance).toLocaleUpperCase()
let statusSubmissionCAT = String(item.outlook_status_cat).toLocaleUpperCase()
let statusOI = String(item.operating_indicator).toLocaleUpperCase()
item.report.map((items,index) => {
let statusReport = String(items.status_report).toLocaleUpperCase()
......@@ -333,8 +335,8 @@ class ReportProgress extends Component {
})
report.push(
{report_name: 'Operating Indicator', status_report: statusOI},
{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}
{report_name: 'Report Finance Status', status_report: (statusSubmissionFinance == 'APPROVED' || statusSubmissionFinance == 'REVISION' || statusSubmissionFinance == 'COMPLETED') ? (statusSubmissionFinance + ' - ' + item.submissionStatusDate) : statusSubmissionFinance},
{report_name: 'Report CAT Status', status_report: (statusSubmissionCAT == 'APPROVED' || statusSubmissionCAT == 'REVISION' || statusSubmissionCAT == 'COMPLETED') ? (statusSubmissionCAT + ' - ' + item.submissionStatusDate) : statusSubmissionCAT}
)
dataTable.push([
item.company_name,
......
src/container/ProgressReport/TableProgressReport.js
View file @ efb27b7f
......@@ -407,17 +407,17 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{handleValue(tableMeta, 'Cash Flow')}</div>
</div>
</div>
<div className="column-3 grid grid-3x" style={{ ...style2, fontSize: 12, position: "sticky" }}>
<div className="column-3 grid grid-4x" style={{ ...style2, fontSize: 12, position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div style={{ textAlign: 'center' }}>{handleValue(tableMeta, 'CAT')}</div>
</div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div style={{ textAlign: 'center' }}>{handleValue(tableMeta, 'Report Finance Status')}</div>
</div>
<div className="column-2" 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' }}>{handleValue(tableMeta, 'Report CAT Status')}</div>
</div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
<div style={{ textAlign: 'center' }}>{handleValue(tableMeta, 'Operating Indicator')}</div>
</div>
</div>
......
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