Skip to content

T
Tia-dev
Commit 8bb935da authored by d.arizona's avatar d.arizona
Browse files
Options

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

parents 71794974 7a400996
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 40 deletions
src/container/BudgetTahunan.js
View file @ 8bb935da
......@@ -272,8 +272,9 @@ export default class BudgetTahunan extends Component {
lastStatus: response.data.data.last_status === null ? 'SUBMIT' : response.data.data.last_status
}, () => {
this.setState({ loading: false })
this.checkIsSubmit()
this.historyApproval()
this.getReport()
this.getReportAttachment()
})
} else {
this.setState({ submissionID: null })
......@@ -304,20 +305,6 @@ export default class BudgetTahunan extends Component {
})
}
checkIsSubmit() {
// let body = {
// "submission_id": this.state.submissionID
// }
// api.create().checkIsSubmit(body).then(response => {
// console.log(response.data.data.result);
// if (response.data) {
// if (response.data.status === "Success") {
// this.setState({ isSubmit: response.data.data.result })
// }
// }
// })
}
approvalSubmission(type) {
this.setState({ loading: true })
let body = {
......@@ -463,20 +450,14 @@ export default class BudgetTahunan extends Component {
if (response.data) {
if (response.data.status === "success") {
this.getSubmission()
this.getReport()
this.getReportAttachment()
} else {
this.setState({ loading: false }, () => {
this.getSubmission()
this.getReport()
this.getReportAttachment()
})
}
} else {
this.setState({ loading: false }, ()=> {
this.getSubmission()
this.getReport()
this.getReportAttachment()
})
}
})
......@@ -591,13 +572,13 @@ export default class BudgetTahunan extends Component {
<button
style={{
backgroundColor: 'transparent',
cursor: tableMeta.rowData[5] ? 'pointer' : null,
cursor: tableMeta.rowData[5] ? 'pointer' : 'default',
borderColor: 'transparent'
}}
onClick={() =>
// tableMeta.rowData[5] ?
tableMeta.rowData[5] == true ?
this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
// : null
: null
}
>
<Typography style={{ color: tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
......@@ -713,8 +694,7 @@ export default class BudgetTahunan extends Component {
download: false,
selectableRows: false,
viewColumns: false,
rowsPerPage: 5,
rowsPerPageOptions: [5, 25, 100],
pagination: false,
search: false
}
const optionsRevision = {
......@@ -764,8 +744,6 @@ export default class BudgetTahunan extends Component {
onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => {
this.setState({ visibleTableHistory: false, loading: true })
this.getRevision()
this.getReport()
this.getReportAttachment()
this.getSubmission()
})}
disabled={this.state.intent === 'Home' ? true : false}
......@@ -785,8 +763,6 @@ export default class BudgetTahunan extends Component {
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
this.setState({ visibleTableHistory: false, loading: true })
this.getRevision()
this.getReport()
this.getReportAttachment()
this.getSubmission()
})}
disableClearable
......@@ -803,6 +779,7 @@ export default class BudgetTahunan extends Component {
this.getReport()
this.getReportAttachment()
})}
disabled={true}
disableClearable
style={{ width: 250 }}
renderInput={(params) => <TextField {...params} label="Revision" margin="normal" style={{ marginTop: 7 }} />}
......@@ -1045,7 +1022,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleBS: false, visibleBudgetTahunan: true })}
getReport={this.getCompanyActive.bind(this)}
getReport={this.getSubmission.bind(this)}
isApprover={this.state.isApprover}
/>
)}
......@@ -1061,7 +1038,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visiblePL: false, visibleBudgetTahunan: true })}
getReport={this.getReport.bind(this)}
getReport={this.getSubmission.bind(this)}
status={this.state.status}
isApprover={this.state.isApprover}
/>
......@@ -1079,7 +1056,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
getReport={this.getCompanyActive.bind(this)}
getReport={this.getSubmission.bind(this)}
status={this.state.status}
isApprover={this.state.isApprover}
/>
......@@ -1096,7 +1073,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleFAM: false, visibleBudgetTahunan: true })}
getReport={this.getCompanyActive.bind(this)}
getReport={this.getSubmission.bind(this)}
status={this.state.status}
isApprover={this.state.isApprover}
/>
......@@ -1113,7 +1090,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })}
getReport={this.getCompanyActive.bind(this)}
getReport={this.getSubmission.bind(this)}
isApprover={this.state.isApprover}
/>
)}
......@@ -1129,7 +1106,7 @@ export default class BudgetTahunan extends Component {
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleCF: false, visibleBudgetTahunan: true })}
getReport={this.getCompanyActive.bind(this)}
getReport={this.getSubmission.bind(this)}
/>
)}
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 8bb935da
......@@ -91,6 +91,7 @@ export default class ProfitLoss extends Component {
api.create().getDetailReportMB(payload).then(response => {
console.log(response);
let dataTable = []
this.setState({visibleProfitLoss: true})
if (response.data) {
let res = response.data.data
const handlePushChild = (item) => {
......@@ -166,6 +167,7 @@ export default class ProfitLoss extends Component {
}
}
})
console.log(dataTable)
this.setState({ dataTable, loading: false, buttonError: true, editable: true })
} else {
this.setState({ dataTable, loading: false, buttonError: true, editable: true })
......@@ -497,9 +499,9 @@ export default class ProfitLoss extends Component {
}
})
if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "sales price") {
dataTable2[tableMeta.rowIndex][20] = Number(dataTable2[tableMeta.rowIndex - 2][20]) / Number(dataTable2[tableMeta.rowIndex - 1][20])
let value = Number(dataTable2[tableMeta.rowIndex - 2][20]) / Number(dataTable2[tableMeta.rowIndex - 1][20])
return value
dataTable2[tableMeta.rowIndex][20] = R.equals(value, NaN) ? "0.0" : value
return R.equals(value, NaN) ? "0.0" : value
} else {
dataTable2[tableMeta.rowIndex][20] = total
......@@ -2255,9 +2257,9 @@ export default class ProfitLoss extends Component {
<div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1">
<button
<button
type="button"
onClick={() => this.setState({ loading: true, visibleProfitLoss: true }, () => {
onClick={() => this.setState({ loading: true, dataTable:[] }, () => {
setTimeout(() => {
this.getItemHierarki()
}, 100);
......
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