Merge branch 'rifka' into 'master'

Rifka

See merge request !826

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -242,7 +242,7 @@ export default class FixedAssetsMovementMR extends Component {
                     fixed_asset_movement: payload
                 }
                 // console.log(body)
-                this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })
+                this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
             }
         });
     }
@@ -1597,7 +1597,7 @@ export default class FixedAssetsMovementMR extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    String(this.state.judul).includes("MONTHLY REPORT - FIXED ASSETS MOVEMENT") ?
+                                    String(this.state.judulColumn).includes("TEMPLATE") && String(this.state.judulColumn).includes("UPLOAD") && String(this.state.judul).includes("FIXED") && String(this.state.judul).includes("ASSETS") && String(this.state.judul).includes("MOVEMENT") && String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}