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
5087ad5d
Commit
5087ad5d
authored
Jun 18, 2021
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'riri' into 'master'
Riri See merge request
!1522
parents
1c488e3e
f5210e5b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+7
-7
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+4
-4
No files found.
src/container/MonthlyReport/BalanceSheetMR.js
View file @
5087ad5d
...
...
@@ -759,7 +759,7 @@ export default class BalanceSheetMR extends Component {
if
(
dex
===
1
)
{
let
selisih
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
11
])
let
prevMonth
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
10
])
let
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
...
...
@@ -776,7 +776,7 @@ export default class BalanceSheetMR extends Component {
}
else
if
(
dex
===
2
)
{
let
selisih
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
13
])
let
prevMonth
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
7
])
let
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
...
...
@@ -788,16 +788,16 @@ export default class BalanceSheetMR extends Component {
}
else
if
(
dex
===
3
)
{
let
selisih
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
15
])
let
prevMonth
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
8
])
let
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
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
+
type
]
=
String
(
selisih
).
includes
(
'-'
)
?
Number
(
total
*
-
1
).
toFixed
(
1
)
:
Number
(
total
).
toFixed
(
1
)
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
)
//
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)
// console.log(total);
}
return
total
...
...
@@ -2713,7 +2713,7 @@ export default class BalanceSheetMR extends Component {
<
div
className
=
"col-2"
>
<
/div>
:
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
,
paddingRight
:
5
}}
>
{
this
.
state
.
get_for
==
'view'
&&
this
.
state
.
viewOnly
&&
<
button
{
this
.
state
.
get_for
==
'view'
&&
<
button
className
=
"button"
type
=
"button"
style
=
{{
...
...
src/container/MonthlyReport/ProfitLossMR.js
View file @
5087ad5d
...
...
@@ -817,7 +817,7 @@ export default class ProfitLossMR extends Component {
if
(
dex
===
1
)
{
let
selisih
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
13
])
let
prevMonth
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
12
])
let
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
...
...
@@ -834,7 +834,7 @@ export default class ProfitLossMR extends Component {
}
else
if
(
dex
===
2
)
{
let
selisih
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
15
])
let
prevMonth
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
8
])
let
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
...
...
@@ -847,7 +847,7 @@ export default class ProfitLossMR extends Component {
}
else
if
(
dex
===
3
)
{
let
selisih
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
17
])
let
prevMonth
=
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
9
])
let
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
...
...
@@ -2145,7 +2145,7 @@ export default class ProfitLossMR extends Component {
<
div
className
=
"col-2"
>
<
/div>
:
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
,
paddingRight
:
5
}}
>
{
this
.
state
.
get_for
==
'view'
&&
this
.
state
.
viewOnly
&&
{
this
.
state
.
get_for
==
'view'
&&
<
button
className
=
"button"
type
=
"button"
...
...
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