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
5dd47d60
Commit
5dd47d60
authored
Sep 03, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into deni-dev(pc)
parents
afeff22f
fbe62400
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
468 additions
and
320 deletions
+468
-320
ApprovalMatrix.js
src/container/ApprovalMatrix/ApprovalMatrix.js
+11
-5
CreateApprovalMatrix.js
src/container/ApprovalMatrix/CreateApprovalMatrix.js
+0
-1
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+2
-2
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
CreatePerusahaan.js
src/container/MasterData/Perusahaan/CreatePerusahaan.js
+32
-8
Perusahaan.js
src/container/MasterData/Perusahaan/Perusahaan.js
+176
-167
AddRole.js
src/container/Otorisasi/UserRole/AddRole.js
+1
-1
EditRole.js
src/container/Otorisasi/UserRole/EditRole.js
+1
-1
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 @
5dd47d60
...
...
@@ -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 @
5dd47d60
...
...
@@ -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/FixedAssetsMovement.js
View file @
5dd47d60
...
...
@@ -653,7 +653,7 @@ export default class FixedAssetsMovement extends Component {
<
div
style
=
{{
flex
:
1
,
padding
:
20
,
width
:
'100%'
}}
>
<
Paper
style
=
{{
paddingTop
:
10
,
paddingBottom
:
20
}}
>
<
div
style
=
{{
borderBottom
:
'solid 1px #c4c4c4'
}}
>
<
Typography
style
=
{{
fontSize
:
'12px'
,
color
:
'#4b4b4b'
,
margin
:
10
}}
>
Master
Budget
-
Fixed
Assets
Movement
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'12px'
,
color
:
'#4b4b4b'
,
margin
:
10
}}
>
Budget
Tahunan
-
Fixed
Assets
Movement
<
/Typography
>
<
/div
>
<
div
style
=
{{
padding
:
20
}}
>
<
div
>
...
...
@@ -685,7 +685,7 @@ export default class FixedAssetsMovement extends Component {
onClick
=
{()
=>
this
.
props
.
onClickClose
()}
>
<
div
style
=
{{
backgroundColor
:
'#019ce5'
,
width
:
105
,
height
:
25
,
borderRadius
:
3
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Kembali
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Back
<
/Typography
>
<
/div
>
<
/button
>
<
/div
>
...
...
src/container/BudgetTahunan/ProfitLoss.js
View file @
5dd47d60
This diff is collapsed.
Click to expand it.
src/container/ForgotPassword.js
View file @
5dd47d60
...
...
@@ -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 @
5dd47d60
...
...
@@ -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/Perusahaan/CreatePerusahaan.js
View file @
5dd47d60
...
...
@@ -249,6 +249,8 @@ export default class CreatePerusahaan extends Component {
validasiEdit
()
{
if
(
R
.
isEmpty
(
this
.
state
.
company
))
{
this
.
setState
({
errorNP
:
true
,
msgErrorNP
:
'Company Name Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
getPerusahaan
))
{
this
.
setState
({
errorPC
:
true
,
msgErrorPC
:
'Parent Company Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
getTypes
))
{
this
.
setState
({
errorUB
:
true
,
msgErrorUB
:
'Business Unit Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
...
...
@@ -260,7 +262,8 @@ export default class CreatePerusahaan extends Component {
"company_id"
:
this
.
state
.
companyID
,
"company_name"
:
this
.
state
.
company
,
"business_unit_id"
:
this
.
state
.
getTypes
.
business_unit_id
,
"parent"
:
this
.
state
.
getPerusahaan
==
null
?
null
:
this
.
state
.
getPerusahaan
.
company_id
,
// "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
"parent"
:
this
.
state
.
getPerusahaan
.
company_id
,
"start_date"
:
this
.
state
.
startDate
,
"end_date"
:
this
.
state
.
endDate
}
...
...
@@ -271,6 +274,8 @@ export default class CreatePerusahaan extends Component {
validasi
()
{
if
(
R
.
isEmpty
(
this
.
state
.
company
))
{
this
.
setState
({
errorNP
:
true
,
msgErrorNP
:
'Company Name Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
getPerusahaan
))
{
this
.
setState
({
errorPC
:
true
,
msgErrorPC
:
'Parent Company Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
getTypes
))
{
this
.
setState
({
errorUB
:
true
,
msgErrorUB
:
'Business Unit Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
...
...
@@ -281,7 +286,8 @@ export default class CreatePerusahaan extends Component {
else
{
let
payload
=
{
"company_name"
:
this
.
state
.
company
,
"parent"
:
this
.
state
.
getPerusahaan
==
null
?
null
:
this
.
state
.
getPerusahaan
.
company_id
,
// "parent": this.state.getPerusahaan == null ? null : this.state.getPerusahaan.company_id,
"parent"
:
this
.
state
.
getPerusahaan
.
company_id
,
"business_unit_id"
:
this
.
state
.
getTypes
.
business_unit_id
,
"start_date"
:
this
.
state
.
startDate
,
"end_date"
:
this
.
state
.
endDate
...
...
@@ -448,12 +454,21 @@ export default class CreatePerusahaan extends Component {
<
/TextField
>
<
/div
>
<
div
className
=
"margin-top-10px"
style
=
{{
padding
:
10
,
borderRadius
:
5
}}
>
<
Autocomplete
<
Autocomplete
{...
this
.
state
.
perusahaan
}
debug
id
=
"tipe"
onChange
=
{(
event
,
newInputValue
)
=>
this
.
setState
({
getPerusahaan
:
newInputValue
})}
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
InputProps
=
{{
...
params
.
InputProps
,
style
:
{
fontSize
:
11
}
}}
InputLabelProps
=
{{
style
:
{
fontSize
:
11
,
color
:
'#7e8085'
}
}}
label
=
"Parent Company"
/>
}
onChange
=
{(
event
,
newInputValue
)
=>
this
.
setState
({
getPerusahaan
:
newInputValue
},
()
=>
this
.
clearError
())}
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
label
=
"Parent Company"
error
=
{
this
.
state
.
errorPC
}
helperText
=
{
this
.
state
.
msgErrorPC
}
InputProps
=
{{
...
params
.
InputProps
,
style
:
{
fontSize
:
11
}
}}
InputLabelProps
=
{{
style
:
{
fontSize
:
11
,
color
:
'#7e8085'
}
}}
/
>
}
value
=
{
this
.
state
.
getPerusahaan
}
/
>
<
/div
>
...
...
@@ -662,9 +677,18 @@ export default class CreatePerusahaan extends Component {
{...
this
.
state
.
perusahaan
}
debug
id
=
"tipe"
onChange
=
{(
event
,
newInputValue
)
=>
this
.
setState
({
getPerusahaan
:
newInputValue
})}
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
InputProps
=
{{
...
params
.
InputProps
,
style
:
{
fontSize
:
11
}
}}
InputLabelProps
=
{{
style
:
{
fontSize
:
11
,
color
:
'#7e8085'
}
}}
label
=
"Parent Company"
/>
}
value
=
{
this
.
state
.
getPerusahaan
}
onChange
=
{(
event
,
newInputValue
)
=>
this
.
setState
({
getPerusahaan
:
newInputValue
},
()
=>
this
.
clearError
())}
renderInput
=
{(
params
)
=>
<
TextField
{...
params
}
label
=
"Parent Company"
error
=
{
this
.
state
.
errorPC
}
helperText
=
{
this
.
state
.
msgErrorPC
}
InputProps
=
{{
...
params
.
InputProps
,
style
:
{
fontSize
:
11
}
}}
InputLabelProps
=
{{
style
:
{
fontSize
:
11
,
color
:
'#7e8085'
}
}}
/
>
}
value
=
{
this
.
state
.
perusahaan
}
/
>
<
/div
>
<
div
style
=
{{
padding
:
10
,
borderRadius
:
5
}}
>
...
...
src/container/MasterData/Perusahaan/Perusahaan.js
View file @
5dd47d60
This diff is collapsed.
Click to expand it.
src/container/Otorisasi/UserRole/AddRole.js
View file @
5dd47d60
...
...
@@ -111,7 +111,7 @@ export default class AddRole extends Component {
validasi
()
{
if
(
R
.
isEmpty
(
this
.
state
.
roleName
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'
Role Nam
e Cannot be Empty.'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'
User Rol
e Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
startDate
))
{
this
.
setState
({
errorStartDate
:
true
,
msgErrorSD
:
'Valid From Cannot be Empty.'
})
}
else
if
(
R
.
isNil
(
this
.
state
.
endDate
))
{
...
...
src/container/Otorisasi/UserRole/EditRole.js
View file @
5dd47d60
...
...
@@ -124,7 +124,7 @@ export default class EditRole extends Component {
validasi
()
{
if
(
R
.
isEmpty
(
this
.
state
.
tempData
.
role_name
))
{
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'
Role Nam
e Cannot be Empty.'
})
this
.
setState
({
errorRoleName
:
true
,
msgErrorRN
:
'
User Rol
e 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 @
5dd47d60
...
...
@@ -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 @
5dd47d60
...
...
@@ -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