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
54be0dfb
Commit
54be0dfb
authored
Aug 24, 2020
by
EKSAD
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://103.44.149.204/d.arizona/tia-dev
into riri
parents
576ebe9a
3bcebe0d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
12 deletions
+28
-12
Home.js
src/container/Home.js
+18
-2
CreateParameter.js
src/container/MasterData/Parameter/CreateParameter.js
+1
-1
Parameter.js
src/container/MasterData/Parameter/Parameter.js
+2
-2
Perusahaan.js
src/container/MasterData/Perusahaan/Perusahaan.js
+2
-2
UnitBisnis.js
src/container/MasterData/UnitBisnis.js
+2
-2
CreateUnitBisnis.js
src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js
+2
-2
Profile.js
src/container/Profile.js
+1
-1
No files found.
src/container/Home.js
View file @
54be0dfb
...
...
@@ -17,7 +17,7 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
import
Collapse
from
'@material-ui/core/Collapse'
;
import
DateFnsUtils
from
'@date-io/date-fns'
;
import
{
MuiPickersUtilsProvider
}
from
"@material-ui/pickers"
;
import
localeID
from
'date-fns/locale/
id
'
;
import
localeID
from
'date-fns/locale/
en-US
'
;
import
{
BrowserRouter
as
Router
,
...
...
@@ -483,7 +483,9 @@ export default function MiniDrawer() {
<
div
style
=
{{
width
:
'100%'
,
textAlign
:
'-webkit-center'
,
marginTop
:
-
45
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
div
className
=
{
"sub-color"
}
style
=
{{
width
:
90
,
height
:
90
,
borderRadius
:
50
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
div
style
=
{{
width
:
72
,
height
:
72
,
backgroundColor
:
'#838383'
,
borderRadius
:
50
,
alignSelf
:
'center'
}}
>
{
userPhoto
===
""
?
null
:
<
img
src
=
{
userPhoto
}
style
=
{{
width
:
72
,
height
:
72
,
borderRadius
:
50
}}
/>
}
<
Link
to
=
{
"profile"
}
>
{
userPhoto
===
""
?
null
:
<
img
src
=
{
userPhoto
}
style
=
{{
width
:
72
,
height
:
72
,
borderRadius
:
50
}}
/>
}
<
/Link
>
<
/div
>
<
/div
>
...
...
@@ -585,6 +587,20 @@ export default function MiniDrawer() {
<
/div
>
))}
<
/List
>
{
open
&&
<
div
style
=
{{
marginLeft
:
20
,
marginTop
:
5
}}
>
<
button
style
=
{{
outline
:
'none'
,
backgroundColor
:
'transparent'
,
cursor
:
'pointer'
,
borderColor
:
'transparent'
,
}}
onClick
=
{()
=>
logout
()}
>
<
Typography
style
=
{{
color
:
'#525355'
,
fontSize
:
14
,
fontFamily
:
'Nunito Sans, sans-serif'
}}
>
Logout
<
/Typography
>
<
/button
>
<
/div
>
}
<
/Drawer
>
<
div
className
=
{
classes
.
content
}
style
=
{{
justifyContent
:
'space-between'
,
padding
:
0
,
backgroundColor
:
'#f8f8f8'
}}
>
<
div
>
...
...
src/container/MasterData/Parameter/CreateParameter.js
View file @
54be0dfb
...
...
@@ -939,7 +939,7 @@ export default class CreateParameter extends Component {
<
div
className
=
"margin-top-10px"
style
=
{{
backgroundColor
:
'#e8e8e8'
,
padding
:
10
,
borderRadius
:
5
}}
>
<
TextField
style
=
{{
width
:
'100%'
}}
defaultValue
=
{
"A
ktif
"
}
defaultValue
=
{
"A
ctive
"
}
id
=
"status"
label
=
"Status"
disabled
...
...
src/container/MasterData/Parameter/Parameter.js
View file @
54be0dfb
...
...
@@ -681,7 +681,7 @@ export default class Parameter extends Component {
return
(
<
div
style
=
{{
height
:
this
.
props
.
height
}}
>
{
/* <Row> */
}
<
div
className
=
{
"main-color"
}
style
=
{{
height
:
19
9
,
width
:
'100%'
}}
/
>
<
div
className
=
{
"main-color"
}
style
=
{{
height
:
19
5
,
width
:
'100%'
}}
/
>
<
Snackbar
open
=
{
this
.
state
.
alert
}
autoHideDuration
=
{
6000
}
onClose
=
{()
=>
this
.
closeAlert
()}
>
<
Alert
onClose
=
{()
=>
this
.
closeAlert
()}
severity
=
{
this
.
state
.
tipeAlert
}
>
{
this
.
state
.
messageAlert
}
...
...
@@ -689,7 +689,7 @@ export default class Parameter extends Component {
<
/Snackbar
>
{
this
.
state
.
visibleParameter
===
true
?
<
div
>
<
div
style
=
{{
display
:
'flex'
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
paddingRight
:
25
,
paddingLeft
:
25
,
marginTop
:
-
1
50
}}
>
<
div
style
=
{{
display
:
'flex'
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
paddingRight
:
25
,
paddingLeft
:
25
,
marginTop
:
-
1
18
}}
>
<
label
style
=
{{
color
:
'white'
,
fontSize
:
16
,
alignSelf
:
'center'
,
width
:
'20%'
,
}}
>
Parameter
<
/label
>
<
div
style
=
{{
color
:
'white'
,
width
:
'50%'
,
height
:
37
,
display
:
'flex'
,
backgroundColor
:
'white'
,
borderWidth
:
2
,
alignItems
:
'center'
,
borderRadius
:
6
,
paddingLeft
:
5
,
paddingRight
:
5
,
alignSelf
:
'center'
}}
>
<
img
src
=
{
Images
.
searchBlack
}
style
=
{{
marginRight
:
10
}}
/
>
...
...
src/container/MasterData/Perusahaan/Perusahaan.js
View file @
54be0dfb
...
...
@@ -465,7 +465,7 @@ export default class Perusahaan extends Component {
return
(
<
div
style
=
{{
height
:
this
.
props
.
height
}}
>
{
/* <Row> */
}
<
div
className
=
{
"main-color"
}
style
=
{{
height
:
19
9
,
width
:
'100%'
}}
/
>
<
div
className
=
{
"main-color"
}
style
=
{{
height
:
19
5
,
width
:
'100%'
}}
/
>
<
Snackbar
open
=
{
this
.
state
.
alert
}
autoHideDuration
=
{
6000
}
onClose
=
{()
=>
this
.
closeAlert
()}
>
<
Alert
onClose
=
{()
=>
this
.
closeAlert
()}
severity
=
{
this
.
state
.
tipeAlert
}
>
{
this
.
state
.
messageAlert
}
...
...
@@ -473,7 +473,7 @@ export default class Perusahaan extends Component {
<
/Snackbar
>
{
this
.
state
.
visiblePerusahaan
===
true
?
<
div
>
<
div
style
=
{{
display
:
'flex'
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
paddingRight
:
25
,
paddingLeft
:
25
,
marginTop
:
-
1
50
}}
>
<
div
style
=
{{
display
:
'flex'
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
paddingRight
:
25
,
paddingLeft
:
25
,
marginTop
:
-
1
18
}}
>
<
label
style
=
{{
color
:
'white'
,
fontSize
:
16
,
alignSelf
:
'center'
,
width
:
'20%'
,
}}
>
Master
Data
-
Company
<
/label
>
<
div
style
=
{{
color
:
'white'
,
width
:
'50%'
,
height
:
37
,
display
:
'flex'
,
backgroundColor
:
'white'
,
borderWidth
:
2
,
alignItems
:
'center'
,
borderRadius
:
6
,
paddingLeft
:
5
,
paddingRight
:
5
,
alignSelf
:
'center'
}}
>
<
img
src
=
{
Images
.
searchBlack
}
style
=
{{
marginRight
:
10
}}
/
>
...
...
src/container/MasterData/UnitBisnis.js
View file @
54be0dfb
...
...
@@ -395,7 +395,7 @@ export default class UnitBisnis extends Component {
return
(
<
div
style
=
{{
height
:
this
.
props
.
height
}}
>
{
/* <Row> */
}
<
div
style
=
{{
height
:
19
9
,
width
:
'100%'
}}
className
=
{
"main-color"
}
/
>
<
div
style
=
{{
height
:
19
5
,
width
:
'100%'
}}
className
=
{
"main-color"
}
/
>
<
Snackbar
open
=
{
this
.
state
.
alert
}
autoHideDuration
=
{
6000
}
onClose
=
{()
=>
this
.
closeAlert
()}
>
<
Alert
onClose
=
{()
=>
this
.
closeAlert
()}
severity
=
{
this
.
state
.
tipeAlert
}
>
{
this
.
state
.
messageAlert
}
...
...
@@ -403,7 +403,7 @@ export default class UnitBisnis extends Component {
<
/Snackbar
>
{
this
.
state
.
visibleUnitBisnis
===
true
?
<
div
>
<
div
style
=
{{
display
:
'flex'
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
paddingRight
:
25
,
paddingLeft
:
25
,
marginTop
:
-
1
50
}}
>
<
div
style
=
{{
display
:
'flex'
,
flexDirection
:
'row'
,
justifyContent
:
'space-between'
,
paddingRight
:
25
,
paddingLeft
:
25
,
marginTop
:
-
1
18
}}
>
<
label
style
=
{{
color
:
'white'
,
fontSize
:
16
,
alignSelf
:
'center'
,
width
:
'20%'
,
}}
>
Master
Data
-
Business
Unit
<
/label
>
<
div
style
=
{{
color
:
'white'
,
width
:
'50%'
,
height
:
37
,
display
:
'flex'
,
backgroundColor
:
'white'
,
borderWidth
:
2
,
alignItems
:
'center'
,
borderRadius
:
6
,
paddingLeft
:
5
,
paddingRight
:
5
,
alignSelf
:
'center'
}}
>
<
img
src
=
{
Images
.
searchBlack
}
style
=
{{
marginRight
:
10
}}
/
>
...
...
src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js
View file @
54be0dfb
...
...
@@ -396,7 +396,7 @@ export default class CreateUnitBisnis extends Component {
<
div
className
=
"margin-top-10px"
style
=
{{
padding
:
10
,
borderRadius
:
5
,
backgroundColor
:
'#e8e8e8'
,
}}
>
<
TextField
style
=
{{
width
:
'100%'
}}
defaultValue
=
{
"A
ktif
"
}
defaultValue
=
{
"A
ctive
"
}
id
=
"status"
label
=
"Status"
disabled
...
...
@@ -425,7 +425,7 @@ export default class CreateUnitBisnis extends Component {
<
TextField
style
=
{{
width
:
'100%'
}}
id
=
"unit"
label
=
"
Unit Bisnis
"
label
=
"
Business Unit
"
value
=
{
this
.
state
.
name
}
inputProps
=
{{
style
:
{
...
...
src/container/Profile.js
View file @
54be0dfb
...
...
@@ -340,7 +340,7 @@ export default class Profile extends Component {
{
this
.
state
.
messageAlert
}
<
/Alert
>
<
/Snackbar
>
<
div
className
=
{
"main-color"
}
style
=
{{
height
:
203
,
flex
:
1
,
display
:
'flex'
,
alignItems
:
'flex-end'
,
padding
:
20
}}
>
<
div
className
=
{
"main-color"
}
style
=
{{
height
:
195
,
flex
:
1
,
display
:
'flex'
,
alignItems
:
'flex-end'
,
padding
:
20
}}
>
<
div
style
=
{{
display
:
'flex'
,
alignItems
:
'center'
,
justifyContent
:
'space-between'
,
width
:
'100%'
}}
>
<
div
style
=
{{
display
:
'flex'
,
alignItems
:
'center'
}}
>
<
div
style
=
{{
height
:
72
,
width
:
72
,
backgroundColor
:
'white'
,
borderRadius
:
40
,
marginRight
:
20
}}
>
...
...
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