Skip to content

T
Tia-dev
Commit e0d3486d authored by qorri_di's avatar qorri_di
Browse files
Options

Fixing Conflic Merge

parent 5a37d455
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 27671 additions and 25392 deletions
package-lock.json
View file @ e0d3486d
...@@ -17900,6 +17900,16 @@ ...@@ -17900,6 +17900,16 @@
} }
} }
}, },
"suneditor": {
"version": "2.44.3",
"resolved": "https://registry.npmjs.org/suneditor/-/suneditor-2.44.3.tgz",
"integrity": "sha512-B25DrbAxcwkvAANNm2EClugBCxATCa3SvV03SpyaMJybKj4bzQnS1iq6Wo3h+v970tNSnjfeoT3ID3Nj0NuiBA=="
},
"suneditor-react": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/suneditor-react/-/suneditor-react-3.4.1.tgz",
"integrity": "sha512-xsfMjy2748x8Bcw/SeT2CeecrBABcJPyCO+LPourVLcQg8QW/A9FbIfP0DghNlBkH/gxy9iviR5wVydg9UW2wQ=="
},
"supports-color": { "supports-color": {
"version": "5.5.0", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
......
package.json
View file @ e0d3486d
...@@ -47,7 +47,9 @@ ...@@ -47,7 +47,9 @@
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "3.4.1", "react-scripts": "3.4.1",
"react-spinners": "^0.9.0", "react-spinners": "^0.9.0",
"react-tooltip": "^4.2.8" "react-tooltip": "^4.2.8",
"suneditor": "^2.44.3",
"suneditor-react": "^3.4.1"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
......
src/api/index.js
View file @ e0d3486d
...@@ -488,6 +488,21 @@ const create = (type = "") => { ...@@ -488,6 +488,21 @@ const create = (type = "") => {
const getMonitoringOLPA = (body) => api.get(`transaction/monitoring/outlook/${body.year}`) const getMonitoringOLPA = (body) => api.get(`transaction/monitoring/outlook/${body.year}`)
const getMonitoringCafrm = (body) => api.get(`transaction/monitoring/cafrm/${body.year}/${body.month}/${body.status}`) const getMonitoringCafrm = (body) => api.get(`transaction/monitoring/cafrm/${body.year}/${body.month}/${body.status}`)
// Maintenance
const getDetailMaintenanceMode = () => api.get('maintenance/mode/get_maintenance_mode')
const createMaintenanceMode = (body) => api.post('maintenance/mode/create_maintenance_mode', body)
const updateMaintenanceMode = (body) => api.post('maintenance/mode/update_maintenance_mode', body)
// Reminder Manual
const sendEmail = (body) => api.post('transaction/monitoring/reminder_progress_report', body)
// Download Report
const createDownloadFile = (body) => api.post('transaction/create/download-files-report', body)
const createZipReport = (id) => api.get(`transaction/zip-files?downloadedFileReportId=${id}`)
const getListDownload = () => api.get('transaction/download-files')
const downloadZipReport = (id) => api.get(`transaction/download/zip-files?downloadedFileReportId=${id}`)
// const createZipReport = (body) => api.post('transaction/monthly_report/export_selected_report', body)
// Superadmin Approve // Superadmin Approve
const getListApprover = (report, monthlyReportId) => api.get(`transaction/${report}/get_approver/${monthlyReportId}`) const getListApprover = (report, monthlyReportId) => api.get(`transaction/${report}/get_approver/${monthlyReportId}`)
const getIdToken = (userId) => api.get(`transaction/get_token/${userId}`) const getIdToken = (userId) => api.get(`transaction/get_token/${userId}`)
...@@ -844,7 +859,15 @@ const create = (type = "") => { ...@@ -844,7 +859,15 @@ const create = (type = "") => {
getMonitoringCafrm, getMonitoringCafrm,
getListApprover, getListApprover,
getIdToken, getIdToken,
triggerHistoricalRatio triggerHistoricalRatio,
getDetailMaintenanceMode,
createMaintenanceMode,
updateMaintenanceMode,
createZipReport,
createDownloadFile,
getListDownload,
downloadZipReport,
sendEmail
} }
} }
......
src/assets/Images.js
View file @ e0d3486d
...@@ -55,7 +55,7 @@ const Images = { ...@@ -55,7 +55,7 @@ const Images = {
dotDone: require('./dot-done.svg'), dotDone: require('./dot-done.svg'),
dotOverdue: require('./dot-overdue.svg'), dotOverdue: require('./dot-overdue.svg'),
dotOpen: require('./dot-open.svg'), dotOpen: require('./dot-open.svg'),
zip: require('./zip.png'),
} }
export default Images export default Images
\ No newline at end of file
src/container/Auth/Login.js
View file @ e0d3486d
This diff is collapsed.
src/container/Auth/Maintenance.js 0 → 100644
View file @ e0d3486d
import React, { Component } from 'react';
import Images from '../../assets/Images';
class Maintenance extends Component {
constructor(props) {
super(props)
this.state = {
width: 0,
height: 0
}
}
getWindowDimensions() {
const { innerWidth: width, innerHeight: height } = window;
this.setState({
width,
height
})
}
render() {
return (
<div style={{ flex: 1, display: 'flex' }}>
<div style={{ width: '50%', display: 'grid' }}>
<img src={Images.meeting} style={{ objectFit: 'fill', width: '100%', height: '100%' }} alt={'TIA 4.0'}/>
</div>
<div style={{ width: '50%', height: '100vh', backgroundColor: '#4B0082', display: 'flex', justifyContent: 'center', alignItems: 'left', flexDirection: 'column', padding: '5vh'}}>
<p style={{fontSize: '1rem'}}>
<span style={{color: 'white', fontWeight:'bold'}}>
TIA 4.0 is down for Maintenance!<br/>
Thank you for your patience, we expect to be back shortly.<br/>
<br/>
We apologize for any inconvenience.<br/>
For more information, please contact our email : <a style={{color: 'white'}} href={'mailto:tia4.0@triputra-group.com'}>tia4.0@triputra-group.com</a>.
</span>
</p>
</div>
</div >
);
}
}
export default Maintenance;
\ No newline at end of file
src/container/BudgetTahunan/BalanceSheet.js
View file @ e0d3486d
...@@ -3361,30 +3361,30 @@ export default class BalanceSheet extends Component { ...@@ -3361,30 +3361,30 @@ export default class BalanceSheet extends Component {
} }
} }
}, },
{ {
name: "", name: "",
options: { options: {
display: false display: false
} }
}, },
{ {
name: "", name: "",
options: { options: {
display: false display: false
} }
}, },
{ {
name: "", name: "",
options: { options: {
display: false display: false
} }
}, },
{ {
name: "", name: "",
options: { options: {
display: false display: false
}
} }
}
] ]
const loadingComponent = ( const loadingComponent = (
<div style={{ position: 'fixed', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}> <div style={{ position: 'fixed', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
...@@ -3423,27 +3423,29 @@ export default class BalanceSheet extends Component { ...@@ -3423,27 +3423,29 @@ export default class BalanceSheet extends Component {
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
{this.state.dataTable.length == 0 ? null : this.props.isApprover == true ? {this.state.dataTable.length == 0 ? null : this.props.isApprover == true ?
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> null
<a data-tip={'Download'} data-for="download"> // <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<button // <a data-tip={'Download'} data-for="download">
style={{ // <button
backgroundColor: 'transparent', // style={{
cursor: 'pointer', // backgroundColor: 'transparent',
borderColor: 'transparent', // cursor: 'pointer',
margin: 5 // borderColor: 'transparent',
}} // margin: 5
onClick={() => // }}
this.setState({ loading: true }, () => { // onClick={() =>
setTimeout(() => { // this.setState({ loading: true }, () => {
this.downloadAllData() // setTimeout(() => {
}, 100); // this.downloadAllData()
})} // }, 100);
> // })}
<img src={Images.download} /> // >
</button> // <img src={Images.download} />
</a> // </button>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" /> // </a>
</div> : // <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
{((!this.props.truelyApprover) && (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.truelyApprover) && (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> <div>
...@@ -3481,7 +3483,7 @@ export default class BalanceSheet extends Component { ...@@ -3481,7 +3483,7 @@ export default class BalanceSheet extends Component {
<ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
</div> </div>
)} )}
<a data-tip={'Download'} data-for="download"> {/* <a data-tip={'Download'} data-for="download">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -3499,7 +3501,7 @@ export default class BalanceSheet extends Component { ...@@ -3499,7 +3501,7 @@ export default class BalanceSheet extends Component {
<img src={Images.download} /> <img src={Images.download} />
</button> </button>
</a> </a>
<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> </div>
...@@ -3520,10 +3522,10 @@ export default class BalanceSheet extends Component { ...@@ -3520,10 +3522,10 @@ export default class BalanceSheet extends Component {
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}> <div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{ {
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => { this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return ( return (
<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>
......
src/container/BudgetTahunan/CashFlow.js
View file @ e0d3486d
This diff is collapsed.
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ e0d3486d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @ e0d3486d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/ProfitLoss.js
View file @ e0d3486d
This diff is collapsed.
src/container/BudgetTahunan/TaxPlanning.js
View file @ e0d3486d
This diff is collapsed.
src/container/Menu/Home.js
View file @ e0d3486d
This diff is collapsed.
src/container/Menu/HomePage.js
View file @ e0d3486d
...@@ -70,6 +70,7 @@ class HomePage extends Component { ...@@ -70,6 +70,7 @@ class HomePage extends Component {
this.setState({ loading: true, loading2: true, loading3: true }) this.setState({ loading: true, loading2: true, loading3: true })
let userId = localStorage.getItem(Constant.USER) let userId = localStorage.getItem(Constant.USER)
api.create().getDetailUser(userId).then((response) => { api.create().getDetailUser(userId).then((response) => {
console.log(response);
if (response.data) { if (response.data) {
if (response.ok) { if (response.ok) {
if (response.data.status === 'success') { if (response.data.status === 'success') {
...@@ -165,18 +166,18 @@ class HomePage extends Component { ...@@ -165,18 +166,18 @@ class HomePage extends Component {
getOptionLabel: (option) => option.name getOptionLabel: (option) => option.name
} }
this.setState({ listPeriodeMB: defaultPropsMB, this.setState({ listPeriodeMB: defaultPropsMB,
periodeMB: MB[MB.length - 1], periodeMB: MB[MB.length - 1],
listPeriodeMR: defaultPropsMR, listPeriodeMR: defaultPropsMR,
periodeMR: MR[indexMonthMR], periodeMR: MR[indexMonthMR],
listPeriodeRO: defaultPropsRO, listPeriodeRO: defaultPropsRO,
periodeRO: ROut[indexMonthRO], periodeRO: ROut[indexMonthRO],
listQuarter: defaultPropsQuarter, listQuarter: defaultPropsQuarter,
quarter: this.state.quarterList[0], quarter: this.state.quarterList[0],
listPeriodeOL: defaultPropsOL, listPeriodeOL: defaultPropsOL,
periodeOL: OL[indexMonthOL], periodeOL: OL[indexMonthOL],
listPeriodeCAT: defaultPropsMB, listPeriodeCAT: defaultPropsMB,
periodeCAT: MB[indexMonthMR] }, () => { periodeCAT: MB[indexMonthMR] }, () => {
this.getParameterGroupPerfom() this.getParameterGroupPerfom()
}) })
} }
...@@ -595,20 +596,20 @@ class HomePage extends Component { ...@@ -595,20 +596,20 @@ class HomePage extends Component {
} else if (String(item.type_report).toLocaleLowerCase().includes("pa")) { } else if (String(item.type_report).toLocaleLowerCase().includes("pa")) {
listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert]) listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
rawData.push(item) rawData.push(item)
} }
} else { } else {
if (this.state.isApproverMB) { if (this.state.isApproverMB) {
if (String(item.type_report).toLocaleLowerCase().includes("master")) { if (String(item.type_report).toLocaleLowerCase().includes("master")) {
listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} - ${item.periode}`, item.revision, item.status, statusConvert]) listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} - ${item.periode}`, item.revision, item.status, statusConvert])
rawData.push(item) rawData.push(item)
} }
} }
if (this.state.isApproverMR) { if (this.state.isApproverMR) {
if (String(item.type_report).toLocaleLowerCase().includes("monthly")) { if (String(item.type_report).toLocaleLowerCase().includes("monthly")) {
listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert]) listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
rawData.push(item) rawData.push(item)
} }
} }
if (this.state.isApproverRO) { if (this.state.isApproverRO) {
if (String(item.type_report).toLocaleLowerCase().includes("rolling")) { if (String(item.type_report).toLocaleLowerCase().includes("rolling")) {
listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert]) listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
......
src/container/MonthlyReport/CashFlowMR.js
View file @ e0d3486d
...@@ -417,19 +417,19 @@ export default class CashFlowMR extends Component { ...@@ -417,19 +417,19 @@ export default class CashFlowMR extends Component {
// if (opt == "") { // if (opt == "") {
// total = Number(Number(total) + Number(totalPrio)) // total = Number(Number(total) + Number(totalPrio))
// } else { // } else {
if (opt == "tambah") { if (opt == "tambah") {
total = Number(total) + Number(totalPrio) total = Number(total) + Number(totalPrio)
totalPrio = 0 totalPrio = 0
} else if (opt == "kurang") { } else if (opt == "kurang") {
total = Number(total) - Number(totalPrio) total = Number(total) - Number(totalPrio)
totalPrio = 0 totalPrio = 0
} else if (opt == "kali") { } else if (opt == "kali") {
total = Number(total) * Number(totalPrio) total = Number(total) * Number(totalPrio)
totalPrio = 0 totalPrio = 0
} else if (opt == "bagi") { } else if (opt == "bagi") {
total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio) total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio)
totalPrio = 0 totalPrio = 0
} }
// } // }
// if (tableMeta.rowData[5] == '3.2 Movement of SHL and intercompany loan (nett)') { // if (tableMeta.rowData[5] == '3.2 Movement of SHL and intercompany loan (nett)') {
// console.log(totalPrio) // console.log(totalPrio)
...@@ -438,7 +438,7 @@ export default class CashFlowMR extends Component { ...@@ -438,7 +438,7 @@ export default class CashFlowMR extends Component {
// } // }
} else { } else {
// const handleReturn = (x,y) => { // const handleReturn = (x,y) => {
// return Number(totalXYZ) // return Number(totalXYZ)
// } // }
if (item == "+") { if (item == "+") {
...@@ -494,12 +494,12 @@ export default class CashFlowMR extends Component { ...@@ -494,12 +494,12 @@ export default class CashFlowMR extends Component {
}) })
// if (tableMeta.rowData[5] == '3.2 Movement of SHL and intercompany loan (nett)' || tableMeta.rowData[5] == '3.6 Other') { // if (tableMeta.rowData[5] == '3.2 Movement of SHL and intercompany loan (nett)' || tableMeta.rowData[5] == '3.6 Other') {
// console.log(tableMeta.rowData[5]) // console.log(tableMeta.rowData[5])
// console.log(splitFormula) // console.log(splitFormula)
// console.log(baru) // console.log(baru)
// console.log(anjay) // console.log(anjay)
// console.log(anjay2) // console.log(anjay2)
// console.log(total) // console.log(total)
// } // }
dataTable2[tableMeta.rowIndex][6].value = total dataTable2[tableMeta.rowIndex][6].value = total
...@@ -698,7 +698,7 @@ export default class CashFlowMR extends Component { ...@@ -698,7 +698,7 @@ export default class CashFlowMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
<div style={{ width: '50%' }}> {/* <div style={{ width: '50%' }}>
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download'} data-for="download"> <a data-tip={'Download'} data-for="download">
<button <button
...@@ -720,7 +720,7 @@ export default class CashFlowMR extends Component { ...@@ -720,7 +720,7 @@ export default class CashFlowMR extends Component {
</a> </a>
<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> </div> */}
</div> </div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}> <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ e0d3486d
...@@ -607,7 +607,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -607,7 +607,7 @@ export default class CorporateAnnualTargetMR extends Component {
} else { } else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' }) this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
} }
}) })
} }
...@@ -661,7 +661,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -661,7 +661,7 @@ export default class CorporateAnnualTargetMR extends Component {
} }
this.props.saveToMonthlyReport() this.props.saveToMonthlyReport()
}) })
} }
// else { // else {
// this.setState({ loading: false }, () => { // this.setState({ loading: false }, () => {
// this.props.saveToMonthlyReport() // this.props.saveToMonthlyReport()
...@@ -1831,11 +1831,11 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1831,11 +1831,11 @@ export default class CorporateAnnualTargetMR extends Component {
value={handleScore(tableMeta)} value={handleScore(tableMeta)}
decimalScale={0} decimalScale={0}
disabled={true} disabled={true}
// onBlur={(event) => { // onBlur={(event) => {
// // updateValue(event.target.value) // // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta) // handleChange(event.target.value, tableMeta)
// // // console.log(dataTable2) // // // console.log(dataTable2)
// }} // }}
/> />
} }
/> />
...@@ -2004,7 +2004,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -2004,7 +2004,7 @@ export default class CorporateAnnualTargetMR extends Component {
</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
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -2022,7 +2022,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -2022,7 +2022,7 @@ export default class CorporateAnnualTargetMR extends Component {
<img src={Images.download} /> <img src={Images.download} />
</button> </button>
</a> </a>
<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> </div>
</div> </div>
...@@ -2045,11 +2045,11 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -2045,11 +2045,11 @@ export default class CorporateAnnualTargetMR extends Component {
<div style={{marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10}}> <div style={{marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10}}>
{ {
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => { this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return ( return (
<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>
...@@ -2228,11 +2228,11 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -2228,11 +2228,11 @@ export default class CorporateAnnualTargetMR extends Component {
<div style={{marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10}}> <div style={{marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10}}>
{ {
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => { this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return ( return (
<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>
......
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ e0d3486d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/MonthlyReport/ProfitLossMR.js
View file @ e0d3486d
This diff is collapsed.
src/container/OutlookPA/BalanceSheetOLPA.js
View file @ e0d3486d
This diff is collapsed.
src/container/OutlookPA/CashFlowOLPA.js
View file @ e0d3486d
This diff is collapsed.
src/container/OutlookPA/OutlookPA.js
View file @ e0d3486d
This diff is collapsed.
src/container/OutlookPA/ProfitLossOLPA.js
View file @ e0d3486d
...@@ -1763,27 +1763,29 @@ export default class ProfitLossOLPA extends Component { ...@@ -1763,27 +1763,29 @@ export default class ProfitLossOLPA extends Component {
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
{this.props.isApprover == true || this.state.get_for == 'view' ? {this.props.isApprover == true || this.state.get_for == 'view' ?
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> null
<a data-tip={'Download'} data-for="download"> // <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<button // <a data-tip={'Download'} data-for="download">
style={{ // <button
backgroundColor: 'transparent', // style={{
cursor: 'pointer', // backgroundColor: 'transparent',
borderColor: 'transparent', // cursor: 'pointer',
margin: 5 // borderColor: 'transparent',
}} // margin: 5
onClick={() => // }}
this.setState({ loading: true }, () => { // onClick={() =>
setTimeout(() => { // this.setState({ loading: true }, () => {
this.downloadAllData() // setTimeout(() => {
}, 100); // this.downloadAllData()
})} // }, 100);
> // })}
<img src={Images.download} /> // >
</button> // <img src={Images.download} />
</a> // </button>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" /> // </a>
</div> : // <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template"> <a data-tip={'Download Template'} data-for="template">
<button <button
...@@ -1813,7 +1815,7 @@ export default class ProfitLossOLPA extends Component { ...@@ -1813,7 +1815,7 @@ export default class ProfitLossOLPA extends Component {
</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
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -1831,7 +1833,7 @@ export default class ProfitLossOLPA extends Component { ...@@ -1831,7 +1833,7 @@ export default class ProfitLossOLPA extends Component {
<img src={Images.download} /> <img src={Images.download} />
</button> </button>
</a> </a>
<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> </div>
...@@ -1853,10 +1855,10 @@ export default class ProfitLossOLPA extends Component { ...@@ -1853,10 +1855,10 @@ export default class ProfitLossOLPA extends Component {
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}> <div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{ {
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => { this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return ( return (
<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>
......
src/container/OutlookPA/TaxPlanningOLPA.js
View file @ e0d3486d
This diff is collapsed.
src/container/Reports/SubHolding.js
View file @ e0d3486d
This diff is collapsed.
src/container/Reports/TableSubHolding.js
View file @ e0d3486d
This diff is collapsed.
src/container/RollingOutlook/CashFlowRO.js
View file @ e0d3486d
This diff is collapsed.
src/container/SummaryTriputra/SummaryOfTriputra.js
View file @ e0d3486d
...@@ -46,7 +46,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -46,7 +46,7 @@ export default class SummaryOfTriputra extends Component {
console.log(this.state.report); console.log(this.state.report);
this.getPeriode() this.getPeriode()
}) })
// this.getMonth() // this.getMonth()
} }
...@@ -60,9 +60,9 @@ export default class SummaryOfTriputra extends Component { ...@@ -60,9 +60,9 @@ export default class SummaryOfTriputra extends Component {
let data = [] let data = []
response.data.data.map((item) => { response.data.data.map((item) => {
// if (this.state.isApprover) { // if (this.state.isApprover) {
if (item >= 2000 && item <= (Number(currentYear) + 1)) { if (item >= 2000 && item <= (Number(currentYear) + 1)) {
data.push(item) data.push(item)
} }
// } else { // } else {
// if ((item >= 2000) && (item == this.state.lastPeriod || item < this.state.lastPeriod)) { // if ((item >= 2000) && (item == this.state.lastPeriod || item < this.state.lastPeriod)) {
// data.push(item) // data.push(item)
...@@ -414,6 +414,27 @@ export default class SummaryOfTriputra extends Component { ...@@ -414,6 +414,27 @@ export default class SummaryOfTriputra extends Component {
item.npat_fy_percent_of_last_year, item.npat_fy_percent_of_last_year,
item.order, item.order,
item.is_approved == undefined ? true : item.is_approved, item.is_approved == undefined ? true : item.is_approved,
item.ytd_optional_cashflow_cfo,
item.ytd_optional_cashflow_cfi,
item.ytd_optional_cashflow_cff,
item.ytd_optional_cashflow_netcf,
item.ytd_optional_osbankloan_ki,
item.ytd_optional_osbankloan_wc,
item.ytd_optional_osbankloan_others,
item.ytd_optional_osbankloan_total,
item.ytd_optional_os_shl,
item.ytd_optional_balancesheet_cashbank,
item.ytd_optional_balancesheet_ca,
item.ytd_optional_balancesheet_cl,
item.ytd_optional_balancesheet_equity,
item.ytd_optional_financialratio_cr,
item.ytd_optional_financialratio_der,
item.ytd_optional_financialratio_debttoebitda,
item.ytd_optional_financialratio_tointerest,
item.ytd_optional_financialratio_ardays,
item.ytd_optional_financialratio_invdays,
item.ytd_optional_financialratio_apdays,
item.ytd_optional_financialratio_ccc,
]) ])
} }
if (item.children !== null) { if (item.children !== null) {
...@@ -472,6 +493,27 @@ export default class SummaryOfTriputra extends Component { ...@@ -472,6 +493,27 @@ export default class SummaryOfTriputra extends Component {
item.npat_fy_percent_of_last_year, item.npat_fy_percent_of_last_year,
item.order, item.order,
item.is_approved == undefined ? true : item.is_approved, item.is_approved == undefined ? true : item.is_approved,
item.ytd_optional_cashflow_cfo,
item.ytd_optional_cashflow_cfi,
item.ytd_optional_cashflow_cff,
item.ytd_optional_cashflow_netcf,
item.ytd_optional_osbankloan_ki,
item.ytd_optional_osbankloan_wc,
item.ytd_optional_osbankloan_others,
item.ytd_optional_osbankloan_total,
item.ytd_optional_os_shl,
item.ytd_optional_balancesheet_cashbank,
item.ytd_optional_balancesheet_ca,
item.ytd_optional_balancesheet_cl,
item.ytd_optional_balancesheet_equity,
item.ytd_optional_financialratio_cr,
item.ytd_optional_financialratio_der,
item.ytd_optional_financialratio_debttoebitda,
item.ytd_optional_financialratio_tointerest,
item.ytd_optional_financialratio_ardays,
item.ytd_optional_financialratio_invdays,
item.ytd_optional_financialratio_apdays,
item.ytd_optional_financialratio_ccc,
]) ])
if (item.children !== null) { if (item.children !== null) {
if (item.children.length > 0) { if (item.children.length > 0) {
...@@ -846,7 +888,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -846,7 +888,7 @@ export default class SummaryOfTriputra extends Component {
this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false }) this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
} }
}) })
} }
} }
async downloadAllData() { async downloadAllData() {
...@@ -921,7 +963,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -921,7 +963,7 @@ export default class SummaryOfTriputra extends Component {
a.click(); a.click();
} }
} else { } else {
// setTimeout(() => { // setTimeout(() => {
// this.setState({ loading: false }) // this.setState({ loading: false })
// }, 1000); // }, 1000);
...@@ -974,7 +1016,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -974,7 +1016,7 @@ export default class SummaryOfTriputra extends Component {
} else { } else {
this.getDataTable() this.getDataTable()
} }
})} })}
disableClearable disableClearable
style={{ width: 250 }} style={{ width: 250 }}
...@@ -999,7 +1041,7 @@ export default class SummaryOfTriputra extends Component { ...@@ -999,7 +1041,7 @@ export default class SummaryOfTriputra extends Component {
value={this.state.periode} value={this.state.periode}
/> />
</div> </div>
{(this.state.report != null && !String(this.state.report.label).toLocaleLowerCase().includes('historical')) && <div style={{ marginTop: 15 }}> {(this.state.report != null && !String(this.state.report.label).toLocaleLowerCase().includes('historical')) && <div style={{ marginTop: 15 }}>
<Autocomplete <Autocomplete
{...this.state.listMonths} {...this.state.listMonths}
......
src/library/Array.js
View file @ e0d3486d
...@@ -71,6 +71,18 @@ const arraySide = [ ...@@ -71,6 +71,18 @@ const arraySide = [
path: 'beranda', path: 'beranda',
subItem: null subItem: null
}, },
// {
// img: '',
// label: 'General Setting',
// path: '',
// subItem: [
// {
// img: '',
// label: 'Maintenance Mode',
// path: 'maintenance-mode',
// }
// ]
// },
{ {
img: Images.masterdata, img: Images.masterdata,
label: 'Master Data', label: 'Master Data',
...@@ -137,7 +149,13 @@ const arraySide = [ ...@@ -137,7 +149,13 @@ const arraySide = [
path: '', path: '',
}, },
] ]
} },
{
img: Images.outlookperformance,
label: 'Download Report',
path: 'download-report',
subItem: null
},
] ]
export default arraySide; export default arraySide;
\ No newline at end of file
src/library/CustomTable.js
View file @ e0d3486d
This diff is collapsed.
src/router/homeRoutes.js
View file @ e0d3486d
This diff is collapsed.
src/router/index.js
View file @ e0d3486d
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