Skip to content

T
Tia-dev
Commit 12ab7adc authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'dev/ardi' into 'ENV-DEV' 

Update RO Cashflow

See merge request !1639
parents d3f8beff a36eb566
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 42 deletions
src/container/RollingOutlook/CashFlowRO.js
View file @ 12ab7adc
...@@ -781,9 +781,6 @@ export default class CashFlow extends Component { ...@@ -781,9 +781,6 @@ export default class CashFlow extends Component {
options: { options: {
customHeadRender: (columnMeta) => ( 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 }} > <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 }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell> */}
<div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
<div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center', backgroundColor: '#07a7d0' }}> <div className="column-1 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center', backgroundColor: '#07a7d0' }}>
...@@ -813,9 +810,8 @@ export default class CashFlow extends Component { ...@@ -813,9 +810,8 @@ export default class CashFlow extends Component {
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}> <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"8"}</span> <span>{"8"}</span>
</div> </div>
</div> </div>
<div className="column-3 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center', backgroundColor: '#07a7d0' }}> <div className="column-3 grid grid-5x" style={{ placeSelf: 'center', textAlign: 'center', backgroundColor: '#07a7d0' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"9"}</span> <span>{"9"}</span>
</div> </div>
...@@ -828,9 +824,7 @@ export default class CashFlow extends Component { ...@@ -828,9 +824,7 @@ export default class CashFlow extends Component {
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}> <div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"12"}</span> <span>{"12"}</span>
</div> </div>
</div> <div className="column-5" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', width: 110 }}>
<div className="column-4 grid grid-1" style={{ placeSelf: 'center', textAlign: 'center', backgroundColor: '#07a7d0' }}>
<div className="column-1" style={{ width: 120, placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#07a7d0' }}>
<span>{"Current Total"}</span> <span>{"Current Total"}</span>
</div> </div>
</div> </div>
...@@ -841,7 +835,7 @@ export default class CashFlow extends Component { ...@@ -841,7 +835,7 @@ export default class CashFlow extends Component {
customBodyRender: (val, tableMeta, updateValue) => { customBodyRender: (val, tableMeta, updateValue) => {
return ( return (
<div> <div>
<div className="grid grid-4x content-center"> <div className="grid grid-3x content-center">
<div className="grid grid-4x content-center"> <div className="grid grid-4x content-center">
<div className="col-1"> <div className="col-1">
{ {
...@@ -1410,7 +1404,7 @@ export default class CashFlow extends Component { ...@@ -1410,7 +1404,7 @@ export default class CashFlow extends Component {
} }
</div> </div>
</div> </div>
<div className="grid grid-4x content-center"> <div className="grid grid-5x content-center">
<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 ?
...@@ -1688,23 +1682,73 @@ export default class CashFlow extends Component { ...@@ -1688,23 +1682,73 @@ export default class CashFlow extends Component {
null null
} }
</div> </div>
</div> <div className="col-5">
<div className="grid grid-1 content-center">
<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 ?
null null
: :
<span style={{ fontSize: 12, textAlign: 'right' }}> tableMeta.rowData[0] === 5 ?
<NumberFormat // null
thousandSeparator={true} <span style={{ fontSize: 12, textAlign: 'right' }}>
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} <NumberFormat
type="text" thousandSeparator={true}
placeholder="" style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
disabled={true} type="text"
value={Number(tableMeta.rowData[18]).toFixed(1)} placeholder=""
/> disabled={true}
</span> value={Number(tableMeta.rowData[18]).toFixed(1)}
/>
</span>
:
tableMeta.rowData[0] === 6 ?
// null
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1)}
/>
:
tableMeta.rowData[0] === 7 ?
((Number(tableMeta.rowData[18]).toFixed(1))) ?
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1)}
/> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[23]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'red'
}}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1)}
/>
</LightTooltip>
:
null
} }
</div> </div>
</div> </div>
...@@ -1713,13 +1757,13 @@ export default class CashFlow extends Component { ...@@ -1713,13 +1757,13 @@ export default class CashFlow extends Component {
) )
} }
} }
}, },
{ {
name: "", name: "",
options: { options: {
display: false display: false
} }
}, },
{ {
name: "", name: "",
options: { options: {
...@@ -1780,7 +1824,17 @@ export default class CashFlow extends Component { ...@@ -1780,7 +1824,17 @@ export default class CashFlow extends Component {
options: { options: {
display: false display: false
} }
}, }, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}
// { // {
// name: "", // name: "",
// options: { // options: {
...@@ -2025,22 +2079,6 @@ export default class CashFlow extends Component { ...@@ -2025,22 +2079,6 @@ export default class CashFlow extends Component {
// } // }
// } // }
// } // }
{
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
},
] ]
const loadingComponent = ( const loadingComponent = (
......
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