Skip to content

T
Tia-dev
Commit 3397b424 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'didam' into 'master' 

apdet

See merge request !605
parents c028a2f3 f475cc52
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 10 deletions
src/container/BudgetTahunan.js
View file @ 3397b424
......@@ -398,7 +398,8 @@ export default class BudgetTahunan extends Component {
approverID: response.data.data.approve_id, pic: response.data.data.approver == null ? '' : response.data.data.approver,
lastStatus: response.data.data.last_status === null ? 'SUBMIT' : response.data.data.last_status,
lastRevision: response.data.data.last_revision,
btnApprove: response.data.data.is_submit
btnApprove: response.data.data.is_submit,
// loading: false
}, () => {
// console.log(this.state.lastStatus);
this.historyApproval()
......@@ -699,6 +700,7 @@ export default class BudgetTahunan extends Component {
}
validateRevision() {
this.scrollToMyRef()
let arrayRevisi = this.state.detailRevisiCheck
let remarksKosong = 0
arrayRevisi.map((item, index) => {
......@@ -706,7 +708,8 @@ export default class BudgetTahunan extends Component {
remarksKosong += 1
}
})
if (remarksKosong > 0) {
console.log(arrayRevisi)
if (arrayRevisi.length == 0 || remarksKosong > 0) {
this.setState({ alert: true, messageAlert: 'Remarks Cannot be Empty', tipeAlert: 'error' })
} else {
this.setState({ visibleRevision: false }, () => this.approvalSubmission('revision'))
......
src/container/BudgetTahunan/CashFlow.js
View file @ 3397b424
......@@ -2345,7 +2345,7 @@ export default class CashFlow extends Component {
}}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div>
</button>
</div>
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 3397b424
......@@ -2262,7 +2262,7 @@ export default class CorporateAnnualTarget extends Component {
})}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div>
</button>
</div>
......@@ -2379,7 +2379,7 @@ export default class CorporateAnnualTarget extends Component {
})}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div>
</button>
</div>
......
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @ 3397b424
......@@ -2277,7 +2277,7 @@ export default class FixedAssetsMovement extends Component {
})}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div>
</button>
</div>
......@@ -2390,7 +2390,7 @@ export default class FixedAssetsMovement extends Component {
style={{ marginRight: 20 }}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div>
</button>
</div>
......
src/container/HomePage.js
View file @ 3397b424
......@@ -90,6 +90,7 @@ class HomePage extends Component {
getDashboard() {
let listDashboard = []
let rawData = []
api.create().getDashboard().then((response) => {
// console.log(response);
if (String(response.data.status).toLocaleLowerCase() == 'success') {
......@@ -97,8 +98,9 @@ class HomePage extends Component {
data.map((item, index) => {
let statusConvert = item.status == 'approval_review'? 'Waiting For Review' : item.status == 'approval_proccess'? 'Waiting For Approval' : titleCase(item.status)
listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} - ${item.periode}`, item.revision, item.status, statusConvert])
rawData.push(item)
})
this.setState({ listDashboard, rawData: response.data.data })
this.setState({ listDashboard, rawData })
}
})
}
......
src/container/OprIndicator/OperatingIndicatorDetail.js
View file @ 3397b424
......@@ -1968,7 +1968,7 @@ export default class BalanceSheet extends Component {
}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div>
</button>
</div>
......@@ -2072,7 +2072,7 @@ export default class BalanceSheet extends Component {
})}
>
<div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Back</Typography>
</div>
</button>
</div>
......
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