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
e4bf28c1
Commit
e4bf28c1
authored
Dec 24, 2020
by
rifkaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into rifka
parents
adf82e09
fadd910f
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
221 additions
and
113 deletions
+221
-113
index.js
src/api/index.js
+3
-1
MonthlyReport.js
src/container/MonthlyReport.js
+132
-46
ListOfCreditFacilities.js
src/container/MonthlyReport/ListOfCreditFacilities.js
+14
-12
OperatingIndicatorMR.js
src/container/MonthlyReport/OperatingIndicatorMR.js
+69
-51
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+3
-3
No files found.
src/api/index.js
View file @
e4bf28c1
...
...
@@ -254,6 +254,7 @@ const create = (type = "") => {
// Monthly
const
getMonthlyReport
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/get_all_report'
,
body
)
const
getMonthlyOI
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_oi/get_operating_indicator_id'
,
body
)
const
getMonthlyReportID
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/get_monthly_report_id'
,
body
)
const
getHierarkiMontlyReportBS
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_bs/get_report_hierarki'
,
body
)
const
getHierarkiMontlyReportOI
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report_oi/get_report_hierarki'
,
body
)
...
...
@@ -530,7 +531,8 @@ const create = (type = "") => {
getPerBSiMontlyReportLOCF
,
checkUploadMonthlyReportLOCF
,
uploadMonthlyReportLOCF
,
validateSubmitReportOI
validateSubmitReportOI
,
getMonthlyOI
}
}
...
...
src/container/MonthlyReport.js
View file @
e4bf28c1
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @
e4bf28c1
...
...
@@ -1198,7 +1198,7 @@ export default class ListOfCreditFacilities extends Component {
// console.log(totalLoan);
// dataTable: newData, totalOutStand: newData[newData.length-1][22]
if
(
bankNameEmpty
)
{
this
.
setState
({
loading
:
false
,
dataTable
:
this
.
state
.
dataTable
,
totalOutStand
:
0
,
diff
:
Number
(
0
-
this
.
state
.
perBS
),
saveDraft
:
false
})
this
.
setState
({
loading
:
false
,
dataTable
:
this
.
state
.
dataTable
,
totalOutStand
:
0
,
diff
:
Number
(
0
-
this
.
state
.
perBS
),
saveDraft
:
true
,
saveComp
:
true
})
}
else
{
this
.
setState
({
loading
:
false
,
dataTable
:
newData
,
totalOutStand
:
totalLoan
,
diff
:
Number
(
totalLoan
-
this
.
state
.
perBS
),
saveDraft
:
false
,
saveComp
:
Number
(
totalLoan
-
this
.
state
.
perBS
)
==
0
?
false
:
true
})
}
...
...
@@ -3490,7 +3490,7 @@ export default class ListOfCreditFacilities extends Component {
<
div
style
=
{{
flex
:
1
,
padding
:
20
,
width
:
'100%'
}}
>
{
this
.
state
.
visibleLOCFMR
?
<
Paper
style
=
{{
paddingTop
:
10
,
paddingBottom
:
20
}}
>
<
Snackbar
open
=
{
this
.
state
.
snekbar
}
autoHideDuration
=
{
6
000
}
onClose
=
{
handleClose
}
>
<
Snackbar
open
=
{
this
.
state
.
snekbar
}
autoHideDuration
=
{
3
000
}
onClose
=
{
handleClose
}
>
<
Alert
onClose
=
{
handleClose
}
severity
=
"error"
>
{
this
.
state
.
snekbarMsg
}
<
/Alert
>
...
...
@@ -3507,7 +3507,7 @@ export default class ListOfCreditFacilities extends Component {
<
/div
>
<
div
style
=
{{
width
:
'50%'
}}
>
<
div
style
=
{{
justifyContent
:
'flex-end'
,
display
:
'flex'
,
flexFlow
:
'wrap'
}}
>
{(
this
.
state
.
get_for
==
'edit'
&&
(
this
.
props
.
lastStatus
===
'SUBMIT'
||
this
.
props
.
lastStatus
===
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
&&
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'draft'
||
this
.
props
.
status
===
'submitted'
))
&&
(
{(
this
.
state
.
get_for
==
'edit'
&&
<
div
>
<
a
data
-
tip
=
{
'Download Template'
}
data
-
for
=
"template"
>
<
button
...
...
@@ -3525,7 +3525,7 @@ export default class ListOfCreditFacilities extends Component {
<
ReactTooltip
border
=
{
true
}
id
=
"template"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
/div
>
)}
{(
this
.
state
.
get_for
==
'edit'
&&
(
this
.
props
.
lastStatus
===
'SUBMIT'
||
this
.
props
.
lastStatus
===
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
&&
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'draft'
||
this
.
props
.
status
===
'submitted'
))
&&
(
{(
this
.
state
.
get_for
==
'edit'
&&
<
div
>
<
a
data
-
tip
=
{
'Upload'
}
data
-
for
=
"upload"
>
<
button
...
...
@@ -3670,7 +3670,8 @@ export default class ListOfCreditFacilities extends Component {
type
=
"button"
onClick
=
{()
=>
this
.
state
.
saveDraft
===
true
?
null
:
this
.
setState
({
snekbar
:
true
,
snekbarMsg
:
'Data Incomplete !'
})
:
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
setTimeout
(()
=>
{
...
...
@@ -3680,7 +3681,7 @@ export default class ListOfCreditFacilities extends Component {
}
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
this
.
state
.
saveDraft
!==
true
?
'pointer'
:
'default
'
,
cursor
:
'pointer
'
,
borderColor
:
'transparent'
,
outline
:
'none'
,
marginRight
:
20
...
...
@@ -3699,7 +3700,7 @@ export default class ListOfCreditFacilities extends Component {
// disabled={this.state.buttonError}
onClick
=
{()
=>
this
.
state
.
saveComp
?
this
.
setState
({
alert
:
true
,
messageAlert
:
'Data is not complete !'
,
tipeAlert
:
'warning'
})
this
.
setState
({
snekbar
:
true
,
snekbarMsg
:
'Data Incomplete !'
})
:
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
...
...
@@ -3710,7 +3711,7 @@ export default class ListOfCreditFacilities extends Component {
}
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
this
.
state
.
saveComp
===
true
?
'default'
:
'pointer'
,
cursor
:
'pointer'
,
borderColor
:
'transparent'
,
outline
:
'none'
}}
...
...
@@ -3824,7 +3825,8 @@ export default class ListOfCreditFacilities extends Component {
type
=
"button"
onClick
=
{()
=>
this
.
state
.
saveDraft
===
true
?
null
:
this
.
setState
({
snekbar
:
true
,
snekbarMsg
:
'Data Incomplete !'
})
:
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
setTimeout
(()
=>
{
...
...
@@ -3834,7 +3836,7 @@ export default class ListOfCreditFacilities extends Component {
}
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
this
.
state
.
saveDraft
!==
true
?
'pointer'
:
'default
'
,
cursor
:
'pointer
'
,
borderColor
:
'transparent'
,
outline
:
'none'
,
marginRight
:
20
...
...
@@ -3855,7 +3857,7 @@ export default class ListOfCreditFacilities extends Component {
// disabled={this.state.buttonError}
onClick
=
{()
=>
this
.
state
.
saveComp
?
this
.
setState
({
alert
:
true
,
messageAlert
:
'Data is not complete !'
,
tipeAlert
:
'warning'
})
this
.
setState
({
snekbar
:
true
,
snekbarMsg
:
'Data Incomplete !'
})
:
this
.
state
.
handleTekTekTek
==
1
?
null
:
this
.
setState
({
handleTekTekTek
:
1
,
loading
:
true
},
()
=>
{
...
...
@@ -3866,7 +3868,7 @@ export default class ListOfCreditFacilities extends Component {
}
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
this
.
state
.
saveComp
===
true
?
'default'
:
'pointer'
,
cursor
:
'pointer'
,
borderColor
:
'transparent'
,
outline
:
'none'
}}
...
...
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @
e4bf28c1
This diff is collapsed.
Click to expand it.
src/container/MonthlyReport/ProfitLossMR.js
View file @
e4bf28c1
...
...
@@ -561,7 +561,7 @@ export default class ProfitLossMR extends Component {
let
err
=
false
this
.
state
.
dataTable
.
map
((
i
,
index
)
=>
{
if
(
i
[
0
]
===
3
&&
i
[
4
]
===
2
)
{
console
.
log
(
i
);
//
console.log(i);
if
(
i
[
19
]
===
""
&&
(
Number
(
i
[
14
])
<
this
.
state
.
minValue
||
Number
(
i
[
14
])
>
this
.
state
.
maxValue
))
{
console
.
log
(
'msk 1'
);
// console.log(i);
...
...
@@ -608,8 +608,8 @@ export default class ProfitLossMR extends Component {
}
// console.log(JSON.stringify(payload));
api
.
create
().
validateSubmitReportPL
(
payload
).
then
((
response
)
=>
{
console
.
log
(
response
.
data
.
data
.
result
)
console
.
log
(
err
);
//
console.log(response.data.data.result)
//
console.log(err);
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
data
.
result
&&
err
===
false
)
{
...
...
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