Commit 2d38aea2 authored by r.kurnia's avatar r.kurnia

tp fixed 1,2

parent 4453ddb4
...@@ -1269,9 +1269,16 @@ export default class TaxPlanning extends Component { ...@@ -1269,9 +1269,16 @@ export default class TaxPlanning extends Component {
let total = 0 let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => { dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index >= 9 && index <= 20) { if (index >= 9 && index <= 20) {
let indexChild = item.tbf.formula.findIndex((val) => val.periode === periode) if (this.props.status === 'CLOSED') {
if (indexChild !== -1) { let indexChild = item.tbf
total += Number(item.tbf.formula[indexChild].value) if (indexChild !== -1) {
total += Number(item.tbf)
}
} else {
let indexChild = item.tbf.formula.findIndex((val) => val.periode === periode)
if (indexChild !== -1) {
total += Number(item.tbf.formula[indexChild].value)
}
} }
} }
}) })
...@@ -8131,22 +8138,59 @@ export default class TaxPlanning extends Component { ...@@ -8131,22 +8138,59 @@ export default class TaxPlanning extends Component {
} }
/> />
</div> : </div> :
<div style={{ flex: 1 }}> tableMeta.rowData[3] === 7 ?
<FormControlLabel (Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)).toFixed(1) >= Number(this.state.minValue) && Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)).toFixed(1) <= Number(this.state.maxValue)) ?
style={{ margin: 0 }} <NumberFormat
value={value.tbf} thousandSeparator={true}
control={ style={{
<NumberFormat fontSize: 12,
thousandSeparator={true} textAlign: 'right',
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)).toFixed(1)}
/> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[25].tbf}` : `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" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf).toFixed(1)} value={Number(handleForecast(tableMeta, Number(this.props.periode) + 1, 3)).toFixed(1)}
/> />
} </LightTooltip>
/> :
</div> <div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value.tbf}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(value.tbf).toFixed(1)}
/>
}
/>
</div>
: :
tableMeta.rowData[3] === 3 ? tableMeta.rowData[3] === 3 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -8660,22 +8704,59 @@ export default class TaxPlanning extends Component { ...@@ -8660,22 +8704,59 @@ export default class TaxPlanning extends Component {
} }
/> />
</div> : </div> :
<div style={{ flex: 1 }}> tableMeta.rowData[3] === 7 ?
<FormControlLabel (Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1) >= Number(this.state.minValue) && Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1) <= Number(this.state.maxValue)) ?
style={{ margin: 0 }} <NumberFormat
value={value.tbf} thousandSeparator={true}
control={ style={{
<NumberFormat fontSize: 12,
thousandSeparator={true} textAlign: 'right',
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1)}
/> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[25].tbf}` : `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" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf).toFixed(1)} value={Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1)}
/> />
} </LightTooltip>
/> :
</div> <div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value.tbf}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(value.tbf).toFixed(1)}
/>
}
/>
</div>
: :
tableMeta.rowData[3] === 3 ? tableMeta.rowData[3] === 3 ?
<div style={{ flex: 1 }}> <div style={{ flex: 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