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
6fd1f458
Commit
6fd1f458
authored
Jul 09, 2021
by
r.kurnia
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into rifka
parents
5f7ff9f4
024ece7a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
CreateMasterDataCAT.js
...container/MasterData/MasterDataCAT/CreateMasterDataCAT.js
+2
-2
EditMasterDataCAT.js
src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js
+5
-5
No files found.
src/container/MasterData/MasterDataCAT/CreateMasterDataCAT.js
View file @
6fd1f458
...
...
@@ -186,9 +186,9 @@ export default class CreateMasterDataCAT extends Component {
})
console
.
log
(
jumlah
)
if
(
jumlah
>
100
/
100
)
{
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight more than 100
%'
})
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight more than 100%'
})
}
else
if
(
jumlah
<
100
/
100
)
{
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight less than 100
%'
})
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight less than 100%'
})
}
else
{
this
.
addReportItems
(
getData
)
...
...
src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js
View file @
6fd1f458
...
...
@@ -196,9 +196,9 @@ export default class EditMasterDataCAT extends Component {
})
console
.
log
(
jumlah
)
if
(
jumlah
>
100
/
100
)
{
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight more than 100
%'
})
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight more than 100%'
})
}
else
if
(
jumlah
<
100
/
100
)
{
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight less than 100
%'
})
this
.
setState
({
errorWeight
:
true
,
msgErrorWeight
:
'Weight less than 100%'
})
}
else
{
this
.
addReportItems
(
getData
)
...
...
@@ -314,7 +314,7 @@ export default class EditMasterDataCAT extends Component {
// console.log(response);
if
(
response
.
data
)
{
if
(
response
.
data
.
status
===
"success"
)
{
this
.
setState
({
getParent
:
response
.
data
.
data
.
filter
((
val
)
=>
String
(
val
.
type_item_report_name
).
toLocaleLowerCase
()
!=
'break'
),
created_by
:
response
.
data
.
data
[
0
].
created
,
updated_by
:
response
.
data
.
data
[
0
].
created_at
},
()
=>
{
this
.
setState
({
getParent
:
response
.
data
.
data
.
filter
((
val
)
=>
String
(
val
.
type_item_report_name
).
toLocaleLowerCase
()
!=
'break'
),
created_by
:
response
.
data
.
data
[
0
].
created
,
updated_by
:
response
.
data
.
data
[
0
].
updated
},
()
=>
{
// console.log(this.state.getParent[0].created);
this
.
setState
({
loading
:
false
})
})
...
...
@@ -587,11 +587,11 @@ export default class EditMasterDataCAT extends Component {
<
div
className
=
"margin-top-10px"
style
=
{{
paddingTop
:
10
,
paddingBottom
:
30
,
paddingRight
:
30
,
paddingLeft
:
30
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'13%'
}}
>
Created
By
:
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'13%'
}}
>
Created
By
<
/Typography
>
{
!
this
.
state
.
loading
&&
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
created_by
}
<
/Typography>
}
<
/div
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'13%'
}}
>
Updated
By
:
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'13%'
}}
>
Updated
By
<
/Typography
>
{
!
this
.
state
.
loading
&&
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
updated_by
}
<
/Typography>
}
<
/div
>
<
/div
>
...
...
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