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
ab8d732f
Commit
ab8d732f
authored
Apr 20, 2021
by
faisalhamdi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update!
parent
1a3ac253
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
25 deletions
+18
-25
SubHolding.js
src/container/Laporan/SubHolding.js
+14
-9
TableSubHolding.js
src/container/Laporan/TableSubHolding.js
+4
-16
No files found.
src/container/Laporan/SubHolding.js
View file @
ab8d732f
...
...
@@ -2905,10 +2905,10 @@ export default class SubHolding extends Component {
item
.
level
,
item
.
itemName
,
item
.
corporate_annual_target
.
weight
==
""
?
Number
(
0
).
toFixed
(
1
)
:
Number
(
weight
).
toFixed
(
1
),
item
.
corporate_annual_target
.
uom
,
item
.
corporate_annual_target
.
kpiType
,
item
.
corporate_annual_target
.
maxAch
,
item
.
corporate_annual_target
.
formulaYtd
,
parentTrue
?
item
.
corporate_annual_target
.
uom
:
item
.
uom
,
parentTrue
?
item
.
corporate_annual_target
.
kpiType
:
item
.
typeKpi
,
parentTrue
?
titleCase
(
item
.
corporate_annual_target
.
maxAch
)
:
titleCase
(
item
.
maxAch
)
,
parentTrue
?
item
.
corporate_annual_target
.
formulaYtd
:
item
.
formulaYtd
,
item
.
corporate_annual_target
.
lastYearActualQx
,
item
.
corporate_annual_target
.
lastYearActualFy
,
...
...
@@ -3072,10 +3072,15 @@ export default class SubHolding extends Component {
item
.
level
,
item
.
description
,
item
.
corporate_annual_target
.
weight
==
""
?
Number
(
0
).
toFixed
(
1
)
:
Number
(
weight
).
toFixed
(
1
),
item
.
uom
,
item
.
kpi_type
,
item
.
max_ach
,
item
.
formula_ytd
,
// item.uom,
// item.kpi_type,
// item.max_ach,
// item.formula_ytd,
parentTrue
?
item
.
corporate_annual_target
.
uom
:
item
.
uom
,
parentTrue
?
item
.
corporate_annual_target
.
jenis_kpi
==
""
?
null
:
item
.
corporate_annual_target
.
jenis_kpi
:
item
.
jenis_kpi
==
""
?
null
:
item
.
kpi_type
,
parentTrue
?
item
.
corporate_annual_target
.
max_ach
==
""
?
null
:
titleCase
(
item
.
corporate_annual_target
.
max_ach
)
:
item
.
max_ach
==
""
?
null
:
titleCase
(
item
.
max_ach
),
item
.
corporate_annual_target
.
formula_ytd
==
""
?
null
:
item
.
corporate_annual_target
.
formula_ytd
,
item
.
corporate_annual_target
.
actual_ytd
,
item
.
corporate_annual_target
.
target_ytd
,
item
.
corporate_annual_target
.
achivement_ytd
,
...
...
@@ -3907,7 +3912,7 @@ export default class SubHolding extends Component {
}
}
else
if
(
this
.
state
.
report
.
value
===
11
)
{
let
res
=
await
fetch
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/quarterly/export_report?report_id=17&&company_id=
${
this
.
state
.
company
.
company_id
}
&&
year
=
${
this
.
state
.
periode
.
periode
}
&&quarter=
${
this
.
state
.
quarter
.
name
}
`
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/cat/quarterly/export_report?report_id=17&&company_id=
${
this
.
state
.
company
.
company_id
}
&&
periode
=
${
this
.
state
.
periode
.
periode
}
&&quarter=
${
this
.
state
.
quarter
.
name
}
`
)
console
.
log
(
res
);
res
=
await
res
.
blob
()
...
...
src/container/Laporan/TableSubHolding.js
View file @
ab8d732f
...
...
@@ -25246,21 +25246,9 @@ export default class TableSubHolding extends Component {
<div style={{ width: 75, textAlign: 'right' }}>
{tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null :
<FormControlLabel
style={{ margin: 0 }}
value={Number(value).toFixed(1)}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
suffix={'%'}
value={Number(value).toFixed(1)}
disabled={true}
/>
}
/>
<span style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}>
{value}
</span>
}
</div>
)
...
...
@@ -25320,7 +25308,7 @@ export default class TableSubHolding extends Component {
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(
1
)}
value={Number(value).toFixed(
2
)}
disabled={true}
/>
}
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