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
13242284
Commit
13242284
authored
Oct 09, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deni-dev(pc)' into 'master'
pus pus pus See merge request
!497
parents
152095f6
35fa4c81
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
104 additions
and
109 deletions
+104
-109
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+2
-8
CreateParameter.js
src/container/MasterData/Parameter/CreateParameter.js
+17
-16
CreatePerusahaan.js
src/container/MasterData/Perusahaan/CreatePerusahaan.js
+72
-72
CreateUnitBisnis.js
src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js
+13
-13
No files found.
src/container/BudgetTahunan/TaxPlanning.js
View file @
13242284
...
@@ -851,7 +851,7 @@ export default class TaxPlanning extends Component {
...
@@ -851,7 +851,7 @@ export default class TaxPlanning extends Component {
}
}
}
}
})
})
// console.log(tableMeta.rowData[
5
])
// console.log(tableMeta.rowData[
8
])
// console.log(baru)
// console.log(baru)
// console.log(anjay)
// console.log(anjay)
// console.log(total)
// console.log(total)
...
@@ -863,12 +863,6 @@ export default class TaxPlanning extends Component {
...
@@ -863,12 +863,6 @@ export default class TaxPlanning extends Component {
// } else {
// } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbc.value = total
// }
// }
// } else if (dex == 2) {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp = total
// } else {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].fcp.value = total
// }
// } else {
// } else {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
// if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf.value == undefined) {
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
// dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].tbf = total
...
@@ -7435,7 +7429,7 @@ export default class TaxPlanning extends Component {
...
@@ -7435,7 +7429,7 @@ export default class TaxPlanning extends Component {
}}
}}
onClick
=
{()
=>
{
onClick
=
{()
=>
{
// this.forceUpdate()
// this.forceUpdate()
this
.
setState
({
loading
:
true
,
buttonDraft
:
false
,
dataTable
:
dataTable2
},
()
=>
{
this
.
setState
({
loading
:
true
,
buttonDraft
:
false
},
()
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
// this.setState({ loading: false, buttonError: false, editable: true })
// this.setState({ loading: false, buttonError: false, editable: true })
this
.
handleValidate
()
this
.
handleValidate
()
...
...
src/container/MasterData/Parameter/CreateParameter.js
View file @
13242284
...
@@ -125,8 +125,9 @@ export default class CreateParameter extends Component {
...
@@ -125,8 +125,9 @@ export default class CreateParameter extends Component {
options
:
typeData
,
options
:
typeData
,
getOptionLabel
:
(
option
)
=>
option
.
setting_group_name
,
getOptionLabel
:
(
option
)
=>
option
.
setting_group_name
,
};
};
this
.
setState
({
types
:
typeProps
,
typeData
:
response
.
data
.
data
,
getTypes
:
index
==
-
1
?
typeData
[
0
]
:
typeData
[
index
]
},
()
=>
{
this
.
setState
({
types
:
typeProps
,
typeData
:
response
.
data
.
data
,
getTypes
:
index
==
-
1
?
typeData
[
0
]
:
typeData
[
index
]
},
()
=>
{
this
.
getParameterByGroup
(
this
.
state
.
getTypes
.
setting_group_id
)})
this
.
getParameterByGroup
(
this
.
state
.
getTypes
.
setting_group_id
)
})
}
else
{
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'warning'
},
()
=>
{
if
(
response
.
data
.
message
.
includes
(
"Someone Logged In"
))
{
if
(
response
.
data
.
message
.
includes
(
"Someone Logged In"
))
{
...
@@ -535,7 +536,7 @@ export default class CreateParameter extends Component {
...
@@ -535,7 +536,7 @@ export default class CreateParameter extends Component {
<
/div
>
<
/div
>
<
div
className
=
"
border-bottom
grid grid-2x grid-mobile-none gap-15px"
style
=
{{
padding
:
20
}}
>
<
div
className
=
"grid grid-2x grid-mobile-none gap-15px"
style
=
{{
padding
:
20
}}
>
<
div
className
=
"column-1"
>
<
div
className
=
"column-1"
>
<
div
style
=
{{
backgroundColor
:
'#e8e8e8'
,
padding
:
10
,
borderRadius
:
5
}}
>
<
div
style
=
{{
backgroundColor
:
'#e8e8e8'
,
padding
:
10
,
borderRadius
:
5
}}
>
<
TextField
<
TextField
...
@@ -629,8 +630,8 @@ export default class CreateParameter extends Component {
...
@@ -629,8 +630,8 @@ export default class CreateParameter extends Component {
}
}
// this.handleChange(coba, 'value')}
// this.handleChange(coba, 'value')}
}
}
error
=
{
this
.
state
.
errorValue
}
error
=
{
this
.
state
.
errorValue
}
helperText
=
{
this
.
state
.
msgErrorValue
}
helperText
=
{
this
.
state
.
msgErrorValue
}
>
>
<
/TextField
>
<
/TextField
>
<
/div
>
<
/div
>
...
@@ -719,17 +720,6 @@ export default class CreateParameter extends Component {
...
@@ -719,17 +720,6 @@ export default class CreateParameter extends Component {
}}
}}
/
>
/
>
<
/div
>
<
/div
>
<
div
className
=
"margin-top-10px"
style
=
{{
padding
:
10
,
borderRadius
:
5
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'25%'
}}
>
Created
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
tempData
===
null
?
""
:
this
.
state
.
tempData
.
created
}
<
/Typography
>
<
/div
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'25%'
}}
>
Updated
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
tempData
===
null
?
""
:
this
.
state
.
tempData
.
updated
===
null
?
""
:
this
.
state
.
tempData
.
updated
}
<
/Typography
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
className
=
"column-2"
>
<
div
className
=
"column-2"
>
...
@@ -870,6 +860,17 @@ export default class CreateParameter extends Component {
...
@@ -870,6 +860,17 @@ export default class CreateParameter extends Component {
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
className
=
"border-bottom margin-top-10px"
style
=
{{
padding
:
'0px 20px 20px 20px'
,
borderRadius
:
5
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'12%'
}}
>
Created
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
tempData
===
null
?
""
:
this
.
state
.
tempData
.
created
}
<
/Typography
>
<
/div
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'12%'
}}
>
Updated
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
tempData
===
null
?
""
:
this
.
state
.
tempData
.
updated
===
null
?
""
:
this
.
state
.
tempData
.
updated
}
<
/Typography
>
<
/div
>
<
/div
>
<
div
className
=
"border-top grid grid-2x"
style
=
{{
height
:
56
,
backgroundColor
:
'#f5f5f5'
,
paddingLeft
:
20
,
paddingRight
:
20
}}
>
<
div
className
=
"border-top grid grid-2x"
style
=
{{
height
:
56
,
backgroundColor
:
'#f5f5f5'
,
paddingLeft
:
20
,
paddingRight
:
20
}}
>
<
div
className
=
"column-1"
style
=
{{
alignSelf
:
'center'
}}
>
<
div
className
=
"column-1"
style
=
{{
alignSelf
:
'center'
}}
>
<
button
<
button
...
...
src/container/MasterData/Perusahaan/CreatePerusahaan.js
View file @
13242284
This diff is collapsed.
Click to expand it.
src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js
View file @
13242284
...
@@ -85,7 +85,7 @@ export default class CreateUnitBisnis extends Component {
...
@@ -85,7 +85,7 @@ export default class CreateUnitBisnis extends Component {
}
}
}
else
{
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'error'
})
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
data
.
message
,
tipeAlert
:
'error'
})
}
}
}
else
{
}
else
{
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
problem
,
tipeAlert
:
'error'
})
this
.
setState
({
alert
:
true
,
messageAlert
:
response
.
problem
,
tipeAlert
:
'error'
})
}
}
...
@@ -188,7 +188,7 @@ export default class CreateUnitBisnis extends Component {
...
@@ -188,7 +188,7 @@ export default class CreateUnitBisnis extends Component {
<
/div
>
<
/div
>
<
div
className
=
"
border-bottom
grid grid-2x grid-mobile-none gap-15px"
style
=
{{
padding
:
20
}}
>
<
div
className
=
"grid grid-2x grid-mobile-none gap-15px"
style
=
{{
padding
:
20
}}
>
<
div
className
=
"column-1"
>
<
div
className
=
"column-1"
>
<
div
style
=
{{
backgroundColor
:
'#e8e8e8'
,
padding
:
10
,
borderRadius
:
5
}}
>
<
div
style
=
{{
backgroundColor
:
'#e8e8e8'
,
padding
:
10
,
borderRadius
:
5
}}
>
<
TextField
<
TextField
...
@@ -258,17 +258,6 @@ export default class CreateUnitBisnis extends Component {
...
@@ -258,17 +258,6 @@ export default class CreateUnitBisnis extends Component {
}}
}}
/
>
/
>
<
/div
>
<
/div
>
<
div
className
=
"margin-top-10px"
style
=
{{
padding
:
10
,
borderRadius
:
5
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'25%'
}}
>
Created
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
created
}
<
/Typography
>
<
/div
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'25%'
}}
>
Updated
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
updated
}
<
/Typography
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
className
=
"column-2"
>
<
div
className
=
"column-2"
>
...
@@ -327,6 +316,17 @@ export default class CreateUnitBisnis extends Component {
...
@@ -327,6 +316,17 @@ export default class CreateUnitBisnis extends Component {
<
/div
>
<
/div
>
<
div
className
=
"border-bottom margin-top-10px"
style
=
{{
padding
:
'0px 20px 20px 20px'
,
borderRadius
:
5
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'12%'
}}
>
Created
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
created
}
<
/Typography
>
<
/div
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
Typography
style
=
{{
fontSize
:
11
,
width
:
'12%'
}}
>
Updated
By
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
11
}}
>
:
{
this
.
state
.
updated
}
<
/Typography
>
<
/div
>
<
/div
>
<
div
className
=
"border-top grid grid-2x"
style
=
{{
height
:
56
,
backgroundColor
:
'#f5f5f5'
,
paddingLeft
:
20
,
paddingRight
:
20
}}
>
<
div
className
=
"border-top grid grid-2x"
style
=
{{
height
:
56
,
backgroundColor
:
'#f5f5f5'
,
paddingLeft
:
20
,
paddingRight
:
20
}}
>
<
div
className
=
"column-1"
style
=
{{
alignSelf
:
'center'
}}
>
<
div
className
=
"column-1"
style
=
{{
alignSelf
:
'center'
}}
>
<
button
<
button
...
...
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