Skip to content

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

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Fixing Conflic Merge

See merge request !1768
parents 8c209886 f23471fa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22969 additions and 22969 deletions
src/container/Auth/Login.js
View file @ ff61da50
This diff is collapsed.
src/container/BudgetTahunan/BalanceSheet.js
View file @ ff61da50
......@@ -3361,30 +3361,30 @@ export default class BalanceSheet extends Component {
}
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
}
]
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)' }}>
......@@ -3444,7 +3444,7 @@ export default class BalanceSheet extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<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')) && (
......@@ -3522,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 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
</div>
......
src/container/BudgetTahunan/BudgetTahunan.js
View file @ ff61da50
......@@ -1127,27 +1127,27 @@ export default class BudgetTahunan extends Component {
if (item[0] == 5 || item[0] == 6 || item[0] == 7) {
// if (item[7].value == "" || item[7].value == 0 || item[7].value == "0.0") {
item[7].value = this.handleValueFormula(index, item[7], item, 7)
// }
// }
// if (item[8].value == "" || item[8].value == 0 || item[8].value == "0.0") {
item[8].value = this.handleValueFormula(index, item[8], item, 8)
// }
// }
// if (item[9].value == "" || item[9].value == 0 || item[9].value == "0.0") {
item[9].value = this.handleValueFormula(index, item[9], item, 9)
// }
// }
// if (item[10].value == "" || item[10].value == 0 || item[10].value == "0.0") {
item[10].value = this.handleValueFormula(index, item[10], item, 10)
// }
// }
// if (item[11].value == "" || item[11].value == 0 || item[11].value == "0.0") {
item[11].value = this.handleValueFormula(index, item[11], item, 11)
// }
// }
// if (item[12].value == "" || item[12].value == 0 || item[12].value == "0.0") {
item[12].value = this.handleValueFormula(index, item[12], item, 12)
// }
// }
// if (item[13].value == "" || item[13].value == 0 || item[13].value == "0.0") {
item[13].value = this.handleValueFormula(index, item[13], item, 13)
......@@ -1155,33 +1155,33 @@ export default class BudgetTahunan extends Component {
// if (item[14].value == "" || item[14].value == 0 || item[14].value == "0.0") {
item[14].value = this.handleValueFormula(index, item[14], item, 14)
// }
// }
// if (item[15].value == "" || item[15].value == 0 || item[15].value == "0.0") {
item[15].value = this.handleValueFormula(index, item[15], item, 15)
// }
// }
// if (item[16].value == "" || item[16].value == 0 || item[16].value == "0.0") {
item[16].value = this.handleValueFormula(index, item[16], item, 16)
// }
// }
// if (item[17].value == "" || item[17].value == 0 || item[17].value == "0.0") {
item[17].value = this.handleValueFormula(index, item[17], item, 17)
// }
// }
// if (item[18].value == "" || item[18].value == 0 || item[18].value == "0.0") {
item[18].value = this.handleValueFormula(index, item[18], item, 18)
// }
// }
item[19] = this.handleForecast(index, item, `${Number(this.state.periode.periode)}`, 19)
// if (item[20] == "" || item[20] == 0 || item[20] == "0.0") {
item[20] = this.handleForecast(index, item, `${Number(this.state.periode.periode) + 1}`, 20)
// }
// }
// if (item[21] == "" || item[21] == 0 || item[21] == "0.0") {
item[21] = this.handleForecast(index, item, `${Number(this.state.periode.periode) + 2}`, 21)
// }
// }
}
......@@ -1633,27 +1633,27 @@ export default class BudgetTahunan extends Component {
if (item[0] == 5 || item[0] == 6 || item[0] == 7) {
// if (item[7].value == "" || item[7].value == 0 || item[7].value == "0.0") {
item[7].value = this.handleValueFormulaDBPL(index, item[7], item, 7)
// }
// }
// if (item[8].value == "" || item[8].value == 0 || item[8].value == "0.0") {
item[8].value = this.handleValueFormulaDBPL(index, item[8], item, 8)
// }
// }
// if (item[9].value == "" || item[9].value == 0 || item[9].value == "0.0") {
item[9].value = this.handleValueFormulaDBPL(index, item[9], item, 9)
// }
// }
// if (item[10].value == "" || item[10].value == 0 || item[10].value == "0.0") {
item[10].value = this.handleValueFormulaDBPL(index, item[10], item, 10)
// }
// }
// if (item[11].value == "" || item[11].value == 0 || item[11].value == "0.0") {
item[11].value = this.handleValueFormulaDBPL(index, item[11], item, 11)
// }
// }
// if (item[12].value == "" || item[12].value == 0 || item[12].value == "0.0") {
item[12].value = this.handleValueFormulaDBPL(index, item[12], item, 12)
// }
// }
// if (item[13].value == "" || item[13].value == 0 || item[13].value == "0.0") {
item[13].value = this.handleValueFormulaDBPL(index, item[13], item, 13)
......@@ -1661,31 +1661,31 @@ export default class BudgetTahunan extends Component {
// if (item[14].value == "" || item[14].value == 0 || item[14].value == "0.0") {
item[14].value = this.handleValueFormulaDBPL(index, item[14], item, 14)
// }
// }
// if (item[15].value == "" || item[15].value == 0 || item[15].value == "0.0") {
item[15].value = this.handleValueFormulaDBPL(index, item[15], item, 15)
// }
// }
// if (item[16].value == "" || item[16].value == 0 || item[16].value == "0.0") {
item[16].value = this.handleValueFormulaDBPL(index, item[16], item, 16)
// }
// }
// if (item[17].value == "" || item[17].value == 0 || item[17].value == "0.0") {
item[17].value = this.handleValueFormulaDBPL(index, item[17], item, 17)
// }
// }
// if (item[18].value == "" || item[18].value == 0 || item[18].value == "0.0") {
item[18].value = this.handleValueFormulaDBPL(index, item[18], item, 18)
// }
// }
// if (item[20] == "" || item[20] == 0 || item[20] == "0.0") {
item[20] = this.handleForecastDBPL(index, item, `${Number(this.state.periode.periode) + 1}`, 20)
// }
// }
// if (item[21] == "" || item[21] == 0 || item[21] == "0.0") {
item[21] = this.handleForecastDBPL(index, item, `${Number(this.state.periode.periode) + 2}`, 21)
// }
// }
}
......
src/container/BudgetTahunan/CashFlow.js
View file @ ff61da50
......@@ -438,7 +438,7 @@ export default class CashFlow extends Component {
// let valuezzz = dataTable2[tableMeta.rowIndex][7].value
// forecastt += Number(valuezzz == "" ? 0 : valuezzz)
// } else {
forecastt += Number(valuezz == "" ? 0 : valuezz)
forecastt += Number(valuezz == "" ? 0 : valuezz)
// }
}
}
......@@ -454,7 +454,7 @@ export default class CashFlow extends Component {
// let valuezzz = dataTable2[tableMeta.rowIndex + 1][19]
// forecastt += Number(valuezzz == "" ? 0 : valuezzz)
// } else {
forecastt += Number(valuezz == "" ? 0 : valuezz)
forecastt += Number(valuezz == "" ? 0 : valuezz)
// }
}
}
......@@ -469,7 +469,7 @@ export default class CashFlow extends Component {
// let valuezzz = dataTable2[tableMeta.rowIndex + 1][20]
// forecastt += Number(valuezzz == "" ? 0 : valuezzz)
// } else {
forecastt += Number(valuezz == "" ? 0 : valuezz)
forecastt += Number(valuezz == "" ? 0 : valuezz)
// }
}
}
......@@ -493,7 +493,7 @@ export default class CashFlow extends Component {
// let valuezzz = dataTable2[tableMeta.rowIndex + 1][data].value
// anjay.push(valuezzz == "" ? 0 : valuezzz)
// } else {
anjay.push(valuezz == "" ? 0 : valuezz)
anjay.push(valuezz == "" ? 0 : valuezz)
// }
}
}
......@@ -721,7 +721,7 @@ export default class CashFlow extends Component {
// console.log(total)
// let testttt = dataTable2[tableMeta.rowIndex - 1][8].value
// console.log(testttt)
// total = testttt
// total = testttt
}
if (dataTable2[tableMeta.rowIndex][column].value == undefined) {
......@@ -966,7 +966,7 @@ export default class CashFlow extends Component {
// />
// }
// />
// </span>
// </span>
// :
tableMeta.rowData[0] === 3 ?
null
......@@ -2892,13 +2892,13 @@ export default class CashFlow extends Component {
options: {
display: false
}
},
},
// {
// name: "",
// options: {
// display: false
// }
// },
// },
// {
// name: "",
// options: {
......@@ -2980,7 +2980,7 @@ export default class CashFlow extends Component {
// )
// }
// }
// },
// },
{
name: `Current`,
options: {
......@@ -3041,24 +3041,24 @@ export default class CashFlow extends Component {
// />
// </LightTooltip>
// :
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
// value={Number(handleFYTotal(tableMeta)).toFixed(1)}
// value={Number(handleForecast(tableMeta, `${Number(this.props.periode) + 1}`, 20)).toFixed(1)}
value={value}
/>
}
/>
</div>}
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
// value={Number(handleFYTotal(tableMeta)).toFixed(1)}
// value={Number(handleForecast(tableMeta, `${Number(this.props.periode) + 1}`, 20)).toFixed(1)}
value={value}
/>
}
/>
</div>}
</div>
)
}
......
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ ff61da50
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 @ ff61da50
......@@ -714,7 +714,7 @@ export default class FixedAssetsMovement extends Component {
}
const handleTotal = (tableMeta) => {
let total = 0
// console.log(tableMeta)
// console.log(tableMeta)
// if (tableMeta.rowData[5] == 'Beginning balance') {
// console.log(tableMeta.rowData)
// }
......@@ -2330,11 +2330,11 @@ export default class FixedAssetsMovement extends Component {
placeholder=""
disabled={true}
value={Number(handleTotal(tableMeta)).toFixed(1)}
// onBlur={(event) => {
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta)
// // // console.log(dataTable2)
// }}
// onBlur={(event) => {
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta)
// // // console.log(dataTable2)
// }}
/>
}
/>
......@@ -2647,7 +2647,7 @@ export default class FixedAssetsMovement extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<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')) && (
......@@ -2725,10 +2725,10 @@ export default class FixedAssetsMovement extends Component {
<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) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
</div>
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ ff61da50
......@@ -2802,18 +2802,18 @@ export default class ProfitLoss extends Component {
}
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
}
]
const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
......@@ -2873,7 +2873,7 @@ export default class ProfitLoss extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<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')) &&
......@@ -2949,10 +2949,10 @@ export default class ProfitLoss extends Component {
<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) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
</div>
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ ff61da50
This diff is collapsed.
src/container/Menu/Home.js
View file @ ff61da50
This diff is collapsed.
src/container/Menu/HomePage.js
View file @ ff61da50
......@@ -166,18 +166,18 @@ class HomePage extends Component {
getOptionLabel: (option) => option.name
}
this.setState({ listPeriodeMB: defaultPropsMB,
periodeMB: MB[MB.length - 1],
listPeriodeMR: defaultPropsMR,
periodeMR: MR[indexMonthMR],
listPeriodeRO: defaultPropsRO,
periodeRO: ROut[indexMonthRO],
listQuarter: defaultPropsQuarter,
quarter: this.state.quarterList[0],
listPeriodeOL: defaultPropsOL,
periodeOL: OL[indexMonthOL],
listPeriodeCAT: defaultPropsMB,
periodeCAT: MB[indexMonthMR] }, () => {
this.setState({ listPeriodeMB: defaultPropsMB,
periodeMB: MB[MB.length - 1],
listPeriodeMR: defaultPropsMR,
periodeMR: MR[indexMonthMR],
listPeriodeRO: defaultPropsRO,
periodeRO: ROut[indexMonthRO],
listQuarter: defaultPropsQuarter,
quarter: this.state.quarterList[0],
listPeriodeOL: defaultPropsOL,
periodeOL: OL[indexMonthOL],
listPeriodeCAT: defaultPropsMB,
periodeCAT: MB[indexMonthMR] }, () => {
this.getParameterGroupPerfom()
})
}
......@@ -596,20 +596,20 @@ class HomePage extends Component {
} 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])
rawData.push(item)
}
}
} else {
if (this.state.isApproverMB) {
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])
rawData.push(item)
}
}
}
if (this.state.isApproverMR) {
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])
rawData.push(item)
}
}
}
if (this.state.isApproverRO) {
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])
......
src/container/MonthlyReport/CashFlowMR.js
View file @ ff61da50
......@@ -417,19 +417,19 @@ export default class CashFlowMR extends Component {
// if (opt == "") {
// total = Number(Number(total) + Number(totalPrio))
// } else {
if (opt == "tambah") {
total = Number(total) + Number(totalPrio)
totalPrio = 0
} else if (opt == "kurang") {
total = Number(total) - Number(totalPrio)
totalPrio = 0
} else if (opt == "kali") {
total = Number(total) * Number(totalPrio)
totalPrio = 0
} else if (opt == "bagi") {
total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio)
totalPrio = 0
}
if (opt == "tambah") {
total = Number(total) + Number(totalPrio)
totalPrio = 0
} else if (opt == "kurang") {
total = Number(total) - Number(totalPrio)
totalPrio = 0
} else if (opt == "kali") {
total = Number(total) * Number(totalPrio)
totalPrio = 0
} else if (opt == "bagi") {
total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio)
totalPrio = 0
}
// }
// if (tableMeta.rowData[5] == '3.2 Movement of SHL and intercompany loan (nett)') {
// console.log(totalPrio)
......@@ -438,7 +438,7 @@ export default class CashFlowMR extends Component {
// }
} else {
// const handleReturn = (x,y) => {
// return Number(totalXYZ)
// }
if (item == "+") {
......@@ -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') {
// console.log(tableMeta.rowData[5])
// console.log(splitFormula)
// console.log(baru)
// console.log(anjay)
// console.log(anjay2)
// console.log(total)
// console.log(tableMeta.rowData[5])
// console.log(splitFormula)
// console.log(baru)
// console.log(anjay)
// console.log(anjay2)
// console.log(total)
// }
dataTable2[tableMeta.rowIndex][6].value = total
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ ff61da50
......@@ -607,7 +607,7 @@ export default class CorporateAnnualTargetMR extends Component {
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
}
})
}
......@@ -661,7 +661,7 @@ export default class CorporateAnnualTargetMR extends Component {
}
this.props.saveToMonthlyReport()
})
}
}
// else {
// this.setState({ loading: false }, () => {
// this.props.saveToMonthlyReport()
......@@ -1831,11 +1831,11 @@ export default class CorporateAnnualTargetMR extends Component {
value={handleScore(tableMeta)}
decimalScale={0}
disabled={true}
// onBlur={(event) => {
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta)
// // // console.log(dataTable2)
// }}
// onBlur={(event) => {
// // updateValue(event.target.value)
// handleChange(event.target.value, tableMeta)
// // // console.log(dataTable2)
// }}
/>
}
/>
......@@ -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}}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
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 }}>-</Typography>
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 }}>-</Typography>
}
</div>
......@@ -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}}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
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 }}>-</Typography>
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 }}>-</Typography>
}
</div>
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ ff61da50
......@@ -752,7 +752,7 @@ export default class FixedAssetsMovementMR extends Component {
}
const handleValue = (data, type) => {
// console.log(data, type);
// console.log(data, type);
let total = 0
dataTable2.map((item, index) => {
if (data.rowData[1] === item[2]) {
......@@ -1368,7 +1368,7 @@ export default class FixedAssetsMovementMR extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template">
......@@ -1439,10 +1439,10 @@ export default class FixedAssetsMovementMR extends Component {
<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) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
......
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ ff61da50
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/MonthlyReport/MonthlyReport.js
View file @ ff61da50
......@@ -2084,7 +2084,7 @@ export default class MonthlyReport extends Component {
// item[16] = this.handleFormulaRatio(item[16],item,10)
// item[17] = this.handleFormulaRatio(item[17],item,11)
// item[18] = this.handleFormulaRatio(item[18],item,12)
// }
// }
}
......@@ -2732,9 +2732,9 @@ export default class MonthlyReport extends Component {
</div>
<div style={{ padding: 20 }}>
<div style={{ display: 'flex' }}>
{/* {this.state.isApprover?
{/* {this.state.isApprover?
<div className="grid grid-2x" style={{}}>
<div className="col-1" style={{ display: 'flex', maxWidth: '100%', paddingLeft: 0}}>
<div className="col-1" style={{ display: 'flex', maxWidth: '100%', paddingLeft: 0}}>
<Autocomplete
{...this.state.listMonth}
id="month"
......@@ -3268,7 +3268,7 @@ export default class MonthlyReport extends Component {
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
createCF={this.createCashFlow.bind(this)}
// getReport={this.getCompanyActive.bind(this)}
// getReport={this.getCompanyActive.bind(this)}
/>
)}
{this.state.visiblePL && (
......@@ -3289,7 +3289,7 @@ export default class MonthlyReport extends Component {
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
createCF={this.createCashFlow.bind(this)}
// getReport={this.getCompanyActive.bind(this)}
// getReport={this.getCompanyActive.bind(this)}
/>
)}
......
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ ff61da50
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 @ ff61da50
......@@ -821,7 +821,7 @@ export default class ProfitLossMR extends Component {
|| R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity)) ? 0 : (selisih / prevMonth) * 100
// total = (Number(tableMeta.rowData[10]) > Number(tableMeta.rowData[12]))? (String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// if (String(tableMeta.rowData[5]).toLocaleUpperCase() == 'CORPORATE INCOME TAX') {
......@@ -844,9 +844,9 @@ export default class ProfitLossMR extends Component {
let selisih = Number(dataTable2[tableMeta.rowIndex][15])
let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][8]).includes('-')? Number(dataTable2[tableMeta.rowIndex][8]) *-1 : dataTable2[tableMeta.rowIndex][8])
total = R.equals(selisih / prevMonth, 0)
|| R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
|| R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
// total = (Number(tableMeta.rowData[10]) > Number(tableMeta.rowData[8]))? (String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
......@@ -863,9 +863,9 @@ export default class ProfitLossMR extends Component {
let selisih = Number(dataTable2[tableMeta.rowIndex][17])
let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][9]).includes('-')? Number(dataTable2[tableMeta.rowIndex][9]) *-1 : dataTable2[tableMeta.rowIndex][9])
total = R.equals(selisih / prevMonth, 0)
|| R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
|| R.equals(selisih / prevMonth, NaN)
|| R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
// total = (Number(tableMeta.rowData[10]) > Number(tableMeta.rowData[9])) ? (String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)) : Number(total).toFixed(1)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
......@@ -1256,7 +1256,7 @@ export default class ProfitLossMR extends Component {
disabled={true}
decimalScale={1}
value={Number(handleValue(value, tableMeta)).toFixed(1)}
// value={Number(handleValue(tableMeta, 2)).toFixed(1)}
// value={Number(handleValue(tableMeta, 2)).toFixed(1)}
/>
</span> :
tableMeta.rowData[0] === 6 || tableMeta.rowData[0] === 5 ?
......@@ -1540,7 +1540,7 @@ export default class ProfitLossMR extends Component {
disabled={true}
value={Number(handleVariancePercent(tableMeta, 1, 1)).toFixed(1)}
decimalScale={1}
// value={11}
// value={11}
/>
}
/>
......@@ -2052,7 +2052,7 @@ export default class ProfitLossMR extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
null
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
......@@ -2125,10 +2125,10 @@ export default class ProfitLossMR extends Component {
<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) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ ff61da50
......@@ -850,13 +850,13 @@ export default class TaxPlanningMR extends Component {
item[tableMeta.columnIndex].tbc.value == undefined ? Number(item[tableMeta.columnIndex].tbc == "" || item[tableMeta.columnIndex].tbc == "0.0" ? 0 : item[tableMeta.columnIndex].tbc) : Number(item[tableMeta.columnIndex].tbc.value == "" || item[tableMeta.columnIndex].tbc.value == "0.0" ? 0 : item[tableMeta.columnIndex].tbc.value)
:
(type == 2 ?
item[tableMeta.columnIndex].fcp.value == undefined ? Number(item[tableMeta.columnIndex].fcp == "" || item[tableMeta.columnIndex].fcp == "0.0" ? 0 : item[tableMeta.columnIndex].fcp) : Number(item[tableMeta.columnIndex].fcp.value == "" || item[tableMeta.columnIndex].fcp.value == "0.0" ? 0 : item[tableMeta.columnIndex].fcp.value)
item[tableMeta.columnIndex].fcp.value == undefined ? Number(item[tableMeta.columnIndex].fcp == "" || item[tableMeta.columnIndex].fcp == "0.0" ? 0 : item[tableMeta.columnIndex].fcp) : Number(item[tableMeta.columnIndex].fcp.value == "" || item[tableMeta.columnIndex].fcp.value == "0.0" ? 0 : item[tableMeta.columnIndex].fcp.value)
:
(type == 3 ?
item[tableMeta.columnIndex].tbf.value == undefined ? Number(item[tableMeta.columnIndex].tbf == "" || item[tableMeta.columnIndex].tbf == "0.0" ? 0 : item[tableMeta.columnIndex].tbf) : Number(item[tableMeta.columnIndex].tbf.value == "" || item[tableMeta.columnIndex].tbf.value == "0.0" ? 0 : item[tableMeta.columnIndex].tbf.value)
:
(type == 3 ?
item[tableMeta.columnIndex].tbf.value == undefined ? Number(item[tableMeta.columnIndex].tbf == "" || item[tableMeta.columnIndex].tbf == "0.0" ? 0 : item[tableMeta.columnIndex].tbf) : Number(item[tableMeta.columnIndex].tbf.value == "" || item[tableMeta.columnIndex].tbf.value == "0.0" ? 0 : item[tableMeta.columnIndex].tbf.value)
:
item[tableMeta.columnIndex].value == undefined ? Number(item[tableMeta.columnIndex] == "" || item[tableMeta.columnIndex] == "0.0" ? 0 : item[tableMeta.columnIndex]) : Number(item[tableMeta.columnIndex].value == "" || item[tableMeta.columnIndex].value == "0.0" ? 0 : item[tableMeta.columnIndex].value)
)
item[tableMeta.columnIndex].value == undefined ? Number(item[tableMeta.columnIndex] == "" || item[tableMeta.columnIndex] == "0.0" ? 0 : item[tableMeta.columnIndex]) : Number(item[tableMeta.columnIndex].value == "" || item[tableMeta.columnIndex].value == "0.0" ? 0 : item[tableMeta.columnIndex].value)
)
)
)
}
......@@ -1384,7 +1384,7 @@ export default class TaxPlanningMR extends Component {
null
:
this.state.get_for == 'view' ?
// Number(value).toFixed(1)
// Number(value).toFixed(1)
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
......@@ -1526,7 +1526,7 @@ export default class TaxPlanningMR extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template">
......@@ -1597,10 +1597,10 @@ export default class TaxPlanningMR extends Component {
<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) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
......
src/container/OperatingIndicator/OperatingIndicator.js
View file @ ff61da50
......@@ -764,7 +764,7 @@ export default class OperatingIndicator extends Component {
// );
// }
// }
// },
// },
{
name: "Status",
options: {
......
src/container/OperatingIndicator/OperatingIndicatorDetail.js
View file @ ff61da50
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/OutlookPA/BalanceSheetOLPA.js
View file @ ff61da50
......@@ -1813,18 +1813,18 @@ export default class BalanceSheetOLPA extends Component {
}
}
},
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
}]
{
name: "",
options: {
display: false
}
},
{
name: "",
options: {
display: false
}
}]
const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
......@@ -1885,7 +1885,7 @@ export default class BalanceSheetOLPA extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template">
......@@ -1955,10 +1955,10 @@ export default class BalanceSheetOLPA extends Component {
<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) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
</div>
......
src/container/OutlookPA/CashFlowOLPA.js
View file @ ff61da50
This diff is collapsed.
src/container/OutlookPA/OutlookPA.js
View file @ ff61da50
......@@ -204,7 +204,7 @@ export default class OutlookPA extends Component {
} else {
this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false, loading: false })
}
//
//
})
} else {
this.setState({ listRevision: null, revision: null, listCompany: null, company: null, dataTable: [], lastRevision: "", visibleTableHistory: false, loading: false }, () => {
......@@ -1306,27 +1306,27 @@ export default class OutlookPA extends Component {
if (item[0] == 5 || item[0] == 6 || item[0] == 7) {
// if (item[7].value == "" || item[7].value == 0 || item[7].value == "0.0") {
item[7].value = this.handleValueFormulaDBPL(index, item[7], item, 7)
// }
// }
// if (item[8].value == "" || item[8].value == 0 || item[8].value == "0.0") {
item[8].value = this.handleValueFormulaDBPL(index, item[8], item, 8)
// }
// }
// if (item[9].value == "" || item[9].value == 0 || item[9].value == "0.0") {
item[9].value = this.handleValueFormulaDBPL(index, item[9], item, 9)
// }
// }
// if (item[10].value == "" || item[10].value == 0 || item[10].value == "0.0") {
item[10].value = this.handleValueFormulaDBPL(index, item[10], item, 10)
// }
// }
// if (item[11].value == "" || item[11].value == 0 || item[11].value == "0.0") {
item[11].value = this.handleValueFormulaDBPL(index, item[11], item, 11)
// }
// }
// if (item[12].value == "" || item[12].value == 0 || item[12].value == "0.0") {
item[12].value = this.handleValueFormulaDBPL(index, item[12], item, 12)
// }
// }
// if (item[13].value == "" || item[13].value == 0 || item[13].value == "0.0") {
item[13].value = this.handleValueFormulaDBPL(index, item[13], item, 13)
......@@ -1334,31 +1334,31 @@ export default class OutlookPA extends Component {
// if (item[14].value == "" || item[14].value == 0 || item[14].value == "0.0") {
item[14].value = this.handleValueFormulaDBPL(index, item[14], item, 14)
// }
// }
// if (item[15].value == "" || item[15].value == 0 || item[15].value == "0.0") {
item[15].value = this.handleValueFormulaDBPL(index, item[15], item, 15)
// }
// }
// if (item[16].value == "" || item[16].value == 0 || item[16].value == "0.0") {
item[16].value = this.handleValueFormulaDBPL(index, item[16], item, 16)
// }
// }
// if (item[17].value == "" || item[17].value == 0 || item[17].value == "0.0") {
item[17].value = this.handleValueFormulaDBPL(index, item[17], item, 17)
// }
// }
// if (item[18].value == "" || item[18].value == 0 || item[18].value == "0.0") {
item[18].value = this.handleValueFormulaDBPL(index, item[18], item, 18)
// }
// }
// if (item[20] == "" || item[20] == 0 || item[20] == "0.0") {
item[20] = this.handleForecastDBPL(index, item, `${Number(this.state.periode.periode) + 1}`, 20)
// }
// }
// if (item[21] == "" || item[21] == 0 || item[21] == "0.0") {
item[21] = this.handleForecastDBPL(index, item, `${Number(this.state.periode.periode) + 2}`, 21)
// }
// }
}
......@@ -1657,7 +1657,7 @@ export default class OutlookPA extends Component {
: null
}
>
{/* {this.state.isApprover == true ?
{/* {this.state.isApprover == true ?
(tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
(this.state.lastRevision == 0 ? (tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
(tableMeta.rowData[3] !== 'submitted' ? '#5198ea' : 'GrayText'))} */}
......
src/container/OutlookPA/ProfitLossOLPA.js
View file @ ff61da50
......@@ -1784,7 +1784,7 @@ export default class ProfitLossOLPA extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template">
......@@ -1855,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 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
</div>
......
src/container/OutlookPA/TaxPlanningOLPA.js
View file @ ff61da50
This diff is collapsed.
src/container/Reports/SubHolding.js
View file @ ff61da50
This diff is collapsed.
src/container/Reports/TableSubHolding.js
View file @ ff61da50
This diff is collapsed.
src/container/RollingOutlook/CashFlowRO.js
View file @ ff61da50
This diff is collapsed.
src/container/RollingOutlook/ProfitLossRO.js
View file @ ff61da50
......@@ -800,11 +800,11 @@ export default class ProfitLossROO extends Component {
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))
}
// else if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "total man power") {
// let totalTMP = dataTable2[tableMeta.rowIndex][20] = dataTable2[tableMeta.rowIndex][19]
// return totalTMP
// } else if (indexParent !== -1 && String(dataTable2[indexParent][5]).toLocaleUpperCase() == "GROSS PROFIT MARGIN (% OF REVENUE)") {
// return handleFormula(0, tableMeta, 0)
// else if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "total man power") {
// let totalTMP = dataTable2[tableMeta.rowIndex][20] = dataTable2[tableMeta.rowIndex][19]
// return totalTMP
// } else if (indexParent !== -1 && String(dataTable2[indexParent][5]).toLocaleUpperCase() == "GROSS PROFIT MARGIN (% OF REVENUE)") {
// return handleFormula(0, tableMeta, 0)
// }
else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
......@@ -2332,7 +2332,7 @@ export default class ProfitLossROO extends Component {
// </button>
// </a>
// <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
// </div>
// </div>
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template">
......@@ -2404,10 +2404,10 @@ export default class ProfitLossROO extends Component {
<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) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
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 }}>-</Typography>
}
</div>
......
src/container/RollingOutlook/RollingOutlook.js
View file @ ff61da50
......@@ -1333,27 +1333,27 @@ export default class RollingOutlook extends Component {
if (item[0] == 5 || item[0] == 6 || item[0] == 7) {
// if (item[7].value == "" || item[7].value == 0 || item[7].value == "0.0") {
item[7].value = this.handleValueFormulaDBPL(index, item[7], item, 7)
// }
// }
// if (item[8].value == "" || item[8].value == 0 || item[8].value == "0.0") {
item[8].value = this.handleValueFormulaDBPL(index, item[8], item, 8)
// }
// }
// if (item[9].value == "" || item[9].value == 0 || item[9].value == "0.0") {
item[9].value = this.handleValueFormulaDBPL(index, item[9], item, 9)
// }
// }
// if (item[10].value == "" || item[10].value == 0 || item[10].value == "0.0") {
item[10].value = this.handleValueFormulaDBPL(index, item[10], item, 10)
// }
// }
// if (item[11].value == "" || item[11].value == 0 || item[11].value == "0.0") {
item[11].value = this.handleValueFormulaDBPL(index, item[11], item, 11)
// }
// }
// if (item[12].value == "" || item[12].value == 0 || item[12].value == "0.0") {
item[12].value = this.handleValueFormulaDBPL(index, item[12], item, 12)
// }
// }
// if (item[13].value == "" || item[13].value == 0 || item[13].value == "0.0") {
item[13].value = this.handleValueFormulaDBPL(index, item[13], item, 13)
......@@ -1361,31 +1361,31 @@ export default class RollingOutlook extends Component {
// if (item[14].value == "" || item[14].value == 0 || item[14].value == "0.0") {
item[14].value = this.handleValueFormulaDBPL(index, item[14], item, 14)
// }
// }
// if (item[15].value == "" || item[15].value == 0 || item[15].value == "0.0") {
item[15].value = this.handleValueFormulaDBPL(index, item[15], item, 15)
// }
// }
// if (item[16].value == "" || item[16].value == 0 || item[16].value == "0.0") {
item[16].value = this.handleValueFormulaDBPL(index, item[16], item, 16)
// }
// }
// if (item[17].value == "" || item[17].value == 0 || item[17].value == "0.0") {
item[17].value = this.handleValueFormulaDBPL(index, item[17], item, 17)
// }
// }
// if (item[18].value == "" || item[18].value == 0 || item[18].value == "0.0") {
item[18].value = this.handleValueFormulaDBPL(index, item[18], item, 18)
// }
// }
// if (item[20] == "" || item[20] == 0 || item[20] == "0.0") {
item[20] = this.handleForecastDBPL(index, item, `${Number(this.state.periode.periode) + 1}`, 20)
// }
// }
// if (item[21] == "" || item[21] == 0 || item[21] == "0.0") {
item[21] = this.handleForecastDBPL(index, item, `${Number(this.state.periode.periode) + 2}`, 21)
// }
// }
}
......@@ -1670,7 +1670,7 @@ export default class RollingOutlook extends Component {
: null
}
>
{/* {this.state.isApprover == true ?
{/* {this.state.isApprover == true ?
(tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
(this.state.lastRevision == 0 ? (tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
(tableMeta.rowData[3] !== 'submitted' ? '#5198ea' : 'GrayText'))} */}
......
src/container/SummaryTriputra/SummaryOfTriputra.js
View file @ ff61da50
......@@ -46,7 +46,7 @@ export default class SummaryOfTriputra extends Component {
console.log(this.state.report);
this.getPeriode()
})
// this.getMonth()
}
......@@ -60,9 +60,9 @@ export default class SummaryOfTriputra extends Component {
let data = []
response.data.data.map((item) => {
// if (this.state.isApprover) {
if (item >= 2000 && item <= (Number(currentYear) + 1)) {
data.push(item)
}
if (item >= 2000 && item <= (Number(currentYear) + 1)) {
data.push(item)
}
// } else {
// if ((item >= 2000) && (item == this.state.lastPeriod || item < this.state.lastPeriod)) {
// data.push(item)
......@@ -888,7 +888,7 @@ export default class SummaryOfTriputra extends Component {
this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
}
})
}
}
}
async downloadAllData() {
......@@ -963,7 +963,7 @@ export default class SummaryOfTriputra extends Component {
a.click();
}
} else {
// setTimeout(() => {
// this.setState({ loading: false })
// }, 1000);
......@@ -1016,7 +1016,7 @@ export default class SummaryOfTriputra extends Component {
} else {
this.getDataTable()
}
})}
disableClearable
style={{ width: 250 }}
......@@ -1041,7 +1041,7 @@ export default class SummaryOfTriputra extends Component {
value={this.state.periode}
/>
</div>
{(this.state.report != null && !String(this.state.report.label).toLocaleLowerCase().includes('historical')) && <div style={{ marginTop: 15 }}>
<Autocomplete
{...this.state.listMonths}
......
src/router/homeRoutes.js
View file @ ff61da50
......@@ -147,7 +147,7 @@ const routes = [
path:"/maintenance",
main: Maintenance
},
];
export default routes;
\ No newline at end of file
src/router/index.js
View file @ ff61da50
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