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
8c6e3f42
Commit
8c6e3f42
authored
Dec 07, 2020
by
Rifka Kurnia
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
permission See merge request
!759
parents
b356415d
760e55ed
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
106 additions
and
28 deletions
+106
-28
BudgetTahunan.js
src/container/BudgetTahunan.js
+35
-1
MonthlyReport.js
src/container/MonthlyReport.js
+38
-5
TaxPlanningMR.js
src/container/MonthlyReport/TaxPlanningMR.js
+33
-22
No files found.
src/container/BudgetTahunan.js
View file @
8c6e3f42
...
@@ -67,7 +67,9 @@ export default class BudgetTahunan extends Component {
...
@@ -67,7 +67,9 @@ export default class BudgetTahunan extends Component {
minDateRevision
:
new
Date
(),
minDateRevision
:
new
Date
(),
maxDateRevision
:
new
Date
(),
maxDateRevision
:
new
Date
(),
btnApprove
:
false
,
btnApprove
:
false
,
isAdmin
:
false
isAdmin
:
false
,
btncreate
:
false
,
loadview
:
false
}
}
this
.
myRef
=
React
.
createRef
()
this
.
myRef
=
React
.
createRef
()
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
...
@@ -84,9 +86,11 @@ export default class BudgetTahunan extends Component {
...
@@ -84,9 +86,11 @@ export default class BudgetTahunan extends Component {
// // console.log(this.props);
// // console.log(this.props);
this
.
setState
({
userType
:
this
.
props
.
location
.
state
.
userType
,
intent
:
'Home'
,
lastPeriod
:
this
.
props
.
location
.
state
.
rawData
.
periode
,
rawData
:
this
.
props
.
location
.
state
.
rawData
},
()
=>
{
this
.
setState
({
userType
:
this
.
props
.
location
.
state
.
userType
,
intent
:
'Home'
,
lastPeriod
:
this
.
props
.
location
.
state
.
rawData
.
periode
,
rawData
:
this
.
props
.
location
.
state
.
rawData
},
()
=>
{
this
.
checkApprover
()
this
.
checkApprover
()
this
.
getPermission
()
})
})
}
else
{
}
else
{
this
.
checkApprover
()
this
.
checkApprover
()
this
.
getPermission
()
}
}
}
}
...
@@ -152,6 +156,34 @@ export default class BudgetTahunan extends Component {
...
@@ -152,6 +156,34 @@ export default class BudgetTahunan extends Component {
})
})
}
}
getPermission
()
{
let
payload
=
{
menu
:
"master budget & cat"
}
api
.
create
().
getPermission
(
payload
).
then
(
response
=>
{
console
.
log
(
response
)
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
btncreate
:
response
.
data
.
data
.
create
,
loadview
:
response
.
data
.
data
.
view
})
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
if
(
response
.
data
.
message
.
includes
(
"Someone Logged In"
))
{
setTimeout
(()
=>
{
localStorage
.
removeItem
(
Constant
.
TOKEN
)
window
.
location
.
reload
();
},
1000
);
}
})
}
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
problem
,
tipeAlert
:
'error'
})
}
})
}
getCompanySubmitted
()
{
getCompanySubmitted
()
{
let
body
=
{
let
body
=
{
"periode"
:
this
.
state
.
periode
.
periode
"periode"
:
this
.
state
.
periode
.
periode
...
@@ -1489,6 +1521,8 @@ export default class BudgetTahunan extends Component {
...
@@ -1489,6 +1521,8 @@ export default class BudgetTahunan extends Component {
isApprover
=
{
this
.
state
.
isApprover
}
isApprover
=
{
this
.
state
.
isApprover
}
lastStatus
=
{
this
.
state
.
lastStatus
}
lastStatus
=
{
this
.
state
.
lastStatus
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
prevRevision
=
{
this
.
state
.
isSubmit
?
this
.
state
.
prevRevision
:
true
}
btncreate
=
{
this
.
state
.
btncreate
}
loadview
=
{
this
.
state
.
loadview
}
/
>
/
>
)
)
}
}
...
...
src/container/MonthlyReport.js
View file @
8c6e3f42
...
@@ -54,12 +54,43 @@ export default class MonthlyReport extends Component {
...
@@ -54,12 +54,43 @@ export default class MonthlyReport extends Component {
alert
:
false
,
alert
:
false
,
tipeAlert
:
''
,
tipeAlert
:
''
,
messageAlert
:
''
,
messageAlert
:
''
,
btncreate
:
false
,
loadview
:
false
}
}
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
}
getPermission
()
{
let
payload
=
{
menu
:
"monthly report"
}
api
.
create
().
getPermission
(
payload
).
then
(
response
=>
{
console
.
log
(
response
)
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
btncreate
:
response
.
data
.
data
.
create
,
loadview
:
response
.
data
.
data
.
view
})
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
if
(
response
.
data
.
message
.
includes
(
"Someone Logged In"
))
{
setTimeout
(()
=>
{
localStorage
.
removeItem
(
Constant
.
TOKEN
)
window
.
location
.
reload
();
},
1000
);
}
})
}
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
problem
,
tipeAlert
:
'error'
})
}
})
}
componentDidMount
()
{
componentDidMount
()
{
this
.
getChecApprover
()
this
.
getChecApprover
()
this
.
getPermission
()
this
.
setState
({
loading
:
true
})
this
.
setState
({
loading
:
true
})
// this.getCompanyActive()
// this.getCompanyActive()
}
}
...
@@ -70,13 +101,13 @@ export default class MonthlyReport extends Component {
...
@@ -70,13 +101,13 @@ export default class MonthlyReport extends Component {
if
(
response
.
data
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
if
(
response
.
data
.
status
===
"success"
)
{
// console.log(response);
// console.log(response);
if
(
response
.
data
.
data
.
is_approver
===
true
)
{
//
if (response.data.data.is_approver === true) {
this
.
setState
({
isApprover
:
true
,
checkApprover
:
true
},
()
=>
//
this.setState({ isApprover: true, checkApprover: true }, () =>
this
.
getPeriode
())
//
this.getPeriode())
}
else
{
//
} else {
this
.
setState
({
isApprover
:
false
,
checkApprover
:
false
},
()
=>
this
.
setState
({
isApprover
:
false
,
checkApprover
:
false
},
()
=>
this
.
getCompanyActive
())
this
.
getCompanyActive
())
}
//
}
}
else
{
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
if
(
response
.
data
.
message
.
includes
(
"Someone Logged In"
))
{
if
(
response
.
data
.
message
.
includes
(
"Someone Logged In"
))
{
...
@@ -1108,6 +1139,8 @@ export default class MonthlyReport extends Component {
...
@@ -1108,6 +1139,8 @@ export default class MonthlyReport extends Component {
month
=
{
this
.
state
.
month
}
month
=
{
this
.
state
.
month
}
saveToMonthlyReport
=
{
this
.
saveToMonthlyReport
.
bind
(
this
)}
saveToMonthlyReport
=
{
this
.
saveToMonthlyReport
.
bind
(
this
)}
onClickClose
=
{()
=>
this
.
setState
({
visibleTP
:
false
,
visibleMonthlyReport
:
true
})}
onClickClose
=
{()
=>
this
.
setState
({
visibleTP
:
false
,
visibleMonthlyReport
:
true
})}
btncreate
=
{
this
.
state
.
btncreate
}
loadview
=
{
this
.
state
.
loadview
}
// getReport={this.getCompanyActive.bind(this)}
// getReport={this.getCompanyActive.bind(this)}
/
>
/
>
)}
)}
...
...
src/container/MonthlyReport/TaxPlanningMR.js
View file @
8c6e3f42
...
@@ -62,6 +62,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -62,6 +62,7 @@ export default class TaxPlanningMR extends Component {
this
.
getSettingControl
()
this
.
getSettingControl
()
// this.getItemHierarki()
// this.getItemHierarki()
// this.getLatestUpdate()
// this.getLatestUpdate()
console
.
log
(
this
.
props
.
loadview
)
}
}
getSettingControl
()
{
getSettingControl
()
{
...
@@ -1112,7 +1113,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1112,7 +1113,7 @@ export default class TaxPlanningMR extends Component {
}
}
}
}
},
{
},
{
name
:
`Trial Balance (Fiscal) Actual
M
TD`
,
name
:
`Trial Balance (Fiscal) Actual
Y
TD`
,
options
:
{
options
:
{
customHeadRender
:
(
columnMeta
)
=>
(
customHeadRender
:
(
columnMeta
)
=>
(
<
th
style
=
{{
...
style2
,
backgroundColor
:
'#1c71b8'
,
color
:
'#fff'
,
fontSize
:
13
,
fontWeight
:
1
,
width
:
150
,
borderRight
:
"1px solid rgb(255, 255, 255)"
}}
>
<
th
style
=
{{
...
style2
,
backgroundColor
:
'#1c71b8'
,
color
:
'#fff'
,
fontSize
:
13
,
fontWeight
:
1
,
width
:
150
,
borderRight
:
"1px solid rgb(255, 255, 255)"
}}
>
...
@@ -1243,7 +1244,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1243,7 +1244,7 @@ export default class TaxPlanningMR extends Component {
}
}
}
}
},
{
},
{
name
:
`Trial Balance (Fiscal) MB
M
TD`
,
name
:
`Trial Balance (Fiscal) MB
Y
TD`
,
options
:
{
options
:
{
customHeadRender
:
(
columnMeta
)
=>
(
customHeadRender
:
(
columnMeta
)
=>
(
<
th
style
=
{{
...
style2
,
backgroundColor
:
'#1c71b8'
,
color
:
'#fff'
,
fontSize
:
13
,
fontWeight
:
1
,
width
:
150
,
borderRight
:
"1px solid rgb(255, 255, 255)"
}}
>
<
th
style
=
{{
...
style2
,
backgroundColor
:
'#1c71b8'
,
color
:
'#fff'
,
fontSize
:
13
,
fontWeight
:
1
,
width
:
150
,
borderRight
:
"1px solid rgb(255, 255, 255)"
}}
>
...
@@ -1455,6 +1456,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1455,6 +1456,7 @@ export default class TaxPlanningMR extends Component {
: */
}
: */
}
<
div
style
=
{{
justifyContent
:
'flex-end'
,
display
:
'flex'
,
flexFlow
:
'wrap'
}}
>
<
div
style
=
{{
justifyContent
:
'flex-end'
,
display
:
'flex'
,
flexFlow
:
'wrap'
}}
>
{
/* {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( */
}
{
/* {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( */
}
{
this
.
props
.
btncreate
===
true
&&
<
div
>
<
div
>
<
a
data
-
tip
=
{
'Download Template'
}
data
-
for
=
"template"
>
<
a
data
-
tip
=
{
'Download Template'
}
data
-
for
=
"template"
>
<
button
<
button
...
@@ -1471,8 +1473,10 @@ export default class TaxPlanningMR extends Component {
...
@@ -1471,8 +1473,10 @@ export default class TaxPlanningMR extends Component {
<
/a
>
<
/a
>
<
ReactTooltip
border
=
{
true
}
id
=
"template"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
ReactTooltip
border
=
{
true
}
id
=
"template"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
/div
>
<
/div
>
}
{
/* )} */
}
{
/* )} */
}
{
/* {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( */
}
{
/* {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( */
}
{
this
.
props
.
btncreate
===
true
&&
<
div
>
<
div
>
<
a
data
-
tip
=
{
'Upload'
}
data
-
for
=
"upload"
>
<
a
data
-
tip
=
{
'Upload'
}
data
-
for
=
"upload"
>
<
button
<
button
...
@@ -1491,7 +1495,10 @@ export default class TaxPlanningMR extends Component {
...
@@ -1491,7 +1495,10 @@ export default class TaxPlanningMR extends Component {
<
/a
>
<
/a
>
<
ReactTooltip
border
=
{
true
}
id
=
"upload"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
ReactTooltip
border
=
{
true
}
id
=
"upload"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
/div
>
<
/div
>
}
{
/* )} */
}
{
/* )} */
}
{(
this
.
props
.
loadview
===
true
||
this
.
props
.
btncreate
===
true
)
&&
(
<
div
>
<
a
data
-
tip
=
{
'Download'
}
data
-
for
=
"download"
>
<
a
data
-
tip
=
{
'Download'
}
data
-
for
=
"download"
>
<
button
<
button
style
=
{{
style
=
{{
...
@@ -1513,6 +1520,8 @@ export default class TaxPlanningMR extends Component {
...
@@ -1513,6 +1520,8 @@ export default class TaxPlanningMR extends Component {
<
/a
>
<
/a
>
<
ReactTooltip
border
=
{
true
}
id
=
"download"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
ReactTooltip
border
=
{
true
}
id
=
"download"
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
<
/div
>
<
/div
>
)}
<
/div
>
{
/* } */
}
{
/* } */
}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
@@ -1553,6 +1562,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1553,6 +1562,7 @@ export default class TaxPlanningMR extends Component {
<
/div
>
<
/div
>
{
/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
{
/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */
}
(this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */
}
{
this
.
props
.
btncreate
===
true
&&
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
<
button
<
button
className
=
"button"
className
=
"button"
...
@@ -1630,6 +1640,7 @@ export default class TaxPlanningMR extends Component {
...
@@ -1630,6 +1640,7 @@ export default class TaxPlanningMR extends Component {
<
/div
>
<
/div
>
<
/button
>
<
/button
>
<
/div
>
<
/div
>
}
{
/* : null } */
}
{
/* : null } */
}
<
/div
>
<
/div
>
<
/Paper
>
<
/Paper
>
...
...
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