Merge branch 'deni-' into 'master'

Deni

See merge request !784

src/container/BudgetTahunan.js

@@ -83,7 +83,7 @@ export default class BudgetTahunan extends Component {
         })
         this.props.selectIndex('Master Budget & CAT')
         if (this.props.location.state !== undefined) {
-            // // console.log(this.props);
+            console.log(this.props);
             this.setState({ userType: this.props.location.state.userType, intent: 'Home', lastPeriod: this.props.location.state.rawData.periode, rawData: this.props.location.state.rawData }, () => {
                 this.getPermission()
                 // this.checkApprover()
@@ -562,7 +562,7 @@ export default class BudgetTahunan extends Component {
             document.body.style.overflow = 'hidden';
         })
         let body = {
-            "approval_id": this.props.location.state == undefined ? this.state.approverID : this.state.rawData.approval_id,
+            "approval_id": this.state.approverID,
             "status": type,
             "detail": this.state.detailRevisiCheck
         }
@@ -572,7 +572,8 @@ export default class BudgetTahunan extends Component {
             "max_periode": moment(this.state.maxDateRevision).format('YYYY-MM-DD')
         }
         // // console.log(payload)
-        // // console.log(body)
+        // console.log(this.props.location);
+        // console.log(body)
         api.create().approvalSubmission(body).then((res) => {
             // // console.log(res)
             // this.setState({ loading: false }, () => {

src/container/MonthlyReport.js

@@ -718,7 +718,7 @@ export default class MonthlyReport extends Component {
     }
 
     render() {
-        const columns = ["#", "Jenis Laporan",
+        const columns = ["#", "Report Type",
             {
                 name: "Revision",
                 options: {
@@ -901,7 +901,7 @@ export default class MonthlyReport extends Component {
                                             })}
                                             disableClearable
                                             style={{ width: 250 }}
-                                            renderInput={(params) => <TextField {...params} label="Periode" margin="normal" style={{ marginTop: 7 }} />}
+                                            renderInput={(params) => <TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }} />}
                                             value={this.state.periode}
                                         />
                                     </div>