Skip to content

T
Tia-dev
Commit 7033beb3 authored by rifkaki's avatar rifkaki
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

parents 09b41b04 cbe17f11
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 170 deletions
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 7033beb3
...@@ -951,17 +951,17 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -951,17 +951,17 @@ export default class FixedAssetsMovementMR extends Component {
} }
/> />
: :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? // tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> // <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(handleValueFormula(tableMeta, 9)).toFixed(1)} // value={Number(handleValueFormula(tableMeta, 9)).toFixed(1)}
/> // />
</span> : // </span> :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 7033beb3
...@@ -779,21 +779,26 @@ export default class ProfitLossMR extends Component { ...@@ -779,21 +779,26 @@ export default class ProfitLossMR extends Component {
} }
const handleTotal = (value, tableMeta) => { const handleTotal = (value, tableMeta) => {
// console.log(tableMeta)
let total = 0 let total = 0
if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "sales price") { // if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "sales price") {
let value = Number(dataTable2[tableMeta.rowIndex - 2][11]) / Number(dataTable2[tableMeta.rowIndex - 1][11]) // let value = Number(dataTable2[tableMeta.rowIndex - 2][11]) / Number(dataTable2[tableMeta.rowIndex - 1][11])
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].map((item, index) => { // dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index == 10) { // if (index == 10) {
let itemActual = item == undefined || item == "" || item == "undefined" ? 0.0 : item // let itemActual = item == undefined || item == "" || item == "undefined" ? 0.0 : item
total = Number(tableMeta.rowData[23]) + Number(itemActual) // total = Number(tableMeta.rowData[23]) + Number(itemActual)
} // }
}) // })
} // }
dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index == 10) {
let itemActual = item == undefined || item == "" || item == "undefined" ? 0.0 : item
total = Number(tableMeta.rowData[23]) + Number(itemActual)
}
})
dataTable2[tableMeta.rowIndex][11] = Number(total).toFixed(1) dataTable2[tableMeta.rowIndex][11] = Number(total).toFixed(1)
return total return total
...@@ -941,7 +946,7 @@ export default class ProfitLossMR extends Component { ...@@ -941,7 +946,7 @@ 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]).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 6 ? tableMeta.rowData[0] === 6 ?
...@@ -973,7 +978,7 @@ export default class ProfitLossMR extends Component { ...@@ -973,7 +978,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(val).toFixed(1)} value={Number(tableMeta.rowData[7]).toFixed(1)}
/> />
} }
/> />
...@@ -1265,36 +1270,36 @@ export default class ProfitLossMR extends Component { ...@@ -1265,36 +1270,36 @@ export default class ProfitLossMR extends Component {
value={Number(tableMeta.rowData[11]).toFixed(1) } value={Number(tableMeta.rowData[11]).toFixed(1) }
/> />
: :
tableMeta.rowData[0] === 2 ? // tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> // <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(handleValue(tableMeta, 0)).toFixed(1)} // value={Number(handleValue(tableMeta, 0)).toFixed(1)}
/> // />
</span> // </span>
: // :
tableMeta.rowData[0] === 6 ? // tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}> // <div style={{ flex: 1 }}>
<FormControlLabel // <FormControlLabel
style={{ margin: 0 }} // style={{ margin: 0 }}
value={Number(tableMeta.rowData[11]).toFixed(1)} // value={Number(tableMeta.rowData[11]).toFixed(1)}
control={ // control={
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(handleFormula(val, tableMeta, 0)).toFixed(1)} // value={Number(handleFormula(val, tableMeta, 0)).toFixed(1)}
/> // />
} // }
/> // />
</div> // </div>
: // :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
......
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