Merge branch 'deni-dev(pc)' into 'master'

lier aing

See merge request !575

src/container/BudgetTahunan/TaxPlanning.js

@@ -204,7 +204,7 @@ export default class TaxPlanning extends Component {
                         }
                     }
                 })
-                // console.log(dataTable)
+                console.log(dataTable)
                 this.setState({ dataTable, loading: false, buttonError: true, editable: true })
             } else {
                 this.setState({ dataTable, loading: false, buttonError: true, editable: true })
@@ -5828,14 +5828,25 @@ export default class TaxPlanning extends Component {
                                                             />
                                                             :
                                                             tableMeta.rowData[3] === 7 ?
-                                                                <NumberFormat
-                                                                    thousandSeparator={true}
-                                                                    style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
-                                                                    type="text"
-                                                                    placeholder=""
-                                                                    disabled={true}
-                                                                    value={Number(handleTotal(tableMeta, 1)).toFixed(1)}
-                                                                />
+                                                                (Number(handleTotal(tableMeta, 1)) >= Number(this.state.minValue) && Number(handleTotal(tableMeta, 1)) <= Number(this.state.maxValue)) ?
+                                                                    <NumberFormat
+                                                                        thousandSeparator={true}
+                                                                        style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                                        type="text"
+                                                                        placeholder=""
+                                                                        disabled={true}
+                                                                        value={Number(handleTotal(tableMeta, 1)).toFixed(1)}
+                                                                    /> :
+                                                                    <LightTooltip title={this.state.minValue === null ? `Value Should be 0` : `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(handleTotal(tableMeta, 1)).toFixed(1)}
+                                                                        />
+                                                                    </LightTooltip> 
                                                                 :
                                                                 null
                                     }
@@ -6214,7 +6225,7 @@ export default class TaxPlanning extends Component {
                                                                 null
                                                                 :
                                                                 tableMeta.rowData[3] === 7 ?
-                                                                (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)) ?
+                                                                    (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)) ?
                                                                         <NumberFormat
                                                                             thousandSeparator={true}
                                                                             style={{
@@ -6230,25 +6241,25 @@ export default class TaxPlanning extends Component {
                                                                             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"
-                                                                                    placeholder=""
-                                                                                    disabled={true}
-                                                                                    value={Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1)}
-                                                                                />
-                                                                            </LightTooltip>
+                                                                        /> :
+                                                                        <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"
+                                                                                placeholder=""
+                                                                                disabled={true}
+                                                                                value={Number(handleForecast(tableMeta, Number(this.props.periode) + 2, 3)).toFixed(1)}
+                                                                            />
+                                                                        </LightTooltip>
                                                                     :
                                                                     null
                                         }