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
66044314
Commit
66044314
authored
Sep 02, 2020
by
faisalhamdi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into faisal
parents
f406b3cb
06654911
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
641 additions
and
507 deletions
+641
-507
ApprovalMatrix.js
src/container/ApprovalMatrix/ApprovalMatrix.js
+11
-5
CreateApprovalMatrix.js
src/container/ApprovalMatrix/CreateApprovalMatrix.js
+0
-1
ProfitLoss.js
src/container/BudgetTahunan/ProfitLoss.js
+235
-125
ForgotPassword.js
src/container/ForgotPassword.js
+1
-1
Login.js
src/container/Login.js
+1
-1
UnitBisnis.js
src/container/MasterData/UnitBisnis.js
+12
-7
User.js
src/container/Otorisasi/User.js
+275
-229
AddUser.js
src/container/Otorisasi/User/AddUser.js
+96
-128
EditUser.js
src/container/Otorisasi/User/EditUser.js
+2
-2
ResetPassword.js
src/container/ResetPassword.js
+4
-4
SetPassword.js
src/container/SetPassword.js
+4
-4
No files found.
src/container/ApprovalMatrix/ApprovalMatrix.js
View file @
66044314
...
...
@@ -39,6 +39,9 @@ export default class ApprovalMatrix extends Component {
rows
:
null
,
dataLoaded
:
false
,
popupError
:
false
,
alert
:
false
,
tipeAlert
:
''
,
messageAlert
:
''
,
btncreate
:
false
,
btnedit
:
false
,
load
:
false
,
...
...
@@ -75,10 +78,11 @@ export default class ApprovalMatrix extends Component {
this
.
setState
({
payload
:
body
,
buttonError
:
false
})
api
.
create
().
checkUploadAM
(
body
).
then
(
response
=>
{
// console.log(response.data)
let
dataRow
=
[]
if
(
response
.
data
){
if
(
response
.
ok
)
{
if
(
response
.
data
.
status
===
"success"
)
{
let
dataRow
=
response
.
data
.
data
.
map
((
item
,
index
)
=>
{
dataRow
=
response
.
data
.
data
.
map
((
item
,
index
)
=>
{
return
[
index
+
1
,
item
.
approval_type_name
,
...
...
@@ -91,7 +95,7 @@ export default class ApprovalMatrix extends Component {
]
})
let
columns
=
[
"
ID
"
,
"
Data
"
,
{
name
:
"Approval Type"
,
options
:
{
...
...
@@ -257,7 +261,7 @@ export default class ApprovalMatrix extends Component {
rows
:
dataRow
});
}
else
{
this
.
setState
({
dataLoaded
:
false
,
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
if
(
response
.
data
.
message
.
includes
(
"Token"
))
{
setTimeout
(()
=>
{
localStorage
.
removeItem
(
Constant
.
TOKEN
)
...
...
@@ -267,7 +271,7 @@ export default class ApprovalMatrix extends Component {
})
}
}
else
{
this
.
setState
({
dataLoaded
:
false
,
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'error'
})
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'error'
})
}
}
else
{
this
.
setState
({
...
...
@@ -303,6 +307,8 @@ export default class ApprovalMatrix extends Component {
load
:
true
})
}
}
else
{
this
.
setState
({
load
:
true
})
}
})
}
...
...
@@ -820,7 +826,7 @@ export default class ApprovalMatrix extends Component {
{
this
.
state
.
visibleUpload
&&
(
<
div
className
=
"test app-popup-show"
>
<
div
className
=
"popup-content background-white border-radius"
style
=
{{
borderRadius
:
8
}}
>
<
div
className
=
"popup-panel grid grid-2x
"
style
=
{{
backgroundColor
:
'#51c6ea'
,
height
:
64
,
borderTopRightRadius
:
8
,
borderTopLeftRadius
:
8
}}
>
<
div
className
=
"popup-panel grid grid-2x
main-color"
style
=
{{
height
:
64
,
borderTopRightRadius
:
8
,
borderTopLeftRadius
:
8
}}
>
<
div
className
=
"col-1"
style
=
{{
maxWidth
:
"inherit"
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
div
className
=
"popup-title"
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
16
,
fontWeight
:
'bold'
}}
>
Upload
File
<
/span
>
...
...
src/container/ApprovalMatrix/CreateApprovalMatrix.js
View file @
66044314
...
...
@@ -215,7 +215,6 @@ export default class CreateApprovalMatrix extends Component {
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 Name Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
operatorId
))
{
...
...
src/container/BudgetTahunan/ProfitLoss.js
View file @
66044314
This diff is collapsed.
Click to expand it.
src/container/ForgotPassword.js
View file @
66044314
...
...
@@ -41,7 +41,7 @@ class ForgotPassword extends Component {
if
(
this
.
state
.
email
.
trim
()
==
""
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'Email Cannot be Empty.'
})
}
else
if
(
!
isEmail
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Email Format is Not Correct
.'
})
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Please enter a valid email address
.'
})
}
else
{
this
.
verification
()
}
...
...
src/container/Login.js
View file @
66044314
...
...
@@ -77,7 +77,7 @@ class Login extends Component {
if
(
this
.
state
.
email
.
trim
()
==
""
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'Email Cannot be Empty.'
})
}
else
if
(
!
isEmail
)
{
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Email Format is Not Correct
.'
})
this
.
setState
({
errorEmail
:
true
,
msgEmail
:
'
Please enter a valid email address
.'
})
}
else
if
(
this
.
state
.
password
.
trim
()
==
""
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'Password Cannot be Empty.'
})
}
else
{
...
...
src/container/MasterData/UnitBisnis.js
View file @
66044314
...
...
@@ -43,7 +43,8 @@ export default class UnitBisnis extends Component {
messageAlert
:
''
,
create
:
false
,
edit
:
false
,
load
:
false
load
:
false
,
judul
:
''
}
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
...
...
@@ -56,8 +57,6 @@ export default class UnitBisnis extends Component {
console
.
log
(
err
);
}
else
{
let
judul
=
resp
.
rows
[
2
]
let
isi
=
resp
.
rows
.
slice
(
3
)
let
payload
=
[]
isi
.
map
((
item
,
index
)
=>
{
...
...
@@ -73,7 +72,8 @@ export default class UnitBisnis extends Component {
let
body
=
{
business_unit
:
payload
}
this
.
setState
({
payload
:
body
,
buttonError
:
false
})
console
.
log
(
resp
.
rows
[
1
])
this
.
setState
({
payload
:
body
,
buttonError
:
false
,
judul
:
resp
.
rows
[
1
][
0
]
})
api
.
create
().
checkUploadUnitBisnis
(
body
).
then
(
response
=>
{
console
.
log
(
response
)
let
dataRow
=
[]
...
...
@@ -174,7 +174,7 @@ export default class UnitBisnis extends Component {
}
]
console
.
log
(
dataRow
);
//
console.log(dataRow);
this
.
setState
({
dataLoaded
:
true
,
cols
:
columns
,
...
...
@@ -623,7 +623,8 @@ export default class UnitBisnis extends Component {
<
/button
>
<
button
type
=
"button"
onClick
=
{()
=>
this
.
state
.
buttonError
?
this
.
setState
({
popupError
:
true
})
:
this
.
uploadUnitBisnis
()}
disabled
=
{
this
.
state
.
buttonError
==
true
?
true
:
false
}
onClick
=
{()
=>
this
.
uploadUnitBisnis
()}
style
=
{{}}
>
<
div
style
=
{{
width
:
102
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
...
...
@@ -682,7 +683,11 @@ export default class UnitBisnis extends Component {
this
.
fileHandler
(
dt
)
this
.
setState
({
uploadStatus
:
'idle'
,
percentage
:
'0'
})
}}
onUpload
=
{()
=>
this
.
setState
({
visibleUpload
:
false
,
visibleUnitBisnis
:
false
})}
onUpload
=
{()
=>
{
this
.
state
.
judul
===
"MASTER DATA - BUSINESS UNIT"
?
this
.
setState
({
visibleUpload
:
false
,
visibleUnitBisnis
:
false
})
:
this
.
setState
({
alert
:
true
,
messageAlert
:
"Invalid Template"
,
tipeAlert
:
'warning'
})
}}
/
>
<
/div
>
<
/div
>
...
...
src/container/Otorisasi/User.js
View file @
66044314
This diff is collapsed.
Click to expand it.
src/container/Otorisasi/User/AddUser.js
View file @
66044314
This diff is collapsed.
Click to expand it.
src/container/Otorisasi/User/EditUser.js
View file @
66044314
...
...
@@ -178,9 +178,9 @@ export default class EditUser extends Component {
}
else
if
(
R
.
isEmpty
(
this
.
state
.
tempData
.
email
))
{
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'Email Cannot be Empty.'
})
}
else
if
(
!
isEmail
)
{
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'
Email Format Not Recognized
.'
})
this
.
setState
({
errorEmail
:
true
,
msgErrorEM
:
'
Please enter a valid email address
.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
role
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role
Name
Cannot be Empty.'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'Role Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
start_date
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Valid From Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
tempData
.
end_date
))
{
...
...
src/container/ResetPassword.js
View file @
66044314
...
...
@@ -70,15 +70,15 @@ class ResetPassword extends Component {
if
(
this
.
state
.
password
.
trim
()
==
""
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'New Password Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
.
length
<
8
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Minimum 8 Characters
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Minimum length : 8
.'
})
}
else
if
(
this
.
isEmail
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Format Should Not Use Email
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Should not be same as Email Address
.'
})
}
else
if
(
!
this
.
isRegex
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Must be a Combination of Characters, Letters and N
umbers.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Must using combination of characters, letters and n
umbers.'
})
}
else
if
(
this
.
state
.
confirmPassword
.
trim
()
==
""
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'Password Confirmation Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
!==
this
.
state
.
confirmPassword
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
Password Does Not M
atch.'
})
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
The password and password confirmation do not m
atch.'
})
}
else
{
this
.
confirmPassword
()
}
...
...
src/container/SetPassword.js
View file @
66044314
...
...
@@ -70,15 +70,15 @@ class SetPassword extends Component {
if
(
this
.
state
.
password
.
trim
()
==
""
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'New Password Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
.
length
<
8
)
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Minimum 8 Characters
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Minimum length : 8
.'
})
}
else
if
(
this
.
isEmail
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Format Should Not Use Email
.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Should not be same as Email Address
.'
})
}
else
if
(
!
this
.
isRegex
(
this
.
state
.
password
))
{
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
New Password Must be a Combination of Characters, Letters and N
umbers.'
})
this
.
setState
({
errorPassword
:
true
,
msgPassword
:
'
Invalid password. Must using combination of characters, letters and n
umbers.'
})
}
else
if
(
this
.
state
.
confirmPassword
.
trim
()
==
""
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'Password Confirmation Cannot be Empty.'
})
}
else
if
(
this
.
state
.
password
!==
this
.
state
.
confirmPassword
)
{
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
Password Does Not M
atch.'
})
this
.
setState
({
errorConfirmPassword
:
true
,
msgConfirmPassword
:
'
The password and password confirmation do not m
atch.'
})
}
else
{
this
.
confirmPassword
()
}
...
...
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