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
84f5d3ae
Commit
84f5d3ae
authored
Aug 20, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'syadziy' into 'master'
Syadziy See merge request
!135
parents
2ba60ccc
b7dc546d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
CreatePerusahaan.js
src/container/MasterData/Perusahaan/CreatePerusahaan.js
+2
-2
EditPerusahaan.js
src/container/MasterData/Perusahaan/EditPerusahaan.js
+1
-1
AddUser.js
src/container/Otorisasi/User/AddUser.js
+2
-2
AddRole.js
src/container/Otorisasi/UserRole/AddRole.js
+2
-2
No files found.
src/container/MasterData/Perusahaan/CreatePerusahaan.js
View file @
84f5d3ae
...
...
@@ -197,7 +197,7 @@ 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
.
company_id
,
"parent"
:
this
.
state
.
getPerusahaan
==
null
?
null
:
this
.
state
.
getPerusahaan
.
company_id
,
// "total_report": this.state.totalReport,
"start_date"
:
this
.
state
.
startDate
,
"end_date"
:
this
.
state
.
endDate
...
...
@@ -223,7 +223,7 @@ export default class CreatePerusahaan extends Component {
}
else
{
let
payload
=
{
"company_name"
:
this
.
state
.
company
,
"parent"
:
this
.
state
.
getPerusahaan
.
company_id
,
"parent"
:
this
.
state
.
getPerusahaan
==
null
?
null
:
this
.
state
.
getPerusahaan
.
company_id
,
"business_unit_id"
:
this
.
state
.
getTypes
.
business_unit_id
,
"total_report"
:
this
.
state
.
totalReport
,
"start_date"
:
this
.
state
.
startDate
,
...
...
src/container/MasterData/Perusahaan/EditPerusahaan.js
View file @
84f5d3ae
...
...
@@ -138,7 +138,7 @@ export default class EditPerusahaan 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
.
company_id
,
"parent"
:
this
.
state
.
getPerusahaan
==
null
?
null
:
this
.
state
.
getPerusahaan
.
company_id
,
"total_report"
:
this
.
state
.
totalReport
,
"start_date"
:
this
.
state
.
startDate
,
"end_date"
:
this
.
state
.
endDate
...
...
src/container/Otorisasi/User/AddUser.js
View file @
84f5d3ae
...
...
@@ -662,8 +662,8 @@ export default class AddUser extends Component {
<
/div
>
<
/div
>
<
div
style
=
{{
flexDirection
:
'column'
,
display
:
'flex'
,
paddingLeft
:
20
,
paddingRight
:
20
}}
>
<
Typography
style
=
{{
fontSize
:
12
}}
>
{
`Dibuat
:
${
format
(
this
.
state
.
date
,
'dd MMMM yyyy'
,
{
locale
:
localeID
})}
`
}
<
/Typography
>
{
/* <Typography style={{fontSize: 12}}>{`Diubah: ${this.state.tempData === null? '' : this.state.tempData.updated}`}</Typography> */
}
<
Typography
style
=
{{
fontSize
:
12
}}
>
{
`Dibuat
:
`
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
12
}}
>
{
`Diubah: `
}
<
/Typography
>
<
/div
>
<
Divider
style
=
{{
margin
:
20
}}
/
>
<
div
style
=
{{
paddingLeft
:
20
,
paddingRight
:
20
}}
>
...
...
src/container/Otorisasi/UserRole/AddRole.js
View file @
84f5d3ae
...
...
@@ -468,8 +468,8 @@ export default class AddRole extends Component {
<
/div
>
<
/div
>
<
div
style
=
{{
flexDirection
:
'column'
,
display
:
'flex'
,
paddingLeft
:
20
,
paddingRight
:
20
}}
>
<
Typography
style
=
{{
fontSize
:
12
}}
>
{
`Dibuat
:
${
format
(
this
.
state
.
date
,
'dd MMMM yyyy'
,
{
locale
:
localeID
})}
`
}
<
/Typography
>
{
/* <Typography style={{fontSize: 12}}>{`Diubah: ${this.state.tempData === null? '' : this.state.tempData.updated}`}</Typography> */
}
<
Typography
style
=
{{
fontSize
:
12
}}
>
{
`Dibuat
:
`
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
12
}}
>
{
`Diubah: `
}
<
/Typography
>
<
/div
>
<
Divider
style
=
{{
margin
:
20
}}
/
>
<
div
style
=
{{
paddingLeft
:
20
,
paddingRight
:
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