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
ca54179b
Commit
ca54179b
authored
Oct 06, 2020
by
Rifka Kurnia Irfiana
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into rifka
parents
7d6d98d1
da5dc009
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
78 additions
and
46 deletions
+78
-46
index.js
src/api/index.js
+10
-2
BudgetTahunan.js
src/container/BudgetTahunan.js
+3
-3
ProfitLossMR.js
src/container/MonthlyReport/ProfitLossMR.js
+1
-1
User.js
src/container/Otorisasi/User.js
+1
-1
OutlookPA.js
src/container/OutlookPA.js
+60
-36
BalanceSheetOLPA.js
src/container/OutlookPA/BalanceSheetOLPA.js
+3
-3
No files found.
src/api/index.js
View file @
ca54179b
...
...
@@ -233,8 +233,12 @@ const create = (type = "") => {
const
createReportOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/create_outlook_report'
,
body
)
const
checkUploadOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/check_import'
,
body
)
const
validateSubmitReportOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/validate_save'
,
body
)
const
uploadOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/import_outlook_pa'
)
const
uploadOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/import_outlook_pa'
,
body
)
const
uploadAttOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/upload_attachment'
,
body
)
const
deleteAttOLPA
=
(
id
)
=>
api
.
post
(
`transaction/outlook_pa/delete_attachment/
${
id
}
`
)
const
getReportOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/get_all_report'
,
body
)
const
approvalSubmissionOLPA
=
(
body
)
=>
api
.
post
(
'transaction/outlook_pa/approval_submission'
,
body
)
const
checkApproverOLPA
=
()
=>
api
.
get
(
'transaction/outlook_pa/is_approver'
)
//Template
const
downloadTemplate
=
(
fileName
,
fileType
)
=>
api
.
get
(
`attachment/download_file?fileName=
${
fileName
}
&&fileType=
${
fileType
}
`
)
...
...
@@ -407,7 +411,11 @@ const create = (type = "") => {
uploadOLPA
,
validateSubmitReportOLPA
,
getDetailReportOLPA
,
uploadAttOLPA
uploadAttOLPA
,
deleteAttOLPA
,
getReportOLPA
,
approvalSubmissionOLPA
,
checkApproverOLPA
}
}
...
...
src/container/BudgetTahunan.js
View file @
ca54179b
...
...
@@ -318,7 +318,7 @@ export default class BudgetTahunan extends Component {
options
:
periodeData
,
getOptionLabel
:
(
option
)
=>
option
.
periode
,
};
let
index
=
data
.
sort
((
a
,
b
)
=>
a
-
b
).
findIndex
((
val
)
=>
val
===
(
this
.
state
.
la
stPeriod
==
""
?
String
(
Number
(
currentYear
)
+
1
)
:
this
.
state
.
lastPeriod
))
let
index
=
data
.
sort
((
a
,
b
)
=>
a
-
b
).
findIndex
((
val
)
=>
val
===
(
this
.
state
.
la
testPeriode
==
""
?
String
(
Number
(
currentYear
)
+
1
)
:
this
.
state
.
latestPeriode
))
// console.log(data)
console
.
log
(
this
.
state
.
lastPeriod
)
// console.log(periodeData)
...
...
@@ -390,7 +390,7 @@ export default class BudgetTahunan extends Component {
if
(
response
.
data
.
data
.
is_approver
===
true
)
{
this
.
setState
({
isApprover
:
true
,
checkApprover
:
true
})
}
else
{
this
.
setState
({
isApprover
:
this
.
state
.
lastStatus
===
"SUBMITTED"
?
true
:
false
,
checkApprover
:
false
})
this
.
setState
({
isApprover
:
false
,
checkApprover
:
false
})
}
})
...
...
@@ -643,7 +643,7 @@ export default class BudgetTahunan extends Component {
api
.
create
().
submitMasterBudget
(
body
).
then
(
response
=>
{
console
.
log
(
response
);
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"
S
uccess"
)
{
if
(
response
.
data
.
status
===
"
s
uccess"
)
{
this
.
getSubmission
()
}
}
...
...
src/container/MonthlyReport/ProfitLossMR.js
View file @
ca54179b
...
...
@@ -22,7 +22,7 @@ const style2 = {
top
:
0
};
export
default
class
BalanceSheet
MR
extends
Component
{
export
default
class
ProfitLoss
MR
extends
Component
{
render
()
{
let
columns
=
[
{
...
...
src/container/Otorisasi/User.js
View file @
ca54179b
...
...
@@ -494,7 +494,7 @@ export default class UserRole extends Component {
// if (String(response.data.status).toLocaleUpperCase === 'Success' || String(response.data.status).toLocaleUpperCase === 'success') {
if
(
response
.
data
)
{
if
(
response
.
ok
)
{
if
(
response
.
data
.
status
===
'
S
uccess'
)
{
if
(
response
.
data
.
status
===
'
s
uccess'
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'success'
,
add
:
false
})
this
.
getUser
()
window
.
location
.
reload
();
...
...
src/container/OutlookPA.js
View file @
ca54179b
...
...
@@ -56,7 +56,8 @@ export default class OutlookPA extends Component {
lastRevision
:
""
,
checkApprover
:
false
,
lastPeriod
:
''
,
latestPeriode
:
''
latestPeriode
:
''
,
btnApprove
:
false
}
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
...
...
@@ -75,7 +76,7 @@ export default class OutlookPA extends Component {
}
checkApprover
()
{
api
.
create
().
checkApprover
().
then
(
response
=>
{
api
.
create
().
checkApprover
OLPA
().
then
(
response
=>
{
console
.
log
(
response
);
if
(
response
.
data
.
data
.
is_approver
===
true
)
{
this
.
setState
({
isApprover
:
true
,
checkApprover
:
true
},
()
=>
...
...
@@ -112,7 +113,7 @@ export default class OutlookPA extends Component {
if
(
response
.
data
.
data
.
length
>
0
)
{
this
.
getRevision
()
}
else
{
this
.
setState
({
listRevision
:
null
,
revision
:
null
,
dataTable
:
[],
loading
:
false
,
checkApprover
:
false
,
lastRevision
:
""
,
visibleTableHistory
:
false
})
this
.
setState
({
listRevision
:
null
,
revision
:
null
,
dataTable
:
[],
checkApprover
:
false
,
lastRevision
:
""
,
visibleTableHistory
:
false
,
loading
:
false
})
}
//
})
...
...
@@ -155,7 +156,7 @@ export default class OutlookPA extends Component {
"periode"
:
this
.
state
.
periode
.
periode
,
"report_type"
:
"Outlook PA"
,
}
api
.
create
().
getReport
TypeBody
(
payload
).
then
(
response
=>
{
api
.
create
().
getReport
OLPA
(
payload
).
then
(
response
=>
{
console
.
log
(
response
);
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
...
...
@@ -305,7 +306,7 @@ export default class OutlookPA extends Component {
options
:
periodeData
,
getOptionLabel
:
(
option
)
=>
option
.
periode
,
};
let
index
=
data
.
sort
((
a
,
b
)
=>
a
-
b
).
findIndex
((
val
)
=>
val
===
(
this
.
state
.
la
stPeriod
==
""
?
String
(
Number
(
currentYear
)
+
1
)
:
this
.
state
.
lastPeriod
))
let
index
=
data
.
sort
((
a
,
b
)
=>
a
-
b
).
findIndex
((
val
)
=>
val
===
(
this
.
state
.
la
testPeriode
==
""
?
String
(
Number
(
currentYear
)
+
1
)
:
this
.
state
.
latestPeriode
))
// console.log(data)
console
.
log
(
this
.
state
.
lastPeriod
)
// console.log(periodeData)
...
...
@@ -365,8 +366,8 @@ export default class OutlookPA extends Component {
submitter
:
response
.
data
.
data
.
submitter
,
approverID
:
response
.
data
.
data
.
approve_id
,
pic
:
response
.
data
.
data
.
approver
==
null
?
''
:
response
.
data
.
data
.
approver
,
lastStatus
:
response
.
data
.
data
.
last_status
===
null
?
'SUBMIT'
:
response
.
data
.
data
.
last_status
,
loading
:
false
,
lastRevision
:
response
.
data
.
data
.
last_revision
,
btnApprove
:
response
.
data
.
data
.
is_submit
},
()
=>
{
console
.
log
(
this
.
state
.
lastStatus
);
this
.
historyApproval
()
...
...
@@ -376,7 +377,7 @@ export default class OutlookPA extends Component {
if
(
response
.
data
.
data
.
is_approver
===
true
)
{
this
.
setState
({
isApprover
:
true
,
checkApprover
:
true
})
}
else
{
this
.
setState
({
isApprover
:
this
.
state
.
lastStatus
===
"SUBMITTED"
?
true
:
false
,
checkApprover
:
false
})
this
.
setState
({
isApprover
:
false
,
checkApprover
:
false
})
}
})
...
...
@@ -399,7 +400,7 @@ export default class OutlookPA extends Component {
let
dataTableHistory
=
response
.
data
.
data
.
map
(
item
=>
{
return
[
item
.
pic
,
item
.
status_approval
,
String
(
item
.
status_approval
).
replace
(
'APPROVAL_PROCCESS'
,
'WAITING FOR APPROVAL'
).
replace
(
'- -'
,
''
)
,
item
.
remarks
,
item
.
item_revision
,
item
.
history_approval_date
...
...
@@ -417,11 +418,19 @@ export default class OutlookPA extends Component {
"status"
:
type
,
"detail"
:
this
.
state
.
detailRevisiCheck
}
api
.
create
().
approvalSubmission
(
body
).
then
((
res
)
=>
{
api
.
create
().
approvalSubmission
OLPA
(
body
).
then
((
res
)
=>
{
console
.
log
(
res
)
this
.
setState
({
loading
:
false
},
()
=>
{
if
(
res
.
data
)
{
if
(
res
.
data
.
status
===
"success"
)
{
this
.
getOutlookPAID
()
})
}
else
{
this
.
setState
({
loading
:
false
})
alert
(
res
.
data
.
message
)
}
}
else
{
this
.
setState
({
loading
:
false
})
alert
(
res
.
problem
)
}
})
}
...
...
@@ -468,6 +477,21 @@ export default class OutlookPA extends Component {
})
}
validateRevision
(){
let
arrayRevisi
=
this
.
state
.
detailRevisiCheck
let
remarksKosong
=
0
arrayRevisi
.
map
((
item
,
index
)
=>
{
if
(
item
.
remarks
==
""
)
{
remarksKosong
+=
1
}
})
if
(
remarksKosong
>
0
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
'Remarks Cannot be Empty'
,
tipeAlert
:
'error'
})
}
else
{
this
.
setState
({
visibleRevision
:
false
},
()
=>
this
.
approvalSubmission
(
'revision'
))
}
}
handleChange
(
value
,
tableMeta
)
{
let
data
=
this
.
state
.
dataTable
data
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
]
=
value
...
...
@@ -504,7 +528,7 @@ export default class OutlookPA extends Component {
}
deleteAttachment
(
item
)
{
api
.
create
().
deleteAtt
achment
(
item
.
attachment_id
).
then
(
response
=>
{
api
.
create
().
deleteAtt
OLPA
(
item
.
attachment_id
).
then
(
response
=>
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
getOutlookPAID
()
...
...
@@ -527,12 +551,12 @@ export default class OutlookPA extends Component {
this
.
getOutlookPAID
()
}
else
{
this
.
setState
({
loading
:
false
},
()
=>
{
this
.
getOutlookPAID
(
)
alert
(
response
.
data
.
message
)
})
}
}
else
{
this
.
setState
({
loading
:
false
},
()
=>
{
this
.
getOutlookPAID
(
)
alert
(
response
.
problem
)
})
}
})
...
...
@@ -582,7 +606,7 @@ export default class OutlookPA extends Component {
api
.
create
().
submitOLPA
(
body
).
then
(
response
=>
{
console
.
log
(
response
);
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"
S
uccess"
)
{
if
(
response
.
data
.
status
===
"
s
uccess"
)
{
this
.
getOutlookPAID
()
}
}
...
...
@@ -1031,7 +1055,7 @@ export default class OutlookPA extends Component {
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Review
<
/Typography
>
<
/div
>
<
/button
>
<
/div> :
this.state.lastStatus === 'WAITING FOR YOUR APPROVAL'
?
<
/div> :
(
this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' && this.state.btnApprove
)
?
<
div
className
=
"grid grid-2x"
style
=
{{
borderTop
:
'solid 1px #c4c4c4'
,
padding
:
10
,
backgroundColor
:
'#f5f5f5'
,
width
:
'100%'
,
}}
>
<
div
className
=
"col-1"
>
<
button
...
...
@@ -1298,7 +1322,7 @@ export default class OutlookPA extends Component {
<
div
className
=
"column-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
alignItems
:
'center'
}}
>
<
button
type
=
"button"
onClick
=
{()
=>
this
.
setState
({
visibleRevision
:
false
},
()
=>
this
.
approvalSubmission
(
'revision'
)
)}
onClick
=
{()
=>
this
.
validateRevision
(
)}
>
<
div
style
=
{{
width
:
102
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
Revision
<
/span
>
...
...
src/container/OutlookPA/BalanceSheetOLPA.js
View file @
ca54179b
...
...
@@ -359,10 +359,10 @@ export default class BalanceSheetOLPA extends Component {
}
async
downloadAllData
()
{
let
url
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?
submission_id=
${
this
.
props
.
submissionID
}
&&report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&revision=
${
this
.
props
.
revision
}
`
let
url
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?
outlook_pa_id=
${
this
.
props
.
outlook_pa_id
}
&&report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&revision=
${
this
.
props
.
revision
}
`
console
.
log
(
url
);
let
res
=
await
fetch
(
`https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?
submission_id=
${
this
.
props
.
submissionID
===
null
?
""
:
this
.
props
.
submissionID
}
&&report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&revision=
${
this
.
props
.
revision
}
`
`https://tia.eksad.com/tia-reporting-dev/public/transaction/outlook_pa/export_outlook_pa?
outlook_pa_id=
${
this
.
props
.
outlook_pa_id
===
null
?
""
:
this
.
props
.
outlook_pa_id
}
&&report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
&&revision=
${
this
.
props
.
revision
}
`
)
res
=
await
res
.
blob
()
this
.
setState
({
loading
:
false
})
...
...
@@ -370,7 +370,7 @@ export default class BalanceSheetOLPA extends Component {
let
url
=
window
.
URL
.
createObjectURL
(
res
);
let
a
=
document
.
createElement
(
'a'
);
a
.
href
=
url
;
a
.
download
=
'
Master Budget
Balance Sheet.xlsx'
;
a
.
download
=
'
Outlook PA
Balance Sheet.xlsx'
;
a
.
click
();
}
}
...
...
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