sf-i-events 1.0.873 → 1.0.874

package/src/sf-i-events.ts

@@ -859,7 +859,7 @@ export class SfIEvents extends LitElement {
 
   EXCLUDE_COLS_FROM_REGS: Array<string> = ["updatetype", "question", "invalidations", "activations", "alertschedule", "clientquestion", "countryname", "countryid", "entityname", "entityid", "locationname", "locationid", "reporters", "approvers", "timeframe", "responsedays", "execmodule", "functions", "shortid", "shortnumid", "countries", "entities", "locations", "tagsmap", "reportersmap", "approversmap", "functionheadsmap", "auditorsmap", "viewersmap", "approved", "documents", "comments", "lastupdated", "dateofcompletion", "mmdd", "completeness", "timeliness", "compliance", "delta", "triggers"]
 
-  CHARTS_LIST_BY_MODULES: { [key: string]: Array<string> } = { "compliances": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "notices": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "contracts": ["compliance", "timeliness", "completeness", "location"] };
+  CHARTS_LIST_BY_MODULES: { [key: string]: Array<string> } = { "compliances": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "notices": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "contracts": ["compliance", "timeliness", "completeness", "location"], "licenses": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"] };
 
   chartSelectedLegend: Array<number> = [];
 
@@ -1246,6 +1246,9 @@ export class SfIEvents extends LitElement {
   @property()
   apiIdAgreements!: string;
 
+  @property()
+  apiIdLicenses!: string;
+
   @property()
   apiMethodList!: string;
 
@@ -4263,7 +4266,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)
+      console.log('compliance status', event.terminated, completeness, timeliness)
       if(event.terminated){
         return "terminated"
       }
@@ -6794,7 +6797,9 @@ export class SfIEvents extends LitElement {
         if (module === "notice") {
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "contract") {
-          this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -6833,7 +6838,9 @@ export class SfIEvents extends LitElement {
         if (module === "notice") {
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "contract") {
-          this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -10959,7 +10966,9 @@ export class SfIEvents extends LitElement {
         if (module === "notice") {
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "contract") {
-          this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -10998,7 +11007,9 @@ export class SfIEvents extends LitElement {
         if (module === "notice") {
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "contract") {
-          this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -11567,7 +11578,9 @@ export class SfIEvents extends LitElement {
         if (module === "notice") {
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "contract") {
-          this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -11588,7 +11601,7 @@ export class SfIEvents extends LitElement {
 
 
           // this.renderEventDetail(this.events[mmdd][j], mmdd + "/" + yyyy, (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-month-'+this.currentColumnIndex) as HTMLButtonElement);
-          console.log('errorFetchEvent', mmdd, j, buttonArr[i].outerHTML, idArr);
+          // console.log('errorFetchEvent', mmdd, j, buttonArr[i].outerHTML, idArr);
           this.fetchEventDetails(this.events[mmdd][j], mmdd + "/" + yyyy, (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-month-' + this.currentColumnIndex) as HTMLButtonElement, this._SfStreamContainer as HTMLDivElement);
         }
 
@@ -11611,7 +11624,9 @@ export class SfIEvents extends LitElement {
         if (module === "notice") {
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else if (module === "contract") {
-          this.fetchAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         } else {
           let found = false;
           for (var k = 0; k < this.selectedItemIds.length; k++) {
@@ -13678,7 +13693,7 @@ export class SfIEvents extends LitElement {
 
     }
   }
-  fetchAgreementDetails = async (listEvent: any, mmddyyyy: string) => {
+  fetchContractDetails = async (listEvent: any, mmddyyyy: string) => {
     let entityId = listEvent.entityid;
     let locationId = listEvent.locationid;
     let url = "https://" + this.apiIdAgreements + "/getallobjectdetails";
@@ -13695,7 +13710,7 @@ export class SfIEvents extends LitElement {
 
       const jsonRespose = JSON.parse(xhr.responseText);
       console.log('jsonRespose agreement details', jsonRespose);
-      this.renderAgreementDetails(jsonRespose.object, mmddyyyy)
+      this.renderContractDetails(jsonRespose.object, mmddyyyy)
     } else {
       if (xhr.status == 401) {
         let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
@@ -13709,7 +13724,7 @@ export class SfIEvents extends LitElement {
 
   }
 
-  renewAgreement = async (listEvent: any, reportformatvalues: any) => {
+  renewContract = async (listEvent: any, reportformatvalues: any) => {
 
     let url = "https://" + this.apiIdAgreements + "/reopen";
 
@@ -13735,7 +13750,7 @@ export class SfIEvents extends LitElement {
 
     }
   }
-  renderAgreementDetails = async (listEvent: any, mmddyyyy: string) => {
+  renderContractDetails = async (listEvent: any, mmddyyyy: string) => {
     // await this.fetchAgreementDetails(listEvent, mmddyyyy);
     // return;
     let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
@@ -13959,7 +13974,7 @@ export class SfIEvents extends LitElement {
           console.log('mmddyyyy', mmddyyyy)
           if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "events")) {
             if (approved) {
-              await this.renewAgreement(listEvent, reportformatvalues);
+              await this.renewContract(listEvent, reportformatvalues);
             } else {
               console.log('renew reporting', reportformatvalues)
             }
@@ -14331,7 +14346,7 @@ export class SfIEvents extends LitElement {
                           this.events[mmdd][p].lastupdated = new Date().toString()
                         }
                       }
-                      await this.renewAgreement(listEvent, reportformatvalues);
+                      await this.renewContract(listEvent, reportformatvalues);
                       console.log('upload report auto approve single')
                     }
                     if (this.recentlyReported[mmdd] == null) {
@@ -14570,13 +14585,13 @@ 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";
+  fetchLicenseDetails = async (listEvent: any, mmddyyyy: string) => {
+    let entityId = listEvent.entityid;
+    let locationId = listEvent.locationid;
+    let url = "https://" + this.apiIdLicenses + "/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) };
+    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);
 
@@ -14586,197 +14601,1089 @@ 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.renderLicenseDetails(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);
+  renewLicense = 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.apiIdLicenses + "/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>
+  }
+  renderLicenseDetails = 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">License 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="Contract Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdAgreements + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
 
-    }
+    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);
+      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>'
-    html += '<h3 class="head-indicator-statute">-</h3>'
-    html += '</div>';
-    html += '<div class="d-flex flex-wrap accordian-body body-statute" part="accordian-body">';
+    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="Contract 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.renewContract(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.renewContract(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">';
 
     for (var i = 0; i < statuteFields.length; i++) {
 
@@ -15249,13 +16156,21 @@ export class SfIEvents extends LitElement {
       } else {
         feedbackMessage.setAttribute('style', 'border:');
         this.uploadTriggerMyEvent(
-          event.id + ";" + event.shortid,
+          event.id + " - " + event.shortid,
           feedbackMessage.value,
-          event.countries.join(",").replace(/ *\([^)]*\) */g, ""),
-          event.entities.join(',').replace(/ *\([^)]*\) */g, ""),
-          event.locations.join(',').replace(/ *\([^)]*\) */g, ""),
+          (event.country[0] ?? "").replace(/ *\([^)]*\) */g, ""),
+          (event.entityname ?? "").replace(/ *\([^)]*\) */g, ""),
+          (event.locationname ?? "").replace(/ *\([^)]*\) */g, ""),
           event.statute[0],
           event.subcategory[0]);
+        // this.uploadTriggerMyEvent(
+        //   event.id + ";" + event.shortid,
+        //   feedbackMessage.value,
+        //   event.countries.join(",").replace(/ *\([^)]*\) */g, ""),
+        //   event.entities.join(',').replace(/ *\([^)]*\) */g, ""),
+        //   event.locations.join(',').replace(/ *\([^)]*\) */g, ""),
+        //   event.statute[0],
+        //   event.subcategory[0]);
         buttonCancel.click();
         buttonClose.click();
       }
@@ -16080,15 +16995,15 @@ export class SfIEvents extends LitElement {
     // taggingArray.data.mappings.mappings = [];
 
     const tempArray = [];
-
+    console.log('selectedindexchecking 1', this.selectedCbs)
     for (var count = 0; count < sourceArray.data.mappings.mappings.length; count++) {
 
-      //console.log('selectedindexchecking', selectedIndex, count, this.selectedCbs.includes(selectedIndex), this.selectedCbs.includes(count));
+      console.log('selectedindexchecking', selectedIndex, count, this.selectedCbs.includes(selectedIndex + ""), this.selectedCbs.includes(count + ""));
       //taggingArray.data.mappings.mappings[count] = sourceArray.data.mappings.mappings[count];
       //taggingArray.data.mappings.mappings.push(sourceArray.data.mappings.mappings[count]);
       tempArray.push(sourceArray.data.mappings.mappings[count]);
       // //console.log('selectedindexchecking', this.selectedCbs, count, this.selectedCbs.includes(selectedIndex), this.selectedCbs.includes(count));
-      if (this.selectedCbs.includes(selectedIndex) && this.selectedCbs.includes(count + '')) {
+      if (this.selectedCbs.includes(selectedIndex + '') && this.selectedCbs.includes(count + '')) {
         if (((divElement as HTMLDivElement).querySelector('#tags-' + selectedIndex) as SfIForm).selectedValues != null) {
 
           if (tempArray[count] == null) tempArray[count] = {};
@@ -16730,16 +17645,16 @@ export class SfIEvents extends LitElement {
           var k = 0;
           for (k = 0; k < taggingArray.data.mappings.mappings.length; k++) {
 
-            if (taggingArray.data.mappings.mappings[k].id == sourceArray.data.mappings.mappings[i].id) {
-              if (taggingArray.data.mappings.mappings[k].id == "62330e24-298d-4ef2-9449-c0e400e37cac") {
+            // if (taggingArray.data.mappings.mappings[k].id == sourceArray.data.mappings.mappings[i].id) {
+            //   if (taggingArray.data.mappings.mappings[k].id == "62330e24-298d-4ef2-9449-c0e400e37cac") {
 
-                console.log('found', taggingArray.data.mappings.mappings[k]);
-                //console.log('before before filtermatch',sourceCols[l],JSON.parse(sourceArray.data.mappings.mappings[0].cols)[j], colCountry, (sourceArray.data.mappings.mappings[i]), (sourceArray.data.mappings.mappings[i].data), colState);
-                //console.log('before filtermatch', colCountry, JSON.parse(sourceArray.data.mappings.mappings[i].data)[colCountry], colState, JSON.parse(sourceArray.data.mappings.mappings[i].data)[colState], JSON.parse(sourceArray.data.mappings.mappings[i].data)[colSubcategory]);
+            //     console.log('found', taggingArray.data.mappings.mappings[k]);
+            //     //console.log('before before filtermatch',sourceCols[l],JSON.parse(sourceArray.data.mappings.mappings[0].cols)[j], colCountry, (sourceArray.data.mappings.mappings[i]), (sourceArray.data.mappings.mappings[i].data), colState);
+            //     //console.log('before filtermatch', colCountry, JSON.parse(sourceArray.data.mappings.mappings[i].data)[colCountry], colState, JSON.parse(sourceArray.data.mappings.mappings[i].data)[colState], JSON.parse(sourceArray.data.mappings.mappings[i].data)[colSubcategory]);
 
-              }
-              break;
-            }
+            //   }
+            //   break;
+            // }
 
           }
 
@@ -17056,12 +17971,12 @@ export class SfIEvents extends LitElement {
           }
 
           // if(taggingArray.data.mappings.mappings[j].id == "62330e24-298d-4ef2-9449-c0e400e37cac" && equal) {
-          if (taggingArray.data.mappings.mappings[j].id == "62330e24-298d-4ef2-9449-c0e400e37cac") {
+          // if (taggingArray.data.mappings.mappings[j].id == "62330e24-298d-4ef2-9449-c0e400e37cac") {
 
-            // console.log('rendertagging', taggingArray.data.mappings.mappings[j], sourceArray.data.mappings.mappings[i]);
-            console.log('rendertagging', taggingArray.data.mappings.mappings[j]);
+          //   // console.log('rendertagging', taggingArray.data.mappings.mappings[j], sourceArray.data.mappings.mappings[i]);
+          //   console.log('rendertagging', taggingArray.data.mappings.mappings[j]);
 
-          }
+          // }
 
 
           if (equal) {
@@ -22713,7 +23628,7 @@ export class SfIEvents extends LitElement {
 
     html += '<button class="tab-button mb-10" id="calendar-tab-month" part="' + (selectedTab == this.TAB_STREAM ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Month</button>';
     html += '<button class="tab-button mb-10" id="calendar-tab-custom" part="' + (selectedTab == this.TAB_CUSTOM ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">' + (this.myRole == this.TAB_VIEWER ? "Statistics" : "Range") + '</button>';
-    if (this.selectedFeatures.indexOf('contracts') < 0) {
+    if (this.selectedFeatures.indexOf('contracts') < 0 && this.selectedFeatures.indexOf('licenses') < 0) {
       html += '<button class="tab-button mb-10" id="calendar-tab-register" part="' + (selectedTab == this.TAB_REGISTERS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Registers</button>';
       html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_FIND ? '' : 'hide') + '" id="calendar-tab-find" part="' + (selectedTab == this.TAB_FIND ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Search</button>';
       html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_THIS ? '' : 'hide') + '" id="calendar-tab-this" part="' + (selectedTab == this.TAB_THIS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Current</button>';
@@ -23945,7 +24860,7 @@ export class SfIEvents extends LitElement {
       "module": module
     }
     let retValue = true;
-    //console.log('uploading review', body);
+    console.log('uploading review', body);
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
     this._SfLoader.innerHTML = '';
@@ -24053,7 +24968,7 @@ export class SfIEvents extends LitElement {
       "makercheckers": makercheckers
     }
 
-    console.log(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;
@@ -25621,7 +26536,9 @@ export class SfIEvents extends LitElement {
     } else if (this.selectedFeatures.indexOf('notices') >= 0) {
       this.fetchAndRenderNotices(startDate, endDate, searchString, list, month, year);
     } else if (this.selectedFeatures.indexOf('contracts') >= 0) {
-      this.fetchAndRenderAgreements(startDate, endDate, searchString, list, month, year);
+      this.fetchAndRenderContracts(startDate, endDate, searchString, list, month, year);
+    } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
+      this.fetchAndRenderLicenses(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) => {
@@ -25843,7 +26760,7 @@ export class SfIEvents extends LitElement {
 
   }
 
-  fetchAndRenderAgreements = async (startDate: string = "", endDate: string = "", searchString: string = "", list: string = "yes", month: string = "00", year: string = this.calendarStartYYYY) => {
+  fetchAndRenderContracts = async (startDate: string = "", endDate: string = "", searchString: string = "", list: string = "yes", month: string = "00", year: string = this.calendarStartYYYY) => {
 
     let path = "", view = "";
     this.sdate = startDate;
@@ -25920,6 +26837,84 @@ export class SfIEvents extends LitElement {
 
     }
 
+  }
+  fetchAndRenderLicenses = 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.apiIdLicenses + "/" + 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 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]]
+      }
+      this.events = tempEvents;
+      this.renderAppropriateStream(this.sdate, this.edate, true);
+      console.log('licenses', licenses, tempEvents);
+    } 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);
+      }
+
+    }
+
   }
 
   fetchStatistics = async (startDate: string = "", endDate: string = "", filtercriteria: string, filterid: string, subfiltercriteria: string, subfilterid: string) => {
@@ -25951,6 +26946,8 @@ export class SfIEvents extends LitElement {
       url = "https://" + this.apiIdNotices + "/" + path;
     } else if (this.selectedFeatures.indexOf('contracts') >= 0) {
       url = "https://" + this.apiIdAgreements + "/" + path;
+    } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
+      url = "https://" + this.apiIdLicenses + "/" + path;
     }
 
     //console.log('fetch calendar url', url);