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
1aa4afec
Commit
1aa4afec
authored
Sep 18, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
apdet See merge request
!328
parents
2aad00c5
e520cc27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
index.js
src/api/index.js
+6
-5
OperatingIndicator.js
src/container/OprIndicator/OperatingIndicator.js
+6
-5
OperatingIndicatorDetail.js
src/container/OprIndicator/OperatingIndicatorDetail.js
+1
-2
No files found.
src/api/index.js
View file @
1aa4afec
...
...
@@ -194,10 +194,10 @@ const create = (type = "") => {
const
checkUploadMB
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/check_import'
,
body
)
const
uploadMasterBudget
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/import_master_budget'
,
body
)
const
getAllOperatingInd
=
(
body
)
=>
api
.
post
(
'
/
transaction/get_all_operating_indicator_report'
,
body
)
const
getOperatingIndDetail
=
(
body
)
=>
api
.
post
(
'
/
transaction/operating_indicator/get_operating_indicator_report_hierarki'
,
body
)
const
createOpetaingInd
=
(
body
)
=>
api
.
post
(
'
/
transaction/operating_indicator/create_submission_report'
,
body
)
const
getOpetratingIndID
=
(
body
)
=>
api
.
post
(
'transaction/get_operating_indicator_id'
,
body
)
const
getAllOperatingInd
=
(
body
)
=>
api
.
post
(
'transaction/get_all_operating_indicator_report'
,
body
)
const
getOperatingIndDetail
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/get_operating_indicator_report_hierarki'
,
body
)
const
createOpetaingInd
=
(
body
)
=>
api
.
post
(
'transaction/operating_indicator/create_submission_report'
,
body
)
//Template
const
downloadTemplate
=
(
fileName
,
fileType
)
=>
api
.
get
(
`attachment/download_file?fileName=
${
fileName
}
&&fileType=
${
fileType
}
`
)
...
...
@@ -333,7 +333,8 @@ const create = (type = "") => {
getOperatingIndDetail
,
createOpetaingInd
,
uploadMasterBudget
,
getAllSettingByType
getAllSettingByType
,
getOpetratingIndID
}
}
...
...
src/container/OprIndicator/OperatingIndicator.js
View file @
1aa4afec
...
...
@@ -26,7 +26,7 @@ export default class OperatingIndicator extends Component {
report_id
:
null
,
listAttachment
:
[],
visibleUpload
:
false
,
submission
ID
:
null
operatingInd
ID
:
null
}
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
...
...
@@ -161,12 +161,13 @@ export default class OperatingIndicator extends Component {
"company_id"
:
this
.
state
.
company
.
company_id
,
"periode"
:
this
.
state
.
periode
.
periode
}
api
.
create
().
get
Submission
(
payload
).
then
(
response
=>
{
api
.
create
().
get
OpetratingIndID
(
payload
).
then
(
response
=>
{
if
(
response
)
{
console
.
log
(
response
.
data
.
data
)
if
(
response
.
data
.
data
)
{
this
.
setState
({
submissionID
:
response
.
data
.
data
.
submission
_id
})
this
.
setState
({
operatingIndID
:
response
.
data
.
data
.
operating_indicator
_id
})
}
else
{
this
.
setState
({
submission
ID
:
null
})
this
.
setState
({
operatingInd
ID
:
null
})
}
}
})
...
...
@@ -176,7 +177,7 @@ export default class OperatingIndicator extends Component {
let
index
=
this
.
state
.
dataReport
.
findIndex
((
val
)
=>
val
.
report_name
==
item
[
1
])
if
(
index
!==
-
1
)
{
this
.
setState
({
dataDetail
:
{...
this
.
state
.
dataReport
[
index
],
periode
:
this
.
state
.
periode
.
periode
,
submissionID
:
this
.
state
.
submission
ID
,
company
:
this
.
state
.
company
},
dataDetail
:
{...
this
.
state
.
dataReport
[
index
],
periode
:
this
.
state
.
periode
.
periode
,
operatingIndID
:
this
.
state
.
operatingInd
ID
,
company
:
this
.
state
.
company
},
visibleOperatingIndicator
:
false
,
visibleDetailOpt
:
true
,
})
...
...
src/container/OprIndicator/OperatingIndicatorDetail.js
View file @
1aa4afec
...
...
@@ -59,9 +59,8 @@ export default class BalanceSheet extends Component {
getDataDetail
()
{
this
.
setState
({
loading
:
true
})
let
payload
=
{
"
submission_id"
:
this
.
props
.
data
.
submission
ID
,
"
operating_indicator_id"
:
this
.
props
.
data
.
operatingInd
ID
,
"report_id"
:
this
.
props
.
data
.
report_id
,
"revision"
:
Number
(
this
.
props
.
data
.
revision
),
"company_id"
:
this
.
props
.
data
.
company
.
company_id
,
"periode"
:
this
.
props
.
data
.
periode
}
...
...
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