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
d27dd2f5
Commit
d27dd2f5
authored
Jan 17, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Binding Manual Reminder
parent
8e159d3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
178 additions
and
15 deletions
+178
-15
ProgressReport.js
src/container/ProgressReport/ProgressReport.js
+18
-5
TableProgressReport.js
src/container/ProgressReport/TableProgressReport.js
+160
-10
No files found.
src/container/ProgressReport/ProgressReport.js
View file @
d27dd2f5
...
...
@@ -178,9 +178,10 @@ class ReportProgress extends Component {
dataTable
.
push
([
item
.
company_name
,
report
,
"Sent, 17 Oct 2022"
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
company_id
,
"19 Oct 2022"
])
})
// data.map((item,index) => {
...
...
@@ -230,7 +231,11 @@ class ReportProgress extends Component {
report
.
push
({
report_name
:
'Operating Indicator'
,
status_report
:
item
.
operating_indicator
},
{
report_name
:
'Monthly Status'
,
status_report
:
item
.
monthly_status
})
dataTable
.
push
([
item
.
company_name
,
report
report
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
company_id
,
])
})
this
.
setState
({
dataTable
,
loading
:
false
})
...
...
@@ -262,7 +267,11 @@ class ReportProgress extends Component {
report
.
push
({
report_name
:
'Operating Indicator'
,
status_report
:
item
.
operating_indicator
},
{
report_name
:
'Rolling Status'
,
status_report
:
item
.
rolling_status
})
dataTable
.
push
([
item
.
company_name
,
report
report
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
company_id
,
])
})
this
.
setState
({
dataTable
,
loading
:
false
})
...
...
@@ -302,7 +311,11 @@ class ReportProgress extends Component {
{
report_name
:
'OLPA Status'
,
status_report
:
(
statusSubmission
==
'APPROVED'
||
statusSubmission
==
'REVISION'
||
statusSubmission
==
'COMPLETED'
)
?
(
statusSubmission
+
' - '
+
item
.
submissionStatusDate
)
:
statusSubmission
})
dataTable
.
push
([
item
.
company_name
,
report
report
,
item
.
automatic_reminder_report_date
,
item
.
manual_reminder_report_status
,
item
.
manual_reminder_report_date
,
item
.
company_id
,
])
})
// data.map((item,index) => {
...
...
src/container/ProgressReport/TableProgressReport.js
View file @
d27dd2f5
...
...
@@ -102,7 +102,7 @@ export default class TableProgressReport extends Component {
),
setCellProps
:
()
=>
({
style2
}),
customBodyRender
:
(
value
,
tableMeta
,
updateValue
)
=>
{
console
.
log
(
tableMeta
);
//
console.log(tableMeta);
return
(
<
div
className
=
"grid grid-3x"
>
<
div
className
=
"column-1 grid grid-4x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
...
...
@@ -142,10 +142,10 @@ export default class TableProgressReport extends Component {
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
alert
(
tableMeta
.
rowData
[
3
])}
onClick
=
{()
=>
alert
(
tableMeta
.
rowData
[
5
])}
>
<
div
style
=
{{
width
:
102
,
height
:
30
,
backgroundColor
:
'#354960'
,
borderRadius
:
5
,
alignItems
:
'center'
,
display
:
'flex'
,
justifyContent
:
'center'
}}
>
<
span
style
=
{{
color
:
'#fff'
,
fontSize
:
11
}}
>
Sent
<
/span
>
<
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
>
...
...
@@ -200,7 +200,7 @@ export default class TableProgressReport extends Component {
customHeadRender
:
(
columnMeta
)
=>
(
<
th
style
=
{{
...
style
,
top
:
0
,
zIndex
:
103
,
color
:
'#fff'
,
backgroundColor
:
'#1c71b8'
,
fontSize
:
13
,
fontWeight
:
1
,
borderRight
:
"1px solid rgb(255, 255, 255)"
,
padding
:
0
}}
>
<
div
style
=
{{
borderBottom
:
"1px #fff solid"
,
backgroundColor
:
'#37b5e6'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
40
,
fontSize
:
12
,
fontWeight
:
'bold'
,
padding
:
5
}}
>
{
columnMeta
.
name
}
<
/div
>
<
div
className
=
"grid grid-
3
x"
>
<
div
className
=
"grid grid-
4
x"
>
<
div
className
=
"column-1 grid grid-3x"
style
=
{{
color
:
'#fff'
,
fontSize
:
12
,
fontWeight
:
'bold'
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Profit Loss"
}
<
/span
>
...
...
@@ -234,13 +234,24 @@ export default class TableProgressReport extends Component {
<
span
>
{
"Operating Indicator"
}
<
/span
>
<
/div
>
<
/div
>
<
div
className
=
"column-4 grid grid-3x"
style
=
{{
color
:
'#fff'
,
fontSize
:
12
,
fontWeight
:
'bold'
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Automatic Reminder"
}
<
/span
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Manual Reminder"
}
<
/span
>
<
/div
>
<
div
className
=
"column-3"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Last Manual Reminder"
}
<
/span
>
<
/div
>
<
/div
>
<
/div
>
<
/th
>
),
setCellProps
:
()
=>
({
style2
}),
customBodyRender
:
(
value
,
tableMeta
,
updateValue
)
=>
{
return
(
<
div
className
=
"grid grid-
3
x"
>
<
div
className
=
"grid grid-
4
x"
>
<
div
className
=
"column-1 grid grid-3x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
handleValue
(
tableMeta
,
'Profit Loss'
)}
<
/div
>
...
...
@@ -274,10 +285,49 @@ export default class TableProgressReport extends Component {
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
handleValue
(
tableMeta
,
'Operating Indicator'
)}
<
/div
>
<
/div
>
<
/div
>
<
div
className
=
"column-4 grid grid-3x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
2
]}
<
/div
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
alert
(
tableMeta
.
rowData
[
5
])}
>
<
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
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
4
]}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
)
},
},
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
}
];
...
...
@@ -302,7 +352,7 @@ export default class TableProgressReport extends Component {
customHeadRender
:
(
columnMeta
)
=>
(
<
th
style
=
{{
...
style
,
top
:
0
,
zIndex
:
103
,
color
:
'#fff'
,
backgroundColor
:
'#1c71b8'
,
fontSize
:
13
,
fontWeight
:
1
,
borderRight
:
"1px solid rgb(255, 255, 255)"
,
padding
:
0
}}
>
<
div
style
=
{{
borderBottom
:
"1px #fff solid"
,
backgroundColor
:
'#37b5e6'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
40
,
fontSize
:
12
,
fontWeight
:
'bold'
,
padding
:
5
}}
>
{
columnMeta
.
name
}
<
/div
>
<
div
className
=
"grid grid-
2
x"
>
<
div
className
=
"grid grid-
3
x"
>
<
div
className
=
"column-1 grid grid-4x"
style
=
{{
color
:
'#fff'
,
fontSize
:
12
,
fontWeight
:
'bold'
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#07a7d0'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Profit Loss"
}
<
/span
>
...
...
@@ -328,13 +378,24 @@ export default class TableProgressReport extends Component {
<
span
>
{
"Operating Indicator"
}
<
/span
>
<
/div
>
<
/div
>
<
div
className
=
"column-3 grid grid-3x"
style
=
{{
color
:
'#fff'
,
fontSize
:
12
,
fontWeight
:
'bold'
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Automatic Reminder"
}
<
/span
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Manual Reminder"
}
<
/span
>
<
/div
>
<
div
className
=
"column-3"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Last Manual Reminder"
}
<
/span
>
<
/div
>
<
/div
>
<
/div
>
<
/th
>
),
setCellProps
:
()
=>
({
style2
}),
customBodyRender
:
(
value
,
tableMeta
,
updateValue
)
=>
{
return
(
<
div
className
=
"grid grid-
2
x"
>
<
div
className
=
"grid grid-
3
x"
>
<
div
className
=
"column-1 grid grid-4x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
handleValue
(
tableMeta
,
'Profit Loss'
)}
<
/div
>
...
...
@@ -360,10 +421,49 @@ export default class TableProgressReport extends Component {
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
handleValue
(
tableMeta
,
'Operating Indicator'
)}
<
/div
>
<
/div
>
<
/div
>
<
div
className
=
"column-3 grid grid-3x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
2
]}
<
/div
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
alert
(
tableMeta
.
rowData
[
5
])}
>
<
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
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
4
]}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
)
},
},
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
}
];
...
...
@@ -388,7 +488,7 @@ export default class TableProgressReport extends Component {
customHeadRender
:
(
columnMeta
)
=>
(
<
th
style
=
{{
...
style
,
top
:
0
,
zIndex
:
103
,
color
:
'#fff'
,
backgroundColor
:
'#1c71b8'
,
fontSize
:
13
,
fontWeight
:
1
,
borderRight
:
"1px solid rgb(255, 255, 255)"
,
padding
:
0
}}
>
<
div
style
=
{{
borderBottom
:
"1px #fff solid"
,
backgroundColor
:
'#37b5e6'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
40
,
fontSize
:
12
,
fontWeight
:
'bold'
,
padding
:
5
}}
>
{
columnMeta
.
name
}
<
/div
>
<
div
className
=
"grid grid-
2
x"
>
<
div
className
=
"grid grid-
3
x"
>
<
div
className
=
"column-1 grid grid-3x"
style
=
{{
color
:
'#fff'
,
fontSize
:
12
,
fontWeight
:
'bold'
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Profit Loss"
}
<
/span
>
...
...
@@ -414,13 +514,24 @@ export default class TableProgressReport extends Component {
<span>{"Operating Indicator"}</span>
</div> */
}
<
/div
>
<
div
className
=
"column-3 grid grid-3x"
style
=
{{
color
:
'#fff'
,
fontSize
:
12
,
fontWeight
:
'bold'
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Automatic Reminder"
}
<
/span
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Manual Reminder"
}
<
/span
>
<
/div
>
<
div
className
=
"column-3"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
,
borderRight
:
"1px #fff solid"
,
backgroundColor
:
'#1c71b8'
,
justifyContent
:
'center'
,
display
:
'flex'
,
alignItems
:
'center'
,
height
:
45
}}
>
<
span
>
{
"Last Manual Reminder"
}
<
/span
>
<
/div
>
<
/div
>
<
/div
>
<
/th
>
),
setCellProps
:
()
=>
({
style2
}),
customBodyRender
:
(
value
,
tableMeta
,
updateValue
)
=>
{
return
(
<
div
className
=
"grid grid-
2
x"
>
<
div
className
=
"grid grid-
3
x"
>
<
div
className
=
"column-1 grid grid-3x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
handleValue
(
tableMeta
,
'Profit Loss'
)}
<
/div
>
...
...
@@ -446,10 +557,49 @@ export default class TableProgressReport extends Component {
<div style={{ textAlign: 'center' }}>{handleValue(tableMeta, 'Operating Indicator')}</div>
</div> */
}
<
/div
>
<
div
className
=
"column-3 grid grid-3x"
style
=
{{
...
style2
,
fontSize
:
12
,
position
:
"sticky"
}}
>
<
div
className
=
"column-1"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
2
]}
<
/div
>
<
/div
>
<
div
className
=
"column-2"
style
=
{{
placeSelf
:
'center'
,
textAlign
:
'center'
,
padding
:
5
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
<
button
type
=
"button"
style
=
{{
background
:
'white'
}}
onClick
=
{()
=>
alert
(
tableMeta
.
rowData
[
5
])}
>
<
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
}}
>
<
div
style
=
{{
textAlign
:
'center'
}}
>
{
tableMeta
.
rowData
[
4
]}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
)
},
},
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
false
}
},
{
name
:
""
,
options
:
{
display
:
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