Merge branch 'syadziy' into 'master'

update

See merge request !437

src/container/BudgetTahunan.js

@@ -118,7 +118,7 @@ export default class BudgetTahunan extends Component {
                         if (response.data.data.length > 0) {
                             this.getRevision()
                         } else {
-                            this.setState({ listRevision: null, revision: null, dataTable: [], loading: false, checkApprover: false })
+                            this.setState({ listRevision: null, revision: null, dataTable: [], loading: false, checkApprover: false, lastRevision: "", visibleTableHistory: false })
                         }
                         // 
                     })
@@ -172,7 +172,7 @@ export default class BudgetTahunan extends Component {
                             item.revision,
                             item.current_status,
                             item.report_id,
-                            Number(item.revision) > 0? (String(item.current_status).toLocaleLowerCase() == 'submitted'? false : item.is_can_upload) :  item.is_can_upload,
+                            Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
                             item.revision
                         ]
                     })
@@ -703,6 +703,10 @@ export default class BudgetTahunan extends Component {
                                             : null
                                     }
                                 >
+                                    {/* {this.state.isApprover == true ? 
+                                        (tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
+                                        (this.state.lastRevision == 0 ? (tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
+                                        (tableMeta.rowData[3] !== 'submitted' ? '#5198ea' : 'GrayText'))} */}
                                     <Typography style={{ color: tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
                                 </button>
                             </div >