Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
e2ebac6c
Commit
e2ebac6c
authored
Jun 18, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GGMAC' into 'master'
push pl bs See merge request
!1525
parents
19c6ea3f
c8adf3ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
14 deletions
+26
-14
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+10
-5
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+16
-9
No files found.
src/container/MonthlyReport/BalanceSheetMR.js
View file @
e2ebac6c
...
...
@@ -765,7 +765,10 @@ export default class BalanceSheetMR extends Component {
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
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) : Number(total).toFixed(1)
total
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
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)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
...
...
@@ -782,8 +785,9 @@ export default class BalanceSheetMR extends Component {
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
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) : Number(total).toFixed(1)
total
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
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)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
}
else
if
(
dex
===
3
)
{
...
...
@@ -794,8 +798,9 @@ export default class BalanceSheetMR extends Component {
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
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) : Number(total).toFixed(1)
total
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
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((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)
...
...
src/container/MonthlyReport/ProfitLossMR.js
View file @
e2ebac6c
...
...
@@ -137,7 +137,7 @@ export default class ProfitLossMR extends Component {
}
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
// this.setState({
viewOnly: true
})
// this.setState({
viewOnly: true
})
}
handleGetFor
(
type
)
{
...
...
@@ -822,12 +822,14 @@ export default class ProfitLossMR extends Component {
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
))
?
0
:
(
selisih
/
prevMonth
)
*
100
// if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'interest expenses - affiliated/shareholders') {
// console.log(selisih)
// console.log(prevMonth)
// console.log(total)
// }
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
// }'
total
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
total
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
// total = Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) /
// Number(dataTable2[tableMeta.rowIndex][12])) * 100), NaN) ? '0' :
...
...
@@ -843,9 +845,14 @@ export default class ProfitLossMR extends Component {
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
)
?
0
:
(
selisih
/
prevMonth
)
*
100
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
total
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
total
// if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'corporate income tax') {
// console.log(String(selisih).includes('-'))
// console.log(selisih)
// console.log(prevMonth)
// console.log(total)
// }
// total = 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)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
...
...
@@ -856,8 +863,8 @@ export default class ProfitLossMR extends Component {
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
)
?
0
:
(
selisih
/
prevMonth
)
*
100
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
total
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
total
// total = Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100)
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment