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

yoshhh

See merge request !502

src/container/BudgetTahunan/BalanceSheet.js

@@ -331,8 +331,8 @@ export default class BalanceSheet extends Component {
                             item.total_next_year,
                             item.total_more_year,
                             item.orders,
-                            item.condition_it_should_be,
-                            item.condition_if_wrong,
+                            item.condition_it_should_be ? item.condition_it_should_be : '0',
+                            item.condition_if_wrong ? item.condition_if_wrong : "STOPPER",
                             item.error
                         ]
                     })
@@ -623,20 +623,16 @@ export default class BalanceSheet extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ width: 300 }}>
-                            {tableMeta.rowData[25] ?
-                                tableMeta.rowData[25].length > 0 ?
+                            {tableMeta.rowData[0] === null ?
+                                tableMeta.rowData[4] == 0 ?
+                                    <LightTooltip title={"Report Items Not Registered"} arrow>
+                                        <span style={{ fontSize: 12, fontWeight: 'bold', color: 'red' }}>{String(val).toUpperCase()}</span>
+                                    </LightTooltip> :
                                     <div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
                                         <LightTooltip title={"Report Items Not Registered"} arrow>
                                             <span style={{ fontSize: 12, color: 'red' }}>{tableMeta.rowData[0] === 4 ? "" : val}</span>
                                         </LightTooltip>
                                     </div>
-                                    :
-                                    tableMeta.rowData[4] == 0 ?
-                                        <span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(tableMeta.rowData[0] === 4 ? "" : val).toUpperCase()}</span>
-                                        :
-                                        <div style={{ paddingLeft: 20 * Number(tableMeta.rowData[4]) }}>
-                                            <span style={{ fontSize: 12 }}>{tableMeta.rowData[0] === 4 ? "" : val}</span>
-                                        </div>
                                 :
                                 tableMeta.rowData[4] == 0 ?
                                     <span style={{ fontSize: 12, fontWeight: 'bold' }}>{String(tableMeta.rowData[0] === 4 ? "" : val).toUpperCase()}</span>
@@ -3113,10 +3109,9 @@ export default class BalanceSheet extends Component {
                                         <button
                                             className="button"
                                             type="button"
-                                            disabled={this.state.buttonError}
                                             style={{
                                                 backgroundColor: 'transparent',
-                                                cursor: this.state.buttonError === true ? 'default' : 'pointer',
+                                                cursor: 'pointer',
                                                 borderColor: 'transparent',
                                                 outline: 'none',
                                                 marginRight: 20
@@ -3124,7 +3119,7 @@ export default class BalanceSheet extends Component {
                                             onClick={() => {
                                                 this.setState({ loading: true }, () => {
                                                     setTimeout(() => {
-                                                        this.setState({ loading: false, buttonError: this.state.errorPreview === true ? true : false, editable: false })
+                                                        this.handleValidate()
                                                     }, 100);
                                                 })
                                             }}