sf-i-events 1.0.849 → 1.0.851

package/sf-i-events.js

@@ -850,6 +850,7 @@ let SfIEvents = class SfIEvents extends LitElement {
   `;
         this.AUTOSAVE_FLAG = true;
         this.EXCLUDE_COLS_FROM_REGS = ["updatetype", "question", "invalidations", "activations", "alertschedule", "clientquestion", "countryname", "countryid", "entityname", "entityid", "locationname", "locationid", "reporters", "approvers", "timeframe", "responsedays", "execmodule", "functions", "shortid", "shortnumid", "countries", "entities", "locations", "tagsmap", "reportersmap", "approversmap", "functionheadsmap", "auditorsmap", "viewersmap", "approved", "documents", "comments", "lastupdated", "dateofcompletion", "mmdd", "completeness", "timeliness", "compliance", "delta", "triggers"];
+        this.CHARTS_LIST_BY_MODULES = { "compliances": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "notices": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "agreements": ["compliance", "timeliness", "completeness", "location"] };
         this.chartSelectedLegend = [];
         this.selectedFilters = null;
         this.barCharDataSet2 = [];
@@ -2065,6 +2066,16 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.getTimelinessStatus = (mmdd, event, completeness) => {
+            // if(event.module == "agreement"){
+            //   if (completeness == "not-started") {
+            //     if (this.getPastDueDate(mmdd)) {
+            //       return "past-due-date";
+            //     } else {
+            //       return "in-time"
+            //     }
+            //   } else if (completeness == "pending-approval" || completeness == "rejected") {
+            //   }
+            // }
             if (completeness == "not-started") {
                 if (this.getPastDueDate(mmdd)) {
                     return "past-due-date";
@@ -2102,7 +2113,41 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
-        this.getComplianceStatus = (completeness, timeliness, percentage) => {
+        this.getComplianceStatus = (completeness, timeliness, percentage, event = {}) => {
+            if (event.module == "agreement") {
+                if (completeness == "not-started") {
+                    if (timeliness == "in-time") {
+                        return "active";
+                    }
+                    else {
+                        return "expired";
+                    }
+                }
+                else if (completeness == "pending-approval") {
+                    if (timeliness == "in-time") {
+                        return "active";
+                    }
+                    else {
+                        return "expired";
+                    }
+                }
+                else if (completeness == "rejected") {
+                    if (timeliness == "in-time") {
+                        return "active";
+                    }
+                    else {
+                        return "expired";
+                    }
+                }
+                else {
+                    if (timeliness == "in-time" || timeliness == "late-reported" || timeliness == "late-approved") {
+                        return "complied";
+                    }
+                    else {
+                        return "expired";
+                    }
+                }
+            }
             if (completeness == "not-started") {
                 if (timeliness == "in-time") {
                     return "scheduled";
@@ -2205,28 +2250,50 @@ let SfIEvents = class SfIEvents extends LitElement {
                 html += '<div part="stream-event-chart-selection" class="mb-20">';
                 html += '<div part="td-head" class="mb-5">Select Chart</div>';
                 html += '<div class="mb-10 d-flex flex-wrap align-center">';
-                html += '<div part="chart-radio-item"><input type="radio" id="radio-completeness" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_COMPLETENESS) ? 'checked' : '') + '>';
-                html += '<label for="radio-completeness" part="input-label" class="mr-10">Completeness</label></div>';
-                html += '<div part="chart-radio-item"><input type="radio" id="radio-timeliness" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_TIMELINESS) ? 'checked' : '') + '>';
-                html += '<label for="radio-timeliness" part="input-label" class="mr-10">Timeliness</label></div>';
-                html += '<div part="chart-radio-item"><input type="radio" id="radio-compliance" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_COMPLIANCE) ? 'checked' : '') + '>';
-                html += '<label for="radio-compliance" part="input-label" class="mr-10">Compliance</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_RISKAREAS ? '' : 'hide') + '"><input type="radio" id="radio-risk" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_RISKAREAS) ? 'checked' : '') + '>';
-                html += '<label for="radio-risk" part="input-label" class="mr-10">Risk Areas</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_RISKSEVERITY ? '' : 'hide') + '"><input type="radio" id="radio-riskseverity" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_RISKSEVERITY) ? 'checked' : '') + '>';
-                html += '<label for="radio-riskseverity" part="input-label" class="mr-10">Risk Severity</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_LOCATION ? '' : 'hide') + '"><input type="radio" id="radio-location" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_LOCATION) ? 'checked' : '') + '>';
-                html += '<label for="radio-location" part="input-label" class="mr-10">Location</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_FUNCTION ? '' : 'hide') + '"><input type="radio" id="radio-function" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_FUNCTION) ? 'checked' : '') + '>';
-                html += '<label for="radio-function" part="input-label" class="mr-10">Function</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_OBLIGATIONTYPE ? '' : 'hide') + '"><input type="radio" id="radio-obligationtype" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_OBLIGATIONTYPE) ? 'checked' : '') + '>';
-                html += '<label for="radio-obligationtype" part="input-label" class="mr-10">Obligation Type</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_JURISDICTION ? '' : 'hide') + '"><input type="radio" id="radio-jurisdiction" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_JURISDICTION) ? 'checked' : '') + '>';
-                html += '<label for="radio-jurisdiction" part="input-label" class="mr-10">Jurisdiction</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_FREQUENCY ? '' : 'hide') + '"><input type="radio" id="radio-frequency" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_FREQUENCY) ? 'checked' : '') + '>';
-                html += '<label for="radio-frequency" part="input-label" class="mr-10">Frequency</label></div>';
-                html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_SUBCATEGORY ? '' : 'hide') + '"><input type="radio" id="radio-subcategory" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_SUBCATEGORY) ? 'checked' : '') + '>';
-                html += '<label for="radio-frequency" part="input-label">SubCategory</label></div>';
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("completeness") >= 0) {
+                    html += '<div part="chart-radio-item"><input type="radio" id="radio-completeness" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_COMPLETENESS) ? 'checked' : '') + '>';
+                    html += '<label for="radio-completeness" part="input-label" class="mr-10">Completeness</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("timeliness") >= 0) {
+                    html += '<div part="chart-radio-item"><input type="radio" id="radio-timeliness" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_TIMELINESS) ? 'checked' : '') + '>';
+                    html += '<label for="radio-timeliness" part="input-label" class="mr-10">Timeliness</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("compliance") >= 0) {
+                    html += '<div part="chart-radio-item"><input type="radio" id="radio-compliance" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_COMPLIANCE) ? 'checked' : '') + '>';
+                    html += '<label for="radio-compliance" part="input-label" class="mr-10">Compliance</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("riskArea") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_RISKAREAS ? '' : 'hide') + '"><input type="radio" id="radio-risk" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_RISKAREAS) ? 'checked' : '') + '>';
+                    html += '<label for="radio-risk" part="input-label" class="mr-10">Risk Areas</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("riskSeverity") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_RISKSEVERITY ? '' : 'hide') + '"><input type="radio" id="radio-riskseverity" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_RISKSEVERITY) ? 'checked' : '') + '>';
+                    html += '<label for="radio-riskseverity" part="input-label" class="mr-10">Risk Severity</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("location") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_LOCATION ? '' : 'hide') + '"><input type="radio" id="radio-location" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_LOCATION) ? 'checked' : '') + '>';
+                    html += '<label for="radio-location" part="input-label" class="mr-10">Location</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("function") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_FUNCTION ? '' : 'hide') + '"><input type="radio" id="radio-function" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_FUNCTION) ? 'checked' : '') + '>';
+                    html += '<label for="radio-function" part="input-label" class="mr-10">Function</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("obligationType") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_OBLIGATIONTYPE ? '' : 'hide') + '"><input type="radio" id="radio-obligationtype" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_OBLIGATIONTYPE) ? 'checked' : '') + '>';
+                    html += '<label for="radio-obligationtype" part="input-label" class="mr-10">Obligation Type</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("jurisdiction") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_JURISDICTION ? '' : 'hide') + '"><input type="radio" id="radio-jurisdiction" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_JURISDICTION) ? 'checked' : '') + '>';
+                    html += '<label for="radio-jurisdiction" part="input-label" class="mr-10">Jurisdiction</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("frequency") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_FREQUENCY ? '' : 'hide') + '"><input type="radio" id="radio-frequency" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_FREQUENCY) ? 'checked' : '') + '>';
+                    html += '<label for="radio-frequency" part="input-label" class="mr-10">Frequency</label></div>';
+                }
+                if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].indexOf("subcategory") >= 0) {
+                    html += '<div part="chart-radio-item" class="chart-radio-item-secondary ' + (this.flowGraph == this.FLOW_GRAPH_SUBCATEGORY ? '' : 'hide') + '"><input type="radio" id="radio-subcategory" name="graph-type" part="radio-graph" ' + ((this.flowGraph == this.FLOW_GRAPH_SUBCATEGORY) ? 'checked' : '') + '>';
+                    html += '<label for="radio-frequency" part="input-label">SubCategory</label></div>';
+                }
                 html += '<button id="graph-radios-expander" class="ml-10" part="calendar-tab-button-not-selected"><span class="material-symbols-outlined">chevron_right</span></button>';
                 html += '</div>';
                 html += '</div>';
@@ -2294,13 +2361,22 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div part="badge-dashboard" id="chip-timeliness-2" class="chip stat-timeliness justify-center align-center mr-10 mb-10 no-shrink late-statuses"><span class="material-icons color-late-reported">report_off</span>&nbsp;&nbsp;<span>Late Reported:</span>&nbsp;<span id="graph-late-reported">DASHBOARD_LATE_REPORTED</span></div>';
             html += '<div part="badge-dashboard" id="chip-timeliness-3" class="chip stat-timeliness justify-center align-center mr-10 mb-10 no-shrink late-statuses"><span class="material-icons color-late-approved">remove_done</span>&nbsp;&nbsp;<span>Late Approved:</span>&nbsp;<span id="graph-late-approved">DASHBOARD_LATE_APPROVED</span></div>';
             html += '<div part="badge-dashboard" id="chip-timeliness-4" class="chip stat-timeliness justify-center align-center mr-10 mb-10 no-shrink late-statuses"><span class="material-icons color-late-executed">running_with_errors</span>&nbsp;&nbsp;<span>Late Executed:</span>&nbsp;<span id="graph-late-executed">DASHBOARD_LATE_EXECUTED</span></div>';
-            html += '<div part="badge-dashboard" id="chip-compliance-0" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-scheduled">schedule</span>&nbsp;&nbsp;<span>Scheduled:</span>&nbsp;<span id="graph-scheduled">DASHBOARD_SCHEDULED</span></div>';
-            html += '<div part="badge-dashboard" id="chip-compliance-1" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-not-complied">disabled_by_default</span>&nbsp;&nbsp;<span>Not Complied:</span>&nbsp;<span id="graph-not-complied">DASHBOARD_NOT_COMPLIED</span></div>';
-            html += '<div part="badge-dashboard" id="chip-compliance-2" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-partially-complied">rule</span>&nbsp;&nbsp;<span>Partially Complied:</span>&nbsp;<span id="graph-partially-complied">DASHBOARD_PARTIALLY_COMPLIED</span></div>';
-            html += '<div part="badge-dashboard" id="chip-compliance-3" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied">sweep</span>&nbsp;&nbsp;<span>Complied:</span>&nbsp;<span id="graph-complied">DASHBOARD_COMPLIED</span></div>';
-            html += '<div part="badge-dashboard" id="chip-compliance-4" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied-with-gaps">rule</span>&nbsp;&nbsp;<span>Complied With Gaps:</span>&nbsp;<span id="graph-complied-with-gaps">DASHBOARD_COMPLIED_WITH_GAPS</span></div>';
-            html += '<div part="badge-dashboard" id="chip-compliance-5" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-reported-non-compliance">rule</span>&nbsp;&nbsp;<span>Reported Non Compliance:</span>&nbsp;<span id="graph-reported-non-compliance">DASHBOARD_REPORTED_NON_COMPLIANCE</span></div>';
-            html += '</div>';
+            if (this.selectedFeatures.indexOf("agreements") >= 0) {
+                html += '<div part="badge-dashboard" id="chip-compliance-0" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-scheduled">schedule</span>&nbsp;&nbsp;<span>Active:</span>&nbsp;<span id="graph-active">DASHBOARD_ACTIVE</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-1" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-not-complied">disabled_by_default</span>&nbsp;&nbsp;<span>About To Expire:</span>&nbsp;<span id="graph-about-to-expire">DASHBOARD_ABOUT_TO_EXPIRE</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-2" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-partially-complied">rule</span>&nbsp;&nbsp;<span>Expired:</span>&nbsp;<span id="graph-expired">DASHBOARD_EXPIRED</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-3" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied">sweep</span>&nbsp;&nbsp;<span>Terminated:</span>&nbsp;<span id="graph-terminated">DASHBOARD_TERMINATED</span></div>';
+                html += '</div>';
+            }
+            else {
+                html += '<div part="badge-dashboard" id="chip-compliance-0" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-scheduled">schedule</span>&nbsp;&nbsp;<span>Scheduled:</span>&nbsp;<span id="graph-scheduled">DASHBOARD_SCHEDULED</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-1" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-not-complied">disabled_by_default</span>&nbsp;&nbsp;<span>Not Complied:</span>&nbsp;<span id="graph-not-complied">DASHBOARD_NOT_COMPLIED</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-2" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-partially-complied">rule</span>&nbsp;&nbsp;<span>Partially Complied:</span>&nbsp;<span id="graph-partially-complied">DASHBOARD_PARTIALLY_COMPLIED</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-3" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied">sweep</span>&nbsp;&nbsp;<span>Complied:</span>&nbsp;<span id="graph-complied">DASHBOARD_COMPLIED</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-4" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied-with-gaps">rule</span>&nbsp;&nbsp;<span>Complied With Gaps:</span>&nbsp;<span id="graph-complied-with-gaps">DASHBOARD_COMPLIED_WITH_GAPS</span></div>';
+                html += '<div part="badge-dashboard" id="chip-compliance-5" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-reported-non-compliance">rule</span>&nbsp;&nbsp;<span>Reported Non Compliance:</span>&nbsp;<span id="graph-reported-non-compliance">DASHBOARD_REPORTED_NON_COMPLIANCE</span></div>';
+                html += '</div>';
+            }
             html += '<div id="stream-event-filter" part="stream-event-total" class="d-flex flex-wrap"></div>';
             return html;
         };
@@ -2322,7 +2398,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div part="badge-dashboard" id="chip-compliance-2" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-partially-complied">rule</span>&nbsp;&nbsp;<span>Partially Complied:</span>&nbsp;<span id="graph-partially-complied">DASHBOARD_PARTIALLY_COMPLIED</span></div>';
             html += '<div part="badge-dashboard" id="chip-compliance-3" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied">sweep</span>&nbsp;&nbsp;<span>Complied:</span>&nbsp;<span id="graph-complied">DASHBOARD_COMPLIED</span></div>';
             html += '<div part="badge-dashboard" id="chip-compliance-4" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied-with-gaps">rule</span>&nbsp;&nbsp;<span>Complied With Gaps:</span>&nbsp;<span id="graph-complied-with-gaps">DASHBOARD_COMPLIED_WITH_GAPS</span></div>';
-            html += '<div part="badge-dashboard" id="chip-compliance-5" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-reported-non-compliance">rule</span>&nbsp;&nbsp;<span>Reported Non Compliance:</span>&nbsp;<span id="graph-reported-non-compliance">DASHBOARD_COMPLIED_WITH_GAPS</span></div>';
+            html += '<div part="badge-dashboard" id="chip-compliance-5" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-reported-non-compliance">rule</span>&nbsp;&nbsp;<span>Reported Non Compliance:</span>&nbsp;<span id="graph-reported-non-compliance">DASHBOARD_REPORTED_NON_COMPLIANCE</span></div>';
             html += '</div>';
             html += '<div id="stream-event-filter" part="stream-event-total" class="d-flex flex-wrap"></div>';
             return html;
@@ -2719,7 +2795,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         //(firstDay, endDay, 1, lastDay, true, 0, (firstDate.getMonth()), period, firstDate,"From " + firstDay.toLocaleDateString('en-IN') + " To " + endDay.toLocaleDateString('en-IN'), showBackgroundButton)
         this.renderEvents = (_firstDay, _endDay, iInit, iLast, showGraph, index, month, period, firstDate = null, parametersTitle, showBackgroundButton) => {
             var _a, _b, _c, _f, _g, _h, _j, _k;
-            var total = 0, notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0, inTime = 0, pastDueDate = 0, lateExecuted = 0, lateApproved = 0, lateReported = 0, scheduled = 0, partiallyComplied = 0, notComplied = 0, complied = 0, compliedWithGaps = 0, reportedNonCompliance = 0;
+            var total = 0, notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0, inTime = 0, pastDueDate = 0, lateExecuted = 0, lateApproved = 0, lateReported = 0, scheduled = 0, partiallyComplied = 0, notComplied = 0, complied = 0, compliedWithGaps = 0, reportedNonCompliance = 0, active = 0, aboutToExpire = 0, expired = 0, terminated = 0;
             var html = '';
             this.selectedItemIds = [];
             this.selectedItems = [];
@@ -2775,7 +2851,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                         // //console.log('eventlog1', tempEvents1['06/30'][7].comments, mmdd, j);
                         partStatus = this.getCompletenessStatus(JSON.parse(JSON.stringify(this.events[mmdd][j])));
                         lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(this.events[mmdd][j])), partStatus);
-                        complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(this.events[mmdd][j])).percentage);
+                        complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(this.events[mmdd][j])).percentage, JSON.parse(JSON.stringify(this.events[mmdd][j])));
+                        console.log("agreement partStatus", partStatus, lateStatus, complianceStatus);
                         if (this.flowGraph == this.FLOW_GRAPH_TIMELINESS) {
                             bgStatus += lateStatus;
                         }
@@ -2802,6 +2879,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                         complied = complied + (complianceStatus == "complied" ? 1 : 0);
                         compliedWithGaps = compliedWithGaps + (complianceStatus == "complied-with-gaps" ? 1 : 0);
                         reportedNonCompliance = reportedNonCompliance + (complianceStatus == "reported-non-compliance" ? 1 : 0);
+                        active = active + (complianceStatus == "active" ? 1 : 0);
+                        aboutToExpire = aboutToExpire + (complianceStatus == "about-to-expire" ? 1 : 0);
+                        expired = expired + (complianceStatus == "expired" ? 1 : 0);
+                        terminated = terminated + (complianceStatus == "teminated" ? 1 : 0);
                         this.events[mmdd][j][this.FLOW_GRAPH_COMPLETENESS] = partStatus;
                         this.events[mmdd][j][this.FLOW_GRAPH_TIMELINESS] = lateStatus;
                         this.events[mmdd][j][this.FLOW_GRAPH_COMPLIANCE] = complianceStatus;
@@ -2931,14 +3012,31 @@ let SfIEvents = class SfIEvents extends LitElement {
             html = html.replace("DASHBOARD_PARTIALLY_COMPLIED", partiallyComplied + "");
             html = html.replace("DASHBOARD_COMPLIED", complied + "");
             html = html.replace("DASHBOARD_COMPLIED_WITH_GAPS", compliedWithGaps + "");
-            this.csvDataStats = 'Period,Total,Not Started,Approved,Pending Approval,Rejected,Past Due Date,Late Reported,Late Executed,Late Approved,Scheduled,Not Complied,Partially Complied,Complied,Complied With Gaps\n';
-            this.csvDataStats += this.period + "," + total + "," + notStarted + "," + approved + "," + pendingApproval + "," + rejected + "," + pastDueDate + "," + lateReported + "," + lateExecuted + "," + lateApproved + "," + scheduled + "," + notComplied + "," + partiallyComplied + "," + complied + "," + compliedWithGaps;
+            html = html.replace("DASHBOARD_REPORTED_NON_COMPLIANCE", reportedNonCompliance + "");
+            html = html.replace("DASHBOARD_ACTIVE", active + "");
+            html = html.replace("DASHBOARD_ABOUT_TO_EXPIRE", aboutToExpire + "");
+            html = html.replace("DASHBOARD_EXPIRED", expired + "");
+            html = html.replace("DASHBOARD_TERMINATED", terminated + "");
+            if (this.selectedFeatures.indexOf("agreements") >= 0) {
+                this.csvDataStats = 'Period,Total,Not Started,Approved,Pending Approval,Rejected,Past Due Date,Late Reported,Late Executed,Late Approved,Active,About To Expire,Expired,Terminated\n';
+                this.csvDataStats += this.period + "," + total + "," + notStarted + "," + approved + "," + pendingApproval + "," + rejected + "," + pastDueDate + "," + lateReported + "," + lateExecuted + "," + lateApproved + "," + active + "," + aboutToExpire + "," + expired + "," + terminated;
+            }
+            else {
+                this.csvDataStats = 'Period,Total,Not Started,Approved,Pending Approval,Rejected,Past Due Date,Late Reported,Late Executed,Late Approved,Scheduled,Not Complied,Partially Complied,Complied,Complied With Gaps,Reported Non Compliance\n';
+                this.csvDataStats += this.period + "," + total + "," + notStarted + "," + approved + "," + pendingApproval + "," + rejected + "," + pastDueDate + "," + lateReported + "," + lateExecuted + "," + lateApproved + "," + scheduled + "," + notComplied + "," + partiallyComplied + "," + complied + "," + compliedWithGaps + "," + reportedNonCompliance;
+            }
             this.htmlDataStats = 'Completeness<br /><br /><table class="w-100"><tr><th class="w-14">Total</th><th class="w-14">Not Started</th><th class="w-14">Approved</th><th class="w-14">Pending Approval</th><th class="w-14">Rejected</th><tr>';
             this.htmlDataStats += '<tr><td class="w-14 text-center td-odd">' + total + '</td><td class="w-14 text-center td-odd">' + notStarted + '</td><td class="w-14 text-center td-odd">' + approved + '</td><td class="w-14 text-center td-odd">' + pendingApproval + '</td><td class="w-14 text-center td-odd">' + rejected + '</td></table>';
             this.htmlDataStats += '<br /><br />Timeliness<br /><br /><table class="mt-20 w-100"><tr><th class="w-14">Total</th><th class="w-14">In Time</th><th class="w-14">Past Due Date</th><th class="w-14">Late Reported</th><th class="w-14">Late Executed</th><th class="w-14">Late Approved</th><tr>';
             this.htmlDataStats += '<tr><td class="w-14 text-center td-odd">' + total + '</td><td class="w-14 text-center td-odd">' + (total - (pastDueDate + lateApproved + lateExecuted)) + '</td><td class="w-14 text-center td-odd">' + pastDueDate + '</td><td class="w-14 text-center td-odd">' + lateReported + '</td><td class="w-14 text-center td-odd">' + lateExecuted + '</td><td class="w-14 text-center td-odd">' + lateApproved + '</td><tr></table>';
-            this.htmlDataStats += '<br /><br />Compliance<br /><br /><table class="w-100"><tr><th class="w-14">Total</th><th class="w-14">Scheduled</th><th class="w-14">Not Complied</th><th class="w-14">Partially Complied</th><th class="w-14">Complied</th><th class="w-14">Complied With Gaps</th><tr>';
-            this.htmlDataStats += '<tr><td class="w-14 text-center td-odd">' + total + '</td><td class="w-14 text-center td-odd">' + scheduled + '</td><td class="w-14 text-center td-odd">' + notComplied + '</td><td class="w-14 text-center td-odd">' + partiallyComplied + '</td><td class="w-14 text-center td-odd">' + complied + '</td><td class="w-14 text-center td-odd">' + compliedWithGaps + '</td><tr></table>';
+            if (this.selectedFeatures.indexOf("agreements") >= 0) {
+                this.htmlDataStats += '<br /><br />Compliance<br /><br /><table class="w-100"><tr><th class="w-14">Total</th><th class="w-14">Active</th><th class="w-14">About To Expire</th><th class="w-14">Expired</th><th class="w-14">Terminated</th><tr>';
+                this.htmlDataStats += '<tr><td class="w-14 text-center td-odd">' + total + '</td><td class="w-14 text-center td-odd">' + active + '</td><td class="w-14 text-center td-odd">' + aboutToExpire + '</td><td class="w-14 text-center td-odd">' + expired + '</td><td class="w-14 text-center td-odd">' + terminated + '</td><tr></table>';
+            }
+            else {
+                this.htmlDataStats += '<br /><br />Compliance<br /><br /><table class="w-100"><tr><th class="w-14">Total</th><th class="w-14">Scheduled</th><th class="w-14">Not Complied</th><th class="w-14">Partially Complied</th><th class="w-14">Complied</th><th class="w-14">Complied With Gaps</th><th class="w-14">Reported Non Compliance</th><tr>';
+                this.htmlDataStats += '<tr><td class="w-14 text-center td-odd">' + total + '</td><td class="w-14 text-center td-odd">' + scheduled + '</td><td class="w-14 text-center td-odd">' + notComplied + '</td><td class="w-14 text-center td-odd">' + partiallyComplied + '</td><td class="w-14 text-center td-odd">' + complied + '</td><td class="w-14 text-center td-odd">' + compliedWithGaps + '</td><td class="w-14 text-center td-odd">' + reportedNonCompliance + '</td><tr></table>';
+            }
             return html;
         };
         this.renderStatistics = (_firstDay, _endDay, iInit, iLast, showGraph, index, month, period, firstDate = null, parametersTitle) => {
@@ -4128,6 +4226,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     div.style.display = 'block';
                 });
             });
+            if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].length <= 4) {
+                radioExpander === null || radioExpander === void 0 ? void 0 : radioExpander.click();
+            }
             const buttonRefresh = eventsContainer.querySelector('#button-refresh');
             buttonRefresh.addEventListener('click', async () => {
                 this.processDateSelection(eventsContainer);
@@ -4146,7 +4247,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else if (module === "agreement") {
-                        this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
+                        this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else {
                         let found = false;
@@ -4179,7 +4280,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else if (module === "agreement") {
-                        this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
+                        this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else {
                         let found = false;
@@ -7458,6 +7559,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     div.style.display = 'block';
                 });
             });
+            if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].length <= 4) {
+                radioExpander === null || radioExpander === void 0 ? void 0 : radioExpander.click();
+            }
             const radioCompleteness = this._SfThisContainer.querySelector('#radio-completeness');
             radioCompleteness === null || radioCompleteness === void 0 ? void 0 : radioCompleteness.addEventListener('click', () => {
                 this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
@@ -7581,7 +7685,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else if (module === "agreement") {
-                        this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
+                        this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else {
                         let found = false;
@@ -7613,7 +7717,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else if (module === "agreement") {
-                        this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
+                        this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else {
                         let found = false;
@@ -7926,6 +8030,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     div.style.display = 'block';
                 });
             });
+            if (this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]] != null && this.CHARTS_LIST_BY_MODULES[this.selectedFeatures[0]].length <= 4) {
+                radioExpander === null || radioExpander === void 0 ? void 0 : radioExpander.click();
+            }
             const radioCompleteness = this._SfStreamContainer.querySelector('#radio-completeness');
             radioCompleteness === null || radioCompleteness === void 0 ? void 0 : radioCompleteness.addEventListener('click', () => {
                 this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
@@ -8068,7 +8175,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else if (module === "agreement") {
-                        this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
+                        this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else {
                         let found = false;
@@ -8102,7 +8209,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else if (module === "agreement") {
-                        this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
+                        this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy);
                     }
                     else {
                         let found = false;
@@ -8541,36 +8648,71 @@ let SfIEvents = class SfIEvents extends LitElement {
             this.csvCompletenessStats = "";
             this.csvTimelinessStats = "";
             this.csvComplianceStats = "";
-            var dataTotal = divContainer.querySelector('#graph-total').innerHTML;
-            var dataNotComplied = divContainer.querySelector('#graph-not-complied').innerHTML;
-            var dataScheduled = divContainer.querySelector('#graph-scheduled').innerHTML;
-            var dataPartiallyComplied = divContainer.querySelector('#graph-partially-complied').innerHTML;
-            var dataComplied = divContainer.querySelector('#graph-complied').innerHTML;
-            var dataCompliedWithGaps = divContainer.querySelector('#graph-complied-with-gaps').innerHTML;
-            var dataReportedNonComplaince = divContainer.querySelector('#graph-reported-non-compliance').innerHTML;
-            const ctx = divContainer.querySelector('#myChart');
-            this.showGraph(divContainer, 1);
-            this.clearGraph(divContainer, 2);
-            this.clearGraph(divContainer, 3);
-            this.clearGraph(divContainer, 4);
-            const data = {
-                labels: ['Scheduled', 'Not Complied', 'Partially Complied', 'Complied', 'Complied With Gaps', 'Reported Non Complinace'],
-                datasets: [{
-                        label: 'Compliances',
-                        data: [dataScheduled, dataNotComplied, dataPartiallyComplied, dataComplied, dataCompliedWithGaps, dataReportedNonComplaince],
-                        borderWidth: 1,
-                        backgroundColor: [
-                            this.COLOR_SCHEDULED,
-                            this.COLOR_NOT_COMPLIED,
-                            this.COLOR_PARTIALLY_COMPLIED,
-                            this.COLOR_COMPLIED,
-                            this.COLOR_COMPLIED_WITH_EXCEPTION,
-                            this.COLOR_REPORTED_NON_COMPLIANCE
-                        ]
-                    }]
-            };
-            this.csvGraphStats += 'Compliance,Scheduled,Not Complied,Partially Complied,Complied,Complied With Gaps,Reported Non Compliance,Total\n';
-            this.csvGraphStats += 'Count,' + parseInt(dataScheduled) + ',' + parseInt(dataNotComplied) + ',' + parseInt(dataPartiallyComplied) + ',' + parseInt(dataComplied) + ',' + parseInt(dataCompliedWithGaps) + ',' + parseInt(dataReportedNonComplaince) + ',' + parseInt(dataTotal) + '\n';
+            console.log('agreements');
+            let data = null;
+            let ctx = null;
+            if (this.selectedFeatures.indexOf('agreements') >= 0) {
+                var dataTotal = divContainer.querySelector('#graph-total').innerHTML;
+                var dataActive = divContainer.querySelector('#graph-active').innerHTML;
+                var dataAboutToExpire = divContainer.querySelector('#graph-about-to-expire').innerHTML;
+                var dataExpired = divContainer.querySelector('#graph-expired').innerHTML;
+                var dataTerminated = divContainer.querySelector('#graph-terminated').innerHTML;
+                ctx = divContainer.querySelector('#myChart');
+                this.showGraph(divContainer, 1);
+                this.clearGraph(divContainer, 2);
+                this.clearGraph(divContainer, 3);
+                this.clearGraph(divContainer, 4);
+                data = {
+                    labels: ['Active', 'About To Expire', 'Expired', 'Terminated'],
+                    datasets: [{
+                            label: 'Compliances',
+                            data: [dataActive, dataAboutToExpire, dataExpired, dataTerminated],
+                            borderWidth: 1,
+                            backgroundColor: [
+                                this.COLOR_SCHEDULED,
+                                this.COLOR_NOT_COMPLIED,
+                                this.COLOR_PARTIALLY_COMPLIED,
+                                this.COLOR_COMPLIED,
+                                // this.COLOR_COMPLIED_WITH_EXCEPTION,
+                                // this.COLOR_REPORTED_NON_COMPLIANCE
+                            ]
+                        }]
+                };
+                this.csvGraphStats += 'Compliance,Active,About To Expire,Expired,Terminated,Total\n';
+                this.csvGraphStats += 'Count,' + parseInt(dataActive) + ',' + parseInt(dataAboutToExpire) + ',' + parseInt(dataExpired) + ',' + parseInt(dataTerminated) + ',' + parseInt(dataTotal) + '\n';
+            }
+            else {
+                var dataTotal = divContainer.querySelector('#graph-total').innerHTML;
+                var dataNotComplied = divContainer.querySelector('#graph-not-complied').innerHTML;
+                var dataScheduled = divContainer.querySelector('#graph-scheduled').innerHTML;
+                var dataPartiallyComplied = divContainer.querySelector('#graph-partially-complied').innerHTML;
+                var dataComplied = divContainer.querySelector('#graph-complied').innerHTML;
+                var dataCompliedWithGaps = divContainer.querySelector('#graph-complied-with-gaps').innerHTML;
+                var dataReportedNonComplaince = divContainer.querySelector('#graph-reported-non-compliance').innerHTML;
+                ctx = divContainer.querySelector('#myChart');
+                this.showGraph(divContainer, 1);
+                this.clearGraph(divContainer, 2);
+                this.clearGraph(divContainer, 3);
+                this.clearGraph(divContainer, 4);
+                data = {
+                    labels: ['Scheduled', 'Not Complied', 'Partially Complied', 'Complied', 'Complied With Gaps', 'Reported Non Complinace'],
+                    datasets: [{
+                            label: 'Compliances',
+                            data: [dataScheduled, dataNotComplied, dataPartiallyComplied, dataComplied, dataCompliedWithGaps, dataReportedNonComplaince],
+                            borderWidth: 1,
+                            backgroundColor: [
+                                this.COLOR_SCHEDULED,
+                                this.COLOR_NOT_COMPLIED,
+                                this.COLOR_PARTIALLY_COMPLIED,
+                                this.COLOR_COMPLIED,
+                                this.COLOR_COMPLIED_WITH_EXCEPTION,
+                                this.COLOR_REPORTED_NON_COMPLIANCE
+                            ]
+                        }]
+                };
+                this.csvGraphStats += 'Compliance,Scheduled,Not Complied,Partially Complied,Complied,Complied With Gaps,Reported Non Compliance,Total\n';
+                this.csvGraphStats += 'Count,' + parseInt(dataScheduled) + ',' + parseInt(dataNotComplied) + ',' + parseInt(dataPartiallyComplied) + ',' + parseInt(dataComplied) + ',' + parseInt(dataCompliedWithGaps) + ',' + parseInt(dataReportedNonComplaince) + ',' + parseInt(dataTotal) + '\n';
+            }
             //console.log('rendering timeliness graph', this.csvGraphStats);
             const itemsTimeliness = divContainer.querySelectorAll('.stat-timeliness');
             for (var i = 0; i < itemsTimeliness.length; i++) {
@@ -9757,8 +9899,58 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
+        this.fetchAgreementDetails = async (listEvent, mmddyyyy) => {
+            let entityId = listEvent.entityid;
+            let locationId = listEvent.locationid;
+            let url = "https://" + this.apiIdAgreements + "/getallobjectdetails";
+            //console.log('fetch calendar url', url);
+            let urlBody = { projectid: this.projectId, objectid: listEvent.id, entityid: entityId, locationid: locationId, userprofileid: this.userProfileId, role: this.myRole, year: this.calendarStartYYYY, mmddyyyy: mmddyyyy };
+            //console.log('urlbody', urlBody);
+            const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
+            const xhr = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
+            this._SfLoader.innerHTML = '';
+            if (xhr.status == 200) {
+                const jsonRespose = JSON.parse(xhr.responseText);
+                console.log('jsonRespose agreement details', jsonRespose);
+                this.renderAgreementDetails(jsonRespose.object, mmddyyyy);
+            }
+            else {
+                if (xhr.status == 401) {
+                    let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+                    this.dispatchEvent(changeEvent);
+                }
+                else {
+                    const jsonRespose = JSON.parse(xhr.responseText);
+                    this.setError(jsonRespose.error);
+                }
+            }
+        };
+        this.renewAgreement = async (listEvent, reportformatvalues) => {
+            let url = "https://" + this.apiIdAgreements + "/reopen";
+            //console.log('fetch calendar url', url);
+            let urlBody = { projectid: this.projectId, objectid: listEvent.id, newvalues: JSON.parse(reportformatvalues), published: true };
+            const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
+            const xhr = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
+            this._SfLoader.innerHTML = '';
+            if (xhr.status == 200) {
+                const jsonRespose = JSON.parse(xhr.responseText);
+                console.log('jsonRespose agreement reopen', jsonRespose);
+            }
+            else {
+                if (xhr.status == 401) {
+                    let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+                    this.dispatchEvent(changeEvent);
+                }
+                else {
+                    const jsonRespose = JSON.parse(xhr.responseText);
+                    this.setError(jsonRespose.error);
+                }
+            }
+        };
         this.renderAgreementDetails = async (listEvent, mmddyyyy) => {
             var _a, _b, _c, _f, _g, _h;
+            // await this.fetchAgreementDetails(listEvent, mmddyyyy);
+            // return;
             let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1];
             let entityId = listEvent.entityid;
             let locationId = listEvent.locationid;
@@ -9782,6 +9974,9 @@ let SfIEvents = class SfIEvents extends LitElement {
     `;
             html += '<sf-i-reporting id="detail-reporting" class="hide" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, commentbox:reporting-commentbox, comment-username:reporting-comment-username, detail-head:reporting-detail-head, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label, reporting-commentbox:reporting-reporting-commentbox, reporting-comment-username:reporting-reporting-comment-username, reporting-detail-head:reporting-reporting-detail-head, input-sf-i-select:reporting-input-sf-i-select,reporting-input-sf-i-select:reporting-reporting-input-sf-i-select, select-input-select:reporting-select-input-select" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdAgreements + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
             html += '<div part="reporting-view-container">';
+            if (listEvent.customreporting != null || listEvent.reportformatschema != null) {
+                html += '<sf-i-reporting id="reporting-reporting" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, commentbox:reporting-commentbox, comment-username:reporting-comment-username, detail-head:reporting-detail-head, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label, reporting-commentbox:reporting-reporting-commentbox, reporting-comment-username:reporting-reporting-comment-username, reporting-detail-head:reporting-reporting-detail-head, input-sf-i-select:reporting-input-sf-i-select,reporting-input-sf-i-select:reporting-reporting-input-sf-i-select, select-input-select:reporting-select-input-select" mode="edit" name="Contract Reporting" formviewclass="flex-wrap"></sf-i-reporting>';
+            }
             html += this.renderReporting(listEvent, mmddyyyy);
             html += "</div>";
             html += '<div class="d-flex justify-between m-20">';
@@ -9825,11 +10020,35 @@ let SfIEvents = class SfIEvents extends LitElement {
             this._SfDetailContainer.style.display = 'block';
             let sfireporting = this._SfDetailContainer.querySelector('#detail-reporting');
             sfireporting.selectedItem = listEvent;
+            sfireporting.editdisable = "true";
             sfireporting.loadMode();
             sfireporting.addEventListener('valueChanged', () => {
                 sfireporting.classList.remove('hide');
                 this._SfDetailContainer.querySelector('#shimmer-container-agreements').classList.add('hide');
             });
+            let reportingSchemaJson = "";
+            let reportingSchemaValues = "";
+            if (listEvent.reportformatschema != null) {
+                reportingSchemaJson = listEvent.reportformatschema;
+                reportingSchemaValues = listEvent.reportformatvalues;
+            }
+            else if (listEvent.customreporting != null) {
+                reportingSchemaJson = listEvent.customreporting;
+            }
+            if (reportingSchemaJson != "") {
+                let reportingReporting = this._SfDetailContainer.querySelector('#reporting-reporting');
+                reportingReporting.configjson = reportingSchemaJson;
+                if (reportingSchemaValues != "")
+                    reportingReporting.prepopulateValJson = reportingSchemaValues;
+                reportingReporting.editdisable = "false";
+                reportingReporting.flow = "edit";
+                setTimeout(() => {
+                    reportingReporting.loadMode();
+                    console.log('list-customreporting', reportingSchemaJson);
+                    console.log('list-customreporting1', reportingSchemaValues);
+                    console.log('list-customreporting2', reportingReporting.mode);
+                }, 500);
+            }
             (_a = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
                 this._SfDetailContainer.innerHTML = '';
                 this._SfDetailContainer.style.display = 'none';
@@ -9881,7 +10100,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             });
             if (this.mode == "consumer" || this.mode == "next") {
                 (_f = this._SfDetailContainer.querySelector('#button-uploader-submit-approve')) === null || _f === void 0 ? void 0 : _f.addEventListener('click', async (ev) => {
-                    var _a, _b;
+                    var _a, _b, _c;
                     let buttonClick = ev.target;
                     buttonClick.innerHTML = "Saving...";
                     const comments = this._SfDetailContainer.querySelector('#input-approver-comments').value;
@@ -9905,6 +10124,14 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (this.selectedItemIds.length <= 1) {
                         console.log('mmddyyyy', mmddyyyy);
                         if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, (_a = listEvent.module) !== null && _a !== void 0 ? _a : "events")) {
+                            if (approved) {
+                                let reportformatvalues = "";
+                                if (listEvent.customreporting != null) {
+                                    let reportingReporting = this._SfDetailContainer.querySelector('#reporting-reporting');
+                                    reportformatvalues = (_b = JSON.stringify(reportingReporting.selectedValues())) !== null && _b !== void 0 ? _b : "";
+                                }
+                                await this.renewAgreement(listEvent, reportformatvalues);
+                            }
                             for (var p = 0; p < this.events[mmdd].length; p++) {
                                 if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                                     this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
@@ -9941,7 +10168,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
                                 "year": this.calendarStartYYYY,
-                                "module": (_b = listEvent.module) !== null && _b !== void 0 ? _b : "events"
+                                "module": (_c = listEvent.module) !== null && _c !== void 0 ? _c : "events"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
                             // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
@@ -10140,9 +10367,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 //console.log('docs', docs);
                                 let reportformatvalues = "";
                                 let reportformatschema = "";
-                                if (this._SfReporting[0] != null) {
-                                    reportformatvalues = (_a = JSON.stringify(this._SfReporting[0].querySelector('#reporting-format').selectedValues())) !== null && _a !== void 0 ? _a : "";
-                                    reportformatschema = (_b = this._SfReporting[0].querySelector('#reporting-format').configjson) !== null && _b !== void 0 ? _b : "";
+                                if (listEvent.customreporting != null) {
+                                    let reportingReporting = this._SfDetailContainer.querySelector('#reporting-reporting');
+                                    reportformatvalues = (_a = JSON.stringify(reportingReporting.selectedValues())) !== null && _a !== void 0 ? _a : "";
+                                    reportformatschema = (_b = reportingReporting.configjson) !== null && _b !== void 0 ? _b : "";
                                 }
                                 let percentage = "100";
                                 if (this._SfDetailContainer.querySelector('#input-reporter-percentage') != null) {
@@ -10219,6 +10447,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                                     this.events[mmdd][p].lastupdated = new Date().toString();
                                                                 }
                                                             }
+                                                            await this.renewAgreement(listEvent, reportformatvalues);
                                                             console.log('upload report auto approve single');
                                                         }
                                                         if (this.recentlyReported[mmdd] == null) {
@@ -11582,7 +11811,22 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
             this.fetchStatuteDefinitionDetails(statuteName);
-            if (event['reportformat'] != null && event['reportformat'].length > 0) {
+            console.log('customreporting', event['customreporting']);
+            if (event['customreporting'] != null) {
+                let reportingContainer = this._SfDetailContainer;
+                if (reportingContainer.querySelector('#report-format-container') != null) {
+                    reportingContainer.querySelector('#report-format-container').innerHTML = `<slot name="reporting"></slot>`;
+                    console.log('innerhtml', reportingContainer.querySelector('#report-format-container').innerHTML);
+                    this._SfReporting[0].querySelector('#reporting-format').name = event.obligationtitle;
+                    this._SfReporting[0].querySelector('#reporting-format').mode = "edit";
+                    this._SfReporting[0].querySelector('#reporting-format').configjson = event['customreporting'];
+                    // if(reportformatvalues != ""){
+                    //   (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).prepopulateValJson = reportformatvalues
+                    // }
+                    this._SfReporting[0].querySelector('#reporting-format').loadMode();
+                }
+            }
+            else if (event['reportformat'] != null && event['reportformat'].length > 0) {
                 this.fetchReportFormat(this._SfDetailContainer, reportformatName, (_v = event['reportformatschema']) !== null && _v !== void 0 ? _v : "", (_w = event['reportformatvalues']) !== null && _w !== void 0 ? _w : "");
             }
         };
@@ -13652,84 +13896,84 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '</div>';
             this._SfOnboardingTriggersContainer.innerHTML = html;
             //console.log('rendering triggers...', (this._SfOnboardingTriggersContainer as HTMLDivElement).innerHTML);
-            this.renderTaggingTable(this._SfOnboardingTriggersListContainer, mappedSerializedAlertSchedules, mappedTriggers, [], this.uploadTriggersMapping, this.loadOnboardingTriggers, "triggers", ["id", "entityname", "locationname"], '', "", ["triggers"], triggersJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingTriggersListContainer, mappedSerializedAlertSchedules, mappedTriggers, ["obligationtitle", "obligationtype"], this.uploadTriggersMapping, this.loadOnboardingTriggers, "triggers", ["id", "entityname", "locationname"], '', "", ["triggers"], triggersJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingInternalControls = (mappedInternalControls, mappedSerializedTriggers, internalcontrolsJobs) => {
             var html = '';
             html += '<div id="internalcontrols-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingInternalControlsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingInternalControlsListContainer, mappedSerializedTriggers, mappedInternalControls, [], this.uploadInternalControlsMapping, this.loadOnboardingInternalControls, "internalcontrols", ["id", "entityname", "locationname"], '', "", ["internalcontrols"], internalcontrolsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingInternalControlsListContainer, mappedSerializedTriggers, mappedInternalControls, ["obligationtitle", "obligationtype"], this.uploadInternalControlsMapping, this.loadOnboardingInternalControls, "internalcontrols", ["id", "entityname", "locationname"], '', "", ["internalcontrols"], internalcontrolsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingActivations = (mappedActivations, mappedSerializedExtensions, activationsJobs) => {
             var html = '';
             html += '<div id="activations-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingActivationsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingActivationListContainer, mappedSerializedExtensions, mappedActivations, [], this.uploadActivationsMapping, this.loadOnboardingActivations, "activations", ["id", "entityname", "locationname"], '', "", ["activations"], activationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingActivationListContainer, mappedSerializedExtensions, mappedActivations, ["obligationtitle", "obligationtype"], this.uploadActivationsMapping, this.loadOnboardingActivations, "activations", ["id", "entityname", "locationname"], '', "", ["activations"], activationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingInvalidations = (mappedInvalidations, mappedSerializedExtensions, invalidationsJobs) => {
             var html = '';
             html += '<div id="invalidations-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingInvalidationsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingInvalidationListContainer, mappedSerializedExtensions, mappedInvalidations, [], this.uploadInvalidationsMapping, this.loadOnboardingInvalidations, "invalidations", ["id", "entityname", "locationname"], '', "", ["invalidations"], invalidationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingInvalidationListContainer, mappedSerializedExtensions, mappedInvalidations, ["obligationtitle", "obligationtype"], this.uploadInvalidationsMapping, this.loadOnboardingInvalidations, "invalidations", ["id", "entityname", "locationname"], '', "", ["invalidations"], invalidationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingAlertSchedules = (mappedAlertSchedules, mappedSerializedExtensions, alertschedulesJobs) => {
             var html = '';
             html += '<div id="alertschedules-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingAlertSchedulesContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingAlertSchedulesListContainer, mappedSerializedExtensions, mappedAlertSchedules, [], this.uploadAlertSchedulesMapping, this.loadOnboardingAlertSchedules, "alertschedules", ["id", "entityname", "locationname"], '', "", ["alertschedules"], alertschedulesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingAlertSchedulesListContainer, mappedSerializedExtensions, mappedAlertSchedules, ["obligationtitle", "obligationtype"], this.uploadAlertSchedulesMapping, this.loadOnboardingAlertSchedules, "alertschedules", ["id", "entityname", "locationname"], '', "", ["alertschedules"], alertschedulesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingExtensions = (mappedExtensions, mappedSerializedDuedates, extensionsJobs) => {
             var html = '';
             html += '<div id="extensions-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingExtensionsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingExtensionsListContainer, mappedSerializedDuedates, mappedExtensions, [], this.uploadExtensionsMapping, this.loadOnboardingExtensions, "extensions", ["id", "entityname", "locationname"], '', "", ["extensions"], extensionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingExtensionsListContainer, mappedSerializedDuedates, mappedExtensions, ["obligationtitle", "obligationtype"], this.uploadExtensionsMapping, this.loadOnboardingExtensions, "extensions", ["id", "entityname", "locationname"], '', "", ["extensions"], extensionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingDuedates = (mappedDuedates, mappedSerializedMakerCheckers, duedatesJobs) => {
             var html = '';
             html += '<div id="duedates-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingDuedatesContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingDuedatesListContainer, mappedSerializedMakerCheckers, mappedDuedates, [], this.uploadDuedatesMapping, this.loadOnboardingDuedates, "duedates", ["id", "entityname", "locationname"], '', "", ["duedates"], duedatesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingDuedatesListContainer, mappedSerializedMakerCheckers, mappedDuedates, ["obligationtitle", "obligationtype"], this.uploadDuedatesMapping, this.loadOnboardingDuedates, "duedates", ["id", "entityname", "locationname"], '', "", ["duedates"], duedatesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingReporters = (mappedReporters, mappedSerializedTags, reportersJobs, _arrFeedbackReference) => {
             var html = '';
             html += '<div id="reporters-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingReportersContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingReportersListContainer, mappedSerializedTags, mappedReporters, [], this.uploadReportersMapping, this.loadOnboardingReporters, "reporters", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["reporters"], reportersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+            this.renderTaggingTable(this._SfOnboardingReportersListContainer, mappedSerializedTags, mappedReporters, ["obligationtitle", "obligationtype"], this.uploadReportersMapping, this.loadOnboardingReporters, "reporters", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["reporters"], reportersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
         };
         this.renderOnboardingApprovers = (mappedApprovers, mappedSerializedReporters, approversJobs, _arrFeedbackReference) => {
             var html = '';
             html += '<div id="approvers-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingApproversContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingApproversListContainer, mappedSerializedReporters, mappedApprovers, [], this.uploadApproversMapping, this.loadOnboardingApprovers, "approvers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["approvers"], approversJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+            this.renderTaggingTable(this._SfOnboardingApproversListContainer, mappedSerializedReporters, mappedApprovers, ["obligationtitle", "obligationtype"], this.uploadApproversMapping, this.loadOnboardingApprovers, "approvers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["approvers"], approversJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
         };
         this.renderOnboardingFunctionHeads = (mappedFunctionHeads, mappedSerializedApprovers, functionHeadsJobs, _arrFeedbackReference) => {
             var html = '';
             html += '<div id="functionheads-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingFunctionHeadsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingFunctionHeadsListContainer, mappedSerializedApprovers, mappedFunctionHeads, [], this.uploadFunctionHeadsMapping, this.loadOnboardingFunctionHeads, "functionheads", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["functionheads"], functionHeadsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+            this.renderTaggingTable(this._SfOnboardingFunctionHeadsListContainer, mappedSerializedApprovers, mappedFunctionHeads, ["obligationtitle", "obligationtype"], this.uploadFunctionHeadsMapping, this.loadOnboardingFunctionHeads, "functionheads", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["functionheads"], functionHeadsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
         };
         this.renderOnboardingMakerCheckers = (mappedMakerCheckers, mappedSerializedDocs, makerCheckerJobs) => {
             var html = '';
             html += '<div id="makercheckers-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingMakerCheckersContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingMakerCheckersListContainer, mappedSerializedDocs, mappedMakerCheckers, [], this.uploadMakerCheckersMapping, this.loadOnboardingMakerCheckers, "makercheckers", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["makercheckers"], makerCheckerJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingMakerCheckersListContainer, mappedSerializedDocs, mappedMakerCheckers, ["obligationtitle", "obligationtype"], this.uploadMakerCheckersMapping, this.loadOnboardingMakerCheckers, "makercheckers", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["makercheckers"], makerCheckerJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingDocs = (mappedDocs, mappedSerializedViewers, docsJobs) => {
             var html = '';
             html += '<div id="docs-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingDocsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingDocsListContainer, mappedSerializedViewers, mappedDocs, [], this.uploadDocsMapping, this.loadOnboardingDocs, "docs", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["docs"], docsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingDocsListContainer, mappedSerializedViewers, mappedDocs, ["obligationtitle", "obligationtype"], this.uploadDocsMapping, this.loadOnboardingDocs, "docs", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["docs"], docsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingAuditors = (mappedAuditors, mappedSerializedFunctionheads, auditorsJobs, _arrFeedbackReference) => {
             //console.log('inside rendering auditors..');
@@ -13737,7 +13981,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div id="auditors-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingAuditorsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingAuditorsListContainer, mappedSerializedFunctionheads, mappedAuditors, [], this.uploadAuditorsMapping, this.loadOnboardingAuditors, "auditors", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["auditors"], auditorsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+            this.renderTaggingTable(this._SfOnboardingAuditorsListContainer, mappedSerializedFunctionheads, mappedAuditors, ["obligationtitle", "obligationtype"], this.uploadAuditorsMapping, this.loadOnboardingAuditors, "auditors", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["auditors"], auditorsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
         };
         this.renderOnboardingViewers = (mappedViewers, mappedSerializedAuditors, viewersJobs, _arrFeedbackReference) => {
             //console.log('inside rendering viewers..');
@@ -13745,14 +13989,14 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div id="viewers-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingViewersContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingViewersListContainer, mappedSerializedAuditors, mappedViewers, [], this.uploadViewersMapping, this.loadOnboardingViewers, "viewers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["viewers"], viewersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+            this.renderTaggingTable(this._SfOnboardingViewersListContainer, mappedSerializedAuditors, mappedViewers, ["obligationtitle", "obligationtype"], this.uploadViewersMapping, this.loadOnboardingViewers, "viewers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["viewers"], viewersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
         };
         this.renderOnboardingTags = (mappedTags, mappedSerializedFunctions, tagsJobs) => {
             var html = '';
             html += '<div id="tags-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingTagsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingTagsListContainer, mappedSerializedFunctions, mappedTags, [], this.uploadTagsMapping, this.loadOnboardingTags, "tags", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Tag", ["tags"], tagsJobs, "tagtype", ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingTagsListContainer, mappedSerializedFunctions, mappedTags, ["obligationtitle", "obligationtype"], this.uploadTagsMapping, this.loadOnboardingTags, "tags", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Tag", ["tags"], tagsJobs, "tagtype", ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingFunctions = (mappedFunctions, mappedSerializedLocations, functionsJobs) => {
             var html = '';
@@ -13764,14 +14008,14 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
             this._SfOnboardingFunctionsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingFunctionsListContainer, mappedSerializedLocations, mappedFunctions, [], this.uploadFunctionsMapping, this.loadOnboardingFunctions, "functions", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Function", ["functions"], functionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingFunctionsListContainer, mappedSerializedLocations, mappedFunctions, ["obligationtitle", "obligationtype"], this.uploadFunctionsMapping, this.loadOnboardingFunctions, "functions", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Function", ["functions"], functionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingLocations = (mappedLocations, mappedSerializedEntities, locationsJobs) => {
             var html = '';
             html += '<div id="locations-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingLocationsContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingLocationsListContainer, mappedSerializedEntities, mappedLocations, ["firstlineofdefence", "obligation", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingLocationsListContainer, mappedSerializedEntities, mappedLocations, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingCompliances = (mappedStatutes, mappedCompliances) => {
             //console.log('mappedcompliances', mappedCompliances);
@@ -13886,7 +14130,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div id="entities-list-container" class="d-flex flex-col w-100 scroll-x">';
             html += '</div>';
             this._SfOnboardingEntitiesContainer.innerHTML = html;
-            this.renderTaggingTable(this._SfOnboardingEntitiesListContainer, mappedSerializedCountries, mappedEntities, ["firstlineofdefence", "obligation", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
+            this.renderTaggingTable(this._SfOnboardingEntitiesListContainer, mappedSerializedCountries, mappedEntities, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
         };
         this.renderOnboardingCountries = (mappedCountries, mappedCompliances, countriesJobs) => {
             var html = '';
@@ -13907,7 +14151,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             //   }
             // }
             // mappedCountries.data.mappings.mappings = arr2;
-            this.renderTaggingTable(this._SfOnboardingCountriesListContainer, mappedCompliances, mappedCountries, ["firstlineofdefence", "obligation", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+            this.renderTaggingTable(this._SfOnboardingCountriesListContainer, mappedCompliances, mappedCountries, ["firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
         };
         this.renderOnboardingStatutes = (mappedStatutes) => {
             var initCursor = "";
@@ -20172,7 +20416,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         var complianceStatus = "";
                         partStatus = this.getCompletenessStatus(JSON.parse(JSON.stringify(eventsData[role][mmdd][j])));
                         lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(eventsData[role][mmdd][j])), partStatus);
-                        complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(eventsData[role][mmdd][j])).percentage);
+                        complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(eventsData[role][mmdd][j])).percentage, JSON.parse(JSON.stringify(eventsData[role][mmdd][j])));
                         notStarted = notStarted + (partStatus == "not-started" ? 1 : 0);
                         pendingApproval = pendingApproval + (partStatus == "pending-approval" ? 1 : 0);
                         rejected = rejected + (partStatus == "rejected" ? 1 : 0);
@@ -20720,7 +20964,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             continue;
                         }
                         lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(eventsData[mmdd][j])), partStatus);
-                        complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(eventsData[mmdd][j])).percentage);
+                        complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(eventsData[mmdd][j])).percentage, JSON.parse(JSON.stringify(eventsData[mmdd][j])));
                         // notStarted = notStarted + (partStatus == "not-started" ? 1 : 0);
                         // pendingApproval = pendingApproval + (partStatus == "pending-approval" ? 1 : 0);
                         // rejected = rejected + (partStatus == "rejected" ? 1 : 0);