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
52fc15e9
Commit
52fc15e9
authored
Sep 02, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
update apprv matrix See merge request
!219
parents
ed543fff
53d9c7b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
ApprovalMatrix.js
src/container/ApprovalMatrix/ApprovalMatrix.js
+11
-5
CreateApprovalMatrix.js
src/container/ApprovalMatrix/CreateApprovalMatrix.js
+0
-1
No files found.
src/container/ApprovalMatrix/ApprovalMatrix.js
View file @
52fc15e9
...
...
@@ -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 @
52fc15e9
...
...
@@ -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
))
{
...
...
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