Commit a4d59990 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'GGMAC' into 'master'

cashflow report subco

See merge request !1379
parents 88dd19b0 10efeed3
...@@ -12556,7 +12556,7 @@ export default class TableSubHolding extends Component { ...@@ -12556,7 +12556,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[51]).toFixed(1)} value={Number(tableMeta.rowData[99]).toFixed(1)}
/> />
} }
/> />
...@@ -12579,7 +12579,7 @@ export default class TableSubHolding extends Component { ...@@ -12579,7 +12579,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[52]).toFixed(1)} value={Number(tableMeta.rowData[100]).toFixed(1)}
/> />
} }
/> />
...@@ -12605,7 +12605,7 @@ export default class TableSubHolding extends Component { ...@@ -12605,7 +12605,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
value={Number(tableMeta.rowData[53]).toFixed(1)} value={Number(tableMeta.rowData[101]).toFixed(1)}
/> />
} }
/> />
...@@ -12628,7 +12628,7 @@ export default class TableSubHolding extends Component { ...@@ -12628,7 +12628,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[54]).toFixed(1)} value={Number(tableMeta.rowData[102]).toFixed(1)}
/> />
} }
/> />
...@@ -12691,7 +12691,7 @@ export default class TableSubHolding extends Component { ...@@ -12691,7 +12691,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[55]).toFixed(1)} value={Number(tableMeta.rowData[103]).toFixed(1)}
/> />
} }
/> />
...@@ -12714,7 +12714,7 @@ export default class TableSubHolding extends Component { ...@@ -12714,7 +12714,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[56]).toFixed(1)} value={Number(tableMeta.rowData[104]).toFixed(1)}
/> />
} }
/> />
...@@ -12740,7 +12740,7 @@ export default class TableSubHolding extends Component { ...@@ -12740,7 +12740,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
value={Number(tableMeta.rowData[57]).toFixed(1)} value={Number(tableMeta.rowData[105]).toFixed(1)}
/> />
} }
/> />
...@@ -12763,7 +12763,7 @@ export default class TableSubHolding extends Component { ...@@ -12763,7 +12763,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[58]).toFixed(1)} value={Number(tableMeta.rowData[106]).toFixed(1)}
/> />
} }
/> />
...@@ -12827,7 +12827,7 @@ export default class TableSubHolding extends Component { ...@@ -12827,7 +12827,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[59]).toFixed(1)} value={Number(tableMeta.rowData[107]).toFixed(1)}
/> />
} }
/> />
...@@ -12850,7 +12850,7 @@ export default class TableSubHolding extends Component { ...@@ -12850,7 +12850,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[60]).toFixed(1)} value={Number(tableMeta.rowData[108]).toFixed(1)}
/> />
} }
/> />
...@@ -12876,7 +12876,7 @@ export default class TableSubHolding extends Component { ...@@ -12876,7 +12876,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
value={Number(tableMeta.rowData[61]).toFixed(1)} value={Number(tableMeta.rowData[109]).toFixed(1)}
/> />
} }
/> />
...@@ -12899,7 +12899,7 @@ export default class TableSubHolding extends Component { ...@@ -12899,7 +12899,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[62]).toFixed(1)} value={Number(tableMeta.rowData[110]).toFixed(1)}
/> />
} }
/> />
...@@ -12962,7 +12962,7 @@ export default class TableSubHolding extends Component { ...@@ -12962,7 +12962,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[63]).toFixed(1)} value={Number(tableMeta.rowData[111]).toFixed(1)}
/> />
} }
/> />
...@@ -12985,7 +12985,7 @@ export default class TableSubHolding extends Component { ...@@ -12985,7 +12985,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[64]).toFixed(1)} value={Number(tableMeta.rowData[112]).toFixed(1)}
/> />
} }
/> />
...@@ -13010,7 +13010,7 @@ export default class TableSubHolding extends Component { ...@@ -13010,7 +13010,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[65]).toFixed(1)} value={Number(tableMeta.rowData[113]).toFixed(1)}
suffix={'%'} suffix={'%'}
/> />
} }
...@@ -13034,7 +13034,7 @@ export default class TableSubHolding extends Component { ...@@ -13034,7 +13034,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[66]).toFixed(1)} value={Number(tableMeta.rowData[114]).toFixed(1)}
/> />
} }
/> />
...@@ -13561,7 +13561,7 @@ export default class TableSubHolding extends Component { ...@@ -13561,7 +13561,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[26]) === "" ? "" : Number(tableMeta.rowData[26]).toFixed(1)} value={String(tableMeta.rowData[38]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(1)}
/> />
} }
/> />
...@@ -13584,7 +13584,7 @@ export default class TableSubHolding extends Component { ...@@ -13584,7 +13584,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(1)} value={String(tableMeta.rowData[39]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(1)}
/> />
} }
/> />
...@@ -13607,7 +13607,7 @@ export default class TableSubHolding extends Component { ...@@ -13607,7 +13607,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[28]) === "" ? "" : Number(tableMeta.rowData[28]).toFixed(1)} value={String(tableMeta.rowData[40]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(1)}
/> />
} }
/> />
...@@ -13630,7 +13630,7 @@ export default class TableSubHolding extends Component { ...@@ -13630,7 +13630,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[29]) === "" ? "" : Number(tableMeta.rowData[29]).toFixed(1)} value={String(tableMeta.rowData[41]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(1)}
/> />
} }
/> />
...@@ -13655,7 +13655,7 @@ export default class TableSubHolding extends Component { ...@@ -13655,7 +13655,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[30]) === "" ? "" : Number(tableMeta.rowData[30]).toFixed(1)} value={String(tableMeta.rowData[42]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(1)}
/> />
} }
/> />
...@@ -13678,7 +13678,7 @@ export default class TableSubHolding extends Component { ...@@ -13678,7 +13678,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[31]) === "" ? "" : Number(tableMeta.rowData[31]).toFixed(1)} value={String(tableMeta.rowData[43]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(1)}
/> />
} }
/> />
...@@ -13701,7 +13701,7 @@ export default class TableSubHolding extends Component { ...@@ -13701,7 +13701,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[32]) === "" ? "" : Number(tableMeta.rowData[32]).toFixed(1)} value={String(tableMeta.rowData[44]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(1)}
/> />
} }
/> />
...@@ -13724,7 +13724,7 @@ export default class TableSubHolding extends Component { ...@@ -13724,7 +13724,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[33]) === "" ? "" : Number(tableMeta.rowData[33]).toFixed(1)} value={String(tableMeta.rowData[45]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(1)}
/> />
} }
/> />
...@@ -13749,7 +13749,7 @@ export default class TableSubHolding extends Component { ...@@ -13749,7 +13749,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[34]) === "" ? "" : Number(tableMeta.rowData[34]).toFixed(1)} value={String(tableMeta.rowData[46]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(1)}
/> />
} }
/> />
...@@ -13772,7 +13772,7 @@ export default class TableSubHolding extends Component { ...@@ -13772,7 +13772,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[35]) === "" ? "" : Number(tableMeta.rowData[35]).toFixed(1)} value={String(tableMeta.rowData[47]) === "" ? "" : Number(tableMeta.rowData[47]).toFixed(1)}
/> />
} }
/> />
...@@ -13795,7 +13795,7 @@ export default class TableSubHolding extends Component { ...@@ -13795,7 +13795,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[36]) === "" ? "" : Number(tableMeta.rowData[36]).toFixed(1)} value={String(tableMeta.rowData[48]) === "" ? "" : Number(tableMeta.rowData[48]).toFixed(1)}
/> />
} }
/> />
...@@ -13818,7 +13818,7 @@ export default class TableSubHolding extends Component { ...@@ -13818,7 +13818,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[37]) === "" ? "" : Number(tableMeta.rowData[37]).toFixed(1)} value={String(tableMeta.rowData[49]) === "" ? "" : Number(tableMeta.rowData[49]).toFixed(1)}
/> />
} }
/> />
...@@ -13911,7 +13911,7 @@ export default class TableSubHolding extends Component { ...@@ -13911,7 +13911,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[38]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(1)} value={String(tableMeta.rowData[86]) === "" ? "" : Number(tableMeta.rowData[86]).toFixed(1)}
/> />
} }
/> />
...@@ -13934,7 +13934,7 @@ export default class TableSubHolding extends Component { ...@@ -13934,7 +13934,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[39]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(1)} value={String(tableMeta.rowData[87]) === "" ? "" : Number(tableMeta.rowData[87]).toFixed(1)}
/> />
} }
/> />
...@@ -13957,7 +13957,7 @@ export default class TableSubHolding extends Component { ...@@ -13957,7 +13957,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[40]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(1)} value={String(tableMeta.rowData[88]) === "" ? "" : Number(tableMeta.rowData[88]).toFixed(1)}
/> />
} }
/> />
...@@ -13980,7 +13980,7 @@ export default class TableSubHolding extends Component { ...@@ -13980,7 +13980,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[41]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(1)} value={String(tableMeta.rowData[89]) === "" ? "" : Number(tableMeta.rowData[89]).toFixed(1)}
/> />
} }
/> />
...@@ -14005,7 +14005,7 @@ export default class TableSubHolding extends Component { ...@@ -14005,7 +14005,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[42]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(1)} value={String(tableMeta.rowData[90]) === "" ? "" : Number(tableMeta.rowData[90]).toFixed(1)}
/> />
} }
/> />
...@@ -14028,7 +14028,7 @@ export default class TableSubHolding extends Component { ...@@ -14028,7 +14028,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[43]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(1)} value={String(tableMeta.rowData[91]) === "" ? "" : Number(tableMeta.rowData[91]).toFixed(1)}
/> />
} }
/> />
...@@ -14051,7 +14051,7 @@ export default class TableSubHolding extends Component { ...@@ -14051,7 +14051,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[44]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(1)} value={String(tableMeta.rowData[92]) === "" ? "" : Number(tableMeta.rowData[92]).toFixed(1)}
/> />
} }
/> />
...@@ -14074,7 +14074,7 @@ export default class TableSubHolding extends Component { ...@@ -14074,7 +14074,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[45]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(1)} value={String(tableMeta.rowData[93]) === "" ? "" : Number(tableMeta.rowData[93]).toFixed(1)}
/> />
} }
/> />
...@@ -14099,7 +14099,7 @@ export default class TableSubHolding extends Component { ...@@ -14099,7 +14099,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[46]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(1)} value={String(tableMeta.rowData[94]) === "" ? "" : Number(tableMeta.rowData[94]).toFixed(1)}
/> />
} }
/> />
...@@ -14122,7 +14122,7 @@ export default class TableSubHolding extends Component { ...@@ -14122,7 +14122,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[47]) === "" ? "" : Number(tableMeta.rowData[47]).toFixed(1)} value={String(tableMeta.rowData[95]) === "" ? "" : Number(tableMeta.rowData[95]).toFixed(1)}
/> />
} }
/> />
...@@ -14145,7 +14145,7 @@ export default class TableSubHolding extends Component { ...@@ -14145,7 +14145,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[48]) === "" ? "" : Number(tableMeta.rowData[48]).toFixed(1)} value={String(tableMeta.rowData[96]) === "" ? "" : Number(tableMeta.rowData[96]).toFixed(1)}
/> />
} }
/> />
...@@ -14168,7 +14168,7 @@ export default class TableSubHolding extends Component { ...@@ -14168,7 +14168,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[49]) === "" ? "" : Number(tableMeta.rowData[49]).toFixed(1)} value={String(tableMeta.rowData[97]) === "" ? "" : Number(tableMeta.rowData[97]).toFixed(1)}
/> />
} }
/> />
...@@ -14184,7 +14184,7 @@ export default class TableSubHolding extends Component { ...@@ -14184,7 +14184,7 @@ export default class TableSubHolding extends Component {
},{ },{
name: `OL Q1 ${this.props.periode}`, name: `OL Q1 ${this.props.periode}`,
options: { options: {
display: false, // display: false,
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#000', 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 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
...@@ -14262,7 +14262,7 @@ export default class TableSubHolding extends Component { ...@@ -14262,7 +14262,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[50]) === "" ? "" : Number(tableMeta.rowData[50]).toFixed(1)}
/> />
} }
/> />
...@@ -14285,7 +14285,7 @@ export default class TableSubHolding extends Component { ...@@ -14285,7 +14285,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[51]) === "" ? "" : Number(tableMeta.rowData[51]).toFixed(1)}
/> />
} }
/> />
...@@ -14308,7 +14308,7 @@ export default class TableSubHolding extends Component { ...@@ -14308,7 +14308,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[52]) === "" ? "" : Number(tableMeta.rowData[52]).toFixed(1)}
/> />
} }
/> />
...@@ -14331,7 +14331,7 @@ export default class TableSubHolding extends Component { ...@@ -14331,7 +14331,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[53]) === "" ? "" : Number(tableMeta.rowData[53]).toFixed(1)}
/> />
} }
/> />
...@@ -14356,7 +14356,7 @@ export default class TableSubHolding extends Component { ...@@ -14356,7 +14356,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[54]) === "" ? "" : Number(tableMeta.rowData[54]).toFixed(1)}
/> />
} }
/> />
...@@ -14379,7 +14379,7 @@ export default class TableSubHolding extends Component { ...@@ -14379,7 +14379,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[55]) === "" ? "" : Number(tableMeta.rowData[55]).toFixed(1)}
/> />
} }
/> />
...@@ -14402,7 +14402,7 @@ export default class TableSubHolding extends Component { ...@@ -14402,7 +14402,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[56]) === "" ? "" : Number(tableMeta.rowData[56]).toFixed(1)}
/> />
} }
/> />
...@@ -14425,7 +14425,7 @@ export default class TableSubHolding extends Component { ...@@ -14425,7 +14425,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[57]) === "" ? "" : Number(tableMeta.rowData[57]).toFixed(1)}
/> />
} }
/> />
...@@ -14450,7 +14450,7 @@ export default class TableSubHolding extends Component { ...@@ -14450,7 +14450,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[58]) === "" ? "" : Number(tableMeta.rowData[58]).toFixed(1)}
/> />
} }
/> />
...@@ -14473,7 +14473,7 @@ export default class TableSubHolding extends Component { ...@@ -14473,7 +14473,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[59]) === "" ? "" : Number(tableMeta.rowData[59]).toFixed(1)}
/> />
} }
/> />
...@@ -14496,7 +14496,7 @@ export default class TableSubHolding extends Component { ...@@ -14496,7 +14496,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[60]) === "" ? "" : Number(tableMeta.rowData[60]).toFixed(1)}
/> />
} }
/> />
...@@ -14519,7 +14519,7 @@ export default class TableSubHolding extends Component { ...@@ -14519,7 +14519,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[61]) === "" ? "" : Number(tableMeta.rowData[61]).toFixed(1)}
/> />
} }
/> />
...@@ -14535,7 +14535,7 @@ export default class TableSubHolding extends Component { ...@@ -14535,7 +14535,7 @@ export default class TableSubHolding extends Component {
},{ },{
name: `OL Q2 ${this.props.periode}`, name: `OL Q2 ${this.props.periode}`,
options: { options: {
display: false, // display: false,
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#000', 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 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
...@@ -14613,7 +14613,7 @@ export default class TableSubHolding extends Component { ...@@ -14613,7 +14613,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[62]) === "" ? "" : Number(tableMeta.rowData[62]).toFixed(1)}
/> />
} }
/> />
...@@ -14636,7 +14636,7 @@ export default class TableSubHolding extends Component { ...@@ -14636,7 +14636,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[63]) === "" ? "" : Number(tableMeta.rowData[63]).toFixed(1)}
/> />
} }
/> />
...@@ -14659,7 +14659,7 @@ export default class TableSubHolding extends Component { ...@@ -14659,7 +14659,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[64]) === "" ? "" : Number(tableMeta.rowData[64]).toFixed(1)}
/> />
} }
/> />
...@@ -14682,7 +14682,7 @@ export default class TableSubHolding extends Component { ...@@ -14682,7 +14682,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[65]) === "" ? "" : Number(tableMeta.rowData[65]).toFixed(1)}
/> />
} }
/> />
...@@ -14707,7 +14707,7 @@ export default class TableSubHolding extends Component { ...@@ -14707,7 +14707,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[66]) === "" ? "" : Number(tableMeta.rowData[66]).toFixed(1)}
/> />
} }
/> />
...@@ -14730,7 +14730,7 @@ export default class TableSubHolding extends Component { ...@@ -14730,7 +14730,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[67]) === "" ? "" : Number(tableMeta.rowData[67]).toFixed(1)}
/> />
} }
/> />
...@@ -14753,7 +14753,7 @@ export default class TableSubHolding extends Component { ...@@ -14753,7 +14753,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[68]) === "" ? "" : Number(tableMeta.rowData[68]).toFixed(1)}
/> />
} }
/> />
...@@ -14776,7 +14776,7 @@ export default class TableSubHolding extends Component { ...@@ -14776,7 +14776,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[69]) === "" ? "" : Number(tableMeta.rowData[69]).toFixed(1)}
/> />
} }
/> />
...@@ -14801,7 +14801,7 @@ export default class TableSubHolding extends Component { ...@@ -14801,7 +14801,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[70]) === "" ? "" : Number(tableMeta.rowData[70]).toFixed(1)}
/> />
} }
/> />
...@@ -14824,7 +14824,7 @@ export default class TableSubHolding extends Component { ...@@ -14824,7 +14824,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[71]) === "" ? "" : Number(tableMeta.rowData[71]).toFixed(1)}
/> />
} }
/> />
...@@ -14847,7 +14847,7 @@ export default class TableSubHolding extends Component { ...@@ -14847,7 +14847,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[72]) === "" ? "" : Number(tableMeta.rowData[72]).toFixed(1)}
/> />
} }
/> />
...@@ -14870,7 +14870,7 @@ export default class TableSubHolding extends Component { ...@@ -14870,7 +14870,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[73]) === "" ? "" : Number(tableMeta.rowData[73]).toFixed(1)}
/> />
} }
/> />
...@@ -14886,7 +14886,7 @@ export default class TableSubHolding extends Component { ...@@ -14886,7 +14886,7 @@ export default class TableSubHolding extends Component {
},{ },{
name: `OL Q3 ${this.props.periode}`, name: `OL Q3 ${this.props.periode}`,
options: { options: {
display: false, // display: false,
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#000', 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 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
...@@ -14964,7 +14964,7 @@ export default class TableSubHolding extends Component { ...@@ -14964,7 +14964,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[74]) === "" ? "" : Number(tableMeta.rowData[74]).toFixed(1)}
/> />
} }
/> />
...@@ -14987,7 +14987,7 @@ export default class TableSubHolding extends Component { ...@@ -14987,7 +14987,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[75]) === "" ? "" : Number(tableMeta.rowData[75]).toFixed(1)}
/> />
} }
/> />
...@@ -15010,7 +15010,7 @@ export default class TableSubHolding extends Component { ...@@ -15010,7 +15010,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[76]) === "" ? "" : Number(tableMeta.rowData[76]).toFixed(1)}
/> />
} }
/> />
...@@ -15033,7 +15033,7 @@ export default class TableSubHolding extends Component { ...@@ -15033,7 +15033,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[77]) === "" ? "" : Number(tableMeta.rowData[77]).toFixed(1)}
/> />
} }
/> />
...@@ -15058,7 +15058,7 @@ export default class TableSubHolding extends Component { ...@@ -15058,7 +15058,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[78]) === "" ? "" : Number(tableMeta.rowData[78]).toFixed(1)}
/> />
} }
/> />
...@@ -15081,7 +15081,7 @@ export default class TableSubHolding extends Component { ...@@ -15081,7 +15081,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[79]) === "" ? "" : Number(tableMeta.rowData[79]).toFixed(1)}
/> />
} }
/> />
...@@ -15104,7 +15104,7 @@ export default class TableSubHolding extends Component { ...@@ -15104,7 +15104,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[80]) === "" ? "" : Number(tableMeta.rowData[80]).toFixed(1)}
/> />
} }
/> />
...@@ -15127,7 +15127,7 @@ export default class TableSubHolding extends Component { ...@@ -15127,7 +15127,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[81]) === "" ? "" : Number(tableMeta.rowData[81]).toFixed(1)}
/> />
} }
/> />
...@@ -15152,7 +15152,7 @@ export default class TableSubHolding extends Component { ...@@ -15152,7 +15152,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[82]) === "" ? "" : Number(tableMeta.rowData[82]).toFixed(1)}
/> />
} }
/> />
...@@ -15175,7 +15175,7 @@ export default class TableSubHolding extends Component { ...@@ -15175,7 +15175,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[83]) === "" ? "" : Number(tableMeta.rowData[83]).toFixed(1)}
/> />
} }
/> />
...@@ -15198,7 +15198,7 @@ export default class TableSubHolding extends Component { ...@@ -15198,7 +15198,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[84]) === "" ? "" : Number(tableMeta.rowData[84]).toFixed(1)}
/> />
} }
/> />
...@@ -15221,7 +15221,7 @@ export default class TableSubHolding extends Component { ...@@ -15221,7 +15221,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[85]) === "" ? "" : Number(tableMeta.rowData[85]).toFixed(1)}
/> />
} }
/> />
...@@ -15237,7 +15237,7 @@ export default class TableSubHolding extends Component { ...@@ -15237,7 +15237,7 @@ export default class TableSubHolding extends Component {
},{ },{
name: `OL PA ${this.props.periode}`, name: `OL PA ${this.props.periode}`,
options: { options: {
display: false, // display: false,
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#000', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, color: '#000', 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 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
...@@ -15315,7 +15315,7 @@ export default class TableSubHolding extends Component { ...@@ -15315,7 +15315,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[26]) === "" ? "" : Number(tableMeta.rowData[26]).toFixed(1)}
/> />
} }
/> />
...@@ -15338,7 +15338,7 @@ export default class TableSubHolding extends Component { ...@@ -15338,7 +15338,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(1)}
/> />
} }
/> />
...@@ -15361,7 +15361,7 @@ export default class TableSubHolding extends Component { ...@@ -15361,7 +15361,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(1)}
/> />
} }
/> />
...@@ -15384,7 +15384,7 @@ export default class TableSubHolding extends Component { ...@@ -15384,7 +15384,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[28]) === "" ? "" : Number(tableMeta.rowData[28]).toFixed(1)}
/> />
} }
/> />
...@@ -15409,7 +15409,7 @@ export default class TableSubHolding extends Component { ...@@ -15409,7 +15409,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[29]) === "" ? "" : Number(tableMeta.rowData[29]).toFixed(1)}
/> />
} }
/> />
...@@ -15432,7 +15432,7 @@ export default class TableSubHolding extends Component { ...@@ -15432,7 +15432,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[30]) === "" ? "" : Number(tableMeta.rowData[30]).toFixed(1)}
/> />
} }
/> />
...@@ -15455,7 +15455,7 @@ export default class TableSubHolding extends Component { ...@@ -15455,7 +15455,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[31]) === "" ? "" : Number(tableMeta.rowData[31]).toFixed(1)}
/> />
} }
/> />
...@@ -15478,7 +15478,7 @@ export default class TableSubHolding extends Component { ...@@ -15478,7 +15478,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[32]) === "" ? "" : Number(tableMeta.rowData[32]).toFixed(1)}
/> />
} }
/> />
...@@ -15503,7 +15503,7 @@ export default class TableSubHolding extends Component { ...@@ -15503,7 +15503,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[33]) === "" ? "" : Number(tableMeta.rowData[33]).toFixed(1)}
/> />
} }
/> />
...@@ -15526,7 +15526,7 @@ export default class TableSubHolding extends Component { ...@@ -15526,7 +15526,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[34]) === "" ? "" : Number(tableMeta.rowData[34]).toFixed(1)}
/> />
} }
/> />
...@@ -15549,7 +15549,7 @@ export default class TableSubHolding extends Component { ...@@ -15549,7 +15549,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[35]) === "" ? "" : Number(tableMeta.rowData[35]).toFixed(1)}
/> />
} }
/> />
...@@ -15572,7 +15572,7 @@ export default class TableSubHolding extends Component { ...@@ -15572,7 +15572,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(0).toFixed(1)} value={String(tableMeta.rowData[36]) === "" ? "" : Number(tableMeta.rowData[36]).toFixed(1)}
/> />
} }
/> />
...@@ -16113,6 +16113,61 @@ export default class TableSubHolding extends Component { ...@@ -16113,6 +16113,61 @@ export default class TableSubHolding extends Component {
options: { options: {
display: false 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