Skip to content

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

update

parent f33cb776
Hide whitespace changes
Inline Side-by-side
Showing with 526 additions and 603 deletions
src/container/BudgetTahunan.js
View file @ 87b67844
...@@ -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: true }, () => { this.setState({ isSubmit: response.data.data.is_can_submit }, () => {
this.getReport() this.getReport()
this.getReportAttachment() this.getReportAttachment()
}) })
...@@ -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 ?
......
src/container/BudgetTahunan/BalanceSheet.js
View file @ 87b67844
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 @ 87b67844
...@@ -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 @ 87b67844
...@@ -399,7 +399,7 @@ export default class ProfitLoss extends Component { ...@@ -399,7 +399,7 @@ export default class ProfitLoss extends Component {
}) })
// console.log(this.state.buttonError) // console.log(this.state.buttonError)
}) })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) { if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
...@@ -567,7 +567,7 @@ export default class ProfitLoss extends Component { ...@@ -567,7 +567,7 @@ export default class ProfitLoss extends Component {
let indexParent = dataTable2.findIndex((val) => val[1] == tableMeta.rowData[2]) let indexParent = dataTable2.findIndex((val) => val[1] == tableMeta.rowData[2])
if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "sales price") { if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "sales price") {
let value = 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])
dataTable2[tableMeta.rowIndex][20] = R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value)) dataTable2[tableMeta.rowIndex][20] = R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value))
return R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value)) return R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value))
} else if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "total man power") { } else if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "total man power") {
let totalTMP = dataTable2[tableMeta.rowIndex][20] = dataTable2[tableMeta.rowIndex][19] let totalTMP = dataTable2[tableMeta.rowIndex][20] = dataTable2[tableMeta.rowIndex][19]
...@@ -595,8 +595,8 @@ export default class ProfitLoss extends Component { ...@@ -595,8 +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) // let a = dataTable2[data.rowIndex][data.columnIndex] = Number(value)
// console.log(indexParent); // console.log(indexParent);
return a return a
} }
...@@ -2523,8 +2523,8 @@ export default class ProfitLoss extends Component { ...@@ -2523,8 +2523,8 @@ export default class ProfitLoss extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
value={Number(value).toFixed(1)} // value={Number(value).toFixed(1)}
// value={Number(handleTotal(tableMeta)).toFixed(1)} value={Number(handleTotal(tableMeta)).toFixed(1)}
/> />
</span>} </span>}
</div> </div>
...@@ -2888,21 +2888,21 @@ export default class ProfitLoss extends Component { ...@@ -2888,21 +2888,21 @@ 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')) && */} {((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"> <a data-tip={'Upload'} data-for="upload">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
margin: 5 margin: 5
}} }}
onClick={() => this.setState({ visibleUpload: true })} onClick={() => this.setState({ visibleUpload: true })}
> >
<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
...@@ -2950,7 +2950,7 @@ export default class ProfitLoss extends Component { ...@@ -2950,7 +2950,7 @@ export default class ProfitLoss extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
) )
}) : }) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
} }
</div> </div>
</div> </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