Skip to content

T
Tia-dev
Commit b108f393 authored by ardiansyah's avatar ardiansyah
Browse files
Options

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

Env dev

See merge request !2376
parents c605bd98 c1c69957
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 27 deletions
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ b108f393
......@@ -3863,9 +3863,9 @@ export default class CorporateAnnualTarget extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision})</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
<div style={{ width: '50%' }}>
......@@ -4052,9 +4052,9 @@ export default class CorporateAnnualTarget extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode}</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
{this.state.dataLoaded && (
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ b108f393
......@@ -2050,9 +2050,9 @@ export default class CorporateAnnualTargetMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
<div style={{ width: '50%' }}>
......@@ -2291,9 +2291,9 @@ export default class CorporateAnnualTargetMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
{this.props.defaultCurrency.id === 1 ?
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR bio</Typography>
:
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD thousand</Typography>
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in USD mio</Typography>
}
</div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ b108f393
......@@ -709,8 +709,8 @@ export default class BalanceSheetRO extends Component {
const handleChange = (value, tableMeta, type) => {
let val = String(value).split(",").join("")
if (type === "actual") {
console.log('masuk')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
console.log('masuk')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
} else {
console.log('masuk2')
let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2])
......@@ -719,26 +719,27 @@ export default class BalanceSheetRO extends Component {
let a = 0
if (type == 'r/e') {
// console.log('masuk8')
a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = Number(val)
} else {
// console.log('masuk9')
a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
a = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
}
let jagain = dataTable2[indexParent][tableMeta.columnIndex]
if (this.props.defaultCurrency.id == 1) {
a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? fixNumber((0 + Number(val)), 1) : fixNumber(Number(jagain + Number(val)), 1)
} else {
a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? (0 + Number(val)) : Number(jagain + Number(val))
}
a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? (0 + Number(val)) : Number(jagain + Number(val))
// if (this.props.defaultCurrency.id == 1) {
// a = dataTable2[indexParent][tableMeta.columnIndex] = jagain === undefined ? fixNumber((0 + Number(val)), 1) : fixNumber(Number(jagain + Number(val)), 1)
// } else {
// }
} else {
// console.log('masuk3')
if (type == 'r/e') {
// console.log('masuk4')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = Number(val)
} else {
// console.log('masuk5')
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(val)
}
}
}
......@@ -752,8 +753,11 @@ export default class BalanceSheetRO extends Component {
total = item[data.columnIndex] === undefined ? Number(total) + 0 : Number(total) + itemVal
}
})
// if (data.rowData[5] === "Acc. Depreciation & Amortization" && data.columnIndex == 17) {
// console.log(total)
// }
let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[data.rowIndex][2])
let a = dataTable2[data.rowIndex][data.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
let a = dataTable2[data.rowIndex][data.columnIndex] = Number(total)
// console.log(indexParent);
return a
}
......@@ -820,12 +824,6 @@ export default class BalanceSheetRO extends Component {
}
})
// if (tableMeta.columnIndex == 7) {
// console.log(splitFormula)
// console.log(baru)
// }
// console.log(baru)
baru.map((item, index) => {
if (item == '-' || item == '+' || item == '/' || item == '*') {
anjay.push(item)
......@@ -894,7 +892,6 @@ export default class BalanceSheetRO extends Component {
}
}
})
// console.log(anjay)
let total = 0
let opt = ""
......
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