Skip to content

T
Tia-dev
Commit a4c770a0 authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

formula dan blank cf

See merge request !1074
parents 9ab9eaed 891972bd
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 40 deletions
src/container/Laporan/SubHolding.js
View file @ a4c770a0
...@@ -1124,13 +1124,49 @@ export default class SubHolding extends Component { ...@@ -1124,13 +1124,49 @@ export default class SubHolding extends Component {
const handlePushChild = (item) => { const handlePushChild = (item) => {
let indexIDzz = dbSumaCF.findIndex((val) => val[1] === item.id) let indexIDzz = dbSumaCF.findIndex((val) => val[1] === item.id)
if (indexIDzz === -1) { if (indexIDzz === -1) {
let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : item.cash_flow.mtd_actual let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : Number(item.cash_flow.mtd_actual)
let mtd = item.cash_flow.mtd == '' ? 0 : item.cash_flow.mtd let mtd = item.cash_flow.mtd == '' ? 0 : Number(item.cash_flow.mtd)
let persenMtd = Number(mtd_actual / mtd) // let persenMtd = Number(mtd_actual / mtd)
let persenMtd = 0
if (mtd < 0) {
if (mtd_actual >= mtd) {
persenMtd = ((mtd - mtd_actual) / mtd + 1 )
} else {
persenMtd = ((mtd - mtd_actual) / mtd)
}
}
else {
persenMtd = Number(mtd_actual / mtd)
}
let ytd_actual = item.cash_flow.ytd_actual == '' ? 0 : item.cash_flow.ytd_actual let ytd_actual = item.cash_flow.ytd_actual == '' ? 0 : Number(item.cash_flow.ytd_actual)
let ytd = item.cash_flow.ytd == '' ? 0 : item.cash_flow.ytd let ytd = item.cash_flow.ytd == '' ? 0 : Number(item.cash_flow.ytd)
let persenYtd = Number(ytd_actual / ytd) // let ytd_last_year = item.cash_flow.ytd_last_year == ''? 0 : Number(item.cash_flow.ytd_last_year)
// let persenYtd = Number(ytd_actual / ytd)
let persenYtd = 0
if (ytd < 0) {
if (ytd_actual >= ytd) {
persenYtd = ((ytd - ytd_actual) / ytd + 1 )
} else {
persenYtd = ((ytd - ytd_actual) / ytd)
}
}
else {
persenYtd = Number(ytd_actual/ytd)
}
// let persenYtdLY = 0
// if (ytd_last_year < 0) {
// if (ytd_actual >= ytd_last_year) {
// persenYtdLY = ((ytd_last_year - ytd_actual) / ytd_last_year + 1 )
// } else {
// persenYtdLY = (ytd_last_year - ytd_actual) / ytd_last_year
// }
// }
// else {
// persenYtdLY = Number(ytd_actual/ytd_last_year)
// }
let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : item.cash_flow.quarter_actual let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : item.cash_flow.quarter_actual
let quarter = item.cash_flow.quarter == '' ? 0 : item.cash_flow.quarter let quarter = item.cash_flow.quarter == '' ? 0 : item.cash_flow.quarter
...@@ -1174,11 +1210,33 @@ export default class SubHolding extends Component { ...@@ -1174,11 +1210,33 @@ export default class SubHolding extends Component {
res.map((item, index) => { res.map((item, index) => {
let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : item.cash_flow.mtd_actual let mtd_actual = item.cash_flow.mtd_actual == '' ? 0 : item.cash_flow.mtd_actual
let mtd = item.cash_flow.mtd == '' ? 0 : item.cash_flow.mtd let mtd = item.cash_flow.mtd == '' ? 0 : item.cash_flow.mtd
let persenMtd = Number(mtd_actual / mtd) // let persenMtd = Number(mtd_actual / mtd)
console.log(persenMtd) let persenMtd = 0
let ytd_actual = item.cash_flow.ytd_actual == '' ? 0 : item.cash_flow.ytd_actual if (mtd < 0) {
let ytd = item.cash_flow.ytd == '' ? 0 : item.cash_flow.ytd if (mtd_actual >= mtd) {
let persenYtd = Number(ytd_actual / ytd) persenMtd = ((mtd - mtd_actual) / mtd + 1 )
} else {
persenMtd = ((mtd - mtd_actual) / mtd)
}
}
else {
persenMtd = Number(mtd_actual / mtd)
}
let ytd_actual = item.cash_flow.ytd_actual == '' ? 0 : Number(item.cash_flow.ytd_actual)
let ytd = item.cash_flow.ytd == '' ? 0 : Number(item.cash_flow.ytd)
// let persenYtd = Number(ytd_actual / ytd)
let persenYtd = 0
if (ytd < 0) {
if (ytd_actual >= ytd) {
persenYtd = ((ytd - ytd_actual) / ytd + 1 )
} else {
persenYtd = ((ytd - ytd_actual) / ytd)
}
}
else {
persenYtd = Number(ytd_actual/ytd)
}
let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : item.cash_flow.quarter_actual let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : item.cash_flow.quarter_actual
let quarter = item.cash_flow.quarter == '' ? 0 : item.cash_flow.quarter let quarter = item.cash_flow.quarter == '' ? 0 : item.cash_flow.quarter
......
src/container/Laporan/TableSubHolding.js
View file @ a4c770a0
...@@ -5249,7 +5249,7 @@ export default class TableSubHolding extends Component { ...@@ -5249,7 +5249,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormulaDBPLMR(tableMeta.rowData[27], tableMeta, 0)).toFixed(1)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(handleValueFormulaDBPLMR(tableMeta.rowData[27], tableMeta, 0)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -5263,7 +5263,7 @@ export default class TableSubHolding extends Component { ...@@ -5263,7 +5263,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormulaDBPLMR(tableMeta.rowData[27], tableMeta, 0)).toFixed(1)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(handleValueFormulaDBPLMR(tableMeta.rowData[27], tableMeta, 0)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -5283,7 +5283,7 @@ export default class TableSubHolding extends Component { ...@@ -5283,7 +5283,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormulaDBPLMR(tableMeta.rowData[27], tableMeta, 0)).toFixed(1)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(handleValueFormulaDBPLMR(tableMeta.rowData[27], tableMeta, 0)).toFixed(1)}
/> />
: :
null null
...@@ -12275,7 +12275,7 @@ export default class TableSubHolding extends Component { ...@@ -12275,7 +12275,7 @@ export default class TableSubHolding extends Component {
name: `${Number(this.props.periode) + 1}`, name: `${Number(this.props.periode) + 1}`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, backgroundColor: '#1c71b8', zIndex: 102, color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} > <th style={{ ...style2, backgroundColor: '#1c71b8', zIndex: 102, top: 0, color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, paddingTop: 8 }}>{columnMeta.name}</div> <div style={{ textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, paddingTop: 8 }}>{columnMeta.name}</div>
{/* <div className="" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky", paddingBottom: 20 }}> {/* <div className="" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky", paddingBottom: 20 }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
...@@ -12317,7 +12317,7 @@ export default class TableSubHolding extends Component { ...@@ -12317,7 +12317,7 @@ export default class TableSubHolding extends Component {
name: `${Number(this.props.periode) + 2}`, name: `${Number(this.props.periode) + 2}`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, backgroundColor: '#1c71b8', zIndex: 102, color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} > <th style={{ ...style2, backgroundColor: '#1c71b8', zIndex: 102, top: 0, color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, paddingTop: 8 }}>{columnMeta.name}</div> <div style={{ textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, paddingTop: 8 }}>{columnMeta.name}</div>
{/* <div className="" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky", paddingBottom: 20 }}> {/* <div className="" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky", paddingBottom: 20 }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
...@@ -12435,7 +12435,7 @@ export default class TableSubHolding extends Component { ...@@ -12435,7 +12435,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[26]).toFixed(1)} value={String(tableMeta.rowData[26]) === "" ? "" : Number(tableMeta.rowData[26]).toFixed(1)}
/> />
} }
/> />
...@@ -12458,7 +12458,7 @@ export default class TableSubHolding extends Component { ...@@ -12458,7 +12458,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[27]).toFixed(1)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(1)}
/> />
} }
/> />
...@@ -12481,7 +12481,7 @@ export default class TableSubHolding extends Component { ...@@ -12481,7 +12481,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[28]).toFixed(1)} value={String(tableMeta.rowData[28]) === "" ? "" : Number(tableMeta.rowData[28]).toFixed(1)}
/> />
} }
/> />
...@@ -12504,7 +12504,7 @@ export default class TableSubHolding extends Component { ...@@ -12504,7 +12504,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[29]).toFixed(1)} value={String(tableMeta.rowData[29]) === "" ? "" : Number(tableMeta.rowData[29]).toFixed(1)}
/> />
} }
/> />
...@@ -12529,7 +12529,7 @@ export default class TableSubHolding extends Component { ...@@ -12529,7 +12529,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[30]).toFixed(1)} value={String(tableMeta.rowData[30]) === "" ? "" : Number(tableMeta.rowData[30]).toFixed(1)}
/> />
} }
/> />
...@@ -12552,7 +12552,7 @@ export default class TableSubHolding extends Component { ...@@ -12552,7 +12552,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[31]).toFixed(1)} value={String(tableMeta.rowData[31]) === "" ? "" : Number(tableMeta.rowData[31]).toFixed(1)}
/> />
} }
/> />
...@@ -12575,7 +12575,7 @@ export default class TableSubHolding extends Component { ...@@ -12575,7 +12575,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[32]).toFixed(1)} value={String(tableMeta.rowData[32]) === "" ? "" : Number(tableMeta.rowData[32]).toFixed(1)}
/> />
} }
/> />
...@@ -12598,7 +12598,7 @@ export default class TableSubHolding extends Component { ...@@ -12598,7 +12598,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[33]).toFixed(1)} value={String(tableMeta.rowData[33]) === "" ? "" : Number(tableMeta.rowData[33]).toFixed(1)}
/> />
} }
/> />
...@@ -12623,7 +12623,7 @@ export default class TableSubHolding extends Component { ...@@ -12623,7 +12623,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[34]).toFixed(1)} value={String(tableMeta.rowData[34]) === "" ? "" : Number(tableMeta.rowData[34]).toFixed(1)}
/> />
} }
/> />
...@@ -12646,7 +12646,7 @@ export default class TableSubHolding extends Component { ...@@ -12646,7 +12646,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[35]).toFixed(1)} value={String(tableMeta.rowData[35]) === "" ? "" : Number(tableMeta.rowData[35]).toFixed(1)}
/> />
} }
/> />
...@@ -12669,7 +12669,7 @@ export default class TableSubHolding extends Component { ...@@ -12669,7 +12669,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[36]).toFixed(1)} value={String(tableMeta.rowData[36]) === "" ? "" : Number(tableMeta.rowData[36]).toFixed(1)}
/> />
} }
/> />
...@@ -12692,7 +12692,7 @@ export default class TableSubHolding extends Component { ...@@ -12692,7 +12692,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[37]).toFixed(1)} value={String(tableMeta.rowData[37]) === "" ? "" : Number(tableMeta.rowData[37]).toFixed(1)}
/> />
} }
/> />
...@@ -12785,7 +12785,7 @@ export default class TableSubHolding extends Component { ...@@ -12785,7 +12785,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[38]).toFixed(1)} value={String(tableMeta.rowData[38]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(1)}
/> />
} }
/> />
...@@ -12808,7 +12808,7 @@ export default class TableSubHolding extends Component { ...@@ -12808,7 +12808,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[39]).toFixed(1)} value={String(tableMeta.rowData[39]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(1)}
/> />
} }
/> />
...@@ -12831,7 +12831,7 @@ export default class TableSubHolding extends Component { ...@@ -12831,7 +12831,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[40]).toFixed(1)} value={String(tableMeta.rowData[40]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(1)}
/> />
} }
/> />
...@@ -12854,7 +12854,7 @@ export default class TableSubHolding extends Component { ...@@ -12854,7 +12854,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[41]).toFixed(1)} value={String(tableMeta.rowData[41]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(1)}
/> />
} }
/> />
...@@ -12879,7 +12879,7 @@ export default class TableSubHolding extends Component { ...@@ -12879,7 +12879,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[42]).toFixed(1)} value={String(tableMeta.rowData[42]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(1)}
/> />
} }
/> />
...@@ -12902,7 +12902,7 @@ export default class TableSubHolding extends Component { ...@@ -12902,7 +12902,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[43]).toFixed(1)} value={String(tableMeta.rowData[43]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(1)}
/> />
} }
/> />
...@@ -12925,7 +12925,7 @@ export default class TableSubHolding extends Component { ...@@ -12925,7 +12925,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[44]).toFixed(1)} value={String(tableMeta.rowData[44]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(1)}
/> />
} }
/> />
...@@ -12948,7 +12948,7 @@ export default class TableSubHolding extends Component { ...@@ -12948,7 +12948,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[45]).toFixed(1)} value={String(tableMeta.rowData[45]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(1)}
/> />
} }
/> />
...@@ -12973,7 +12973,7 @@ export default class TableSubHolding extends Component { ...@@ -12973,7 +12973,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[46]).toFixed(1)} value={String(tableMeta.rowData[46]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(1)}
/> />
} }
/> />
...@@ -12996,7 +12996,7 @@ export default class TableSubHolding extends Component { ...@@ -12996,7 +12996,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[47]).toFixed(1)} value={String(tableMeta.rowData[47]) === "" ? "" : Number(tableMeta.rowData[47]).toFixed(1)}
/> />
} }
/> />
...@@ -13019,7 +13019,7 @@ export default class TableSubHolding extends Component { ...@@ -13019,7 +13019,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[48]).toFixed(1)} value={String(tableMeta.rowData[48]) === "" ? "" : Number(tableMeta.rowData[48]).toFixed(1)}
/> />
} }
/> />
...@@ -13042,7 +13042,7 @@ export default class TableSubHolding extends Component { ...@@ -13042,7 +13042,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[49]).toFixed(1)} value={String(tableMeta.rowData[49]) === "" ? "" : Number(tableMeta.rowData[49]).toFixed(1)}
/> />
} }
/> />
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