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
ec5d2f93
Commit
ec5d2f93
authored
Apr 10, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'
Fixing CF dan Reminder See merge request
!1771
parents
10db258f
404c3a3e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
47 deletions
+71
-47
ProgressReport.js
src/container/ProgressReport/ProgressReport.js
+4
-0
TableProgressReport.js
src/container/ProgressReport/TableProgressReport.js
+65
-46
TableSubHolding.js
src/container/Reports/TableSubHolding.js
+2
-1
No files found.
src/container/ProgressReport/ProgressReport.js
View file @
ec5d2f93
...
...
@@ -187,6 +187,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
submission_status
,
item
.
company_id
,
])
})
...
...
@@ -241,6 +242,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
monthly_status
,
item
.
company_id
,
])
})
...
...
@@ -277,6 +279,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
rolling_status
,
item
.
company_id
,
])
})
...
...
@@ -321,6 +324,7 @@ class ReportProgress extends Component {
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
outlook_status
,
item
.
company_id
,
])
})
...
...
src/container/ProgressReport/TableProgressReport.js
View file @
ec5d2f93
...
...
@@ -123,7 +123,7 @@ export default class TableProgressReport extends Component {
render
()
{
let
dataTable2
=
this
.
props
.
dataTable
;
// console.log(
this.props
);
// console.log(
dataTable2
);
const
handleValue
=
(
tableMeta
,
itemName
)
=>
{
let
value
=
tableMeta
.
rowData
[
1
].
filter
((
val
)
=>
val
.
report_name
==
itemName
)
// console.log(itemName)
...
...
@@ -201,7 +201,6 @@ export default class TableProgressReport extends Component {
),
setCellProps
:
()
=>
({
style2
}),
customBodyRender
:
(
value
,
tableMeta
,
updateValue
)
=>
{
// console.log(tableMeta);
return
(
<
div
className
=
"grid grid-3x"
>
<
div
className
=
"column-1 grid grid-4x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
...
...
@@ -237,17 +236,22 @@ export default class TableProgressReport extends Component {
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
2
]}
<
/div
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
{
tableMeta
.
rowData
[
5
]
===
"OPEN"
?
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
:
"-"
}
<
/div
>
<
div
className
=
"column-3"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
4
]}
<
/div
>
...
...
@@ -399,17 +403,22 @@ export default class TableProgressReport extends Component {
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
2
]}
<
/div
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
position
:
'relative'
,
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
{
tableMeta
.
rowData
[
5
]
===
"OPEN"
?
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
position
:
'relative'
,
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
:
"-"
}
<
/div
>
<
div
className
=
"column-3"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
4
]}
<
/div
>
...
...
@@ -545,17 +554,22 @@ export default class TableProgressReport extends Component {
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
2
]}
<
/div
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
{
tableMeta
.
rowData
[
5
]
===
"OPEN"
?
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
:
"-"
}
<
/div
>
<
div
className
=
"column-3"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
4
]}
<
/div
>
...
...
@@ -691,17 +705,22 @@ export default class TableProgressReport extends Component {
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
2
]}
<
/div
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
{
tableMeta
.
rowData
[
5
]
===
"OPEN"
?
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
this
.
handleShowPopup
(
tableMeta
.
rowData
[
5
],
tableMeta
.
rowData
)}
>
<
div
style
=
{{
width
:
85
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
{
tableMeta
.
rowData
[
3
]
===
null
||
tableMeta
.
rowData
[
3
]
===
0
?
"Send Email"
:
"Sent"
}
<
/span
>
<
/div
>
<
/button
>
<
/div
>
:
"-"
}
<
/div
>
<
div
className
=
"column-3"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
width
:
143
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
4
]}
<
/div
>
...
...
src/container/Reports/TableSubHolding.js
View file @
ec5d2f93
...
...
@@ -19053,7 +19053,8 @@ export default class TableSubHolding extends Component {
else {
persenOl = ol / fy
}
value = String(type).includes('MTD') ? persenMtd : String(type).includes('YTD') ? persenYtd : String(type).includes('Quarter') ? persenQuarter : persenFy
// console.log(type);
value = String(type).includes('MTD') ? persenMtd : String(type).includes('YTD') ? persenYtd : String(type).includes('Quarter') ? persenQuarter : String(type).includes('OL') ? persenOl : persenFy
value = (value == null || value == Infinity || value == -Infinity || isNaN(value) ? 0 : Number(value * 100).toFixed(1))
// value = isNaN(value) || value == 'Infinity' || value == '-Infinity' ? (value == '' || value == 0 ? -0 : 0) : (value== '' || value == 0 ? persenFy * -100 : persenFy * 100)
} else {
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