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
c0a4393c
Commit
c0a4393c
authored
Aug 30, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deni-dev(pc)' into 'master'
start date to valod from See merge request
!205
parents
db1f9ecb
88650ce4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
16 deletions
+16
-16
AddUser.js
src/container/Otorisasi/User/AddUser.js
+4
-4
EditUser.js
src/container/Otorisasi/User/EditUser.js
+4
-4
AddRole.js
src/container/Otorisasi/UserRole/AddRole.js
+4
-4
EditRole.js
src/container/Otorisasi/UserRole/EditRole.js
+4
-4
No files found.
src/container/Otorisasi/User/AddUser.js
View file @
c0a4393c
...
@@ -166,9 +166,9 @@ export default class AddUser extends Component {
...
@@ -166,9 +166,9 @@ export default class AddUser extends Component {
}
else
if
(
R
.
isNil
(
this
.
state
.
role
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
role
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name Cannot be Empty'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Start date
Cannot be Empty'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Valid From
Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
End date
Cannot be Empty'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
Valid To
Cannot be Empty'
})
}
}
// else if (this.state.privileges.length < 1) {
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
// alert('Hak Akses belum di pilih !!')
...
@@ -579,7 +579,7 @@ export default class AddUser extends Component {
...
@@ -579,7 +579,7 @@ export default class AddUser extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"startDate"
id
=
"startDate"
label
=
"
Start Date
"
label
=
"
Valid From
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
startDate
}
value
=
{
this
.
state
.
startDate
}
error
=
{
this
.
state
.
errorStartDate
}
error
=
{
this
.
state
.
errorStartDate
}
...
@@ -612,7 +612,7 @@ export default class AddUser extends Component {
...
@@ -612,7 +612,7 @@ export default class AddUser extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"endDate"
id
=
"endDate"
label
=
"
End Date
"
label
=
"
Valid To
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
endDate
}
value
=
{
this
.
state
.
endDate
}
error
=
{
this
.
state
.
errorEndDate
}
error
=
{
this
.
state
.
errorEndDate
}
...
...
src/container/Otorisasi/User/EditUser.js
View file @
c0a4393c
...
@@ -174,9 +174,9 @@ export default class EditUser extends Component {
...
@@ -174,9 +174,9 @@ export default class EditUser extends Component {
}
else
if
(
R
.
isNil
(
this
.
state
.
role
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
role
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role Name Cannot be Empty'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role Name Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
start_date
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
start_date
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Start Date
Cannot be Empty'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Valid From
Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
end_date
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
end_date
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
End Date
Cannot be Empty'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
Valid To
Cannot be Empty'
})
}
}
// else if (this.state.privileges.length < 1) {
// else if (this.state.privileges.length < 1) {
// alert('Hak Akses belum di pilih !!')
// alert('Hak Akses belum di pilih !!')
...
@@ -559,7 +559,7 @@ export default class EditUser extends Component {
...
@@ -559,7 +559,7 @@ export default class EditUser extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"startDate"
id
=
"startDate"
label
=
"
Start Date
"
label
=
"
Valid From
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
start_date
}
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
start_date
}
error
=
{
this
.
state
.
errorStartDate
}
error
=
{
this
.
state
.
errorStartDate
}
...
@@ -591,7 +591,7 @@ export default class EditUser extends Component {
...
@@ -591,7 +591,7 @@ export default class EditUser extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"endDate"
id
=
"endDate"
label
=
"
End Date
"
label
=
"
Valid To
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
end_date
}
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
end_date
}
error
=
{
this
.
state
.
errorEndDate
}
error
=
{
this
.
state
.
errorEndDate
}
...
...
src/container/Otorisasi/UserRole/AddRole.js
View file @
c0a4393c
...
@@ -112,9 +112,9 @@ export default class AddRole extends Component {
...
@@ -112,9 +112,9 @@ export default class AddRole extends Component {
if
(
R
.
isEmpty
(
this
.
state
.
roleName
))
{
if
(
R
.
isEmpty
(
this
.
state
.
roleName
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name Cannot be Empty'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Start date
Cannot be Empty'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Valid From
Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
End date
Cannot be Empty'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
Valid To
Cannot be Empty'
})
}
else
if
(
this
.
state
.
privileges
.
length
<
1
)
{
}
else
if
(
this
.
state
.
privileges
.
length
<
1
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
'You must choose the Access Rights!!'
,
tipeAlert
:
'warning'
})
this
.
setState
({
alert
:
true
,
messageAlert
:
'You must choose the Access Rights!!'
,
tipeAlert
:
'warning'
})
}
else
{
}
else
{
...
@@ -440,7 +440,7 @@ export default class AddRole extends Component {
...
@@ -440,7 +440,7 @@ export default class AddRole extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"startDate"
id
=
"startDate"
label
=
"
Start Date
"
label
=
"
Valid From
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
startDate
}
value
=
{
this
.
state
.
startDate
}
error
=
{
this
.
state
.
errorStartDate
}
error
=
{
this
.
state
.
errorStartDate
}
...
@@ -473,7 +473,7 @@ export default class AddRole extends Component {
...
@@ -473,7 +473,7 @@ export default class AddRole extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"endDate"
id
=
"endDate"
label
=
"
End Date
"
label
=
"
Valid To
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
endDate
}
value
=
{
this
.
state
.
endDate
}
error
=
{
this
.
state
.
errorEndDate
}
error
=
{
this
.
state
.
errorEndDate
}
...
...
src/container/Otorisasi/UserRole/EditRole.js
View file @
c0a4393c
...
@@ -118,9 +118,9 @@ export default class EditRole extends Component {
...
@@ -118,9 +118,9 @@ export default class EditRole extends Component {
if
(
R
.
isEmpty
(
this
.
state
.
tempData
.
role_name
))
{
if
(
R
.
isEmpty
(
this
.
state
.
tempData
.
role_name
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name Cannot be Empty'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role name Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
start_date
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
start_date
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Start date
Cannot be Empty'
})
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'
Valid From
Cannot be Empty'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
end_date
))
{
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
end_date
))
{
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
End date
Cannot be Empty'
})
this
.
setState
({
errorEndDate
:
true
,
msgErrorED
:
'
Valid To
Cannot be Empty'
})
}
else
if
(
this
.
state
.
privileges
.
length
<
1
)
{
}
else
if
(
this
.
state
.
privileges
.
length
<
1
)
{
this
.
setState
({
alert
:
true
,
messageAlert
:
'You must choose the Access Rights'
,
tipeAlert
:
'warning'
})
this
.
setState
({
alert
:
true
,
messageAlert
:
'You must choose the Access Rights'
,
tipeAlert
:
'warning'
})
}
else
{
}
else
{
...
@@ -410,7 +410,7 @@ export default class EditRole extends Component {
...
@@ -410,7 +410,7 @@ export default class EditRole extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"startDate"
id
=
"startDate"
label
=
"
Start Date
"
label
=
"
Valid From
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
start_date
}
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
start_date
}
error
=
{
this
.
state
.
errorStartDate
}
error
=
{
this
.
state
.
errorStartDate
}
...
@@ -443,7 +443,7 @@ export default class EditRole extends Component {
...
@@ -443,7 +443,7 @@ export default class EditRole extends Component {
<
DatePicker
<
DatePicker
margin
=
"normal"
margin
=
"normal"
id
=
"endDate"
id
=
"endDate"
label
=
"
End Date
"
label
=
"
Valid To
"
format
=
"dd MMMM yyyy"
format
=
"dd MMMM yyyy"
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
end_date
}
value
=
{
this
.
state
.
tempData
===
null
?
null
:
this
.
state
.
tempData
.
end_date
}
error
=
{
this
.
state
.
errorEndDate
}
error
=
{
this
.
state
.
errorEndDate
}
...
...
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