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
e67c5070
Commit
e67c5070
authored
Jun 23, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GGMAC' into 'master'
update See merge request
!1532
parents
0417ffcb
430b6820
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
26 deletions
+58
-26
index.js
src/api/index.js
+7
-1
TableSubHolding.js
src/container/Laporan/TableSubHolding.js
+42
-17
ListOfCreditFacilities.js
src/container/MonthlyReport/ListOfCreditFacilities.js
+9
-8
No files found.
src/api/index.js
View file @
e67c5070
...
...
@@ -441,6 +441,10 @@ const create = (type = "") => {
const
getHierarkiCronJobMRCF
=
()
=>
api
.
get
(
'/transaction/report/get_hierarki_monthly_report/cash_flow'
)
const
getHierarkiCronJobMRRatio
=
()
=>
api
.
get
(
'/transaction/report/get_hierarki_monthly_report/ratio'
)
// Ratio X LOCF
const
getRatioLOCF
=
(
body
)
=>
api
.
get
(
`/transaction/cronjob/create_monthly_report/
${
body
.
report
}
/
${
body
.
monthlyReportId
}
/
${
body
.
companyId
}
/
${
body
.
months
}
/
${
body
.
periode
}
`
)
const
triggerRatioFromLOCF
=
(
body
)
=>
api
.
get
(
`/transaction/cronjob/create_monthly_report_locf/
${
body
.
report
}
/
${
body
.
monthlyReportId
}
/
${
body
.
companyId
}
/
${
body
.
months
}
/
${
body
.
periode
}
`
)
// MonthlyPL
// const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
// const createMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/create_monthly_report', body)
...
...
@@ -807,7 +811,9 @@ const create = (type = "") => {
getHierarkiDBPLRO
,
createDBPLRO
,
getDetailReportOLPACAT
,
createCATOLPA
createCATOLPA
,
getRatioLOCF
,
triggerRatioFromLOCF
}
}
...
...
src/container/Laporan/TableSubHolding.js
View file @
e67c5070
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @
e67c5070
...
...
@@ -173,6 +173,7 @@ export default class ListOfCreditFacilities extends Component {
}
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
&&
checkPrevRev
})
// this.setState({viewOnly: true})
}
getItemHierarki
()
{
...
...
@@ -757,7 +758,7 @@ export default class ListOfCreditFacilities extends Component {
if
(
response
.
data
)
{
if
(
response
.
ok
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
props
.
saveToMonthlyReport
()
this
.
props
.
saveToMonthlyReport
(
'LOCF'
)
// this.props.onClickClose()
// this.props.getReport()
}
else
{
...
...
@@ -961,13 +962,13 @@ export default class ListOfCreditFacilities extends Component {
getDataRatio
()
{
let
payload
=
{
"report
_id"
:
this
.
props
.
report_id
,
"
revision"
:
this
.
props
.
revision
,
"periode"
:
2021
,
"company
_i
d"
:
this
.
props
.
company
.
company_id
,
"
submission_id"
:
this
.
state
.
submissionID
"report
"
:
'ratio'
,
"
monthlyReportId"
:
this
.
props
.
monthlyReportId
,
"periode"
:
this
.
props
.
periode
,
"company
I
d"
:
this
.
props
.
company
.
company_id
,
"
months"
:
this
.
props
.
month
.
month_id
}
api
.
create
().
getR
eportHierarkiFRMR
(
payload
).
then
(
response
=>
{
api
.
create
().
getR
atioLOCF
(
payload
).
then
(
response
=>
{
console
.
log
(
payload
);
console
.
log
(
response
);
let
dataTable
=
[]
...
...
@@ -1153,7 +1154,7 @@ export default class ListOfCreditFacilities extends Component {
console
.
log
(
response
);
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
props
.
saveToMonthlyReport
()
this
.
props
.
saveToMonthlyReport
(
'LOCF'
)
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
,
loading
:
false
},
()
=>
{
document
.
body
.
style
.
overflow
=
'unset'
;
...
...
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