Skip to content

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

Merge branch 'GGMAC' into 'master' 

Ggmac

See merge request !1472
parents 707c635a f33cb776
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 829 additions and 650 deletions
src/container/BudgetTahunan.js
View file @ 1de6193d
...@@ -342,7 +342,7 @@ export default class BudgetTahunan extends Component { ...@@ -342,7 +342,7 @@ export default class BudgetTahunan extends Component {
// // // console.log(response); // // // console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ isSubmit: response.data.data.is_can_submit }, () => { this.setState({ isSubmit: true }, () => {
this.getReport() this.getReport()
this.getReportAttachment() this.getReportAttachment()
}) })
...@@ -1060,7 +1060,7 @@ export default class BudgetTahunan extends Component { ...@@ -1060,7 +1060,7 @@ export default class BudgetTahunan extends Component {
listCF.push(item) listCF.push(item)
}) })
this.setState({dbCF: listCF}, () => { this.setState({ dbCF: listCF }, () => {
this.olahDataCashFlowOneMore(listCF, type) this.olahDataCashFlowOneMore(listCF, type)
}) })
} }
...@@ -1170,8 +1170,8 @@ export default class BudgetTahunan extends Component { ...@@ -1170,8 +1170,8 @@ export default class BudgetTahunan extends Component {
// } // }
// if (type != undefined) { // if (type != undefined) {
// if (type == 'BS' || type == 'FAM' || type == 'PL') { // if (type == 'BS' || type == 'FAM' || type == 'PL') {
console.log('tarik sis') console.log('tarik sis')
// this.createCashFlow() // this.createCashFlow()
// } // }
// } // }
}) })
...@@ -1519,7 +1519,7 @@ export default class BudgetTahunan extends Component { ...@@ -1519,7 +1519,7 @@ export default class BudgetTahunan extends Component {
} }
}) })
if(String(tableMeta[5]) == "Cost of Goods Sold (COGS)" && column == 20) { if (String(tableMeta[5]) == "Cost of Goods Sold (COGS)" && column == 20) {
console.log(splitFormula) console.log(splitFormula)
console.log(baru) console.log(baru)
console.log(anjay) console.log(anjay)
...@@ -2224,7 +2224,7 @@ export default class BudgetTahunan extends Component { ...@@ -2224,7 +2224,7 @@ export default class BudgetTahunan extends Component {
this.state.dataTable.map(item => { this.state.dataTable.map(item => {
// if (item[1] !== 'Cash Flow') { // if (item[1] !== 'Cash Flow') {
if (item[3] !== "submitted" && item[3] !== 'approved') { if (item[3] !== "submitted" && item[3] !== 'approved') {
canSubmit = false // canSubmit = false
array.push(item[3]) array.push(item[3])
} }
// } // }
...@@ -2357,9 +2357,9 @@ export default class BudgetTahunan extends Component { ...@@ -2357,9 +2357,9 @@ export default class BudgetTahunan extends Component {
borderColor: 'transparent' borderColor: 'transparent'
}} }}
onClick={() => onClick={() =>
tableMeta.rowData[5] == true ? // tableMeta.rowData[5] == true ?
this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3]) this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
: null // : null
} }
> >
{/* {this.state.isApprover == true ? {/* {this.state.isApprover == true ?
...@@ -2569,6 +2569,32 @@ export default class BudgetTahunan extends Component { ...@@ -2569,6 +2569,32 @@ export default class BudgetTahunan extends Component {
<div style={{ borderBottom: 'solid 1px #c4c4c4' }} > <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
<Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget</Typography> <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Master Budget</Typography>
</div> </div>
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
outline: 'none',
}}
onClick={() => this.validate()}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Submit</Typography>
</div>
</button>
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
outline: 'none',
}}
onClick={() => this.approvalSubmission('approve')}
>
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Approve</Typography>
</div>
</button>
<div style={{ padding: 20 }}> <div style={{ padding: 20 }}>
<div> <div>
<Autocomplete <Autocomplete
...@@ -3036,6 +3062,7 @@ export default class BudgetTahunan extends Component { ...@@ -3036,6 +3062,7 @@ export default class BudgetTahunan extends Component {
status={this.state.status} status={this.state.status}
lastStatus={this.state.lastStatus} lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
// PLBSFAMSubmitted={false}
PLBSFAMSubmitted={this.state.lastStatus == 'APPROVED'? true : false} PLBSFAMSubmitted={this.state.lastStatus == 'APPROVED'? true : false}
createCashFlow={this.createCashFlow.bind(this)} createCashFlow={this.createCashFlow.bind(this)}
/> />
......
src/container/BudgetTahunan/BalanceSheet.js
View file @ 1de6193d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CashFlow.js
View file @ 1de6193d
...@@ -3195,8 +3195,8 @@ export default class CashFlow extends Component { ...@@ -3195,8 +3195,8 @@ export default class CashFlow extends Component {
</div> </div>
</button> </button>
</div> </div>
{this.props.isApprover === true || dataTable2.length == 0 ? null : {/* {this.props.isApprover === true || dataTable2.length == 0 ? null :
(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}> <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button <button
type="button" type="button"
...@@ -3221,7 +3221,7 @@ export default class CashFlow extends Component { ...@@ -3221,7 +3221,7 @@ export default class CashFlow extends Component {
</div> </div>
</button> </button>
</div> </div>
: null} {/* : null} */}
</div> </div>
</div> </div>
</Paper> </Paper>
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 1de6193d
...@@ -595,7 +595,8 @@ export default class ProfitLoss extends Component { ...@@ -595,7 +595,8 @@ export default class ProfitLoss extends Component {
} }
}) })
let indexParent = dataTable2.findIndex((val) => val[1] == dataTable2[data.rowIndex][2]) let indexParent = dataTable2.findIndex((val) => val[1] == dataTable2[data.rowIndex][2])
let a = dataTable2[data.rowIndex][data.columnIndex] = Number(total) // let a = dataTable2[data.rowIndex][data.columnIndex] = Number(total)
let a = dataTable2[data.rowIndex][data.columnIndex] = Number(value)
// console.log(indexParent); // console.log(indexParent);
return a return a
} }
...@@ -672,9 +673,12 @@ export default class ProfitLoss extends Component { ...@@ -672,9 +673,12 @@ export default class ProfitLoss extends Component {
// console.log(arrayJumlah); // console.log(arrayJumlah);
// } // }
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === "" || dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === undefined || dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === null) { // if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === "" || dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === undefined || dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] === null) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total)
// // }
// return Number(total)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(data)
// } // }
return Number(total) return Number(data)
} }
...@@ -2519,7 +2523,8 @@ export default class ProfitLoss extends Component { ...@@ -2519,7 +2523,8 @@ export default class ProfitLoss extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
value={Number(handleTotal(tableMeta)).toFixed(1)} value={Number(value).toFixed(1)}
// value={Number(handleTotal(tableMeta)).toFixed(1)}
/> />
</span>} </span>}
</div> </div>
...@@ -2869,7 +2874,7 @@ export default class ProfitLoss extends Component { ...@@ -2869,7 +2874,7 @@ export default class ProfitLoss extends Component {
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
</div> : </div> :
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
{((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && <a data-tip={'Download Template'} data-for="template"> {<a data-tip={'Download Template'} data-for="template">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -2883,7 +2888,8 @@ export default class ProfitLoss extends Component { ...@@ -2883,7 +2888,8 @@ export default class ProfitLoss extends Component {
</button> </button>
</a>} </a>}
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
{((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && <a data-tip={'Upload'} data-for="upload"> {/* {((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && */}
<a data-tip={'Upload'} data-for="upload">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -2895,7 +2901,8 @@ export default class ProfitLoss extends Component { ...@@ -2895,7 +2901,8 @@ export default class ProfitLoss extends Component {
> >
<img src={Images.upload} /> <img src={Images.upload} />
</button> </button>
</a>} </a>
{/* // } */}
<ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
<a data-tip={'Download'} data-for="download"> <a data-tip={'Download'} data-for="download">
<button <button
......
src/container/OutlookPA.js
View file @ 1de6193d
This diff is collapsed.
src/container/RollingOutlook.js
View file @ 1de6193d
This diff is collapsed.
src/container/RollingOutlook/CashFlowRO.js
View file @ 1de6193d
This diff is collapsed.
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