sf-i-events 1.0.879 → 1.0.881

package/src/sf-i-events.ts

@@ -1249,6 +1249,9 @@ export class SfIEvents extends LitElement {
   @property()
   apiIdLicenses!: string;
 
+  @property()
+  apiIdRCMResources!: string;
+
   @property()
   apiMethodList!: string;
 
@@ -4270,7 +4273,7 @@ export class SfIEvents extends LitElement {
   getComplianceStatus = (completeness: string, timeliness: string, percentage?: string, event: any = {}) => {
     if (event.module == "contract") {
       console.log('compliance status', event.terminated, completeness, timeliness)
-      if(event.terminated){
+      if (event.terminated) {
         return "terminated"
       }
       if (completeness == "not-started") {
@@ -4757,7 +4760,7 @@ export class SfIEvents extends LitElement {
     const moduleType = event.module ?? 'compliance';
     const partStatusSanitized = partStatus.replace(/-/g, '_');
     const entityIdSanitized = event.entityid.replace(/-/g, '_');
-    const locationIdSanitized = event.locationid.replace(/-/g, '_');
+    const locationIdSanitized = (event.locationid ?? "").replace(/-/g, '_');
     const eventIdSanitized = event.id.replace(/-/g, '_');
     const mmddSanitized = mmdd.replace(/\//g, '-');
     const dueDateParts = event.duedate.split('/');
@@ -5157,11 +5160,25 @@ export class SfIEvents extends LitElement {
     html += this.renderCalendarEventSummary();
 
 
-    // csvCols += 'Period,Status,Id,ObligationTitle,Obligation,Duedate' 
-    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>'
+    }
 
-    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 {
+      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++) {
 
@@ -5243,94 +5260,199 @@ 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){
+            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) {
-            //Id,Country,Entity,Location,Function,Reporter,Approver,Functionhead,State
-            csvValues += ('"' + (this.events[mmdd][j]["id"] + '",'));
-            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]["functions"] ?? [])[0] ?? "").split(';')[0] + "").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]["state"] + '",'));
-            csvValues += ('"' + (this.events[mmdd][j]["jurisdiction"] + '",'));
-            csvValues += ('"' + (this.events[mmdd][j]["category"] + '",'));
-            csvValues += ('"' + (this.events[mmdd][j]["subcategory"] + '",'));
-            csvValues += ('"' + (this.events[mmdd][j]["statute"] + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["reference"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["applicability"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["obligationtype"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["obligationtitle"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["obligation"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["firstlineofdefence"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["secondlineofdefence"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["thirdlineofdefence"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["internalcontrols"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["penalty"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["form"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["additionalurls"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["definition"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["authority"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["risk"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["riskarea"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["frequency"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["subfrequency"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + ((this.events[mmdd][j]["duedate"] + "").replace(/"/g, "") + '",'));
-            csvValues += ('"' + (this.renderStatusString(partStatus, lateStatus, complianceStatus) + '",'));
-            csvValues += ('"' + (this.getGraphParam(this.events[mmdd][j]) + '"\n'));
-
-            // csvValues += (period + ',' 
-            //   + this.renderStatusString(partStatus, lateStatus, complianceStatus) + ',' 
-            //   + this.events[mmdd][j]["id"] + ',' 
-            //   + this.events[mmdd][j]["obligationtitle"] + ',' 
-            //   + this.events[mmdd][j]["obligation"] + ',' 
-            //   + this.events[mmdd][j]["duedate"]
-            //   + '\n');
-
-            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-thin">' + this.events[mmdd][j]["country"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["state"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["jurisdiction"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["category"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["subcategory"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["statute"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["reference"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["applicability"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["obligationtype"] + '</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]["obligation"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["firstlineofdefence"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["secondlineofdefence"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["thirdlineofdefence"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["internalcontrols"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["penalty"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["form"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["additionalurls"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["definition"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["authority"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["risk"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["riskarea"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["frequency"] + '</td>'
-              + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["subfrequency"] + '</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-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>');
-            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.events[mmdd][j]["obligation"] + '" 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">');
-
-            for (let document of this.events[mmdd][j].documents) {
-              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 />`
+            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"] + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligationtitle"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["contracttypename"] + "").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]["party1"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["party2"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["party3"] + "").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]["duedate"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + (this.renderStatusString(partStatus, lateStatus, complianceStatus) + '",'));
+              csvValues += ('"' + (this.getGraphParam(this.events[mmdd][j]) + '"\n'));
+
+              //Id,RefNo,Type,Country,Entity,Location,Party1,Party2,Party3,DueDate,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]["contracttypename"] + '</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]["party1"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["party2"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["party3"] + '</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-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('licenses') >= 0) {
+              //Id,ReferenceNo.,Type,Country,Entity,Location,Reporter,Approver,Functionhead,State,Jurisdiction,Category,Subcategory,Statute,ObligationType,RiskSeverity,RiskAreas,Frequency,SubFrequency,DueDate,Status,ReportParameter
+              csvValues += ('"' + (this.events[mmdd][j]["id"] + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligationtitle"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["licensetypename"] + "").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]?.statute?.state ?? "" + '",'));
+              csvValues += ('"' + (this.events[mmdd][j]["jurisdiction"] + '",'));
+              csvValues += ('"' + (this.events?.[mmdd]?.[j]?.complianceobj?.category ?? "" + '",'));
+              csvValues += ('"' + (this.events[mmdd][j]["subcategory"] + '",'));
+              csvValues += ('"' + (this.events?.[mmdd]?.[j]?.statute?.name + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["risk"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["riskarea"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["frequency"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + (((this.events?.[mmdd]?.[j]?.complianceobj?.subfrequency ?? "") + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligationtype"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["duedate"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + (this.renderStatusString(partStatus, lateStatus, complianceStatus) + '",'));
+              csvValues += ('"' + (this.getGraphParam(this.events[mmdd][j]) + '"\n'));
+
+              //Id,ReferenceNo.,Type,Country,Entity,Location,State,Jurisdiction,Category,Subcategory,Statute,ObligationType,RiskSeverity,RiskAreas,Frequency,SubFrequency,DueDate,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]["licensetypename"] + '</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]?.statute?.state ?? "") + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["jurisdiction"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + (this.events?.[mmdd]?.[j]?.complianceobj?.category ?? "") + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["subcategory"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + (this.events?.[mmdd]?.[j]?.statute?.name ?? "") + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["obligationtype"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["risk"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["riskarea"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["frequency"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + ((this.events?.[mmdd]?.[j]?.complianceobj?.subfrequency ?? "") + "").replace(/"/g, "") + '</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-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"] + '",'));
+              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]["functions"] ?? [])[0] ?? "").split(';')[0] + "").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]["state"] + '",'));
+              csvValues += ('"' + (this.events[mmdd][j]["jurisdiction"] + '",'));
+              csvValues += ('"' + (this.events[mmdd][j]["category"] + '",'));
+              csvValues += ('"' + (this.events[mmdd][j]["subcategory"] + '",'));
+              csvValues += ('"' + (this.events[mmdd][j]["statute"] + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["reference"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["applicability"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligationtype"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligationtitle"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligation"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["firstlineofdefence"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["secondlineofdefence"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["thirdlineofdefence"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["internalcontrols"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["penalty"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["form"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["additionalurls"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["definition"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["authority"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["risk"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["riskarea"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["frequency"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["subfrequency"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["duedate"] + "").replace(/"/g, "") + '",'));
+              csvValues += ('"' + (this.renderStatusString(partStatus, lateStatus, complianceStatus) + '",'));
+              csvValues += ('"' + (this.getGraphParam(this.events[mmdd][j]) + '"\n'));
+
+              // csvValues += (period + ',' 
+              //   + this.renderStatusString(partStatus, lateStatus, complianceStatus) + ',' 
+              //   + this.events[mmdd][j]["id"] + ',' 
+              //   + this.events[mmdd][j]["obligationtitle"] + ',' 
+              //   + this.events[mmdd][j]["obligation"] + ',' 
+              //   + this.events[mmdd][j]["duedate"]
+              //   + '\n');
+
+              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-thin">' + this.events[mmdd][j]["country"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["state"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["jurisdiction"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["category"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["subcategory"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["statute"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["reference"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["applicability"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["obligationtype"] + '</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]["obligation"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["firstlineofdefence"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["secondlineofdefence"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["thirdlineofdefence"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["internalcontrols"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["penalty"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["form"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["additionalurls"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["definition"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["authority"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["risk"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["riskarea"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["frequency"] + '</td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["subfrequency"] + '</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-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>');
+            }
+            if (this.selectedFeatures.indexOf('contracts') >= 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">');
+
+              for (let document of this.events[mmdd][j].contractdocuments ?? []) {
+                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('licenses') >= 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">');
+
+              for (let document of this.events[mmdd][j].licensedocuments ?? []) {
+                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 {
+              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.events[mmdd][j]["obligation"] + '" 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">');
+
+              for (let document of this.events[mmdd][j].documents) {
+                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 += this.renderCalendarAnnotations(this.events[mmdd][j]);
+              htmlSummaryValues += '</td></tr>'
             }
-            // htmlSummaryValues += this.renderCalendarAnnotations(this.events[mmdd][j]);
-            htmlSummaryValues += '</td></tr>'
           }
 
           html += this.renderCalendarRowDivItemDivStart(mmdd, this.events[mmdd][j], j, partStatus, bgStatus);
@@ -5692,7 +5814,7 @@ export class SfIEvents extends LitElement {
         html += '<button id="button-uploader-submit-approve" class="button-submit" part="button">Save</button>'
         html += '</div>'
 
-        if (this.myRole != this.TAB_FUNCTION_HEAD && docs.length > 0 && event.module != 'contract' && event.module != 'license') {
+        if (this.myRole != this.TAB_FUNCTION_HEAD && docs.length > 0 && event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
           html += '<div class="m-20">';
           html += '<label part="input-label">Supporting Documents</label>';
           html += '<slot name="uploader"></slot>';
@@ -5703,7 +5825,7 @@ export class SfIEvents extends LitElement {
         html += '<div class="d-flex m-20 flex-col">';
         html += '<label part="input-label">Approver Comments*</label>';
         html += '<input id="input-approver-comments" type="text" part="input" value=""/><br />';
-        if (event.module != 'contract' && event.module != 'license') {
+        if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
           html += '<label part="input-label">Date of Completion*</label>';
           html += '<input id="input-approver-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" disabled/><br />';
           html += '<label part="input-label">Percentage</label>';
@@ -5764,7 +5886,7 @@ export class SfIEvents extends LitElement {
         html += '<div class="d-flex m-20 flex-col">';
         html += '<label part="input-label">Reporter Comments*</label>';
         html += '<input id="input-reporter-comments" type="text" part="input" value=""/><br />';
-        if (event.module != 'contract' && event.module != 'license') {
+        if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
           html += '<label part="input-label">Date of Completion*</label>';
           html += '<input id="input-reporter-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" max="' + (new Date().toISOString().substring(0, 10)) + '"/><br />';
           html += '<label part="input-label">Completion Percentage*</label>';
@@ -5822,7 +5944,7 @@ export class SfIEvents extends LitElement {
       html += '<div class="d-flex m-20 flex-col">';
       html += '<label part="input-label">Auditor Comments</label>';
       html += '<input id="input-auditor-comments" type="text" part="input" value=""/><br />';
-      if (event.module != 'contract' && event.module != 'license') {
+      if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
         html += '<label part="input-label">Date of Completion</label>';
         html += '<input id="input-auditor-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" max="' + (new Date().toISOString().substring(0, 10)) + '" readonly/><br />';
         html += '<label part="input-label">Percentage</label>';
@@ -5890,7 +6012,10 @@ export class SfIEvents extends LitElement {
     event.docsOptional = event['docs'] == null ? [] : event['docs'];
     html = this.renderReporting(event, mmddyyyy);
     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 listReportingContainers = eventsContainer.querySelectorAll('.list-reporting-container') as NodeListOf<HTMLDivElement>
     for (let tempReportingContainer of listReportingContainers) {
       tempReportingContainer.style.display = 'none';
@@ -6803,6 +6928,8 @@ export class SfIEvents extends LitElement {
           this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "license") {
           this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -6844,6 +6971,8 @@ export class SfIEvents extends LitElement {
           this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "license") {
           this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -10972,6 +11101,8 @@ export class SfIEvents extends LitElement {
           this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "license") {
           this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -11013,6 +11144,8 @@ export class SfIEvents extends LitElement {
           this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "license") {
           this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -11584,6 +11717,8 @@ export class SfIEvents extends LitElement {
           this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "license") {
           this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -11630,6 +11765,8 @@ export class SfIEvents extends LitElement {
           this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "license") {
           this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -14588,6 +14725,7 @@ export class SfIEvents extends LitElement {
 
     }
   }
+
   fetchLicenseDetails = async (listEvent: any, mmddyyyy: string) => {
     let entityId = listEvent.entityid;
     let locationId = listEvent.locationid;
@@ -15482,14 +15620,15 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null) => {
-    console.log('listEvent', listEvent, listEvent.id)
-    let url = "https://" + this.apiId + "/getalleventdetails";
+  fetchRCMResourceDetails = async (listEvent: any, mmddyyyy: string) => {
+    let entityId = listEvent.entityid;
+    let locationId = listEvent.locationid;
+    let url = "https://" + this.apiIdRCMResources + "/getallobjectdetails";
 
-    //console.log('fetch calendar url', url);
-    let urlBody: any = { "projectid": this.projectId, "userprofileid": this.userProfileId, "role": this.myRole, "eventid": listEvent.id, "entityid": listEvent.entityid, "locationid": listEvent.locationid, "mmddyyyy": mmddyyyy, "year": this.getFinancialYear(mmddyyyy) };
+    console.log('fetch rcm resource details url', url);
+    let urlBody: any = { projectid: this.projectId, objectid: listEvent.id, entityid: entityId, locationid: locationId, userprofileid: this.userProfileId, role: this.myRole, year: this.calendarStartYYYY, mmddyyyy: mmddyyyy };
 
-    //console.log('urlbody', urlBody);
+    console.log('fetch rcm resource details urlbody', urlBody);
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing')) as any;
@@ -15497,194 +15636,1087 @@ export class SfIEvents extends LitElement {
     if (xhr.status == 200) {
 
       const jsonRespose = JSON.parse(xhr.responseText);
-      console.log('jsonRespose', jsonRespose);
-      if (flagUploadGuidance) {
-        if (listEventContainer != null) {
-          let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
-          if (this.events[mmdd] != null) {
-            for (var p = 0; p < this.events[mmdd].length; p++) {
-              if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == listEvent.locationid && this.events[mmdd][p].entityid == listEvent.entityid) {
-                this.events[mmdd][p].uploadguidance = jsonRespose.data.uploadguidance
-              }
-            }
-          }
-          this.renderListReporting(listEventContainer, jsonRespose.data, mmddyyyy, eventsContainer)
-        }
-      } else {
-        this.renderEventDetail(jsonRespose.data, mmddyyyy, currentColumnButton, eventsContainer);
-      }
-
+      console.log('jsonRespose agreement details', jsonRespose);
+      this.renderRCMResourceDetails(jsonRespose.object, mmddyyyy)
     } 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);
       }
 
     }
+
   }
 
-  renderEventDetail = (event: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement) => {
-    console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
+  renewRCMResource = async (listEvent: any, reportformatvalues: any) => {
 
-    let comments, docs, approved, /*dateOfCompletion,*/ makercheckers: Array<string>, docsOptional, documentType;
-    let entityId: string = "";
-    let locationId: string = "";
-    let statuteName: string = "";
-    let reportformatName: string = "";
-    let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
-    entityId = event.entityid;
-    locationId = event.locationid;
-    // let completeness = this.getCompletenessStatus(event);
-    comments = event['comments'] == null ? [] : (event['comments']);
-    docs = event['documents'] == null ? [] : event['documents'] == null ? [] : (event['documents']);
-    approved = event['approved'] == null ? false : event['approved'] == null ? false : event['approved'];
-    // dateOfCompletion = event['dateofcompletion'] == null ? '' : event['dateofcompletion'] == null ? '' : event['dateofcompletion'];
-    makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'] == null ? [] : event['makercheckers'];
-    docsOptional = event['docs'] == null ? [] : event['docs'] == null ? [] : event['docs'];
-    documentType = event['documenttype'] == null ? null : event['documenttype'][0] == null ? null : event['documenttype'][0].split(" ")[0];
+    let url = "https://" + this.apiIdRCMResources + "/reopen";
 
-    statuteName = event['statute'][0].trim();
-    if (event['reportformat'] != null) {
-      reportformatName = (event['reportformat'][0] ?? "").trim().replace('&amp;', '&');
-    }
+    console.log('renewing', reportformatvalues)
+    //console.log('fetch calendar url', url);
+    let urlBody: any = { projectid: this.projectId, objectid: listEvent.id, newvalues: reportformatvalues == "" ? null : JSON.parse(reportformatvalues), published: true, terminated: (JSON.parse(reportformatvalues).terminated ?? false) };
+    console.log('reopen body', url, urlBody)
+    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) {
 
-    console.log('event detail', event, statuteName);
-    //console.log('event detail comments', comments);
-    //console.log('event dateofcompletion', dateOfCompletion);
-    //console.log('event detail documenttype', documentType);
-    const basicFields = ['id', 'shortid', 'entityname', 'locationname', 'functions'];
-    const statuteFields = ['jurisdiction', 'country', 'state', 'category', 'subcategory', 'statute'];
-    const complianceFields = ['specificity', 'reference', 'obligation', 'penalty', 'authority', 'frequency', 'subfrequency', 'obligationtype', 'duedate', 'applicability', 'form', 'additionalurls', 'adhocquestion', 'adhocquestionschedule', 'adhocinstances', 'uploadguidance', 'attachment'];
-    const grcFields = ['internalcontrols', 'firstlineofdefence', 'secondlineofdefence', 'thirdlineofdefence', 'risk', 'riskarea'];
+      const jsonRespose = JSON.parse(xhr.responseText);
+      console.log('jsonRespose agreement reopen', jsonRespose);
+    } else {
+      if (xhr.status == 401) {
+        let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+        this.dispatchEvent(changeEvent);
+      } else {
+        const jsonRespose = JSON.parse(xhr.responseText);
+        this.setError(jsonRespose.error);
+      }
 
-    let listReportingContainers = eventsContainer.querySelectorAll('.list-reporting-container') as NodeListOf<HTMLDivElement>
-    for (let tempReportingContainer of listReportingContainers) {
-      tempReportingContainer.style.display = 'none';
-      tempReportingContainer.innerHTML = '';
-    }
-    let buttonListReportings = eventsContainer.querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>
-    for (let buttonListReporting of buttonListReportings) {
-      buttonListReporting.setAttribute('part', 'button-list-reporting')
-    }
-    let streamEventTitles = eventsContainer.querySelectorAll('.stream-event-title') as NodeListOf<SfIElasticText>
-    for (let streamEventTitle of streamEventTitles) {
-      streamEventTitle.removeAttribute('part')
     }
-    var html = `
-    
-      <div part="compliance-detail-title" class="d-flex justify-between">
-        <button part="button-icon" class="material-icons invisible">close</button>
-        <h3 part="results-title" class="m-0">Compliance Details</h3>
-        <button id="button-detail-close" part="button-icon" class="material-icons">close</button>
-      </div>
-    
-    `;
-
-    if (this.selectedItemIds.length > 1) {
-
-      html += `
-    
-        <div class="d-flex justify-between m-20">
-          <h4 class="m-0">${this.selectedItemIds.length - 1} other ` + ((this.selectedItemIds.length - 1) === 1 ? `item` : `items`) + ` also selected</h4>
+  }
+  renderRCMResourceDetails = async (listEvent: any, mmddyyyy: string) => {
+    // await this.fetchAgreementDetails(listEvent, mmddyyyy);
+    // return;
+    let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+    let entityId = listEvent.entityid;
+    let locationId = listEvent.locationid;
+    let comments = listEvent['comments'];
+    let docs = listEvent['documents'] == null ? [] : listEvent['documents'] == null ? [] : (listEvent['documents']);
+    let approved = listEvent['approved'] == null ? false : listEvent['approved'] == null ? false : listEvent['approved'];
+    let makercheckers = listEvent['makercheckers'] == null ? [] : listEvent['makercheckers'] == null ? [] : listEvent['makercheckers'];
+    // let docsOptional = listEvent['docs'] == null ? [] : listEvent['docs'] == null ? [] : listEvent['docs']; 
+    let html: string = '';
+    let documentType = listEvent['documenttype'] == null ? null : listEvent['documenttype'][0] == null ? null : listEvent['documenttype'][0].split(" ")[0];
+    html += `
+        <div part="compliance-detail-title" class="d-flex justify-between">
+          <button part="button-icon" class="material-icons invisible">close</button>
+          <h3 part="results-title" class="m-0">RCM Resource Details</h3>
+          <button id="button-detail-close" part="button-icon" class="material-icons">close</button>
         </div>
-    
-      `;
+      `
+    html += `
+        <div class="box-large" id="shimmer-container-agreements" part="shimmer-container-agreements">
+        </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>';
 
-    }
+    html += '<div part="reporting-view-container">'
 
-    html += '<div class="accordian-container m-20 pb-20" part="accordian-container">';
+    html += this.renderReporting(listEvent, mmddyyyy);
+    html += "</div>"
 
-    html += '<div part="detail-summary">';
-    html += ('<div part="detail-summary-title" class="pl-20 pr-20"><h1>' + event['obligationtitle'] + '</h1></div>');
-    html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + event['obligation'].replace(/\n/g, '<br />') + '</h3></div>');
-    html += ('<div part="detail-summary-content" class="pl-20 pr-20">' + ('<sf-i-elastic-text text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+    html += '<div class="d-flex justify-between m-20">';
+    html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
     html += '</div>';
 
-    html += '<br />';
+    html += '<div class="m-20">';
 
-    html += '<div class="accordian-section section-basic pl-20 pr-20" part="accordian-section">';
-    html += '<div class="d-flex justify-between accordian-head head-basic cursor" part="accordian-head">';
-    html += '<h3>Basic Information</h3>'
-    html += '<h3 class="head-indicator-basic">-</h3>'
-    html += '</div>';
-    html += '<div class="d-flex flex-wrap accordian-body body-basic" part="accordian-body">';
+    html += '<div class="d-flex flex-col">';
 
-    for (var i = 0; i < basicFields.length; i++) {
+    for (var i = 0; i < comments.length; i++) {
+      html += '<div part="commentbox" class="d-flex commentbox ' + (comments[i].author + "").toLowerCase() + 'box">';
+      html += '<div class="mr-20 d-flex flex-col align-end"><span part="comment-username">' + (comments[i].username != null ? comments[i].username : '') + '</span><span part="td-head">' + comments[i].author + '</span>' + ((i === (comments.length - 1) && this.enableDeleteLatestReport) ? '<br /><button class="mt-5 button-delete" part="button">Delete</button>' : '') + '</div>';
 
-      if (!this.getEventPreviewFields().includes(basicFields[i])) {
+      const onlyCommentText = (comments[i].comment + "").replace(/ *\([^)]*\) */g, "").trim();
+      try {
 
-        if (!this.getEventHideFields().includes(basicFields[i])) {
+        const jsonComments = JSON.parse(onlyCommentText);
 
-          console.log('basicFields', event[basicFields[i]] + "");
-          if ((event[basicFields[i]] + "").indexOf("[") >= 0) {
-            html += '<div class="m-20">';
-            html += '<div part="detail-head"><strong>' + basicFields[i] + '</strong></div>'
-            html += this.getEventTexts(basicFields[i], JSON.parse(event[basicFields[i]]), event).replace(/ *\([^)]*\) */g, "").trim();
-            html += '</div>';
-          } else {
-            html += '<div class="m-20">';
-            html += '<div part="detail-head"><strong>' + basicFields[i] + '</strong></div>'
-            html += '<sf-i-elastic-text text="' + (event[basicFields[i]] + "").replace(/"/g, "").replace(/ *\([^)]*\) */g, "").trim().split(';')[0] + '" minLength="80"></sf-i-elastic-text>';
-            html += '</div>';
+        if (Util.isInteger(jsonComments)) {
+          html += '<div class="">' + comments[i].comment + '<br /><small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
+        } else {
+          //console.log('json comments', jsonComments);
+          var htmlTable = '';
+          for (var j = 0; j < Object.keys(jsonComments).length; j++) {
+            htmlTable += '<div class="mb-20">';
+            htmlTable += ('<div part="detail-head">' + Object.keys(jsonComments)[j] + '</div>');
+            htmlTable += ('<sf-i-elastic-text text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
+            htmlTable += '</div>';
           }
-
+          html += '<div class="">' + htmlTable + '<small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
         }
-      }
-
-    }
 
-    if (this.mode == "consumer") {
-      if (approved) {
-        html += '<div class="m-20">';
-        html += '<div part="detail-head"><strong>Approved</strong></div>'
-        html += '<span class="material-icons color-done">check_circle</span>'
-        html += '</div>';
+      } catch (e: any) {
+        //console.log('json comments exception', comments[i]);
+        html += '<div class="">' + comments[i].comment + '<br /><small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
       }
-    }
 
-    if (docs != null) {
-      html += '<div class="m-20">';
-      html += '<div part="detail-head"><strong>Documents</strong></div>'
-      html += '<span class="material-icons muted">description</span>'
-      html += docs.length
       html += '</div>';
     }
-
-    if (comments != null) {
-      html += '<div class="m-20">';
-      html += '<div part="detail-head"><strong>Comments</strong></div>'
-      html += '<span class="material-icons muted">forum</span>'
-      html += comments.length
-      html += '</div>';
+    if (comments.length === 0) {
+      html += '<div><strong>No comments yet!</strong></div>';
     }
 
-    html += '<div class="m-20">';
-    html += '<div part="detail-head"><strong>Reporters</strong></div>'
-    html += this.getReporterDetailStringFromEvent(event);
     html += '</div>';
 
-    html += '<div class="m-20">';
-    html += '<div part="detail-head"><strong>Approvers</strong></div>'
-    html += this.getApproverDetailStringFromEvent(event);
     html += '</div>';
+    console.log('selected event', JSON.stringify(listEvent));
+    (this._SfDetailContainer as HTMLDivElement).innerHTML = html;
+    (this._SfDetailContainer as HTMLDivElement).style.display = 'block';
 
-    html += '</div>';
-    html += '</div>';
+    let usermap = Util.getUsermap();
 
+    let sfireporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#detail-reporting') as SfIReporting
+    sfireporting.usermap = JSON.stringify(usermap);
+    sfireporting.selectedItem = listEvent;
+    sfireporting.editdisable = "true"
+    setTimeout(() => {
+      console.log('sfireporting', sfireporting._SfReportingContainer);
+      console.log('sfireporting', sfireporting.selectedItem);
+      sfireporting.loadMode();
+    }, 500);
 
-    html += '<div class="accordian-section section-statute pl-20 pr-20" part="accordian-section">';
-    html += '<div class="d-flex justify-between accordian-head head-statute cursor" part="accordian-head">';
-    html += '<h3>Statute Information</h3>'
+    sfireporting.addEventListener('valueChanged', () => {
+      sfireporting.classList.remove('hide');
+      ((this._SfDetailContainer as HTMLDivElement).querySelector('#shimmer-container-agreements') as HTMLDivElement).classList.add('hide');
+    });
+    let reportingSchemaJson = "";
+    let reportingSchemaValues = ""
+    if (listEvent.reportformatschema != null) {
+      reportingSchemaJson = listEvent.reportformatschema
+      reportingSchemaValues = listEvent.reportformatvalues
+    } else if (listEvent.customreporting != null) {
+      reportingSchemaJson = listEvent.customreporting
+    }
+    if (listEvent.customreporting != null || listEvent.reportformatschema != null) {
+      let reportingHtml = '<sf-i-reporting id="reporting-reporting" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-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" mode="edit" flow="reporting" name="RCM Resource Reporting" formviewclass="flex-wrap" showterminate="true" projectid="' + this.projectId + '"></sf-i-reporting>'
+
+      let reportFormatContainer = (this._SfDetailContainer as HTMLDivElement).querySelector('#report-format-container') as HTMLDivElement;
+      if (reportFormatContainer != null) {
+        reportFormatContainer.innerHTML = reportingHtml;
+      }
+
+    }
+    let reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting') as SfIReporting
+
+    if (reportingSchemaJson != "" && reportingReporting != null) {
+      reportingReporting.configjson = reportingSchemaJson;
+      if (reportingSchemaValues != "") reportingReporting.prepopulateValJson = reportingSchemaValues
+      reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
+      reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
+      reportingReporting.flow = "reporting"
+      setTimeout(() => {
+        reportingReporting.loadMode();
+        console.log('list-customreporting', reportingSchemaJson);
+        console.log('list-customreporting1', reportingSchemaValues);
+        console.log('list-customreporting2', reportingReporting.mode);
+      }, 500)
+    }
+
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close')?.addEventListener('click', () => {
+
+      (this._SfDetailContainer as HTMLDivElement).innerHTML = '';
+      (this._SfDetailContainer as HTMLDivElement).style.display = 'none';
+
+    });
+
+    (this._SfDetailContainer as HTMLDivElement).querySelector('.button-delete')?.addEventListener('click', async () => {
+
+      // await this.fetchDeleteReview(listEvent["id"], mmddyyyy, entityId, locationId);
+      // this.setSuccess('Deleted successfully!')
+      // setTimeout(() => {
+      //   this.clearMessages()
+      // }, 3000);
+      // //console.log('deleted', resultDelete);
+      // if(this.getCurrentTab() == this.TAB_CUSTOM) {
+      //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
+      // } else {
+      //   if(currentColumnButton != null) {
+      //     currentColumnButton.click();
+      //   }
+      // }
+
+      console.log('delete review clicked')
+
+      var clickEvent = new MouseEvent("click", {
+        "view": window,
+        "bubbles": true,
+        "cancelable": false
+      });
+      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
+
+    });
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-auto-approve')?.addEventListener('click', async () => {
+      if (this.selectedItemIds.length === 0) {
+        console.log('audto approve single')
+      } else {
+        console.log('auto approve bulk')
+      }
+      //console.log('deleted', resultDelete);
+      if (this.getCurrentTab() == this.TAB_CUSTOM) {
+        this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
+      } else {
+        // if(currentColumnButton != null) {
+        //   currentColumnButton.click();
+        // }
+      }
+
+      var clickEvent = new MouseEvent("click", {
+        "view": window,
+        "bubbles": true,
+        "cancelable": false
+      });
+      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
+
+    });
+
+    if (this.mode == "consumer" || this.mode == "next") {
+
+      (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-approve')?.addEventListener('click', async (ev: any) => {
+        let buttonClick = ev.target as HTMLButtonElement
+        buttonClick.innerHTML = "Saving..."
+        const comments = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approver-comments') as HTMLInputElement).value;
+        const approved = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement).checked;
+        let currStatus = this.getCompletenessStatus(listEvent);
+        let newEvent = { ...listEvent };
+        newEvent.comments = comments;
+        newEvent.approved = approved;
+        let newStatus = this.getCompletenessStatus(newEvent);
+        if (currStatus == newStatus) {
+          buttonClick.innerHTML = "Save"
+          this.setError(approved ? 'Already Approved!' : 'Already Rejected!');
+          setTimeout(() => {
+            this.clearMessages();
+          }, 3000);
+          return;
+        }
+        let reportformatvalues = ""
+        let reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting') as SfIReporting
+        console.log('renew reporting', reportingReporting)
+        if (reportingReporting != null) {
+          reportformatvalues = JSON.stringify(reportingReporting!.selectedValues()) ?? "";
+        }
+        var clickEvent = new MouseEvent("click", {
+          "view": window,
+          "bubbles": true,
+          "cancelable": false
+        });
+        ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
+
+        // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved)
+        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 (approved) {
+              await this.renewRCMResource(listEvent, reportformatvalues);
+            } else {
+              console.log('renew reporting', reportformatvalues)
+            }
+            for (var p = 0; p < this.events[mmdd].length; p++) {
+              if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                this.events[mmdd][p].approved = approved
+                this.events[mmdd][p].terminated = (JSON.parse(reportformatvalues).terminated) ?? false
+                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() })
+                this.events[mmdd][p].lastupdated = new Date().toString()
+              }
+            }
+            if (this.recentlyReported[mmdd] == null) {
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(listEvent)
+            console.log('review single')
+          }
+        } else {
+          let bulkBodyReview = []
+          for (var k = 0; k < this.selectedItemIds.length; k++) {
+
+            const selectedId = this.selectedItemIds[k];
+            //console.log('selectedid', selectedId);
+            entityId = selectedId.split('-')[7].replace(/_/g, '-');
+            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+            const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+            mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+
+            //console.log(entityId, locationId, eventId, mmddyyyy);
+            bulkBodyReview.push({
+              "mmddyyyy": mmddyyyy,
+              "projectid": this.projectId,
+              "type": "review",
+              "eventid": eventId,
+              "comments": comments,
+              "approved": approved,
+              "entityid": entityId,
+              "locationid": locationId,
+              "username": this.userName,
+              "userid": this.userProfileId,
+              "userrole": this.myRole,
+              "year": this.calendarStartYYYY,
+              "module": listEvent.module ?? "events"
+            })
+            // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
+
+            // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
+            // await this.sleep(2000);
+            // this.clearMessages();
+
+          }
+          await this.uploadReviewsBulk(bulkBodyReview);
+
+          for (var k = 0; k < this.selectedItemIds.length; k++) {
+
+            const selectedId = this.selectedItemIds[k];
+            //console.log('selectedid', selectedId);
+            entityId = selectedId.split('-')[7].replace(/_/g, '-');
+            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+            const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+            mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+            let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+            for (var p = 0; p < this.events[mmdd].length; p++) {
+              if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+
+                this.events[mmdd][p].isbulk = true
+                flagBulk = true;
+                if (this.recentlyReported[mmdd] == null) {
+                  this.recentlyReported[mmdd] = []
+                }
+                this.recentlyReported[mmdd].push(this.events[mmdd][p])
+              }
+            }
+          }
+          console.log('review bulk')
+        }
+
+        if (this.mode == "next") {
+          // this.fetchNext(this.nextPage)
+          this.renderRoleTabsNext(this.nextPage)
+        } else {
+          // if(this.getCurrentTab() == this.TAB_CUSTOM) {
+          //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
+          // } else 
+          if (this.getCurrentTab() == this.TAB_FIND) {
+            const searchString = ((this._SfFindContainer as HTMLDivElement).querySelector('#stream-search') as HTMLInputElement).value;
+            this.processFindSelection((this._SfFindContainer as HTMLDivElement), searchString);
+          } else {
+            if (this.selectedItemIds.length > 0) {
+              await this.fetchBulkReportingData();
+            }
+            this.renderAppropriateStream(this.sdate, this.edate, true, flagBulk);
+            var clickEvent = new MouseEvent("click", {
+              "view": window,
+              "bubbles": true,
+              "cancelable": false
+            });
+            ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)?.dispatchEvent(clickEvent);
+
+            // if(currentColumnButton != null) {
+            //   currentColumnButton.click();
+            // }
+          }
+        }
+
+      });
+
+      (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-audit')?.addEventListener('click', async (ev: any) => {
+        let buttonClick = ev.target as HTMLButtonElement
+        buttonClick.innerHTML = "Saving..."
+        const comments = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-auditor-comments') as HTMLInputElement).value;
+        const approved = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement).checked;
+        let currStatus = this.getCompletenessStatus(listEvent);
+        let newEvent = { ...listEvent };
+        newEvent.comments = comments;
+        newEvent.approved = approved;
+        let newStatus = this.getCompletenessStatus(newEvent);
+        if (currStatus == newStatus) {
+          buttonClick.innerHTML = "Save"
+          this.setError(approved ? 'Already Approved!' : 'Already Rejected!');
+          setTimeout(() => {
+            this.clearMessages();
+          }, 3000);
+          return;
+        }
+        if (comments.trim().length === 0) {
+          buttonClick.innerHTML = "Save"
+          this.setError('Comments cannot be blank!');
+          setTimeout(() => {
+            this.clearMessages();
+          }, 3000);
+
+        } else {
+          let flagBulk = false;
+          if (this.selectedItemIds.length <= 1) {
+
+            if (await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
+              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
+                  this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() })
+                  this.events[mmdd][p].lastupdated = new Date().toString()
+                }
+              }
+              if (this.recentlyReported[mmdd] == null) {
+                this.recentlyReported[mmdd] = []
+              }
+              this.recentlyReported[mmdd].push(listEvent)
+            }
+            console.log('uploadaudit single')
+          } else {
+            let bulkBodyAudit = []
+            for (var k = 0; k < this.selectedItemIds.length; k++) {
+
+              const selectedId = this.selectedItemIds[k];
+              //console.log('selectedid', selectedId);
+
+              entityId = selectedId.split('-')[7].replace(/_/g, '-');
+              locationId = selectedId.split('-')[8].replace(/_/g, '-');
+              const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+              mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+
+              //console.log(entityId, locationId, eventId, mmddyyyy);
+              bulkBodyAudit.push({
+                "mmddyyyy": mmddyyyy,
+                "projectid": this.projectId,
+                "type": "audit",
+                "eventid": eventId,
+                "comments": comments,
+                "approved": approved,
+                "entityid": entityId,
+                "locationid": locationId,
+                "username": this.userName,
+                "userid": this.userProfileId,
+                "userrole": this.myRole,
+                "year": this.calendarStartYYYY,
+                "module": listEvent.module ?? "events"
+              })
+              // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
+
+            }
+
+            await this.uploadAuditsBulk(bulkBodyAudit);
+            for (var k = 0; k < this.selectedItemIds.length; k++) {
+
+              const selectedId = this.selectedItemIds[k];
+              //console.log('selectedid', selectedId);
+              let entityId = selectedId.split('-')[7].replace(/_/g, '-');
+              let locationId = selectedId.split('-')[8].replace(/_/g, '-');
+              const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+              mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+              let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+              for (var p = 0; p < this.events[mmdd].length; p++) {
+                if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+
+                  this.events[mmdd][p].isbulk = true
+                  flagBulk = true;
+                  if (this.recentlyReported[mmdd] == null) {
+                    this.recentlyReported[mmdd] = []
+                  }
+                  this.recentlyReported[mmdd].push(this.events[mmdd][p])
+                }
+              }
+            }
+
+            console.log('uploadAudit bulk')
+
+          }
+
+          var clickEvent = new MouseEvent("click", {
+            "view": window,
+            "bubbles": true,
+            "cancelable": false
+          });
+          ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
+          if (this.mode == "next") {
+            this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
+          } else {
+            // if(this.getCurrentTab() == this.TAB_CUSTOM) {
+            //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
+            // } else 
+            if (this.getCurrentTab() == this.TAB_FIND) {
+              const searchString = ((this._SfFindContainer as HTMLDivElement).querySelector('#stream-search') as HTMLInputElement).value;
+              this.processFindSelection((this._SfFindContainer as HTMLDivElement), searchString);
+            } else {
+              if (this.selectedItemIds.length > 0) {
+                await this.fetchBulkReportingData();
+              }
+              this.renderAppropriateStream(this.sdate, this.edate, true, flagBulk);
+              // if(currentColumnButton != null) {
+              //   currentColumnButton.click();
+              // }
+            }
+          }
+
+        }
+
+
+
+      });
+
+      if (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) {
+
+        if (approved) {
+
+          if (((this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report') as HTMLElement) != null) {
+            ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report') as HTMLElement).style.visibility = 'hidden';
+          }
+
+
+        } else {
+
+          if (((this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report') as HTMLElement) != null) {
+
+
+            ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report') as HTMLElement).style.visibility = 'visible';
+
+            (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report')?.addEventListener('click', async (ev: any) => {
+              let buttonClick = ev.target as HTMLButtonElement
+              buttonClick.innerHTML = "Saving..."
+              const reportercomments = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-comments') as HTMLInputElement).value;
+
+              //console.log('reporter comments 1', reportercomments);
+
+              // const reporterdoc = ((((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement) != null) && ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0) ? (new Date(((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
+              const reporterdoc = new Date().getTime() + "";
+              let docs: any[] = [];
+
+              //console.log('reporter comments 2', reportercomments);
+
+              // if(docsOptional.length === 0) {
+              // docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+              // }
+
+              //console.log('docs', docs);
+              let reportformatvalues: string = "";
+              let reportformatschema: string = "";
+              if (listEvent.customreporting != null) {
+                let reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting') as SfIReporting
+                console.log('reportformatvalues', JSON.stringify(reportingReporting.selectedValues()))
+                reportformatvalues = JSON.stringify(reportingReporting!.selectedValues()) ?? "";
+                reportformatschema = reportingReporting!.configjson ?? "";
+              }
+
+              let percentage: string = "100";
+              if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
+                percentage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement).value
+              }
+              // if (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
+
+              //   //console.log('reporter comments 3', reportercomments);
+              //   buttonClick.innerHTML = "Save"
+              //   this.setError('Invalid Percentage!');
+              //   setTimeout(() => {
+              //     this.clearMessages();
+              //   }, 3000);
+
+              // } else {
+              //   if (docs.length === 0 && docsOptional.length === 0) {
+
+              //     //console.log('reporter comments 3', reportercomments);
+              //     buttonClick.innerHTML = "Save"
+              //     this.setError('No documents uploaded!');
+              //     setTimeout(() => {
+              //       this.clearMessages();
+              //     }, 3000);
+
+              //   } else {
+
+              //     //console.log('reporterdoc', reporterdoc);
+
+              //     if (reporterdoc.length === 0) {
+              //       buttonClick.innerHTML = "Save"
+              //       this.setError('Date of completion not selected!');
+              //       setTimeout(() => {
+              //         this.clearMessages();
+              //       }, 3000);
+
+              //     } else if (parseInt(reporterdoc) > new Date().getTime()) {
+              //       buttonClick.innerHTML = "Save"
+              //       this.setError('Date of completion cannot be in future!');
+              //       setTimeout(() => {
+              //         this.clearMessages();
+              //       }, 3000);
+
+              //     } else {
+
+              //console.log('makerscheckers 1', reportercomments);
+
+              if (reportercomments.trim().length === 0) {
+                buttonClick.innerHTML = "Save"
+                this.setError('Comments cannot be blank!');
+                setTimeout(() => {
+                  this.clearMessages();
+                }, 3000);
+
+              } else {
+
+
+                var clickEvent = new MouseEvent("click", {
+                  "view": window,
+                  "bubbles": true,
+                  "cancelable": false
+                });
+
+                ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
+                let flagBulk = false;
+                if (this.selectedItemIds.length <= 1) {
+
+                  if (await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, listEvent.module, percentage, makercheckers)) {
+                    console.log('this.events', this.events);
+                    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].documents = docs
+                        this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() })
+                        this.events[mmdd][p].lastupdated = new Date().toString()
+                      }
+                    }
+                    console.log('uploadReport single')
+                    if (makercheckers.length > 0) {
+
+                      // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                      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 = true
+                          this.events[mmdd][p].terminated = (JSON.parse(reportformatvalues).terminated) ?? false
+                          // this.events[mmdd][p].documents = docs
+                          this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() })
+                          this.events[mmdd][p].lastupdated = new Date().toString()
+                        }
+                      }
+                      await this.renewRCMResource(listEvent, reportformatvalues);
+                      console.log('upload report auto approve single')
+                    }
+                    if (this.recentlyReported[mmdd] == null) {
+                      this.recentlyReported[mmdd] = []
+                    }
+                    this.recentlyReported[mmdd].push(listEvent)
+                  }
+                } else {
+                  let bulkBody = []
+                  let bulkBodyReview = []
+                  for (var k = 0; k < this.selectedItemIds.length; k++) {
+
+                    const selectedId = this.selectedItemIds[k];
+                    //console.log('selectedid', selectedId);
+
+                    const makercheckersL = selectedId.split('-')[5];
+                    entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                    locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                    const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                    mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+
+                    //console.log(entityId, locationId, eventId, mmddyyyy);
+
+                    // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
+                    // if(parseInt(makercheckersL) > 0) {
+                    //   bulkBodyReview.push({ 
+                    //     "mmddyyyy": mmddyyyy,
+                    //     "projectid": this.projectId, 
+                    //     "type": "report",
+                    //     "eventid": eventId,
+                    //     "comments": reportercomments,
+                    //     "dateofcompletion": reporterdoc,
+                    //     "percentage": percentage,
+                    //     "entityid": entityId,
+                    //     "locationid": locationId,
+                    //     "event": null,
+                    //     "docs": JSON.stringify(docs),
+                    //     "approved": true,
+                    //     "username": this.userName,
+                    //     "reportformatvalues": reportformatvalues,
+                    //     "reportformatschema": reportformatschema,
+                    //     "userid": this.userProfileId,
+                    //     "userrole": this.myRole,
+                    //     "year": this.calendarStartYYYY,
+                    //     "module": listEvent.module ?? "events"
+                    //   } )
+                    //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
+
+                    // }else{
+                    bulkBody.push({
+                      "mmddyyyy": mmddyyyy,
+                      "projectid": this.projectId,
+                      "type": "report",
+                      "eventid": eventId,
+                      "comments": reportercomments,
+                      "dateofcompletion": reporterdoc,
+                      "percentage": percentage,
+                      "entityid": entityId,
+                      "locationid": locationId,
+                      "event": null,
+                      "docs": JSON.stringify(docs),
+                      "username": this.userName,
+                      "reportformatvalues": reportformatvalues,
+                      "reportformatschema": reportformatschema,
+                      "userid": this.userProfileId,
+                      "userrole": this.myRole,
+                      "year": this.calendarStartYYYY,
+                      "module": listEvent.module ?? "events",
+                      "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
+                    })
+                    // }
+
+                    // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
+                    // await this.sleep(2000);
+                    // this.clearMessages();
+
+                  }
+
+                  // await this.uploadReportsBulk(bulkBody);
+                  // await this.fetchBulkReportingData();
+                  if (bulkBody.length > 0) {
+                    await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
+                  }
+
+                  // if(bulkBodyReview.length > 0){
+                  //   await this.uploadReportsReviewsBulk(bulkBodyReview)
+                  // }
+                  await this.fetchBulkReportingData();
+                  console.log('uploadReport bulk')
+                  for (var k = 0; k < this.selectedItemIds.length; k++) {
+
+                    const selectedId = this.selectedItemIds[k];
+                    //console.log('selectedid', selectedId);
+                    let entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                    let locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                    const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                    mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+                    let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+                    for (var p = 0; p < this.events[mmdd].length; p++) {
+                      if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+
+                        this.events[mmdd][p].isbulk = true
+                        flagBulk = true;
+                        if (this.recentlyReported[mmdd] == null) {
+                          this.recentlyReported[mmdd] = []
+                        }
+                        this.recentlyReported[mmdd].push(this.events[mmdd][p])
+                      }
+                    }
+                  }
+
+                }
+
+                if (this.mode == "next") {
+                  this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
+                } else {
+                  // if(this.getCurrentTab() == this.TAB_CUSTOM) {
+                  //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
+                  // } else 
+                  if (this.getCurrentTab() == this.TAB_FIND) {
+                    const searchString = ((this._SfFindContainer as HTMLDivElement).querySelector('#stream-search') as HTMLInputElement).value;
+                    this.processFindSelection((this._SfFindContainer as HTMLDivElement), searchString);
+                  } else {
+                    if (this.selectedItemIds.length > 0) {
+                      await this.fetchBulkReportingData();
+                    }
+                    this.renderAppropriateStream(this.sdate, this.edate, true, flagBulk)
+                    // if(currentColumnButton != null) {
+                    //   currentColumnButton.click();
+                    // }
+                  }
+                }
+
+              }
+
+
+              //     }
+              //   }
+              // }
+            });
+
+          }
+
+        }
+
+      }
+
+      if (this._SfUploader[0] != null) {
+        (this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "none"
+        this._SfUploader[0].querySelector('#uploader').addEventListener('analysisInProgress', (_ev: any) => {
+          console.log('uploader analysisInProgress', _ev);
+          (this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "block"
+        });
+        this._SfUploader[0].querySelector('#uploader').addEventListener('analysisCompleted', (_ev: any) => {
+          console.log('uploader analysisInProgress', _ev);
+          (this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "none"
+        });
+
+
+        //console.log('documentType checking', documentType);
+
+        if (documentType != null) {
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.docType = documentType;
+        }
+
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.prepopulatedInputArr = JSON.stringify([]);
+        console.log('uploader', (this._SfUploader[0].querySelector('#uploader') as SfIUploader));
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
+
+        if (docs.length > 0) {
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.prepopulatedInputArr = JSON.stringify(docs);
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
+        }
+
+        if (this.myRole == this.TAB_APPROVER || approved) {
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.readOnly = true;
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
+        } else {
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.readOnly = false;
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
+        }
+
+        const dataPassthrough = {
+          projectId: this.projectId,
+          countryId: this.countryId,
+          entityId: listEvent.entityid,
+          locationId: listEvent.locationid,
+          mmddyyyy: mmddyyyy,
+          complianceId: listEvent['id'],
+          path: "uploadextract"
+        };
+
+        const callbackUrlHost = "8icpy39ru0.execute-api.us-east-1.amazonaws.com";
+        const callbackUrlPath = "test/uploadextract";
+
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.projectId = this.projectId;
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.dataPassthrough = JSON.stringify(dataPassthrough);
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.callbackUrlHost = callbackUrlHost;
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.callbackUrlPath = callbackUrlPath;
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
+
+      }
+
+
+
+      //console.log('approved 1', event["approved"], this.myRole, this.TAB_APPROVER);
+      if (this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_VIEWER || this.myRole == this.TAB_AUDITOR || this.myRole == this.TAB_FUNCTION_HEAD) {
+        //console.log('approved 1', event["approved"], this.myRole, this.TAB_APPROVER);
+        if (listEvent["approved"] != null) {
+          if (listEvent["approved"] === true) {
+            //console.log('approved 2', event["approved"], this.myRole, this.TAB_APPROVER);
+            if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement) != null) {
+              ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement).checked = true;
+            }
+            if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-no') as HTMLInputElement) != null) {
+              ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-no') as HTMLInputElement).checked = false;
+            }
+          } else {
+            if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement) != null) {
+              ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement)!.checked = false;
+            }
+            if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-no') as HTMLInputElement) != null) {
+              ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-no') as HTMLInputElement)!.checked = true;
+            }
+          }
+        } else {
+          if ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement != null) {
+            ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement).checked = false;
+          }
+          if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-no') as HTMLInputElement) != null) {
+            ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-no') as HTMLInputElement).checked = true;
+          }
+
+        }
+      }
+
+    }
+  }
+
+  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null) => {
+    console.log('listEvent', listEvent, listEvent.id)
+    let url = "https://" + this.apiId + "/getalleventdetails";
+
+    //console.log('fetch calendar url', url);
+    let urlBody: any = { "projectid": this.projectId, "userprofileid": this.userProfileId, "role": this.myRole, "eventid": listEvent.id, "entityid": listEvent.entityid, "locationid": listEvent.locationid, "mmddyyyy": mmddyyyy, "year": this.getFinancialYear(mmddyyyy) };
+
+    //console.log('urlbody', urlBody);
+
+    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 (flagUploadGuidance) {
+        if (listEventContainer != null) {
+          let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+          if (this.events[mmdd] != null) {
+            for (var p = 0; p < this.events[mmdd].length; p++) {
+              if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == listEvent.locationid && this.events[mmdd][p].entityid == listEvent.entityid) {
+                this.events[mmdd][p].uploadguidance = jsonRespose.data.uploadguidance
+              }
+            }
+          }
+          this.renderListReporting(listEventContainer, jsonRespose.data, mmddyyyy, eventsContainer)
+        }
+      } else {
+        this.renderEventDetail(jsonRespose.data, mmddyyyy, currentColumnButton, eventsContainer);
+      }
+
+    } 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);
+      }
+
+    }
+  }
+
+  renderEventDetail = (event: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement) => {
+    console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
+
+    let comments, docs, approved, /*dateOfCompletion,*/ makercheckers: Array<string>, docsOptional, documentType;
+    let entityId: string = "";
+    let locationId: string = "";
+    let statuteName: string = "";
+    let reportformatName: string = "";
+    let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+    entityId = event.entityid;
+    locationId = event.locationid;
+    // let completeness = this.getCompletenessStatus(event);
+    comments = event['comments'] == null ? [] : (event['comments']);
+    docs = event['documents'] == null ? [] : event['documents'] == null ? [] : (event['documents']);
+    approved = event['approved'] == null ? false : event['approved'] == null ? false : event['approved'];
+    // dateOfCompletion = event['dateofcompletion'] == null ? '' : event['dateofcompletion'] == null ? '' : event['dateofcompletion'];
+    makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'] == null ? [] : event['makercheckers'];
+    docsOptional = event['docs'] == null ? [] : event['docs'] == null ? [] : event['docs'];
+    documentType = event['documenttype'] == null ? null : event['documenttype'][0] == null ? null : event['documenttype'][0].split(" ")[0];
+
+    statuteName = event['statute'][0].trim();
+    if (event['reportformat'] != null) {
+      reportformatName = (event['reportformat'][0] ?? "").trim().replace('&amp;', '&');
+    }
+
+    console.log('event detail', event, statuteName);
+    //console.log('event detail comments', comments);
+    //console.log('event dateofcompletion', dateOfCompletion);
+    //console.log('event detail documenttype', documentType);
+    const basicFields = ['id', 'shortid', 'entityname', 'locationname', 'functions'];
+    const statuteFields = ['jurisdiction', 'country', 'state', 'category', 'subcategory', 'statute'];
+    const complianceFields = ['specificity', 'reference', 'obligation', 'penalty', 'authority', 'frequency', 'subfrequency', 'obligationtype', 'duedate', 'applicability', 'form', 'additionalurls', 'adhocquestion', 'adhocquestionschedule', 'adhocinstances', 'uploadguidance', 'attachment'];
+    const grcFields = ['internalcontrols', 'firstlineofdefence', 'secondlineofdefence', 'thirdlineofdefence', 'risk', 'riskarea'];
+
+    let listReportingContainers = eventsContainer.querySelectorAll('.list-reporting-container') as NodeListOf<HTMLDivElement>
+    for (let tempReportingContainer of listReportingContainers) {
+      tempReportingContainer.style.display = 'none';
+      tempReportingContainer.innerHTML = '';
+    }
+    let buttonListReportings = eventsContainer.querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>
+    for (let buttonListReporting of buttonListReportings) {
+      buttonListReporting.setAttribute('part', 'button-list-reporting')
+    }
+    let streamEventTitles = eventsContainer.querySelectorAll('.stream-event-title') as NodeListOf<SfIElasticText>
+    for (let streamEventTitle of streamEventTitles) {
+      streamEventTitle.removeAttribute('part')
+    }
+    var html = `
+    
+      <div part="compliance-detail-title" class="d-flex justify-between">
+        <button part="button-icon" class="material-icons invisible">close</button>
+        <h3 part="results-title" class="m-0">Compliance Details</h3>
+        <button id="button-detail-close" part="button-icon" class="material-icons">close</button>
+      </div>
+    
+    `;
+
+    if (this.selectedItemIds.length > 1) {
+
+      html += `
+    
+        <div class="d-flex justify-between m-20">
+          <h4 class="m-0">${this.selectedItemIds.length - 1} other ` + ((this.selectedItemIds.length - 1) === 1 ? `item` : `items`) + ` also selected</h4>
+        </div>
+    
+      `;
+
+    }
+
+    html += '<div class="accordian-container m-20 pb-20" part="accordian-container">';
+
+    html += '<div part="detail-summary">';
+    html += ('<div part="detail-summary-title" class="pl-20 pr-20"><h1>' + event['obligationtitle'] + '</h1></div>');
+    html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + event['obligation'].replace(/\n/g, '<br />') + '</h3></div>');
+    html += ('<div part="detail-summary-content" class="pl-20 pr-20">' + ('<sf-i-elastic-text text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+    html += '</div>';
+
+    html += '<br />';
+
+    html += '<div class="accordian-section section-basic pl-20 pr-20" part="accordian-section">';
+    html += '<div class="d-flex justify-between accordian-head head-basic cursor" part="accordian-head">';
+    html += '<h3>Basic Information</h3>'
+    html += '<h3 class="head-indicator-basic">-</h3>'
+    html += '</div>';
+    html += '<div class="d-flex flex-wrap accordian-body body-basic" part="accordian-body">';
+
+    for (var i = 0; i < basicFields.length; i++) {
+
+      if (!this.getEventPreviewFields().includes(basicFields[i])) {
+
+        if (!this.getEventHideFields().includes(basicFields[i])) {
+
+          console.log('basicFields', event[basicFields[i]] + "");
+          if ((event[basicFields[i]] + "").indexOf("[") >= 0) {
+            html += '<div class="m-20">';
+            html += '<div part="detail-head"><strong>' + basicFields[i] + '</strong></div>'
+            html += this.getEventTexts(basicFields[i], JSON.parse(event[basicFields[i]]), event).replace(/ *\([^)]*\) */g, "").trim();
+            html += '</div>';
+          } else {
+            html += '<div class="m-20">';
+            html += '<div part="detail-head"><strong>' + basicFields[i] + '</strong></div>'
+            html += '<sf-i-elastic-text text="' + (event[basicFields[i]] + "").replace(/"/g, "").replace(/ *\([^)]*\) */g, "").trim().split(';')[0] + '" minLength="80"></sf-i-elastic-text>';
+            html += '</div>';
+          }
+
+        }
+      }
+
+    }
+
+    if (this.mode == "consumer") {
+      if (approved) {
+        html += '<div class="m-20">';
+        html += '<div part="detail-head"><strong>Approved</strong></div>'
+        html += '<span class="material-icons color-done">check_circle</span>'
+        html += '</div>';
+      }
+    }
+
+    if (docs != null) {
+      html += '<div class="m-20">';
+      html += '<div part="detail-head"><strong>Documents</strong></div>'
+      html += '<span class="material-icons muted">description</span>'
+      html += docs.length
+      html += '</div>';
+    }
+
+    if (comments != null) {
+      html += '<div class="m-20">';
+      html += '<div part="detail-head"><strong>Comments</strong></div>'
+      html += '<span class="material-icons muted">forum</span>'
+      html += comments.length
+      html += '</div>';
+    }
+
+    html += '<div class="m-20">';
+    html += '<div part="detail-head"><strong>Reporters</strong></div>'
+    html += this.getReporterDetailStringFromEvent(event);
+    html += '</div>';
+
+    html += '<div class="m-20">';
+    html += '<div part="detail-head"><strong>Approvers</strong></div>'
+    html += this.getApproverDetailStringFromEvent(event);
+    html += '</div>';
+
+    html += '</div>';
+    html += '</div>';
+
+
+    html += '<div class="accordian-section section-statute pl-20 pr-20" part="accordian-section">';
+    html += '<div class="d-flex justify-between accordian-head head-statute cursor" part="accordian-head">';
+    html += '<h3>Statute Information</h3>'
     html += '<h3 class="head-indicator-statute">-</h3>'
     html += '</div>';
     html += '<div class="d-flex flex-wrap accordian-body body-statute" part="accordian-body">';
@@ -15940,6 +16972,11 @@ export class SfIEvents extends LitElement {
     // for(let attachmentUploader of attachmentUploaders){
     //   attachmentUploader.loadMode();
     // }
+
+    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;
     (this._SfDetailContainer as HTMLDivElement).querySelector('.button-delete')?.addEventListener('click', async () => {
 
       await this.fetchDeleteReview(event["id"], mmddyyyy, entityId, locationId);
@@ -18261,17 +19298,26 @@ export class SfIEvents extends LitElement {
           console.log('csv data', tempArr)
           let changeCount = 0;
           for (let [i, obj] of tempArr.entries()) {
-            if (JSON.stringify(taggingArray.data.mappings.mappings[i]) !== JSON.stringify(obj)) {
+            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){
+              console.log('changed onboarding item', tempObj, obj, JSON.stringify(tempObj) !== JSON.stringify(obj))
+            }
+            if (JSON.stringify(tempObj) !== JSON.stringify(obj)) {
               // console.log('item changed', taggingArray.data.mappings.mappings[i], obj)
               let changedId = ""
               for (let [k, col] of uniqCols.entries()) {
-                changedId += taggingArray.data.mappings.mappings[i][col];
+                changedId += tempObj[col];
                 if (k < (uniqCols.length - 1)) {
                   changedId += ";"
                 }
               }
               // this.changedOnboardingItemIds.push(taggingArray.data.mappings.mappings[i].id + ";" + taggingArray.data.mappings.mappings[i].entityid + ";" + taggingArray.data.mappings.mappings[i].locationid)
               this.changedOnboardingItemIds.push(changedId)
+              // if(changedId.indexOf("6fb88c28-d572-4b55-b16c-957a519733b9") >= 0){
+              //   console.log('changed onboarding item', tempObj, obj)
+              // }
               changeCount++
             }
           }
@@ -19583,7 +20629,7 @@ export class SfIEvents extends LitElement {
 
     //console.log('rendering triggers...', (this._SfOnboardingTriggersContainer as HTMLDivElement).innerHTML);
 
-    this.renderTaggingTable((this._SfOnboardingTriggersListContainer as HTMLDivElement), mappedSerializedAlertSchedules, mappedTriggers, ["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, "", "");
 
   }
 
@@ -19596,7 +20642,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingInternalControlsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingInternalControlsListContainer as HTMLDivElement), mappedSerializedTriggers, mappedInternalControls, ["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, "", "");
 
   }
 
@@ -19609,7 +20655,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingActivationsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingActivationListContainer as HTMLDivElement), mappedSerializedExtensions, mappedActivations, ["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, "", "");
 
   }
 
@@ -19622,7 +20668,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingInvalidationsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingInvalidationListContainer as HTMLDivElement), mappedSerializedExtensions, mappedInvalidations, ["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, "", "");
 
   }
 
@@ -19635,7 +20681,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingAlertSchedulesContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingAlertSchedulesListContainer as HTMLDivElement), mappedSerializedExtensions, mappedAlertSchedules, ["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, "", "");
 
   }
 
@@ -19648,7 +20694,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingExtensionsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingExtensionsListContainer as HTMLDivElement), mappedSerializedDuedates, mappedExtensions, ["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, "", "");
 
   }
 
@@ -19661,7 +20707,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingDuedatesContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingDuedatesListContainer as HTMLDivElement), mappedSerializedMakerCheckers, mappedDuedates, ["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, "", "");
 
   }
 
@@ -19674,7 +20720,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingReportersContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingReportersListContainer as HTMLDivElement), mappedSerializedTags, mappedReporters, ["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", "");
 
   }
 
@@ -19687,7 +20733,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingApproversContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingApproversListContainer as HTMLDivElement), mappedSerializedReporters, mappedApprovers, ["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", "");
 
   }
 
@@ -19700,7 +20746,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingFunctionHeadsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingFunctionHeadsListContainer as HTMLDivElement), mappedSerializedApprovers, mappedFunctionHeads, ["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", "");
 
   }
 
@@ -19713,7 +20759,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingMakerCheckersContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingMakerCheckersListContainer as HTMLDivElement), mappedSerializedDocs, mappedMakerCheckers, ["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, "", "");
 
   }
 
@@ -19726,7 +20772,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingDocsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingDocsListContainer as HTMLDivElement), mappedSerializedViewers, mappedDocs, ["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, "", "");
 
   }
 
@@ -19741,7 +20787,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingAuditorsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingAuditorsListContainer as HTMLDivElement), mappedSerializedFunctionheads, mappedAuditors, ["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", "");
 
   }
 
@@ -19756,7 +20802,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingViewersContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingViewersListContainer as HTMLDivElement), mappedSerializedAuditors, mappedViewers, ["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", "");
 
   }
 
@@ -19769,7 +20815,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingTagsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingTagsListContainer as HTMLDivElement), mappedSerializedFunctions, mappedTags, ["obligationtitle", "obligationtype"], this.uploadTagsMapping, this.loadOnboardingTags, "tags", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Tag", ["tags"], tagsJobs, "tagtype", ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.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, "", "");
 
   }
 
@@ -19790,7 +20836,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingFunctionsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingFunctionsListContainer as HTMLDivElement), mappedSerializedLocations, mappedFunctions, ["obligationtitle", "obligationtype"], this.uploadFunctionsMapping, this.loadOnboardingFunctions, "functions", ["id", "countryname", "entityname", "locationname"], this.apiIdTags, "&Function", ["functions"], functionsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.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, "", "");
 
   }
 
@@ -19803,7 +20849,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingLocationsContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingLocationsListContainer as HTMLDivElement), mappedSerializedEntities, mappedLocations, ["shortid","firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingLocationsListContainer as HTMLDivElement), mappedSerializedEntities, mappedLocations, ["shortid", "applicability", "firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "reference"], this.uploadLocationsMapping, this.loadOnboardingLocations, "locations", ["id", "countryname", "entityname"], this.apiIdTags, "&Location", ["locations"], locationsJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -19964,7 +21010,7 @@ export class SfIEvents extends LitElement {
 
     (this._SfOnboardingEntitiesContainer as HTMLDivElement).innerHTML = html;
 
-    this.renderTaggingTable((this._SfOnboardingEntitiesListContainer as HTMLDivElement), mappedSerializedCountries, mappedEntities, ["shortid","firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
+    this.renderTaggingTable((this._SfOnboardingEntitiesListContainer as HTMLDivElement), mappedSerializedCountries, mappedEntities, ["shortid", "applicability", "firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute"], this.uploadEntitiesMapping, this.loadOnboardingEntities, "entities", ["id", "countryname"], this.apiIdTags, "&Entity", ["entities"], entitiesJobs, null, ["Client remarks", "FlaggGRC response"], arrFeedbackReference, "Guideline", "");
 
   }
 
@@ -19996,7 +21042,7 @@ export class SfIEvents extends LitElement {
 
     // mappedCountries.data.mappings.mappings = arr2;
 
-    this.renderTaggingTable((this._SfOnboardingCountriesListContainer as HTMLDivElement), mappedCompliances, mappedCountries, ["shortid","firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
+    this.renderTaggingTable((this._SfOnboardingCountriesListContainer as HTMLDivElement), mappedCompliances, mappedCountries, ["shortid", "firstlineofdefence", "obligationtitle", "obligationtype", "country", "statute", "state", "subcategory"], this.uploadCountriesMapping, this.loadOnboardingCountries, "countries", ["id"], this.apiIdTags, "-Country", ["countries"], countriesJobs, null, ["Client remarks", "FlaggGRC response"], null, "", "");
 
   }
 
@@ -21278,7 +22324,7 @@ export class SfIEvents extends LitElement {
 
       let targetDiv = e.target as HTMLDivElement;
       let containerDiv = targetDiv.parentElement?.parentElement as HTMLDivElement;
-      if(containerDiv != null){
+      if (containerDiv != null) {
         containerDiv.innerHTML = '';
         containerDiv.parentElement?.parentElement?.querySelector('#chart-control-settings')?.setAttribute('part', 'calendar-tab-button-not-selected');
         containerDiv.parentElement?.parentElement?.querySelector('#chart-control-summary')?.setAttribute('part', 'calendar-tab-button-not-selected');
@@ -21406,7 +22452,7 @@ export class SfIEvents extends LitElement {
       let targetDiv = e.target as HTMLDivElement;
       let containerDiv = targetDiv.parentElement?.parentElement as HTMLDivElement;
       console.log('containerDiv', containerDiv);
-      if(containerDiv != null){
+      if (containerDiv != null) {
         containerDiv.innerHTML = '';
         containerDiv.parentElement?.parentElement?.querySelector('#chart-control-settings')?.setAttribute('part', 'calendar-tab-button-not-selected');
         containerDiv.parentElement?.parentElement?.querySelector('#chart-control-summary')?.setAttribute('part', 'calendar-tab-button-not-selected');
@@ -21415,7 +22461,7 @@ export class SfIEvents extends LitElement {
     });
 
     container.querySelector('#button-download-stats')?.addEventListener('click', async () => {
-      if (selectedTab === -1){
+      if (selectedTab === -1) {
         if (this.selectedFeatures.indexOf('compliances') >= 0) {
           await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no")
         } else if (this.selectedFeatures.indexOf('notices') >= 0) {
@@ -21424,7 +22470,9 @@ export class SfIEvents extends LitElement {
           await this.fetchAndRenderContracts(this.sdate, this.edate, "", "no");
         } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
           await this.fetchAndRenderLicenses(this.sdate, this.edate, "", "no");
-        } 
+        } else if (this.selectedFeatures.indexOf('rcmresources') >= 0) {
+          await this.fetchAndRenderRCMResources(this.sdate, this.edate, "", "no");
+        }
         // await this.fetchAndYearlyRenderUserCalendar_2(this.sdate, this.edate, "", "no");
       }
       const radioCsv = (container.querySelector('#radio-csv') as HTMLInputElement);
@@ -21651,7 +22699,7 @@ export class SfIEvents extends LitElement {
     }
     html += '</div>';
 
-    if((container.querySelector('#chart-settings-controls') as HTMLDivElement) != null){
+    if ((container.querySelector('#chart-settings-controls') as HTMLDivElement) != null) {
       (container.querySelector('#chart-settings-controls') as HTMLDivElement).innerHTML = html;
 
       (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-settings')?.addEventListener('click', () => {
@@ -22030,7 +23078,7 @@ export class SfIEvents extends LitElement {
       }
     }
 
-    //console.log('newarrlist', newArrList);
+    console.log('newarrlist', newArrList);
 
     let filteredHTML = '';
 
@@ -22061,6 +23109,7 @@ export class SfIEvents extends LitElement {
       filteredHTML += (newArrList[i] as HTMLTableRowElement).outerHTML;
     }
     filteredHTML += '</table></div>';
+    // console.log('filteredHTML', filteredHTML);
     return filteredHTML;
   }
 
@@ -23311,7 +24360,7 @@ export class SfIEvents extends LitElement {
       let graphparamname1Arr = (graphparamnames1[i] as HTMLDivElement).innerHTML.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ').split(' • ');
       let filterFound = false;
       for (let tempFilterStr of graphparamname1Arr) {
-          console.log('graphparamname1Arr', tempFilterStr,this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '),tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '));
+        console.log('graphparamname1Arr', tempFilterStr, this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '), tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '));
         if (tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ') || this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ') == "") {
           filterFound = true;
           break;
@@ -25001,7 +26050,7 @@ export class SfIEvents extends LitElement {
       "makercheckers": makercheckers
     }
 
-    console.log('reportingbody',body);
+    console.log('reportingbody', body);
     let retValue = true;
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
@@ -26572,6 +27621,8 @@ export class SfIEvents extends LitElement {
       this.fetchAndRenderContracts(startDate, endDate, searchString, list, month, year);
     } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
       this.fetchAndRenderLicenses(startDate, endDate, searchString, list, month, year);
+    } else if (this.selectedFeatures.indexOf('rcmresources') >= 0) {
+      this.fetchAndRenderRCMResources(startDate, endDate, searchString, list, month, year);
     }
   }
   fetchAndYearlyRenderUserCalendar_2 = async (startDate: string = "", endDate: string = "", searchString: string = "", list: string = "yes", month: string = "00", year: string = this.calendarStartYYYY) => {
@@ -26842,16 +27893,17 @@ export class SfIEvents extends LitElement {
 
       const jsonRespose = JSON.parse(xhr.responseText);
       console.log('jsonRespose', jsonRespose);
-      let agreements = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
+      let contracts = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
       this.lastupdated = Util.getDateTimeStrings(new Date().getTime())
-      let tempEvents = this.events
-      for (let mmddyyyy of Object.keys(agreements)) {
-        tempEvents[mmddyyyy] = [...(tempEvents[mmddyyyy] ?? []), ...agreements[mmddyyyy]]
-      }
-      this.events = tempEvents;
+      // let tempEvents = this.events
+      // for (let mmddyyyy of Object.keys(contracts)) {
+      //   tempEvents[mmddyyyy] = [...(tempEvents[mmddyyyy] ?? []), ...contracts[mmddyyyy]]
+      // }
+      // this.events = tempEvents;
+      this.events = contracts;
       this.renderAppropriateStream(this.sdate, this.edate, true);
-      console.log('contracts', agreements, tempEvents);
+      console.log('contracts', contracts);
     } else {
       if (xhr.status == 401) {
         let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
@@ -26923,13 +27975,89 @@ export class SfIEvents extends LitElement {
       let licenses = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
       this.lastupdated = Util.getDateTimeStrings(new Date().getTime())
-      let tempEvents = this.events
-      for (let mmddyyyy of Object.keys(licenses)) {
-        tempEvents[mmddyyyy] = [...(tempEvents[mmddyyyy] ?? []), ...licenses[mmddyyyy]]
+      // let tempEvents = this.events
+      // for (let mmddyyyy of Object.keys(licenses)) {
+      //   tempEvents[mmddyyyy] = [...(tempEvents[mmddyyyy] ?? []), ...licenses[mmddyyyy]]
+      // }
+      // this.events = tempEvents;
+      this.events = licenses;
+      this.renderAppropriateStream(this.sdate, this.edate, true);
+      console.log('licenses', licenses);
+    } else {
+      if (xhr.status == 401) {
+        let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+        this.dispatchEvent(changeEvent);
       }
-      this.events = tempEvents;
+      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);
+      }
+
+    }
+
+  }
+
+  fetchAndRenderRCMResources = async (startDate: string = "", endDate: string = "", searchString: string = "", list: string = "yes", month: string = "00", year: string = this.calendarStartYYYY) => {
+
+    let path = "", view = "";
+    this.sdate = startDate;
+    this.edate = endDate;
+    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 = "getallcountryobjects";
+
+    let sDate = "";
+    let eDate = "";
+
+    //console.log('currenttab', this.getCurrentTab());
+
+    if (this.getCurrentTab() == this.TAB_YEAR) {
+      sDate = "03/31/" + this.calendarStartYYYY;
+      eDate = "04/01/" + (parseInt(this.calendarStartYYYY) + 1);
+    } else {
+      sDate = startDate;
+      eDate = endDate;
+    }
+
+
+    let url = "https://" + this.apiIdRCMResources + "/" + path;
+
+    //console.log('fetch calendar url', url);
+    let urlBody: any = { "projectid": this.projectId, "userprofileid": this.userProfileId, "role": this.myRole, "entityid": this.entityId, "countryid": this.countryId, "functionid": this.functionId, "locationid": this.locationId, "tagid": this.tagId, "adhoc": "false", "exclusivestartkey": 0, "sdate": sDate, "edate": eDate, "view": view, "year": year, "list": list, "month": month };
+
+    if (searchString.length > 0) {
+      urlBody["searchstring"] = searchString;
+    }
+
+    //console.log('urlbody', urlBody);
+
+    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);
+      let rcmresources = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
+      await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
+      this.lastupdated = Util.getDateTimeStrings(new Date().getTime())
+      this.events = rcmresources;
       this.renderAppropriateStream(this.sdate, this.edate, true);
-      console.log('licenses', licenses, tempEvents);
+      console.log('rcmresources', rcmresources);
     } else {
       if (xhr.status == 401) {
         let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
@@ -26981,6 +28109,8 @@ export class SfIEvents extends LitElement {
       url = "https://" + this.apiIdAgreements + "/" + path;
     } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
       url = "https://" + this.apiIdLicenses + "/" + path;
+    } else if (this.selectedFeatures.indexOf('rcmresource') >= 0) {
+      url = "https://" + this.apiIdRCMResources + "/" + path;
     }
 
     //console.log('fetch calendar url', url);