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
cacee229
Commit
cacee229
authored
Feb 01, 2021
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
03f4655b
da6b4f59
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
278 additions
and
193 deletions
+278
-193
index.js
src/api/index.js
+3
-1
SubHolding.js
src/container/Laporan/SubHolding.js
+24
-2
SummaryOfTriputra.js
src/container/SummaryTriputra/SummaryOfTriputra.js
+251
-190
No files found.
src/api/index.js
View file @
cacee229
...
@@ -264,6 +264,7 @@ const create = (type = "") => {
...
@@ -264,6 +264,7 @@ const create = (type = "") => {
const
getReportFRLastMR
=
(
body
)
=>
api
.
post
(
'/transaction/summary_ratio/monthly_report_last_year/get_report_hierarki'
,
body
)
const
getReportFRLastMR
=
(
body
)
=>
api
.
post
(
'/transaction/summary_ratio/monthly_report_last_year/get_report_hierarki'
,
body
)
const
getReportBSSuma
=
(
body
)
=>
api
.
post
(
'/transaction/summary_balance_sheet/summary/get_report_hierarki'
,
body
)
const
getReportBSSuma
=
(
body
)
=>
api
.
post
(
'/transaction/summary_balance_sheet/summary/get_report_hierarki'
,
body
)
const
getDashboardCAT
=
(
body
)
=>
api
.
post
(
'/dashboard/cat'
,
body
)
const
getDashboardCAT
=
(
body
)
=>
api
.
post
(
'/dashboard/cat'
,
body
)
const
getHierarkiReportHistorical
=
(
body
)
=>
api
.
post
(
'/transaction/historical/get_historical_hierarki'
,
body
)
//CASH FLOW
//CASH FLOW
const
getDetailReportCF
=
(
body
)
=>
api
.
post
(
'/transaction/cash_flow/master_budget/get_report_hierarki'
,
body
)
const
getDetailReportCF
=
(
body
)
=>
api
.
post
(
'/transaction/cash_flow/master_budget/get_report_hierarki'
,
body
)
...
@@ -635,7 +636,8 @@ const create = (type = "") => {
...
@@ -635,7 +636,8 @@ const create = (type = "") => {
getHierarkiCreateReportPLMR
,
getHierarkiCreateReportPLMR
,
createReportPLMB
,
createReportPLMB
,
createReportPLMR
,
createReportPLMR
,
getPLID
getPLID
,
getHierarkiReportHistorical
}
}
}
}
...
...
src/container/Laporan/SubHolding.js
View file @
cacee229
...
@@ -1351,11 +1351,33 @@ export default class SubHolding extends Component {
...
@@ -1351,11 +1351,33 @@ export default class SubHolding extends Component {
let
quarter_actual
=
item
.
cash_flow
.
quarter_actual
==
''
?
0
:
item
.
cash_flow
.
quarter_actual
let
quarter_actual
=
item
.
cash_flow
.
quarter_actual
==
''
?
0
:
item
.
cash_flow
.
quarter_actual
let
quarter
=
item
.
cash_flow
.
quarter
==
''
?
0
:
item
.
cash_flow
.
quarter
let
quarter
=
item
.
cash_flow
.
quarter
==
''
?
0
:
item
.
cash_flow
.
quarter
let
persenQuarter
=
Number
(
quarter_actual
/
quarter
)
// let persenQuarter = Number(quarter_actual / quarter)
let
persenQuarter
=
0
if
(
quarter
<
0
)
{
if
(
quarter_actual
>=
quarter
)
{
persenQuarter
=
(
quarter
-
quarter_actual
)
/
quarter
+
1
}
else
{
persenQuarter
=
(
quarter
-
quarter_actual
)
/
quarter
}
}
else
{
persenQuarter
=
quarter_actual
/
quarter
}
let
fy_actual
=
item
.
cash_flow
.
fy_actual
==
''
?
0
:
item
.
cash_flow
.
fy_actual
let
fy_actual
=
item
.
cash_flow
.
fy_actual
==
''
?
0
:
item
.
cash_flow
.
fy_actual
let
fy
=
item
.
cash_flow
.
fy
==
''
?
0
:
item
.
cash_flow
.
fy
let
fy
=
item
.
cash_flow
.
fy
==
''
?
0
:
item
.
cash_flow
.
fy
let
persenFy
=
Number
(
fy_actual
/
fy
)
// let persenFy = Number(fy_actual / fy)
let
persenFy
=
0
if
(
fy
<
0
)
{
if
(
fy_actual
>=
fy
)
{
persenFy
=
(
fy
-
fy_actual
)
/
fy
+
1
}
else
{
persenFy
=
(
fy
-
fy_actual
)
/
fy
}
}
else
{
persenFy
=
fy_actual
/
fy
}
dbSumaCF
.
push
([
dbSumaCF
.
push
([
item
.
id
,
item
.
id
,
...
...
src/container/SummaryTriputra/SummaryOfTriputra.js
View file @
cacee229
This diff is collapsed.
Click to expand it.
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