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
e124bc09
Commit
e124bc09
authored
Jan 06, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
Didam See merge request
!904
parents
4baee212
022d0081
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
204 additions
and
114 deletions
+204
-114
index.js
src/api/index.js
+5
-5
CorporateAnnualTarget.js
src/container/BudgetTahunan/CorporateAnnualTarget.js
+22
-14
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+52
-4
ListOfCreditFacilities.js
src/container/MonthlyReport/ListOfCreditFacilities.js
+125
-91
No files found.
src/api/index.js
View file @
e124bc09
...
...
@@ -263,7 +263,7 @@ const create = (type = "") => {
const
getLastestUpdateMR
=
(
body
)
=>
api
.
post
(
'/transaction/monthly_report/get_latest_update'
,
body
)
// const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
const
getHierarkiMontlyReportTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
monthly_report_locf
/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
locf/monthly_report
/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/fam/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportCF
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_cf/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportCAT
=
(
body
)
=>
api
.
post
(
'/transaction/monthly_report/cat/get_report_hierarki'
,
body
)
...
...
@@ -276,7 +276,7 @@ const create = (type = "") => {
const
deleteAttachmentMonthly
=
(
id
)
=>
api
.
post
(
`transaction/monthly_report/delete_attachment/
${
id
}
`
)
// const createMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/create_monthly_report', body)
const
createMonthlyReportBS
=
(
body
)
=>
api
.
post
(
'transaction/balance_sheet/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
monthly_report_locf
/create_monthly_report'
,
body
)
const
createMonthlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
locf/monthly_report
/create_monthly_report'
,
body
)
// const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body)
const
createMonthlyReportTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/create_monthly_report'
,
body
)
const
createMonthlyReportFAM
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/fam/create_monthly_report'
,
body
)
...
...
@@ -301,9 +301,9 @@ const create = (type = "") => {
const
validateSubmitReportMR
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/validate_save'
,
body
)
// const validateSubmitReportMRTP = (body) => api.post('transaction/monthly_report_tp/validate_save', body)
const
validateSubmitReportMRTP
=
(
body
)
=>
api
.
post
(
'transaction/tax_planning/monthly_report/validate_save'
,
body
)
const
getPerBSiMontlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
monthly_report_locf
/get_per_bs'
,
body
)
const
checkUploadMonthlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
monthly_report_locf
/check_import'
,
body
)
const
uploadMonthlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
monthly_report_locf
/import_monthly_report'
,
body
)
const
getPerBSiMontlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
locf/monthly_report
/get_per_bs'
,
body
)
const
checkUploadMonthlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
locf/monthly_report
/check_import'
,
body
)
const
uploadMonthlyReportLOCF
=
(
body
)
=>
api
.
post
(
'transaction/
locf/monthly_report
/import_monthly_report'
,
body
)
const
validateSubmitReportOI
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_oi/validate_save'
,
body
)
// MonthlyPL
...
...
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @
e124bc09
...
...
@@ -684,6 +684,7 @@ export default class CorporateAnnualTarget extends Component {
let
weightReal
=
null
let
handleKosongKPIMAXYTD
=
false
let
stateFR
=
false
console
.
log
(
this
.
state
.
dataTable
)
this
.
state
.
dataTable
.
map
((
i
,
index
)
=>
{
if
(
i
[
0
]
==
1
)
{
dataTampung
.
push
({
...
...
@@ -746,6 +747,10 @@ export default class CorporateAnnualTarget extends Component {
}
// // console.log(String(weightReal).substr(0,String(weightReal).length-1))
// // console.log(Number(String(weightReal).substr(0,String(weightReal).length-1)).toFixed(1));
console
.
log
(
weightReal
)
console
.
log
(
i
[
7
])
let
b
=
[]
// console.log(i[13].value == undefined? 'Y' : 'N')
data
.
push
({
"item_report_id"
:
i
[
1
]
==
""
||
i
[
1
]
==
null
?
0
:
i
[
1
],
"item_name"
:
String
(
i
[
6
]),
...
...
@@ -756,24 +761,26 @@ export default class CorporateAnnualTarget extends Component {
"max_ach"
:
i
[
10
]
==
null
?
""
:
i
[
10
].
value
,
"formula"
:
i
[
11
]
==
null
?
""
:
i
[
11
].
value
,
"total_actual_before"
:
String
(
i
[
12
])
==
""
?
"0.0"
:
String
(
i
[
12
]),
"january"
:
stateFR
?
String
(
i
[
13
].
value
)
:
String
(
i
[
13
])
==
""
?
"0.0"
:
String
(
i
[
13
]),
"february"
:
stateFR
?
String
(
i
[
14
].
value
)
:
String
(
i
[
14
])
==
""
?
"0.0"
:
String
(
i
[
14
]),
"march"
:
stateFR
?
String
(
i
[
15
].
value
)
:
String
(
i
[
15
])
==
""
?
"0.0"
:
String
(
i
[
15
]),
"april"
:
stateFR
?
String
(
i
[
16
].
value
)
:
String
(
i
[
16
])
==
""
?
"0.0"
:
String
(
i
[
16
]),
"may"
:
stateFR
?
String
(
i
[
17
].
value
)
:
String
(
i
[
17
])
==
""
?
"0.0"
:
String
(
i
[
17
]),
"june"
:
stateFR
?
String
(
i
[
18
].
value
)
:
String
(
i
[
18
])
==
""
?
"0.0"
:
String
(
i
[
18
]),
"july"
:
stateFR
?
String
(
i
[
19
].
value
)
:
String
(
i
[
19
])
==
""
?
"0.0"
:
String
(
i
[
19
]),
"august"
:
stateFR
?
String
(
i
[
20
].
value
)
:
String
(
i
[
20
])
==
""
?
"0.0"
:
String
(
i
[
20
]),
"september"
:
stateFR
?
String
(
i
[
21
].
value
)
:
String
(
i
[
21
])
==
""
?
"0.0"
:
String
(
i
[
21
]),
"october"
:
stateFR
?
String
(
i
[
22
].
value
)
:
String
(
i
[
22
])
==
""
?
"0.0"
:
String
(
i
[
22
]),
"november"
:
stateFR
?
String
(
i
[
23
].
value
)
:
String
(
i
[
23
])
==
""
?
"0.0"
:
String
(
i
[
23
]),
"december"
:
stateFR
?
String
(
i
[
24
].
value
)
:
String
(
i
[
24
])
==
""
?
"0.0"
:
String
(
i
[
24
]),
"january"
:
i
[
13
].
value
==
undefined
?
(
String
(
i
[
13
])
==
''
?
"0.0"
:
String
(
i
[
13
]))
:
String
(
i
[
13
].
value
),
// "january": stateFR ? String(i[13].value) : String(i[13]) == "" ? "0.0" : String(i[13]),
"february"
:
i
[
14
].
value
==
undefined
?
(
String
(
i
[
14
])
==
''
?
"0.0"
:
String
(
i
[
14
]))
:
String
(
i
[
14
].
value
),
"march"
:
i
[
15
].
value
==
undefined
?
(
String
(
i
[
15
])
==
''
?
"0.0"
:
String
(
i
[
15
]))
:
String
(
i
[
15
].
value
),
"april"
:
i
[
16
].
value
==
undefined
?
(
String
(
i
[
16
])
==
''
?
"0.0"
:
String
(
i
[
16
]))
:
String
(
i
[
16
].
value
),
"may"
:
i
[
17
].
value
==
undefined
?
(
String
(
i
[
17
])
==
''
?
"0.0"
:
String
(
i
[
17
]))
:
String
(
i
[
17
].
value
),
"june"
:
i
[
18
].
value
==
undefined
?
(
String
(
i
[
18
])
==
''
?
"0.0"
:
String
(
i
[
18
]))
:
String
(
i
[
18
].
value
),
"july"
:
i
[
19
].
value
==
undefined
?
(
String
(
i
[
19
])
==
''
?
"0.0"
:
String
(
i
[
19
]))
:
String
(
i
[
19
].
value
),
"august"
:
i
[
20
].
value
==
undefined
?
(
String
(
i
[
20
])
==
''
?
"0.0"
:
String
(
i
[
20
]))
:
String
(
i
[
20
].
value
),
"september"
:
i
[
21
].
value
==
undefined
?
(
String
(
i
[
21
])
==
''
?
"0.0"
:
String
(
i
[
21
]))
:
String
(
i
[
21
].
value
),
"october"
:
i
[
22
].
value
==
undefined
?
(
String
(
i
[
22
])
==
''
?
"0.0"
:
String
(
i
[
22
]))
:
String
(
i
[
22
].
value
),
"november"
:
i
[
23
].
value
==
undefined
?
(
String
(
i
[
23
])
==
''
?
"0.0"
:
String
(
i
[
23
]))
:
String
(
i
[
23
].
value
),
"december"
:
i
[
24
].
value
==
undefined
?
(
String
(
i
[
24
])
==
''
?
"0.0"
:
String
(
i
[
24
]))
:
String
(
i
[
24
].
value
),
"total_current_year"
:
String
(
i
[
25
])
==
""
?
"0.0"
:
String
(
i
[
25
]),
"total_next_year"
:
String
(
i
[
26
])
==
""
?
"0.0"
:
String
(
i
[
26
]),
"total_more_year"
:
String
(
i
[
27
])
==
""
?
"0.0"
:
String
(
i
[
27
]),
"strategic"
:
String
(
i
[
28
]),
"pic"
:
String
(
i
[
29
])
})
stateFR
=
false
})
// // // // console.log(dataTableBaru)
...
...
@@ -793,8 +800,9 @@ export default class CorporateAnnualTarget extends Component {
}
else
if
(
totalWeight
<
100
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
'Total weight less than 100%'
,
tipeAlert
:
'warning'
,
loading
:
false
,
editable
:
true
})
}
else
{
console
.
log
(
JSON
.
stringify
(
payload
))
api
.
create
().
validateSubmitReport
(
payload
).
then
((
response
)
=>
{
// // // //
console.log(response)
console
.
log
(
response
)
if
(
response
.
data
.
data
.
result
)
{
this
.
setState
({
loading
:
false
,
buttonError
:
false
,
editable
:
false
,
buttonDraft
:
false
})
}
else
{
...
...
@@ -867,7 +875,7 @@ export default class CorporateAnnualTarget extends Component {
"status"
:
type
,
"cat"
:
data
}
//
console.log(JSON.stringify(payload));
console
.
log
(
JSON
.
stringify
(
payload
));
this
.
deleteReport
(
payload
)
}
...
...
src/container/MonthlyReport/BalanceSheetMR.js
View file @
e124bc09
...
...
@@ -476,7 +476,7 @@ export default class BalanceSheetMR extends Component {
}
api
.
create
(
'UPLOAD'
).
createMonthlyReportBS
(
payload
).
then
(
response
=>
{
console
.
log
(
response
);
//
console.log(JSON.stringify(payload))
console
.
log
(
JSON
.
stringify
(
payload
))
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
props
.
saveToMonthlyReport
()
...
...
@@ -1669,6 +1669,7 @@ export default class BalanceSheetMR extends Component {
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
suffix
=
{
'%'
}
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
12
]).
toFixed
(
1
)}
/
>
...
...
@@ -1812,6 +1813,7 @@ export default class BalanceSheetMR extends Component {
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
suffix
=
{
'%'
}
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
14
]).
toFixed
(
1
)}
/
>
...
...
@@ -1954,6 +1956,7 @@ export default class BalanceSheetMR extends Component {
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
suffix
=
{
'%'
}
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
tableMeta
.
rowData
[
16
]).
toFixed
(
1
)}
...
...
@@ -2061,7 +2064,22 @@ export default class BalanceSheetMR extends Component {
{
tableMeta
.
rowData
[
0
]
!==
3
?
null
:
(
this
.
state
.
get_for
==
'view'
?
tableMeta
.
rowData
[
17
]
<
Input
disableUnderline
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'left'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
// disabled={Number(tableMeta.rowData[12]) < this.state.minValue || Number(tableMeta.rowData[12]) > this.state.maxValue ? false : true}
disabled
=
{
true
}
multiline
=
{
true
}
defaultValue
=
{
tableMeta
.
rowData
[
17
]}
inputProps
=
{{
style
:
{
color
:
'black'
,
textAlign
:
'left'
}
}}
/
>
:
<
FormControlLabel
style
=
{{
margin
:
0
}}
...
...
@@ -2156,7 +2174,22 @@ export default class BalanceSheetMR extends Component {
<
div
style
=
{{
flex
:
1
}}
>
{
tableMeta
.
rowData
[
0
]
!==
3
?
null
:
(
this
.
state
.
get_for
==
'view'
?
tableMeta
.
rowData
[
18
]
<
Input
disableUnderline
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'left'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
// disabled={Number(tableMeta.rowData[12]) < this.state.minValue || Number(tableMeta.rowData[12]) > this.state.maxValue ? false : true}
disabled
=
{
true
}
multiline
=
{
true
}
defaultValue
=
{
tableMeta
.
rowData
[
18
]}
inputProps
=
{{
style
:
{
color
:
'black'
,
textAlign
:
'left'
}
}}
/
>
:
<
FormControlLabel
style
=
{{
margin
:
0
}}
...
...
@@ -2251,7 +2284,22 @@ export default class BalanceSheetMR extends Component {
<
div
style
=
{{
flex
:
1
}}
>
{
tableMeta
.
rowData
[
0
]
!==
3
?
null
:
(
this
.
state
.
get_for
==
'view'
?
tableMeta
.
rowData
[
19
]
<
Input
disableUnderline
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'left'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
// disabled={Number(tableMeta.rowData[12]) < this.state.minValue || Number(tableMeta.rowData[12]) > this.state.maxValue ? false : true}
disabled
=
{
true
}
multiline
=
{
true
}
defaultValue
=
{
tableMeta
.
rowData
[
19
]}
inputProps
=
{{
style
:
{
color
:
'black'
,
textAlign
:
'left'
}
}}
/
>
:
<
FormControlLabel
style
=
{{
margin
:
0
}}
...
...
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @
e124bc09
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