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
da5dc009
Commit
da5dc009
authored
Oct 06, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deni-dev(pc)' into 'master'
Deni dev(pc) See merge request
!472
parents
d02daf74
18f5034c
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
77 additions
and
45 deletions
+77
-45
index.js
src/api/index.js
+10
-2
BudgetTahunan.js
src/container/BudgetTahunan.js
+3
-3
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 @
da5dc009
...
...
@@ -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 @
da5dc009
...
...
@@ -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/Otorisasi/User.js
View file @
da5dc009
...
...
@@ -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 @
da5dc009
This diff is collapsed.
Click to expand it.
src/container/OutlookPA/BalanceSheetOLPA.js
View file @
da5dc009
...
...
@@ -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