Commit ceb032c2 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

Rifka

See merge request !826
parents a2ae22f7 6c13b3c9
...@@ -242,7 +242,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -242,7 +242,7 @@ export default class FixedAssetsMovementMR extends Component {
fixed_asset_movement: payload fixed_asset_movement: payload
} }
// console.log(body) // 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 { ...@@ -1597,7 +1597,7 @@ export default class FixedAssetsMovementMR extends Component {
this.setState({ uploadStatus: 'idle', percentage: '0' }) this.setState({ uploadStatus: 'idle', percentage: '0' })
}} }}
onUpload={() => { 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.checkUpload() :
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
}} }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment