Skip to content

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

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

issue ratio

See merge request !1773
parents ec5d2f93 7b0a197c
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 15 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 63e741f3
......@@ -480,17 +480,17 @@ export default class BalanceSheetMR extends Component {
// this.props.onClickClose()
if (type == 'submitted') {
this.props.saveToMonthlyReport('BS')
let bodyRatioBs = {
"report": 'ratio',
"monthlyReportId": this.props.monthlyReportId,
"periode": this.props.periode,
"companyId": this.props.company.company_id,
"months": this.props.month.month_id
}
api.create().triggerRatioFromLOCF(bodyRatioBs).then((res) => {
console.log(res)
this.setState({ loading: false })
})
// let bodyRatioBs = {
// "report": 'ratio',
// "monthlyReportId": this.props.monthlyReportId,
// "periode": this.props.periode,
// "companyId": this.props.company.company_id,
// "months": this.props.month.month_id
// }
// api.create().triggerRatioFromLOCF(bodyRatioBs).then((res) => {
// console.log(res)
// this.setState({ loading: false })
// })
} else {
this.props.saveToMonthlyReport()
}
......
src/container/ProgressReport/ProgressReport.js
View file @ 63e741f3
......@@ -188,6 +188,7 @@ class ReportProgress extends Component {
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.submission_status,
item.manual_reminder_report_button,
item.company_id,
])
})
......@@ -243,6 +244,7 @@ class ReportProgress extends Component {
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.monthly_status,
item.manual_reminder_report_button,
item.company_id,
])
})
......@@ -280,6 +282,7 @@ class ReportProgress extends Component {
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.rolling_status,
item.manual_reminder_report_button,
item.company_id,
])
})
......@@ -325,6 +328,7 @@ class ReportProgress extends Component {
item.manual_reminder_report_status,
item.manual_reminder_report_date,
item.outlook_status,
item.manual_reminder_report_button,
item.company_id,
])
})
......
src/container/ProgressReport/TableProgressReport.js
View file @ 63e741f3
......@@ -236,7 +236,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
{tableMeta.rowData[5] === "OPEN" && tableMeta.rowData[6] === 1 ?
<div style={{ textAlign: 'center' }}>
<button
type="button"
......@@ -403,7 +403,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
{tableMeta.rowData[5] === "OPEN" && tableMeta.rowData[6] === 1 ?
<div style={{ textAlign: 'center' }}>
<button
type="button"
......@@ -554,7 +554,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
{tableMeta.rowData[5] === "OPEN" && tableMeta.rowData[6] === 1 ?
<div style={{ textAlign: 'center' }}>
<button
type="button"
......@@ -705,7 +705,7 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{tableMeta.rowData[2]}</div>
</div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, width: 143 }}>
{tableMeta.rowData[5] === "OPEN" ?
{tableMeta.rowData[5] === "OPEN" && tableMeta.rowData[6] === 1 ?
<div style={{ textAlign: 'center' }}>
<button
type="button"
......
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