Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

push banyak

See merge request !1670

src/container/ProgressReport/ProgressReport.js

@@ -177,7 +177,10 @@ class ReportProgress extends Component {
                             {report_name: 'Submission Status', status_report: (statusSubmission == 'APPROVED' || statusSubmission == 'REVISION' || statusSubmission == 'COMPLETED') ? (statusSubmission + ' - ' + item.submissionStatusDate) : statusSubmission})
                         dataTable.push([
                             item.company_name,
-                            report
+                            report,
+                            "Sent, 17 Oct 2022",
+                            item.company_id,
+                            "19 Oct 2022"
                         ])
                     })
                     // data.map((item,index) => {

src/container/ProgressReport/TableProgressReport.js

@@ -57,7 +57,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-2x">
+                            <div className="grid grid-3x">
                                 <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: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
                                         <span>{"Profit Loss"}</span>
@@ -86,13 +86,25 @@ 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) => {
+                        console.log(tableMeta);
                         return (
-                            <div className="grid grid-2x">
+                            <div className="grid grid-3x">
                                 <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>
@@ -121,10 +133,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[3])}
+                                            >
+                                                <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>
+                                            </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
+                }
             }
         ];