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
d98bcdfc
Commit
d98bcdfc
authored
Jun 18, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update pl bs
parent
02bdf788
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+4
-3
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+10
-5
No files found.
src/container/MonthlyReport/BalanceSheetMR.js
View file @
d98bcdfc
...
...
@@ -97,6 +97,7 @@ export default class BalanceSheetMR extends Component {
}
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
// this.setState({viewOnly: true})
}
getLatestUpdate
()
{
...
...
@@ -762,7 +763,7 @@ export default class BalanceSheetMR extends Component {
total
=
R
.
equals
(
selisih
/
prevMonth
,
0
)
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
'-Infinity'
)
?
0
:
(
selisih
/
prevMonth
)
*
100
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
)
?
0
:
(
selisih
/
prevMonth
)
*
100
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
...
...
@@ -779,7 +780,7 @@ export default class BalanceSheetMR extends Component {
total
=
R
.
equals
(
selisih
/
prevMonth
,
0
)
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
'-Infinity'
)
?
0
:
(
selisih
/
prevMonth
)
*
100
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
)
?
0
:
(
selisih
/
prevMonth
)
*
100
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
...
...
@@ -791,7 +792,7 @@ export default class BalanceSheetMR extends Component {
total
=
R
.
equals
(
selisih
/
prevMonth
,
0
)
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
'-Infinity'
)
?
0
:
(
selisih
/
prevMonth
)
*
100
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
)
?
0
:
(
selisih
/
prevMonth
)
*
100
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
...
...
src/container/MonthlyReport/ProfitLossMR.js
View file @
d98bcdfc
...
...
@@ -817,11 +817,16 @@ export default class ProfitLossMR extends Component {
if
(
dex
===
1
)
{
let
selisih
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
13
])
let
prevMonth
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
12
])
total
=
R
.
equals
(
selisih
/
prevMonth
,
0
)
total
=
(
R
.
equals
(
selisih
/
prevMonth
,
0
)
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
'-Infinity'
)
?
0
:
(
selisih
/
prevMonth
)
*
100
||
R
.
equals
(
selisih
/
prevMonth
,
-
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 = Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])
// total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) /
...
...
@@ -837,7 +842,7 @@ export default class ProfitLossMR extends Component {
total
=
R
.
equals
(
selisih
/
prevMonth
,
0
)
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
'-Infinity'
)
?
0
:
(
selisih
/
prevMonth
)
*
100
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
)
?
0
:
(
selisih
/
prevMonth
)
*
100
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
...
...
@@ -850,7 +855,7 @@ export default class ProfitLossMR extends Component {
total
=
R
.
equals
(
selisih
/
prevMonth
,
0
)
||
R
.
equals
(
selisih
/
prevMonth
,
NaN
)
||
R
.
equals
(
selisih
/
prevMonth
,
Infinity
)
||
R
.
equals
(
selisih
/
prevMonth
,
'-Infinity'
)
?
0
:
(
selisih
/
prevMonth
)
*
100
||
R
.
equals
(
selisih
/
prevMonth
,
-
Infinity
)
?
0
:
(
selisih
/
prevMonth
)
*
100
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
// total = Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])
...
...
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