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
750b9205
Commit
750b9205
authored
Jul 17, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev/riri' into 'ENV-DEV'
fixnumber LOCF See merge request
!1906
parents
4e78b275
146f6671
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
20 deletions
+21
-20
CreateParameter.js
src/container/MasterData/Parameter/CreateParameter.js
+3
-3
ListOfCreditFacilitiesMR.js
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
+18
-17
No files found.
src/container/MasterData/Parameter/CreateParameter.js
View file @
750b9205
...
...
@@ -623,7 +623,7 @@ export default class CreateParameter extends Component {
"end_date"
:
this
.
state
.
tempData
.
end_date
}
console
.
log
(
body
);
//
this.props.updateParameter(body)
this
.
props
.
updateParameter
(
body
)
}
createParameter
()
{
...
...
@@ -644,7 +644,7 @@ export default class CreateParameter extends Component {
"end_date"
:
this
.
state
.
endDate
}
console
.
log
(
body
);
//
this.props.createParameter(body)
this
.
props
.
createParameter
(
body
)
}
render
()
{
...
...
@@ -829,7 +829,7 @@ export default class CreateParameter extends Component {
<
TextField
style
=
{{
width
:
'100%'
}}
id
=
"value"
label
=
{
this
.
state
.
enableReportName
?
"Value IDR mn"
:
"Value"
}
label
=
{
"Value"
}
value
=
{
this
.
state
.
tempData
===
null
?
''
:
this
.
state
.
tempData
.
value
}
inputProps
=
{{
min
:
0
,
...
...
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @
750b9205
...
...
@@ -18,6 +18,7 @@ import MuiAlert from '@material-ui/lab/Alert';
import
{
makeStyles
}
from
'@material-ui/core/styles'
;
import
UploadFile
from
"../../library/Upload"
;
import
{
ExcelRenderer
}
from
'react-excel-renderer'
;
import
{
fixNumber
,
roundMath
}
from
"../../library/Utils"
;
function
Alert
(
props
)
{
return
<
MuiAlert
elevation
=
{
6
}
variant
=
"filled"
{...
props
}
/>
;
...
...
@@ -458,15 +459,15 @@ export default class ListOfCreditFacilities extends Component {
"loan_maturity_date"
:
i
[
5
]
!==
undefined
?
tgl
[
2
]
+
'-'
+
tgl
[
1
]
+
'-'
+
tgl
[
0
]
:
null
,
"interest"
:
i
[
6
],
"currency"
:
i
[
7
],
"loan_plafond_amount_ori"
:
i
[
8
],
"loan_plafond_amount_idr"
:
i
[
9
],
"out_loan_ki_amount_ori"
:
i
[
10
],
"out_loan_ki_amount_idr"
:
i
[
11
],
"out_loan_kmk_amount_ori"
:
i
[
12
],
"out_loan_kmk_amount_idr"
:
i
[
13
],
"loan_plafond_amount_ori"
:
i
[
8
]
!==
undefined
?
Number
(
i
[
8
]).
toFixed
(
1
)
:
i
[
8
]
,
"loan_plafond_amount_idr"
:
i
[
9
]
!==
undefined
?
Number
(
i
[
9
]).
toFixed
(
1
)
:
i
[
9
]
,
"out_loan_ki_amount_ori"
:
i
[
10
]
!==
undefined
?
Number
(
i
[
10
]).
toFixed
(
1
)
:
i
[
10
]
,
"out_loan_ki_amount_idr"
:
i
[
11
]
!==
undefined
?
Number
(
i
[
11
]).
toFixed
(
1
)
:
i
[
11
]
,
"out_loan_kmk_amount_ori"
:
i
[
12
]
!==
undefined
?
Number
(
i
[
12
]).
toFixed
(
1
)
:
i
[
12
]
,
"out_loan_kmk_amount_idr"
:
i
[
13
]
!==
undefined
?
Number
(
i
[
13
]).
toFixed
(
1
)
:
i
[
13
]
,
"out_loan_other_type"
:
i
[
14
],
"out_loan_other_amount_ori"
:
i
[
15
],
"out_loan_other_amount_idr"
:
i
[
16
],
"out_loan_other_amount_ori"
:
i
[
15
]
!==
undefined
?
Number
(
i
[
15
]).
toFixed
(
1
)
:
i
[
15
]
,
"out_loan_other_amount_idr"
:
i
[
16
]
!==
undefined
?
Number
(
i
[
16
]).
toFixed
(
1
)
:
i
[
16
]
,
// "total_out_loan_ori": i[18],
// "total_out_loan_idr": i[19],
// "remaining_plafond_ori": i[20],
...
...
@@ -535,15 +536,15 @@ export default class ListOfCreditFacilities extends Component {
"loan_maturity_date"
:
i
[
5
]
!==
undefined
?
tgl
[
2
]
+
'-'
+
tgl
[
1
]
+
'-'
+
tgl
[
0
]
:
null
,
"interest"
:
i
[
6
],
"currency"
:
i
[
7
],
"loan_plafond_amount_ori"
:
i
[
8
],
"loan_plafond_amount_idr"
:
i
[
9
],
"out_loan_ki_amount_ori"
:
i
[
10
],
"out_loan_ki_amount_idr"
:
i
[
11
],
"out_loan_kmk_amount_ori"
:
i
[
12
],
"out_loan_kmk_amount_idr"
:
i
[
13
],
"loan_plafond_amount_ori"
:
i
[
8
]
!==
undefined
?
Number
(
i
[
8
]).
toFixed
(
1
)
:
i
[
8
]
,
"loan_plafond_amount_idr"
:
i
[
9
]
!==
undefined
?
Number
(
i
[
9
]).
toFixed
(
1
)
:
i
[
9
]
,
"out_loan_ki_amount_ori"
:
i
[
10
]
!==
undefined
?
Number
(
i
[
10
]).
toFixed
(
1
)
:
i
[
10
]
,
"out_loan_ki_amount_idr"
:
i
[
11
]
!==
undefined
?
Number
(
i
[
11
]).
toFixed
(
1
)
:
i
[
11
]
,
"out_loan_kmk_amount_ori"
:
i
[
12
]
!==
undefined
?
Number
(
i
[
12
]).
toFixed
(
1
)
:
i
[
12
]
,
"out_loan_kmk_amount_idr"
:
i
[
13
]
!==
undefined
?
Number
(
i
[
13
]).
toFixed
(
1
)
:
i
[
13
]
,
"out_loan_other_type"
:
i
[
14
],
"out_loan_other_amount_ori"
:
i
[
15
],
"out_loan_other_amount_idr"
:
i
[
16
],
"out_loan_other_amount_ori"
:
i
[
15
]
!==
undefined
?
Number
(
i
[
15
]).
toFixed
(
1
)
:
i
[
15
]
,
"out_loan_other_amount_idr"
:
i
[
16
]
!==
undefined
?
Number
(
i
[
16
]).
toFixed
(
1
)
:
i
[
16
]
,
// "total_out_loan_ori": i[18],
// "total_out_loan_idr": i[19],
// "remaining_plafond_ori": i[20],
...
...
@@ -1346,7 +1347,7 @@ export default class ListOfCreditFacilities extends Component {
dataGabung
.
map
((
items
,
index
)
=>
{
if
(
items
[
0
]
==
3
)
{
t
otalLoan
+=
items
[
22
]
t
his
.
props
.
defaultCurrency
.
id
==
1
?
totalLoan
+=
items
[
22
]
:
totalLoan
+=
items
[
21
]
}
if
(
bankPrev
!=
""
)
{
if
(
items
[
6
].
value
!==
bankPrev
)
{
...
...
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