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
2c1142fb
Commit
2c1142fb
authored
Oct 05, 2020
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'didam' into 'master'
deps See merge request
!450
parents
b1adec00
ca711eb6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
Perusahaan.js
src/container/MasterData/Perusahaan/Perusahaan.js
+2
-2
ReportItems.js
src/container/MasterData/ReportItems.js
+6
-3
VisualReportItems.js
...container/MasterData/formReportItems/VisualReportItems.js
+1
-0
No files found.
src/container/MasterData/Perusahaan/Perusahaan.js
View file @
2c1142fb
...
...
@@ -696,6 +696,7 @@ export default class Perusahaan extends Component {
{
this
.
state
.
messageAlert
}
<
/Alert
>
<
/Snackbar
>
{
this
.
state
.
loading
&&
loadingComponent
}
{
this
.
state
.
visiblePerusahaan
===
true
?
this
.
state
.
load
&&
(
<
div
>
...
...
@@ -790,7 +791,6 @@ export default class Perusahaan extends Component {
<
/div
>
<
/div
>
<
div
style
=
{{
padding
:
25
}}
>
{
this
.
state
.
loading
&&
loadingComponent
}
<
MuiThemeProvider
theme
=
{
getMuiTheme
()}
>
<
MUIDataTable
theme
=
{
getMuiTheme
()}
...
...
@@ -811,7 +811,7 @@ export default class Perusahaan extends Component {
onClickClose
=
{()
=>
this
.
setState
({
visibleVisual
:
false
,
visiblePerusahaan
:
true
})}
height
=
{
this
.
props
.
height
}
updateHierarchy
=
{
this
.
updateHierarchy
.
bind
(
this
)}
handleLoading
=
{()
=>
this
.
setState
({
loading
:
true
})}
handleLoading
=
{()
=>
this
.
setState
({
loading
:
true
}
,
()
=>
console
.
log
(
'aksdkas'
)
)}
/
>
:
<
div
>
...
...
src/container/MasterData/ReportItems.js
View file @
2c1142fb
...
...
@@ -63,7 +63,7 @@ export default class ReportItems extends Component {
invalidTemplate
:
false
,
loading
:
false
}
this
.
myRef
=
React
.
createRef
()
this
.
fileHandler
=
this
.
fileHandler
.
bind
(
this
);
}
...
...
@@ -824,6 +824,8 @@ export default class ReportItems extends Component {
this
.
setState
({
alert
:
false
})
}
scrollToMyRef
=
()
=>
window
.
scrollTo
(
0
,
this
.
myRef
.
current
.
offsetTop
)
render
()
{
const
columns
=
[{
name
:
"Action"
,
...
...
@@ -1049,7 +1051,7 @@ export default class ReportItems extends Component {
<
/div
>
);
return
(
<
div
style
=
{{
height
:
this
.
props
.
height
}}
>
<
div
style
=
{{
height
:
this
.
props
.
height
}}
ref
=
{
this
.
myRef
}
>
{
/* <Row> */
}
<
div
className
=
{
"main-color"
}
style
=
{{
height
:
195
,
width
:
'100%'
}}
/
>
<
Snackbar
open
=
{
this
.
state
.
alert
}
autoHideDuration
=
{
6000
}
onClose
=
{()
=>
this
.
closeAlert
()}
>
...
...
@@ -1057,6 +1059,7 @@ export default class ReportItems extends Component {
{
this
.
state
.
messageAlert
}
<
/Alert
>
<
/Snackbar
>
{
this
.
state
.
loading
&&
loadingComponent
}
{
this
.
state
.
itemReport
===
true
?
this
.
state
.
load
&&
(
<
div
>
...
...
@@ -1150,7 +1153,6 @@ export default class ReportItems extends Component {
<
/div
>
<
/div
>
<
div
style
=
{{
padding
:
25
}}
>
{
this
.
state
.
loading
&&
loadingComponent
}
<
MuiThemeProvider
theme
=
{
getMuiTheme
()}
>
<
MUIDataTable
theme
=
{
getMuiTheme
()}
...
...
@@ -1171,6 +1173,7 @@ export default class ReportItems extends Component {
onClickClose
=
{()
=>
this
.
setState
({
visualisasi
:
false
,
itemReport
:
true
},
()
=>
this
.
getData
())}
height
=
{
this
.
props
.
height
}
handleLoading
=
{()
=>
this
.
setState
({
loading
:
true
})}
scrollToTop
=
{()
=>
this
.
scrollToMyRef
()}
/
>
:
<
div
>
...
...
src/container/MasterData/formReportItems/VisualReportItems.js
View file @
2c1142fb
...
...
@@ -336,6 +336,7 @@ export default class VisualReportItems extends Component {
<
/div
>
<
button
onClick
=
{()
=>
{
this
.
props
.
handleLoading
()
this
.
props
.
scrollToTop
()
this
.
handleSave
()}}
>
<
div
style
=
{{
width
:
102
,
height
:
30
,
marginLeft
:
25
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
,
cursor
:
"pointer"
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
Save
<
/span
>
...
...
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