Skip to content

T
Tia-dev
Commit 6644120f authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Env dev

See merge request !2389
parents 5486bbf4 7b182df8
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 45 deletions
src/container/BudgetTahunan/BudgetTahunan.js
View file @ 6644120f
......@@ -115,6 +115,14 @@ export default class BudgetTahunan extends Component {
dataForRevisionCAT: [],
rowDataFinance: [],
rowDataCAT: [],
submitterCAT: null,
approverIDCAT: null,
picCAT: null,
btnApproveCAT: false,
lastStatusCat: null,
rowData: [],
dataTableHistoryCAT: [],
visibleTableHistoryCAT: false,
}
this.myRef = React.createRef()
this.fileHandler = this.fileHandler.bind(this);
......@@ -347,7 +355,7 @@ export default class BudgetTahunan extends Component {
item.number,
item.report_name === 'CAT' ? 'Corporate Annual Target' : item.report_name,
item.revision,
this.state.lastStatus === 'APPROVED' ? 'CLOSED' : this.state.isSubmit === false ? "CLOSED" : status_approv,
(item?.master_report_type_id === 2 ? this.state.lastStatusCat : this.state.lastStatus) === 'APPROVED' ? 'CLOSED' : this.state.isSubmit === false ? "CLOSED" : status_approv,
item.report_id,
item.report_name === "Cash Flow" ? handleOpbal(item.is_can_upload) : (Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : handleOpbal(item.is_can_upload)) : handleOpbal(item.is_can_upload)),
item.revision
......@@ -397,6 +405,7 @@ export default class BudgetTahunan extends Component {
loading: false, dataTable: resultDataTableFinance, dataTableCAT: resultDataTableCAT,
rowDataFinance,
rowDataCAT,
rowData: listData,
dataTableRevision: dataTableRevision,
dataForRevision: rowDataTableFinance,
dataTableRevisionCAT: dataTableRevisionCAT,
......@@ -660,10 +669,11 @@ export default class BudgetTahunan extends Component {
this.setState({ loading: true }, () => {
document.body.style.overflow = 'hidden';
})
const _lastStatus = this.getLastStatus()
let payload = {
"company_id": this.state.company.company_id,
"periode": this.state.periode.periode,
"is_approver": this.state.isAdmin && this.state.lastStatus == 'WAITING FOR APPROVAL' ? false : (this.state.permissionhandle ? this.state.permissionhandle : this.state.isApprover)
"is_approver": this.state.isAdmin && _lastStatus == 'WAITING FOR APPROVAL' ? false : (this.state.permissionhandle ? this.state.permissionhandle : this.state.isApprover)
}
console.log(payload)
api.create().getSubmission(payload).then(response => {
......@@ -677,13 +687,18 @@ export default class BudgetTahunan extends Component {
}
this.setState({
submissionID: response.data.data.submission_id,
submitter: response.data.data.submitter,
approverID: response.data.data.approve_id, pic: response.data.data.approver == null ? '' : response.data.data.approver,
submitter: response.data.data.submitter_finance,
submitterCAT: response.data.data.submitter_cat,
approverID: response.data.data.finance_approve_id,
approverIDCAT: response.data.data.cat_approve_id,
pic: response.data.data.approver_finance == null ? '' : response.data.data.approver_finance,
picCAT: response.data.data.approver_cat == null ? '' : response.data.data.approver_cat,
lastStatus: response.data.data.last_status_finance === null ? 'SUBMIT' : response.data.data.last_status_finance,
lastStatusCat: response.data.data.last_status_cat === null ? 'SUBMIT' : response.data.data.last_status_cat,
lastRevision: response.data.data.last_revision,
btnApprove: response.data.data.is_submit,
loading: false
btnApprove: response.data.data.is_submit_finance,
btnApproveCAT: response.data.data.is_submit_cat,
loading: false,
}, () => {
// // console.log(response.data.data.is_submit);
// // console.log(this.state.btnApprove)
......@@ -2148,32 +2163,44 @@ export default class BudgetTahunan extends Component {
}
historyApproval() {
let body = {
"company_id": this.state.company.company_id,
"periode": this.state.periode.periode
}
api.create().historyApproval(body).then(response => {
// // // console.log(response);
if (response.data.data.length > 0) {
let dataTableHistory = response.data.data.map(item => {
let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C')
let status_approv = ''
if (String(item.status_approval).toLocaleUpperCase().includes('CC')) {
status_approv = `${String(item.status_approval).substr(0, indexC)}${String(item.status_approval).substr(indexC + 1, String(item.status_approval).length)}`
const uniqueTypeIds =
this.state.rowData?.length
? [...new Set(this.state.rowData.map(item => item.master_report_type_id))]
: [1, 2];
uniqueTypeIds.forEach((master_report_type_id) => {
let body = {
"company_id": this.state.company.company_id,
"periode": this.state.periode.periode,
master_report_type_id
}
api.create().historyApproval(body).then(response => {
// // // console.log(response);
if (response.data.data.length > 0) {
const dataTable = response.data.data.forEach(item => {
let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C')
let status_approv = ''
if (String(item.status_approval).toLocaleUpperCase().includes('CC')) {
status_approv = `${String(item.status_approval).substr(0, indexC)}${String(item.status_approval).substr(indexC + 1, String(item.status_approval).length)}`
} else {
status_approv = String(item.status_approval)
}
return [
item.pic,
status_approv,
item.remarks,
item.item_revision,
item.history_approval_date
]
})
if (master_report_type_id === 2) {
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
} else {
status_approv = String(item.status_approval)
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
}
return [
item.pic,
status_approv,
item.remarks,
item.item_revision,
item.history_approval_date
]
})
this.setState({ dataTableHistory, visibleTableHistory: true })
}
})
}
})
});
}
async setHeaderTokenSuperadmin(type) {
......@@ -2730,13 +2757,27 @@ export default class BudgetTahunan extends Component {
getLastStatus = () => {
const { tableKey, lastStatus, lastStatusCat } = this.state
if (tableKey === 'CAT') {
return lastStatusCat
} else {
return lastStatus
}
return tableKey === 'CAT' ? lastStatusCat : lastStatus
}
getSubmissionObj = (tableKeyParam) => {
const {
tableKey,
btnApprove,
btnApproveCAT,
lastStatus,
lastStatusCat,
submitter,
submitterCAT,
} = this.state;
const key = tableKeyParam ?? tableKey;
return key === 2
? { btnApprove: btnApproveCAT, lastStatus: lastStatusCat, submitter: submitterCAT }
: { btnApprove, lastStatus, submitter };
};
renderFilter = () => {
return (
<div>
......@@ -2844,13 +2885,14 @@ export default class BudgetTahunan extends Component {
}
renderAttachment = () => {
const _lastStatus = this.getLastStatus()
return (
<>
<div style={{ display: 'flex', marginTop: 20 }}>
<div style={{ width: '50%' }}>
<Typography style={{ fontSize: '16px', color: '#4b4b4b', fontWeight: 'bold' }}>Attachment: </Typography>
</div>
{!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
{!this.state.isApprover && (_lastStatus === 'SUBMIT' || _lastStatus === 'REVISION') && (
<div style={{ width: '50%' }}>
<button
style={{
......@@ -2896,7 +2938,7 @@ export default class BudgetTahunan extends Component {
: null
}
</div>
{!this.state.isApprover && (this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && (
{!this.state.isApprover && (_lastStatus === 'SUBMIT' || _lastStatus === 'REVISION') && (
<div style={{ width: '50%' }}>
{
this.state.listAttachment.length > 0 ?
......@@ -2926,8 +2968,9 @@ export default class BudgetTahunan extends Component {
}
renderBtnSubmit = (master_report_type_id) => {
const obj = this.getSubmissionObj(master_report_type_id)
return (
this.state.isAdmin && this.state.lastStatus == 'APPROVED' ?
this.state.isAdmin && obj.lastStatus == 'APPROVED' ?
<div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}>
<div className="col-1" />
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
......@@ -2961,7 +3004,7 @@ export default class BudgetTahunan extends Component {
</div>
</div>
:
this.state.isAdmin && (this.state.lastStatus == 'WAITING FOR YOUR APPROVAL' || this.state.lastStatus == 'WAITING FOR APPROVAL') ?
this.state.isAdmin && (obj.lastStatus == 'WAITING FOR YOUR APPROVAL' || obj.lastStatus == 'WAITING FOR APPROVAL') ?
<div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}>
<div className="col-1" />
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
......@@ -2982,7 +3025,7 @@ export default class BudgetTahunan extends Component {
</div>
:
this.state.checkApprover === true ?
this.state.lastStatus === 'WAITING FOR REVIEW' ?
obj.lastStatus === 'WAITING FOR REVIEW' ?
<div style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', display: 'flex', justifyContent: 'flex-end' }} >
<button
style={{
......@@ -2999,7 +3042,7 @@ export default class BudgetTahunan extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Review</Typography>
</div>
</button>
</div> : (this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' && this.state.btnApprove) ?
</div> : (obj.lastStatus === 'WAITING FOR YOUR APPROVAL' && obj.btnApprove) ?
<div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}>
<div className="col-1" />
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
......@@ -3033,7 +3076,7 @@ export default class BudgetTahunan extends Component {
</div>
</div> : null
:
(this.state.lastStatus === 'SUBMIT' || this.state.lastStatus === 'REVISION') && this.state.isSubmit === true ?
(obj.lastStatus === 'SUBMIT' || obj.lastStatus === 'REVISION') && this.state.isSubmit === true ?
<div style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', display: 'flex', justifyContent: 'flex-end' }} >
<button
style={{
......@@ -3049,7 +3092,7 @@ export default class BudgetTahunan extends Component {
</div>
</button>
</div> :
this.state.lastStatus === 'SUBMITTED' && this.state.submitter ?
obj.lastStatus === 'SUBMITTED' && obj.submitter ?
<div style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', display: 'flex', justifyContent: 'flex-end' }} >
<button
style={{
......@@ -3468,7 +3511,7 @@ export default class BudgetTahunan extends Component {
</MuiThemeProvider>
{this.renderAttachment()}
</div>
{this.renderBtnSubmit(this.state?.rowDataFinance?.length > 0 && this.state.rowDataFinance[0]?.master_report_type_id)}
{this.renderBtnSubmit(this.state?.rowDataCAT?.length > 0 && this.state.rowDataCAT[0]?.master_report_type_id)}
</Paper>
</div>
</div>
......@@ -3656,7 +3699,7 @@ export default class BudgetTahunan extends Component {
lastStatus={this.getLastStatus()}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
// PLBSFAMSubmitted={false}
PLBSFAMSubmitted={this.state.lastStatus == 'APPROVED' ? true : false}
PLBSFAMSubmitted={this.getLastStatus() == 'APPROVED' ? true : false}
createCashFlow={this.createCashFlow.bind(this)}
/>
)
......
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