Skip to content

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

Merge branch 'rifka' into 'master' 

historial suma cf

See merge request !1438
parents a5c983ba 738ed476
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 24 deletions
src/container/Laporan/SubHolding.js
View file @ bc91a125
......@@ -3219,7 +3219,16 @@ export default class SubHolding extends Component {
items.cash_flow.q3_october,
items.cash_flow.q3_november,
items.cash_flow.q3_december,
items.cash_flow.history_current_year,
items.cash_flow.history_last_year,
items.cash_flow.history_last_two_year,
items.cash_flow.history_last_three_year,
items.cash_flow.history_last_four_year,
items.cash_flow.history_last_five_year,
items.cash_flow.history_last_six_year,
items.cash_flow.history_last_seven_year,
items.cash_flow.history_last_eight_year,
items.cash_flow.history_last_nine_year,
])
}
if (items.children !== null) {
......@@ -3280,6 +3289,16 @@ export default class SubHolding extends Component {
item.cash_flow.q3_october,
item.cash_flow.q3_november,
item.cash_flow.q3_december,
item.cash_flow.history_current_year,
item.cash_flow.history_last_year,
item.cash_flow.history_last_two_year,
item.cash_flow.history_last_three_year,
item.cash_flow.history_last_four_year,
item.cash_flow.history_last_five_year,
item.cash_flow.history_last_six_year,
item.cash_flow.history_last_seven_year,
item.cash_flow.history_last_eight_year,
item.cash_flow.history_last_nine_year,
])
if (item.children !== null) {
......
src/container/Laporan/TableSubHolding.js
View file @ bc91a125
......@@ -20186,7 +20186,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[86]) === "" ? "" : Number(tableMeta.rowData[86]).toFixed(1)}
value={String(tableMeta.rowData[96]) === "" ? "" : Number(tableMeta.rowData[96]).toFixed(1)}
/>
}
/>
......@@ -20209,7 +20209,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[87]) === "" ? "" : Number(tableMeta.rowData[87]).toFixed(1)}
value={String(tableMeta.rowData[97]) === "" ? "" : Number(tableMeta.rowData[97]).toFixed(1)}
/>
}
/>
......@@ -20232,7 +20232,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[88]) === "" ? "" : Number(tableMeta.rowData[88]).toFixed(1)}
value={String(tableMeta.rowData[98]) === "" ? "" : Number(tableMeta.rowData[98]).toFixed(1)}
/>
}
/>
......@@ -20255,7 +20255,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[89]) === "" ? "" : Number(tableMeta.rowData[89]).toFixed(1)}
value={String(tableMeta.rowData[99]) === "" ? "" : Number(tableMeta.rowData[99]).toFixed(1)}
/>
}
/>
......@@ -20280,7 +20280,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[90]) === "" ? "" : Number(tableMeta.rowData[90]).toFixed(1)}
value={String(tableMeta.rowData[100]) === "" ? "" : Number(tableMeta.rowData[100]).toFixed(1)}
/>
}
/>
......@@ -20303,7 +20303,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[91]) === "" ? "" : Number(tableMeta.rowData[91]).toFixed(1)}
value={String(tableMeta.rowData[101]) === "" ? "" : Number(tableMeta.rowData[101]).toFixed(1)}
/>
}
/>
......@@ -20326,7 +20326,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[92]) === "" ? "" : Number(tableMeta.rowData[92]).toFixed(1)}
value={String(tableMeta.rowData[102]) === "" ? "" : Number(tableMeta.rowData[102]).toFixed(1)}
/>
}
/>
......@@ -20349,7 +20349,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[93]) === "" ? "" : Number(tableMeta.rowData[93]).toFixed(1)}
value={String(tableMeta.rowData[103]) === "" ? "" : Number(tableMeta.rowData[103]).toFixed(1)}
/>
}
/>
......@@ -20374,7 +20374,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[94]) === "" ? "" : Number(tableMeta.rowData[94]).toFixed(1)}
value={String(tableMeta.rowData[104]) === "" ? "" : Number(tableMeta.rowData[104]).toFixed(1)}
/>
}
/>
......@@ -20397,7 +20397,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[95]) === "" ? "" : Number(tableMeta.rowData[95]).toFixed(1)}
value={String(tableMeta.rowData[105]) === "" ? "" : Number(tableMeta.rowData[105]).toFixed(1)}
/>
}
/>
......@@ -20420,7 +20420,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[96]) === "" ? "" : Number(tableMeta.rowData[96]).toFixed(1)}
value={String(tableMeta.rowData[106]) === "" ? "" : Number(tableMeta.rowData[106]).toFixed(1)}
/>
}
/>
......@@ -20443,7 +20443,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={String(tableMeta.rowData[97]) === "" ? "" : Number(tableMeta.rowData[97]).toFixed(1)}
value={String(tableMeta.rowData[107]) === "" ? "" : Number(tableMeta.rowData[107]).toFixed(1)}
/>
}
/>
......@@ -21863,7 +21863,7 @@ export default class TableSubHolding extends Component {
},{
name: `Historial`,
options: {
display: false,
// display: false,
customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
{/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
......@@ -21931,7 +21931,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[95]) == "" ? "" : Number(tableMeta.rowData[95]).toFixed(1)}
/>
}
/>
......@@ -21954,7 +21954,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[94]) == "" ? "" : Number(tableMeta.rowData[94]).toFixed(1)}
/>
}
/>
......@@ -21977,7 +21977,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[93]) == "" ? "" : Number(tableMeta.rowData[93]).toFixed(1)}
/>
}
/>
......@@ -22000,7 +22000,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[92]) == "" ? "" : Number(tableMeta.rowData[92]).toFixed(1)}
/>
}
/>
......@@ -22023,7 +22023,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[91]) == "" ? "" : Number(tableMeta.rowData[91]).toFixed(1)}
/>
}
/>
......@@ -22048,7 +22048,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[90]) == "" ? "" : Number(tableMeta.rowData[90]).toFixed(1)}
/>
}
/>
......@@ -22071,7 +22071,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[89]) == "" ? "" : Number(tableMeta.rowData[89]).toFixed(1)}
/>
}
/>
......@@ -22094,7 +22094,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[88]) == "" ? "" : Number(tableMeta.rowData[88]).toFixed(1)}
/>
}
/>
......@@ -22117,7 +22117,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[87]) == "" ? "" : Number(tableMeta.rowData[87]).toFixed(1)}
/>
}
/>
......@@ -22140,7 +22140,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(0).toFixed(1)}
value={String(tableMeta.rowData[86]) == "" ? "" : Number(tableMeta.rowData[86]).toFixed(1)}
/>
}
/>
......@@ -22443,6 +22443,61 @@ export default class TableSubHolding extends Component {
options: {
display: false
}
},{
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
},
]
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