sf-i-events 1.0.846 → 1.0.848

package/src/sf-i-events.ts

@@ -1241,6 +1241,9 @@ export class SfIEvents extends LitElement {
   @property()
   apiIdNotices!: string;
 
+  @property()
+  apiIdAgreements!: string;
+
   @property()
   apiMethodList!: string;
 
@@ -4617,7 +4620,7 @@ export class SfIEvents extends LitElement {
     html += '<div class="stream-events-container flex-grow" part="' + bgStatus + '">';
     html += '<div class="hidden-tags hide">'+JSON.stringify(event['tags'])+'</div>'
     html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-    html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' +  '<input id="button-select-'+mmdd.replace('/', '-')+'-'+ itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') +  '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g,'_') + '-' + ((event.isnotice ?? false) ? 'isnotice' : 'isevent') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + itemNumber + '-'+((event.isnotice ?? false)?'isnotice':'isevent')+ '" text="'+event['obligationtitle']+'" minLength="' + (event.reporters != null ? "100" : "60") + '"></sf-i-elastic-text>' + (event.reporters != null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g,'-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div><button id="button-list-reporting-'+mmdd.replace('/', '-')+'-' + itemNumber +'" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.reporters != null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
+    html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' +  '<input id="button-select-'+mmdd.replace('/', '-')+'-'+ itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') +  '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g,'_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + itemNumber + '-'+((event.module ?? false)?event.module:'compliance')+ '" text="'+event['obligationtitle']+'" minLength="' + (event.reporters != null ? "100" : "60") + '"></sf-i-elastic-text>' + (event.reporters != null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g,'-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div><button id="button-list-reporting-'+mmdd.replace('/', '-')+'-' + itemNumber +'" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.reporters != null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
     if(event.reporters != null && remarks.length > 0) {
       html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">'+remarks+', occurred on '+occurrenceDate+'</div>';  
     }
@@ -4753,7 +4756,7 @@ export class SfIEvents extends LitElement {
     html += '<tbody>';
     html += '<td id="td-expand-'+i+'" part="td-body">';
     if(event.isbulk == null || !event.isbulk){
-      html += '<button id="button-unmapped-expand-'+mmdd.replace('/', '-')+'-'+j+'-'+((event.isnotice ?? false)?'isnotice':'isevent')+ '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>'
+      html += '<button id="button-unmapped-expand-'+mmdd.replace('/', '-')+'-'+j+'-'+((event.module ?? false)?event.module:'compliance')+ '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>'
     }else{
       html += '<div class="lds-dual-ring1 bulk-loader"></div>';
     }
@@ -5693,7 +5696,7 @@ export class SfIEvents extends LitElement {
     }
     let streamEventTitles = eventsContainer.querySelectorAll('.stream-event-title') as NodeListOf<SfIElasticText>
     for(let streamEventTitle of streamEventTitles){
-      if(streamEventTitle.id == 'stream-event-title-'+mmdd.replace(/\//g, '-') + '-' + j + '-'+((event.isnotice ?? false)?'isnotice':'isevent')){
+      if(streamEventTitle.id == 'stream-event-title-'+mmdd.replace(/\//g, '-') + '-' + j + '-'+((event.module ?? false)?event.module:'compliance')){
         streamEventTitle.setAttribute('part','stream-event-title-selected')
       }else{
         streamEventTitle.removeAttribute('part')
@@ -5719,7 +5722,7 @@ export class SfIEvents extends LitElement {
     });
     listReportingContainer.querySelector('#button-auto-approve')?.addEventListener('click', async () => {
       if(this.selectedItemIds.length <= 1){
-        await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+        await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
         this.setSuccess('Auto-Approved successfully!')
         setTimeout(() => {
           this.clearMessages()
@@ -5749,7 +5752,7 @@ export class SfIEvents extends LitElement {
             "userid": this.userProfileId,
             "userrole": this.myRole,
             "year": this.calendarStartYYYY,
-            "module": event.isnotice != null ? "notices" : "events"
+            "module": event.module ?? "events"
           })
         }
         await this.uploadReviewsBulk(bulkBodyReview);
@@ -5791,7 +5794,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length <= 1){
             console.log('selectedevent', JSON.stringify(event));
-          if(await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+          if(await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "events")){
             for( var p = 0 ; p < this.events[mmdd].length; p ++){
               if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
                 this.events[mmdd][p].approved = approved 
@@ -5833,7 +5836,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": event.isnotice != null ? "notices" : "events"
+              "module": event.module ?? "events"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -5904,7 +5907,7 @@ export class SfIEvents extends LitElement {
         } else {
           let flagBulk = false;
           if(this.selectedItemIds.length <= 1){
-            if(await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+            if(await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "events")){
               for( var p = 0 ; p < this.events[mmdd].length; p ++){
                 if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
                   this.events[mmdd][p].approved = approved
@@ -5946,7 +5949,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": event.isnotice != null ? "notices" : "events"
+                "module": event.module ?? "events"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -6097,7 +6100,7 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length <= 1){
                         
-                        if(await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers)){
+                        if(await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "events", percentage, event.makercheckers)){
                         
                           console.log('this.events', this.events);
                           if(this.mode != "next"){
@@ -6111,7 +6114,7 @@ export class SfIEvents extends LitElement {
                             
                             if(event.makercheckers.length > 0) {
 
-                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
                               for( var p = 0 ; p < this.events[mmdd].length; p ++){
                                 if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
                                   this.events[mmdd][p].approved = true
@@ -6165,7 +6168,7 @@ export class SfIEvents extends LitElement {
                           //     "userid": this.userProfileId,
                           //     "userrole": this.myRole,
                           //     "year": this.calendarStartYYYY,
-                          //     "module": event.isnotice != null ? "notices" : "events"
+                          //     "module": event.module ?? "events"
                           //   } )
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -6188,7 +6191,7 @@ export class SfIEvents extends LitElement {
                               "userid": this.userProfileId,
                               "userrole": this.myRole,
                               "year": this.calendarStartYYYY,
-                              "module": event.isnotice != null ? "notices" : "events",
+                              "module": event.module ?? "events",
                               "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                             })
                           // }
@@ -6563,10 +6566,12 @@ export class SfIEvents extends LitElement {
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
         const j = idArr[5];
-        const isnotice = idArr[6];
+        const module = idArr[6];
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
-        if(isnotice === "isnotice"){
+        if(module === "notice"){
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if(module === "agreement"){
+          this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         }else{
           let found = false;
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -6600,10 +6605,12 @@ export class SfIEvents extends LitElement {
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
         const j = idArr[5];
-        const isnotice = idArr[6];
+        const module = idArr[6];
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
-        if(isnotice === "isnotice"){
+        if(module === "notice"){
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if(module === "agreement"){
+          this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         }else{
           let found = false;
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -6646,7 +6653,7 @@ export class SfIEvents extends LitElement {
           const j = idArr[4];
           // const makercheckers = idArr[5];
           const docs = idArr[6];
-          const isnotice = idArr[14];
+          const module = idArr[14];
 
           if((ev.target as HTMLInputElement).checked) {
             this.selectedItemIds.push(id);
@@ -6657,7 +6664,7 @@ export class SfIEvents extends LitElement {
             listReportingContainer.innerHTML = '';
             let buttonListReporting = eventsContainer.querySelector('#button-list-reporting-' + mmdd.replace(/\//g,'-') + '-' + j) as HTMLButtonElement
             buttonListReporting.setAttribute('part','button-list-reporting')    
-            let streamEventTitle = eventsContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + isnotice) as SfIElasticText
+            let streamEventTitle = eventsContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + module) as SfIElasticText
             streamEventTitle.removeAttribute('part')
           }
 
@@ -6704,13 +6711,13 @@ export class SfIEvents extends LitElement {
               const idArr1 = id1.split("-")
               const docs1 = idArr1[6];
               const status = idArr1[13].replace(/_/g, '-');
-              const isnotice1 = idArr1[14]
+              const module1 = idArr1[14]
               const isbulk = idArr1[15] == "bulk"
               console.log('isBulk button-select', id1, isbulk)
               if(isbulk){
                 (buttonSelect[k] as HTMLInputElement).style.display = 'none';
               }
-              if(docs == docs1 && status == this.selectedStatus && isnotice == isnotice1) {
+              if(docs == docs1 && status == this.selectedStatus && module == module1) {
                 totalVisibleCount++
               } else {
                 (buttonSelect[k] as HTMLInputElement).style.display = 'none';
@@ -10701,10 +10708,12 @@ export class SfIEvents extends LitElement {
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
         const j = idArr[5];
-        const isnotice = idArr[6];
+        const module = idArr[6];
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
-        if(isnotice === "isnotice"){
+        if(module === "notice"){
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if(module === "agreement"){
+          this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         }else{
           let found = false;
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -10738,10 +10747,12 @@ export class SfIEvents extends LitElement {
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
         const j = idArr[5];
-        const isnotice = idArr[6];
+        const module = idArr[6];
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
-        if(isnotice === "isnotice"){
+        if(module === "notice"){
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if(module === "agreement"){
+          this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         }else{
           let found = false;
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -10783,7 +10794,7 @@ export class SfIEvents extends LitElement {
         const j = idArr[4];
         // const makercheckers = idArr[5];
         const docs = idArr[6];
-        const isnotice = idArr[14];
+        const module = idArr[14];
 
         if((ev.target as HTMLInputElement).checked) {
           this.selectedItemIds.push(id);
@@ -10794,7 +10805,7 @@ export class SfIEvents extends LitElement {
           listReportingContainer.innerHTML = '';
           let buttonListReporting = (this._SfThisContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g,'-') + '-' + j) as HTMLButtonElement
           buttonListReporting.setAttribute('part','button-list-reporting')    
-          let streamEventTitle = (this._SfThisContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + isnotice) as SfIElasticText
+          let streamEventTitle = (this._SfThisContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + module) as SfIElasticText
           streamEventTitle.removeAttribute('part')
           
         }
@@ -10842,13 +10853,13 @@ export class SfIEvents extends LitElement {
             const idArr1 = id1.split("-")
             const docs1 = idArr1[6];
             const status = idArr1[13].replace(/_/g, '-');
-            const isnotice1 = idArr1[14]
+            const module1 = idArr1[14]
             const isbulk = idArr1[15] == "bulk"
             if(isbulk){
               (buttonSelect[k] as HTMLInputElement).style.display = 'none';
             }
   
-            if(docs == docs1 && status == this.selectedStatus && isnotice == isnotice1) {
+            if(docs == docs1 && status == this.selectedStatus && module == module1) {
               totalVisibleCount++
             } else {
               (buttonSelect[k] as HTMLInputElement).style.display = 'none';
@@ -11287,10 +11298,12 @@ export class SfIEvents extends LitElement {
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
         const j = idArr[5];
-        const isnotice = idArr[6];
+        const module = idArr[6];
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
-        if(isnotice === "isnotice"){
+        if(module === "notice"){
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if(module === "agreement"){
+          this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         }else{
           let found = false;
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -11328,10 +11341,12 @@ export class SfIEvents extends LitElement {
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
         const j = idArr[5];
-        const isnotice = idArr[6];
+        const module = idArr[6];
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
-        if(isnotice === "isnotice"){
+        if(module === "notice"){
           this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if(module === "agreement"){
+          this.renderAgreementDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
         }else{
           let found = false;
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -11374,7 +11389,7 @@ export class SfIEvents extends LitElement {
         const j = idArr[4];
         // const makercheckers = idArr[5];
         const docs = idArr[6];
-        const isnotice = idArr[14];
+        const module = idArr[14];
         if((ev.target as HTMLInputElement).checked) {
           this.selectedItemIds.push(id);
         } else {
@@ -11384,7 +11399,7 @@ export class SfIEvents extends LitElement {
           listReportingContainer.innerHTML = '';
           let buttonListReporting = (this._SfStreamContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g,'-') + '-' + j) as HTMLButtonElement
           buttonListReporting.setAttribute('part','button-list-reporting')    
-          let streamEventTitle = (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + isnotice) as SfIElasticText
+          let streamEventTitle = (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + module) as SfIElasticText
           streamEventTitle.removeAttribute('part')
         }
 
@@ -11429,14 +11444,14 @@ export class SfIEvents extends LitElement {
             const idArr1 = id1.split("-")
             const docs1 = idArr1[6];
             const status = idArr1[13].replace(/_/g, '-');
-            const isnotice1 = idArr1[14]
+            const module1 = idArr1[14]
             const isbulk = idArr1[15] == "bulk"
             console.log('isBulk button-select', id1, isbulk)
             if(isbulk){
               (buttonSelect[k] as HTMLInputElement).style.display = 'none';
             }
   
-            if(docs == docs1 && status == this.selectedStatus && isnotice == isnotice1) {
+            if(docs == docs1 && status == this.selectedStatus && module == module1) {
               totalVisibleCount++
             } else {
               (buttonSelect[k] as HTMLInputElement).style.display = 'none';
@@ -12576,7 +12591,7 @@ export class SfIEvents extends LitElement {
         <div class="box-large" id="shimmer-container-notices" part="shimmer-container-notices">
         </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-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, commentbox:reporting-commentbox, comment-username:reporting-comment-username, detail-head:reporting-detail-head, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label, reporting-commentbox:reporting-reporting-commentbox, reporting-comment-username:reporting-reporting-comment-username, reporting-detail-head:reporting-reporting-detail-head" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdNotices + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
+    html += '<sf-i-reporting id="detail-reporting" class="hide" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, commentbox:reporting-commentbox, comment-username:reporting-comment-username, detail-head:reporting-detail-head, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label, reporting-commentbox:reporting-reporting-commentbox, reporting-comment-username:reporting-reporting-comment-username, reporting-detail-head:reporting-reporting-detail-head, reporting-input-sf-i-select:reporting-reporting-input-sf-i-select, select-input-select:reporting-select-input-select" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdNotices + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
 
     html += '<div part="reporting-view-container">'
       html += this.renderReporting(listEvent, mmddyyyy);
@@ -12755,7 +12770,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length <= 1) {
           console.log('mmddyyyy', mmddyyyy)
-          if(await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")){
+          if(await this.uploadReview(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){
                 
@@ -12794,7 +12809,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": listEvent.isnotice != null ? "notices" : "events"
+              "module": listEvent.module ?? "events"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -12883,7 +12898,7 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if(this.selectedItemIds.length <= 1) {
 
-            if(await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")){
+            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
@@ -12923,7 +12938,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": listEvent.isnotice != null ? "notices" : "events"
+                "module": listEvent.module ?? "events"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -13093,7 +13108,7 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length <= 1) {
 
-                        if(await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers)){
+                        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){
@@ -13158,7 +13173,7 @@ export class SfIEvents extends LitElement {
                           //     "userid": this.userProfileId,
                           //     "userrole": this.myRole,
                           //     "year": this.calendarStartYYYY,
-                          //     "module": listEvent.isnotice != null ? "notices" : "events"
+                          //     "module": listEvent.module ?? "events"
                           //   } )
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -13181,7 +13196,7 @@ export class SfIEvents extends LitElement {
                               "userid": this.userProfileId,
                               "userrole": this.myRole,
                               "year": this.calendarStartYYYY,
-                              "module": listEvent.isnotice != null ? "notices" : "events",
+                              "module": listEvent.module ?? "events",
                               "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                             })
                           // }
@@ -13352,167 +13367,932 @@ export class SfIEvents extends LitElement {
 
     }
   }
+  renderAgreementDetails = async (listEvent: any, mmddyyyy:string) => {
+    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">Agreement 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-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, commentbox:reporting-commentbox, comment-username:reporting-comment-username, detail-head:reporting-detail-head, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label, reporting-commentbox:reporting-reporting-commentbox, reporting-comment-username:reporting-reporting-comment-username, reporting-detail-head:reporting-reporting-detail-head" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdAgreements + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
 
-  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)};
+    html += '<div part="reporting-view-container">'
+      html += this.renderReporting(listEvent, mmddyyyy);
+      html += "</div>"
 
-    //console.log('urlbody', urlBody);
+      html += '<div class="d-flex justify-between m-20">';
+      html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
+      html += '</div>';
+      
+      html += '<div class="m-20">';
 
-    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) {
+        html += '<div class="d-flex flex-col">';
 
-      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 
+          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>';
+            
+            const onlyCommentText = (comments[i].comment + "").replace(/ *\([^)]*\) */g, "").trim();
+            try {
+
+              const jsonComments = JSON.parse(onlyCommentText);
+
+              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>';
               }
+              
+            } 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>';
             }
+            
+            html += '</div>';
+          }
+          if(comments.length === 0) {
+            html += '<div><strong>No comments yet!</strong></div>';
           }
-          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) {
+        html += '</div>';
 
-        this.showChosenProject();
-        (this._SfTitleChosenProject as HTMLElement).innerHTML = (this._SfProject[0].querySelector('#sf-i-project') as SfIForm).selectedTexts()[0];
-        this.renderChosenProject();
+      html += '</div>';
 
-      } else {
-        const jsonRespose = JSON.parse(xhr.responseText);
-        this.setError(jsonRespose.error);
-      }
+    (this._SfDetailContainer as HTMLDivElement).innerHTML = html;
+    (this._SfDetailContainer as HTMLDivElement).style.display = 'block';
 
-    }
-  }
+    let sfireporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#detail-reporting') as SfIReporting
+    sfireporting.selectedItem = listEvent;
+    sfireporting.loadMode();
+    
+    sfireporting.addEventListener('valueChanged',()=>{
+      sfireporting.classList.remove('hide');
+      ((this._SfDetailContainer as HTMLDivElement).querySelector('#shimmer-container-agreements') as HTMLDivElement).classList.add('hide');
+    });
 
-  renderEventDetail = (event: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement) => {
-    console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close')?.addEventListener('click', () => {
 
-    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];
+      (this._SfDetailContainer as HTMLDivElement).innerHTML = '';
+      (this._SfDetailContainer as HTMLDivElement).style.display = 'none';
 
-    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'];
+    (this._SfDetailContainer as HTMLDivElement).querySelector('.button-delete')?.addEventListener('click', async () => {
 
-    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>
-    
-    `;
+      // 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();
+      //   }
+      // }
 
-    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>
-    
-      `;
+      console.log('delete review clicked')
       
-    }
-
-    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 />';
+      var clickEvent = new MouseEvent("click", {
+        "view": window,
+        "bubbles": true,
+        "cancelable": false
+      });
+      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
 
-    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">';
+    });
+    (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();
+        // }
+      }
       
-      for(var i = 0; i < basicFields.length; i++) {
-
-        if(!this.getEventPreviewFields().includes(basicFields[i])) {
-    
-          if(!this.getEventHideFields().includes(basicFields[i])) {
+      var clickEvent = new MouseEvent("click", {
+        "view": window,
+        "bubbles": true,
+        "cancelable": false
+      });
+      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
 
-            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" || 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;
+        if(approved == listEvent.approved){
+          buttonClick.innerHTML = "Save"
+                this.setError('Already Approved!');
+                setTimeout(() => {
+                  this.clearMessages();
+                }, 3000);
+                return;
+        }
+        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")){
+            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+              if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                
+                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                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;
+        if(approved == listEvent.approved){
+          buttonClick.innerHTML = "Save"
+                this.setError('Already Approved!');
+                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).value.length > 0 ? (new Date(((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement).value).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(this._SfReporting[0] != null){
+                reportformatvalues = JSON.stringify((this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.selectedValues()) ?? "";
+                reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.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].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()
+                              }
+                            }
+                            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) {
@@ -13837,7 +14617,7 @@ export class SfIEvents extends LitElement {
     });
     (this._SfDetailContainer as HTMLDivElement).querySelector('#button-auto-approve')?.addEventListener('click', async () => {
       if(this.selectedItemIds.length <= 1) {
-        await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+        await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
         this.setSuccess('Auto-Approved successfully!')
         setTimeout(() => {
           this.clearMessages()
@@ -13867,7 +14647,7 @@ export class SfIEvents extends LitElement {
             "userid": this.userProfileId,
             "userrole": this.myRole,
             "year": this.calendarStartYYYY,
-            "module": event.isnotice != null ? "notices" : "events"
+            "module": event.module ?? "events"
           })
         }
         await this.uploadReviewsBulk(bulkBodyReview);
@@ -14086,7 +14866,7 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length <= 1) {
           // console.log('mmddyyyy', mmddyyyy)
-          if(await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+          if(await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "events")){
             for( var p = 0 ; p < this.events[mmdd].length; p ++){
               if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                 
@@ -14124,7 +14904,7 @@ export class SfIEvents extends LitElement {
               "userid": this.userProfileId,
               "userrole": this.myRole,
               "year": this.calendarStartYYYY,
-              "module": event.isnotice != null ? "notices" : "events"
+              "module": event.module ?? "events"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
 
@@ -14218,7 +14998,7 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if(this.selectedItemIds.length <= 1) {
 
-            if(await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+            if(await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "events")){
               for( var p = 0 ; p < this.events[mmdd].length; p ++){
                 if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                   this.events[mmdd][p].approved = approved
@@ -14257,7 +15037,7 @@ export class SfIEvents extends LitElement {
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
                 "year": this.calendarStartYYYY,
-                "module": event.isnotice != null ? "notices" : "events"
+                "module": event.module ?? "events"
               })
               // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
 
@@ -14428,7 +15208,7 @@ export class SfIEvents extends LitElement {
                         //console.log('makerscheckers', makercheckers, reportercomments);
                         // console.log('reportformatvalues', reportformatvalues)
                         // console.log('reportformatschema',reportformatschema)
-                        if(await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers)){
+                        if(await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "events", percentage, makercheckers)){
                           console.log('this.events', this.events);
                           for( var p = 0 ; p < this.events[mmdd].length; p ++){
                             if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
@@ -14439,7 +15219,7 @@ export class SfIEvents extends LitElement {
                           }
                           if(makercheckers.length > 0) {
 
-                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "events");
                             for( var p = 0 ; p < this.events[mmdd].length; p ++){
                               if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                                 this.events[mmdd][p].approved = true
@@ -14486,7 +15266,7 @@ export class SfIEvents extends LitElement {
                           //   "userid": this.userProfileId,
                           //   "userrole": this.myRole,
                           //   "year": this.calendarStartYYYY,
-                          //   "module": event.isnotice != null ? "notices" : "events"
+                          //   "module": event.module ?? "events"
                           // })
                           // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
                           // if(parseInt(makercheckersL) > 0) {
@@ -14509,7 +15289,7 @@ export class SfIEvents extends LitElement {
                           //     "userid": this.userProfileId,
                           //     "userrole": this.myRole,
                           //     "year": this.calendarStartYYYY,
-                          //     "module": event.isnotice != null ? "notices" : "events"
+                          //     "module": event.module ?? "events"
                           //   } )
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
@@ -14532,7 +15312,7 @@ export class SfIEvents extends LitElement {
                               "userid": this.userProfileId,
                               "userrole": this.myRole,
                               "year": this.calendarStartYYYY,
-                              "module": event.isnotice != null ? "notices" : "events",
+                              "module": event.module ?? "events",
                               "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                             })
                           // }
@@ -22607,7 +23387,7 @@ export class SfIEvents extends LitElement {
   }
 
   uploadAudit = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module: string = "events") => {
-    let url = "https://"+this.apiId+"/uploadaudit";
+    let url = "https://"+this.apiId+"/uploadaudit1";
 
     const body = { 
       "mmddyyyy": mmddyyyy,
@@ -22677,7 +23457,7 @@ export class SfIEvents extends LitElement {
   }
 
   uploadReview = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module: string = "events") => {
-    let url = "https://"+this.apiId+"/uploadreview";
+    let url = "https://"+this.apiId+"/uploadreview1";
 
     const body = { 
       "mmddyyyy": mmddyyyy,
@@ -22777,7 +23557,7 @@ export class SfIEvents extends LitElement {
   }
 
   uploadReport = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string = "", reportformatschema: string = "", module: string = "events", percentage: string = "100", makercheckers: any) => {
-    let url = "https://"+this.apiId+"/uploadreport";
+    let url = "https://"+this.apiId+"/uploadreport1";
 
     let body = { 
       "mmddyyyy": mmddyyyy,
@@ -24361,6 +25141,8 @@ export class SfIEvents extends LitElement {
       this.fetchAndYearlyRenderUserCalendar_2(startDate, endDate, searchString, list, month, year)    
     }else if(this.selectedFeatures.indexOf('notices') >= 0){
       this.fetchAndRenderNotices(startDate, endDate, searchString, list, month, year);
+    }else if(this.selectedFeatures.indexOf('agreements') >= 0){
+      this.fetchAndRenderAgreements(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) => {
@@ -24581,6 +25363,85 @@ export class SfIEvents extends LitElement {
     }
 
   }
+  
+  fetchAndRenderAgreements = 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.apiIdAgreements+"/"+ 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 agreements = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
+      await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
+      this.lastupdated = Util.getDateTimeStrings(new Date().getTime())
+      let tempEvents = this.events
+      for(let mmddyyyy of Object.keys(agreements)){
+        tempEvents[mmddyyyy] = [...(tempEvents[mmddyyyy] ?? []),...agreements[mmddyyyy]]
+      }
+      this.events = tempEvents;
+      this.renderAppropriateStream(this.sdate,this.edate,true);
+      console.log('agreements', agreements, 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) => {
 
@@ -24609,6 +25470,8 @@ export class SfIEvents extends LitElement {
       url = "https://"+this.apiId+"/"+ path;
     }else if(this.selectedFeatures.indexOf('notices') >= 0){
       url = "https://"+this.apiIdNotices+"/"+ path;
+    }else if(this.selectedFeatures.indexOf('agreements') >= 0){
+      url = "https://"+this.apiIdAgreements+"/"+ path;
     }
     
     //console.log('fetch calendar url', url);