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
fa525afc
Commit
fa525afc
authored
Oct 02, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
dont need a reason See merge request
!432
parents
a339d97f
df694324
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
28 deletions
+28
-28
index.js
src/api/index.js
+6
-6
BudgetTahunan.js
src/container/BudgetTahunan.js
+3
-3
BalanceSheet.js
src/container/BudgetTahunan/BalanceSheet.js
+15
-15
CorporateAnnualTarget.js
src/container/BudgetTahunan/CorporateAnnualTarget.js
+4
-4
No files found.
src/api/index.js
View file @
fa525afc
...
@@ -184,10 +184,10 @@ const create = (type = "") => {
...
@@ -184,10 +184,10 @@ const create = (type = "") => {
const
deleteParameter
=
(
id
)
=>
api
.
post
(
`setting/delete_setting/
${
id
}
`
)
const
deleteParameter
=
(
id
)
=>
api
.
post
(
`setting/delete_setting/
${
id
}
`
)
//Transaction
//Transaction
const
getReportTypeBody
=
(
body
)
=>
api
.
post
(
'transaction/get_all_report'
,
body
)
const
getReportTypeBody
=
(
body
)
=>
api
.
post
(
'transaction/
master_budget/
get_all_report'
,
body
)
const
getMasterBudgetAtt
=
(
body
)
=>
api
.
post
(
'transaction/get_report_attachment'
,
body
)
const
getMasterBudgetAtt
=
(
body
)
=>
api
.
post
(
'transaction/
master_budget/
get_report_attachment'
,
body
)
const
uploadAttachment
=
(
body
)
=>
api
.
post
(
'transaction/upload_attachment'
,
body
)
const
uploadAttachment
=
(
body
)
=>
api
.
post
(
'transaction/
master_budget/
upload_attachment'
,
body
)
const
getRevision
=
(
body
)
=>
api
.
post
(
'transaction/get_revision'
,
body
)
const
getRevision
=
(
body
)
=>
api
.
post
(
'transaction/
master_budget/
get_revision'
,
body
)
const
getPeriodeTransaction
=
()
=>
api
.
get
(
'transaction/get_periode'
)
const
getPeriodeTransaction
=
()
=>
api
.
get
(
'transaction/get_periode'
)
const
deleteAttachment
=
(
id
)
=>
api
.
post
(
`transaction/delete_attachment/
${
id
}
`
)
const
deleteAttachment
=
(
id
)
=>
api
.
post
(
`transaction/delete_attachment/
${
id
}
`
)
const
getDetailReportMB
=
(
body
)
=>
api
.
post
(
'/transaction/master_budget/get_report_hierarki'
,
body
)
const
getDetailReportMB
=
(
body
)
=>
api
.
post
(
'/transaction/master_budget/get_report_hierarki'
,
body
)
...
@@ -203,8 +203,8 @@ const create = (type = "") => {
...
@@ -203,8 +203,8 @@ const create = (type = "") => {
const
checkIsSubmit
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/is_can_submit'
,
body
)
const
checkIsSubmit
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/is_can_submit'
,
body
)
const
checkApprover
=
()
=>
api
.
get
(
'transaction/master_budget/is_approver'
)
const
checkApprover
=
()
=>
api
.
get
(
'transaction/master_budget/is_approver'
)
const
approvalSubmission
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/approval_submission'
,
body
)
const
approvalSubmission
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/approval_submission'
,
body
)
const
getCompanySubmitted
=
(
body
)
=>
api
.
post
(
'transaction/get_company_submitted'
,
body
)
const
getCompanySubmitted
=
(
body
)
=>
api
.
post
(
'transaction/
master_budget/
get_company_submitted'
,
body
)
const
getLastPeriod
=
(
idCompany
)
=>
api
.
get
(
`transaction/get_last_periode/
${
idCompany
}
`
)
const
getLastPeriod
=
(
idCompany
)
=>
api
.
get
(
`transaction/
master_budget/
get_last_periode/
${
idCompany
}
`
)
const
getIdDeleteFromExcel
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/delete_from_excel'
,
body
)
const
getIdDeleteFromExcel
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/delete_from_excel'
,
body
)
const
getOpetratingIndID
=
(
body
)
=>
api
.
post
(
'transaction/get_operating_indicator_id'
,
body
)
const
getOpetratingIndID
=
(
body
)
=>
api
.
post
(
'transaction/get_operating_indicator_id'
,
body
)
...
...
src/container/BudgetTahunan.js
View file @
fa525afc
...
@@ -351,7 +351,7 @@ export default class BudgetTahunan extends Component {
...
@@ -351,7 +351,7 @@ export default class BudgetTahunan extends Component {
})
})
})
})
}
else
{
}
else
{
this
.
setState
({
submissionID
:
null
,
loading
:
null
})
this
.
setState
({
submissionID
:
null
,
loading
:
false
})
}
}
}
}
})
})
...
@@ -550,10 +550,10 @@ export default class BudgetTahunan extends Component {
...
@@ -550,10 +550,10 @@ export default class BudgetTahunan extends Component {
let
length
=
name
.
split
(
"."
).
length
let
length
=
name
.
split
(
"."
).
length
let
fileType
=
name
.
split
(
"."
)[
length
-
1
]
let
fileType
=
name
.
split
(
"."
)[
length
-
1
]
console
.
log
(
fileType
);
console
.
log
(
fileType
);
let
url
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/download_attachment?fileName=
${
fileurl
}
&&fileType=
${
fileType
}
`
let
url
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/
master_budget/
download_attachment?fileName=
${
fileurl
}
&&fileType=
${
fileType
}
`
// console.log(url);
// console.log(url);
let
res
=
await
fetch
(
let
res
=
await
fetch
(
`https://tia.eksad.com/tia-reporting-dev/public/transaction/download_attachment?fileName=
${
fileurl
}
&&fileType=
${
fileType
}
`
`https://tia.eksad.com/tia-reporting-dev/public/transaction/
master_budget/
download_attachment?fileName=
${
fileurl
}
&&fileType=
${
fileType
}
`
)
)
res
=
await
res
.
blob
()
res
=
await
res
.
blob
()
this
.
setState
({
loading
:
false
})
this
.
setState
({
loading
:
false
})
...
...
src/container/BudgetTahunan/BalanceSheet.js
View file @
fa525afc
This diff is collapsed.
Click to expand it.
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @
fa525afc
...
@@ -2028,7 +2028,7 @@ export default class CorporateAnnualTarget extends Component {
...
@@ -2028,7 +2028,7 @@ export default class CorporateAnnualTarget extends Component {
<
/div
>
<
/div
>
{
!
this
.
props
.
isApprover
&&
<
div
style
=
{{
width
:
'50%'
}}
>
{
!
this
.
props
.
isApprover
&&
<
div
style
=
{{
width
:
'50%'
}}
>
<
div
style
=
{{
justifyContent
:
'flex-end'
,
display
:
'flex'
,
flexFlow
:
'wrap'
}}
>
<
div
style
=
{{
justifyContent
:
'flex-end'
,
display
:
'flex'
,
flexFlow
:
'wrap'
}}
>
<
a
data
-
tip
=
{
'Download Template'
}
data
-
for
=
"template"
>
{((
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
)
&&
<
a
data
-
tip
=
{
'Download Template'
}
data
-
for
=
"template"
>
<
button
<
button
style
=
{{
style
=
{{
backgroundColor
:
'transparent'
,
backgroundColor
:
'transparent'
,
...
@@ -2040,7 +2040,7 @@ export default class CorporateAnnualTarget extends Component {
...
@@ -2040,7 +2040,7 @@ export default class CorporateAnnualTarget extends Component {
>
>
<
img
src
=
{
Images
.
template
}
/
>
<
img
src
=
{
Images
.
template
}
/
>
<
/button
>
<
/button
>
<
/a
>
<
/a>
}
<
ReactTooltip
border
=
{
true
}
id
=
"template"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
ReactTooltip
border
=
{
true
}
id
=
"template"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
{((
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
)
&&
<
a
data
-
tip
=
{
'Upload'
}
data
-
for
=
"upload"
>
{((
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
)
&&
<
a
data
-
tip
=
{
'Upload'
}
data
-
for
=
"upload"
>
<
button
<
button
...
@@ -2114,7 +2114,7 @@ export default class CorporateAnnualTarget extends Component {
...
@@ -2114,7 +2114,7 @@ export default class CorporateAnnualTarget extends Component {
<
/button
>
<
/button
>
<
/div
>
<
/div
>
{
!
this
.
props
.
isApprover
&&
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
{
!
this
.
props
.
isApprover
&&
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
<
button
{((
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
)
&&
<
button
className
=
"button"
className
=
"button"
type
=
"button"
type
=
"button"
style
=
{{
style
=
{{
...
@@ -2135,7 +2135,7 @@ export default class CorporateAnnualTarget extends Component {
...
@@ -2135,7 +2135,7 @@ export default class CorporateAnnualTarget extends Component {
<
div
style
=
{{
backgroundColor
:
'#fff'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
border
:
'solid 1px #354960'
}}
>
<
div
style
=
{{
backgroundColor
:
'#fff'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
border
:
'solid 1px #354960'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#354960'
,
textAlign
:
'center'
}}
>
Calculate
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#354960'
,
textAlign
:
'center'
}}
>
Calculate
<
/Typography
>
<
/div
>
<
/div
>
<
/button
>
<
/button>
}
{((
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
)
&&
<
button
{((
this
.
props
.
lastStatus
==
'SUBMIT'
||
this
.
props
.
lastStatus
==
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
)
&&
<
button
className
=
"button"
className
=
"button"
type
=
"button"
type
=
"button"
...
...
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