Skip to content

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

Merge branch 'riri' into 'master' 

OI

See merge request !858
parents 27d8d90f 0ffdb960
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 32 deletions
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ 5d59f4b0
...@@ -63,6 +63,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -63,6 +63,7 @@ export default class OperatingIndicatorMR extends Component {
editable: true, editable: true,
emptyData: false, emptyData: false,
templateNull: true, templateNull: true,
judulColumn: null,
get_for: 'view' get_for: 'view'
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
...@@ -353,7 +354,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -353,7 +354,7 @@ export default class OperatingIndicatorMR extends Component {
monthly_report: payload monthly_report: payload
} }
console.log(body) console.log(body)
this.setState({ payload: body, buttonError: false, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] }) this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
} }
}); });
} }
...@@ -431,7 +432,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -431,7 +432,7 @@ export default class OperatingIndicatorMR extends Component {
months: this.props.data.report_id === 22 ? 1 : 23 ? 2 : 24 ? 3 : 25 ? 4 : 27 ? 5 : 28 ? 6 : 29 ? 7 : 31 ? 8 : 32 ? 9 : 33 ? 10 : 35 ? 11 : 36 ? 12 : null, months: this.props.data.report_id === 22 ? 1 : 23 ? 2 : 24 ? 3 : 25 ? 4 : 27 ? 5 : 28 ? 6 : 29 ? 7 : 31 ? 8 : 32 ? 9 : 33 ? 10 : 35 ? 11 : 36 ? 12 : null,
monthly_report: data monthly_report: data
} }
console.log(data); console.log(body);
// // console.log(JSON.stringify(body)) // // console.log(JSON.stringify(body))
api.create('UPLOAD').uploadMonthlyReportOI(body).then(response => { api.create('UPLOAD').uploadMonthlyReportOI(body).then(response => {
// // console.log(response); // // console.log(response);
...@@ -1374,6 +1375,11 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1374,6 +1375,11 @@ export default class OperatingIndicatorMR extends Component {
<div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}> <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
<Typography style={{ fontSize: '16px', color: 'white' }}>Monthly Report Submission</Typography> <Typography style={{ fontSize: '16px', color: 'white' }}>Monthly Report Submission</Typography>
</div> </div>
<Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
<Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
{this.state.messageAlert}
</Alert>
</Snackbar>
<div style={{ flex: 1, padding: 20, width: '100%' }}> <div style={{ flex: 1, padding: 20, width: '100%' }}>
{this.state.visibleOI === true ? {this.state.visibleOI === true ?
<Paper style={{ paddingTop: 10, paddingBottom: 20 }}> <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
...@@ -1463,7 +1469,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1463,7 +1469,7 @@ export default class OperatingIndicatorMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notesUpdate}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10 }}>Notes : {this.state.notesUpdate}</Typography>
</div> </div>
<div className="grid grid-2x"> <div className="grid grid-2x">
<div className="col-1"> <div className="col-1" style={{ paddingLeft: 20 }}>
<button <button
className="button" className="button"
type="button" type="button"
...@@ -1484,7 +1490,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1484,7 +1490,7 @@ export default class OperatingIndicatorMR extends Component {
</div> </div>
</button> </button>
</div> </div>
{!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && this.props.isSubmit && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}> {!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && this.props.isSubmit && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}>
{this.state.get_for == 'view' && <button {this.state.get_for == 'view' && <button
type="button" type="button"
onClick={() => { onClick={() => {
...@@ -1492,7 +1498,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1492,7 +1498,7 @@ export default class OperatingIndicatorMR extends Component {
this.handleGetFor('edit') this.handleGetFor('edit')
}) })
}} }}
style={{ marginRight: 20 }} style={{ marginRight: 21 }}
> >
<div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}> <div style={{ backgroundColor: '#fff', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center', border: 'solid 1px #354960' }}>
<Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Edit</Typography> <Typography style={{ fontSize: '11px', color: '#354960', textAlign: 'center' }}>Edit</Typography>
...@@ -1517,15 +1523,19 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1517,15 +1523,19 @@ export default class OperatingIndicatorMR extends Component {
{this.state.get_for == 'edit' && <button {this.state.get_for == 'edit' && <button
className="button" className="button"
type="button" type="button"
disabled={this.state.editable} // disabled={this.state.editable}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.editable === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.setState({ loading: true }, () => { onClick={() =>
this.state.editable === true ?
this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
:
this.setState({ loading: true }, () => {
setTimeout(() => { setTimeout(() => {
this.createData("draft") this.createData("draft")
}, 100); }, 100);
...@@ -1543,15 +1553,19 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1543,15 +1553,19 @@ export default class OperatingIndicatorMR extends Component {
</button>} </button>}
{this.state.get_for == 'edit' && <button {this.state.get_for == 'edit' && <button
type="button" type="button"
disabled={this.state.editable} // disabled={this.state.editable}
onClick={() => this.setState({ loading: true }, () => { onClick={() =>
this.state.editable === true ?
this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
:
this.setState({ loading: true }, () => {
setTimeout(() => { setTimeout(() => {
this.createData("submitted") this.createData("submitted")
}, 100); }, 100);
})} })}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.editable === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
...@@ -1649,12 +1663,12 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1649,12 +1663,12 @@ export default class OperatingIndicatorMR extends Component {
type="button" type="button"
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.editable === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
disabled={this.state.editable} // disabled={this.state.editable}
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : this.setState({ loading: true }, () => { null : this.setState({ loading: true }, () => {
...@@ -1677,16 +1691,17 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1677,16 +1691,17 @@ export default class OperatingIndicatorMR extends Component {
type="button" type="button"
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : this.setState({ alert: true, messageAlert: 'Data Incomplete !', tipeAlert: 'error' })
:
this.setState({ loading: true }, () => { this.setState({ loading: true }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadOI("submitted") this.uploadOI("submitted")
}, 100); }, 100);
})} })}
disabled={this.state.editable} // disabled={this.state.editable}
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: this.state.editable === true ? 'default' : 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 5d59f4b0
...@@ -561,7 +561,7 @@ export default class ProfitLossMR extends Component { ...@@ -561,7 +561,7 @@ export default class ProfitLossMR extends Component {
let err = false let err = false
this.state.dataTable.map((i, index) => { this.state.dataTable.map((i, index) => {
if(i[0] === 3 && i[4] === 2) { if(i[0] === 3 && i[4] === 2) {
console.log(i); // console.log(i);
if ( i[19] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) { if ( i[19] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) {
console.log('msk 1'); console.log('msk 1');
// console.log(i); // console.log(i);
...@@ -608,8 +608,8 @@ export default class ProfitLossMR extends Component { ...@@ -608,8 +608,8 @@ export default class ProfitLossMR extends Component {
} }
// console.log(JSON.stringify(payload)); // console.log(JSON.stringify(payload));
api.create().validateSubmitReportPL(payload).then((response) => { api.create().validateSubmitReportPL(payload).then((response) => {
console.log(response.data.data.result) // console.log(response.data.data.result)
console.log(err); // console.log(err);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
if (response.data.data.result && err === false) { if (response.data.data.result && err === false) {
......
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