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
8fcf1da3
Commit
8fcf1da3
authored
Aug 27, 2020
by
EKSAD
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
460d7067
0b643fd5
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
394 additions
and
136 deletions
+394
-136
Images.js
src/assets/Images.js
+3
-1
meeting.jpg
src/assets/meeting.jpg
+0
-0
triputra-black.jpg
src/assets/triputra-black.jpg
+0
-0
CreateApprovalMatrix.js
src/container/ApprovalMatrix/CreateApprovalMatrix.js
+10
-10
EditApprovalMatrix.js
src/container/ApprovalMatrix/EditApprovalMatrix.js
+9
-9
BudgetTahunan.js
src/container/BudgetTahunan.js
+2
-0
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+328
-85
Login.js
src/container/Login.js
+18
-7
User.js
src/container/Otorisasi/User.js
+22
-1
EditUser.js
src/container/Otorisasi/User/EditUser.js
+2
-23
No files found.
src/assets/Images.js
View file @
8fcf1da3
...
...
@@ -46,7 +46,9 @@ const Images = {
failedCopy
:
require
(
'./failed-copy.svg'
),
triputraLogo
:
require
(
'./triputra-logo.png'
),
photo
:
require
(
'./photo.svg'
),
camera
:
require
(
'./camera.svg'
)
camera
:
require
(
'./camera.svg'
),
meeting
:
require
(
'./meeting.jpg'
),
triputraBlack
:
require
(
'./triputra-black.jpg'
),
}
...
...
src/assets/meeting.jpg
0 → 100644
View file @
8fcf1da3
This diff is collapsed.
Click to expand it.
src/assets/triputra-black.jpg
0 → 100644
View file @
8fcf1da3
26.5 KB
src/container/ApprovalMatrix/CreateApprovalMatrix.js
View file @
8fcf1da3
...
...
@@ -71,7 +71,7 @@ export default class CreateApprovalMatrix extends Component {
};
this
.
setState
({
approvedBy
:
defaultProps
,
userData
:
response
.
data
.
data
})
}
else
{
alert
(
'Approver: '
+
response
.
data
.
message
)
alert
(
'Approver
Name
: '
+
response
.
data
.
message
)
}
})
}
...
...
@@ -157,22 +157,22 @@ export default class CreateApprovalMatrix extends Component {
validasi
()
{
if
(
R
.
isNil
(
this
.
state
.
typeId
))
{
this
.
setState
({
errorType
:
true
,
msgErrType
:
'Approval Type
is Required
'
})
this
.
setState
({
errorType
:
true
,
msgErrType
:
'Approval Type
Cannot be Empty
'
})
}
else
if
(
R
.
isEmpty
(
this
.
state
.
order
))
{
this
.
setState
({
errorOrder
:
true
,
msgErrOrder
:
'Order
is Required
'
})
this
.
setState
({
errorOrder
:
true
,
msgErrOrder
:
'Order
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
userId
))
{
// return alert("Pemberi Persetujuan tidak boleh kosong");
this
.
setState
({
errorApproved
:
true
,
msgErrApproved
:
'Approver
is Required
'
})
this
.
setState
({
errorApproved
:
true
,
msgErrApproved
:
'Approver
Name Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
operatorId
))
{
this
.
setState
({
errorOperator
:
true
,
msgErrOperator
:
'Operator
is Required
'
})
this
.
setState
({
errorOperator
:
true
,
msgErrOperator
:
'Operator
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorStartDate
:
'
Start Date is Required
'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorStartDate
:
'
Valid From Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorEndDate
:
'
End Date is Required
'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorEndDate
:
'
Valid To Cannot be Empty
'
})
}
else
{
console
.
log
(
'masuk'
);
let
payload
=
{
...
...
@@ -299,7 +299,7 @@ export default class CreateApprovalMatrix extends Component {
debug
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
label
=
"Approver"
label
=
"Approver
Name
"
onChange
=
{(
e
)
=>
this
.
handleChange
(
e
,
''
)}
error
=
{
this
.
state
.
errorApproved
}
helperText
=
{
this
.
state
.
msgErrApproved
}
...
...
@@ -353,7 +353,7 @@ export default class CreateApprovalMatrix extends Component {
<
DatePicker
margin
=
"normal"
id
=
"startDate"
label
=
"
Start Date
"
label
=
"
Valid From
"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
startDate
==
""
?
null
:
this
.
state
.
startDate
}
onChange
=
{(
e
)
=>
this
.
handleChange
(
e
,
'start_date'
)}
...
...
@@ -382,7 +382,7 @@ export default class CreateApprovalMatrix extends Component {
<
DatePicker
margin
=
"normal"
id
=
"endDate"
label
=
"
End Date
"
label
=
"
Valid To
"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
endDate
==
""
?
null
:
this
.
state
.
endDate
}
error
=
{
this
.
state
.
errorEndDate
}
...
...
src/container/ApprovalMatrix/EditApprovalMatrix.js
View file @
8fcf1da3
...
...
@@ -176,21 +176,21 @@ export default class EditApprovalMatrix extends Component {
validasi
()
{
if
(
R
.
isNil
(
this
.
state
.
getTypes
))
{
this
.
setState
({
errorType
:
true
,
msgErrType
:
'Approval Type
is Required
'
})
this
.
setState
({
errorType
:
true
,
msgErrType
:
'Approval Type
Cannot be Empty
'
})
}
else
if
(
R
.
isEmpty
(
this
.
state
.
order
))
{
this
.
setState
({
errorOrder
:
true
,
msgErrOrder
:
'Order
is Required
'
})
this
.
setState
({
errorOrder
:
true
,
msgErrOrder
:
'Order
Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
getApprovedBy
))
{
this
.
setState
({
errorApproved
:
true
,
msgErrApproved
:
'Approver
is Required
'
})
this
.
setState
({
errorApproved
:
true
,
msgErrApproved
:
'Approver
Name Cannot be Empty
'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
getOperators
))
{
this
.
setState
({
errorOperator
:
true
,
msgErrOperator
:
'Operator
is Required
'
})
this
.
setState
({
errorOperator
:
true
,
msgErrOperator
:
'Operator
Cannot be Empty
'
})
}
else
if
(
R
.
isEmpty
(
this
.
state
.
startDate
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorStartDate
:
'
Start Date is Required
'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorStartDate
:
'
Valid From Cannot be Empty
'
})
}
else
if
(
R
.
isEmpty
(
this
.
state
.
endDate
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorEndDate
:
'
End Date is Required
'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorEndDate
:
'
Valid To Cannot be Empty
'
})
}
else
{
console
.
log
(
'masuk'
);
if
(
this
.
props
.
type
==
'edit'
)
{
...
...
@@ -319,7 +319,7 @@ export default class EditApprovalMatrix extends Component {
onChange
=
{(
event
,
newInputValue
)
=>
this
.
setState
({
getApprovedBy
:
newInputValue
},
()
=>
this
.
clearError
())}
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
label
=
"Approver"
label
=
"Approver
Name
"
onChange
=
{(
e
)
=>
this
.
handleChange
(
e
,
''
)}
error
=
{
this
.
state
.
errorApproved
}
helperText
=
{
this
.
state
.
msgErrApproved
}
...
...
@@ -373,7 +373,7 @@ export default class EditApprovalMatrix extends Component {
<
DatePicker
margin
=
"normal"
id
=
"startDate"
label
=
"
Start Date
"
label
=
"
Valid From
"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
startDate
}
onChange
=
{(
e
)
=>
this
.
handleChange
(
e
,
'start_date'
)}
...
...
@@ -402,7 +402,7 @@ export default class EditApprovalMatrix extends Component {
<
DatePicker
margin
=
"normal"
id
=
"endDate"
label
=
"
End Date
"
label
=
"
Valid To
"
format
=
"dd MMMM yyyy"
error
=
{
this
.
state
.
errorEndDate
}
helperText
=
{
this
.
state
.
msgErrorEndDate
}
...
...
src/container/BudgetTahunan.js
View file @
8fcf1da3
...
...
@@ -326,6 +326,8 @@ export default class BudgetTahunan extends Component {
)}
{
this
.
state
.
visibleTP
&&
(
<
TaxPlanning
report_id
=
{
this
.
state
.
report_id
}
company
=
{
this
.
state
.
company
}
onClickClose
=
{()
=>
this
.
setState
({
visibleTP
:
false
,
visibleBudgetTahunan
:
true
})}
/
>
)}
...
...
src/container/BudgetTahunan/TaxPlanning.js
View file @
8fcf1da3
This diff is collapsed.
Click to expand it.
src/container/Login.js
View file @
8fcf1da3
...
...
@@ -36,7 +36,9 @@ class Login extends Component {
rememberMe
:
false
,
alert
:
false
,
tipeAlert
:
''
,
messageAlert
:
''
messageAlert
:
''
,
width
:
0
,
height
:
0
}
}
...
...
@@ -47,6 +49,14 @@ class Login extends Component {
console
.
log
(
email
)
}
getWindowDimensions
()
{
const
{
innerWidth
:
width
,
innerHeight
:
height
}
=
window
;
this
.
setState
({
width
,
height
})
}
handleChange
(
e
)
{
let
data
=
this
.
state
this
.
setState
({
...
data
,
[
e
.
target
.
name
]:
e
.
target
.
value
})
...
...
@@ -136,19 +146,19 @@ class Login extends Component {
{
this
.
state
.
messageAlert
}
<
/Alert
>
<
/Snackbar
>
<
div
style
=
{{
width
:
'50%'
,
height
:
'100vh'
,
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
flexDirection
:
'column
'
}}
>
<
img
src
=
{
Images
.
tia
}
/
>
<
img
src
=
{
Images
.
imageLogin
}
style
=
{{
marginTop
:
30
}}
/
>
<
div
style
=
{{
width
:
'50%'
,
display
:
'grid
'
}}
>
<
img
src
=
{
Images
.
meeting
}
style
=
{{
objectFit
:
'fill'
,
width
:
'100%'
,
height
:
'100%'
}}
/
>
{
/* <img src={Images.imageLogin} style={{ marginTop: 30 }} /> */
}
<
/div
>
<
div
style
=
{{
width
:
'50%'
,
height
:
'100vh'
,
backgroundColor
:
'#
152d4
0'
,
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
flexDirection
:
'column'
}}
>
<
div
style
=
{{
width
:
'50%'
,
height
:
'100vh'
,
backgroundColor
:
'#
263b8
0'
,
display
:
'flex'
,
justifyContent
:
'center'
,
alignItems
:
'center'
,
flexDirection
:
'column'
}}
>
<
form
onSubmit
=
{(
e
)
=>
{
e
.
preventDefault
()
this
.
validateLogin
()
}}
>
<
div
style
=
{{
paddingTop
:
56
,
padding
Left
:
54
,
paddingRight
:
54
,
display
:
'flex'
,
flexDirection
:
'column'
,
width
:
388
,
height
:
(
this
.
state
.
msgEmail
.
length
>
45
?
466
:
441
),
borderRadius
:
12
,
boxShadow
:
'0 2 4 0 rgba(0, 0, 0, 0.2)'
,
backgroundColor
:
'#ffffff'
}}
>
<
img
src
=
{
Images
.
t
ia
}
/
>
<
div
style
=
{{
paddingTop
:
56
,
padding
:
65
,
display
:
'flex'
,
flexDirection
:
'column'
,
height
:
(
this
.
state
.
msgEmail
.
length
>
45
?
466
:
441
),
borderRadius
:
12
,
boxShadow
:
'0 2 4 0 rgba(0, 0, 0, 0.2)'
,
backgroundColor
:
'#ffffff'
}}
>
<
img
src
=
{
Images
.
t
riputraBlack
}
style
=
{{
height
:
59
,
width
:
175
,
alignSelf
:
'center'
}
}
/
>
<
TextField
label
=
{
<
Typography
style
=
{{
fontSize
:
12
,
fontFamily
:
'Nunito Sans, sans-serif'
}}
>
Email
*<
/Typography>
}
...
...
@@ -207,6 +217,7 @@ class Login extends Component {
backgroundColor
:
'transparent'
,
cursor
:
'pointer'
,
borderColor
:
'transparent'
,
outline
:
'none'
}}
disabled
=
{
this
.
state
.
email
.
trim
()
==
''
&&
this
.
state
.
password
.
trim
()
==
''
?
true
:
false
}
// onClick={() => this.validateLogin()}
...
...
src/container/Otorisasi/User.js
View file @
8fcf1da3
...
...
@@ -292,6 +292,27 @@ export default class UserRole extends Component {
}
}
updateUser
(
payload
)
{
api
.
create
().
updateUser
(
payload
).
then
((
response
)
=>
{
console
.
log
(
response
.
data
.
message
)
console
.
log
(
response
.
data
.
status
)
if
(
response
.
data
)
{
if
(
response
.
ok
)
{
if
(
response
.
data
.
status
===
'success'
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'success'
})
this
.
closeEdit
()
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
})
}
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'error'
})
}
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
problem
,
tipeAlert
:
'error'
})
}
})
}
_handleKeyDown
(
e
)
{
if
(
e
.
key
===
'Enter'
)
{
if
(
this
.
state
.
search
.
length
>
0
)
{
...
...
@@ -308,7 +329,6 @@ export default class UserRole extends Component {
if
(
response
.
ok
)
{
if
(
response
.
data
.
status
===
"success"
)
{
console
.
log
(
response
)
alert
(
response
.
data
.
message
)
this
.
getUser
()
this
.
setState
({
visibleUser
:
true
})
}
else
{
...
...
@@ -598,6 +618,7 @@ export default class UserRole extends Component {
<
EditUser
onClickClose
=
{
this
.
closeEdit
.
bind
(
this
)}
refresh
=
{
this
.
getUser
.
bind
(
this
)}
updateUser
=
{
this
.
updateUser
.
bind
(
this
)}
data
=
{
this
.
state
.
indexData
}
/
>
)}
...
...
src/container/Otorisasi/User/EditUser.js
View file @
8fcf1da3
...
...
@@ -186,7 +186,7 @@ export default class EditUser extends Component {
}
}
updateUser
()
{
updateUser
(){
let
payload
=
{
"user_id"
:
this
.
state
.
tempData
.
user_id
,
"role_id"
:
this
.
state
.
role
.
role_id
,
...
...
@@ -196,28 +196,7 @@ export default class EditUser extends Component {
"start_date"
:
this
.
state
.
tempData
.
start_date
,
"end_date"
:
this
.
state
.
tempData
.
end_date
}
api
.
create
().
updateUser
(
payload
).
then
((
response
)
=>
{
console
.
log
(
response
.
data
.
message
)
console
.
log
(
response
.
data
.
status
)
if
(
response
.
data
)
{
if
(
response
.
ok
)
{
if
(
response
.
data
.
status
===
'success'
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'success'
})
setTimeout
(()
=>
{
this
.
props
.
onClickClose
()
this
.
props
.
refresh
()
},
750
);
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
})
}
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'error'
})
}
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
problem
,
tipeAlert
:
'error'
})
}
})
this
.
props
.
updateUser
(
payload
)
}
getRole
()
{
...
...
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