Skip to content

T
Tia-dev
Commit dc904c50 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 494ffd82 af5a51a0
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 58 deletions
src/container/MonthlyReport.js
View file @ dc904c50
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Typography, Paper, TextField, MenuItem, Select, FormControlLabel, Snackbar, withStyles, createMuiTheme, MuiThemeProvider } from '@material-ui/core'; import { Typography, Paper, TextField, MenuItem, Select, FormControlLabel, Snackbar, withStyles, createMuiTheme, MuiThemeProvider, Checkbox } from '@material-ui/core';
import MUIDataTable from 'mui-datatables'; import MUIDataTable from 'mui-datatables';
import Images from '../assets/Images'; import Images from '../assets/Images';
import api from '../api'; import api from '../api';
...@@ -55,7 +55,11 @@ export default class MonthlyReport extends Component { ...@@ -55,7 +55,11 @@ export default class MonthlyReport extends Component {
tipeAlert: '', tipeAlert: '',
messageAlert: '', messageAlert: '',
btnCreate: false, btnCreate: false,
loadview: false loadview: false,
submittedOnly: false,
company_active: null,
company_submit: null,
still_approver: false
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
} }
...@@ -102,10 +106,16 @@ export default class MonthlyReport extends Component { ...@@ -102,10 +106,16 @@ export default class MonthlyReport extends Component {
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
if (response.data.data.is_approver === true) { if (response.data.data.is_approver === true) {
this.setState({ isApprover: true, checkApprover: true }, () => this.setState({ isApprover: true, checkApprover: true, still_approver: true}, () =>
this.getMonth()) {
if (this.state.submittedOnly) {
this.getMonth()
} else {
this.getCompanyActive()
}
})
} else { } else {
this.setState({ isApprover: false, checkApprover: false }, () => this.setState({ isApprover: false, checkApprover: false, still_approver: false }, () =>
this.getCompanyActive()) this.getCompanyActive())
} }
} else { } else {
...@@ -206,8 +216,9 @@ export default class MonthlyReport extends Component { ...@@ -206,8 +216,9 @@ export default class MonthlyReport extends Component {
options: companyData, options: companyData,
getOptionLabel: (option) => titleCase(option.company_name), getOptionLabel: (option) => titleCase(option.company_name),
}; };
this.setState({ listCompany: defaultProps, company: companyData[0] }, () => { this.setState({ listCompany: defaultProps, company: companyData[0], company_active: defaultProps}, () => {
this.getMonth() this.getMonth()
// console.log(this.state.company_active)
}) })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
...@@ -248,10 +259,14 @@ export default class MonthlyReport extends Component { ...@@ -248,10 +259,14 @@ export default class MonthlyReport extends Component {
console.log(index); console.log(index);
this.setState({ listMonth: defaultProps, month: index == -1 ? monthData[0] : monthData[index] }, () => { this.setState({ listMonth: defaultProps, month: index == -1 ? monthData[0] : monthData[index] }, () => {
if (this.state.isApprover === true) { if (this.state.isApprover === true) {
if (this.state.submittedOnly) {
this.getPeriode() this.getPeriode()
} else { } else {
this.getLastPeriod() this.getLastPeriod()
} }
} else {
this.getLastPeriod()
}
}) })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
...@@ -313,7 +328,7 @@ export default class MonthlyReport extends Component { ...@@ -313,7 +328,7 @@ export default class MonthlyReport extends Component {
// console.log(periodeData) // console.log(periodeData)
console.log(index) console.log(index)
this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => { this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => {
if (this.state.isApprover === true) { if (this.state.isApprover === true && this.state.submittedOnly) {
this.getCompanySubmitted() this.getCompanySubmitted()
} else { } else {
this.getRevision() this.getRevision()
...@@ -361,17 +376,20 @@ export default class MonthlyReport extends Component { ...@@ -361,17 +376,20 @@ export default class MonthlyReport extends Component {
if (this.state.rawData !== undefined) { if (this.state.rawData !== undefined) {
indexID = companyData.findIndex((val) => val.company_id == this.state.rawData.company_id) indexID = companyData.findIndex((val) => val.company_id == this.state.rawData.company_id)
} }
// console.log(response.data.data.length)
this.setState({ listCompany: defaultProps, company: indexID == null ? companyData[0] : companyData[indexID] }, () => { this.setState({ listCompany: defaultProps, company: indexID == null ? companyData[0] : companyData[indexID], company_submit: defaultProps }, () => {
// console.log(response.data.data.length)
if (response.data.data.length > 0) { if (response.data.data.length > 0) {
this.getRevision() this.getRevision()
} else { } else {
// console.log(this.state.listCompany)
// console.log(this.state.company_submit)
this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false }) this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false })
} }
// //
}) })
} else { } else {
this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false, loading: false }, () => { this.setState({ listRevision: null, revision: null, listCompany: null, company: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false, loading: false }, () => {
document.body.style.overflow = 'unset'; document.body.style.overflow = 'unset';
}) })
} }
...@@ -458,10 +476,9 @@ export default class MonthlyReport extends Component { ...@@ -458,10 +476,9 @@ export default class MonthlyReport extends Component {
this.getReport() this.getReport()
this.getReportAttachment() this.getReportAttachment()
api.create().checkApproverMonthly().then(response => { api.create().checkApproverMonthly().then(response => {
// // console.log(response);
if (this.state.btnCreate === true && this.state.btnEdit === true) { if (this.state.btnCreate === true && this.state.btnEdit === true) {
console.log('editable'); console.log('editable');
this.setState({ isApprover: false, checkApprover: false }) this.setState({ isApprover: this.state.still_approver? true : false, checkApprover: false })
} else { } else {
console.log('just view'); console.log('just view');
this.setState({ isApprover: true, checkApprover: true }) this.setState({ isApprover: true, checkApprover: true })
...@@ -871,6 +888,9 @@ export default class MonthlyReport extends Component { ...@@ -871,6 +888,9 @@ export default class MonthlyReport extends Component {
</div> </div>
<div style={{ padding: 20 }}> <div style={{ padding: 20 }}>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
{this.state.isApprover?
<div className="grid grid-2x" style={{}}>
<div className="col-1" style={{ display: 'flex', maxWidth: '100%', paddingLeft: 0}}>
<Autocomplete <Autocomplete
{...this.state.listMonth} {...this.state.listMonth}
id="month" id="month"
...@@ -887,7 +907,6 @@ export default class MonthlyReport extends Component { ...@@ -887,7 +907,6 @@ export default class MonthlyReport extends Component {
renderInput={(params) => <TextField {...params} label="Month" margin="normal" style={{ marginTop: 7 }} />} renderInput={(params) => <TextField {...params} label="Month" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.month} value={this.state.month}
/> />
<Autocomplete <Autocomplete
{...this.state.listPeriode} {...this.state.listPeriode}
id="periode" id="periode"
...@@ -904,6 +923,73 @@ export default class MonthlyReport extends Component { ...@@ -904,6 +923,73 @@ export default class MonthlyReport extends Component {
renderInput={(params) => <TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }} />} renderInput={(params) => <TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.periode} value={this.state.periode}
/> />
</div>
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', alignSelf: 'flex-end'}}>
<FormControlLabel
style={{ margin: 0 }}
value={this.state.submittedOnly}
control={
<Checkbox
checked={this.state.submittedOnly}
onClick={() => this.setState({submittedOnly: !this.state.submittedOnly, loading: true}, () => {
this.getChecApprover()
// console.log(this.state.company)
// this.setState({listCompany: this.state.submittedOnly? this.state.company_submit : this.state.company_active, company: this.state.listCompany != null? this.state.listCompany.options[0] : null})
// console.log(this.state.company_active)
// console.log(this.state.company_submit)
// console.log(this.state.company)
// console.log(this.state.submittedOnly)
// if (this.state.submittedOnly) {
// this.getCompanySubmitted()
// } else {
// this.getCompanyActive()
// }
})} />
}
/>
<Typography style={{ fontSize: '16px', color: '#4b4b4b', fontWeight: 'bold', marginLeft: 5, alignSelf: 'center'}}>Submitted Only</Typography>
</div>
</div>
:
<div style={{ display: 'flex' }}>
<Autocomplete
{...this.state.listMonth}
id="month"
onChange={(event, newInputValue) => this.setState({ month: newInputValue, loading: true }, () => {
if (this.state.isApprover === true) {
this.getCompanySubmitted()
} else {
this.setState({ visibleTableHistory: false })
this.getRevision()
}
})}
disableClearable
style={{ width: 250, marginRight: 20 }}
renderInput={(params) => <TextField {...params} label="Month" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.month}
/>
<Autocomplete
{...this.state.listPeriode}
id="periode"
onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true }, () => {
if (this.state.isApprover === true) {
this.getCompanySubmitted()
} else {
this.setState({ visibleTableHistory: false })
this.getRevision()
}
})}
disableClearable
style={{ width: 250 }}
renderInput={(params) => <TextField {...params} label="Period" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.periode}
/>
</div>
}
</div> </div>
<div style={{ marginTop: 20 }}> <div style={{ marginTop: 20 }}>
<Autocomplete <Autocomplete
......
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ dc904c50
...@@ -1198,7 +1198,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -1198,7 +1198,7 @@ export default class ListOfCreditFacilities extends Component {
// console.log(totalLoan); // console.log(totalLoan);
// dataTable: newData, totalOutStand: newData[newData.length-1][22] // dataTable: newData, totalOutStand: newData[newData.length-1][22]
if (bankNameEmpty) { if (bankNameEmpty) {
this.setState({ loading: false, dataTable: this.state.dataTable, totalOutStand: 0, diff: Number(0 - this.state.perBS), saveDraft: false }) this.setState({ loading: false, dataTable: this.state.dataTable, totalOutStand: 0, diff: Number(0 - this.state.perBS), saveDraft: true, saveComp: true})
} else { } else {
this.setState({ loading: false, dataTable: newData, totalOutStand: totalLoan, diff: Number(totalLoan - this.state.perBS), saveDraft: false, saveComp: Number(totalLoan - this.state.perBS) == 0? false : true }) this.setState({ loading: false, dataTable: newData, totalOutStand: totalLoan, diff: Number(totalLoan - this.state.perBS), saveDraft: false, saveComp: Number(totalLoan - this.state.perBS) == 0? false : true })
} }
...@@ -3490,7 +3490,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3490,7 +3490,7 @@ export default class ListOfCreditFacilities extends Component {
<div style={{ flex: 1, padding: 20, width: '100%' }}> <div style={{ flex: 1, padding: 20, width: '100%' }}>
{this.state.visibleLOCFMR ? {this.state.visibleLOCFMR ?
<Paper style={{ paddingTop: 10, paddingBottom: 20 }}> <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
<Snackbar open={this.state.snekbar} autoHideDuration={6000} onClose={handleClose}> <Snackbar open={this.state.snekbar} autoHideDuration={3000} onClose={handleClose}>
<Alert onClose={handleClose} severity="error"> <Alert onClose={handleClose} severity="error">
{this.state.snekbarMsg} {this.state.snekbarMsg}
</Alert> </Alert>
...@@ -3507,7 +3507,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3507,7 +3507,7 @@ export default class ListOfCreditFacilities extends Component {
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
{(this.state.get_for == 'edit' && (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( {(this.state.get_for == 'edit' &&
<div> <div>
<a data-tip={'Download Template'} data-for="template"> <a data-tip={'Download Template'} data-for="template">
<button <button
...@@ -3525,7 +3525,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3525,7 +3525,7 @@ export default class ListOfCreditFacilities extends Component {
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
</div> </div>
)} )}
{(this.state.get_for == 'edit' && (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( {(this.state.get_for == 'edit' &&
<div> <div>
<a data-tip={'Upload'} data-for="upload"> <a data-tip={'Upload'} data-for="upload">
<button <button
...@@ -3670,7 +3670,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3670,7 +3670,8 @@ export default class ListOfCreditFacilities extends Component {
type="button" type="button"
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true ?
null : this.setState({snekbar: true, snekbarMsg: 'Data Incomplete !'})
:
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
setTimeout(() => { setTimeout(() => {
...@@ -3680,7 +3681,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3680,7 +3681,7 @@ export default class ListOfCreditFacilities extends Component {
} }
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.saveDraft !== true ? 'pointer' : 'default', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
...@@ -3699,7 +3700,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3699,7 +3700,7 @@ export default class ListOfCreditFacilities extends Component {
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.saveComp ? this.state.saveComp ?
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' }) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete !'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
...@@ -3710,7 +3711,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3710,7 +3711,7 @@ export default class ListOfCreditFacilities extends Component {
} }
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.saveComp === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none' outline: 'none'
}} }}
...@@ -3824,7 +3825,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3824,7 +3825,8 @@ export default class ListOfCreditFacilities extends Component {
type="button" type="button"
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true ?
null : this.setState({snekbar: true, snekbarMsg: 'Data Incomplete !'})
:
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
setTimeout(() => { setTimeout(() => {
...@@ -3834,7 +3836,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3834,7 +3836,7 @@ export default class ListOfCreditFacilities extends Component {
} }
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.saveDraft !== true ? 'pointer' : 'default', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
...@@ -3855,7 +3857,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3855,7 +3857,7 @@ export default class ListOfCreditFacilities extends Component {
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.saveComp ? this.state.saveComp ?
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' }) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete !'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
...@@ -3866,7 +3868,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3866,7 +3868,7 @@ export default class ListOfCreditFacilities extends Component {
} }
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.saveComp === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none' outline: 'none'
}} }}
......
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