Skip to content

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

apdet

parent 8779cbe4
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 23 deletions
src/container/MonthlyReport.js
View file @ ed8dbe73
......@@ -689,6 +689,21 @@ export default class MonthlyReport extends Component {
clickDetail(item, id, revision, status) {
console.log(item)
let items = ''
if (item === 'Corporate Annual Target') {
items = 'CAT'
} else {
items = item
}
this.state.dataForRevision.map(i => {
if (i.report_name === items) {
if (i.revision !== revision) {
this.setState({ prevRevision: true })
} else {
this.setState({ prevRevision: false })
}
}
})
this.setState({
report_id: id,
revisionTable: revision,
......@@ -1757,7 +1772,8 @@ export default class MonthlyReport extends Component {
isApprover={this.state.isApprover}
status={this.state.status}
lastStatus={this.state.lastStatus}
// getReport={this.getCompanyActive.bind(this)}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
// getReport={this.getCompanyActive.bind(this)}
/>
)}
{this.state.visiblePL && (
......@@ -1776,7 +1792,8 @@ export default class MonthlyReport extends Component {
isApprover={this.state.isApprover}
status={this.state.status}
lastStatus={this.state.lastStatus}
// getReport={this.getCompanyActive.bind(this)}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
// getReport={this.getCompanyActive.bind(this)}
/>
)}
......@@ -1799,6 +1816,7 @@ export default class MonthlyReport extends Component {
status={this.state.status}
lastStatus={this.state.lastStatus}
// getReport={this.getCompanyActive.bind(this)}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/>
)}
{this.state.visibleFAM && (
......@@ -1817,6 +1835,7 @@ export default class MonthlyReport extends Component {
isApprover={this.state.isApprover}
status={this.state.status}
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/>
)}
{this.state.visibleCAT && (
......@@ -1835,6 +1854,7 @@ export default class MonthlyReport extends Component {
isApprover={this.state.isApprover}
status={this.state.status}
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/>
)}
{this.state.visibleLOCF && (
......@@ -1853,7 +1873,7 @@ export default class MonthlyReport extends Component {
isApprover={this.state.isApprover}
status={this.state.status}
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/>
)}
......@@ -1871,6 +1891,7 @@ export default class MonthlyReport extends Component {
onClickClose={() => this.setState({ visibleOI: false, visibleMonthlyReport: true })}
status={this.state.status}
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/>
)}
......
src/container/MonthlyReport/BalanceSheetMR.js
View file @ ed8dbe73
......@@ -70,6 +70,7 @@ export default class BalanceSheetMR extends Component {
let checkApprover = false
let checkLastStatus = false
let checkStatus = false
let checkPrevRev = false
if (this.props.isApprover) {
checkApprover = true
......@@ -82,9 +83,12 @@ export default class BalanceSheetMR extends Component {
} else {
checkLastStatus = false
}
// else if (this.props.prevRevision) {
// viewOnly = false
// }
if (this.props.prevRevision) {
checkPrevRev = true
} else {
checkPrevRev = false
}
if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') {
checkStatus = true
......@@ -92,7 +96,7 @@ export default class BalanceSheetMR extends Component {
checkStatus = false
}
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus})
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev})
}
getLatestUpdate() {
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ ed8dbe73
......@@ -71,6 +71,7 @@ export default class FixedAssetsMovementMR extends Component {
let checkApprover = false
let checkLastStatus = false
let checkStatus = false
let checkPrevRev = false
if (this.props.isApprover) {
checkApprover = true
......@@ -83,9 +84,12 @@ export default class FixedAssetsMovementMR extends Component {
} else {
checkLastStatus = false
}
// else if (this.props.prevRevision) {
// viewOnly = false
// }
if (this.props.prevRevision) {
checkPrevRev = true
} else {
checkPrevRev = false
}
if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') {
checkStatus = true
......@@ -93,7 +97,7 @@ export default class FixedAssetsMovementMR extends Component {
checkStatus = false
}
this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus })
this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
}
getLatestUpdate() {
......
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ ed8dbe73
......@@ -145,6 +145,7 @@ export default class ListOfCreditFacilities extends Component {
let checkApprover = false
let checkLastStatus = false
let checkStatus = false
let checkPrevRev = false
if (this.props.isApprover) {
checkApprover = true
......@@ -157,9 +158,12 @@ export default class ListOfCreditFacilities extends Component {
} else {
checkLastStatus = false
}
// else if (this.props.prevRevision) {
// viewOnly = false
// }
if (this.props.prevRevision) {
checkPrevRev = true
} else {
checkPrevRev = false
}
if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') {
checkStatus = true
......@@ -167,7 +171,7 @@ export default class ListOfCreditFacilities extends Component {
checkStatus = false
}
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus})
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev})
}
getItemHierarki() {
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ ed8dbe73
......@@ -110,6 +110,7 @@ export default class ProfitLossMR extends Component {
let checkApprover = false
let checkLastStatus = false
let checkStatus = false
let checkPrevRev = false
if (this.props.isApprover) {
checkApprover = true
......@@ -122,9 +123,12 @@ export default class ProfitLossMR extends Component {
} else {
checkLastStatus = false
}
// else if (this.props.prevRevision) {
// viewOnly = false
// }
if (this.props.prevRevision) {
checkPrevRev = true
} else {
checkPrevRev = false
}
if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') {
checkStatus = true
......@@ -132,7 +136,7 @@ export default class ProfitLossMR extends Component {
checkStatus = false
}
this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus })
this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev})
}
handleGetFor(type) {
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ ed8dbe73
......@@ -72,6 +72,7 @@ export default class TaxPlanningMR extends Component {
let checkApprover = false
let checkLastStatus = false
let checkStatus = false
let checkPrevRev = false
if (this.props.isApprover) {
checkApprover = true
......@@ -84,17 +85,20 @@ export default class TaxPlanningMR extends Component {
} else {
checkLastStatus = false
}
// else if (this.props.prevRevision) {
// viewOnly = false
// }
if (this.props.prevRevision) {
checkPrevRev = true
} else {
checkPrevRev = false
}
if (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') {
checkStatus = true
} else {
checkStatus = false
}
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus})
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev})
}
handleGetFor(type) {
......
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