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
64b7c62d
Commit
64b7c62d
authored
Sep 28, 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
!381
parents
cb751107
a695d679
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
391 additions
and
62 deletions
+391
-62
index.js
src/api/index.js
+3
-1
BudgetTahunan.js
src/container/BudgetTahunan.js
+30
-4
MonthlyReport.js
src/container/MonthlyReport.js
+70
-57
BalanceSheetMR.js
src/container/MonthlyReport/BalanceSheetMR.js
+288
-0
No files found.
src/api/index.js
View file @
64b7c62d
...
@@ -199,6 +199,7 @@ const create = (type = "") => {
...
@@ -199,6 +199,7 @@ const create = (type = "") => {
const
validateSubmitReport
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/validate_save'
,
body
)
const
validateSubmitReport
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/validate_save'
,
body
)
const
getMonthTransaction
=
()
=>
api
.
get
(
'transaction/get_default_month'
)
const
getMonthTransaction
=
()
=>
api
.
get
(
'transaction/get_default_month'
)
const
countingFormula
=
(
body
)
=>
api
.
post
(
'transaction/counting_formula'
,
body
)
const
countingFormula
=
(
body
)
=>
api
.
post
(
'transaction/counting_formula'
,
body
)
const
submitMasterBudget
=
(
body
)
=>
api
.
post
(
'transaction/master_budget/submit_master_budget'
,
body
)
const
getOpetratingIndID
=
(
body
)
=>
api
.
post
(
'transaction/get_operating_indicator_id'
,
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
getAllOperatingInd
=
(
body
)
=>
api
.
post
(
'transaction/get_all_operating_indicator_report'
,
body
)
...
@@ -352,7 +353,8 @@ const create = (type = "") => {
...
@@ -352,7 +353,8 @@ const create = (type = "") => {
checkUploadOperatingInd
,
checkUploadOperatingInd
,
uploadOperatingInd
,
uploadOperatingInd
,
getLastestUpdateMB
,
getLastestUpdateMB
,
countingFormula
countingFormula
,
submitMasterBudget
}
}
}
}
...
...
src/container/BudgetTahunan.js
View file @
64b7c62d
...
@@ -17,6 +17,7 @@ import { format } from 'date-fns';
...
@@ -17,6 +17,7 @@ import { format } from 'date-fns';
import
Constant
from
'../library/Constant'
;
import
Constant
from
'../library/Constant'
;
import
PropagateLoader
from
"react-spinners/PropagateLoader"
import
PropagateLoader
from
"react-spinners/PropagateLoader"
import
CashFlow
from
'./BudgetTahunan/CashFlow'
;
import
CashFlow
from
'./BudgetTahunan/CashFlow'
;
import
{
validate
}
from
'@material-ui/pickers'
;
var
ct
=
require
(
"../library/CustomTable"
);
var
ct
=
require
(
"../library/CustomTable"
);
const
getMuiTheme
=
()
=>
createMuiTheme
(
ct
.
customTable
());
const
getMuiTheme
=
()
=>
createMuiTheme
(
ct
.
customTable
());
...
@@ -289,7 +290,7 @@ export default class BudgetTahunan extends Component {
...
@@ -289,7 +290,7 @@ export default class BudgetTahunan extends Component {
visibleTP
:
false
,
visibleTP
:
false
,
visibleCF
:
false
,
visibleCF
:
false
,
})
})
}
else
if
(
item
===
"Cash Flow"
){
}
else
if
(
item
===
"Cash Flow"
)
{
this
.
setState
({
this
.
setState
({
visibleBudgetTahunan
:
false
,
visibleBudgetTahunan
:
false
,
visibleBS
:
false
,
visibleBS
:
false
,
...
@@ -372,6 +373,21 @@ export default class BudgetTahunan extends Component {
...
@@ -372,6 +373,21 @@ export default class BudgetTahunan extends Component {
})
})
}
}
validate
()
{
let
array
=
[]
this
.
state
.
dataTable
.
map
(
item
=>
{
if
(
item
[
3
].
includes
(
"not-yet"
)
||
item
[
3
].
includes
(
"draft"
))
{
array
.
push
(
item
[
3
])
}
else
{
array
.
push
(
item
[
3
])
}
})
if
(
array
.
includes
(
"not-yet"
||
"draft"
))
{
console
.
log
(
'gagal'
);
}
else
{
console
.
log
(
'masuk'
);
}
}
render
()
{
render
()
{
const
columns
=
[
"#"
,
"Report Type"
,
const
columns
=
[
"#"
,
"Report Type"
,
...
@@ -606,9 +622,19 @@ export default class BudgetTahunan extends Component {
...
@@ -606,9 +622,19 @@ export default class BudgetTahunan extends Component {
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
style
=
{{
borderTop
:
'solid 1px #c4c4c4'
,
padding
:
10
,
backgroundColor
:
'#f5f5f5'
,
width
:
'100%'
,
display
:
'flex'
,
justifyContent
:
'flex-end'
}}
>
<
div
style
=
{{
borderTop
:
'solid 1px #c4c4c4'
,
padding
:
10
,
backgroundColor
:
'#f5f5f5'
,
width
:
'100%'
,
display
:
'flex'
,
justifyContent
:
'flex-end'
}}
>
<
button
style
=
{{
backgroundColor
:
'transparent'
,
cursor
:
'pointer'
,
borderColor
:
'transparent'
,
outline
:
'none'
,
}}
onClick
=
{()
=>
this
.
validate
()}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
div
style
=
{{
backgroundColor
:
'#354960'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Submit
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Submit
<
/Typography
>
<
/div
>
<
/div
>
<
/button
>
<
/div
>
<
/div
>
<
/Paper
>
<
/Paper
>
...
...
src/container/MonthlyReport.js
View file @
64b7c62d
...
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
...
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
import
{
Typography
,
Paper
,
TextField
,
MenuItem
,
Select
,
FormControlLabel
}
from
'@material-ui/core'
;
import
{
Typography
,
Paper
,
TextField
,
MenuItem
,
Select
,
FormControlLabel
}
from
'@material-ui/core'
;
import
MUIDataTable
from
'mui-datatables'
;
import
MUIDataTable
from
'mui-datatables'
;
import
Images
from
'../assets/Images'
;
import
Images
from
'../assets/Images'
;
import
BalanceSheet
from
'./BudgetTahunan/BalanceSheet'
;
import
api
from
'../api'
;
import
api
from
'../api'
;
import
Autocomplete
from
'@material-ui/lab/Autocomplete'
;
import
Autocomplete
from
'@material-ui/lab/Autocomplete'
;
import
{
titleCase
}
from
'../library/Utils'
;
import
{
titleCase
}
from
'../library/Utils'
;
...
@@ -13,6 +12,7 @@ import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
...
@@ -13,6 +12,7 @@ import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
import
{
ExcelRenderer
}
from
'react-excel-renderer'
;
import
{
ExcelRenderer
}
from
'react-excel-renderer'
;
import
UploadFile
from
"../library/Upload"
;
import
UploadFile
from
"../library/Upload"
;
import
{
format
}
from
'date-fns'
;
import
{
format
}
from
'date-fns'
;
import
BalanceSheetMR
from
'./MonthlyReport/BalanceSheetMR'
;
export
default
class
MonthlyReport
extends
Component
{
export
default
class
MonthlyReport
extends
Component
{
constructor
(
props
)
{
constructor
(
props
)
{
...
@@ -161,8 +161,12 @@ export default class MonthlyReport extends Component {
...
@@ -161,8 +161,12 @@ export default class MonthlyReport extends Component {
})
})
}
}
clickDetail
(
item
,
id
)
{
clickDetail
(
item
,
id
,
revision
,
status
)
{
this
.
setState
({
report_id
:
id
})
this
.
setState
({
report_id
:
id
,
revisionTable
:
revision
,
status
:
status
},
()
=>
{
if
(
item
===
'Balance Sheet'
)
{
if
(
item
===
'Balance Sheet'
)
{
this
.
setState
({
this
.
setState
({
visibleMonthlyReport
:
false
,
visibleMonthlyReport
:
false
,
...
@@ -209,6 +213,7 @@ export default class MonthlyReport extends Component {
...
@@ -209,6 +213,7 @@ export default class MonthlyReport extends Component {
visibleTP
:
false
visibleTP
:
false
})
})
}
}
})
}
}
handleChange
(
value
,
tableMeta
)
{
handleChange
(
value
,
tableMeta
)
{
...
@@ -312,9 +317,9 @@ export default class MonthlyReport extends Component {
...
@@ -312,9 +317,9 @@ export default class MonthlyReport extends Component {
cursor
:
tableMeta
.
rowData
[
5
]
?
'pointer'
:
null
,
cursor
:
tableMeta
.
rowData
[
5
]
?
'pointer'
:
null
,
borderColor
:
'transparent'
borderColor
:
'transparent'
}}
}}
//
onClick={() =>
onClick
=
{()
=>
// tableMeta.rowData[5] ? this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4
]) : null
tableMeta
.
rowData
[
5
]
?
this
.
clickDetail
(
tableMeta
.
rowData
[
1
],
tableMeta
.
rowData
[
4
],
tableMeta
.
rowData
[
2
],
tableMeta
.
rowData
[
3
])
:
null
//
}
}
>
>
<
Typography
style
=
{{
color
:
tableMeta
.
rowData
[
5
]
?
'#5198ea'
:
'GrayText'
,
fontSize
:
12
,
}}
>
Detail
<
/Typography
>
<
Typography
style
=
{{
color
:
tableMeta
.
rowData
[
5
]
?
'#5198ea'
:
'GrayText'
,
fontSize
:
12
,
}}
>
Detail
<
/Typography
>
<
/button
>
<
/button
>
...
@@ -530,10 +535,18 @@ export default class MonthlyReport extends Component {
...
@@ -530,10 +535,18 @@ export default class MonthlyReport extends Component {
)}
)}
{
this
.
state
.
visibleBS
&&
(
{
this
.
state
.
visibleBS
&&
(
<
BalanceSheet
<
BalanceSheetMR
open
=
{
this
.
props
.
open
}
report_id
=
{
this
.
state
.
report_id
}
report_id
=
{
this
.
state
.
report_id
}
height
=
{
this
.
props
.
height
}
width
=
{
this
.
props
.
width
}
company
=
{
this
.
state
.
company
}
company
=
{
this
.
state
.
company
}
onClickClose
=
{()
=>
this
.
setState
({
visibleBS
:
false
,
visibleMonthlyReport
:
true
})}
revision
=
{
this
.
state
.
revisionTable
}
periode
=
{
this
.
state
.
periode
.
periode
}
submissionID
=
{
this
.
state
.
submissionID
}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose
=
{()
=>
this
.
setState
({
visibleBS
:
false
,
visibleBudgetTahunan
:
true
})}
// getReport={this.getCompanyActive.bind(this)}
/
>
/
>
)}
)}
{
this
.
state
.
visiblePL
&&
(
{
this
.
state
.
visiblePL
&&
(
...
...
src/container/MonthlyReport/BalanceSheetMR.js
0 → 100644
View file @
64b7c62d
This diff is collapsed.
Click to expand it.
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