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
f54623bb
Commit
f54623bb
authored
Jan 09, 2021
by
d.arizona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apdeet
parent
b1920180
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
90 additions
and
39 deletions
+90
-39
index.js
src/api/index.js
+5
-1
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+24
-24
ListOfCreditFacilities.js
src/container/MonthlyReport/ListOfCreditFacilities.js
+61
-14
No files found.
src/api/index.js
View file @
f54623bb
...
...
@@ -170,6 +170,7 @@ const create = (type = "") => {
const
getAllSettingByType
=
(
body
)
=>
api
.
post
(
'setting/get_all_setting_by_type'
,
body
)
const
createAllItemReport
=
(
body
)
=>
api
.
post
(
'item_report/create_all_item_report'
,
body
)
const
deleteAllItemReport
=
(
body
)
=>
api
.
post
(
'/item_report/delete_all_item_report'
,
body
)
const
deleteAllItemReportLOCF
=
(
body
)
=>
api
.
post
(
'/item_report/delete_all_item_report_locf'
,
body
)
//PARAMETER
const
getAllParameter
=
()
=>
api
.
get
(
'/setting/get_all_setting'
)
...
...
@@ -210,6 +211,7 @@ const create = (type = "") => {
const
getSubmitMonthlyReport
=
(
body
)
=>
api
.
post
(
'transaction/monthly_report/get_latest_periode_submit'
,
body
)
const
createPeriodeRevision
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/create_periode_revision'
,
body
)
const
getIdDeleteFromExcel
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/delete_from_excel'
,
body
)
const
getIdDeleteFromExcelLOCF
=
(
body
)
=>
api
.
post
(
'transaction/locf/monthly_report/delete_from_excel'
,
body
)
const
getDashboard
=
(
body
)
=>
api
.
get
(
'transaction/get_dashboard'
)
const
historyApproval
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/history_approval'
,
body
)
const
getDashboardUser
=
()
=>
api
.
get
(
'transaction/get_dashboard_sub_co'
)
...
...
@@ -551,7 +553,9 @@ const create = (type = "") => {
validateSubmitReportOI
,
getMonthlyOI
,
getParameterByGroupName
,
getSubmitMonthlyReport
getSubmitMonthlyReport
,
getIdDeleteFromExcelLOCF
,
deleteAllItemReportLOCF
}
}
...
...
src/container/MonthlyReport/BalanceSheetMR.js
View file @
f54623bb
...
...
@@ -2113,30 +2113,30 @@ export default class BalanceSheetMR extends Component {
style
=
{{
margin
:
0
}}
// value={value}
control
=
{
tableMeta
.
rowData
[
17
]
===
""
&&
(
Number
(
tableMeta
.
rowData
[
12
])
<
this
.
state
.
minValue
||
Number
(
tableMeta
.
rowData
[
12
])
>
this
.
state
.
maxValue
)
?
<
LightTooltip
title
=
{
"MTD Explanation vs Prev Month is Reqiured"
}
arrow
>
<
Input
disableUnderline
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'left'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
this
.
props
.
isApprover
?
true
:
(
this
.
state
.
get_for
==
'view'
?
true
:
false
)}
// disabled={false}
multiline
=
{
true
}
defaultValue
=
{
tableMeta
.
rowData
[
17
]}
inputProps
=
{{
style
:
{
color
:
"#5198ea"
,
textAlign
:
'left'
,
backgroundColor
:
'#ffac99'
}
}}
onBlur
=
{(
event
)
=>
{
handleText
(
event
.
target
.
value
,
tableMeta
,
17
)
}}
/
>
<
/LightTooltip
>
:
//
tableMeta.rowData[17] === "" && (Number(tableMeta.rowData[12]) < this.state.minValue || Number(tableMeta.rowData[12]) > this.state.maxValue) ?
//
<LightTooltip title={"MTD Explanation vs Prev Month is Reqiured"} arrow>
//
<Input
//
disableUnderline={true}
//
style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
//
type="text"
//
placeholder=""
//
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
//
// disabled={false}
//
multiline={true}
//
defaultValue={tableMeta.rowData[17]}
//
inputProps={{
//
style: {
//
color: "#5198ea",
//
textAlign: 'left',
//
backgroundColor: '#ffac99'
//
}
//
}}
//
onBlur={(event) => {
//
handleText(event.target.value, tableMeta, 17)
//
}}
//
/>
//
</LightTooltip>
//
:
// tableMeta.rowData[0] === 7 ?
// (Number(handleValueFormula(tableMeta, 17)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 17)).toFixed(1) <= Number(this.state.maxValue)) ?
// <NumberFormat
...
...
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @
f54623bb
...
...
@@ -117,6 +117,7 @@ export default class ListOfCreditFacilities extends Component {
updateBy
:
'-'
,
notes
:
""
,
viewOnly
:
true
,
dataDelete
:
[]
}
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
...
...
@@ -164,7 +165,7 @@ export default class ListOfCreditFacilities extends Component {
checkStatus
=
false
}
this
.
setState
({
viewOnly
:
!
checkApprover
&&
checkLastStatus
&&
checkStatus
})
//
this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus})
}
getItemHierarki
()
{
...
...
@@ -494,6 +495,21 @@ export default class ListOfCreditFacilities extends Component {
}
checkUpload
()
{
let
dataDelete
=
[]
api
.
create
().
getIdDeleteFromExcelLOCF
(
this
.
state
.
payload
).
then
((
response
)
=>
{
console
.
log
(
response
)
// if (response.data) {
// // // // // // console.log(response.data)
// let idDelete = response.data.data.item_report_id
// if (idDelete.length > 0) {
// idDelete.map((item, index) => {
// dataDelete.push(item)
// })
// this.setState({ dataDelete })
// }
// }
})
api
.
create
().
checkUploadMonthlyReportLOCF
(
this
.
state
.
payload
).
then
(
response
=>
{
console
.
log
(
JSON
.
stringify
(
this
.
state
.
payload
));
console
.
log
(
response
)
...
...
@@ -620,7 +636,7 @@ export default class ListOfCreditFacilities extends Component {
)
}
this
.
setState
({
dataTable
,
dataLoaded
:
true
,
loading
:
false
,
buttonError
:
false
},
()
=>
{
this
.
setState
({
dataTable
,
dataLoaded
:
true
,
loading
:
false
,
buttonError
:
false
,
dataDelete
:
[]
},
()
=>
{
this
.
handleCalculate
()
this
.
state
.
dataTable
.
map
(
item
=>
{
if
(
item
[
23
].
length
>
0
)
{
...
...
@@ -1344,7 +1360,7 @@ export default class ListOfCreditFacilities extends Component {
const
handleAction
=
(
typeReport
,
tableMeta
,
typeButton
)
=>
{
// console.log(typeReport)
if
(
typeReport
==
3
)
{
if
(
dataTable2
.
length
==
1
)
{
if
(
dataTable2
.
length
==
2
)
{
if
(
typeButton
==
'add'
)
{
return
true
}
else
{
...
...
@@ -1546,28 +1562,59 @@ export default class ListOfCreditFacilities extends Component {
}
const
handleDelete
=
(
index
)
=>
{
// if (dataTable2[index][1] !== "") {
// dataDelete.push(dataTable2[index][1])
// }
let
dataDelete
=
this
.
state
.
dataDelete
let
berapaInput
=
0
dataTable2
.
map
((
items
,
indexs
)
=>
{
if
(
items
[
0
]
==
3
)
{
berapaInput
+=
1
}
})
let
rowSblmnya
=
dataTable2
[
index
-
1
]
==
undefined
?
false
:
String
(
dataTable2
[
index
-
1
][
6
].
value
).
includes
(
dataTable2
[
index
][
6
].
value
)
if
(
berapaInput
>
1
)
{
if
(
String
(
dataTable2
[
index
+
1
][
6
].
value
).
includes
(
'Total'
)
&&
!
rowSblmnya
)
{
dataTable2
.
splice
(
index
,
2
)
dataDelete
.
push
(
dataTable2
[
index
][
1
])
let
prevData
=
dataTable2
[
index
-
1
]
==
undefined
?
null
:
dataTable2
[
index
-
1
][
6
]
let
currentData
=
dataTable2
[
index
][
6
]
let
nextData
=
dataTable2
[
index
+
1
]
==
undefined
?
null
:
dataTable2
[
index
+
1
][
6
]
if
(
nextData
==
null
)
{
dataTable2
.
splice
(
index
,
1
)
}
else
if
(
nextData
.
value
.
includes
(
'Total'
))
{
if
(
prevData
!==
null
&&
currentData
==
null
)
{
dataTable2
.
splice
(
index
,
1
)
}
else
if
(
prevData
!==
null
&&
prevData
.
value
==
currentData
.
value
)
{
dataTable2
.
splice
(
index
,
1
)
}
else
if
(
dataTable2
.
length
>
3
)
{
if
(
prevData
==
null
)
{
if
(
nextData
.
value
.
includes
(
'Grand'
))
{
dataTable2
.
splice
(
index
,
1
)
}
else
{
dataTable2
.
splice
(
index
,
1
)
dataTable2
.
splice
(
index
,
2
)
}
}
else
{
dataTable2
.
splice
(
index
,
2
)
}
}
else
if
(
dataTable2
.
length
==
3
)
{
if
(
prevData
==
null
)
{
if
(
nextData
.
value
.
includes
(
'Grand'
))
{
dataTable2
.
splice
(
index
,
1
)
}
else
{
dataTable2
.
splice
(
index
,
3
)
dataTable2
.
push
(
[
3
,
""
,
""
,
""
,
""
,
this
.
props
.
company
.
company_name
,
null
,
null
,
""
,
this
.
state
.
currentDate
,
"0.00"
,
""
,
""
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
""
,
"0"
,
"0"
,
"0"
,
"0"
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
0
],
[
9
,
""
,
""
,
""
,
""
,
""
,
{
value
:
"Grand Total"
},
null
,
""
,
""
,
""
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
""
,
"0"
,
"0"
,
"0"
,
"0"
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
"0"
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
""
,
"notes"
,
999999
],
)
}
}
else
{
dataTable2
.
splice
(
index
,
1
)
}
}
}
else
{
this
.
setState
({
snekbar
:
true
,
snekbarMsg
:
'Datatable Cannot be Empty'
}
)
dataTable2
.
splice
(
index
,
1
)
}
this
.
setState
({
dataTable
:
dataTable2
,},
()
=>
{
this
.
setState
({
dataTable
:
dataTable2
,
dataDelete
},
()
=>
{
setTimeout
(()
=>
{
console
.
log
(
this
.
state
.
dataDelete
)
this
.
setState
({
loading
:
false
})
},
100
)
})
...
...
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