Skip to content

T
Tia-dev
Commit 26423b4c authored by qorri_di's avatar qorri_di
Browse files
Options

Merge branch 'ENV-DEV' into 'BACKUP-DEV' 

Env dev

See merge request !1781
parents 83856731 eef9e9c4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 76 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 26423b4c
...@@ -480,17 +480,17 @@ export default class BalanceSheetMR extends Component { ...@@ -480,17 +480,17 @@ export default class BalanceSheetMR extends Component {
// this.props.onClickClose() // this.props.onClickClose()
if (type == 'submitted') { if (type == 'submitted') {
this.props.saveToMonthlyReport('BS') this.props.saveToMonthlyReport('BS')
let bodyRatioBs = { // let bodyRatioBs = {
"report": 'ratio', // "report": 'ratio',
"monthlyReportId": this.props.monthlyReportId, // "monthlyReportId": this.props.monthlyReportId,
"periode": this.props.periode, // "periode": this.props.periode,
"companyId": this.props.company.company_id, // "companyId": this.props.company.company_id,
"months": this.props.month.month_id // "months": this.props.month.month_id
} // }
api.create().triggerRatioFromLOCF(bodyRatioBs).then((res) => { // api.create().triggerRatioFromLOCF(bodyRatioBs).then((res) => {
console.log(res) // console.log(res)
this.setState({ loading: false }) // this.setState({ loading: false })
}) // })
} else { } else {
this.props.saveToMonthlyReport() this.props.saveToMonthlyReport()
} }
......
src/container/OutlookPA/CashFlowOLPA.js
View file @ 26423b4c
...@@ -942,7 +942,7 @@ export default class CashFlow extends Component { ...@@ -942,7 +942,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 14}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1017,7 +1017,7 @@ export default class CashFlow extends Component { ...@@ -1017,7 +1017,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 28}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1091,7 +1091,7 @@ export default class CashFlow extends Component { ...@@ -1091,7 +1091,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 43}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1170,7 +1170,7 @@ export default class CashFlow extends Component { ...@@ -1170,7 +1170,7 @@ export default class CashFlow extends Component {
} }
</div> </div>
</div> </div>
<div className="grid grid-4x content-center"> <div className="grid grid-4x content-center" style={{ left: 58}}>
<div className="col-1"> <div className="col-1">
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
...@@ -1249,7 +1249,7 @@ export default class CashFlow extends Component { ...@@ -1249,7 +1249,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 15}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1326,7 +1326,7 @@ export default class CashFlow extends Component { ...@@ -1326,7 +1326,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 29}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1403,7 +1403,7 @@ export default class CashFlow extends Component { ...@@ -1403,7 +1403,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 45}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1482,7 +1482,7 @@ export default class CashFlow extends Component { ...@@ -1482,7 +1482,7 @@ export default class CashFlow extends Component {
</div> </div>
</div> </div>
<div className="grid grid-5x content-center"> <div className="grid grid-5x content-center">
<div className="col-1"> <div className="col-1" style={{ left: 90}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1559,7 +1559,7 @@ export default class CashFlow extends Component { ...@@ -1559,7 +1559,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-2"> <div className="col-2" style={{ left: 76}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1637,7 +1637,7 @@ export default class CashFlow extends Component { ...@@ -1637,7 +1637,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-3"> <div className="col-3" style={{ left: 63}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1708,7 +1708,7 @@ export default class CashFlow extends Component { ...@@ -1708,7 +1708,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-4"> <div className="col-4" style={{ left: 46}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
...@@ -1781,7 +1781,7 @@ export default class CashFlow extends Component { ...@@ -1781,7 +1781,7 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
<div className="col-5"> <div className="col-5" style={{ left: 30}}>
{ {
tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 3 || tableMeta.rowData[0] === 4 || tableMeta.rowData[0] === 1 ?
null null
......
src/container/ProgressReport/ProgressReport.js
View file @ 26423b4c
...@@ -42,6 +42,7 @@ class ReportProgress extends Component { ...@@ -42,6 +42,7 @@ class ReportProgress extends Component {
alert: false, alert: false,
tipeAlert: '', tipeAlert: '',
messageAlert: '', messageAlert: '',
company: null
} }
} }
...@@ -187,6 +188,8 @@ class ReportProgress extends Component { ...@@ -187,6 +188,8 @@ 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.manual_reminder_report_button,
item.company_id, item.company_id,
]) ])
}) })
...@@ -241,6 +244,8 @@ class ReportProgress extends Component { ...@@ -241,6 +244,8 @@ 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.manual_reminder_report_button,
item.company_id, item.company_id,
]) ])
}) })
...@@ -277,6 +282,8 @@ class ReportProgress extends Component { ...@@ -277,6 +282,8 @@ 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.manual_reminder_report_button,
item.company_id, item.company_id,
]) ])
}) })
...@@ -321,6 +328,8 @@ class ReportProgress extends Component { ...@@ -321,6 +328,8 @@ 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.manual_reminder_report_button,
item.company_id, item.company_id,
]) ])
}) })
...@@ -567,7 +576,7 @@ class ReportProgress extends Component { ...@@ -567,7 +576,7 @@ class ReportProgress extends Component {
periode={this.state.periode ? this.state.periode.periode : null} periode={this.state.periode ? this.state.periode.periode : null}
quarter={this.state.quarter.name} quarter={this.state.quarter.name}
month={this.state.month.month_id} month={this.state.month.month_id}
company={this.state.company} company={this.state.company_id}
typeReport={String(this.state.reportType.name).toLocaleUpperCase()} typeReport={String(this.state.reportType.name).toLocaleUpperCase()}
year={this.state.periodeMB.value} year={this.state.periodeMB.value}
getMonitoringMB={this.getMonitoringMB.bind(this)} getMonitoringMB={this.getMonitoringMB.bind(this)}
......
src/container/Reports/SubHolding.js
View file @ 26423b4c
...@@ -4218,7 +4218,7 @@ export default class SubHolding extends Component { ...@@ -4218,7 +4218,7 @@ export default class SubHolding extends Component {
// console.log(yearNow) // console.log(yearNow)
// console.log(periode) // console.log(periode)
if (String(this.state.report.label).toLocaleLowerCase().includes('summary')) { if (String(this.state.report.label).toLocaleLowerCase().includes('summary')) {
let index = data.sort((a, b) => a - b).findIndex((val) => val.periode == yearNow) let index = data.sort((a, b) => a - b).findIndex((val) => val.periode == yearNow - 1)
// console.log(index) // console.log(index)
this.setState({ periode: data[index] }, () => { this.setState({ periode: data[index] }, () => {
this.getReportType() this.getReportType()
......
src/container/Reports/TableSubHolding.js
View file @ 26423b4c
...@@ -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