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
5b5003aa
Commit
5b5003aa
authored
Jan 29, 2021
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'riri' into 'master'
summary pl apdet See merge request
!1068
parents
aa99d6c6
23d9b470
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
32 deletions
+45
-32
SubHolding.js
src/container/Laporan/SubHolding.js
+3
-0
TableSubHolding.js
src/container/Laporan/TableSubHolding.js
+42
-32
No files found.
src/container/Laporan/SubHolding.js
View file @
5b5003aa
...
@@ -1555,6 +1555,9 @@ export default class SubHolding extends Component {
...
@@ -1555,6 +1555,9 @@ export default class SubHolding extends Component {
item
.
profit_loss
.
fy_last_year
,
item
.
profit_loss
.
fy_last_year
,
isNaN
(
persenFyLY
)
||
persenFyLY
==
'Infinity'
||
persenFyLY
==
'-Infinity'
?
(
item
.
profit_loss
.
fy_last_year
==
''
||
item
.
profit_loss
.
fy_last_year
==
0
?
-
0
:
0
)
:
(
item
.
profit_loss
.
fy_last_year
==
''
||
item
.
profit_loss
.
fy_last_year
==
0
?
persenFyLY
*
-
100
:
persenFyLY
*
100
),
isNaN
(
persenFyLY
)
||
persenFyLY
==
'Infinity'
||
persenFyLY
==
'-Infinity'
?
(
item
.
profit_loss
.
fy_last_year
==
''
||
item
.
profit_loss
.
fy_last_year
==
0
?
-
0
:
0
)
:
(
item
.
profit_loss
.
fy_last_year
==
''
||
item
.
profit_loss
.
fy_last_year
==
0
?
persenFyLY
*
-
100
:
persenFyLY
*
100
),
isNaN
(
persenFyOLMB
)
||
persenFyOLMB
==
'Infinity'
||
persenFyOLMB
==
'-Infinity'
?
(
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
''
||
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
0
?
-
0
:
0
)
:
(
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
''
||
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
0
?
persenFyOLMB
*
-
100
:
persenFyOLMB
*
100
),
isNaN
(
persenFyOLMB
)
||
persenFyOLMB
==
'Infinity'
||
persenFyOLMB
==
'-Infinity'
?
(
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
''
||
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
0
?
-
0
:
0
)
:
(
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
''
||
item
.
profit_loss
.
fy_percent_ach_ol_to_mb
==
0
?
persenFyOLMB
*
-
100
:
persenFyOLMB
*
100
),
item
.
profit_loss
.
forecast_next_year
,
item
.
profit_loss
.
forecast_more_year
,
item
.
profit_loss
.
notes
,
])
])
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
!==
null
)
{
if
(
item
.
children
.
length
>
0
)
{
if
(
item
.
children
.
length
>
0
)
{
...
...
src/container/Laporan/TableSubHolding.js
View file @
5b5003aa
...
@@ -15423,7 +15423,7 @@ export default class TableSubHolding extends Component {
...
@@ -15423,7 +15423,7 @@ export default class TableSubHolding extends Component {
name: "Account",
name: "Account",
options: {
options: {
customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => (
<TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 10
2, backgroundColor: '#1c71b8', width: 300, borderRight: '1px #fff solid'
}}>
<TableCell key={columnMeta.index} style={{ ...style, top: 0, zIndex: 10
3, backgroundColor: '#1c71b8', width: 300
}}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'left' }}>{columnMeta.name}</Typography>
</TableCell>
</TableCell>
),
),
...
@@ -15448,10 +15448,10 @@ export default class TableSubHolding extends Component {
...
@@ -15448,10 +15448,10 @@ export default class TableSubHolding extends Component {
options: {
options: {
customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => (
dataTable2.length > 0 ?
dataTable2.length > 0 ?
<TableCell style={{ ...stylenotes, top: 0, zIndex: 10
2
, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
<TableCell style={{ ...stylenotes, top: 0, zIndex: 10
3
, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell> :
</TableCell> :
<TableCell style={{ ...styleNotesEmpty, top: 0, zIndex: 10
2
, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
<TableCell style={{ ...styleNotesEmpty, top: 0, zIndex: 10
3
, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
<Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
</TableCell>
</TableCell>
),
),
...
@@ -15501,17 +15501,17 @@ export default class TableSubHolding extends Component {
...
@@ -15501,17 +15501,17 @@ export default class TableSubHolding extends Component {
name: `MTD ${this.props.periode}`,
name: `MTD ${this.props.periode}`,
options: {
options: {
customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => (
<th style={{ ...style2,
backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)"
}} >
<th style={{ ...style2,
color: '#fff', backgroundColor: '#1c71b8', color: '#fff', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)"
}} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50 }}>{columnMeta.name}</div>
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50
, paddingTop: 15
}}>{columnMeta.name}</div>
<div className="grid grid-1x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="grid grid-1x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<span>{"Actual"}</span>
<span>{"Actual"}</span>
</div>
</div>
<div className="column-2" style={{ placeSelf: 'center', color: 'black', textAlign: 'center
', padding: 5, borderRight: "1px #fff solid", backgroundColor: 'rgb(200 224 229)' }}>
<div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', color: '#000
', padding: 5, borderRight: "1px #fff solid", backgroundColor: 'rgb(200 224 229)' }}>
<span>{"MB"}</span>
<span>{"MB"}</span>
</div>
</div>
<div className="column-3" style={{ placeSelf: 'center', color: 'black', textAlign: 'center', padding: 5
, borderRight: "1px #fff solid", backgroundColor: 'rgb(200 224 229)' }}>
<div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, color: '#000'
, borderRight: "1px #fff solid", backgroundColor: 'rgb(200 224 229)' }}>
<span>{"% of MB"}</span>
<span>{"% of MB"}</span>
</div>
</div>
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d06' }}>
<div className="column-4" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d06' }}>
...
@@ -15542,6 +15542,7 @@ export default class TableSubHolding extends Component {
...
@@ -15542,6 +15542,7 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
decimalScale={1}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[6]).toFixed(1)}
value={Number(tableMeta.rowData[6]).toFixed(1)}
/>
/>
...
@@ -15565,6 +15566,7 @@ export default class TableSubHolding extends Component {
...
@@ -15565,6 +15566,7 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
decimalScale={1}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[7]).toFixed(1)}
value={Number(tableMeta.rowData[7]).toFixed(1)}
/>
/>
...
@@ -15588,8 +15590,9 @@ export default class TableSubHolding extends Component {
...
@@ -15588,8 +15590,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
suffix={'%'}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(
1
)}
value={Number(tableMeta.rowData[8]).toFixed(
2
)}
/>
/>
}
}
/>
/>
...
@@ -15629,8 +15632,8 @@ export default class TableSubHolding extends Component {
...
@@ -15629,8 +15632,8 @@ export default class TableSubHolding extends Component {
name: `YTD ${this.props.periode}`,
name: `YTD ${this.props.periode}`,
options: {
options: {
customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => (
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13,
top: 0, zIndex: 102,
fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50 }}>{columnMeta.name}</div>
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50
, paddingTop: 15
}}>{columnMeta.name}</div>
<div className="grid grid-1x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="grid grid-1x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-5x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1 grid grid-5x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
...
@@ -15719,8 +15722,9 @@ export default class TableSubHolding extends Component {
...
@@ -15719,8 +15722,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
suffix={'%'}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(
1
)}
value={Number(tableMeta.rowData[12]).toFixed(
2
)}
/>
/>
}
}
/>
/>
...
@@ -15764,9 +15768,10 @@ export default class TableSubHolding extends Component {
...
@@ -15764,9 +15768,10 @@ export default class TableSubHolding extends Component {
thousandSeparator={true}
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
suffix={'%'}
placeholder=""
placeholder=""
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[14]).toFixed(
1
)}
value={Number(tableMeta.rowData[14]).toFixed(
2
)}
/>
/>
}
}
/>
/>
...
@@ -15783,8 +15788,8 @@ export default class TableSubHolding extends Component {
...
@@ -15783,8 +15788,8 @@ export default class TableSubHolding extends Component {
name: `Q1 ${this.props.periode}`,
name: `Q1 ${this.props.periode}`,
options: {
options: {
customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => (
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13,
top: 0, zIndex: 102,
fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50 }}>{columnMeta.name}</div>
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50
, paddingTop: 15
}}>{columnMeta.name}</div>
<div className="grid grid-1x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="grid grid-1x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-5x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1 grid grid-5x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
...
@@ -15873,8 +15878,9 @@ export default class TableSubHolding extends Component {
...
@@ -15873,8 +15878,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
suffix={'%'}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[17]).toFixed(
1
)}
value={Number(tableMeta.rowData[17]).toFixed(
2
)}
/>
/>
}
}
/>
/>
...
@@ -15919,8 +15925,9 @@ export default class TableSubHolding extends Component {
...
@@ -15919,8 +15925,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
suffix={'%'}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[19]).toFixed(
1
)}
value={Number(tableMeta.rowData[19]).toFixed(
2
)}
/>
/>
}
}
/>
/>
...
@@ -15937,8 +15944,8 @@ export default class TableSubHolding extends Component {
...
@@ -15937,8 +15944,8 @@ export default class TableSubHolding extends Component {
name: `FY ${this.props.periode}`,
name: `FY ${this.props.periode}`,
options: {
options: {
customHeadRender: (columnMeta) => (
customHeadRender: (columnMeta) => (
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13,
top: 0, zIndex: 102,
fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50}}>{columnMeta.name}</div>
<div style={{ borderBottom: "1px #fff solid", textAlign: 'center', fontSize: 12, fontWeight: 'bold', padding: 5, height: 50
, paddingTop: 15
}}>{columnMeta.name}</div>
<div className="grid grid-2x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="grid grid-2x" style={{ ...style2, backgroundColor: '#37b5e6', color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
<div className="column-1 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1 grid grid-4x" style={{ placeSelf: 'center', textAlign: 'center' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
<div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
...
@@ -16039,8 +16046,9 @@ export default class TableSubHolding extends Component {
...
@@ -16039,8 +16046,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
suffix={'%'}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[22]).toFixed(
1
)}
value={Number(tableMeta.rowData[22]).toFixed(
2
)}
/>
/>
}
}
/>
/>
...
@@ -16135,8 +16143,9 @@ export default class TableSubHolding extends Component {
...
@@ -16135,8 +16143,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
suffix={'%'}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[26]).toFixed(
1
)}
value={Number(tableMeta.rowData[26]).toFixed(
2
)}
/>
/>
}
}
/>
/>
...
@@ -16158,8 +16167,9 @@ export default class TableSubHolding extends Component {
...
@@ -16158,8 +16167,9 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
type="text"
placeholder=""
placeholder=""
suffix={'%'}
disabled={true}
disabled={true}
value={Number(tableMeta.rowData[27]).toFixed(
1
)}
value={Number(tableMeta.rowData[27]).toFixed(
2
)}
/>
/>
}
}
/>
/>
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