Skip to content

T
Tia-dev
Commit 16af3459 authored by Faisal Hamdi's avatar Faisal Hamdi
Browse files
Options

Merge branch 'faisal' into 'master' 

update cat pa!

See merge request !1426
parents 1a3ac253 ab8d732f
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 25 deletions
src/container/Laporan/SubHolding.js
View file @ 16af3459
......@@ -2905,10 +2905,10 @@ export default class SubHolding extends Component {
item.level,
item.itemName,
item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
item.corporate_annual_target.uom,
item.corporate_annual_target.kpiType,
item.corporate_annual_target.maxAch,
item.corporate_annual_target.formulaYtd,
parentTrue ? item.corporate_annual_target.uom : item.uom,
parentTrue ? item.corporate_annual_target.kpiType : item.typeKpi,
parentTrue ? titleCase(item.corporate_annual_target.maxAch) : titleCase(item.maxAch),
parentTrue ? item.corporate_annual_target.formulaYtd : item.formulaYtd,
item.corporate_annual_target.lastYearActualQx,
item.corporate_annual_target.lastYearActualFy,
......@@ -3072,10 +3072,15 @@ export default class SubHolding extends Component {
item.level,
item.description,
item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
item.uom,
item.kpi_type,
item.max_ach,
item.formula_ytd,
// item.uom,
// item.kpi_type,
// item.max_ach,
// item.formula_ytd,
parentTrue ? item.corporate_annual_target.uom : item.uom,
parentTrue ? item.corporate_annual_target.jenis_kpi == "" ? null : item.corporate_annual_target.jenis_kpi : item.jenis_kpi == "" ? null : item.kpi_type,
parentTrue ? item.corporate_annual_target.max_ach == "" ? null : titleCase(item.corporate_annual_target.max_ach) : item.max_ach == "" ? null : titleCase(item.max_ach),
item.corporate_annual_target.formula_ytd == "" ? null : item.corporate_annual_target.formula_ytd,
item.corporate_annual_target.actual_ytd,
item.corporate_annual_target.target_ytd,
item.corporate_annual_target.achivement_ytd,
......@@ -3907,7 +3912,7 @@ export default class SubHolding extends Component {
}
} else if (this.state.report.value === 11) {
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/quarterly/export_report?report_id=17&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&quarter=${this.state.quarter.name}`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/cat/quarterly/export_report?report_id=17&&company_id=${this.state.company.company_id}&&periode=${this.state.periode.periode}&&quarter=${this.state.quarter.name}`
)
console.log(res);
res = await res.blob()
......
src/container/Laporan/TableSubHolding.js
View file @ 16af3459
......@@ -25246,21 +25246,9 @@ export default class TableSubHolding extends Component {
<div style={{ width: 75, textAlign: 'right' }}>
{tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
<FormControlLabel
style={{ margin: 0 }}
value={Number(value).toFixed(1)}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
suffix={'%'}
value={Number(value).toFixed(1)}
disabled={true}
/>
}
/>
<span style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}>
{value}
</span>
}
</div>
)
......@@ -25320,7 +25308,7 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
value={Number(value).toFixed(2)}
disabled={true}
/>
}
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