Skip to content

T
Tia-dev
Commit 915515b4 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-' into 'master' 

Deni

See merge request !760
parents 8c6e3f42 16fdd7e0
Show whitespace changes
Inline Side-by-side
Showing with 298 additions and 217 deletions
src/container/BudgetTahunan.js
View file @ 915515b4
...@@ -85,15 +85,42 @@ export default class BudgetTahunan extends Component { ...@@ -85,15 +85,42 @@ export default class BudgetTahunan extends Component {
if (this.props.location.state !== undefined) { if (this.props.location.state !== undefined) {
// // console.log(this.props); // // console.log(this.props);
this.setState({ userType: this.props.location.state.userType, intent: 'Home', lastPeriod: this.props.location.state.rawData.periode, rawData: this.props.location.state.rawData }, () => { this.setState({ userType: this.props.location.state.userType, intent: 'Home', lastPeriod: this.props.location.state.rawData.periode, rawData: this.props.location.state.rawData }, () => {
this.checkApprover()
this.getPermission() this.getPermission()
// this.checkApprover()
}) })
} else { } else {
this.checkApprover()
this.getPermission() this.getPermission()
// this.checkApprover()
} }
} }
getPermission() {
let payload = {
menu: "Master Budget & CAT"
}
api.create().getPermission(payload).then(response => {
console.log(response)
if (response.data) {
if (response.data.status === "success") {
this.setState({
btncreate: response.data.data.create,
btnedit: response.data.data.edit,
btndelete: response.data.data.delete,
// load: true
}, ()=> {
this.checkApprover()
})
} else {
this.setState({
// load: true
})
}
} else {
this.setState({ load: true })
}
})
}
getRole(id) { getRole(id) {
api.create().getDetailRole(id).then((response) => { api.create().getDetailRole(id).then((response) => {
if (response.data) { if (response.data) {
...@@ -505,10 +532,10 @@ export default class BudgetTahunan extends Component { ...@@ -505,10 +532,10 @@ export default class BudgetTahunan extends Component {
this.getLatestPeriodSubmit() this.getLatestPeriodSubmit()
api.create().checkApprover().then(response => { api.create().checkApprover().then(response => {
// // console.log(response); // // console.log(response);
if (response.data.data.is_approver === true) { if (this.state.btncreate === true && this.state.btnedit === true ) {
this.setState({ isApprover: true, checkApprover: true })
} else {
this.setState({ isApprover: false, checkApprover: false }) this.setState({ isApprover: false, checkApprover: false })
} else {
this.setState({ isApprover: true, checkApprover: true })
} }
}) })
......
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 915515b4
...@@ -48,13 +48,46 @@ export default class BalanceSheetMR extends Component { ...@@ -48,13 +48,46 @@ export default class BalanceSheetMR extends Component {
visibleBSMR: true, visibleBSMR: true,
valueThreshold: 0, valueThreshold: 0,
minValue: 0, minValue: 0,
maxValue: 0 maxValue: 0,
updateBy: '-'
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
} }
componentDidMount() { componentDidMount() {
this.getSettingControl() this.getSettingControl()
this.getLatestUpdate()
}
getLatestUpdate() {
let payload = {
"report_id": this.props.report_id,
"revision": Number(this.props.revision),
"periode": this.props.periode,
"company_id": this.props.company.company_id,
"monthly_report_id": this.props.monthlyReportId,
"months": this.props.month.month_id
}
api.create().getLastestUpdateMB(payload).then(response => {
if (response.data) {
if (response.data.status === "success") {
this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update
})
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
if (response.data.message.includes("Someone Logged In")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
}
})
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
}
})
} }
getSettingControl() { getSettingControl() {
...@@ -809,7 +842,7 @@ export default class BalanceSheetMR extends Component { ...@@ -809,7 +842,7 @@ export default class BalanceSheetMR extends Component {
} }
}, },
{ {
name: "Rolling Outlook (FY2021)", name: `Rolling Outlook (FY${this.props.periode})`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}> <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#07a7d0', width: 96, borderLeft: '1px #fff solid', borderRight: '1px #fff solid' }}>
...@@ -837,19 +870,19 @@ export default class BalanceSheetMR extends Component { ...@@ -837,19 +870,19 @@ export default class BalanceSheetMR extends Component {
name: `Month To Date (MTD)`, name: `Month To Date (MTD)`,
options: { options: {
customHeadRender: (columnMeta) => ( customHeadRender: (columnMeta) => (
<th style={{ ...style2, color: '#fff', backgroundColor: '#1c71b8', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} > <th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
{/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}> {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography> <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell> */} </TableCell> */}
<div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 43, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div> <div style={{ borderBottom: "1px #fff solid", justifyContent: 'center', display: 'flex', alignItems: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 40 }}>{columnMeta.name}</div>
<div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}> <div className="grid grid-3x" style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}> <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
<span>{"Master Budget (MB)"}</span> <span>{"Master Budget (MB)"}</span>
</div> </div>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}> <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
<span>{"Rolling Budget (RB)"}</span> <span>{"Rolling Budget (RB)"}</span>
</div> </div>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6', height: '100%', display: 'grid', alignContent: 'center' }}> <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
<span>{"Actual"}</span> <span>{"Actual"}</span>
</div> </div>
</div> </div>
...@@ -881,7 +914,7 @@ export default class BalanceSheetMR extends Component { ...@@ -881,7 +914,7 @@ export default class BalanceSheetMR extends Component {
value={Number(handleValue(tableMeta, 0)).toFixed(1)} value={Number(handleValue(tableMeta, 0)).toFixed(1)}
/> />
</span> : </span> :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6? tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -932,7 +965,7 @@ export default class BalanceSheetMR extends Component { ...@@ -932,7 +965,7 @@ export default class BalanceSheetMR extends Component {
value={Number(handleValue(tableMeta, 1)).toFixed(1)} value={Number(handleValue(tableMeta, 1)).toFixed(1)}
/> />
</span> : </span> :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6? tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -992,7 +1025,7 @@ export default class BalanceSheetMR extends Component { ...@@ -992,7 +1025,7 @@ export default class BalanceSheetMR extends Component {
} }
/> />
</div> : </div> :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6? tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1713,9 +1746,13 @@ export default class BalanceSheetMR extends Component { ...@@ -1713,9 +1746,13 @@ export default class BalanceSheetMR extends Component {
</MuiThemeProvider> </MuiThemeProvider>
)} )}
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
</div>
{/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null : {/* {this.props.isApprover === true || this.state.dataTable.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="grid grid-2x" style={{ marginTop: 20 }}> <div className="grid grid-2x" style={{ padding: 20 }}>
<div className="col-1"> <div className="col-1">
<button <button
type="button" type="button"
...@@ -1809,7 +1846,6 @@ export default class BalanceSheetMR extends Component { ...@@ -1809,7 +1846,6 @@ export default class BalanceSheetMR extends Component {
</div> </div>
{/* : null {/* : null
} */} } */}
</div>
</Paper> : </Paper> :
<Paper style={{ paddingTop: 10 }}> <Paper style={{ paddingTop: 10 }}>
<div style={{ borderBottom: 'solid 1px #c4c4c4' }} > <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
......
src/container/MonthlyReport/CashFlowMR.js
View file @ 915515b4
...@@ -161,11 +161,10 @@ export default class CashFlowMR extends Component { ...@@ -161,11 +161,10 @@ export default class CashFlowMR extends Component {
}) })
anjay.push(forecastt) anjay.push(forecastt)
} else if (String(item).includes('[M-1]')) { } else if (String(item).includes('[M-1]')) {
let tst = String(item).replace('[M-1]', '') let tst = String(item).replace('[M-1]', '[M1]')
let data = tableMeta.columnIndex == 7 ? 18 : tableMeta.columnIndex - 1 let data = tableMeta.columnIndex
let period = data == 18 ? Number(this.props.periode) - 1 : this.props.periode
// console.log(tableMeta.columnIndex) // console.log(tableMeta.columnIndex)
let indexID = tableMeta.rowData[data].formula.findIndex((val) => val.item_formula == String(`@${tst}`) && val.periode == period) let indexID = tableMeta.rowData[data].actual_formula.findIndex((val) => val.item_formula == String(`@${tst}`))
// console.log(indexID) // console.log(indexID)
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = tableMeta.rowData[data].formula[indexID].value let valuezz = tableMeta.rowData[data].formula[indexID].value
...@@ -361,7 +360,17 @@ export default class CashFlowMR extends Component { ...@@ -361,7 +360,17 @@ export default class CashFlowMR extends Component {
console.log(tableMeta); console.log(tableMeta);
return ( return (
<div style={{ textAlign: 'right' }}> <div style={{ textAlign: 'right' }}>
{null} {tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ||tableMeta.rowData[0] === 7 ?
<span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(handleValueFormula(value, tableMeta, 2)).toFixed(1)}
/>
</span> : null}
</div> </div>
) )
} }
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 915515b4
...@@ -402,13 +402,17 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -402,13 +402,17 @@ export default class FixedAssetsMovementMR extends Component {
} else { } else {
if (String(item).includes('#')) { if (String(item).includes('#')) {
if (String(item).includes('[M-1]')) { if (String(item).includes('[M-1]')) {
let tst = String(item).replace('[M-1]', '') let tst = String(item).replace('[M-1]', '[M1]')
let indexID = dataTable2.findIndex((val) => val[17] == tst) // console.log(dataTable2[tableMeta.rowIndex]);
// console.log(indexID); // console.log(tableMeta);
// console.log(tst);
let indexID = dataTable2[tableMeta.rowIndex][16].findIndex((val) => val.item_formula == tst)
console.log(indexID);
if (indexID !== -1) { if (indexID !== -1) {
let valuezz = dataTable2[indexID][8] let valuezz = dataTable2[tableMeta.rowIndex][16][indexID].value
anjay.push(valuezz == "" ? 0 : valuezz) anjay.push(valuezz == "" ? 0 : valuezz)
// console.log(valuezz);
} }
} else { } else {
let data = tableMeta.rowData[16] let data = tableMeta.rowData[16]
...@@ -1183,6 +1187,11 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1183,6 +1187,11 @@ export default class FixedAssetsMovementMR extends Component {
options: { options: {
display: false display: false
} }
}, {
name: "",
options: {
display: false
}
}] }]
const loadingComponent = ( const loadingComponent = (
......
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