sf-i-events 1.0.881 → 1.0.882

package/src/sf-i-events.ts

@@ -859,7 +859,7 @@ export class SfIEvents extends LitElement {
 
   EXCLUDE_COLS_FROM_REGS: Array<string> = ["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"]
 
-  CHARTS_LIST_BY_MODULES: { [key: string]: Array<string> } = { "compliances": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "notices": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "contracts": ["compliance", "timeliness", "completeness", "location"], "licenses": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"] };
+  CHARTS_LIST_BY_MODULES: { [key: string]: Array<string> } = { "compliances": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "notices": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "contracts": ["compliance", "timeliness", "completeness", "location"], "licenses": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "rcmresources": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"] };
 
   chartSelectedLegend: Array<number> = [];
 
@@ -1658,8 +1658,10 @@ export class SfIEvents extends LitElement {
 
   nextTabStatus: string = "";
 
+  @property()
   sdate: string = "";
 
+  @property()
   edate: string = "";
 
   lastupdated: string = "";
@@ -1738,6 +1740,9 @@ export class SfIEvents extends LitElement {
     #detail-container {
       z-index: 101;
     }
+    #detail-list-container {
+      z-index: 100;
+    }
 
     .plain-filter-icon {
       cursor: pointer;
@@ -1783,6 +1788,7 @@ export class SfIEvents extends LitElement {
       opacity: 0.4;
     }
 
+    .detail-list-container,
     .detail-container,
     .report-summary-container {
       width: 60%;
@@ -2833,6 +2839,9 @@ export class SfIEvents extends LitElement {
   @query('#detail-container')
   _SfDetailContainer: any;
 
+  @query('#detail-list-container')
+  _SfDetailListContainer: any;
+
   @query('#report-summary-container')
   _SfReportSummaryContainer: any;
 
@@ -4118,7 +4127,7 @@ export class SfIEvents extends LitElement {
 
   updateRiskSeverityStats = (riskSeverities: Array<string>, partStatus: string, lateStatus: string, complianceStatus: string) => {
 
-    //console.log('updateRiskSeverityStats', riskSeverities, complianceStatus)
+    console.log('updateRiskSeverityStats', riskSeverities, complianceStatus)
 
     const result = this.updateGraphStats(riskSeverities, this.riskSeverityData, this.riskSeverityPartStatusData, this.riskSeverityLateStatusData, this.riskSeverityComplianceStatusData, partStatus, lateStatus, complianceStatus);
     this.riskSeverityData = result.arrData;
@@ -4470,9 +4479,9 @@ export class SfIEvents extends LitElement {
         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) {
+      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 += '<label for="radio-subcategory" 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>'
@@ -4622,7 +4631,7 @@ export class SfIEvents extends LitElement {
 
   }
 
-  renderStatisticsFiltersTableRow = (filterUser: boolean = false) => {
+  renderStatisticsFiltersTableRow = (index: number, filterUser: boolean = false) => {
 
     var html = '';
     html += '<tr class="tablerow">'
@@ -4631,11 +4640,11 @@ export class SfIEvents extends LitElement {
       html += '<div part="td-head" class="pl-0-imp w-100 d-flex align-center">Last Access</div><div>DASHBOARD_LAST_ACTIVE</div><div part="td-head" class="pl-0-imp w-100 d-flex align-center">Last Action</div><div>DASHBOARD_LAST_ACTION</div>'
     }
     html += '</div></td>'
-    html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-icons color-not-started">schedule</span>&nbsp;&nbsp;Not Started</div><div>DASHBOARD_NOT_STARTED</div></div></td>'
-    html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-pending">pending</span>&nbsp;&nbsp;Pending Approval</div><div>DASHBOARD_PENDING_APPROVAL</div></div></td>'
-    html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-rejected">block</span>&nbsp;&nbsp;Rejected</div><div>DASHBOARD_REJECTED</div></div></td>'
-    html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-done">check_circle</span>&nbsp;&nbsp;Approved</div><div>DASHBOARD_APPROVED</div></div></td>'
-    html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center">Total</div><div>DASHBOARD_TOTAL</div></div></td>'
+    html += '<td part="td-body" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" id="filter-not-started-' + index + '" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-icons color-not-started">schedule</span>&nbsp;&nbsp;Not Started</div><div>DASHBOARD_NOT_STARTED</div></div></td>'
+    html += '<td part="td-body" id="filter-pending-approval-' + index + '" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-pending">pending</span>&nbsp;&nbsp;Pending Approval</div><div>DASHBOARD_PENDING_APPROVAL</div></div></td>'
+    html += '<td part="td-body" id="filter-rejected-' + index + '" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-rejected">block</span>&nbsp;&nbsp;Rejected</div><div>DASHBOARD_REJECTED</div></div></td>'
+    html += '<td part="td-body" id="filter-approved-' + index + '" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center"><span class="small-icon material-symbols-outlined color-done">check_circle</span>&nbsp;&nbsp;Approved</div><div>DASHBOARD_APPROVED</div></div></td>'
+    html += '<td part="td-body" id="filter-total-' + index + '" class="td-body TD_BODY_CLASS"><div class="d-flex align-center flex-wrap"><div part="td-head" class="pl-0-imp w-100 d-flex align-center">Total</div><div>DASHBOARD_TOTAL</div></div></td>'
     html += '</tr>';
 
     return html;
@@ -5137,7 +5146,7 @@ export 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)
-  renderEvents = (_firstDay: any, _endDay: any, iInit: number, iLast: number, showGraph: boolean, index: number, month: number, period: string, firstDate: any = null, parametersTitle: string, showBackgroundButton: boolean) => {
+  renderEvents = (_firstDay: any, _endDay: any, iInit: number, iLast: number, showGraph: boolean, index: number, month: number, period: string, firstDate: any = null, parametersTitle: string, showBackgroundButton: boolean, fromDrilldown: boolean = false) => {
     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 = [];
@@ -5154,32 +5163,38 @@ export class SfIEvents extends LitElement {
     console.log('this.clearSelectedGraphParam(); 1', this.graphFilter);
     this.clearSelectedGraphParam();
     this.clearSelectedLegend();
-
-    html += this.renderCalendarGraphs(showGraph, parametersTitle, showBackgroundButton);
+    if (!fromDrilldown) {
+      html += this.renderCalendarGraphs(showGraph, parametersTitle, showBackgroundButton);
+    }
     html += this.renderCalendarContainerDivStart(index)
     html += this.renderCalendarEventSummary();
 
+    if (!fromDrilldown) {
+      if (this.selectedFeatures.indexOf('contracts') >= 0) {
+        csvCols += 'Id,ReferenceNo.,Type,Country,Entity,Location,Party1,Party2,Party3,Reporter,Approver,Functionhead,DueDate,Status,ReportParameter'
+        htmlCols += '<tr><th class="td-thin">Id</th><th class="td-thin">Reference No.</th><th class="td-thin">Type</th><th class="td-thin">Country</th><th class="td-thin">Entity</th><th class="td-thin">Location</th><th class="td-thin">Party 1</th><th class="td-thin">Party 2</th><th class="td-wide">Party 3</th><th class="td-thin">DueDate</th><th class="td-wide">Status</th><th class="td-wide">ReportParameter</th></tr>'
+
+      } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
+        csvCols += 'Id,ReferenceNo.,Type,Country,Entity,Location,Reporter,Approver,Functionhead,State,Jurisdiction,Category,Subcategory,Statute,ObligationType,RiskSeverity,RiskAreas,Frequency,SubFrequency,DueDate,Status,ReportParameter'
+        htmlCols += '<tr><th class="td-thin">Id</th><th class="td-thin">Reference No.</th><th class="td-thin">Type</th><th class="td-thin">Country</th><th class="td-thin">Entity</th><th class="td-thin">Location</th><th class="td-thin">State</th><th class="td-thin">Jurisdiction</th><th class="td-thin">Category</th><th class="td-thin">Subcategory</th><th class="td-wide">Statute</th><th class="td-thin">ObligationType</th><th class="td-thin">RiskSeverity</th><th class="td-wide">RiskAreas</th><th class="td-thin">Frequency</th><th class="td-thin">SubFrequency</th><th class="td-thin">DueDate</th><th class="td-wide">Status</th><th class="td-wide">ReportParameter</th></tr>'
+      } else if (this.selectedFeatures.indexOf('rcmresources') >= 0) {
+        csvCols += 'Id,Name,Url,Country,Entity,Location,Reporter,Approver,Functionhead,LastCheckedDate,DueDate,Terminated,Status,ReportParameter'
+        htmlCols += '<tr><th class="td-thin">Id</th><th class="td-thin">Name</th><th class="td-thin">Url</th><th class="td-thin">Country</th><th class="td-thin">Entity</th><th class="td-thin">Location</th><th class="td-thin">LastCheckedDate</th><th class="td-thin">DueDate</th><th class="td-thin">Terminated</th><th class="td-wide">Status</th><th class="td-wide">ReportParameter</th></tr>'
+      } else {
+        csvCols += 'Id,Country,Entity,Location,Function,Reporter,Approver,Functionhead,State,Jurisdiction,Category,Subcategory,Statute,Reference,Applicability,ObligationType,ObligationTitle,Obligation,Firstlineofdefence,Secondlineofdefence,Thirdlineofdefence,Internalcontrols,Penalty,Form,AdditionalUrl,Definition,Authority,RiskSeverity,RiskAreas,Frequency,SubFrequency,DueDate,Status,ReportParameter'
+        htmlCols += '<tr><th class="td-thin">Id</th><th class="td-thin">Country</th><th class="td-thin">State</th><th class="td-thin">Jurisdiction</th><th class="td-thin">Category</th><th class="td-thin">Subcategory</th><th class="td-wide">Statute</th><th class="td-thin">Reference</th><th class="td-thin">Applicability</th><th class="td-thin">ObligationType</th><th class="td-wide">ObligationTitle</th><th class="td-wide">Obligation</th><th class="td-thin">Firstlineofdefence</th><th class="td-thin">Secondlineofdefence</th><th class="td-thin">Thirdlineofdefence</th><th>InternalControls</th><th class="td-wide">Penalty</th><th class="td-thin">Form</th><th class="td-thin">Additional URL</th><th class="td-thin">Definition</th><th class="td-thin">Authority</th><th class="td-thin">RiskSeverity</th><th class="td-wide">RiskAreas</th><th class="td-thin">Frequency</th><th class="td-thin">SubFrequency</th><th class="td-thin">DueDate</th><th class="td-wide">Status</th><th class="td-wide">ReportParameter</th></tr>'
+      }
 
-    if (this.selectedFeatures.indexOf('contracts') >= 0) {
-      csvCols += 'Id,ReferenceNo.,Type,Country,Entity,Location,Party1,Party2,Party3,Reporter,Approver,Functionhead,DueDate,Status,ReportParameter'
-      htmlCols += '<tr><th class="td-thin">Id</th><th class="td-thin">Reference No.</th><th class="td-thin">Type</th><th class="td-thin">Country</th><th class="td-thin">Entity</th><th class="td-thin">Location</th><th class="td-thin">Party 1</th><th class="td-thin">Party 2</th><th class="td-wide">Party 3</th><th class="td-thin">DueDate</th><th class="td-wide">Status</th><th class="td-wide">ReportParameter</th></tr>'
-      
-    } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
-      csvCols += 'Id,ReferenceNo.,Type,Country,Entity,Location,Reporter,Approver,Functionhead,State,Jurisdiction,Category,Subcategory,Statute,ObligationType,RiskSeverity,RiskAreas,Frequency,SubFrequency,DueDate,Status,ReportParameter'
-      htmlCols += '<tr><th class="td-thin">Id</th><th class="td-thin">Reference No.</th><th class="td-thin">Type</th><th class="td-thin">Country</th><th class="td-thin">Entity</th><th class="td-thin">Location</th><th class="td-thin">State</th><th class="td-thin">Jurisdiction</th><th class="td-thin">Category</th><th class="td-thin">Subcategory</th><th class="td-wide">Statute</th><th class="td-thin">ObligationType</th><th class="td-thin">RiskSeverity</th><th class="td-wide">RiskAreas</th><th class="td-thin">Frequency</th><th class="td-thin">SubFrequency</th><th class="td-thin">DueDate</th><th class="td-wide">Status</th><th class="td-wide">ReportParameter</th></tr>'
-    } else {
-      csvCols += 'Id,Country,Entity,Location,Function,Reporter,Approver,Functionhead,State,Jurisdiction,Category,Subcategory,Statute,Reference,Applicability,ObligationType,ObligationTitle,Obligation,Firstlineofdefence,Secondlineofdefence,Thirdlineofdefence,Internalcontrols,Penalty,Form,AdditionalUrl,Definition,Authority,RiskSeverity,RiskAreas,Frequency,SubFrequency,DueDate,Status,ReportParameter'
-      htmlCols += '<tr><th class="td-thin">Id</th><th class="td-thin">Country</th><th class="td-thin">State</th><th class="td-thin">Jurisdiction</th><th class="td-thin">Category</th><th class="td-thin">Subcategory</th><th class="td-wide">Statute</th><th class="td-thin">Reference</th><th class="td-thin">Applicability</th><th class="td-thin">ObligationType</th><th class="td-wide">ObligationTitle</th><th class="td-wide">Obligation</th><th class="td-thin">Firstlineofdefence</th><th class="td-thin">Secondlineofdefence</th><th class="td-thin">Thirdlineofdefence</th><th>InternalControls</th><th class="td-wide">Penalty</th><th class="td-thin">Form</th><th class="td-thin">Additional URL</th><th class="td-thin">Definition</th><th class="td-thin">Authority</th><th class="td-thin">RiskSeverity</th><th class="td-wide">RiskAreas</th><th class="td-thin">Frequency</th><th class="td-thin">SubFrequency</th><th class="td-thin">DueDate</th><th class="td-wide">Status</th><th class="td-wide">ReportParameter</th></tr>'
-    }
-
-    if (this.selectedFeatures.indexOf('contracts') >= 0) {
-      htmlSummaryCols += '<tr><th class="td-thin">Id</th><th class="td-wide">Reference No.</th><th class="td-wide">Status</th><th class="td-wide">Documents</th></tr>'
-    } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
-      htmlSummaryCols += '<tr><th class="td-thin">Id</th><th class="td-wide">Reference No.</th><th class="td-wide">Status</th><th class="td-wide">Documents</th></tr>'
-    } else {
-      htmlSummaryCols += '<tr><th class="td-thin">Id</th><th class="td-wide">ObligationTitle</th><th class="td-wide">Status</th><th class="td-wide">Documents</th></tr>'
+      if (this.selectedFeatures.indexOf('contracts') >= 0) {
+        htmlSummaryCols += '<tr><th class="td-thin">Id</th><th class="td-wide">Reference No.</th><th class="td-wide">Status</th><th class="td-wide">Documents</th></tr>'
+      } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
+        htmlSummaryCols += '<tr><th class="td-thin">Id</th><th class="td-wide">Reference No.</th><th class="td-wide">Status</th><th class="td-wide">Documents</th></tr>'
+      } else if (this.selectedFeatures.indexOf('rcmresources') >= 0) {
+        htmlSummaryCols += '<tr><th class="td-thin">Id</th><th class="td-wide">Name</th><th class="td-wide">Status</th><th class="td-wide">Url</th></tr>'
+      } else {
+        htmlSummaryCols += '<tr><th class="td-thin">Id</th><th class="td-wide">ObligationTitle</th><th class="td-wide">Status</th><th class="td-wide">Documents</th></tr>'
+      }
     }
-
     for (var i = iInit; i <= iLast; i++) {
 
       let mmdd: string = "";
@@ -5260,13 +5275,13 @@ export class SfIEvents extends LitElement {
 
           this.events[mmdd][j][this.FLOW_GRAPH_COMPLETENESS] = partStatus;
           this.events[mmdd][j][this.FLOW_GRAPH_TIMELINESS] = lateStatus;
-          if(this.events[mmdd][j][this.FLOW_GRAPH_COMPLIANCE] != null){
+          if (this.events[mmdd][j][this.FLOW_GRAPH_COMPLIANCE] != null) {
             this.events[mmdd][j][this.FLOW_GRAPH_COMPLIANCE + "obj"] = this.events[mmdd][j][this.FLOW_GRAPH_COMPLIANCE];
           }
           this.events[mmdd][j][this.FLOW_GRAPH_COMPLIANCE] = complianceStatus;
 
           this.updateStats(this.events[mmdd][j], partStatus, lateStatus, complianceStatus);
-          if (this.events[mmdd][j]["documents"] != null) {
+          if (this.events[mmdd][j]["documents"] != null && !fromDrilldown) {
             if (this.selectedFeatures.indexOf('contracts') >= 0) {
               //Id,ReferenceNo.,Type,Country,Entity,Location,Party1,Party2,Party3,Reporter,Approver,Functionhead,DueDate,Status,ReportParameter
               csvValues += ('"' + (this.events[mmdd][j]["id"] + '",'));
@@ -5345,6 +5360,36 @@ export class SfIEvents extends LitElement {
                 + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide text-center status-format">' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '</td>'
                 + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide status-format">' + this.getGraphParam(this.events[mmdd][j]) + '</td>'
                 + '</tr>');
+            } else if (this.selectedFeatures.indexOf('rcmresources') >= 0) {
+              //Id,Name,Url,Country,Entity,Location,Reporter,Approver,Functionhead,LastCheckedDate,DueDate,Terminated,Status,ReportParameter
+              csvValues += ('"' + (this.events[mmdd][j]["id"] + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligationtitle"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["url"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["countryname"] + "").replace(/\((.*?)\)/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["entityname"] + "").replace(/\((.*?)\)/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["locationname"] + "").replace(/\((.*?)\)/g, "") + '",'));
+              csvValues += ('"' + ((((this.events[mmdd][j]["reporters"] ?? [])[0] ?? "").split(';')[0] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((((this.events[mmdd][j]["approvers"] ?? [])[0] ?? "").split(';')[0] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((((this.events[mmdd][j]["functionheads"] ?? [])[0] ?? "").split(';')[0] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + (this.events[mmdd][j]["lastcheckeddate"] + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["duedate"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["terminated"] ? "Yes" : "No").replace(/"/g, "") + '",'));
+              csvValues += ('"' + (this.renderStatusString(partStatus, lateStatus, complianceStatus) + '",'));
+              csvValues += ('"' + (this.getGraphParam(this.events[mmdd][j]) + '"\n'));
+
+              //Id,Name,Url,Country,Entity,Location,LastCheckedDate,DueDate,Terminated,Status,ReportParameter
+              htmlValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["id"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["obligationtitle"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["url"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (this.events[mmdd][j]["countryname"] + "").replace(/\((.*?)\)/g, "") + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (this.events[mmdd][j]["entityname"] + "").replace(/\((.*?)\)/g, "") + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (this.events[mmdd][j]["locationname"] + "").replace(/\((.*?)\)/g, "") + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["lastcheckeddate"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["duedate"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (this.events[mmdd][j]["terminated"] ? "Yes" : "No") + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide text-center status-format">' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide status-format">' + this.getGraphParam(this.events[mmdd][j]) + '</td>'
+                + '</tr>');
             } else {
               //Id,Country,Entity,Location,Function,Reporter,Approver,Functionhead,State
               csvValues += ('"' + (this.events[mmdd][j]["id"] + '",'));
@@ -5440,6 +5485,11 @@ export class SfIEvents extends LitElement {
                 htmlSummaryValues += `<sf-i-uploader class="summary-report-doc" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" prepopulatedInputArr="${JSON.stringify([{ "key": document.key, "ext": document.ext }]).replace(/"/g, '&quot;')}" projectid="${this.projectId} " extract="no" mode="view" maximize="yes" hidepreview="yes"></sf-i-uploader><br />`
               }
               htmlSummaryValues += '</td></tr>'
+            } else if (this.selectedFeatures.indexOf('rcmresources') >= 0) {
+              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["url"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td></tr>')
             } else {
               htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
                 + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
@@ -5710,7 +5760,7 @@ export class SfIEvents extends LitElement {
             }
           }
         }
-        filtersTableHtml += this.renderStatisticsFiltersTableRow(lastAction != "" || lastActive != "")
+        filtersTableHtml += this.renderStatisticsFiltersTableRow(filterindex, lastAction != "" || lastActive != "")
         if (filterindex % 2 == 0) {
           filtersTableHtml = filtersTableHtml.replace(/TD_BODY_CLASS/g, "td-light");
         } else {
@@ -6014,8 +6064,8 @@ export class SfIEvents extends LitElement {
     console.log('reporting html', html);
     let ddmmyyyy = mmddyyyy.split('/')[1] + '/' + mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[2];
 
-    let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.statute}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
-    (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.emailcontent = emailcontent;
+    let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.statute}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Reporter</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.reporters[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Approver</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.approvers[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
+    
     let listReportingContainers = eventsContainer.querySelectorAll('.list-reporting-container') as NodeListOf<HTMLDivElement>
     for (let tempReportingContainer of listReportingContainers) {
       tempReportingContainer.style.display = 'none';
@@ -6045,6 +6095,7 @@ export class SfIEvents extends LitElement {
       }
     }
     listReportingContainer.innerHTML = html;
+    (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.emailcontent = emailcontent;
     listReportingContainer.querySelector('.button-delete')?.addEventListener('click', async () => {
 
       await this.fetchDeleteReview(event["id"], mmddyyyy, event.entityid, event.locationid);
@@ -6064,7 +6115,7 @@ export class SfIEvents extends LitElement {
     });
     listReportingContainer.querySelector('#button-auto-approve')?.addEventListener('click', async () => {
       if (this.selectedItemIds.length <= 1) {
-        await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
+        await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
         this.setSuccess('Auto-Approved successfully!')
         setTimeout(() => {
           this.clearMessages()
@@ -6094,7 +6145,7 @@ export class SfIEvents extends LitElement {
             "userid": this.userProfileId,
             "userrole": this.myRole,
             "year": this.calendarStartYYYY,
-            "module": event.module ?? "events"
+            "module": event.module ?? "compliance"
           })
         }
         await this.uploadReviewsBulk(bulkBodyReview);
@@ -6136,7 +6187,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if (this.selectedItemIds.length <= 1) {
           console.log('selectedevent', JSON.stringify(event));
-          if (await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "events")) {
+          if (await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
             for (var p = 0; p < this.events[mmdd].length; p++) {
               if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
                 this.events[mmdd][p].approved = approved
@@ -6178,7 +6229,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": event.module ?? "events"
+              "module": event.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -6249,7 +6300,7 @@ export class SfIEvents extends LitElement {
         } else {
           let flagBulk = false;
           if (this.selectedItemIds.length <= 1) {
-            if (await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "events")) {
+            if (await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
               for (var p = 0; p < this.events[mmdd].length; p++) {
                 if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
                   this.events[mmdd][p].approved = approved
@@ -6291,7 +6342,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": event.module ?? "events"
+                "module": event.module ?? "compliance"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -6442,7 +6493,7 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if (this.selectedItemIds.length <= 1) {
 
-                        if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "events", percentage, event.makercheckers)) {
+                        if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "compliance", percentage, event.makercheckers)) {
 
                           console.log('this.events', this.events);
                           if (this.mode != "next") {
@@ -6456,7 +6507,7 @@ export class SfIEvents extends LitElement {
 
                             if (event.makercheckers.length > 0) {
 
-                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
+                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
                               for (var p = 0; p < this.events[mmdd].length; p++) {
                                 if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
                                   this.events[mmdd][p].approved = true
@@ -6510,7 +6561,7 @@ export class SfIEvents extends LitElement {
                           //     "userid": this.userProfileId,
                           //     "userrole": this.myRole,
                           //     "year": this.calendarStartYYYY,
-                          //     "module": event.module ?? "events"
+                          //     "module": event.module ?? "compliance"
                           //   } )
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -6533,7 +6584,7 @@ export class SfIEvents extends LitElement {
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
                             "year": this.calendarStartYYYY,
-                            "module": event.module ?? "events",
+                            "module": event.module ?? "compliance",
                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                           })
                           // }
@@ -7627,32 +7678,6 @@ export class SfIEvents extends LitElement {
         this.renderTabs(this.selectedTab)
         this.processDateSelectionViewer(eventsContainer);
       })
-      // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
-      // selectFeatureAll.addEventListener('click',async(ev: any) => {
-      //   let target = ev.target;
-      //   if(target.checked){
-      //     for(let feature of this.getFeatures()){
-      //       if(this.selectedFeatures.indexOf(feature) < 0){
-      //         this.selectedFeatures.push(feature);
-      //       }
-      //     }
-      //   }else{
-      //     this.selectedFeatures = []
-      //   }
-      //   const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
-      //   for(let selectFeature of selectFeatures){
-      //     let id = selectFeature.id;
-      //     let i = id.split('-')[3];
-      //     let selectedFeature = this.getFeatures()[parseInt(i)]
-      //     selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
-      //   }
-      //   filterSubmitButton.style.visibility = 'visible'
-      // })
-      // const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
-      // selectFeatureAllLabel.addEventListener('click',()=>{
-      //   selectFeatureAll.checked = !selectFeatureAll.checked
-      //   selectFeatureAll.click();
-      // })
       const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
       const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label') as NodeListOf<HTMLLabelElement>
       for (let [i, selectFeature] of selectFeatures.entries()) {
@@ -7667,13 +7692,6 @@ export class SfIEvents extends LitElement {
               this.selectedFeatures = [selectedFeature]
             }
           }
-          // else{
-          //   // selectFeatureAll.checked = false;
-          //   if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
-          //     this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
-          //   }
-          // }
-          // filterSubmitButton.style.visibility = 'visible'
           filterSubmitButton.click();
         })
         selectFeatureLabels[i].addEventListener('click', () => {
@@ -7682,28 +7700,59 @@ export class SfIEvents extends LitElement {
         })
       }
     })
-    // let innerhtml = eventsContainer.innerHTML;
-    // innerhtml += this.renderSelectAllButtons();
-    // eventsContainer.innerHTML = innerhtml
-    // this.attachTimelineFilterHandlers(eventsContainer);
-
-    // const radioExpander = eventsContainer.querySelector('#graph-radios-expander') as HTMLButtonElement;
-    // radioExpander?.addEventListener('click', (e: any) => {
-
-    //   const button = (e.currentTarget as HTMLButtonElement);
-    //   button.style.display = 'none';
-
-    //   const arrRadios = eventsContainer.querySelectorAll('.chart-radio-item-secondary') as NodeListOf<HTMLDivElement>;
-    //   arrRadios.forEach(div => {
-    //     div.style.display = 'block';
-    //   });
-    // });
 
     const buttonRefresh = eventsContainer.querySelector('#button-refresh') as HTMLButtonElement
     buttonRefresh.addEventListener('click', async () => {
       this.processDateSelectionViewer(eventsContainer)
     })
-
+    if (Object.keys(this.statisticsFiltersData).length > 0) {
+      this.renderDrilldownListeners(eventsContainer);
+    }
+  }
+
+  renderDrilldownListeners = async (eventsContainer: HTMLDivElement) => {
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    console.log('rendering drilldown listeners', this.statisticsFiltersData, this.statisticsMeta)
+    let rows = eventsContainer.querySelectorAll('.tablerow') as NodeListOf<HTMLTableRowElement>
+    let filtercriteria = Object.keys(this.statisticsFiltersData)[0]
+    console.log('rendering statistics filters for criteria', filtercriteria, this.statisticsMeta[filtercriteria])
+    let sortedFilters = Util.alphabeticalSort(this.statisticsMeta[filtercriteria])
+    for (let [rowIndex, row] of rows.entries()) {
+      let filterVal = sortedFilters[rowIndex]
+      let filterValue = filterVal.split(';')[1]
+      let filterName = filterVal.split(';')[0].replace(/\([^)]*\)/g, "")
+
+      let notStartedDiv = row.querySelector('#filter-not-started-' + rowIndex) as HTMLDivElement
+      notStartedDiv.addEventListener('click', () => {
+        console.log('clicked not started filter', rowIndex)
+        console.log('filter', filtercriteria, filterValue, filterName)
+        this.renderStatisticsDetails(filtercriteria, filterValue, filterName, "not-started")
+      })
+      let pendingApprovalDiv = row.querySelector('#filter-pending-approval-' + rowIndex) as HTMLDivElement
+      pendingApprovalDiv.addEventListener('click', () => {
+        console.log('clicked pending approval filter', rowIndex)
+        console.log('filter', filtercriteria, filterValue, filterName)
+        this.renderStatisticsDetails(filtercriteria, filterValue, filterName, "pending-approval")
+      })
+      let rejectedDiv = row.querySelector('#filter-rejected-' + rowIndex) as HTMLDivElement
+      rejectedDiv.addEventListener('click', () => {
+        console.log('clicked rejected filter', rowIndex)
+        console.log('filter', filtercriteria, filterValue, filterName)
+        this.renderStatisticsDetails(filtercriteria, filterValue, filterName, "rejected")
+      })
+      let approvedDiv = row.querySelector('#filter-approved-' + rowIndex) as HTMLDivElement
+      approvedDiv.addEventListener('click', () => {
+        console.log('clicked approved filter', rowIndex)
+        console.log('filter', filtercriteria, filterValue, filterName)
+        this.renderStatisticsDetails(filtercriteria, filterValue, filterName, "approved")
+      })
+      let totalDiv = row.querySelector('#filter-total-' + rowIndex) as HTMLDivElement
+      totalDiv.addEventListener('click', () => {
+        console.log('clicked total filter', rowIndex)
+        console.log('filter', filtercriteria, filterValue, filterName)
+        this.renderStatisticsDetails(filtercriteria, filterValue, filterName)
+      })
+    }
   }
 
   renderStatisticsFilters = (eventsContainer: HTMLDivElement) => {
@@ -7765,6 +7814,7 @@ export class SfIEvents extends LitElement {
       let inputLabelSubfilters = eventsContainer.querySelector('#input-label-subfilter') as HTMLLabelElement
       let selectSubfilterCriteria = eventsContainer.querySelector('#select-subfilter-criteria') as HTMLSelectElement
       selectSubfilterCriteria.value = ""
+      selectSubfilterCriteria.length = 0
 
 
       selectFilterValues.innerHTML = ""
@@ -8278,6 +8328,10 @@ export class SfIEvents extends LitElement {
       valueEnd = ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value;
     }
 
+    if (this.mode == "viewer") {
+      valueStart = this.sdate;
+      valueEnd = this.edate;
+    }
     //console.log('valuestart', valueStart);
     //console.log('valueend', valueEnd);
 
@@ -10334,7 +10388,11 @@ export class SfIEvents extends LitElement {
     html += '</div>';
 
     html += '<div class="d-flex w-100">';
-    html += '<div class="calendar-left-col desktop-only flex-col justify-start align-end">';
+    html += '<div class="calendar-left-col desktop-only flex-col justify-start align-end';
+    if (this.mode == "viewer") {
+      html += ' hide';
+    }
+    html += '">';
 
     html += '<div class="title-item-date">';
     html += '<label part="input-label">Start Date</label><br />'
@@ -10503,7 +10561,7 @@ export class SfIEvents extends LitElement {
       this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
     });
 
-    if (this.selectedFeatures.indexOf('contracts') >= 0) {
+    if (this.selectedFeatures.indexOf('contracts') >= 0 && this.mode != "viewer") {
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#button-this-year') as HTMLButtonElement).click();
     }
     // for(var i = 0; i < 3; i++) {
@@ -12747,7 +12805,7 @@ export class SfIEvents extends LitElement {
   }
 
   renderGraph = (divContainer: HTMLDivElement, pieData: any, partData: any, lateData: any, complianceData: any, param: string) => {
-    console.log('rendering graph chart2');
+    console.log('rendering graph chart2', pieData, partData);
     this.clearSelectedGraphParam();
     // this.clearSelectedLegend();
 
@@ -12822,6 +12880,120 @@ export class SfIEvents extends LitElement {
 
   }
 
+  renderStatisticsDetails = async (filter: string, filterid: string, filtervalue: string, filterstatus: string = "") => {
+
+
+    let userid = this.userProfileId
+    // let username = this.userName;
+    let filterString = `countryid="${this.countryId}" locationid="${this.locationId}" entityid="${this.entityId}" tagid="${this.tagId}" selectedcriteria="${this.selectedCriteria}"`;
+    let rolestr = "viewer"
+    if (filter == "reporter" || filter == "approver" || filter == "functionhead") {
+      userid = filterid;
+      // username = filtervalue;
+      rolestr = filter
+      await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, userid, rolestr, this.entityId, this.countryId, this.locationId, this.tagId, this.functionId);
+      filterString = `${filter} - ${filtervalue}`;
+    } else if (filter == "function") {
+      await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, this.countryId, this.locationId, filterid, this.functionId);
+      // filterString = `tagid="${filterid}" selectedcriteria="Tag - ${filtervalue}"`;
+      filterString = `Function - ${filtervalue}`;
+    } else if (filter == "location") {
+      await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, this.countryId, filterid, this.tagId, this.functionId);
+      // filterString = `locationid="${filterid}" selectedcriteria="Location - ${filtervalue}"`;
+      filterString = `Location - ${filtervalue}`;
+    }
+
+    var html = `
+    
+      <div class="d-flex justify-between m-20">
+        <button part="button-icon" class="material-icons invisible">close</button>
+        <h3 part="results-title" class="m-0">Statistics Details: <strong>${filterString}</strong></h3>
+        <button id="button-detail-close" part="button-icon" class="material-icons">close</button>
+      </div>
+    
+    `;
+    html += `
+      <div id="list-container" class="list-container m-20 pb-20" part="list-container"></div>
+    `;
+    // html += `
+    //   <sf-i-events id="statistics-drilldown" name="Statistics" apiid="dwqyez2puoxmu.cloudfront.net/event" exportparts="detail-container" mode="viewer"
+    //     apiidtags="${this.apiIdTags}"
+    //     apiidusers="${this.apiIdUsers}"
+    //     apiidstatutes="${this.apiIdStatutes}"
+    //     apiiddefinitions="${this.apiIdDefinitions}"
+    //     apiidreportformats="${this.apiidReportformats}"
+    //     apiidnotices="${this.apiIdNotices}"
+    //     apiidagreements="${this.apiIdAgreements}"
+    //     apiidlicenses="${this.apiIdLicenses}" username="${username}"
+    //     userprofileid="${userid}" projectid="${this.projectId}"
+    //     projectname="${this.projectName}" ${filterString}
+    //     myrole="${rolestr}" showregisterexport="false"
+    //     features="${this.features.replace(/"/g, "&quot;")}"
+    //     selectedfeatures="${JSON.stringify(this.selectedFeatures).replace(/"/g, "&quot;")}"
+    //     eventfielddependencies="${this.eventFieldDependencies.replace(/"/g, "&quot;")}"
+    //     eventfields="${this.eventFields.replace(/"/g, "&quot;")}"
+    //     eventpreviewfields="${this.eventPreviewFields.replace(/"/g, "&quot;")}"
+    //     eventhidefields="${this.eventHideFields.replace(/"/g, "&quot;")}"
+    //     calendarstartdd="${this.calendarStartDD}" calendarstartmm="${this.calendarStartMM}" calendarstartyyyy="${this.calendarStartYYYY}"
+    //     sdate="${this.sdate}" edate="${this.edate}"
+    //     flowgraphcompleteness="${this.FLOW_GRAPH_COMPLETENESS}">
+
+    //     <div slot="uploader">
+    //       <sf-i-uploader id="uploader" max="10" apiid="1peg5170d3"
+    //         allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]"
+    //         extract="yes" projectid="${this.projectId}" maxsize="31457280"
+    //         allowdownload="yes"></sf-i-uploader>
+    //     </div>
+    //     <div slot="reporting">
+    //       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
+    //     </div>
+
+    //   </sf-i-events>
+    // `;
+    (this._SfDetailListContainer as HTMLDivElement).style.display = 'block';
+    (this._SfDetailListContainer as HTMLDivElement).innerHTML = html;
+
+    // this.renderRangeEvents(new Date(this.sdate), ((new Date(this.edate).getTime()) - new Date(this.sdate).getTime()) / (1000 * 60 * 60 * 24), (this._SfDetailListContainer as HTMLDivElement).querySelector('.list-container') as HTMLDivElement);
+
+    const lastDay = ((new Date(this.edate).getTime()) - new Date(this.sdate).getTime()) / (1000 * 60 * 60 * 24)
+    let firstDay = new Date((new Date(this.sdate)).getFullYear(), (new Date(this.sdate)).getMonth(), (new Date(this.sdate)).getDate());
+    let endDay = new Date((new Date(this.sdate)).getFullYear(), (new Date(this.sdate)).getMonth(), (new Date(this.sdate)).getDate());
+    endDay?.setDate(endDay.getDate() + lastDay);
+    console.log('firstday', firstDay, endDay)
+    var period = ("0" + (firstDay.getMonth() + 1)).slice(-2) + "/" + ("0" + firstDay.getDate()).slice(-2) + '/' + firstDay.getFullYear() + ' - ' + ("0" + (endDay.getMonth() + 1)).slice(-2) + "/" + ("0" + endDay.getDate()).slice(-2) + '/' + endDay.getFullYear();
+
+    console.log('rangeperiod', period, lastDay);
+
+    var htmlEvents = this.renderEvents(firstDay, endDay, 0, lastDay, false, 0, ((new Date(this.sdate)).getMonth()), period, (new Date(this.sdate)), "From " + firstDay.toLocaleDateString('en-IN') + " To " + endDay.toLocaleDateString('en-IN'), false, true);
+
+    ((this._SfDetailListContainer as HTMLDivElement).querySelector('#list-container') as HTMLDivElement).innerHTML = htmlEvents;
+    let divContainer = ((this._SfDetailListContainer as HTMLDivElement).querySelector('#list-container') as HTMLDivElement)
+    const itemsTimeliness = divContainer.querySelectorAll('.stat-timeliness') as NodeListOf<HTMLElement>;
+    for (var i = 0; i < itemsTimeliness.length; i++) {
+      itemsTimeliness[i].style.display = 'none';
+    }
+    const itemsCompliance = divContainer.querySelectorAll('.stat-compliance') as NodeListOf<HTMLElement>;
+    for (var i = 0; i < itemsCompliance.length; i++) {
+      itemsCompliance[i].style.display = 'none';
+    }
+    if(filterstatus != ""){
+      this.processGraphFilter(filterstatus, divContainer);
+    }
+    (this._SfDetailListContainer as HTMLDivElement).querySelector('#button-detail-close')?.addEventListener('click', () => {
+
+      (this._SfDetailListContainer as HTMLDivElement).innerHTML = '';
+      (this._SfDetailListContainer as HTMLDivElement).style.display = 'none';
+
+    });
+
+    // let statisticsDrilldown = (this._SfDetailContainer as HTMLDivElement).querySelector('#statistics-drilldown') as SfIEvents;
+    // statisticsDrilldown.sdate = this.sdate
+    // statisticsDrilldown.edate = this.edate
+    // statisticsDrilldown.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
+    // setTimeout(() => {
+    //   statisticsDrilldown.loadMode();
+    // }, 1000);
+  }
   renderEventDetailShort = (compliance: any) => {
 
     var html = `
@@ -13048,10 +13220,11 @@ export class SfIEvents extends LitElement {
         </div>
     `
     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-textarea-disabled:reporting-input-textarea-disabled, input-date:reporting-input-date, input-date-disabled:reporting-input-date-disabled, 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-textarea-disabled:reporting-reporting-input-textarea-disabled, reporting-input-date:reporting-reporting-input-date, reporting-input-date-disabled:reporting-reporting-input-date-disabled 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, reporting-input-sf-i-select:reporting-reporting-input-sf-i-select, select-input-select:reporting-select-input-select, checklist-container:reporting-checklist-container, checklist-title:reporting-checklist-title, checklist-list:reporting-checklist-list, checklist-item:reporting-checklist-item, checklist-checkbox:reporting-checklist-checkbox, checklist-checkbox-label:reporting-checklist-checkbox-label, reporting-checklist-container:reporting-reporting-checklist-container, reporting-checklist-title:reporting-reporting-checklist-title, reporting-checklist-list:reporting-reporting-checklist-list, reporting-checklist-item:reporting-reporting-checklist-item, reporting-checklist-checkbox:reporting-reporting-checklist-checkbox, reporting-checklist-checkbox-label:reporting-reporting-checklist-checkbox-label, checklist-add-input:reporting-checklist-add-input, checklist-add-button:reporting-checklist-add-button, terminate-container:repoortiinig-terminate-container, terminate-container-terminated:reporting-terminate-container-terminated, terminate-container-active:reporting-terminate-container-active, input-terminate-checkbox: reporting-input-terminate-checkbox, reporting-terminate-container:repoortiinig-reporting-terminate-container, reporting-terminate-container-terminated:reporting-reporting-terminate-container-terminated, reporting-terminate-container-active:reporting-reporting-terminate-container-active, reporting-input-terminate-checkbox: reporting-reporting-input-terminate-checkbox, uploader-container:reporting-uploader-container, reporting-uploader-container:reporting-reporting-uploader-container, not-selected:reporting-not-selected, reporting-not-selected:reportinig-reporting-not-selected, " name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdNotices + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
-
-    html += '<div part="reporting-view-container">'
-    html += this.renderReporting(listEvent, mmddyyyy);
-    html += "</div>"
+    if (this.mode != "viewer") {
+      html += '<div part="reporting-view-container">'
+      html += this.renderReporting(listEvent, mmddyyyy);
+      html += "</div>"
+    }
 
     html += '<div class="d-flex justify-between m-20">';
     html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
@@ -13231,7 +13404,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if (this.selectedItemIds.length <= 1) {
           console.log('mmddyyyy', mmddyyyy)
-          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
             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) {
 
@@ -13270,7 +13443,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": listEvent.module ?? "events"
+              "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -13364,7 +13537,7 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if (this.selectedItemIds.length <= 1) {
 
-            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
               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].approved = approved
@@ -13404,7 +13577,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": listEvent.module ?? "events"
+                "module": listEvent.module ?? "compliance"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -13639,7 +13812,7 @@ export class SfIEvents extends LitElement {
                           //     "userid": this.userProfileId,
                           //     "userrole": this.myRole,
                           //     "year": this.calendarStartYYYY,
-                          //     "module": listEvent.module ?? "events"
+                          //     "module": listEvent.module ?? "compliance"
                           //   } )
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -13662,7 +13835,7 @@ export class SfIEvents extends LitElement {
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
                             "year": this.calendarStartYYYY,
-                            "module": listEvent.module ?? "events",
+                            "module": listEvent.module ?? "compliance",
                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                           })
                           // }
@@ -13915,11 +14088,12 @@ export class SfIEvents extends LitElement {
         </div>
     `
     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-textarea-disabled:reporting-input-textarea-disabled, input-date:reporting-input-date, input-date-disabled:reporting-input-date-disabled, 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-textarea-disabled:reporting-reporting-input-textarea-disabled, reporting-input-date:reporting-reporting-input-date, reporting-input-date-disabled:reporting-reporting-input-date-disabled, 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, checklist-container:reporting-checklist-container, checklist-title:reporting-checklist-title, checklist-list:reporting-checklist-list, checklist-item:reporting-checklist-item, checklist-checkbox:reporting-checklist-checkbox, checklist-checkbox-label:reporting-checklist-checkbox-label, reporting-checklist-container:reporting-reporting-checklist-container, reporting-checklist-title:reporting-reporting-checklist-title, reporting-checklist-list:reporting-reporting-checklist-list, reporting-checklist-item:reporting-reporting-checklist-item, reporting-checklist-checkbox:reporting-reporting-checklist-checkbox, reporting-checklist-checkbox-label:reporting-reporting-checklist-checkbox-label, checklist-add-input:reporting-checklist-add-input, checklist-add-button:reporting-checklist-add-button, terminate-container:reporting-terminate-container, terminate-container-terminated:reporting-terminate-container-terminated, terminate-container-active:reporting-terminate-container-active, input-terminate-checkbox: reporting-input-terminate-checkbox, reporting-terminate-container:reporting-reporting-terminate-container, reporting-terminate-container-terminated:reporting-reporting-terminate-container-terminated, reporting-terminate-container-active:reporting-reporting-terminate-container-active, reporting-input-terminate-checkbox: reporting-reporting-input-terminate-checkbox, uploader-container:reporting-uploader-container, reporting-uploader-container:reporting-reporting-uploader-container, not-selected:reporting-not-selected, reporting-not-selected:reportinig-reporting-not-selected" name="Contract Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdAgreements + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
+    if (this.mode != "viewer") {
+      html += '<div part="reporting-view-container">'
 
-    html += '<div part="reporting-view-container">'
-
-    html += this.renderReporting(listEvent, mmddyyyy);
-    html += "</div>"
+      html += this.renderReporting(listEvent, mmddyyyy);
+      html += "</div>"
+    }
 
     html += '<div class="d-flex justify-between m-20">';
     html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
@@ -14112,7 +14286,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if (this.selectedItemIds.length <= 1) {
           console.log('mmddyyyy', mmddyyyy)
-          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
             if (approved) {
               await this.renewContract(listEvent, reportformatvalues);
             } else {
@@ -14157,7 +14331,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": listEvent.module ?? "events"
+              "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -14251,7 +14425,7 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if (this.selectedItemIds.length <= 1) {
 
-            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
               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].approved = approved
@@ -14291,7 +14465,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": listEvent.module ?? "events"
+                "module": listEvent.module ?? "compliance"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -14531,7 +14705,7 @@ export class SfIEvents extends LitElement {
                     //     "userid": this.userProfileId,
                     //     "userrole": this.myRole,
                     //     "year": this.calendarStartYYYY,
-                    //     "module": listEvent.module ?? "events"
+                    //     "module": listEvent.module ?? "compliance"
                     //   } )
                     //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -14554,7 +14728,7 @@ export class SfIEvents extends LitElement {
                       "userid": this.userProfileId,
                       "userrole": this.myRole,
                       "year": this.calendarStartYYYY,
-                      "module": listEvent.module ?? "events",
+                      "module": listEvent.module ?? "compliance",
                       "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                     })
                     // }
@@ -14808,11 +14982,12 @@ export class SfIEvents extends LitElement {
         </div>
     `
     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-textarea-disabled:reporting-input-textarea-disabled, input-date:reporting-input-date, input-date-disabled:reporting-input-date-disabled, 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-textarea-disabled:reporting-reporting-input-textarea-disabled, reporting-input-date:reporting-reporting-input-date, reporting-input-date-disabled:reporting-reporting-input-date-disabled, 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, checklist-container:reporting-checklist-container, checklist-title:reporting-checklist-title, checklist-list:reporting-checklist-list, checklist-item:reporting-checklist-item, checklist-checkbox:reporting-checklist-checkbox, checklist-checkbox-label:reporting-checklist-checkbox-label, reporting-checklist-container:reporting-reporting-checklist-container, reporting-checklist-title:reporting-reporting-checklist-title, reporting-checklist-list:reporting-reporting-checklist-list, reporting-checklist-item:reporting-reporting-checklist-item, reporting-checklist-checkbox:reporting-reporting-checklist-checkbox, reporting-checklist-checkbox-label:reporting-reporting-checklist-checkbox-label, checklist-add-input:reporting-checklist-add-input, checklist-add-button:reporting-checklist-add-button, terminate-container:reporting-terminate-container, terminate-container-terminated:reporting-terminate-container-terminated, terminate-container-active:reporting-terminate-container-active, input-terminate-checkbox: reporting-input-terminate-checkbox, reporting-terminate-container:reporting-reporting-terminate-container, reporting-terminate-container-terminated:reporting-reporting-terminate-container-terminated, reporting-terminate-container-active:reporting-reporting-terminate-container-active, reporting-input-terminate-checkbox: reporting-reporting-input-terminate-checkbox, uploader-container:reporting-uploader-container, reporting-uploader-container:reporting-reporting-uploader-container, not-selected:reporting-not-selected, reporting-not-selected:reportinig-reporting-not-selected" name="License Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdLicenses + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
+    if (this.mode != "viewer") {
+      html += '<div part="reporting-view-container">'
 
-    html += '<div part="reporting-view-container">'
-
-    html += this.renderReporting(listEvent, mmddyyyy);
-    html += "</div>"
+      html += this.renderReporting(listEvent, mmddyyyy);
+      html += "</div>"
+    }
 
     html += '<div class="d-flex justify-between m-20">';
     html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
@@ -15006,7 +15181,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if (this.selectedItemIds.length <= 1) {
           console.log('mmddyyyy', mmddyyyy)
-          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
             if (approved) {
               await this.renewLicense(listEvent, reportformatvalues);
             } else {
@@ -15051,7 +15226,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": listEvent.module ?? "events"
+              "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -15145,7 +15320,7 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if (this.selectedItemIds.length <= 1) {
 
-            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
               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].approved = approved
@@ -15185,7 +15360,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": listEvent.module ?? "events"
+                "module": listEvent.module ?? "compliance"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -15425,7 +15600,7 @@ export class SfIEvents extends LitElement {
                     //     "userid": this.userProfileId,
                     //     "userrole": this.myRole,
                     //     "year": this.calendarStartYYYY,
-                    //     "module": listEvent.module ?? "events"
+                    //     "module": listEvent.module ?? "compliance"
                     //   } )
                     //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -15448,7 +15623,7 @@ export class SfIEvents extends LitElement {
                       "userid": this.userProfileId,
                       "userrole": this.myRole,
                       "year": this.calendarStartYYYY,
-                      "module": listEvent.module ?? "events",
+                      "module": listEvent.module ?? "compliance",
                       "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                     })
                     // }
@@ -15702,11 +15877,12 @@ export class SfIEvents extends LitElement {
         </div>
     `
     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-textarea-disabled:reporting-input-textarea-disabled, input-date:reporting-input-date, input-date-disabled:reporting-input-date-disabled, 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-textarea-disabled:reporting-reporting-input-textarea-disabled, reporting-input-date:reporting-reporting-input-date, reporting-input-date-disabled:reporting-reporting-input-date-disabled, 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, checklist-container:reporting-checklist-container, checklist-title:reporting-checklist-title, checklist-list:reporting-checklist-list, checklist-item:reporting-checklist-item, checklist-checkbox:reporting-checklist-checkbox, checklist-checkbox-label:reporting-checklist-checkbox-label, reporting-checklist-container:reporting-reporting-checklist-container, reporting-checklist-title:reporting-reporting-checklist-title, reporting-checklist-list:reporting-reporting-checklist-list, reporting-checklist-item:reporting-reporting-checklist-item, reporting-checklist-checkbox:reporting-reporting-checklist-checkbox, reporting-checklist-checkbox-label:reporting-reporting-checklist-checkbox-label, checklist-add-input:reporting-checklist-add-input, checklist-add-button:reporting-checklist-add-button, terminate-container:reporting-terminate-container, terminate-container-terminated:reporting-terminate-container-terminated, terminate-container-active:reporting-terminate-container-active, input-terminate-checkbox: reporting-input-terminate-checkbox, reporting-terminate-container:reporting-reporting-terminate-container, reporting-terminate-container-terminated:reporting-reporting-terminate-container-terminated, reporting-terminate-container-active:reporting-reporting-terminate-container-active, reporting-input-terminate-checkbox: reporting-reporting-input-terminate-checkbox, uploader-container:reporting-uploader-container, reporting-uploader-container:reporting-reporting-uploader-container, not-selected:reporting-not-selected, reporting-not-selected:reportinig-reporting-not-selected" name="RCM Resource Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdRCMResources + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
+    if (this.mode != "viewer") {
+      html += '<div part="reporting-view-container">'
 
-    html += '<div part="reporting-view-container">'
-
-    html += this.renderReporting(listEvent, mmddyyyy);
-    html += "</div>"
+      html += this.renderReporting(listEvent, mmddyyyy);
+      html += "</div>"
+    }
 
     html += '<div class="d-flex justify-between m-20">';
     html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
@@ -15900,7 +16076,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if (this.selectedItemIds.length <= 1) {
           console.log('mmddyyyy', mmddyyyy)
-          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+          if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
             if (approved) {
               await this.renewRCMResource(listEvent, reportformatvalues);
             } else {
@@ -15945,7 +16121,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": listEvent.module ?? "events"
+              "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -16039,7 +16215,7 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if (this.selectedItemIds.length <= 1) {
 
-            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
               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].approved = approved
@@ -16079,7 +16255,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": listEvent.module ?? "events"
+                "module": listEvent.module ?? "compliance"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -16319,7 +16495,7 @@ export class SfIEvents extends LitElement {
                     //     "userid": this.userProfileId,
                     //     "userrole": this.myRole,
                     //     "year": this.calendarStartYYYY,
-                    //     "module": listEvent.module ?? "events"
+                    //     "module": listEvent.module ?? "compliance"
                     //   } )
                     //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -16342,7 +16518,7 @@ export class SfIEvents extends LitElement {
                       "userid": this.userProfileId,
                       "userrole": this.myRole,
                       "year": this.calendarStartYYYY,
-                      "module": listEvent.module ?? "events",
+                      "module": listEvent.module ?? "compliance",
                       "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                     })
                     // }
@@ -16879,11 +17055,12 @@ export class SfIEvents extends LitElement {
 
     html += '</div>';
 
-    if (this.mode == "consumer" || this.mode == "next") {
-
-      html += '<div part="reporting-view-container">'
-      html += this.renderReporting(event, mmddyyyy);
-      html += "</div>"
+    if (this.mode == "consumer" || this.mode == "next" || this.mode == "viewer") {
+      if (this.mode != "viewer") {
+        html += '<div part="reporting-view-container">'
+        html += this.renderReporting(event, mmddyyyy);
+        html += "</div>"
+      }
 
       html += '<div class="d-flex justify-between m-20">';
       html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
@@ -16972,11 +17149,12 @@ export class SfIEvents extends LitElement {
     // for(let attachmentUploader of attachmentUploaders){
     //   attachmentUploader.loadMode();
     // }
+    if (this.mode != "viewer") {
+      let ddmmyyyy = mmddyyyy.split('/')[1] + '/' + mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[2];
 
-    let ddmmyyyy = mmddyyyy.split('/')[1] + '/' + mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[2];
-
-    let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.statute}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
-    (this._SfUploader[0].querySelector('#uploader') as SfIUploader).emailcontent = emailcontent;
+      let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.statute}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Reporter</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.reporters[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Approver</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.approvers[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
+      (this._SfUploader[0].querySelector('#uploader') as SfIUploader).emailcontent = emailcontent;
+    }
     (this._SfDetailContainer as HTMLDivElement).querySelector('.button-delete')?.addEventListener('click', async () => {
 
       await this.fetchDeleteReview(event["id"], mmddyyyy, entityId, locationId);
@@ -17003,7 +17181,7 @@ export class SfIEvents extends LitElement {
     });
     (this._SfDetailContainer as HTMLDivElement).querySelector('#button-auto-approve')?.addEventListener('click', async () => {
       if (this.selectedItemIds.length <= 1) {
-        await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
+        await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
         this.setSuccess('Auto-Approved successfully!')
         setTimeout(() => {
           this.clearMessages()
@@ -17033,7 +17211,7 @@ export class SfIEvents extends LitElement {
             "userid": this.userProfileId,
             "userrole": this.myRole,
             "year": this.calendarStartYYYY,
-            "module": event.module ?? "events"
+            "module": event.module ?? "compliance"
           })
         }
         await this.uploadReviewsBulk(bulkBodyReview);
@@ -17260,7 +17438,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if (this.selectedItemIds.length <= 1) {
           // console.log('mmddyyyy', mmddyyyy)
-          if (await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "events")) {
+          if (await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
             for (var p = 0; p < this.events[mmdd].length; p++) {
               if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
 
@@ -17298,7 +17476,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": event.module ?? "events"
+              "module": event.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -17392,7 +17570,7 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if (this.selectedItemIds.length <= 1) {
 
-            if (await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "events")) {
+            if (await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
               for (var p = 0; p < this.events[mmdd].length; p++) {
                 if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                   this.events[mmdd][p].approved = approved
@@ -17431,7 +17609,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": event.module ?? "events"
+                "module": event.module ?? "compliance"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -17602,7 +17780,7 @@ export class SfIEvents extends LitElement {
                         //console.log('makerscheckers', makercheckers, reportercomments);
                         // console.log('reportformatvalues', reportformatvalues)
                         // console.log('reportformatschema',reportformatschema)
-                        if (await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "events", percentage, makercheckers)) {
+                        if (await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "compliance", percentage, makercheckers)) {
                           console.log('this.events', this.events);
                           for (var p = 0; p < this.events[mmdd].length; p++) {
                             if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
@@ -17613,7 +17791,7 @@ export class SfIEvents extends LitElement {
                           }
                           if (makercheckers.length > 0) {
 
-                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
+                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
                             for (var p = 0; p < this.events[mmdd].length; p++) {
                               if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                                 this.events[mmdd][p].approved = true
@@ -17660,7 +17838,7 @@ export class SfIEvents extends LitElement {
                           //   "userid": this.userProfileId,
                           //   "userrole": this.myRole,
                           //   "year": this.calendarStartYYYY,
-                          //   "module": event.module ?? "events"
+                          //   "module": event.module ?? "compliance"
                           // })
                           // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
                           // if(parseInt(makercheckersL) > 0) {
@@ -17683,7 +17861,7 @@ export class SfIEvents extends LitElement {
                           //     "userid": this.userProfileId,
                           //     "userrole": this.myRole,
                           //     "year": this.calendarStartYYYY,
-                          //     "module": event.module ?? "events"
+                          //     "module": event.module ?? "compliance"
                           //   } )
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -17706,7 +17884,7 @@ export class SfIEvents extends LitElement {
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
                             "year": this.calendarStartYYYY,
-                            "module": event.module ?? "events",
+                            "module": event.module ?? "compliance",
                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                           })
                           // }
@@ -19301,7 +19479,7 @@ export class SfIEvents extends LitElement {
             let tempObj = taggingArray.data.mappings.mappings[i]
             delete tempObj['delta'];
             delete tempObj['lastupdated'];
-            if(tempObj["id"].indexOf("6fb88c28-d572-4b55-b16c-957a519733b9") >= 0 || tempObj["id"].indexOf("90dbfbcc-a009-4778-b28e-a463867ceea9") >= 0 || tempObj["id"].indexOf("62330e24-298d-4ef2-9449-c0e400e37cac") >= 0 || tempObj["id"].indexOf("b9370711-024a-498a-8ce2-21c549824600") >= 0){
+            if (tempObj["id"].indexOf("6fb88c28-d572-4b55-b16c-957a519733b9") >= 0 || tempObj["id"].indexOf("90dbfbcc-a009-4778-b28e-a463867ceea9") >= 0 || tempObj["id"].indexOf("62330e24-298d-4ef2-9449-c0e400e37cac") >= 0 || tempObj["id"].indexOf("b9370711-024a-498a-8ce2-21c549824600") >= 0) {
               console.log('changed onboarding item', tempObj, obj, JSON.stringify(tempObj) !== JSON.stringify(obj))
             }
             if (JSON.stringify(tempObj) !== JSON.stringify(obj)) {
@@ -20629,7 +20807,7 @@ export class SfIEvents extends LitElement {
 
     //console.log('rendering triggers...', (this._SfOnboardingTriggersContainer as HTMLDivElement).innerHTML);
 
-    this.renderTaggingTable((this._SfOnboardingTriggersListContainer as HTMLDivElement), mappedSerializedAlertSchedules, mappedTriggers, ["shortid","obligationtitle", "obligationtype"], this.uploadTriggersMapping, this.loadOnboardingTriggers, "triggers", ["id", "entityname", "locationname"], '', "", ["triggers"], triggersJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingTriggersListContainer as HTMLDivElement), mappedSerializedAlertSchedules, mappedTriggers, ["shortid", "obligationtitle", "obligationtype"], this.uploadTriggersMapping, this.loadOnboardingTriggers, "triggers", ["id", "entityname", "locationname"], '', "", ["triggers"], triggersJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20642,7 +20820,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingInternalControlsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingInternalControlsListContainer as HTMLDivElement), mappedSerializedTriggers, mappedInternalControls, ["shortid","obligationtitle", "obligationtype"], this.uploadInternalControlsMapping, this.loadOnboardingInternalControls, "internalcontrols", ["id", "entityname", "locationname"], '', "", ["internalcontrols"], internalcontrolsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingInternalControlsListContainer as HTMLDivElement), mappedSerializedTriggers, mappedInternalControls, ["shortid", "obligationtitle", "obligationtype"], this.uploadInternalControlsMapping, this.loadOnboardingInternalControls, "internalcontrols", ["id", "entityname", "locationname"], '', "", ["internalcontrols"], internalcontrolsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20655,7 +20833,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingActivationsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingActivationListContainer as HTMLDivElement), mappedSerializedExtensions, mappedActivations, ["shortid","obligationtitle", "obligationtype"], this.uploadActivationsMapping, this.loadOnboardingActivations, "activations", ["id", "entityname", "locationname"], '', "", ["activations"], activationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingActivationListContainer as HTMLDivElement), mappedSerializedExtensions, mappedActivations, ["shortid", "obligationtitle", "obligationtype"], this.uploadActivationsMapping, this.loadOnboardingActivations, "activations", ["id", "entityname", "locationname"], '', "", ["activations"], activationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20668,7 +20846,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingInvalidationsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingInvalidationListContainer as HTMLDivElement), mappedSerializedExtensions, mappedInvalidations, ["shortid","obligationtitle", "obligationtype"], this.uploadInvalidationsMapping, this.loadOnboardingInvalidations, "invalidations", ["id", "entityname", "locationname"], '', "", ["invalidations"], invalidationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingInvalidationListContainer as HTMLDivElement), mappedSerializedExtensions, mappedInvalidations, ["shortid", "obligationtitle", "obligationtype"], this.uploadInvalidationsMapping, this.loadOnboardingInvalidations, "invalidations", ["id", "entityname", "locationname"], '', "", ["invalidations"], invalidationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20681,7 +20859,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingAlertSchedulesContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingAlertSchedulesListContainer as HTMLDivElement), mappedSerializedExtensions, mappedAlertSchedules, ["shortid","obligationtitle", "obligationtype"], this.uploadAlertSchedulesMapping, this.loadOnboardingAlertSchedules, "alertschedules", ["id", "entityname", "locationname"], '', "", ["alertschedules"], alertschedulesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingAlertSchedulesListContainer as HTMLDivElement), mappedSerializedExtensions, mappedAlertSchedules, ["shortid", "obligationtitle", "obligationtype"], this.uploadAlertSchedulesMapping, this.loadOnboardingAlertSchedules, "alertschedules", ["id", "entityname", "locationname"], '', "", ["alertschedules"], alertschedulesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20694,7 +20872,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingExtensionsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingExtensionsListContainer as HTMLDivElement), mappedSerializedDuedates, mappedExtensions, ["shortid","obligationtitle", "obligationtype"], this.uploadExtensionsMapping, this.loadOnboardingExtensions, "extensions", ["id", "entityname", "locationname"], '', "", ["extensions"], extensionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingExtensionsListContainer as HTMLDivElement), mappedSerializedDuedates, mappedExtensions, ["shortid", "obligationtitle", "obligationtype"], this.uploadExtensionsMapping, this.loadOnboardingExtensions, "extensions", ["id", "entityname", "locationname"], '', "", ["extensions"], extensionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20707,7 +20885,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingDuedatesContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingDuedatesListContainer as HTMLDivElement), mappedSerializedMakerCheckers, mappedDuedates, ["shortid","obligationtitle", "obligationtype"], this.uploadDuedatesMapping, this.loadOnboardingDuedates, "duedates", ["id", "entityname", "locationname"], '', "", ["duedates"], duedatesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingDuedatesListContainer as HTMLDivElement), mappedSerializedMakerCheckers, mappedDuedates, ["shortid", "obligationtitle", "obligationtype"], this.uploadDuedatesMapping, this.loadOnboardingDuedates, "duedates", ["id", "entityname", "locationname"], '', "", ["duedates"], duedatesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20720,7 +20898,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingReportersContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingReportersListContainer as HTMLDivElement), mappedSerializedTags, mappedReporters, ["shortid","obligationtitle", "obligationtype"], this.uploadReportersMapping, this.loadOnboardingReporters, "reporters", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["reporters"], reportersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+    this.renderTaggingTable((this._SfOnboardingReportersListContainer as HTMLDivElement), mappedSerializedTags, mappedReporters, ["shortid", "obligationtitle", "obligationtype"], this.uploadReportersMapping, this.loadOnboardingReporters, "reporters", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["reporters"], reportersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
 
   }
 
@@ -20733,7 +20911,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingApproversContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingApproversListContainer as HTMLDivElement), mappedSerializedReporters, mappedApprovers, ["shortid","obligationtitle", "obligationtype"], this.uploadApproversMapping, this.loadOnboardingApprovers, "approvers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["approvers"], approversJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+    this.renderTaggingTable((this._SfOnboardingApproversListContainer as HTMLDivElement), mappedSerializedReporters, mappedApprovers, ["shortid", "obligationtitle", "obligationtype"], this.uploadApproversMapping, this.loadOnboardingApprovers, "approvers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["approvers"], approversJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
 
   }
 
@@ -20746,7 +20924,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingFunctionHeadsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingFunctionHeadsListContainer as HTMLDivElement), mappedSerializedApprovers, mappedFunctionHeads, ["shortid","obligationtitle", "obligationtype"], this.uploadFunctionHeadsMapping, this.loadOnboardingFunctionHeads, "functionheads", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["functionheads"], functionHeadsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+    this.renderTaggingTable((this._SfOnboardingFunctionHeadsListContainer as HTMLDivElement), mappedSerializedApprovers, mappedFunctionHeads, ["shortid", "obligationtitle", "obligationtype"], this.uploadFunctionHeadsMapping, this.loadOnboardingFunctionHeads, "functionheads", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["functionheads"], functionHeadsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
 
   }
 
@@ -20759,7 +20937,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingMakerCheckersContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingMakerCheckersListContainer as HTMLDivElement), mappedSerializedDocs, mappedMakerCheckers, ["shortid","obligationtitle", "obligationtype"], this.uploadMakerCheckersMapping, this.loadOnboardingMakerCheckers, "makercheckers", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["makercheckers"], makerCheckerJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingMakerCheckersListContainer as HTMLDivElement), mappedSerializedDocs, mappedMakerCheckers, ["shortid", "obligationtitle", "obligationtype"], this.uploadMakerCheckersMapping, this.loadOnboardingMakerCheckers, "makercheckers", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["makercheckers"], makerCheckerJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20772,7 +20950,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingDocsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingDocsListContainer as HTMLDivElement), mappedSerializedViewers, mappedDocs, ["shortid","obligationtitle", "obligationtype"], this.uploadDocsMapping, this.loadOnboardingDocs, "docs", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["docs"], docsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingDocsListContainer as HTMLDivElement), mappedSerializedViewers, mappedDocs, ["shortid", "obligationtitle", "obligationtype"], this.uploadDocsMapping, this.loadOnboardingDocs, "docs", ["id", "entityname", "locationname"], this.apiIdTags, "&MakerChecker", ["docs"], docsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20787,7 +20965,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingAuditorsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingAuditorsListContainer as HTMLDivElement), mappedSerializedFunctionheads, mappedAuditors, ["shortid","obligationtitle", "obligationtype"], this.uploadAuditorsMapping, this.loadOnboardingAuditors, "auditors", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["auditors"], auditorsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+    this.renderTaggingTable((this._SfOnboardingAuditorsListContainer as HTMLDivElement), mappedSerializedFunctionheads, mappedAuditors, ["shortid", "obligationtitle", "obligationtype"], this.uploadAuditorsMapping, this.loadOnboardingAuditors, "auditors", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["auditors"], auditorsJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
 
   }
 
@@ -20802,7 +20980,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingViewersContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingViewersListContainer as HTMLDivElement), mappedSerializedAuditors, mappedViewers, ["shortid","obligationtitle", "obligationtype"], this.uploadViewersMapping, this.loadOnboardingViewers, "viewers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["viewers"], viewersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
+    this.renderTaggingTable((this._SfOnboardingViewersListContainer as HTMLDivElement), mappedSerializedAuditors, mappedViewers, ["shortid", "obligationtitle", "obligationtype"], this.uploadViewersMapping, this.loadOnboardingViewers, "viewers", ["id", "entityname", "locationname"], this.apiIdUsers, "", ["viewers"], viewersJobs, null, ["Client remarks", "FlaggGRC response"], null, "Guidelines", "");
 
   }
 
@@ -20815,7 +20993,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingTagsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingTagsListContainer as HTMLDivElement), mappedSerializedFunctions, mappedTags, ["shortid","obligationtitle", "obligationtype"], this.uploadTagsMapping, this.loadOnboardingTags, "tags", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Tag", ["tags"], tagsJobs, "tagtype", ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingTagsListContainer as HTMLDivElement), mappedSerializedFunctions, mappedTags, ["shortid", "obligationtitle", "obligationtype"], this.uploadTagsMapping, this.loadOnboardingTags, "tags", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Tag", ["tags"], tagsJobs, "tagtype", ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -20836,7 +21014,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingFunctionsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingFunctionsListContainer as HTMLDivElement), mappedSerializedLocations, mappedFunctions, ["shortid","obligationtitle", "obligationtype"], this.uploadFunctionsMapping, this.loadOnboardingFunctions, "functions", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Function", ["functions"], functionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingFunctionsListContainer as HTMLDivElement), mappedSerializedLocations, mappedFunctions, ["shortid", "obligationtitle", "obligationtype"], this.uploadFunctionsMapping, this.loadOnboardingFunctions, "functions", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Function", ["functions"], functionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -24269,34 +24447,35 @@ export class SfIEvents extends LitElement {
 
   }
 
-  processGraphFilter = (clickedValue: string) => {
+  processGraphFilter = (clickedValue: string, detailsListContainer?: HTMLDivElement) => {
 
-    let eventContainer = null;
-    console.log('processGraphFilter called', clickedValue);
-    if (this.getCurrentTab() == this.TAB_STREAM) {
-      eventContainer = (this._SfStreamContainer as HTMLDivElement);
-    }
+    let eventContainer = detailsListContainer;
+    if (eventContainer == null) {
+      console.log('processGraphFilter called', clickedValue);
+      if (this.getCurrentTab() == this.TAB_STREAM) {
+        eventContainer = (this._SfStreamContainer as HTMLDivElement);
+      }
 
-    // if(this.getCurrentTab() == this.TAB_UPCOMING) {
-    //   eventContainer = (this._SfUpcomingContainer as HTMLDivElement);
-    // }
+      // if(this.getCurrentTab() == this.TAB_UPCOMING) {
+      //   eventContainer = (this._SfUpcomingContainer as HTMLDivElement);
+      // }
 
-    if (this.getCurrentTab() == this.TAB_THIS) {
-      eventContainer = (this._SfThisContainer as HTMLDivElement);
-    }
+      if (this.getCurrentTab() == this.TAB_THIS) {
+        eventContainer = (this._SfThisContainer as HTMLDivElement);
+      }
 
-    // if(this.getCurrentTab() == this.TAB_PAST) {
-    //   eventContainer = (this._SfPastContainer as HTMLDivElement);
-    // }
+      // if(this.getCurrentTab() == this.TAB_PAST) {
+      //   eventContainer = (this._SfPastContainer as HTMLDivElement);
+      // }
 
-    if (this.getCurrentTab() == this.TAB_CUSTOM) {
-      eventContainer = (this._SfCustomContainer as HTMLDivElement);
-    }
+      if (this.getCurrentTab() == this.TAB_CUSTOM) {
+        eventContainer = (this._SfCustomContainer as HTMLDivElement);
+      }
 
-    if (this.getCurrentTab() == this.TAB_FIND) {
-      eventContainer = (this._SfFindContainer as HTMLDivElement);
+      if (this.getCurrentTab() == this.TAB_FIND) {
+        eventContainer = (this._SfFindContainer as HTMLDivElement);
+      }
     }
-
     if (eventContainer == null) return;
     this.graphFilter = clickedValue
     this.selectedItemIds = [];
@@ -24340,7 +24519,7 @@ export class SfIEvents extends LitElement {
         value: clickedValue
       };
       (streamEventFilters as HTMLDivElement).style.display = 'block';
-      (streamEventFilters as HTMLDivElement).innerHTML = '<div part="badge-dashboard" class="d-flex align-center justify-between mr-10 mb-10 no-shrink"><div><span>Filtered by</span>&nbsp;&nbsp;<span id="graph-total" part="badge-filter-name">' + clickedValue + '</span></div><button id="button-filter-cancel" part="button-icon"><span class="material-symbols-outlined">close</span></button></div>';
+      (streamEventFilters as HTMLDivElement).innerHTML = '<div part="badge-dashboard" class="d-flex align-center justify-between mr-10 mb-10 no-shrink"><div><span>Filtered by</span>&nbsp;&nbsp;<span id="graph-total" part="badge-filter-name">' + clickedValue + '</span></div>' + (detailsListContainer == null ? '<button id="button-filter-cancel" part="button-icon"><span class="material-symbols-outlined">close</span></button>':'') + '</div>';
       (streamEventFilters as HTMLDivElement).querySelector('#button-filter-cancel')?.addEventListener('click', () => {
         this.graphFilter = "";
         this.clearSelectedGraphParam();
@@ -24710,7 +24889,7 @@ export class SfIEvents extends LitElement {
 
     html += '<button class="tab-button mb-10" id="calendar-tab-month" part="' + (selectedTab == this.TAB_STREAM ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Month</button>';
     html += '<button class="tab-button mb-10" id="calendar-tab-custom" part="' + (selectedTab == this.TAB_CUSTOM ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">' + (this.myRole == this.TAB_VIEWER ? "Statistics" : "Range") + '</button>';
-    if (this.selectedFeatures.indexOf('contracts') < 0 && this.selectedFeatures.indexOf('licenses') < 0) {
+    if (this.selectedFeatures.indexOf('contracts') < 0 && this.selectedFeatures.indexOf('licenses') < 0 && this.selectedFeatures.indexOf('rcmresources') < 0) {
       html += '<button class="tab-button mb-10" id="calendar-tab-register" part="' + (selectedTab == this.TAB_REGISTERS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Registers</button>';
       html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_FIND ? '' : 'hide') + '" id="calendar-tab-find" part="' + (selectedTab == this.TAB_FIND ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Search</button>';
       html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_THIS ? '' : 'hide') + '" id="calendar-tab-this" part="' + (selectedTab == this.TAB_THIS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Current</button>';
@@ -25855,7 +26034,7 @@ export class SfIEvents extends LitElement {
 
   }
 
-  uploadAudit = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module: string = "events") => {
+  uploadAudit = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module: string = "compliance") => {
     let url = "https://" + this.apiId + "/uploadaudit1";
 
     const body = {
@@ -25925,7 +26104,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  uploadReview = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module: string = "events") => {
+  uploadReview = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module: string = "compliance") => {
     let url = "https://" + this.apiId + "/uploadreview1";
 
     const body = {
@@ -26025,7 +26204,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  uploadReport = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string = "", reportformatschema: string = "", module: string = "events", percentage: string = "100", makercheckers: any) => {
+  uploadReport = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string = "", reportformatschema: string = "", module: string = "compliance", percentage: string = "100", makercheckers: any) => {
     let url = "https://" + this.apiId + "/uploadreport1";
 
     let body = {
@@ -26161,7 +26340,7 @@ export class SfIEvents extends LitElement {
 
     let url = "https://" + this.apiId + "/synccalendar";
 
-    const body = { "projectid": (this._SfProject[0].querySelector('#sf-i-project') as SfIForm).selectedValues()[0], "events": JSON.stringify(this.events) }
+    const body = { "projectid": (this._SfProject[0].querySelector('#sf-i-project') as SfIForm).selectedValues()[0], "compliance": JSON.stringify(this.events) }
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
     this._SfLoader.innerHTML = '';
@@ -27680,7 +27859,7 @@ export class SfIEvents extends LitElement {
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
       if (JSON.stringify(urlBody) == this.getallcountryevetsParams) {
         this.lastupdated = Util.getDateTimeStrings(new Date().getTime())
-        console.log('rendering appropriate string', list);
+        console.log('rendering appropriate string', list, this.selectedTab);
         this.renderAppropriateStream(startDate, endDate, true);
         this.fetchBulkReportingData();
       }
@@ -27763,6 +27942,61 @@ export class SfIEvents extends LitElement {
 
     }
 
+  }
+  fetchOnlyYearlyUserCalendar = async (startDate: string = "", endDate: string = "", searchString: string = "", list: string = "yes", month: string = "00", year: string = this.calendarStartYYYY, userprofileid: string = this.userProfileId, userrole: string = this.myRole, entityid = this.entityId, countryid = this.countryId, locationid = this.locationId, tagid = this.tagId, functionid = this.functionId) => {
+
+    let path = "", view = "";
+    if (this.tagId != null && this.tagId != "") {
+      view = "tag";
+    } else if (this.countryId != null && this.countryId != "") {
+      view = "country";
+    } else if (this.locationId != null && this.locationId != "") {
+      view = "location";
+    } else {
+      view = "entity";
+    }
+
+    path = "getallcountryevents";
+
+    let url = "https://" + this.apiId + "/" + path;
+
+    //console.log('fetch calendar url', url);
+    let urlBody: any = { "projectid": this.projectId, "userprofileid": userprofileid, "role": userrole, "entityid": entityid, "countryid": countryid, "functionid": functionid, "locationid": locationid, "tagid": tagid, "adhoc": "false", "exclusivestartkey": 0, "sdate": startDate, "edate": endDate, "view": view, "year": year, "list": list, "month": month };
+
+    if (searchString.length > 0) {
+      urlBody["searchstring"] = searchString;
+    }
+
+    const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
+    const xhr: any = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing')) as any;
+    this._SfLoader.innerHTML = '';
+    if (xhr.status == 200) {
+
+      const jsonRespose = JSON.parse(xhr.responseText);
+      console.log('jsonRespose', jsonRespose);
+      // if (JSON.stringify(urlBody) == this.getallcountryevetsParams) {
+      this.events = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
+      // }
+      await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
+
+    } else {
+      if (xhr.status == 401) {
+        let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+        this.dispatchEvent(changeEvent);
+      }
+      if (xhr.status === 404) {
+
+        this.showChosenProject();
+        (this._SfTitleChosenProject as HTMLElement).innerHTML = (this._SfProject[0].querySelector('#sf-i-project') as SfIForm).selectedTexts()[0];
+        this.renderChosenProject();
+
+      } else {
+        const jsonRespose = JSON.parse(xhr.responseText);
+        this.setError(jsonRespose.error);
+      }
+
+    }
+
   }
 
   fetchAndRenderNotices = async (startDate: string = "", endDate: string = "", searchString: string = "", list: string = "yes", month: string = "00", year: string = this.calendarStartYYYY) => {
@@ -29744,6 +29978,11 @@ export class SfIEvents extends LitElement {
       this.renderRoleTabsNext(0, false)
     } else if (this.mode == "reports") {
       this.fetchReports();
+    } else if (this.mode == "viewer") {
+      this.enableCustom();
+      this.selectedTab = this.TAB_CUSTOM
+      this.renderCustom();
+      this.renderWithFeatures(this.sdate, this.edate, "", "yes")
     } else {
 
       this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
@@ -30107,7 +30346,8 @@ export class SfIEvents extends LitElement {
               </div>
               <div class="rb"></div>
           </div>
-          <div id="detail-container" class="hide" part="detail-container">
+          <div id="detail-container" class="hide" part="detail-container"></div>
+          <div id="detail-list-container" class="hide" part="detail-list-container">
           </div>
           <div class="d-flex justify-between">
               <div class="lb"></div>
@@ -30294,7 +30534,8 @@ export class SfIEvents extends LitElement {
           </div>
           <div id="report-summary-container" class="hide" part="report-summary-container">
           </div>
-          <div id="detail-container" class="hide" part="detail-container">
+          <div id="detail-container" class="hide" part="detail-container"></div>
+          <div id="detail-list-container" class="hide" part="detail-list-container">
           </div>
           <div class="d-flex justify-between">
               <div class="lb"></div>