Skip to content

T
Tia-dev
Commit 52c536f2 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

update full amount banyak banget

See merge request !1991
parents 6cec0fc8 5f486deb
Show whitespace changes
Inline Side-by-side
Showing with 10898 additions and 7277 deletions
src/container/BudgetTahunan/BalanceSheet.js
View file @ 52c536f2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CashFlow.js
View file @ 52c536f2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 52c536f2
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 @ 52c536f2
...@@ -11,6 +11,7 @@ import { ExcelRenderer } from 'react-excel-renderer'; ...@@ -11,6 +11,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
import { Alert, Autocomplete } from '@material-ui/lab'; import { Alert, Autocomplete } from '@material-ui/lab';
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
import * as R from 'ramda' import * as R from 'ramda'
import { fixNumber, titleCase } from '../../library/Utils';
const LightTooltip = withStyles((theme) => ({ const LightTooltip = withStyles((theme) => ({
tooltip: { tooltip: {
...@@ -120,21 +121,21 @@ export default class FixedAssetsMovement extends Component { ...@@ -120,21 +121,21 @@ export default class FixedAssetsMovement extends Component {
item.level, item.level,
item.description, item.description,
item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before, item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.january).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : Number(item.fixed_asset_movement.january).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.january) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : Number(item.fixed_asset_movement.january),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.february).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : Number(item.fixed_asset_movement.february).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.february) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : Number(item.fixed_asset_movement.february),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.march).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : Number(item.fixed_asset_movement.march).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.march) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : Number(item.fixed_asset_movement.march),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.april).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : Number(item.fixed_asset_movement.april).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.april) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : Number(item.fixed_asset_movement.april),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.may).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : Number(item.fixed_asset_movement.may).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.may) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : Number(item.fixed_asset_movement.may),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.june).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : Number(item.fixed_asset_movement.june).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.june) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : Number(item.fixed_asset_movement.june),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.july).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : Number(item.fixed_asset_movement.july).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.july) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : Number(item.fixed_asset_movement.july),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.august).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : Number(item.fixed_asset_movement.august).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.august) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : Number(item.fixed_asset_movement.august),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.september).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : Number(item.fixed_asset_movement.september).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.september) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : Number(item.fixed_asset_movement.september),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.october).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : Number(item.fixed_asset_movement.october).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.october) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : Number(item.fixed_asset_movement.october),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.november).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : Number(item.fixed_asset_movement.november).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.november) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : Number(item.fixed_asset_movement.november),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.december).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : Number(item.fixed_asset_movement.december).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.december) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : Number(item.fixed_asset_movement.december),
Number(item.fixed_asset_movement.total_current_year).toFixed(1), Number(item.fixed_asset_movement.total_current_year),
Number(item.fixed_asset_movement.total_next_year).toFixed(1), Number(item.fixed_asset_movement.total_next_year),
Number(item.fixed_asset_movement.total_more_year).toFixed(1), Number(item.fixed_asset_movement.total_more_year),
item.order, item.order,
item.fixed_asset_movement.forecast_formula, item.fixed_asset_movement.forecast_formula,
item.fixed_asset_movement.before_formula item.fixed_asset_movement.before_formula
...@@ -157,21 +158,21 @@ export default class FixedAssetsMovement extends Component { ...@@ -157,21 +158,21 @@ export default class FixedAssetsMovement extends Component {
item.level, item.level,
item.description, item.description,
item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before, item.fixed_asset_movement.total_actual_before === null ? "0" : item.fixed_asset_movement.total_actual_before === "" ? "0" : item.fixed_asset_movement.total_actual_before,
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.january).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : Number(item.fixed_asset_movement.january).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.january) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.january, formula: item.fixed_asset_movement.january_formula } : Number(item.fixed_asset_movement.january),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.february).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : Number(item.fixed_asset_movement.february).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.february) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.february, formula: item.fixed_asset_movement.february_formula } : Number(item.fixed_asset_movement.february),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.march).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : Number(item.fixed_asset_movement.march).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.march) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.march, formula: item.fixed_asset_movement.march_formula } : Number(item.fixed_asset_movement.march),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.april).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : Number(item.fixed_asset_movement.april).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.april) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.april, formula: item.fixed_asset_movement.april_formula } : Number(item.fixed_asset_movement.april),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.may).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : Number(item.fixed_asset_movement.may).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.may) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.may, formula: item.fixed_asset_movement.may_formula } : Number(item.fixed_asset_movement.may),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.june).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : Number(item.fixed_asset_movement.june).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.june) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.june, formula: item.fixed_asset_movement.june_formula } : Number(item.fixed_asset_movement.june),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.july).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : Number(item.fixed_asset_movement.july).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.july) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.july, formula: item.fixed_asset_movement.july_formula } : Number(item.fixed_asset_movement.july),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.august).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : Number(item.fixed_asset_movement.august).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.august) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.august, formula: item.fixed_asset_movement.august_formula } : Number(item.fixed_asset_movement.august),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.september).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : Number(item.fixed_asset_movement.september).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.september) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.september, formula: item.fixed_asset_movement.september_formula } : Number(item.fixed_asset_movement.september),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.october).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : Number(item.fixed_asset_movement.october).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.october) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.october, formula: item.fixed_asset_movement.october_formula } : Number(item.fixed_asset_movement.october),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.november).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : Number(item.fixed_asset_movement.november).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.november) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.november, formula: item.fixed_asset_movement.november_formula } : Number(item.fixed_asset_movement.november),
this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.december).toFixed(1) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : Number(item.fixed_asset_movement.december).toFixed(1), this.props.status === 'CLOSED' ? Number(item.fixed_asset_movement.december) : item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.fixed_asset_movement.december, formula: item.fixed_asset_movement.december_formula } : Number(item.fixed_asset_movement.december),
Number(item.fixed_asset_movement.total_current_year).toFixed(1), Number(item.fixed_asset_movement.total_current_year),
Number(item.fixed_asset_movement.total_next_year).toFixed(1), Number(item.fixed_asset_movement.total_next_year),
Number(item.fixed_asset_movement.total_more_year).toFixed(1), Number(item.fixed_asset_movement.total_more_year),
item.order, item.order,
item.fixed_asset_movement.forecast_formula, item.fixed_asset_movement.forecast_formula,
item.fixed_asset_movement.before_formula item.fixed_asset_movement.before_formula
...@@ -235,27 +236,52 @@ export default class FixedAssetsMovement extends Component { ...@@ -235,27 +236,52 @@ export default class FixedAssetsMovement extends Component {
backToMasterBudget(type) { backToMasterBudget(type) {
console.log("masuk sini"); console.log("masuk sini");
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
total_actual_before: String(Number(i[6]).toFixed(1)), total_actual_before: String(Number(i[6])),
january: i[0] === 5 || i[0] === 6 ? String(Number(i[7].value).toFixed(1)) : String(Number(i[7]).toFixed(1)), january: i[0] === 5 || i[0] === 6 ? String(Number(i[7].value)) : String(Number(i[7])),
february: i[0] === 5 || i[0] === 6 ? String(Number(i[8].value).toFixed(1)) : String(Number(i[8]).toFixed(1)), february: i[0] === 5 || i[0] === 6 ? String(Number(i[8].value)) : String(Number(i[8])),
march: i[0] === 5 || i[0] === 6 ? String(Number(i[9].value).toFixed(1)) : String(Number(i[9]).toFixed(1)), march: i[0] === 5 || i[0] === 6 ? String(Number(i[9].value)) : String(Number(i[9])),
april: i[0] === 5 || i[0] === 6 ? String(Number(i[10].value).toFixed(1)) : String(Number(i[10]).toFixed(1)), april: i[0] === 5 || i[0] === 6 ? String(Number(i[10].value)) : String(Number(i[10])),
may: i[0] === 5 || i[0] === 6 ? String(Number(i[11].value).toFixed(1)) : String(Number(i[11]).toFixed(1)), may: i[0] === 5 || i[0] === 6 ? String(Number(i[11].value)) : String(Number(i[11])),
june: i[0] === 5 || i[0] === 6 ? String(Number(i[12].value).toFixed(1)) : String(Number(i[12]).toFixed(1)), june: i[0] === 5 || i[0] === 6 ? String(Number(i[12].value)) : String(Number(i[12])),
july: i[0] === 5 || i[0] === 6 ? String(Number(i[13].value).toFixed(1)) : String(Number(i[13]).toFixed(1)), july: i[0] === 5 || i[0] === 6 ? String(Number(i[13].value)) : String(Number(i[13])),
august: i[0] === 5 || i[0] === 6 ? String(Number(i[14].value).toFixed(1)) : String(Number(i[14]).toFixed(1)), august: i[0] === 5 || i[0] === 6 ? String(Number(i[14].value)) : String(Number(i[14])),
september: i[0] === 5 || i[0] === 6 ? String(Number(i[15].value).toFixed(1)) : String(Number(i[15]).toFixed(1)), september: i[0] === 5 || i[0] === 6 ? String(Number(i[15].value)) : String(Number(i[15])),
october: i[0] === 5 || i[0] === 6 ? String(Number(i[16].value).toFixed(1)) : String(Number(i[16]).toFixed(1)), october: i[0] === 5 || i[0] === 6 ? String(Number(i[16].value)) : String(Number(i[16])),
november: i[0] === 5 || i[0] === 6 ? String(Number(i[17].value).toFixed(1)) : String(Number(i[17]).toFixed(1)), november: i[0] === 5 || i[0] === 6 ? String(Number(i[17].value)) : String(Number(i[17])),
december: i[0] === 5 || i[0] === 6 ? String(Number(i[18].value).toFixed(1)) : String(Number(i[18]).toFixed(1)), december: i[0] === 5 || i[0] === 6 ? String(Number(i[18].value)) : String(Number(i[18])),
total_current_year: String(Number(i[19]).toFixed(1)), total_current_year: String(Number(i[19])),
total_next_year: String(Number(i[20]).toFixed(1)), total_next_year: String(Number(i[20])),
total_more_year: String(Number(i[21]).toFixed(1)) total_more_year: String(Number(i[21]))
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
total_actual_before: String(fixNumber(Number(i[6]), 1)),
january: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[7].value), 1)) : String(fixNumber(Number(i[7]), 1)),
february: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[8].value), 1)) : String(fixNumber(Number(i[8]), 1)),
march: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[9].value), 1)) : String(fixNumber(Number(i[9]), 1)),
april: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[10].value), 1)) : String(fixNumber(Number(i[10]), 1)),
may: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[11].value), 1)) : String(fixNumber(Number(i[11]), 1)),
june: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[12].value), 1)) : String(fixNumber(Number(i[12]), 1)),
july: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[13].value), 1)) : String(fixNumber(Number(i[13]), 1)),
august: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[14].value), 1)) : String(fixNumber(Number(i[14]), 1)),
september: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[15].value), 1)) : String(fixNumber(Number(i[15]), 1)),
october: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[16].value), 1)) : String(fixNumber(Number(i[16]), 1)),
november: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[17].value), 1)) : String(fixNumber(Number(i[17]), 1)),
december: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[18].value), 1)) : String(fixNumber(Number(i[18]), 1)),
total_current_year: String(fixNumber(Number(i[19]), 1)),
total_next_year: String(fixNumber(Number(i[20]), 1)),
total_more_year: String(fixNumber(Number(i[21]), 1))
})
})
}
let payload = { let payload = {
"submission_id": this.props.submissionID, "submission_id": this.props.submissionID,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -359,21 +385,21 @@ export default class FixedAssetsMovement extends Component { ...@@ -359,21 +385,21 @@ export default class FixedAssetsMovement extends Component {
item.level, item.level,
item.item_report, item.item_report,
item.total_actual_before, item.total_actual_before,
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.january, formula: item.january_formula } : Number(item.january).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.january, formula: item.january_formula } : Number(item.january),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.february, formula: item.february_formula } : Number(item.february).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.february, formula: item.february_formula } : Number(item.february),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.march, formula: item.march_formula } : Number(item.march).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.march, formula: item.march_formula } : Number(item.march),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.april, formula: item.april_formula } : Number(item.april).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.april, formula: item.april_formula } : Number(item.april),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.may, formula: item.may_formula } : Number(item.may).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.may, formula: item.may_formula } : Number(item.may),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.june, formula: item.june_formula } : Number(item.june).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.june, formula: item.june_formula } : Number(item.june),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.july, formula: item.july_formula } : Number(item.july).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.july, formula: item.july_formula } : Number(item.july),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.august, formula: item.august_formula } : Number(item.august).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.august, formula: item.august_formula } : Number(item.august),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.september, formula: item.september_formula } : Number(item.september).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.september, formula: item.september_formula } : Number(item.september),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.october, formula: item.october_formula } : Number(item.october).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.october, formula: item.october_formula } : Number(item.october),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.november, formula: item.november_formula } : Number(item.november).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.november, formula: item.november_formula } : Number(item.november),
item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.december, formula: item.december_formula } : Number(item.december).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.december, formula: item.december_formula } : Number(item.december),
Number(item.total_current_year).toFixed(1), Number(item.total_current_year),
Number(item.total_next_year).toFixed(1), Number(item.total_next_year),
Number(item.total_more_year).toFixed(1), Number(item.total_more_year),
item.orders, item.orders,
item.forecast_formula, item.forecast_formula,
item.before_formula, item.before_formula,
...@@ -411,27 +437,52 @@ export default class FixedAssetsMovement extends Component { ...@@ -411,27 +437,52 @@ export default class FixedAssetsMovement extends Component {
uploadFAM(type) { uploadFAM(type) {
console.log("masuk ga?"); console.log("masuk ga?");
let data = [] let data = []
if (this.state.defaultCurrencyUpload?.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
total_actual_before: String(Number(i[6]).toFixed(1)), total_actual_before: String(Number(i[6])),
january: i[0] === 5 || i[0] === 6 ? String(Number(i[7].value).toFixed(1)) : String(Number(i[7]).toFixed(1)), january: i[0] === 5 || i[0] === 6 ? String(Number(i[7].value)) : String(Number(i[7])),
february: i[0] === 5 || i[0] === 6 ? String(Number(i[8].value).toFixed(1)) : String(Number(i[8]).toFixed(1)), february: i[0] === 5 || i[0] === 6 ? String(Number(i[8].value)) : String(Number(i[8])),
march: i[0] === 5 || i[0] === 6 ? String(Number(i[9].value).toFixed(1)) : String(Number(i[9]).toFixed(1)), march: i[0] === 5 || i[0] === 6 ? String(Number(i[9].value)) : String(Number(i[9])),
april: i[0] === 5 || i[0] === 6 ? String(Number(i[10].value).toFixed(1)) : String(Number(i[10]).toFixed(1)), april: i[0] === 5 || i[0] === 6 ? String(Number(i[10].value)) : String(Number(i[10])),
may: i[0] === 5 || i[0] === 6 ? String(Number(i[11].value).toFixed(1)) : String(Number(i[11]).toFixed(1)), may: i[0] === 5 || i[0] === 6 ? String(Number(i[11].value)) : String(Number(i[11])),
june: i[0] === 5 || i[0] === 6 ? String(Number(i[12].value).toFixed(1)) : String(Number(i[12]).toFixed(1)), june: i[0] === 5 || i[0] === 6 ? String(Number(i[12].value)) : String(Number(i[12])),
july: i[0] === 5 || i[0] === 6 ? String(Number(i[13].value).toFixed(1)) : String(Number(i[13]).toFixed(1)), july: i[0] === 5 || i[0] === 6 ? String(Number(i[13].value)) : String(Number(i[13])),
august: i[0] === 5 || i[0] === 6 ? String(Number(i[14].value).toFixed(1)) : String(Number(i[14]).toFixed(1)), august: i[0] === 5 || i[0] === 6 ? String(Number(i[14].value)) : String(Number(i[14])),
september: i[0] === 5 || i[0] === 6 ? String(Number(i[15].value).toFixed(1)) : String(Number(i[15]).toFixed(1)), september: i[0] === 5 || i[0] === 6 ? String(Number(i[15].value)) : String(Number(i[15])),
october: i[0] === 5 || i[0] === 6 ? String(Number(i[16].value).toFixed(1)) : String(Number(i[16]).toFixed(1)), october: i[0] === 5 || i[0] === 6 ? String(Number(i[16].value)) : String(Number(i[16])),
november: i[0] === 5 || i[0] === 6 ? String(Number(i[17].value).toFixed(1)) : String(Number(i[17]).toFixed(1)), november: i[0] === 5 || i[0] === 6 ? String(Number(i[17].value)) : String(Number(i[17])),
december: i[0] === 5 || i[0] === 6 ? String(Number(i[18].value).toFixed(1)) : String(Number(i[18]).toFixed(1)), december: i[0] === 5 || i[0] === 6 ? String(Number(i[18].value)) : String(Number(i[18])),
total_current_year: String(Number(i[19]).toFixed(1)), total_current_year: String(Number(i[19])),
total_next_year: String(Number(i[20]).toFixed(1)), total_next_year: String(Number(i[20])),
total_more_year: String(Number(i[21]).toFixed(1)) total_more_year: String(Number(i[21]))
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
total_actual_before: String(fixNumber(Number(i[6]), 1)),
january: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[7].value), 1)) : String(fixNumber(Number(i[7]), 1)),
february: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[8].value), 1)) : String(fixNumber(Number(i[8]), 1)),
march: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[9].value), 1)) : String(fixNumber(Number(i[9]), 1)),
april: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[10].value), 1)) : String(fixNumber(Number(i[10]), 1)),
may: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[11].value), 1)) : String(fixNumber(Number(i[11]), 1)),
june: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[12].value), 1)) : String(fixNumber(Number(i[12]), 1)),
july: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[13].value), 1)) : String(fixNumber(Number(i[13]), 1)),
august: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[14].value), 1)) : String(fixNumber(Number(i[14]), 1)),
september: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[15].value), 1)) : String(fixNumber(Number(i[15]), 1)),
october: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[16].value), 1)) : String(fixNumber(Number(i[16]), 1)),
november: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[17].value), 1)) : String(fixNumber(Number(i[17]), 1)),
december: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[18].value), 1)) : String(fixNumber(Number(i[18]), 1)),
total_current_year: String(fixNumber(Number(i[19]), 1)),
total_next_year: String(fixNumber(Number(i[20]), 1)),
total_more_year: String(fixNumber(Number(i[21]), 1))
})
})
}
let body = { let body = {
submission_id: this.props.submissionID, submission_id: this.props.submissionID,
company_id: this.props.company.company_id, company_id: this.props.company.company_id,
...@@ -965,7 +1016,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -965,7 +1016,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
// value={Number(handleBfr(value, tableMeta)).toFixed(1)} // value={Number(handleBfr(value, tableMeta)).toFixed(1)}
/> />
} }
...@@ -983,7 +1034,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -983,7 +1034,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1022,7 +1073,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1022,7 +1073,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1038,7 +1089,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1038,7 +1089,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1056,7 +1107,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1056,7 +1107,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
// // console.log(dataTable2) // // console.log(dataTable2)
...@@ -1073,7 +1124,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1073,7 +1124,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1087,7 +1138,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1087,7 +1138,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') && String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance' ? false : true)} disabled={this.props.isApprover ? true : ((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') && String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance' ? false : true)}
value={String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance' ? Number(value.value).toFixed(1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance' ? fixNumber(Number(value.value), 1) : fixNumber(Number(handleValueFormula(value, tableMeta)), 1)) : (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance' ? Number(value.value) : Number(handleValueFormula(value, tableMeta)))}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
// // console.log(dataTable2) // // console.log(dataTable2)
...@@ -1132,7 +1183,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1132,7 +1183,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1148,7 +1199,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1148,7 +1199,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1166,7 +1217,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1166,7 +1217,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1184,7 +1235,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1184,7 +1235,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1198,7 +1249,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1198,7 +1249,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1239,7 +1290,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1239,7 +1290,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1255,7 +1306,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1255,7 +1306,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1273,7 +1324,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1273,7 +1324,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1291,7 +1342,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1291,7 +1342,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1305,7 +1356,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1305,7 +1356,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1346,7 +1397,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1346,7 +1397,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1362,7 +1413,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1362,7 +1413,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1380,7 +1431,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1380,7 +1431,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1398,7 +1449,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1398,7 +1449,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1412,7 +1463,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1412,7 +1463,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1453,7 +1504,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1453,7 +1504,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1469,7 +1520,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1469,7 +1520,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1487,7 +1538,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1487,7 +1538,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1505,7 +1556,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1505,7 +1556,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1519,7 +1570,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1519,7 +1570,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1560,7 +1611,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1560,7 +1611,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1576,7 +1627,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1576,7 +1627,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1594,7 +1645,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1594,7 +1645,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1612,7 +1663,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1612,7 +1663,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1626,7 +1677,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1626,7 +1677,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1667,7 +1718,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1667,7 +1718,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1683,7 +1734,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1683,7 +1734,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1701,7 +1752,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1701,7 +1752,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1719,7 +1770,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1719,7 +1770,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1733,7 +1784,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1733,7 +1784,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1774,7 +1825,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1774,7 +1825,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1790,7 +1841,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1790,7 +1841,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1808,7 +1859,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1808,7 +1859,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1826,7 +1877,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1826,7 +1877,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1840,7 +1891,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1840,7 +1891,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1881,7 +1932,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1881,7 +1932,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1897,7 +1948,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1897,7 +1948,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -1915,7 +1966,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1915,7 +1966,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -1933,7 +1984,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1933,7 +1984,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1947,7 +1998,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1947,7 +1998,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -1988,7 +2039,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -1988,7 +2039,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2004,7 +2055,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2004,7 +2055,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2022,7 +2073,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2022,7 +2073,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -2040,7 +2091,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2040,7 +2091,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -2054,7 +2105,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2054,7 +2105,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -2095,7 +2146,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2095,7 +2146,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2111,7 +2162,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2111,7 +2162,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2129,7 +2180,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2129,7 +2180,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -2147,7 +2198,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2147,7 +2198,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -2161,7 +2212,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2161,7 +2212,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -2202,7 +2253,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2202,7 +2253,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2218,7 +2269,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2218,7 +2269,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2236,7 +2287,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2236,7 +2287,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -2254,7 +2305,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2254,7 +2305,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -2268,7 +2319,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2268,7 +2319,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta)), 1) : Number(handleValueFormula(value, tableMeta)).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 1 ? tableMeta.rowData[0] === 1 ?
...@@ -2325,7 +2376,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2325,7 +2376,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2416,7 +2467,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2416,7 +2467,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2432,7 +2483,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2432,7 +2483,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2450,7 +2501,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2450,7 +2501,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
...@@ -2523,7 +2574,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2523,7 +2574,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2539,7 +2590,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2539,7 +2590,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
/> />
} }
/> />
...@@ -2557,7 +2608,7 @@ export default class FixedAssetsMovement extends Component { ...@@ -2557,7 +2608,7 @@ export default class FixedAssetsMovement extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : ((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') ? false : true)} disabled={this.props.isApprover ? true : ((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') ? false : true)}
value={Number(value).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 1) : Number(value)}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 52c536f2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/BudgetTahunan/TaxPlanning.js
View file @ 52c536f2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/MasterData/Parameter/CreateParameter.js
View file @ 52c536f2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 52c536f2
...@@ -12,6 +12,7 @@ import { ExcelRenderer } from 'react-excel-renderer'; ...@@ -12,6 +12,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
import * as R from 'ramda'; import * as R from 'ramda';
import { Alert } from '@material-ui/lab'; import { Alert } from '@material-ui/lab';
import { fixNumber, roundMath } from '../../library/Utils';
const LightTooltip = withStyles((theme) => ({ const LightTooltip = withStyles((theme) => ({
tooltip: { tooltip: {
...@@ -65,7 +66,7 @@ export default class BalanceSheetMR extends Component { ...@@ -65,7 +66,7 @@ export default class BalanceSheetMR extends Component {
componentDidMount() { componentDidMount() {
this.getSettingControl() this.getSettingControl()
this.getLatestUpdate() this.getLatestUpdate()
this.handleViewOnly() // this.handleViewOnly()
} }
handleViewOnly() { handleViewOnly() {
...@@ -193,7 +194,7 @@ export default class BalanceSheetMR extends Component { ...@@ -193,7 +194,7 @@ export default class BalanceSheetMR extends Component {
// if (item.balance_sheet.mtd_vs_previous_month == "" && Number(item.balance_sheet.percent_act_vs_previous_month) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_previous_month) > this.state.maxValue) { // if (item.balance_sheet.mtd_vs_previous_month == "" && Number(item.balance_sheet.percent_act_vs_previous_month) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_previous_month) > this.state.maxValue) {
// err = true // err = true
// } // }
if (item.balance_sheet.mtd_vs_mb == "" && Number(item.balance_sheet.percent_act_vs_mb).toFixed(1) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_mb).toFixed(1) > this.state.maxValue) { if (item.balance_sheet.mtd_vs_mb == "" && this.props.defaultCurrency.id == 1 ? fixNumber(Number(item.balance_sheet.percent_act_vs_mb), 1) : Number(item.balance_sheet.percent_act_vs_mb) < this.state.minValue || this.props.defaultCurrency.id == 1 ? fixNumber(Number(item.balance_sheet.percent_act_vs_mb), 1) : Number(item.balance_sheet.percent_act_vs_mb) > this.state.maxValue) {
err = true err = true
} }
// if (item.balance_sheet.mtd_vs_rb == "" && Number(item.balance_sheet.percent_act_vs_rb) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_rb) > this.state.maxValue) { // if (item.balance_sheet.mtd_vs_rb == "" && Number(item.balance_sheet.percent_act_vs_rb) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_rb) > this.state.maxValue) {
...@@ -236,12 +237,13 @@ export default class BalanceSheetMR extends Component { ...@@ -236,12 +237,13 @@ export default class BalanceSheetMR extends Component {
} }
} }
} }
console.log(res);
res.map((item, index) => { res.map((item, index) => {
if (item.type_report_id === 3) { if (item.type_report_id === 3) {
// if (item.balance_sheet.mtd_vs_previous_month == "" && Number(item.balance_sheet.percent_act_vs_previous_month) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_previous_month) > this.state.maxValue) { // if (item.balance_sheet.mtd_vs_previous_month == "" && Number(item.balance_sheet.percent_act_vs_previous_month) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_previous_month) > this.state.maxValue) {
// err = true // err = true
// } // }
if (item.balance_sheet.mtd_vs_mb == "" && Number(item.balance_sheet.percent_act_vs_mb).toFixed(1) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_mb).toFixed(1) > this.state.maxValue) { if (item.balance_sheet.mtd_vs_mb == "" && this.props.defaultCurrency.id == 1 ? fixNumber(Number(item.balance_sheet.percent_act_vs_mb), 1) : Number(item.balance_sheet.percent_act_vs_mb) < this.state.minValue || this.props.defaultCurrency.id == 1 ? fixNumber(Number(item.balance_sheet.percent_act_vs_mb), 1) : Number(item.balance_sheet.percent_act_vs_mb) > this.state.maxValue) {
err = true err = true
} }
// if (item.balance_sheet.mtd_vs_rb == "" && Number(item.balance_sheet.percent_act_vs_rb) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_rb) > this.state.maxValue) { // if (item.balance_sheet.mtd_vs_rb == "" && Number(item.balance_sheet.percent_act_vs_rb) < this.state.minValue || Number(item.balance_sheet.percent_act_vs_rb) > this.state.maxValue) {
...@@ -383,7 +385,7 @@ export default class BalanceSheetMR extends Component { ...@@ -383,7 +385,7 @@ export default class BalanceSheetMR extends Component {
let err = false let err = false
let dataTable = response.data.data.map((item, index) => { let dataTable = response.data.data.map((item, index) => {
if (item.type_report_id === 3) { if (item.type_report_id === 3) {
if (item.mtd_vs_mb == "" && Number(item.percent_act_vs_mb).toFixed(1) < this.state.minValue || Number(item.percent_act_vs_mb).toFixed(1) > this.state.maxValue) { if (item.mtd_vs_mb == "" && this.props.defaultCurrency.id == 1 ? fixNumber(Number(item.percent_act_vs_mb), 1) : Number(item.percent_act_vs_mb) < this.state.minValue || this.props.defaultCurrency.id == 1 ? fixNumber(Number(item.percent_act_vs_mb), 1) : Number(item.percent_act_vs_mb) > this.state.maxValue) {
err = true err = true
} }
} }
...@@ -448,26 +450,50 @@ export default class BalanceSheetMR extends Component { ...@@ -448,26 +450,50 @@ export default class BalanceSheetMR extends Component {
uploadBalanceSheet(type) { uploadBalanceSheet(type) {
let data = [] let data = []
this.setState({ loading: true }) this.setState({ loading: true })
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
item_report: String(i[5]), item_report: String(i[5]),
rolling_outlook: i[0] === 5 || i[0] === 6 ? String(Number(i[6]).toFixed(1)) : i[0] === 3 && i[6] === "" ? "0.0" : String(Number(i[6]).toFixed(1)), rolling_outlook: i[0] === 5 || i[0] === 6 ? String(Number(i[6])) : i[0] === 3 && i[6] === "" ? "0.0" : String(Number(i[6])),
master_budget: i[0] === 5 || i[0] === 6 ? String(Number(i[7]).toFixed(1)) : i[0] === 3 && i[7] === "" ? "0.0" : String(Number(i[7]).toFixed(1)), master_budget: i[0] === 5 || i[0] === 6 ? String(Number(i[7])) : i[0] === 3 && i[7] === "" ? "0.0" : String(Number(i[7])),
rolling_budget: i[0] === 5 || i[0] === 6 ? String(Number(i[8]).toFixed(1)) : i[0] === 3 && i[8] === "" ? "0.0" : String(Number(i[8]).toFixed(1)), rolling_budget: i[0] === 5 || i[0] === 6 ? String(Number(i[8])) : i[0] === 3 && i[8] === "" ? "0.0" : String(Number(i[8])),
actual: i[0] === 5 || i[0] === 6 ? String(Number(i[9]).toFixed(1)) : i[0] === 3 && i[9] === "" ? "0.0" : String(Number(i[9]).toFixed(1)), actual: i[0] === 5 || i[0] === 6 ? String(Number(i[9])) : i[0] === 3 && i[9] === "" ? "0.0" : String(Number(i[9])),
actual_previous_month: i[0] === 5 || i[0] === 6 ? String(Number(i[10]).toFixed(1)) : i[0] === 3 && i[10] === "" ? "0.0" : String(Number(i[10]).toFixed(1)), actual_previous_month: i[0] === 5 || i[0] === 6 ? String(Number(i[10])) : i[0] === 3 && i[10] === "" ? "0.0" : String(Number(i[10])),
amount_act_vs_previous_month: i[0] === 5 || i[0] === 6 ? String(Number(i[11]).toFixed(1)) : i[0] === 3 && i[11] === "" ? "0.0" : String(Number(i[11]).toFixed(1)), amount_act_vs_previous_month: i[0] === 5 || i[0] === 6 ? String(Number(i[11])) : i[0] === 3 && i[11] === "" ? "0.0" : String(Number(i[11])),
percent_act_vs_previous_month: i[0] === 5 || i[0] === 6 ? String(Number(i[12]).toFixed(1)) : i[0] === 3 && i[12] === "" ? "0.0" : String(Number(i[12]).toFixed(1)), percent_act_vs_previous_month: i[0] === 5 || i[0] === 6 ? String(Number(i[12])) : i[0] === 3 && i[12] === "" ? "0.0" : String(Number(i[12])),
amount_act_vs_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[13]).toFixed(1)) : i[0] === 3 && i[13] === "" ? "0.0" : String(Number(i[13]).toFixed(1)), amount_act_vs_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[13])) : i[0] === 3 && i[13] === "" ? "0.0" : String(Number(i[13])),
percent_act_vs_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[14]).toFixed(1)) : i[0] === 3 && i[14] === "" ? "0.0" : String(Number(i[14]).toFixed(1)), percent_act_vs_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[14])) : i[0] === 3 && i[14] === "" ? "0.0" : String(Number(i[14])),
amount_act_vs_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[15]).toFixed(1)) : i[0] === 3 && i[15] === "" ? "0.0" : String(Number(i[15]).toFixed(1)), amount_act_vs_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[15])) : i[0] === 3 && i[15] === "" ? "0.0" : String(Number(i[15])),
percent_act_vs_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[16]).toFixed(1)) : i[0] === 3 && i[16] === "" ? "0.0" : String(Number(i[16]).toFixed(1)), percent_act_vs_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[16])) : i[0] === 3 && i[16] === "" ? "0.0" : String(Number(i[16])),
mtd_vs_previous_month: String(i[17]), mtd_vs_previous_month: String(i[17]),
mtd_vs_mb: String(i[18]), mtd_vs_mb: String(i[18]),
mtd_vs_rb: String(i[19]) mtd_vs_rb: String(i[19])
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
item_report: String(i[5]),
rolling_outlook: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[6]), 1)) : i[0] === 3 && i[6] === "" ? "0.0" : String(fixNumber(Number(i[6]), 1)),
master_budget: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[7]), 1)) : i[0] === 3 && i[7] === "" ? "0.0" : String(fixNumber(Number(i[7]), 1)),
rolling_budget: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[8]), 1)) : i[0] === 3 && i[8] === "" ? "0.0" : String(fixNumber(Number(i[8]), 1)),
actual: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[9]), 1)) : i[0] === 3 && i[9] === "" ? "0.0" : String(fixNumber(Number(i[9]), 1)),
actual_previous_month: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[10]), 1)) : i[0] === 3 && i[10] === "" ? "0.0" : String(fixNumber(Number(i[10]), 1)),
amount_act_vs_previous_month: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[11]), 1)) : i[0] === 3 && i[11] === "" ? "0.0" : String(fixNumber(Number(i[11]), 1)),
percent_act_vs_previous_month: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[12]), 1)) : i[0] === 3 && i[12] === "" ? "0.0" : String(fixNumber(Number(i[12]), 1)),
amount_act_vs_mb: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[13]), 1)) : i[0] === 3 && i[13] === "" ? "0.0" : String(fixNumber(Number(i[13]), 1)),
percent_act_vs_mb: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[14]), 1)) : i[0] === 3 && i[14] === "" ? "0.0" : String(fixNumber(Number(i[14]), 1)),
amount_act_vs_rb: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[15]), 1)) : i[0] === 3 && i[15] === "" ? "0.0" : String(fixNumber(Number(i[15]), 1)),
percent_act_vs_rb: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[16]), 1)) : i[0] === 3 && i[16] === "" ? "0.0" : String(fixNumber(Number(i[16]), 1)),
mtd_vs_previous_month: String(i[17]),
mtd_vs_mb: String(i[18]),
mtd_vs_rb: String(i[19])
})
})
}
let body = { let body = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -523,25 +549,48 @@ export default class BalanceSheetMR extends Component { ...@@ -523,25 +549,48 @@ export default class BalanceSheetMR extends Component {
backToMonthlyReport(type) { backToMonthlyReport(type) {
this.setState({ loading: true }) this.setState({ loading: true })
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
"item_report_id": i[1], "item_report_id": i[1],
"rolling_outlook": String(Number(i[6]).toFixed(1)), "rolling_outlook": String(Number(i[6])),
"master_budget": String(Number(i[7]).toFixed(1)), "master_budget": String(Number(i[7])),
"rolling_budget": String(Number(i[8]).toFixed(1)), "rolling_budget": String(Number(i[8])),
"actual": String(Number(i[9]).toFixed(1)), "actual": String(Number(i[9])),
"actual_previous_month": String(Number(i[10]).toFixed(1)), "actual_previous_month": String(Number(i[10])),
"amount_act_vs_previous_month": String(Number(i[11]).toFixed(1)), "amount_act_vs_previous_month": String(Number(i[11])),
"percent_act_vs_previous_month": String(Number(i[12]).toFixed(1)), "percent_act_vs_previous_month": String(Number(i[12])),
"amount_act_vs_mb": String(Number(i[13]).toFixed(1)), "amount_act_vs_mb": String(Number(i[13])),
"percent_act_vs_mb": i[14], "percent_act_vs_mb": i[14],
"amount_act_vs_rb": String(Number(i[15]).toFixed(1)), "amount_act_vs_rb": String(Number(i[15])),
"percent_act_vs_rb": i[16], "percent_act_vs_rb": i[16],
"mtd_vs_previous_month": i[17], "mtd_vs_previous_month": i[17],
"mtd_vs_mb": i[18], "mtd_vs_mb": i[18],
"mtd_vs_rb": i[19] "mtd_vs_rb": i[19]
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
"item_report_id": i[1],
"rolling_outlook": String(fixNumber(Number(i[6]), 1)),
"master_budget": String(fixNumber(Number(i[7]), 1)),
"rolling_budget": String(fixNumber(Number(i[8]), 1)),
"actual": String(fixNumber(Number(i[9]), 1)),
"actual_previous_month": String(fixNumber(Number(i[10]), 1)),
"amount_act_vs_previous_month": String(fixNumber(Number(i[11]), 1)),
"percent_act_vs_previous_month": String(fixNumber(Number(i[12]), 1)),
"amount_act_vs_mb": String(fixNumber(Number(i[13]), 1)),
"percent_act_vs_mb": i[14],
"amount_act_vs_rb": String(fixNumber(Number(i[15]), 1)),
"percent_act_vs_rb": i[16],
"mtd_vs_previous_month": i[17],
"mtd_vs_mb": i[18],
"mtd_vs_rb": i[19]
})
})
}
let payload = { let payload = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -608,14 +657,14 @@ export default class BalanceSheetMR extends Component { ...@@ -608,14 +657,14 @@ export default class BalanceSheetMR extends Component {
// // console.log(i); // // console.log(i);
// err = true // err = true
// } else // } else
if (i[18] === "" && (Number(i[14]).toFixed(1) < this.state.minValue || Number(i[14]).toFixed(1) > this.state.maxValue)) { if (i[18] === "" && (this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[14]), 1) : Number(i[14]) < this.state.minValue || this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[14]), 1) : Number(i[14]) > this.state.maxValue)) {
console.log('msk 2'); console.log('msk 2');
err = true err = true
} }
} }
if (String(i[5]) == "Control (should be nil)") { if (String(i[5]) == "Control (should be nil)") {
if (Number(i[9]).toFixed(1) < this.state.minValue || Number(i[9]).toFixed(1) > this.state.maxValue) { if (this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[9]), 1) : Number(i[9]) < this.state.minValue || this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[9]), 1) : Number(i[9]) > this.state.maxValue) {
errorContrl = true errorContrl = true
editAble = true editAble = true
} }
...@@ -728,15 +777,15 @@ export default class BalanceSheetMR extends Component { ...@@ -728,15 +777,15 @@ export default class BalanceSheetMR extends Component {
const handleChange = (value, tableMeta, type) => { const handleChange = (value, tableMeta, type) => {
let val = String(value).split(",").join("") let val = String(value).split(",").join("")
if (type === "actual") { if (type === "actual") {
dataTable2[tableMeta.rowIndex][9] = Number(val).toFixed(1) dataTable2[tableMeta.rowIndex][9] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
console.log(dataTable2); console.log(dataTable2);
} else { } else {
let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2]) let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2])
if (indexParent > 0) { if (indexParent > 0) {
// console.log(indexParent) // console.log(indexParent)
dataTable2[tableMeta.rowIndex][9] = Number(val).toFixed(1) dataTable2[tableMeta.rowIndex][9] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
let jagain = Number(dataTable2[indexParent][9]).toFixed(1) let jagain = this.props.defaultCurrency.id == 1 ? fixNumber(Number(dataTable2[indexParent][9]), 1) : Number(dataTable2[indexParent][9])
dataTable2[indexParent][9] = jagain === undefined ? (0 + Number(val)).toFixed(1) : Number(Number(jagain) + Number(val)).toFixed(1) dataTable2[indexParent][9] = this.props.defaultCurrency.id == 1 ? (jagain === undefined ? (0 + fixNumber(Number(val)), 1) : fixNumber(Number(Number(jagain) + Number(val)))) : (jagain === undefined ? (0 + Number(val)) : Number(Number(jagain) + Number(val)))
// if (tableMeta.rowData[5] === 'Cash & Bank Balance') { // if (tableMeta.rowData[5] === 'Cash & Bank Balance') {
// console.log(value); // console.log(value);
// console.log(a); // console.log(a);
...@@ -744,7 +793,7 @@ export default class BalanceSheetMR extends Component { ...@@ -744,7 +793,7 @@ export default class BalanceSheetMR extends Component {
// console.log(dataTable2[indexParent]); // console.log(dataTable2[indexParent]);
// } // }
} else { } else {
dataTable2[tableMeta.rowIndex][9] = Number(val).toFixed(1) dataTable2[tableMeta.rowIndex][9] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
} }
} }
console.log(dataTable2); console.log(dataTable2);
...@@ -763,7 +812,7 @@ export default class BalanceSheetMR extends Component { ...@@ -763,7 +812,7 @@ export default class BalanceSheetMR extends Component {
}) })
let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[data.rowIndex][2]) let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[data.rowIndex][2])
dataTable2[data.rowIndex][data.columnIndex + type] = Number(total).toFixed(1) dataTable2[data.rowIndex][data.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// console.log(indexParent); // console.log(indexParent);
return total return total
} }
...@@ -772,13 +821,13 @@ export default class BalanceSheetMR extends Component { ...@@ -772,13 +821,13 @@ export default class BalanceSheetMR extends Component {
let total = 0 let total = 0
if (dex === 1) { if (dex === 1) {
total = Number(tableMeta.rowData[9]) - Number(tableMeta.rowData[10]) total = Number(tableMeta.rowData[9]) - Number(tableMeta.rowData[10])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else if (dex === 2) { } else if (dex === 2) {
total = Number(tableMeta.rowData[9]) - Number(tableMeta.rowData[7]) total = Number(tableMeta.rowData[9]) - Number(tableMeta.rowData[7])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else if (dex === 3) { } else if (dex === 3) {
total = Number(tableMeta.rowData[9]) - Number(tableMeta.rowData[8]) total = Number(tableMeta.rowData[9]) - Number(tableMeta.rowData[8])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} }
return total return total
} }
...@@ -797,13 +846,13 @@ export default class BalanceSheetMR extends Component { ...@@ -797,13 +846,13 @@ export default class BalanceSheetMR extends Component {
|| R.equals(selisih / prevMonth, Infinity) || R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100 || R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[10])? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[10])? Number(total * -1).toFixed(1) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100) // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// if (tableMeta.rowData[5] === "Cash and cash equivalent") { // if (tableMeta.rowData[5] === "Cash and cash equivalent") {
// console.log(total); // console.log(total);
// console.log(Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])); // console.log(Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10]));
...@@ -817,11 +866,11 @@ export default class BalanceSheetMR extends Component { ...@@ -817,11 +866,11 @@ export default class BalanceSheetMR extends Component {
|| R.equals(selisih / prevMonth, Infinity) || R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100 || R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[7]) ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[7]) ? Number(total * -1).toFixed(1) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100) // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else if (dex === 3) { } else if (dex === 3) {
let selisih = Number(dataTable2[tableMeta.rowIndex][15]) 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]) let prevMonth = Number(String(dataTable2[tableMeta.rowIndex][8]).includes('-') ? Number(dataTable2[tableMeta.rowIndex][8]) * -1 : dataTable2[tableMeta.rowIndex][8])
...@@ -830,12 +879,12 @@ export default class BalanceSheetMR extends Component { ...@@ -830,12 +879,12 @@ export default class BalanceSheetMR extends Component {
|| R.equals(selisih / prevMonth, Infinity) || R.equals(selisih / prevMonth, Infinity)
|| R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100 || R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[8])? Number(total * -1).toFixed(1) : Number(total).toFixed(1) // total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[8])? Number(total * -1).toFixed(1) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
// total = R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8]) // total = R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100) // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// console.log(total); // console.log(total);
} }
return total return total
...@@ -1188,7 +1237,7 @@ export default class BalanceSheetMR extends Component { ...@@ -1188,7 +1237,7 @@ export default class BalanceSheetMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(val).toFixed(1)} value={fixNumber(Number(val), 1)}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1202,7 +1251,7 @@ export default class BalanceSheetMR extends Component { ...@@ -1202,7 +1251,7 @@ export default class BalanceSheetMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(val).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)}
/> />
} }
/> />
...@@ -1257,7 +1306,7 @@ export default class BalanceSheetMR extends Component { ...@@ -1257,7 +1306,7 @@ export default class BalanceSheetMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[7]), 1) : Number(tableMeta.rowData[7])}
/> />
// : // :
// tableMeta.rowData[0] === 2 ? // tableMeta.rowData[0] === 2 ?
...@@ -2711,6 +2760,7 @@ export default class BalanceSheetMR extends Component { ...@@ -2711,6 +2760,7 @@ export default class BalanceSheetMR extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
)} )}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
......
src/container/MonthlyReport/CashFlowMR.js
View file @ 52c536f2
...@@ -10,6 +10,7 @@ import { PropagateLoader } from 'react-spinners'; ...@@ -10,6 +10,7 @@ import { PropagateLoader } from 'react-spinners';
import { ExcelRenderer } from 'react-excel-renderer'; import { ExcelRenderer } from 'react-excel-renderer';
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
import UploadFile from "../../library/Upload"; import UploadFile from "../../library/Upload";
import { fixNumber } from '../../library/Utils';
const LightTooltip = withStyles((theme) => ({ const LightTooltip = withStyles((theme) => ({
tooltip: { tooltip: {
...@@ -222,7 +223,7 @@ export default class CashFlowMR extends Component { ...@@ -222,7 +223,7 @@ export default class CashFlowMR extends Component {
// item[6].value = this.handleValueFormula(item, index) // item[6].value = this.handleValueFormula(item, index)
listCF.push({ listCF.push({
"item_report_id": item[1], "item_report_id": item[1],
"actual": item[0] == 1 ? "" : Number(item[6].value).toFixed(1) "actual": item[0] == 1 ? "" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(item[6].value), 1) : Number(item[6].value)
}) })
// } else { // } else {
// listCF.push({ // listCF.push({
...@@ -609,7 +610,7 @@ export default class CashFlowMR extends Component { ...@@ -609,7 +610,7 @@ export default class CashFlowMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)) : this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6))}
/> />
</span> </span>
: :
...@@ -624,7 +625,8 @@ export default class CashFlowMR extends Component { ...@@ -624,7 +625,8 @@ export default class CashFlowMR extends Component {
// value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)} // value={Number(handleValueFormula(tableMeta, 6)).toFixed(1)}
// /> // />
// </span> // </span>
(Number(handleValueFormula(tableMeta, 6)).toFixed(1) > Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 6)).toFixed(1) < Number(this.state.maxValue)) ? this.props.defaultCurrency.id == 1 ?
(fixNumber(Number(handleValueFormula(tableMeta, 6)), 1) > Number(this.state.minValue) && fixNumber(Number(handleValueFormula(tableMeta, 6)), 1) < Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -639,7 +641,7 @@ export default class CashFlowMR extends Component { ...@@ -639,7 +641,7 @@ export default class CashFlowMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)} value={this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)}
/> : /> :
<LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -656,7 +658,43 @@ export default class CashFlowMR extends Component { ...@@ -656,7 +658,43 @@ export default class CashFlowMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value).toFixed(1) : Number(handleValueFormula(tableMeta, 6)).toFixed(1)} value={this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta, 6)), 1)}
/>
</LightTooltip>
:
(Number(handleValueFormula(tableMeta, 6)) > Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 6)) < Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6))}
/> :
<LightTooltip title={this.state.minValue === null ? null : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'red'
}}
type="text"
placeholder=""
disabled={true}
value={this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta, 6))}
/> />
</LightTooltip> </LightTooltip>
: null} : null}
......
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ 52c536f2
...@@ -2051,6 +2051,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -2051,6 +2051,7 @@ export default class CorporateAnnualTargetMR extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
)} )}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div> </div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15, marginTop: 5 }}> <div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 15, paddingRight: 15, marginTop: 5 }}>
<div> <div>
......
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 52c536f2
...@@ -11,6 +11,7 @@ import { ExcelRenderer } from 'react-excel-renderer'; ...@@ -11,6 +11,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
import * as R from 'ramda' import * as R from 'ramda'
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
import { Alert } from '@material-ui/lab'; import { Alert } from '@material-ui/lab';
import { fixNumber, roundMath } from '../../library/Utils';
const LightTooltip = withStyles((theme) => ({ const LightTooltip = withStyles((theme) => ({
tooltip: { tooltip: {
...@@ -360,19 +361,36 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -360,19 +361,36 @@ export default class FixedAssetsMovementMR extends Component {
uploadFAMMR(type) { uploadFAMMR(type) {
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
item_report: String(i[5]), item_report: String(i[5]),
mtd_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[6]).toFixed(1)) : i[0] === 3 && i[6] === "" ? "0.0" : String(Number(i[6]).toFixed(1)), mtd_mb: i[0] === 5 || i[0] === 6 ? String(Number(i[6])) : i[0] === 3 && i[6] === "" ? "0.0" : String(Number(i[6])),
mtd_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[7]).toFixed(1)) : i[0] === 3 && i[7] === "" ? "0.0" : String(Number(i[7]).toFixed(1)), mtd_rb: i[0] === 5 || i[0] === 6 ? String(Number(i[7])) : i[0] === 3 && i[7] === "" ? "0.0" : String(Number(i[7])),
mtd_actual: i[0] === 5 || i[0] === 6 ? String(Number(i[8]).toFixed(1)) : i[0] === 3 && i[8] === "" ? "0.0" : String(Number(i[8]).toFixed(1)), mtd_actual: i[0] === 5 || i[0] === 6 ? String(Number(i[8])) : i[0] === 3 && i[8] === "" ? "0.0" : String(Number(i[8])),
act_vs_mb_amount: i[0] === 5 || i[0] === 6 ? String(Number(i[9]).toFixed(1)) : i[0] === 3 && i[9] === "" ? "0.0" : String(Number(i[9]).toFixed(1)), act_vs_mb_amount: i[0] === 5 || i[0] === 6 ? String(Number(i[9])) : i[0] === 3 && i[9] === "" ? "0.0" : String(Number(i[9])),
act_vs_mb_percent: i[0] === 5 || i[0] === 6 ? String(Number(i[10]).toFixed(1)) : i[0] === 3 && i[10] === "" ? "0.0" : String(Number(i[10]).toFixed(1)), act_vs_mb_percent: i[0] === 5 || i[0] === 6 ? String(Number(i[10])) : i[0] === 3 && i[10] === "" ? "0.0" : String(Number(i[10])),
act_vs_rb_amount: i[0] === 5 || i[0] === 6 ? String(Number(i[11]).toFixed(1)) : i[0] === 3 && i[11] === "" ? "0.0" : String(Number(i[11]).toFixed(1)), act_vs_rb_amount: i[0] === 5 || i[0] === 6 ? String(Number(i[11])) : i[0] === 3 && i[11] === "" ? "0.0" : String(Number(i[11])),
act_vs_rb_percent: i[0] === 5 || i[0] === 6 ? String(Number(i[12]).toFixed(1)) : i[0] === 3 && i[12] === "" ? "0.0" : String(Number(i[12]).toFixed(1)), act_vs_rb_percent: i[0] === 5 || i[0] === 6 ? String(Number(i[12])) : i[0] === 3 && i[12] === "" ? "0.0" : String(Number(i[12])),
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
item_report: String(i[5]),
mtd_mb: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[6]), 1)) : i[0] === 3 && i[6] === "" ? "0.0" : String(fixNumber(Number(i[6]), 1)),
mtd_rb: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[7]), 1)) : i[0] === 3 && i[7] === "" ? "0.0" : String(fixNumber(Number(i[7]), 1)),
mtd_actual: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[8]), 1)) : i[0] === 3 && i[8] === "" ? "0.0" : String(fixNumber(Number(i[8]), 1)),
act_vs_mb_amount: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[9]), 1)) : i[0] === 3 && i[9] === "" ? "0.0" : String(fixNumber(Number(i[9]), 1)),
act_vs_mb_percent: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[10]), 1)) : i[0] === 3 && i[10] === "" ? "0.0" : String(fixNumber(Number(i[10]), 1)),
act_vs_rb_amount: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[11]), 1)) : i[0] === 3 && i[11] === "" ? "0.0" : String(fixNumber(Number(i[11]), 1)),
act_vs_rb_percent: i[0] === 5 || i[0] === 6 ? String(fixNumber(Number(i[12]), 1)) : i[0] === 3 && i[12] === "" ? "0.0" : String(fixNumber(Number(i[12]), 1)),
})
})
}
let body = { let body = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -415,18 +433,34 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -415,18 +433,34 @@ export default class FixedAssetsMovementMR extends Component {
this.setState({ loading: true }) this.setState({ loading: true })
// console.log(this.state.dataTable); // console.log(this.state.dataTable);
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
"item_report_id": i[1], "item_report_id": i[1],
"mtd_mb": String(Number(i[6]).toFixed(1)), "mtd_mb": String(Number(i[6])),
"mtd_rb": String(Number(i[7]).toFixed(1)), "mtd_rb": String(Number(i[7])),
"mtd_actual": String(Number(i[8]).toFixed(1)), "mtd_actual": String(Number(i[8])),
"act_vs_mb_amount": String(i[9]) === 'NaN' || String(i[9]) === 'Infinity' || String(i[9]) === '-Infinity' ? '0.0' : String(Number(i[9]).toFixed(1)), "act_vs_mb_amount": String(i[9]) === 'NaN' || String(i[9]) === 'Infinity' || String(i[9]) === '-Infinity' ? '0.0' : String(Number(i[9])),
"act_vs_mb_percent": String(i[10]) === 'NaN' || String(i[10]) === 'Infinity' || String(i[10]) === '-Infinity' ? '0.0' : String(Number(i[10]).toFixed(1)), "act_vs_mb_percent": String(i[10]) === 'NaN' || String(i[10]) === 'Infinity' || String(i[10]) === '-Infinity' ? '0.0' : String(Number(i[10])),
"act_vs_rb_amount": String(i[11]) === 'NaN' || String(i[11]) === 'Infinity' || String(i[11]) === '-Infinity' ? '0.0' : String(Number(i[11]).toFixed(1)), "act_vs_rb_amount": String(i[11]) === 'NaN' || String(i[11]) === 'Infinity' || String(i[11]) === '-Infinity' ? '0.0' : String(Number(i[11])),
"act_vs_rb_percent": String(i[12]) === 'NaN' || String(i[12]) === 'Infinity' || String(i[12]) === '-Infinity' ? '0.0' : String(Number(i[12]).toFixed(1)) "act_vs_rb_percent": String(i[12]) === 'NaN' || String(i[12]) === 'Infinity' || String(i[12]) === '-Infinity' ? '0.0' : String(Number(i[12]))
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
"item_report_id": i[1],
"mtd_mb": String(fixNumber(Number(i[6]), 1)),
"mtd_rb": String(fixNumber(Number(i[7]), 1)),
"mtd_actual": String(fixNumber(Number(i[8]), 1)),
"act_vs_mb_amount": String(i[9]) === 'NaN' || String(i[9]) === 'Infinity' || String(i[9]) === '-Infinity' ? '0.0' : String(fixNumber(Number(i[9]), 1)),
"act_vs_mb_percent": String(i[10]) === 'NaN' || String(i[10]) === 'Infinity' || String(i[10]) === '-Infinity' ? '0.0' : String(fixNumber(Number(i[10]), 1)),
"act_vs_rb_amount": String(i[11]) === 'NaN' || String(i[11]) === 'Infinity' || String(i[11]) === '-Infinity' ? '0.0' : String(fixNumber(Number(i[11]), 1)),
"act_vs_rb_percent": String(i[12]) === 'NaN' || String(i[12]) === 'Infinity' || String(i[12]) === '-Infinity' ? '0.0' : String(fixNumber(Number(i[12]), 1))
})
})
}
let payload = { let payload = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -771,7 +805,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -771,7 +805,7 @@ export default class FixedAssetsMovementMR extends Component {
} }
}) })
let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[data.rowIndex][2]) let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[data.rowIndex][2])
let a = dataTable2[data.rowIndex][data.columnIndex + type] = Number(total).toFixed(1) let a = dataTable2[data.rowIndex][data.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// console.log(indexParent); // console.log(indexParent);
return a return a
} }
...@@ -781,19 +815,19 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -781,19 +815,19 @@ export default class FixedAssetsMovementMR extends Component {
let total = 0 let total = 0
// if (dex === 1) { // if (dex === 1) {
// total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9]) == NaN? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9]) // total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9]) == NaN? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[9])
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[9]); // console.log(tableMeta.rowData[9]);
// console.log(total) // console.log(total)
if (dex === 2) { if (dex === 2) {
total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6]) == NaN ? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6]) total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6]) == NaN ? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[6])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[6]); // console.log(tableMeta.rowData[6]);
// console.log(total) // console.log(total)
} else if (dex === 3) { } else if (dex === 3) {
total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) == NaN ? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) total = Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7]) == NaN ? "0.0" : Number(tableMeta.rowData[8]) - Number(tableMeta.rowData[7])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// console.log(tableMeta.rowData[8]); // console.log(tableMeta.rowData[8]);
// console.log(tableMeta.rowData[7]); // console.log(tableMeta.rowData[7]);
// console.log(total) // console.log(total)
...@@ -815,7 +849,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -815,7 +849,7 @@ export default class FixedAssetsMovementMR extends Component {
// dataTable2[5][11] // dataTable2[5][11]
// if (dex === 1) { // if (dex === 1) {
// total = R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9]) // total = R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][10]) / Number(dataTable2[tableMeta.rowIndex][9])
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// if (tableMeta.rowData[5] === "Cash and cash equivalent") { // if (tableMeta.rowData[5] === "Cash and cash equivalent") {
// console.log(total); // console.log(total);
// console.log(Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])); // console.log(Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10]));
...@@ -823,10 +857,10 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -823,10 +857,10 @@ export default class FixedAssetsMovementMR extends Component {
// } // }
if (dex === 2) { if (dex === 2) {
total = R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6]) total = R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][9]) / Number(dataTable2[tableMeta.rowIndex][6])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else if (dex === 3) { } else if (dex === 3) {
total = R.equals((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7]) total = R.equals((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7])), Infinity) ? "0" : R.equals((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7])), -Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][7])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
// console.log(total); // console.log(total);
} }
// console.log(dex) // console.log(dex)
...@@ -946,7 +980,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -946,7 +980,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[6]).toFixed(1)} value={Number(tableMeta.rowData[6]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[6]), 1) : Number(tableMeta.rowData[6])}
/> />
} }
/> />
...@@ -970,7 +1004,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -970,7 +1004,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)} value={Number(tableMeta.rowData[7]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[7]), 1) : Number(tableMeta.rowData[7])}
/> />
} }
/> />
...@@ -994,7 +1028,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -994,7 +1028,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[8]), 1)}
/> />
} }
/> />
...@@ -1012,12 +1046,11 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1012,12 +1046,11 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[8]), 1) : Number(tableMeta.rowData[8])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 8) handleChange(event.target.value, tableMeta, 8)
}} }}
fixedDecimalScale={1} // decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
decimalScale={1}
/> />
} }
/> />
...@@ -1030,12 +1063,11 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1030,12 +1063,11 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={String(tableMeta.rowData[5]).toLocaleLowerCase() == "beginning balance" && this.props.periode == 2021 && this.props.month.month_id == 1 ? false : true} disabled={String(tableMeta.rowData[5]).toLocaleLowerCase() == "beginning balance" && this.props.periode == 2021 && this.props.month.month_id == 1 ? false : true}
value={String(tableMeta.rowData[5]).toLocaleLowerCase() == "beginning balance" && this.props.periode == 2021 && this.props.month.month_id == 1 ? Number(tableMeta.rowData[8]).toFixed(1) : Number(handleValueFormula(tableMeta, 8)).toFixed(1)} value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[5]).toLocaleLowerCase() == "beginning balance" && this.props.periode == 2021 && this.props.month.month_id == 1 ? fixNumber(Number(tableMeta.rowData[8]), 1) : fixNumber(Number(handleValueFormula(tableMeta, 8)), 1)) : (String(tableMeta.rowData[5]).toLocaleLowerCase() == "beginning balance" && this.props.periode == 2021 && this.props.month.month_id == 1 ? Number(tableMeta.rowData[8]) : Number(handleValueFormula(tableMeta, 8)))}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 8) handleChange(event.target.value, tableMeta, 8)
}} }}
fixedDecimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
decimalScale={1}
/> />
</span> : </span> :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1049,7 +1081,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1049,7 +1081,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[8]), 1) : Number(tableMeta.rowData[8])}
/> />
} }
/> />
...@@ -1126,7 +1158,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1126,7 +1158,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(1)} value={Number(tableMeta.rowData[9]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[9]), 1) : Number(tableMeta.rowData[9])}
/> />
} }
/> />
...@@ -1142,7 +1174,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1142,7 +1174,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleVariance(tableMeta, 2, 2)).toFixed(1)} value={Number(tableMeta.rowData[9]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 2, 2)), 1) : Number(handleVariance(tableMeta, 2, 2))}
/> />
} }
/> />
...@@ -1166,7 +1198,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1166,7 +1198,7 @@ export default class FixedAssetsMovementMR extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
value={Number(Number(tableMeta.rowData[10]) * 100).toFixed(1)} value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : fixNumber(Number(Number(tableMeta.rowData[10]) * 100), 1)}
/> />
} }
/> />
...@@ -1184,7 +1216,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1184,7 +1216,7 @@ export default class FixedAssetsMovementMR extends Component {
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
// value={0} // value={0}
value={Number(handleVariancePercent(tableMeta, 2, 3)).toFixed(1)} value={fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1)}
/> />
} }
/> />
...@@ -1211,7 +1243,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1211,7 +1243,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[11]).toFixed(1)} value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[11]), 1) : Number(tableMeta.rowData[11])}
/> />
} }
/> />
...@@ -1227,7 +1259,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1227,7 +1259,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleVariance(tableMeta, 3, 4)).toFixed(1)} value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 3, 4)), 1) : Number(handleVariance(tableMeta, 3, 4))}
/> />
} }
/> />
...@@ -1251,7 +1283,8 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1251,7 +1283,8 @@ export default class FixedAssetsMovementMR extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
value={Number(Number(tableMeta.rowData[10]) * 100).toFixed(1)} value={Number(tableMeta.rowData[12]) == 0 ? "0.0" : fixNumber(Number(Number(tableMeta.rowData[12]) * 100), 1)}
// value={Number(Number(tableMeta.rowData[10]) * 100).toFixed(1)}
/> />
} }
/> />
...@@ -1269,7 +1302,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1269,7 +1302,7 @@ export default class FixedAssetsMovementMR extends Component {
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
// value={0} // value={0}
value={Number(handleVariancePercent(tableMeta, 3, 5)).toFixed(1)} value={fixNumber(Number(handleVariancePercent(tableMeta, 3, 5)), 1)}
/> />
} }
/> />
...@@ -1448,6 +1481,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1448,6 +1481,7 @@ export default class FixedAssetsMovementMR extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
)} )}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
......
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ 52c536f2
...@@ -458,15 +458,15 @@ export default class ListOfCreditFacilities extends Component { ...@@ -458,15 +458,15 @@ export default class ListOfCreditFacilities extends Component {
"loan_maturity_date": i[5] !== undefined ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : null, "loan_maturity_date": i[5] !== undefined ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : null,
"interest": i[6], "interest": i[6],
"currency": i[7], "currency": i[7],
"loan_plafond_amount_ori": i[8] !== undefined ? Number(i[8]).toFixed(1) : i[8], "loan_plafond_amount_ori": i[8] !== undefined ? Number(i[8]) : i[8],
"loan_plafond_amount_idr": i[9] !== undefined ? Number(i[9]).toFixed(1) : i[9], "loan_plafond_amount_idr": i[9] !== undefined ? Number(i[9]) : i[9],
"out_loan_ki_amount_ori": i[10] !== undefined ? Number(i[10]).toFixed(1) : i[10], "out_loan_ki_amount_ori": i[10] !== undefined ? Number(i[10]) : i[10],
"out_loan_ki_amount_idr": i[11] !== undefined ? Number(i[11]).toFixed(1) : i[11], "out_loan_ki_amount_idr": i[11] !== undefined ? Number(i[11]) : i[11],
"out_loan_kmk_amount_ori": i[12] !== undefined ? Number(i[12]).toFixed(1) : i[12], "out_loan_kmk_amount_ori": i[12] !== undefined ? Number(i[12]) : i[12],
"out_loan_kmk_amount_idr": i[13] !== undefined ? Number(i[13]).toFixed(1) : i[13], "out_loan_kmk_amount_idr": i[13] !== undefined ? Number(i[13]) : i[13],
"out_loan_other_type": i[14], "out_loan_other_type": i[14],
"out_loan_other_amount_ori": i[15] !== undefined ? Number(i[15]).toFixed(1) : i[15], "out_loan_other_amount_ori": i[15] !== undefined ? Number(i[15]) : i[15],
"out_loan_other_amount_idr": i[16] !== undefined ? Number(i[16]).toFixed(1) : i[16], "out_loan_other_amount_idr": i[16] !== undefined ? Number(i[16]) : i[16],
// "total_out_loan_ori": i[18], // "total_out_loan_ori": i[18],
// "total_out_loan_idr": i[19], // "total_out_loan_idr": i[19],
// "remaining_plafond_ori": i[20], // "remaining_plafond_ori": i[20],
...@@ -697,6 +697,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -697,6 +697,7 @@ export default class ListOfCreditFacilities extends Component {
} }
let tgl = String(i[9]).split('-') let tgl = String(i[9]).split('-')
let checkUndifined = tgl.findIndex((val) => val == undefined) let checkUndifined = tgl.findIndex((val) => val == undefined)
if (this.props.defaultCurrency.id == 2) {
data.push({ data.push({
"item_report_id": i[1], "item_report_id": i[1],
"borrower_comp_name": i[5], "borrower_comp_name": i[5],
...@@ -708,42 +709,92 @@ export default class ListOfCreditFacilities extends Component { ...@@ -708,42 +709,92 @@ export default class ListOfCreditFacilities extends Component {
// "loan_maturity_date": i[9] !== undefined || i[9] !== "null" || i[9] !== null? (String(tgl[2]).length <= 2? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])) : "", // "loan_maturity_date": i[9] !== undefined || i[9] !== "null" || i[9] !== null? (String(tgl[2]).length <= 2? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])) : "",
"interest": i[10] == "" ? "0.00" : i[10], "interest": i[10] == "" ? "0.00" : i[10],
"currency": i[11], "currency": i[11],
"loan_plafond_amount_ori": Number(i[12]).toFixed(1) == "" ? "0.0" : Number(i[12]).toFixed(1), "loan_plafond_amount_ori": Number(i[12]) == "" ? "0.0" : Number(i[12]),
"loan_plafond_amount_idr": Number(i[13]).toFixed(1) == "" ? "0.0" : Number(i[13]).toFixed(1), "loan_plafond_amount_idr": Number(i[13]) == "" ? "0.0" : Number(i[13]),
"out_loan_ki_amount_ori": Number(i[14]).toFixed(1) == "" ? "0.0" : Number(i[14]).toFixed(1), "out_loan_ki_amount_ori": Number(i[14]) == "" ? "0.0" : Number(i[14]),
"out_loan_ki_amount_idr": Number(i[15]).toFixed(1) == "" ? "0.0" : Number(i[15]).toFixed(1), "out_loan_ki_amount_idr": Number(i[15]) == "" ? "0.0" : Number(i[15]),
"out_loan_kmk_amount_ori": Number(i[16]).toFixed(1) == "" ? "0.0" : Number(i[16]).toFixed(1), "out_loan_kmk_amount_ori": Number(i[16]) == "" ? "0.0" : Number(i[16]),
"out_loan_kmk_amount_idr": Number(i[17]).toFixed(1) == "" ? "0.0" : Number(i[17]).toFixed(1), "out_loan_kmk_amount_idr": Number(i[17]) == "" ? "0.0" : Number(i[17]),
// "mtd_vs_previous_month": i[18], // "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18], "out_loan_other_type": i[18],
"out_loan_other_amount_ori": Number(i[19]).toFixed(1) == "" ? "0.0" : Number(i[19]).toFixed(1), "out_loan_other_amount_ori": Number(i[19]) == "" ? "0.0" : Number(i[19]),
"out_loan_other_amount_idr": Number(i[20]).toFixed(1) == "" ? "0.0" : Number(i[20]).toFixed(1), "out_loan_other_amount_idr": Number(i[20]) == "" ? "0.0" : Number(i[20]),
"total_out_loan_ori": Number(i[21]).toFixed(1) == "" ? "0.0" : Number(i[21]).toFixed(1), "total_out_loan_ori": Number(i[21]) == "" ? "0.0" : Number(i[21]),
"total_out_loan_idr": Number(i[22]).toFixed(1) == "" ? "0.0" : Number(i[22]).toFixed(1), "total_out_loan_idr": Number(i[22]) == "" ? "0.0" : Number(i[22]),
"remaining_plafond_ori": Number(i[23]).toFixed(1) == "" ? "0.0" : Number(i[23]).toFixed(1), "remaining_plafond_ori": Number(i[23]) == "" ? "0.0" : Number(i[23]),
"remaining_plafond_idr": Number(i[24]).toFixed(1) == "" ? "0.0" : Number(i[24]).toFixed(1), "remaining_plafond_idr": Number(i[24]) == "" ? "0.0" : Number(i[24]),
"current_ratio_financial": Number(i[25]).toFixed(2) == "" ? "0.00" : Number(i[25]).toFixed(2), "current_ratio_financial": Number(i[25]) == "" ? "0.00" : Number(i[25]),
"current_ratio_current": Number(i[26]).toFixed(2) == "" ? "0.00" : Number(i[26]).toFixed(2), "current_ratio_current": Number(i[26]) == "" ? "0.00" : Number(i[26]),
"der_financial": Number(i[27]).toFixed(2) == "" ? "0.00" : Number(i[27]).toFixed(2), "der_financial": Number(i[27]) == "" ? "0.00" : Number(i[27]),
"der_current": Number(i[28]).toFixed(2) == "" ? "0.00" : Number(i[28]).toFixed(2), "der_current": Number(i[28]) == "" ? "0.00" : Number(i[28]),
"debt_to_ebitda_financial": Number(i[29]).toFixed(2) == "" ? "0.00" : Number(i[29]).toFixed(2), "debt_to_ebitda_financial": Number(i[29]) == "" ? "0.00" : Number(i[29]),
"debt_to_ebitda_current": Number(i[30]).toFixed(2) == "" ? "0.00" : Number(i[30]).toFixed(2), "debt_to_ebitda_current": Number(i[30]) == "" ? "0.00" : Number(i[30]),
"ebitda_to_interest_financial": Number(i[31]).toFixed(2) == "" ? "0.00" : Number(i[31]).toFixed(2), "ebitda_to_interest_financial": Number(i[31]) == "" ? "0.00" : Number(i[31]),
"ebitda_to_interest_current": Number(i[32]).toFixed(2) == "" ? "0.00" : Number(i[32]).toFixed(2), "ebitda_to_interest_current": Number(i[32]) == "" ? "0.00" : Number(i[32]),
"other_ratio1_ratio_name": i[33], "other_ratio1_ratio_name": i[33],
"other_ratio1_financial": Number(i[34]).toFixed(2) == "" ? "0.00" : Number(i[34]).toFixed(2), "other_ratio1_financial": Number(i[34]) == "" ? "0.00" : Number(i[34]),
"other_ratio1_current": Number(i[35]).toFixed(2) == "" ? "0.00" : Number(i[35]).toFixed(2), "other_ratio1_current": Number(i[35]) == "" ? "0.00" : Number(i[35]),
"other_ratio2_ratio_name": i[36], "other_ratio2_ratio_name": i[36],
"other_ratio2_financial": Number(i[37]).toFixed(2) == "" ? "0.00" : Number(i[37]).toFixed(2), "other_ratio2_financial": Number(i[37]) == "" ? "0.00" : Number(i[37]),
"other_ratio2_current": Number(i[38]).toFixed(2) == "" ? "0.00" : Number(i[38]).toFixed(2), "other_ratio2_current": Number(i[38]) == "" ? "0.00" : Number(i[38]),
"other_ratio3_ratio_name": i[39], "other_ratio3_ratio_name": i[39],
"other_ratio3_financial": Number(i[40]).toFixed(2) == "" ? "0.00" : Number(i[40]).toFixed(2), "other_ratio3_financial": Number(i[40]) == "" ? "0.00" : Number(i[40]),
"other_ratio3_current": Number(i[41]).toFixed(2) == "" ? "0.00" : Number(i[41]).toFixed(2), "other_ratio3_current": Number(i[41]) == "" ? "0.00" : Number(i[41]),
"other_ratio4_ratio_name": i[42], "other_ratio4_ratio_name": i[42],
"other_ratio4_financial": Number(i[43]).toFixed(2) == "" ? "0.00" : Number(i[43]).toFixed(2), "other_ratio4_financial": Number(i[43]) == "" ? "0.00" : Number(i[43]),
"other_ratio4_current": Number(i[44]).toFixed(2) == "" ? "0.00" : Number(i[44]).toFixed(2), "other_ratio4_current": Number(i[44]) == "" ? "0.00" : Number(i[44]),
"notes": i[45], "notes": i[45],
}) })
} else {
data.push({
"item_report_id": i[1],
"borrower_comp_name": i[5],
"bank_name": i[6] == null ? [6] : i[6].value,
"type_of_credit": i[7] == null ? i[7] : i[7].value,
"remarks": i[8],
// "loan_maturity_date": i[9],
"loan_maturity_date": i[9] == undefined || i[9] == "null" || i[9] == null ? "" : (String(tgl[2]).length <= 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])),
// "loan_maturity_date": i[9] !== undefined || i[9] !== "null" || i[9] !== null? (String(tgl[2]).length <= 2? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])) : "",
"interest": i[10] == "" ? "0.00" : i[10],
"currency": i[11],
"loan_plafond_amount_ori": fixNumber(Number(i[12]), 1) == "" ? "0.0" : fixNumber(Number(i[12]), 1),
"loan_plafond_amount_idr": fixNumber(Number(i[13]), 1) == "" ? "0.0" : fixNumber(Number(i[13]), 1),
"out_loan_ki_amount_ori": fixNumber(Number(i[14]), 1) == "" ? "0.0" : fixNumber(Number(i[14]), 1),
"out_loan_ki_amount_idr": fixNumber(Number(i[15]), 1) == "" ? "0.0" : fixNumber(Number(i[15]), 1),
"out_loan_kmk_amount_ori": fixNumber(Number(i[16]), 1) == "" ? "0.0" : fixNumber(Number(i[16]), 1),
"out_loan_kmk_amount_idr": fixNumber(Number(i[17]), 1) == "" ? "0.0" : fixNumber(Number(i[17]), 1),
// "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18],
"out_loan_other_amount_ori": fixNumber(Number(i[19]), 1) == "" ? "0.0" : fixNumber(Number(i[19]), 1),
"out_loan_other_amount_idr": fixNumber(Number(i[20]), 1) == "" ? "0.0" : fixNumber(Number(i[20]), 1),
"total_out_loan_ori": fixNumber(Number(i[21]), 1) == "" ? "0.0" : fixNumber(Number(i[21]), 1),
"total_out_loan_idr": fixNumber(Number(i[22]), 1) == "" ? "0.0" : fixNumber(Number(i[22]), 1),
"remaining_plafond_ori": fixNumber(Number(i[23]), 1) == "" ? "0.0" : fixNumber(Number(i[23]), 1),
"remaining_plafond_idr": fixNumber(Number(i[24]), 1) == "" ? "0.0" : fixNumber(Number(i[24]), 1),
"current_ratio_financial": fixNumber(Number(i[25]), 2) == "" ? "0.00" : fixNumber(Number(i[25]), 2),
"current_ratio_current": fixNumber(Number(i[26]), 2) == "" ? "0.00" : fixNumber(Number(i[26]), 2),
"der_financial": fixNumber(Number(i[27]), 2) == "" ? "0.00" : fixNumber(Number(i[27]), 2),
"der_current": fixNumber(Number(i[28]), 2) == "" ? "0.00" : fixNumber(Number(i[28]), 2),
"debt_to_ebitda_financial": fixNumber(Number(i[29]), 2) == "" ? "0.00" : fixNumber(Number(i[29]), 2),
"debt_to_ebitda_current": fixNumber(Number(i[30]), 2) == "" ? "0.00" : fixNumber(Number(i[30]), 2),
"ebitda_to_interest_financial": fixNumber(Number(i[31]), 2) == "" ? "0.00" : fixNumber(Number(i[31]), 2),
"ebitda_to_interest_current": fixNumber(Number(i[32]), 2) == "" ? "0.00" : fixNumber(Number(i[32]), 2),
"other_ratio1_ratio_name": i[33],
"other_ratio1_financial": fixNumber(Number(i[34]), 2) == "" ? "0.00" : fixNumber(Number(i[34]), 2),
"other_ratio1_current": fixNumber(Number(i[35]), 2) == "" ? "0.00" : fixNumber(Number(i[35]), 2),
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": fixNumber(Number(i[37]), 2) == "" ? "0.00" : fixNumber(Number(i[37]), 2),
"other_ratio2_current": fixNumber(Number(i[38]), 2) == "" ? "0.00" : fixNumber(Number(i[38]), 2),
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": fixNumber(Number(i[40]), 2) == "" ? "0.00" : fixNumber(Number(i[40]), 2),
"other_ratio3_current": fixNumber(Number(i[41]), 2) == "" ? "0.00" : fixNumber(Number(i[41]), 2),
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": fixNumber(Number(i[43]), 2) == "" ? "0.00" : fixNumber(Number(i[43]), 2),
"other_ratio4_current": fixNumber(Number(i[44]), 2) == "" ? "0.00" : fixNumber(Number(i[44]), 2),
"notes": i[45],
})
}
} }
}) })
let body = { let body = {
...@@ -962,7 +1013,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -962,7 +1013,7 @@ export default class ListOfCreditFacilities extends Component {
// } else { // } else {
if (response.data.status == "success") { if (response.data.status == "success") {
this.setState({ this.setState({
perBS: response.data.data.per_bs == null || response.data.data.per_bs == '' ? Number(0).toFixed(1) : Number(response.data.data.per_bs).toFixed(1), perBS: this.props.defaultCurrency.id == 1 ? (response.data.data.per_bs == null || response.data.data.per_bs == '' ? fixNumber(Number(0), 1) : fixNumber(Number(response.data.data.per_bs), 1)) : (response.data.data.per_bs == null || response.data.data.per_bs == '' ? Number(0) : Number(response.data.data.per_bs)),
totalOutStand: response.data.data.total_loan, totalOutStand: response.data.data.total_loan,
diff: response.data.data.diff diff: response.data.data.diff
}) })
...@@ -999,20 +1050,21 @@ export default class ListOfCreditFacilities extends Component { ...@@ -999,20 +1050,21 @@ export default class ListOfCreditFacilities extends Component {
item.description, item.description,
item.uom, item.uom,
item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before, item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
Number(item.ratio.monthly_january).toFixed(2), // Number(item.ratio.monthly_january).toFixed(2),
Number(item.ratio.monthly_february).toFixed(2), Number(item.ratio.monthly_january),
Number(item.ratio.monthly_march).toFixed(2), Number(item.ratio.monthly_february),
Number(item.ratio.monthly_april).toFixed(2), Number(item.ratio.monthly_march),
Number(item.ratio.monthly_may).toFixed(2), Number(item.ratio.monthly_april),
Number(item.ratio.monthly_june).toFixed(2), Number(item.ratio.monthly_may),
Number(item.ratio.monthly_july).toFixed(2), Number(item.ratio.monthly_june),
Number(item.ratio.monthly_august).toFixed(2), Number(item.ratio.monthly_july),
Number(item.ratio.monthly_september).toFixed(2), Number(item.ratio.monthly_august),
Number(item.ratio.monthly_october).toFixed(2), Number(item.ratio.monthly_september),
Number(item.ratio.monthly_november).toFixed(2), Number(item.ratio.monthly_october),
Number(item.ratio.monthly_december).toFixed(2), Number(item.ratio.monthly_november),
Number(item.ratio.total_next_year).toFixed(2), Number(item.ratio.monthly_december),
Number(item.ratio.total_more_year).toFixed(2), Number(item.ratio.total_next_year),
Number(item.ratio.total_more_year),
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong item.condition_if_wrong
...@@ -1036,20 +1088,20 @@ export default class ListOfCreditFacilities extends Component { ...@@ -1036,20 +1088,20 @@ export default class ListOfCreditFacilities extends Component {
item.description, item.description,
item.oum, item.oum,
item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before, item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
Number(item.ratio.monthly_january).toFixed(2), Number(item.ratio.monthly_january),
Number(item.ratio.monthly_february).toFixed(2), Number(item.ratio.monthly_february),
Number(item.ratio.monthly_march).toFixed(2), Number(item.ratio.monthly_march),
Number(item.ratio.monthly_april).toFixed(2), Number(item.ratio.monthly_april),
Number(item.ratio.monthly_may).toFixed(2), Number(item.ratio.monthly_may),
Number(item.ratio.monthly_june).toFixed(2), Number(item.ratio.monthly_june),
Number(item.ratio.monthly_july).toFixed(2), Number(item.ratio.monthly_july),
Number(item.ratio.monthly_august).toFixed(2), Number(item.ratio.monthly_august),
Number(item.ratio.monthly_september).toFixed(2), Number(item.ratio.monthly_september),
Number(item.ratio.monthly_october).toFixed(2), Number(item.ratio.monthly_october),
Number(item.ratio.monthly_november).toFixed(2), Number(item.ratio.monthly_november),
Number(item.ratio.monthly_december).toFixed(2), Number(item.ratio.monthly_december),
Number(item.ratio.total_next_year).toFixed(2), Number(item.ratio.total_next_year),
Number(item.ratio.total_more_year).toFixed(2), Number(item.ratio.total_more_year),
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong item.condition_if_wrong
...@@ -1097,6 +1149,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -1097,6 +1149,7 @@ export default class ListOfCreditFacilities extends Component {
} }
let tgl = String(i[9]).split('-') let tgl = String(i[9]).split('-')
let checkUndifined = tgl.findIndex((val) => val == undefined) let checkUndifined = tgl.findIndex((val) => val == undefined)
if (this.props.defaultCurrency.id == 2) {
data.push({ data.push({
"item_report_id": i[1], "item_report_id": i[1],
"borrower_comp_name": i[5], "borrower_comp_name": i[5],
...@@ -1107,42 +1160,91 @@ export default class ListOfCreditFacilities extends Component { ...@@ -1107,42 +1160,91 @@ export default class ListOfCreditFacilities extends Component {
// "loan_maturity_date": i[9], // "loan_maturity_date": i[9],
"interest": i[10] == "" ? "0.00" : i[10], "interest": i[10] == "" ? "0.00" : i[10],
"currency": i[11], "currency": i[11],
"loan_plafond_amount_ori": Number(i[12]).toFixed(1) == "" ? "0.0" : Number(i[12]).toFixed(1), "loan_plafond_amount_ori": Number(i[12]) == "" ? "0.0" : Number(i[12]),
"loan_plafond_amount_idr": Number(i[13]).toFixed(1) == "" ? "0.0" : Number(i[13]).toFixed(1), "loan_plafond_amount_idr": Number(i[13]) == "" ? "0.0" : Number(i[13]),
"out_loan_ki_amount_ori": Number(i[14]).toFixed(1) == "" ? "0.0" : Number(i[14]).toFixed(1), "out_loan_ki_amount_ori": Number(i[14]) == "" ? "0.0" : Number(i[14]),
"out_loan_ki_amount_idr": Number(i[15]).toFixed(1) == "" ? "0.0" : Number(i[15]).toFixed(1), "out_loan_ki_amount_idr": Number(i[15]) == "" ? "0.0" : Number(i[15]),
"out_loan_kmk_amount_ori": Number(i[16]).toFixed(1) == "" ? "0.0" : Number(i[16]).toFixed(1), "out_loan_kmk_amount_ori": Number(i[16]) == "" ? "0.0" : Number(i[16]),
"out_loan_kmk_amount_idr": Number(i[17]).toFixed(1) == "" ? "0.0" : Number(i[17]).toFixed(1), "out_loan_kmk_amount_idr": Number(i[17]) == "" ? "0.0" : Number(i[17]),
// "mtd_vs_previous_month": i[18], // "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18], "out_loan_other_type": i[18],
"out_loan_other_amount_ori": Number(i[19]).toFixed(1) == "" ? "0.0" : Number(i[19]).toFixed(1), "out_loan_other_amount_ori": Number(i[19]) == "" ? "0.0" : Number(i[19]),
"out_loan_other_amount_idr": Number(i[20]).toFixed(1) == "" ? "0.0" : Number(i[20]).toFixed(1), "out_loan_other_amount_idr": Number(i[20]) == "" ? "0.0" : Number(i[20]),
"total_out_loan_ori": Number(i[21]).toFixed(1) == "" ? "0.0" : Number(i[21]).toFixed(1), "total_out_loan_ori": Number(i[21]) == "" ? "0.0" : Number(i[21]),
"total_out_loan_idr": Number(i[22]).toFixed(1) == "" ? "0.0" : Number(i[22]).toFixed(1), "total_out_loan_idr": Number(i[22]) == "" ? "0.0" : Number(i[22]),
"remaining_plafond_ori": Number(i[23]).toFixed(1) == "" ? "0.0" : Number(i[23]).toFixed(1), "remaining_plafond_ori": Number(i[23]) == "" ? "0.0" : Number(i[23]),
"remaining_plafond_idr": Number(i[24]).toFixed(1) == "" ? "0.0" : Number(i[24]).toFixed(1), "remaining_plafond_idr": Number(i[24]) == "" ? "0.0" : Number(i[24]),
"current_ratio_financial": Number(i[25]).toFixed(2) == "" ? "0.00" : Number(i[25]).toFixed(2), "current_ratio_financial": Number(i[25]) == "" ? "0.00" : Number(i[25]),
"current_ratio_current": Number(i[26]).toFixed(2) == "" ? "0.00" : Number(i[26]).toFixed(2), "current_ratio_current": Number(i[26]) == "" ? "0.00" : Number(i[26]),
"der_financial": Number(i[27]).toFixed(2) == "" ? "0.00" : Number(i[27]).toFixed(2), "der_financial": Number(i[27]) == "" ? "0.00" : Number(i[27]),
"der_current": Number(i[28]).toFixed(2) == "" ? "0.00" : Number(i[28]).toFixed(2), "der_current": Number(i[28]) == "" ? "0.00" : Number(i[28]),
"debt_to_ebitda_financial": Number(i[29]).toFixed(2) == "" ? "0.00" : Number(i[29]).toFixed(2), "debt_to_ebitda_financial": Number(i[29]) == "" ? "0.00" : Number(i[29]),
"debt_to_ebitda_current": Number(i[30]).toFixed(2) == "" ? "0.00" : Number(i[30]).toFixed(2), "debt_to_ebitda_current": Number(i[30]) == "" ? "0.00" : Number(i[30]),
"ebitda_to_interest_financial": Number(i[31]).toFixed(2) == "" ? "0.00" : Number(i[31]).toFixed(2), "ebitda_to_interest_financial": Number(i[31]) == "" ? "0.00" : Number(i[31]),
"ebitda_to_interest_current": Number(i[32]).toFixed(2) == "" ? "0.00" : Number(i[32]).toFixed(2), "ebitda_to_interest_current": Number(i[32]) == "" ? "0.00" : Number(i[32]),
"other_ratio1_ratio_name": i[33], "other_ratio1_ratio_name": i[33],
"other_ratio1_financial": Number(i[34]).toFixed(2) == "" ? "0.00" : Number(i[34]).toFixed(2), "other_ratio1_financial": Number(i[34]) == "" ? "0.00" : Number(i[34]),
"other_ratio1_current": Number(i[35]).toFixed(2) == "" ? "0.00" : Number(i[35]).toFixed(2), "other_ratio1_current": Number(i[35]) == "" ? "0.00" : Number(i[35]),
"other_ratio2_ratio_name": i[36], "other_ratio2_ratio_name": i[36],
"other_ratio2_financial": Number(i[37]).toFixed(2) == "" ? "0.00" : Number(i[37]).toFixed(2), "other_ratio2_financial": Number(i[37]) == "" ? "0.00" : Number(i[37]),
"other_ratio2_current": Number(i[38]).toFixed(2) == "" ? "0.00" : Number(i[38]).toFixed(2), "other_ratio2_current": Number(i[38]) == "" ? "0.00" : Number(i[38]),
"other_ratio3_ratio_name": i[39], "other_ratio3_ratio_name": i[39],
"other_ratio3_financial": Number(i[40]).toFixed(2) == "" ? "0.00" : Number(i[40]).toFixed(2), "other_ratio3_financial": Number(i[40]) == "" ? "0.00" : Number(i[40]),
"other_ratio3_current": Number(i[41]).toFixed(2) == "" ? "0.00" : Number(i[41]).toFixed(2), "other_ratio3_current": Number(i[41]) == "" ? "0.00" : Number(i[41]),
"other_ratio4_ratio_name": i[42], "other_ratio4_ratio_name": i[42],
"other_ratio4_financial": Number(i[43]).toFixed(2) == "" ? "0.00" : Number(i[43]).toFixed(2), "other_ratio4_financial": Number(i[43]) == "" ? "0.00" : Number(i[43]),
"other_ratio4_current": Number(i[44]).toFixed(2) == "" ? "0.00" : Number(i[44]).toFixed(2), "other_ratio4_current": Number(i[44]) == "" ? "0.00" : Number(i[44]),
"notes": i[45], "notes": i[45],
}) })
} else {
data.push({
"item_report_id": i[1],
"borrower_comp_name": i[5],
"bank_name": i[6] == null ? [6] : i[6].value,
"type_of_credit": i[7] == null ? i[7] : i[7].value,
"remarks": i[8],
"loan_maturity_date": i[9] == undefined || i[9] == "null" || i[9] == null ? "" : (String(tgl[2]).length <= 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(i[9])),
// "loan_maturity_date": i[9],
"interest": i[10] == "" ? "0.00" : i[10],
"currency": i[11],
"loan_plafond_amount_ori": fixNumber(Number(i[12]), 1) == "" ? "0.0" : fixNumber(Number(i[12]), 1),
"loan_plafond_amount_idr": fixNumber(Number(i[13]), 1) == "" ? "0.0" : fixNumber(Number(i[13]), 1),
"out_loan_ki_amount_ori": fixNumber(Number(i[14]), 1) == "" ? "0.0" : fixNumber(Number(i[14]), 1),
"out_loan_ki_amount_idr": fixNumber(Number(i[15]), 1) == "" ? "0.0" : fixNumber(Number(i[15]), 1),
"out_loan_kmk_amount_ori": fixNumber(Number(i[16]), 1) == "" ? "0.0" : fixNumber(Number(i[16]), 1),
"out_loan_kmk_amount_idr": fixNumber(Number(i[17]), 1) == "" ? "0.0" : fixNumber(Number(i[17]), 1),
// "mtd_vs_previous_month": i[18],
"out_loan_other_type": i[18],
"out_loan_other_amount_ori": fixNumber(Number(i[19]), 1) == "" ? "0.0" : fixNumber(Number(i[19]), 1),
"out_loan_other_amount_idr": fixNumber(Number(i[20]), 1) == "" ? "0.0" : fixNumber(Number(i[20]), 1),
"total_out_loan_ori": fixNumber(Number(i[21]), 1) == "" ? "0.0" : fixNumber(Number(i[21]), 1),
"total_out_loan_idr": fixNumber(Number(i[22]), 1) == "" ? "0.0" : fixNumber(Number(i[22]), 1),
"remaining_plafond_ori": fixNumber(Number(i[23]), 1) == "" ? "0.0" : fixNumber(Number(i[23]), 1),
"remaining_plafond_idr": fixNumber(Number(i[24]), 1) == "" ? "0.0" : fixNumber(Number(i[24]), 1),
"current_ratio_financial": fixNumber(Number(i[25]), 2) == "" ? "0.00" : fixNumber(Number(i[25]), 2),
"current_ratio_current": fixNumber(Number(i[26]), 2) == "" ? "0.00" : fixNumber(Number(i[26]), 2),
"der_financial": fixNumber(Number(i[27]), 2) == "" ? "0.00" : fixNumber(Number(i[27]), 2),
"der_current": fixNumber(Number(i[28]), 2) == "" ? "0.00" : fixNumber(Number(i[28]), 2),
"debt_to_ebitda_financial": fixNumber(Number(i[29]), 2) == "" ? "0.00" : fixNumber(Number(i[29]), 2),
"debt_to_ebitda_current": fixNumber(Number(i[30]), 2) == "" ? "0.00" : fixNumber(Number(i[30]), 2),
"ebitda_to_interest_financial": fixNumber(Number(i[31]), 2) == "" ? "0.00" : fixNumber(Number(i[31]), 2),
"ebitda_to_interest_current": fixNumber(Number(i[32]), 2) == "" ? "0.00" : fixNumber(Number(i[32]), 2),
"other_ratio1_ratio_name": i[33],
"other_ratio1_financial": fixNumber(Number(i[34]), 2) == "" ? "0.00" : fixNumber(Number(i[34]), 2),
"other_ratio1_current": fixNumber(Number(i[35]), 2) == "" ? "0.00" : fixNumber(Number(i[35]), 2),
"other_ratio2_ratio_name": i[36],
"other_ratio2_financial": fixNumber(Number(i[37]), 2) == "" ? "0.00" : fixNumber(Number(i[37]), 2),
"other_ratio2_current": fixNumber(Number(i[38]), 2) == "" ? "0.00" : fixNumber(Number(i[38]), 2),
"other_ratio3_ratio_name": i[39],
"other_ratio3_financial": fixNumber(Number(i[40]), 2) == "" ? "0.00" : fixNumber(Number(i[40]), 2),
"other_ratio3_current": fixNumber(Number(i[41]), 2) == "" ? "0.00" : fixNumber(Number(i[41]), 2),
"other_ratio4_ratio_name": i[42],
"other_ratio4_financial": fixNumber(Number(i[43]), 2) == "" ? "0.00" : fixNumber(Number(i[43]), 2),
"other_ratio4_current": fixNumber(Number(i[44]), 2) == "" ? "0.00" : fixNumber(Number(i[44]), 2),
"notes": i[45],
})
}
} }
}) })
let payload = { let payload = {
...@@ -1398,25 +1500,31 @@ export default class ListOfCreditFacilities extends Component { ...@@ -1398,25 +1500,31 @@ export default class ListOfCreditFacilities extends Component {
// console.log(dataGabung) // console.log(dataGabung)
console.log(newData) console.log(newData)
// console.log(dataTampungBank) // console.log(dataTampungBank)
console.log(Number(totalLoan).toFixed(1)); console.log(fixNumber(Number(totalLoan), 1));
console.log(this.state.perBS) console.log(this.state.perBS)
console.log(this.state.diff) console.log(this.state.diff)
// console.log(bankNameEmpty) // console.log(bankNameEmpty)
// dataTable: newData, totalOutStand: newData[newData.length-1][22] // dataTable: newData, totalOutStand: newData[newData.length-1][22]
if (bankNameEmpty) { if (bankNameEmpty) {
if (this.state.get_for == 'view') { if (this.state.get_for == 'view') {
this.setState({ loading: false, dataTable: this.state.dataTable, diff: this.state.diff == null ? "0.0" : Number(0 - this.state.perBS).toFixed(1), perBS: this.state.totalOutStand == null ? "0.0" : this.state.totalOutStand, saveDraft: false, saveComp: true }) this.setState({ loading: false, dataTable: this.state.dataTable, diff: this.state.diff == null ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(0 - this.state.perBS), 1) : Number(0 - this.state.perBS), perBS: this.state.totalOutStand == null ? "0.0" : this.state.totalOutStand, saveDraft: false, saveComp: true })
} else { } else {
this.setState({ loading: false, dataTable: this.state.dataTable, diff: Number(0 - this.state.perBS).toFixed(1), saveDraft: false, saveComp: true }) this.setState({ loading: false, dataTable: this.state.dataTable, diff: this.props.defaultCurrency.id == 1 ? fixNumber(Number(0 - this.state.perBS), 1) : Number(0 - this.state.perBS), saveDraft: false, saveComp: true })
} }
} else { } else {
if (this.state.get_for == 'view') { if (this.state.get_for == 'view') {
this.setState({ loading: false, dataTable: newData, diff: this.state.diff == null ? "0.0" : Number(Number(totalLoan).toFixed(1) - this.state.perBS).toFixed(1), perBS: this.state.totalOutStand == null ? "0.0" : this.state.totalOutStand }) if (this.props.defaultCurrency.id == 1) {
this.setState({ loading: false, dataTable: newData, diff: this.state.diff == null ? "0.0" : fixNumber(Number(fixNumber(Number(totalLoan), 1) - this.state.perBS), 1), perBS: this.state.totalOutStand == null ? "0.0" : this.state.totalOutStand })
} else { } else {
this.setState({ loading: false, dataTable: newData, diff: Number(Number(totalLoan).toFixed(1) - this.state.perBS).toFixed(1), saveDraft: false, saveComp: Number(Number(totalLoan).toFixed(1) - this.state.perBS) == 0 || Number(Number(totalLoan).toFixed(1) - this.state.perBS) == "-0.0" ? false : true }, () => { this.setState({ loading: false, dataTable: newData, diff: this.state.diff == null ? "0.0" : Number(Number(totalLoan) - this.state.perBS), perBS: this.state.totalOutStand == null ? "0.0" : this.state.totalOutStand })
// alert(this.state.saveComp) }
// console.log(Number(Number(totalLoan).toFixed(1) - this.state.perBS));
}) } else {
if (this.props.defaultCurrency.id == 1) {
this.setState({ loading: false, dataTable: newData, diff: fixNumber(Number(fixNumber(Number(totalLoan), 1) - this.state.perBS),), saveDraft: false, saveComp: Number(fixNumber(Number(totalLoan), 1) - this.state.perBS) == 0 || Number(fixNumber(Number(totalLoan), 1) - this.state.perBS) == "-0.0" ? false : true })
} else {
this.setState({ loading: false, dataTable: newData, diff: Number(Number(totalLoan) - this.state.perBS), saveDraft: false, saveComp: Number(Number(totalLoan) - this.state.perBS) == 0 || Number(Number(totalLoan) - this.state.perBS) == "-0.0" ? false : true })
}
} }
} }
...@@ -1465,7 +1573,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -1465,7 +1573,7 @@ export default class ListOfCreditFacilities extends Component {
} else { } else {
if (column != 8 && column != 11 && column != 18 && column != 25 && column != 27 && column != 29 && column != 31 && column != 33 && column != 36 && column != 39 && column != 42 && column != 45) { if (column != 8 && column != 11 && column != 18 && column != 25 && column != 27 && column != 29 && column != 31 && column != 33 && column != 36 && column != 39 && column != 42 && column != 45) {
val = String(value).split(",").join("") val = String(value).split(",").join("")
val = Number(val).toFixed(2) val = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 2) : Number(val)
} else { } else {
val = String(value).split(",").join("") val = String(value).split(",").join("")
...@@ -2003,7 +2111,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2003,7 +2111,7 @@ export default class ListOfCreditFacilities extends Component {
style={{ color: this.state.get_for == 'view' ? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: (tableMeta.rowData[10] == '0.00' || tableMeta.rowData[10] == '') && this.state.get_for == 'edit' ? '#ffac99' : 'transparent' }} style={{ color: this.state.get_for == 'view' ? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: (tableMeta.rowData[10] == '0.00' || tableMeta.rowData[10] == '') && this.state.get_for == 'edit' ? '#ffac99' : 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
value={Number(value).toFixed(2)} value={Number(value) == 0 ? "0.0" : this.state.get_for == 'view' ? fixNumber(Number(value), 2) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 2) : Number(value)}
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
// disabled={this.props.isApprover ? true : ((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') ? false : true)} // disabled={this.props.isApprover ? true : ((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') ? false : true)}
decimalScale={2} decimalScale={2}
...@@ -2105,7 +2213,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2105,7 +2213,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[12], tableMeta, 12)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[12]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[12], tableMeta, 12)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[12], tableMeta, 12))}
/> />
} }
/> />
...@@ -2121,8 +2230,9 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2121,8 +2230,9 @@ export default class ListOfCreditFacilities extends Component {
style={{ color: this.state.get_for == 'view' ? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.state.get_for == 'view' ? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
value={Number(tableMeta.rowData[12]).toFixed(1) == 0.0 ? "0.0" : Number(tableMeta.rowData[12]).toFixed(1)} value={Number(tableMeta.rowData[12]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (fixNumber(Number(tableMeta.rowData[12]), 1) == 0.0 ? "0.0" : fixNumber(Number(tableMeta.rowData[12]), 1)) : (Number(tableMeta.rowData[12]) == 0.0 ? "0.0" : Number(tableMeta.rowData[12]))}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 12) handleChange(event.target.value, tableMeta, 12)
}} }}
...@@ -2150,7 +2260,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2150,7 +2260,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[13], tableMeta, 13)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[13], tableMeta, 13)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[13], tableMeta, 13))}
/> />
} }
/> />
...@@ -2167,7 +2278,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2167,7 +2278,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
value={Number(tableMeta.rowData[13]).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[13]), 1) : Number(tableMeta.rowData[13])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 13) handleChange(event.target.value, tableMeta, 13)
}} }}
...@@ -2230,7 +2342,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2230,7 +2342,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[14], tableMeta, 14)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[14]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[14], tableMeta, 14)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[14], tableMeta, 14))}
/> />
} }
/> />
...@@ -2247,7 +2360,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2247,7 +2360,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Investment Loan' ? false : true} disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Investment Loan' ? false : true}
value={Number(tableMeta.rowData[14]).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[14]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[14]), 1) : Number(tableMeta.rowData[14])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 14) handleChange(event.target.value, tableMeta, 14)
}} }}
...@@ -2274,7 +2388,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2274,7 +2388,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[15], tableMeta, 15)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[15]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[15], tableMeta, 15)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[15], tableMeta, 15))}
/> />
} }
/> />
...@@ -2291,7 +2406,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2291,7 +2406,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Investment Loan' ? false : true} disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Investment Loan' ? false : true}
value={Number(tableMeta.rowData[15]).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[15]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[15]), 1) : Number(tableMeta.rowData[15])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 15) handleChange(event.target.value, tableMeta, 15)
}} }}
...@@ -2353,7 +2469,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2353,7 +2469,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[16], tableMeta, 16)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[16], tableMeta, 16)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[16], tableMeta, 16))}
/> />
} }
/> />
...@@ -2370,7 +2487,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2370,7 +2487,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Revolving Loan (KMK)' ? false : true} disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Revolving Loan (KMK)' ? false : true}
value={Number(tableMeta.rowData[16]).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[16]), 1) : Number(tableMeta.rowData[16])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 16) handleChange(event.target.value, tableMeta, 16)
}} }}
...@@ -2397,7 +2515,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2397,7 +2515,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[17], tableMeta, 17)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[17]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[17], tableMeta, 17)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[17], tableMeta, 17))}
/> />
} }
/> />
...@@ -2414,7 +2533,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2414,7 +2533,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Revolving Loan (KMK)' ? false : true} disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Revolving Loan (KMK)' ? false : true}
value={Number(tableMeta.rowData[17]).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[17]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[17]), 1) : Number(tableMeta.rowData[17])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 17) handleChange(event.target.value, tableMeta, 17)
}} }}
...@@ -2509,7 +2629,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2509,7 +2629,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[19], tableMeta, 19)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[19]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[19], tableMeta, 19)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[19], tableMeta, 19))}
/> />
} }
/> />
...@@ -2526,7 +2647,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2526,7 +2647,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Others' ? false : true} disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Others' ? false : true}
value={Number(tableMeta.rowData[19]).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[19]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[19]), 1) : Number(tableMeta.rowData[19])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 19) handleChange(event.target.value, tableMeta, 19)
}} }}
...@@ -2553,7 +2675,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2553,7 +2675,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[20], tableMeta, 20)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[20]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[20], tableMeta, 20)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[20], tableMeta, 20))}
/> />
} }
/> />
...@@ -2570,7 +2693,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2570,7 +2693,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Others' ? false : true} disabled={this.state.get_for == 'view' ? true : tableMeta.rowData[7] == null ? true : tableMeta.rowData[7].value == 'Others' ? false : true}
value={Number(tableMeta.rowData[20]).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[20]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[20]), 1) : Number(tableMeta.rowData[20])}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 20) handleChange(event.target.value, tableMeta, 20)
}} }}
...@@ -2629,7 +2753,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2629,7 +2753,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[21], tableMeta, 21)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[21]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[21], tableMeta, 21)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[21], tableMeta, 21))}
/> />
} }
/> />
...@@ -2646,7 +2771,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2646,7 +2771,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={(Number(handleFormulaHardcode(tableMeta.rowData[21], tableMeta, 21)).toFixed(1))} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[21]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[21], tableMeta, 21)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[21], tableMeta, 21))}
/> />
} }
/> />
...@@ -2670,7 +2796,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2670,7 +2796,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[22], tableMeta, 22)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[22]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[22], tableMeta, 22)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[22], tableMeta, 22))}
/> />
} }
/> />
...@@ -2687,7 +2814,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2687,7 +2814,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={(Number(handleFormulaHardcode(tableMeta.rowData[22], tableMeta, 22)).toFixed(1))} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[22]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[22], tableMeta, 22)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[22], tableMeta, 22))}
/> />
} }
/> />
...@@ -2743,7 +2871,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2743,7 +2871,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[23], tableMeta, 23)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[23]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[23], tableMeta, 23)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[23], tableMeta, 23))}
/> />
} }
/> />
...@@ -2760,7 +2889,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2760,7 +2889,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={(Number(handleFormulaHardcode(tableMeta.rowData[23], tableMeta, 23)).toFixed(1))} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[23]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[23], tableMeta, 23)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[23], tableMeta, 23))}
/> />
} }
/> />
...@@ -2784,7 +2914,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2784,7 +2914,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormulaHardcode(tableMeta.rowData[24], tableMeta, 24)).toFixed(1)} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[24]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[24], tableMeta, 24)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[24], tableMeta, 24))}
/> />
} }
/> />
...@@ -2801,7 +2932,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2801,7 +2932,8 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={(Number(handleFormulaHardcode(tableMeta.rowData[24], tableMeta, 24)).toFixed(1))} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[24]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormulaHardcode(tableMeta.rowData[24], tableMeta, 24)), 1) : Number(handleFormulaHardcode(tableMeta.rowData[24], tableMeta, 24))}
/> />
} }
/> />
...@@ -2862,7 +2994,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2862,7 +2994,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[25]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[25]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 25) handleChange(event.target.value, tableMeta, 25)
}} }}
...@@ -2888,7 +3020,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2888,7 +3020,7 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTableRatio(tableMeta.rowData[26], tableMeta, 26, "Current Ratio")).toFixed(2)} value={fixNumber(Number(handleTableRatio(tableMeta.rowData[26], tableMeta, 26, "Current Ratio")), 1)}
/> />
} }
/> />
...@@ -2945,7 +3077,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2945,7 +3077,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[27]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[27]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 27) handleChange(event.target.value, tableMeta, 27)
}} }}
...@@ -2971,7 +3103,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -2971,7 +3103,7 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTableRatio(tableMeta.rowData[28], tableMeta, 28, "Debt to Equity Ratio")).toFixed(2)} value={fixNumber(Number(handleTableRatio(tableMeta.rowData[28], tableMeta, 28, "Debt to Equity Ratio")), 2)}
/> />
} }
/> />
...@@ -3028,7 +3160,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3028,7 +3160,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[29]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[29]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 29) handleChange(event.target.value, tableMeta, 29)
}} }}
...@@ -3054,7 +3186,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3054,7 +3186,7 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTableRatio(tableMeta.rowData[30], tableMeta, 30, "Debt to EBITDA - YTD")).toFixed(2)} value={fixNumber(Number(handleTableRatio(tableMeta.rowData[30], tableMeta, 30, "Debt to EBITDA - YTD")), 2)}
/> />
} }
/> />
...@@ -3111,7 +3243,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3111,7 +3243,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[31]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[31]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 31) handleChange(event.target.value, tableMeta, 31)
}} }}
...@@ -3137,7 +3269,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3137,7 +3269,7 @@ export default class ListOfCreditFacilities extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTableRatio(tableMeta.rowData[32], tableMeta, 32, "EBITDA to Interest - YTD")).toFixed(2)} value={fixNumber(Number(handleTableRatio(tableMeta.rowData[32], tableMeta, 32, "EBITDA to Interest - YTD")), 2)}
/> />
} }
/> />
...@@ -3227,7 +3359,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3227,7 +3359,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[34]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[34]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 34) handleChange(event.target.value, tableMeta, 34)
}} }}
...@@ -3255,7 +3387,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3255,7 +3387,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[35]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[35]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 35) handleChange(event.target.value, tableMeta, 35)
}} }}
...@@ -3348,7 +3480,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3348,7 +3480,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[37]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[37]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 37) handleChange(event.target.value, tableMeta, 37)
}} }}
...@@ -3376,7 +3508,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3376,7 +3508,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[38]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[38]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 38) handleChange(event.target.value, tableMeta, 38)
}} }}
...@@ -3469,7 +3601,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3469,7 +3601,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[40]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[40]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 40) handleChange(event.target.value, tableMeta, 40)
}} }}
...@@ -3497,7 +3629,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3497,7 +3629,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[41]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[41]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 41) handleChange(event.target.value, tableMeta, 41)
}} }}
...@@ -3590,7 +3722,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3590,7 +3722,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[43]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[43]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 43) handleChange(event.target.value, tableMeta, 43)
}} }}
...@@ -3618,7 +3750,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3618,7 +3750,7 @@ export default class ListOfCreditFacilities extends Component {
disabled={this.state.get_for == 'view'} disabled={this.state.get_for == 'view'}
fixedDecimalScale={2} fixedDecimalScale={2}
decimalScale={2} decimalScale={2}
value={Number(tableMeta.rowData[44]).toFixed(2)} value={fixNumber(Number(tableMeta.rowData[44]), 2)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 44) handleChange(event.target.value, tableMeta, 44)
}} }}
...@@ -3907,6 +4039,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3907,6 +4039,7 @@ export default class ListOfCreditFacilities extends Component {
options={options} options={options}
/> />
</MuiThemeProvider>} </MuiThemeProvider>}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div> </div>
<div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15, marginTop: 5 }}> <div style={{ display: 'flex', justifyContent: 'space-between', maxWidth: '100%', paddingLeft: 5, paddingRight: 15, marginTop: 5 }}>
......
src/container/MonthlyReport/MonthlyReport.js
View file @ 52c536f2
...@@ -2565,9 +2565,9 @@ export default class MonthlyReport extends Component { ...@@ -2565,9 +2565,9 @@ export default class MonthlyReport extends Component {
: :
// { // {
(tableMeta.rowData[5] ? // (tableMeta.rowData[5] ?
this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3]) this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
: null) // : null)
// console.log(tableMeta.rowData) // console.log(tableMeta.rowData)
// } // }
......
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ 52c536f2
...@@ -1758,6 +1758,7 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1758,6 +1758,7 @@ export default class OperatingIndicatorMR extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
} }
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : </Typography>
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 52c536f2
...@@ -11,6 +11,8 @@ import { ExcelRenderer } from 'react-excel-renderer'; ...@@ -11,6 +11,8 @@ import { ExcelRenderer } from 'react-excel-renderer';
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
import UploadFile from "../../library/Upload"; import UploadFile from "../../library/Upload";
import { Alert } from '@material-ui/lab'; import { Alert } from '@material-ui/lab';
import { color } from 'echarts';
import { fixNumber, titleCase } from '../../library/Utils';
const LightTooltip = withStyles((theme) => ({ const LightTooltip = withStyles((theme) => ({
tooltip: { tooltip: {
...@@ -240,7 +242,7 @@ export default class ProfitLossMR extends Component { ...@@ -240,7 +242,7 @@ export default class ProfitLossMR extends Component {
const handlePushChild = (item) => { const handlePushChild = (item) => {
let indexIDzz = dataTable.findIndex((val) => val[1] === item.id) let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
if (item.type_report_id === 3) { if (item.type_report_id === 3) {
if (item.profit_loss.mtd_vs_mb == "" && Number(item.profit_loss.percent_act_vs_mb).toFixed(1) < this.state.minValue || Number(item.profit_loss.percent_act_vs_mb).toFixed(1) > this.state.maxValue) { if (item.profit_loss.mtd_vs_mb == "" && Number(item.profit_loss.percent_act_vs_mb) < this.state.minValue || Number(item.profit_loss.percent_act_vs_mb) > this.state.maxValue) {
err = true err = true
} }
} }
...@@ -282,7 +284,7 @@ export default class ProfitLossMR extends Component { ...@@ -282,7 +284,7 @@ export default class ProfitLossMR extends Component {
} }
res.map((item, index) => { res.map((item, index) => {
if (item.type_report_id === 3) { if (item.type_report_id === 3) {
if (item.profit_loss.mtd_vs_mb == "" && Number(item.profit_loss.percent_act_vs_mb).toFixed(1) < this.state.minValue || Number(item.profit_loss.percent_act_vs_mb).toFixed(1) > this.state.maxValue) { if (item.profit_loss.mtd_vs_mb == "" && Number(item.profit_loss.percent_act_vs_mb) < this.state.minValue || Number(item.profit_loss.percent_act_vs_mb) > this.state.maxValue) {
err = true err = true
} }
} }
...@@ -377,27 +379,51 @@ export default class ProfitLossMR extends Component { ...@@ -377,27 +379,51 @@ export default class ProfitLossMR extends Component {
console.log('test'); console.log('test');
// this.setState({ loading: true }) // this.setState({ loading: true })
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
"item_report_id": i[1], "item_report_id": i[1],
"notes": String(i[6]), "notes": String(i[6]),
"rolling_outlook": String(Number(i[7]).toFixed(1)), "rolling_outlook": String(Number(i[7])),
"master_budget": String(Number(i[8]).toFixed(1)), "master_budget": String(Number(i[8])),
"rolling_budget": String(Number(i[9]).toFixed(1)), "rolling_budget": String(Number(i[9])),
"actual": String(Number(i[10]).toFixed(1)), "actual": String(Number(i[10])),
"ytd_actual": String(Number(i[11]).toFixed(1)), "ytd_actual": String(Number(i[11])),
"actual_previous_month": String(Number(i[12]).toFixed(1)), "actual_previous_month": String(Number(i[12])),
"amount_act_vs_previous_month": String(Number(i[13]).toFixed(1)), "amount_act_vs_previous_month": String(Number(i[13])),
"percent_act_vs_previous_month": i[14], "percent_act_vs_previous_month": i[14],
"amount_act_vs_mb": String(Number(i[15]).toFixed(1)), "amount_act_vs_mb": String(Number(i[15])),
"percent_act_vs_mb": i[16], "percent_act_vs_mb": i[16],
"amount_act_vs_rb": String(Number(i[17]).toFixed(1)), "amount_act_vs_rb": String(Number(i[17])),
"percent_act_vs_rb": i[18], "percent_act_vs_rb": i[18],
"mtd_vs_mb": String(i[19]), "mtd_vs_mb": String(i[19]),
"mtd_vs_rb": String(i[20]), "mtd_vs_rb": String(i[20]),
"mtd_vs_previous_month": String(i[21]), "mtd_vs_previous_month": String(i[21]),
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
"item_report_id": i[1],
"notes": String(i[6]),
"rolling_outlook": String(fixNumber(Number(i[7]), 1)),
"master_budget": String(fixNumber(Number(i[8]), 1)),
"rolling_budget": String(fixNumber(Number(i[9]), 1)),
"actual": String(fixNumber(Number(i[10]), 1)),
"ytd_actual": String(fixNumber(Number(i[11]), 1)),
"actual_previous_month": String(fixNumber(Number(i[12]), 1)),
"amount_act_vs_previous_month": String(fixNumber(Number(i[13]), 1)),
"percent_act_vs_previous_month": i[14],
"amount_act_vs_mb": String(fixNumber(Number(i[15]), 1)),
"percent_act_vs_mb": i[16],
"amount_act_vs_rb": String(fixNumber(Number(i[17]), 1)),
"percent_act_vs_rb": i[18],
"mtd_vs_mb": String(i[19]),
"mtd_vs_rb": String(i[20]),
"mtd_vs_previous_month": String(i[21]),
})
})
}
let payload = { let payload = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -505,7 +531,7 @@ export default class ProfitLossMR extends Component { ...@@ -505,7 +531,7 @@ export default class ProfitLossMR extends Component {
item.rolling_outlook === null ? "" : item.rolling_outlook === "" ? "" : item.rolling_outlook, item.rolling_outlook === null ? "" : item.rolling_outlook === "" ? "" : item.rolling_outlook,
item.master_budget === "" ? "" : item.master_budget, item.master_budget === "" ? "" : item.master_budget,
item.rolling_budget === "" ? "" : item.rolling_budget, item.rolling_budget === "" ? "" : item.rolling_budget,
item.actual === "" ? "" : Number(item.actual).toFixed(1), item.actual === "" ? "" : Number(item.actual),
0, 0,
item.actual_previous_month === null ? "" : item.actual_previous_month === "" ? "" : item.actual_previous_month, item.actual_previous_month === null ? "" : item.actual_previous_month === "" ? "" : item.actual_previous_month,
// 0, // 0,
...@@ -554,27 +580,52 @@ export default class ProfitLossMR extends Component { ...@@ -554,27 +580,52 @@ export default class ProfitLossMR extends Component {
uploadProfitLossMR(type) { uploadProfitLossMR(type) {
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
notes: String(i[6]), notes: String(i[6]),
rolling_outlook: String(Number(i[7]).toFixed(1)), rolling_outlook: String(Number(i[7])),
master_budget: String(Number(i[8]).toFixed(1)), master_budget: String(Number(i[8])),
rolling_budget: String(Number(i[9]).toFixed(1)), rolling_budget: String(Number(i[9])),
actual: String(Number(i[10]).toFixed(1)), actual: String(Number(i[10])),
ytd_actual: String(Number(i[11]).toFixed(1)), ytd_actual: String(Number(i[11])),
actual_previous_month: String(Number(i[12]).toFixed(1)), actual_previous_month: String(Number(i[12])),
amount_act_vs_previous_month: String(Number(i[13]).toFixed(1)), amount_act_vs_previous_month: String(Number(i[13])),
percent_act_vs_previous_month: i[14], percent_act_vs_previous_month: i[14],
amount_act_vs_mb: String(Number(i[15]).toFixed(1)), amount_act_vs_mb: String(Number(i[15])),
percent_act_vs_mb: i[16], percent_act_vs_mb: i[16],
amount_act_vs_rb: String(Number(i[17]).toFixed(1)), amount_act_vs_rb: String(Number(i[17])),
percent_act_vs_rb: i[18], percent_act_vs_rb: i[18],
mtd_vs_mb: String(i[19]), mtd_vs_mb: String(i[19]),
mtd_vs_rb: String(i[20]), mtd_vs_rb: String(i[20]),
mtd_vs_previous_month: String(i[21]), mtd_vs_previous_month: String(i[21]),
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[1],
notes: String(i[6]),
rolling_outlook: String(fixNumber(Number(i[7]), 1)),
master_budget: String(fixNumber(Number(i[8]), 1)),
rolling_budget: String(fixNumber(Number(i[9]), 1)),
actual: String(fixNumber(Number(i[10]), 1)),
ytd_actual: String(fixNumber(Number(i[11]), 1)),
actual_previous_month: String(fixNumber(Number(i[12]), 1)),
amount_act_vs_previous_month: String(fixNumber(Number(i[13]), 1)),
percent_act_vs_previous_month: i[14],
amount_act_vs_mb: String(fixNumber(Number(i[15]), 1)),
percent_act_vs_mb: i[16],
amount_act_vs_rb: String(fixNumber(Number(i[17]), 1)),
percent_act_vs_rb: i[18],
mtd_vs_mb: String(i[19]),
mtd_vs_rb: String(i[20]),
mtd_vs_previous_month: String(i[21]),
})
})
}
let body = { let body = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -628,7 +679,7 @@ export default class ProfitLossMR extends Component { ...@@ -628,7 +679,7 @@ export default class ProfitLossMR extends Component {
this.state.dataTable.map((i, index) => { this.state.dataTable.map((i, index) => {
if (i[0] === 3) { if (i[0] === 3) {
// console.log(i); // console.log(i);
if (i[19] === "" && (Number(i[16]).toFixed(1) < this.state.minValue || Number(i[16]).toFixed(1) > this.state.maxValue)) { if (i[19] === "" && (this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[16]), 1) : Number(i[16]) < this.state.minValue || this.props.defaultCurrency.id == 1 ? fixNumber(Number(i[16]), 1) : Number(i[16]) > this.state.maxValue)) {
console.log('msk 1'); console.log('msk 1');
// console.log(i); // console.log(i);
err = true err = true
...@@ -718,7 +769,7 @@ export default class ProfitLossMR extends Component { ...@@ -718,7 +769,7 @@ export default class ProfitLossMR extends Component {
let val = String(value).split(",").join("") let val = String(value).split(",").join("")
if (type === "actual") { if (type === "actual") {
// console.log(val); // console.log(val);
dataTable2[tableMeta.rowIndex][10] = Number(val).toFixed(1) dataTable2[tableMeta.rowIndex][10] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(val), 1) : Number(val)
} }
// else { // else {
// let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2]) // let indexParent = dataTable2.findIndex((val) => val[1] === dataTable2[tableMeta.rowIndex][2])
...@@ -820,13 +871,13 @@ export default class ProfitLossMR extends Component { ...@@ -820,13 +871,13 @@ export default class ProfitLossMR extends Component {
let total = 0 let total = 0
if (dex === 1) { if (dex === 1) {
total = Number(tableMeta.rowData[10]) - Number(tableMeta.rowData[12]) total = Number(tableMeta.rowData[10]) - Number(tableMeta.rowData[12])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else if (dex === 2) { } else if (dex === 2) {
total = Number(tableMeta.rowData[10]) - Number(tableMeta.rowData[8]) total = Number(tableMeta.rowData[10]) - Number(tableMeta.rowData[8])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else if (dex === 3) { } else if (dex === 3) {
total = Number(tableMeta.rowData[10]) - Number(tableMeta.rowData[9]) total = Number(tableMeta.rowData[10]) - Number(tableMeta.rowData[9])
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} }
return total return total
} }
...@@ -922,7 +973,7 @@ export default class ProfitLossMR extends Component { ...@@ -922,7 +973,7 @@ export default class ProfitLossMR extends Component {
dataTable2[tableMeta.rowIndex][11] = R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value)) dataTable2[tableMeta.rowIndex][11] = R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value))
return R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value)) return R.equals(value, NaN) ? "0.0" : (R.equals(value, Infinity) ? "0.0" : (value == "-Infinity" ? "0.0" : value))
} else { } else {
dataTable2[tableMeta.rowIndex][11] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][11] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total),) : Number(total)
return total return total
} }
} }
...@@ -1078,8 +1129,8 @@ export default class ProfitLossMR extends Component { ...@@ -1078,8 +1129,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)} value={Number(tableMeta.rowData[7]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[7]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
// tableMeta.rowData[0] === 6 ? // tableMeta.rowData[0] === 6 ?
...@@ -1095,7 +1146,7 @@ export default class ProfitLossMR extends Component { ...@@ -1095,7 +1146,7 @@ export default class ProfitLossMR extends Component {
// placeholder="" // placeholder=""
// disabled={true} // disabled={true}
// value={Number(handleFormula(val, tableMeta, 0)).toFixed(1)} // value={Number(handleFormula(val, tableMeta, 0)).toFixed(1)}
// decimalScale={1} // decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
// /> // />
// } // }
// /> // />
...@@ -1112,8 +1163,8 @@ export default class ProfitLossMR extends Component { ...@@ -1112,8 +1163,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)} value={Number(tableMeta.rowData[7]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[7]), 1) : Number(tableMeta.rowData[7])}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1168,8 +1219,8 @@ export default class ProfitLossMR extends Component { ...@@ -1168,8 +1219,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[8]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1183,8 +1234,8 @@ export default class ProfitLossMR extends Component { ...@@ -1183,8 +1234,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(1)} value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[8]), 1) : Number(tableMeta.rowData[8])}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1203,8 +1254,8 @@ export default class ProfitLossMR extends Component { ...@@ -1203,8 +1254,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(1)} value={Number(tableMeta.rowData[9]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[9]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1218,8 +1269,8 @@ export default class ProfitLossMR extends Component { ...@@ -1218,8 +1269,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(1)} value={Number(tableMeta.rowData[9]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[9]), 1) : Number(tableMeta.rowData[9])}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1238,9 +1289,9 @@ export default class ProfitLossMR extends Component { ...@@ -1238,9 +1289,9 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[10]).toFixed(1)} value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[10]), 1)}
// decimalScale={1} // decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
tableMeta.rowData[0] === 3 ? tableMeta.rowData[0] === 3 ?
...@@ -1255,9 +1306,8 @@ export default class ProfitLossMR extends Component { ...@@ -1255,9 +1306,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
value={Number(tableMeta.rowData[10]).toFixed(1)} value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[10]), 1) : Number(tableMeta.rowData[10])}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
fixedDecimalScale={1}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, "actual") handleChange(event.target.value, tableMeta, "actual")
}} }}
...@@ -1273,8 +1323,8 @@ export default class ProfitLossMR extends Component { ...@@ -1273,8 +1323,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(handleValue(value, tableMeta)).toFixed(1)} value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValue(value, tableMeta)), 1) : Number(handleValue(value, tableMeta))}
// value={Number(handleValue(tableMeta, 2)).toFixed(1)} // value={Number(handleValue(tableMeta, 2)).toFixed(1)}
/> />
</span> : </span> :
...@@ -1283,7 +1333,7 @@ export default class ProfitLossMR extends Component { ...@@ -1283,7 +1333,7 @@ export default class ProfitLossMR extends Component {
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={tableMeta.rowData[10]} value={tableMeta.rowData[10]}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
...@@ -1291,7 +1341,7 @@ export default class ProfitLossMR extends Component { ...@@ -1291,7 +1341,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleFormula(value, tableMeta, 2)).toFixed(1)} value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormula(value, tableMeta, 2)), 1) : Number(handleFormula(value, tableMeta, 2))}
/> />
} }
/> />
...@@ -1307,8 +1357,8 @@ export default class ProfitLossMR extends Component { ...@@ -1307,8 +1357,8 @@ export default class ProfitLossMR extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
value={Number(tableMeta.rowData[10]).toFixed(1)} value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[10]), 1) : Number(tableMeta.rowData[10])}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1355,8 +1405,8 @@ export default class ProfitLossMR extends Component { ...@@ -1355,8 +1405,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[23]).toFixed(1)} value={Number(tableMeta.rowData[23]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[23]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1370,8 +1420,8 @@ export default class ProfitLossMR extends Component { ...@@ -1370,8 +1420,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTotal(tableMeta.rowData[11], tableMeta)).toFixed(1)} value={Number(handleTotal(tableMeta.rowData[11], tableMeta)) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleTotal(tableMeta.rowData[11], tableMeta)), 1) : Number(handleTotal(tableMeta.rowData[11], tableMeta))}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1403,8 +1453,8 @@ export default class ProfitLossMR extends Component { ...@@ -1403,8 +1453,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(1)} value={Number(tableMeta.rowData[12]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[12]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1418,8 +1468,8 @@ export default class ProfitLossMR extends Component { ...@@ -1418,8 +1468,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(1)} value={Number(tableMeta.rowData[12]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[12]), 1) : Number(tableMeta.rowData[12])}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1504,8 +1554,8 @@ export default class ProfitLossMR extends Component { ...@@ -1504,8 +1554,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[13]).toFixed(1)} value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[13]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1519,8 +1569,9 @@ export default class ProfitLossMR extends Component { ...@@ -1519,8 +1569,9 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleVariance(tableMeta, 1, 0)).toFixed(1)} value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : fixNumber(Number(handleVariance(tableMeta, 1, 0)), 1)}
decimalScale={1} // value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 1, 0)), 1) : Number(handleVariance(tableMeta, 1, 0))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1541,8 +1592,8 @@ export default class ProfitLossMR extends Component { ...@@ -1541,8 +1592,8 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[14]).toFixed(1)} value={Number(tableMeta.rowData[14]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[14]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1557,8 +1608,9 @@ export default class ProfitLossMR extends Component { ...@@ -1557,8 +1608,9 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(handleVariancePercent(tableMeta, 1, 1)).toFixed(1)} value={Number(tableMeta.rowData[14]) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 1, 1)), 1)}
decimalScale={1} // value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariancePercent(tableMeta, 1, 1)), 1) : Number(handleVariancePercent(tableMeta, 1, 1))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
// value={11} // value={11}
/> />
} }
...@@ -1583,8 +1635,8 @@ export default class ProfitLossMR extends Component { ...@@ -1583,8 +1635,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[15]).toFixed(1)} value={Number(tableMeta.rowData[15]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[15]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1598,8 +1650,9 @@ export default class ProfitLossMR extends Component { ...@@ -1598,8 +1650,9 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleVariance(tableMeta, 2, 2)).toFixed(1)} value={Number(tableMeta.rowData[15]) == 0 ? "0.0" : fixNumber(Number(handleVariance(tableMeta, 2, 2)), 1)}
decimalScale={1} // value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 2, 2)), 1) : Number(handleVariance(tableMeta, 2, 2))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1620,8 +1673,8 @@ export default class ProfitLossMR extends Component { ...@@ -1620,8 +1673,8 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]).toFixed(1)} value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[16]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1636,8 +1689,9 @@ export default class ProfitLossMR extends Component { ...@@ -1636,8 +1689,9 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleVariancePercent(tableMeta, 2, 3)).toFixed(1)} value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1)}
decimalScale={1} // value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1) : Number(handleVariancePercent(tableMeta, 2, 3))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1661,8 +1715,8 @@ export default class ProfitLossMR extends Component { ...@@ -1661,8 +1715,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[17]).toFixed(1)} value={Number(tableMeta.rowData[17]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[17]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1676,8 +1730,8 @@ export default class ProfitLossMR extends Component { ...@@ -1676,8 +1730,8 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleVariance(tableMeta, 3, 4)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 3, 4)), 1) : Number(handleVariance(tableMeta, 3, 4))}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -1698,8 +1752,8 @@ export default class ProfitLossMR extends Component { ...@@ -1698,8 +1752,8 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(1)} value={Number(tableMeta.rowData[18]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[18]), 1)}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
...@@ -1715,8 +1769,8 @@ export default class ProfitLossMR extends Component { ...@@ -1715,8 +1769,8 @@ export default class ProfitLossMR extends Component {
style={{ color: Number(tableMeta.rowData[18]).toFixed(1) < this.state.minValue || Number(tableMeta.rowData[18]).toFixed(1) > this.state.maxValue ? 'red' : '#000000b0', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: Number(tableMeta.rowData[18]).toFixed(1) < this.state.minValue || Number(tableMeta.rowData[18]).toFixed(1) > this.state.maxValue ? 'red' : '#000000b0', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(handleVariancePercent(tableMeta, 3, 5)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariancePercent(tableMeta, 3, 5)), 1) : Number(handleVariancePercent(tableMeta, 3, 5))}
decimalScale={1} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
/> />
...@@ -2141,6 +2195,7 @@ export default class ProfitLossMR extends Component { ...@@ -2141,6 +2195,7 @@ export default class ProfitLossMR extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
)} )}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ 52c536f2
...@@ -11,7 +11,7 @@ import { ExcelRenderer } from 'react-excel-renderer'; ...@@ -11,7 +11,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
import { Alert } from '@material-ui/lab'; import { Alert } from '@material-ui/lab';
import * as R from 'ramda'; import * as R from 'ramda';
import Constant from '../../library/Constant'; import Constant from '../../library/Constant';
import { roundMath } from '../../library/Utils'; import { fixNumber, roundMath } from '../../library/Utils';
const LightTooltip = withStyles((theme) => ({ const LightTooltip = withStyles((theme) => ({
tooltip: { tooltip: {
...@@ -301,16 +301,30 @@ export default class TaxPlanningMR extends Component { ...@@ -301,16 +301,30 @@ export default class TaxPlanningMR extends Component {
backToMonthlyReport(type) { backToMonthlyReport(type) {
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[4], item_report_id: i[4],
trial_balance_commercial: String(Number(i[9].tbc).toFixed(1)), trial_balance_commercial: String(Number(i[9].tbc)),
fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].fcp).toFixed(2)) : String(Number(i[9].fcp).toFixed(1)), fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].fcp)) : String(Number(i[9].fcp)),
trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].tbf).toFixed(2)) : String(Number(i[9].tbf).toFixed(1)), trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].tbf)) : String(Number(i[9].tbf)),
trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[10]).toFixed(2)) : String(Number(i[10]).toFixed(1)), trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[10])) : String(Number(i[10])),
trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[11]).toFixed(2)) : String(Number(i[11]).toFixed(1)) trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[11])) : String(Number(i[11]))
}) })
}) })
} else {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[4],
trial_balance_commercial: String(fixNumber(Number(i[9].tbc), 1)),
fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[9].fcp), 2)) : String(fixNumber(Number(i[9].fcp), 1)),
trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[9].tbf), 2)) : String(fixNumber(Number(i[9].tbf), 1)),
trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[10]), 2)) : String(fixNumber(Number(i[10]), 1)),
trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[11]), 2)) : String(fixNumber(Number(i[11]), 1))
})
})
}
let payload = { let payload = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -365,9 +379,9 @@ export default class TaxPlanningMR extends Component { ...@@ -365,9 +379,9 @@ export default class TaxPlanningMR extends Component {
order: i[0] === undefined ? "" : String(i[0]).trim(), order: i[0] === undefined ? "" : String(i[0]).trim(),
item_report_id: i[1] === undefined ? "" : String(i[1]).trim(), item_report_id: i[1] === undefined ? "" : String(i[1]).trim(),
item_report_name: i[2] === undefined ? "" : String(i[2]).trim(), item_report_name: i[2] === undefined ? "" : String(i[2]).trim(),
trial_balance_commercial: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(roundMath(Number(String(i[3]).trim()), 2)) : String(roundMath(Number(String(i[3]).trim()), 1)), trial_balance_commercial: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[3]).trim())) : String(Number(String(i[3]).trim())),
fiscal_correction: i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(roundMath(Number(String(i[4]).trim()), 2)) : String(roundMath(Number(String(i[4]).trim()), 1)), fiscal_correction: i[4] === undefined ? "0" : reg.test(String(i[4])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[4]).trim())) : String(Number(String(i[4]).trim())),
trial_balance_fiscal: i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(roundMath(Number(String(i[5]).trim()), 2)) : String(roundMath(Number(String(i[5]).trim()), 1)), trial_balance_fiscal: i[5] === undefined ? "0" : reg.test(String(i[5])) === false ? "0" : String(i[2]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(String(i[5]).trim())) : String(Number(String(i[5]).trim())),
trial_balance_fiscal_actual: "", trial_balance_fiscal_actual: "",
trial_balance_fiscal_mb: "", trial_balance_fiscal_mb: "",
}) })
...@@ -413,19 +427,20 @@ export default class TaxPlanningMR extends Component { ...@@ -413,19 +427,20 @@ export default class TaxPlanningMR extends Component {
item.item_report, item.item_report,
{ {
tbc: item.trial_balance_commercial === null ? "0.0" : item.trial_balance_commercial === "" ? "0.0" : item.trial_balance_commercial, tbc: item.trial_balance_commercial === null ? "0.0" : item.trial_balance_commercial === "" ? "0.0" : item.trial_balance_commercial,
fcp: item.fiscal_correction === null ? "0.0" : item.fiscal_correction === "" ? "0.0" : String(item.item_report).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(item.fiscal_correction).toFixed(2) : Number(item.fiscal_correction).toFixed(1), fcp: item.fiscal_correction === null ? "0.0" : item.fiscal_correction === "" ? "0.0" : Number(item.fiscal_correction),
tbf: item.trial_balance_fiscal === null ? "0.0" : item.trial_balance_fiscal === "" ? "0.0" : String(item.item_report).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(item.trial_balance_fiscal).toFixed(2) : Number(item.trial_balance_fiscal).toFixed(1), tbf: item.trial_balance_fiscal === null ? "0.0" : item.trial_balance_fiscal === "" ? "0.0" : Number(item.trial_balance_fiscal),
}, },
0, 0,
item.trial_balance_fiscal_mb === null ? "0.0" : item.trial_balance_fiscal_mb === "" ? "0.0" : String(item.item_report).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(item.trial_balance_fiscal_mb).toFixed(2) : Number(item.trial_balance_fiscal_mb).toFixed(1), item.trial_balance_fiscal_mb === null ? "0.0" : item.trial_balance_fiscal_mb === "" ? "0.0" : Number(item.trial_balance_fiscal_mb),
item.actual_formula, item.actual_formula,
item.orders, item.orders,
{ tbc: item.condition_it_should_be.tbc, fcp: item.condition_it_should_be.fcp, tbf: item.condition_it_should_be.tbf }, { tbc: item.condition_it_should_be.tbc, fcp: item.condition_it_should_be.fcp, tbf: item.condition_it_should_be.tbf },
{ tbc: item.condition_if_wrong.tbc, fcp: item.condition_if_wrong.fcp, tbf: item.condition_if_wrong.tbf }, { tbc: item.condition_if_wrong.tbc, fcp: item.condition_if_wrong.fcp, tbf: item.condition_if_wrong.tbf },
item.trial_balance_fiscal_actual === null ? "0.0" : item.trial_balance_fiscal_actual === "" ? "0.0" : String(item.item_report).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(item.trial_balance_fiscal_actual).toFixed(2) : Number(item.trial_balance_fiscal_actual).toFixed(1), item.trial_balance_fiscal_actual === null ? "0.0" : item.trial_balance_fiscal_actual === "" ? "0.0" : Number(item.trial_balance_fiscal_actual),
item.error item.error
] ]
}) })
console.log(dataTable);
this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, saveDraft: true }, () => { this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, saveDraft: true }, () => {
this.state.dataTable.map(item => { this.state.dataTable.map(item => {
if (item[17].length > 0) { if (item[17].length > 0) {
...@@ -451,16 +466,30 @@ export default class TaxPlanningMR extends Component { ...@@ -451,16 +466,30 @@ export default class TaxPlanningMR extends Component {
uploadTP(type) { uploadTP(type) {
let data = [] let data = []
if (this.props.defaultCurrency.id == 2) {
this.state.dataTable.map(i => {
data.push({
item_report_id: i[4],
trial_balance_commercial: String(Number(i[9].tbc)),
fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].fcp)) : String(Number(i[9].fcp)),
trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].tbf)) : String(Number(i[9].tbf)),
trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[10])) : String(Number(i[10])),
trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[11])) : String(Number(i[11]))
})
})
} else {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[4], item_report_id: i[4],
trial_balance_commercial: String(Number(i[9].tbc).toFixed(1)), trial_balance_commercial: String(fixNumber(Number(i[9].tbc), 1)),
fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].fcp).toFixed(2)) : String(Number(i[9].fcp).toFixed(1)), fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[9].fcp), 2)) : String(fixNumber(Number(i[9].fcp), 1)),
trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].tbf).toFixed(2)) : String(Number(i[9].tbf).toFixed(1)), trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[9].tbf), 2)) : String(fixNumber(Number(i[9].tbf), 1)),
trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[10]).toFixed(2)) : String(Number(i[10]).toFixed(1)), trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[10]), 2)) : String(fixNumber(Number(i[10]), 1)),
trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[11]).toFixed(2)) : String(Number(i[11]).toFixed(1)) trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[11]), 2)) : String(fixNumber(Number(i[11]), 1))
}) })
}) })
}
let body = { let body = {
"monthly_report_id": this.props.monthlyReportId, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
...@@ -520,14 +549,26 @@ export default class TaxPlanningMR extends Component { ...@@ -520,14 +549,26 @@ export default class TaxPlanningMR extends Component {
} }
} }
if (this.props.defaultCurrency.id == 2) {
data.push({ data.push({
item_report_id: i[4], item_report_id: i[4],
trial_balance_commercial: String(Number(i[9].tbc).toFixed(1)), trial_balance_commercial: String(Number(i[9].tbc)),
fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].fcp).toFixed(2)) : String(Number(i[9].fcp).toFixed(1)), fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].fcp)) : String(Number(i[9].fcp)),
trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].tbf).toFixed(2)) : String(Number(i[9].tbf).toFixed(1)), trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[9].tbf)) : String(Number(i[9].tbf)),
trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[10]).toFixed(2)) : String(Number(i[10]).toFixed(1)), trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[10])) : String(Number(i[10])),
trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[11]).toFixed(2)) : String(Number(i[11]).toFixed(1)) trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(Number(i[11])) : String(Number(i[11]))
}) })
} else {
data.push({
item_report_id: i[4],
trial_balance_commercial: String(fixNumber(Number(i[9].tbc), 1)),
fiscal_correction: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[9].fcp), 2)) : String(fixNumber(Number(i[9].fcp), 1)),
trial_balance_fiscal: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[9].tbf), 2)) : String(fixNumber(Number(i[9].tbf), 1)),
trial_balance_fiscal_actual: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[10]), 2)) : String(fixNumber(Number(i[10]), 1)),
trial_balance_fiscal_mb: String(i[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? String(fixNumber(Number(i[11]), 2)) : String(fixNumber(Number(i[11]), 1))
})
}
}) })
// this.setState({ loading: false, buttonError: errorContrl, editable: editAble, saveDraft: false }) // this.setState({ loading: false, buttonError: errorContrl, editable: editAble, saveDraft: false })
console.log(errorContrl) console.log(errorContrl)
...@@ -782,38 +823,38 @@ export default class TaxPlanningMR extends Component { ...@@ -782,38 +823,38 @@ export default class TaxPlanningMR extends Component {
if (dex == 1) { if (dex == 1) {
if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value == undefined) { if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value == undefined) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} }
} else if (dex == 2) { } else if (dex == 2) {
if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value == undefined) { if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value == undefined) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} }
} else if (dex == 3) { } else if (dex == 3) {
if (tableMeta.rowData[8] == "Corporate Income Tax") { if (tableMeta.rowData[8] == "Corporate Income Tax") {
if (total < 0) { if (total < 0) {
total = 0 total = 0
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 2) : Number(total)
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(2) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 2) : Number(total)
} }
} else if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) { } else if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} }
} else { } else {
if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) { if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} else { } else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} }
} }
return tableMeta.rowData[8] == "Corporate Income Tax" ? Number(total).toFixed(2) : Number(total).toFixed(1) return tableMeta.rowData[8] == "Corporate Income Tax" ? this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 2) : Number(total) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(total), 1) : Number(total)
} }
const handleChange = (value, tableMeta, indexChilds) => { const handleChange = (value, tableMeta, indexChilds) => {
...@@ -856,6 +897,7 @@ export default class TaxPlanningMR extends Component { ...@@ -856,6 +897,7 @@ export default class TaxPlanningMR extends Component {
const handleParent = (tableMeta, type) => { const handleParent = (tableMeta, type) => {
let total = 0 let total = 0
console.log("tes parent");
dataTable2.map((item, index) => { dataTable2.map((item, index) => {
if (item[5] == tableMeta.rowData[4]) { if (item[5] == tableMeta.rowData[4]) {
total += Number(type == 1 ? total += Number(type == 1 ?
...@@ -1001,7 +1043,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1001,7 +1043,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.tbc).toFixed(2) : Number(value.tbc).toFixed(1)} value={Number(value.tbc) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.tbc), 2) : fixNumber(Number(value.tbc), 1)}
/> />
} }
/> />
...@@ -1015,7 +1057,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1015,7 +1057,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleParent(tableMeta, 1)).toFixed(1)} value={Number(value.tbc) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 1)), 1) : Number(handleParent(tableMeta, 1))}
/> />
</span> </span>
: :
...@@ -1032,7 +1074,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1032,7 +1074,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="input" placeholder="input"
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
value={Number(value.tbc).toFixed(1)} value={Number(value.tbc) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value.tbc), 1) : Number(value.tbc)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 0) handleChange(event.target.value, tableMeta, 0)
// console.log(dataTable2) // console.log(dataTable2)
...@@ -1054,7 +1096,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1054,7 +1096,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta, 1)).toFixed(1)} value={Number(value.tbc) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 1)), 1) : Number(handleValueFormula(value, tableMeta, 1))}
/> />
} }
/> />
...@@ -1081,7 +1123,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1081,7 +1123,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)} value={Number(value.fcp) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.fcp), 2) : fixNumber(Number(value.fcp), 1)}
/> />
} }
/> />
...@@ -1095,7 +1137,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1095,7 +1137,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleParent(tableMeta, 2)).toFixed(1)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 2)), 1) : Number(handleParent(tableMeta, 2))}
/> />
</span> </span>
: :
...@@ -1111,7 +1153,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1111,7 +1153,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
placeholder="input" placeholder="input"
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp).toFixed(2) : Number(value.fcp).toFixed(1)} value={Number(value.fcp) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.fcp), 2) : fixNumber(Number(value.fcp), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp) : Number(value.fcp))}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 1) handleChange(event.target.value, tableMeta, 1)
// console.log(dataTable2) // console.log(dataTable2)
...@@ -1133,7 +1175,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1133,7 +1175,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta, 2)).toFixed(1)} value={Number(value.fcp) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 2)), 1) : Number(handleValueFormula(value, tableMeta, 2))}
/> />
} }
/> />
...@@ -1159,7 +1201,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1159,7 +1201,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.tbf).toFixed(2) : Number(value.tbf).toFixed(1)} value={Number(value.tbf) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.tbf), 2) : fixNumber(Number(value.tbf), 1)}
/> />
} }
/> />
...@@ -1173,7 +1215,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1173,7 +1215,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleParent(tableMeta, 3)).toFixed(1)} value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 3)), 1) : Number(handleParent(tableMeta, 3))}
/> />
</span> </span>
: :
...@@ -1189,7 +1231,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1189,7 +1231,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
placeholder="input" placeholder="input"
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.tbf).toFixed(2) : Number(value.tbf).toFixed(1)} value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.tbf), 2) : fixNumber(Number(value.tbf), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.tbf) : Number(value.tbf))}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 2) handleChange(event.target.value, tableMeta, 2)
// console.log(dataTable2) // console.log(dataTable2)
...@@ -1211,14 +1253,51 @@ export default class TaxPlanningMR extends Component { ...@@ -1211,14 +1253,51 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleValueFormula(value, tableMeta, 3)).toFixed(2) : Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 2) : fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleValueFormula(value, tableMeta, 3)) : Number(handleValueFormula(value, tableMeta, 3)))}
/> />
} }
/> />
</div> </div>
: :
tableMeta.rowData[3] === 7 ? tableMeta.rowData[3] === 7 ?
(Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(value, tableMeta, 3)).toFixed(1) <= Number(this.state.maxValue)) ? this.props.defaultCurrency.id == 1 ?
(fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) >= Number(this.state.minValue) && fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) <= Number(this.state.maxValue)) ?
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'black'
}}
type="text"
placeholder=""
disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))}
/> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat
thousandSeparator={true}
style={{
fontSize: 12,
textAlign: 'right',
borderColor: 'transparent',
margin: 0,
width: 96,
backgroundColor: 'transparent',
color: 'red'
}}
type="text"
placeholder=""
disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))}
/>
</LightTooltip>
:
(Number(handleValueFormula(value, tableMeta, 3)) >= Number(this.state.minValue) && Number(handleValueFormula(value, tableMeta, 3)) <= Number(this.state.maxValue)) ?
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ style={{
...@@ -1233,7 +1312,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1233,7 +1312,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -1250,7 +1329,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1250,7 +1329,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -1295,7 +1374,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1295,7 +1374,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(tableMeta.rowData[16]).toFixed(2) : Number(tableMeta.rowData[16]).toFixed(1)} value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(tableMeta.rowData[16]), 2) : fixNumber(Number(tableMeta.rowData[16]), 1)}
/> />
} }
/> />
...@@ -1309,7 +1388,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1309,7 +1388,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleParent(tableMeta, 4)).toFixed(1)} value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 4)), 1) : Number(handleParent(tableMeta, 4))}
/> />
</span> </span>
: :
...@@ -1330,7 +1409,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1330,7 +1409,7 @@ export default class TaxPlanningMR extends Component {
// type="text" // type="text"
// placeholder="" // placeholder=""
// disabled={true} // disabled={true}
// // value={Number(handleValueFormula(value, tableMeta, 3)).toFixed(1)} // // value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))}
// value={Number(value).toFixed(1)} // value={Number(value).toFixed(1)}
// /> : // /> :
// <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> // <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
...@@ -1364,7 +1443,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1364,7 +1443,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleTotal(value, tableMeta, 4)).toFixed(2) : Number(handleTotal(value, tableMeta, 4)).toFixed(1)} value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleTotal(value, tableMeta, 4)), 2) : fixNumber(Number(handleTotal(value, tableMeta, 4)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleTotal(value, tableMeta, 4)) : Number(handleTotal(value, tableMeta, 4)))}
/> />
} }
/> />
...@@ -1408,7 +1487,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1408,7 +1487,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(tableMeta.rowData[11]).toFixed(2) : Number(tableMeta.rowData[11]).toFixed(1)} value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(tableMeta.rowData[11]), 2) : fixNumber(Number(tableMeta.rowData[11]), 1)}
/> />
} }
/> />
...@@ -1422,7 +1501,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1422,7 +1501,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleParent(tableMeta, 4)).toFixed(1)} value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 4)), 1) : Number(handleParent(tableMeta, 4))}
/> />
</span> </span>
: :
...@@ -1437,7 +1516,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1437,7 +1516,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value).toFixed(2) : Number(value).toFixed(1)} value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value), 2) : fixNumber(Number(value), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value) : Number(value))}
/> />
} }
/> />
...@@ -1606,6 +1685,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1606,6 +1685,7 @@ export default class TaxPlanningMR extends Component {
options={options} options={options}
/> />
</MuiThemeProvider>} </MuiThemeProvider>}
{this.state.get_for == 'view' && this.state.viewOnly && <div style={{ color: '#000', marginTop: 10, fontSize: 12 }}>(*) There may be discrepancies in amount due to rounding</div>}
{/* )} */} {/* )} */}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
......
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