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
fbe62400
Commit
fbe62400
authored
Sep 02, 2020
by
Deni Rinaldi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'deni-dev(pc)' into 'master'
fixheader column See merge request
!227
parents
65e0d81f
e8650ce6
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
54 additions
and
31 deletions
+54
-31
BudgetTahunan.js
src/container/BudgetTahunan.js
+2
-0
BalanceSheet.js
src/container/BudgetTahunan/BalanceSheet.js
+39
-22
Home.js
src/container/Home.js
+12
-9
CustomTable.js
src/library/CustomTable.js
+1
-0
No files found.
src/container/BudgetTahunan.js
View file @
fbe62400
...
@@ -559,6 +559,8 @@ export default class BudgetTahunan extends Component {
...
@@ -559,6 +559,8 @@ export default class BudgetTahunan extends Component {
{
this
.
state
.
visibleBS
&&
(
{
this
.
state
.
visibleBS
&&
(
<
BalanceSheet
<
BalanceSheet
report_id
=
{
this
.
state
.
report_id
}
report_id
=
{
this
.
state
.
report_id
}
height
=
{
this
.
props
.
height
}
width
=
{
this
.
props
.
width
}
company
=
{
this
.
state
.
company
}
company
=
{
this
.
state
.
company
}
revision
=
{
this
.
state
.
revisionTable
}
revision
=
{
this
.
state
.
revisionTable
}
periode
=
{
this
.
state
.
periode
.
periode
}
periode
=
{
this
.
state
.
periode
.
periode
}
...
...
src/container/BudgetTahunan/BalanceSheet.js
View file @
fbe62400
This diff is collapsed.
Click to expand it.
src/container/Home.js
View file @
fbe62400
...
@@ -473,22 +473,25 @@ export default function MiniDrawer() {
...
@@ -473,22 +473,25 @@ export default function MiniDrawer() {
<
/IconButton>
}
<
/IconButton>
}
{
open
&&
{
open
&&
<
div
style
=
{{
width
:
'100%'
,
marginTop
:
15
,
marginBottom
:
60
}}
>
<
div
style
=
{{
width
:
'100%'
,
marginTop
:
15
,
marginBottom
:
60
}}
>
<
Link
to
=
{
"profile"
}
>
<
Typography
style
=
{{
fontSize
:
14
,
color
:
'#fff'
,
textAlign
:
'center'
,
fontWeight
:
'bold'
}}
>
{
userFullname
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
14
,
color
:
'#fff'
,
textAlign
:
'center'
,
fontWeight
:
'bold'
}}
>
{
userFullname
}
<
/Typography
>
<
/Link
>
<
Link
to
=
{
"profile"
}
>
<
Typography
style
=
{{
fontSize
:
14
,
color
:
'#fff'
,
textAlign
:
'center'
,
marginTop
:
10
}}
>
{
userEmail
}
<
/Typography
>
<
Typography
style
=
{{
fontSize
:
14
,
color
:
'#fff'
,
textAlign
:
'center'
,
marginTop
:
10
}}
>
{
userEmail
}
<
/Typography
>
<
/Link
>
<
/div
>
<
/div
>
}
}
<
/div
>
<
/div
>
<
Divider
/>
<
Divider
/>
{
open
&&
{
open
&&
<
div
style
=
{{
width
:
'100%'
,
textAlign
:
'-webkit-center'
,
marginTop
:
-
45
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
div
style
=
{{
width
:
'100%'
,
textAlign
:
'-webkit-center'
,
marginTop
:
-
45
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
Link
to
=
{
"profile"
}
>
<
div
className
=
{
"sub-color"
}
style
=
{{
width
:
90
,
height
:
90
,
borderRadius
:
50
,
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'
}}
>
<
div
style
=
{{
width
:
72
,
height
:
72
,
backgroundColor
:
'#838383'
,
borderRadius
:
50
,
alignSelf
:
'center'
}}
>
<
Link
to
=
{
"profile"
}
>
{
userPhoto
===
""
?
null
:
<
img
src
=
{
userPhoto
}
style
=
{{
width
:
72
,
height
:
72
,
borderRadius
:
50
}}
/>
}
{
userPhoto
===
""
?
null
:
<
img
src
=
{
userPhoto
}
style
=
{{
width
:
72
,
height
:
72
,
borderRadius
:
50
}}
/>
}
<
/Link
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/Link
>
<
/div
>
<
/div
>
}
}
{
open
&&
application
.
length
>
0
&&
{
open
&&
application
.
length
>
0
&&
...
@@ -619,7 +622,7 @@ export default function MiniDrawer() {
...
@@ -619,7 +622,7 @@ export default function MiniDrawer() {
key
=
{
index
}
key
=
{
index
}
path
=
{
route
.
path
}
path
=
{
route
.
path
}
// exact={route.exact}
// exact={route.exact}
children
=
{
<
route
.
main
height
=
{
height
}
/>
}
children
=
{
<
route
.
main
height
=
{
height
}
width
=
{
width
}
/>
}
/>
/>
))}
))}
<
/Switch
>
<
/Switch
>
...
...
src/library/CustomTable.js
View file @
fbe62400
...
@@ -356,6 +356,7 @@ exports.customOptionsFixedColumn = function () {
...
@@ -356,6 +356,7 @@ exports.customOptionsFixedColumn = function () {
filterType
:
false
,
filterType
:
false
,
filter
:
false
,
filter
:
false
,
sort
:
false
,
sort
:
false
,
responsive
:
'scrollMaxHeight'
,
viewColumns
:
false
,
viewColumns
:
false
,
overflowX
:
'auto'
,
overflowX
:
'auto'
,
print
:
false
,
print
:
false
,
...
...
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