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
ec57c218
Commit
ec57c218
authored
Oct 02, 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
43fc86b5
5c0eccfe
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
153 additions
and
84 deletions
+153
-84
index.js
src/api/index.js
+3
-1
BudgetTahunan.js
src/container/BudgetTahunan.js
+110
-43
BalanceSheet.js
src/container/BudgetTahunan/BalanceSheet.js
+19
-19
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+1
-1
ProfitLoss.js
src/container/BudgetTahunan/ProfitLoss.js
+20
-20
No files found.
src/api/index.js
View file @
ec57c218
...
...
@@ -203,6 +203,7 @@ const create = (type = "") => {
const
checkIsSubmit
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/is_can_submit'
,
body
)
const
checkApprover
=
()
=>
api
.
get
(
'transaction/master_budget/is_approver'
)
const
approvalSubmission
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/approval_submission'
,
body
)
const
getCompanySubmitted
=
(
body
)
=>
api
.
post
(
'transaction/get_company_submitted'
,
body
)
const
getIdDeleteFromExcel
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/delete_from_excel'
,
body
)
const
getOpetratingIndID
=
(
body
)
=>
api
.
post
(
'transaction/get_operating_indicator_id'
,
body
)
...
...
@@ -365,7 +366,8 @@ const create = (type = "") => {
getDashboard
,
historyApproval
,
checkApprover
,
approvalSubmission
approvalSubmission
,
getCompanySubmitted
}
}
...
...
src/container/BudgetTahunan.js
View file @
ec57c218
This diff is collapsed.
Click to expand it.
src/container/BudgetTahunan/BalanceSheet.js
View file @
ec57c218
This diff is collapsed.
Click to expand it.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
ec57c218
...
...
@@ -396,7 +396,7 @@ export default class FixedAssetsMovement extends Component {
let
url
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?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
}
`
console
.
log
(
url
);
let
res
=
await
fetch
(
`https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?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
}
`
`https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_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
})
...
...
src/container/BudgetTahunan/ProfitLoss.js
View file @
ec57c218
...
...
@@ -408,9 +408,10 @@ export default class ProfitLoss extends Component {
async
downloadAllData
()
{
let
url
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?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
sub_null
=
`https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_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/master_budget/export_master_budget?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
}
`
this
.
props
.
submissionID
==
null
?
sub_null
:
url
)
res
=
await
res
.
blob
()
this
.
setState
({
loading
:
false
})
...
...
@@ -504,7 +505,6 @@ export default class ProfitLoss extends Component {
dataTable2
[
tableMeta
.
rowIndex
][
20
]
=
R
.
equals
(
value
,
NaN
)
?
"0.0"
:
value
return
R
.
equals
(
value
,
NaN
)
?
"0.0"
:
value
}
else
if
(
indexParent
!==
-
1
&&
String
(
dataTable2
[
indexParent
][
5
]).
toLocaleUpperCase
()
==
"GROSS PROFIT MARGIN (% OF REVENUE)"
)
{
// console.log("oke")
return
handleFormula
(
0
,
tableMeta
,
0
)
}
else
{
...
...
@@ -1901,15 +1901,15 @@ export default class ProfitLoss extends Component {
// null
:
tableMeta
.
rowData
[
0
]
===
5
?
//
<NumberFormat
//
thousandSeparator={true}
//
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
//
type="text"
//
placeholder=""
//
disabled={true}
// val
ue={handleFormula(value, tableMeta)}
/
/ /
>
null
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleFormula
(
value
,
tableMeta
,
13
)).
toFixed
(
1
)}
ue
=
{
handleFormula
(
value
,
tableMeta
)}
/
>
//
null
:
tableMeta
.
rowData
[
0
]
===
1
?
// value === "" ?
...
...
@@ -1991,15 +1991,15 @@ export default class ProfitLoss extends Component {
// null
:
tableMeta
.
rowData
[
0
]
===
5
?
//
<NumberFormat
//
thousandSeparator={true}
//
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
//
type="text"
//
placeholder=""
//
disabled={true}
// val
ue={handleFormula(value, tableMeta)}
/
/ /
>
null
<
NumberFormat
thousandSeparator
=
{
true
}
style
=
{{
fontSize
:
12
,
textAlign
:
'right'
,
borderColor
:
'transparent'
,
margin
:
0
,
width
:
96
,
backgroundColor
:
'transparent'
}}
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleFormula
(
value
,
tableMeta
,
14
)).
toFixed
(
1
)}
ue
=
{
handleFormula
(
value
,
tableMeta
)}
/
>
//
null
:
tableMeta
.
rowData
[
0
]
===
1
?
// value === "" ?
...
...
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