sf-i-events 1.0.950 → 1.0.951

package/src/sf-i-events.ts

@@ -1709,6 +1709,8 @@ export class SfIEvents extends LitElement {
   suspenseFlag: boolean = false;
 
   tablecols: string[] = []
+
+  reportedLocationsVals: any[] = []
   static override styles = css`
 
     .bg-white {
@@ -2261,6 +2263,10 @@ export class SfIEvents extends LitElement {
       margin-left: 10px;
     }
 
+    .ml-10-m-0 {
+      margin-left: 10px;
+    }
+
     .mt-20 {
       margin-top: 20px;
     }
@@ -2269,6 +2275,10 @@ export class SfIEvents extends LitElement {
       margin-left: 20px;
     }
 
+    .ml-20-m-0 {
+      margin-left: 20px;
+    }
+
     .mr-20 {
       margin-right: 20px;
     }
@@ -2431,6 +2441,14 @@ export class SfIEvents extends LitElement {
       .calendar-right-data {
         width: 100%;
       }
+      
+      .ml-10-m-0 {
+        margin-left: 0px;
+      }
+      
+      .ml-20-m-0 {
+        margin-left: 0px;
+      }
 
     }
 
@@ -4816,9 +4834,9 @@ export class SfIEvents extends LitElement {
     const eventIdSanitized = event.id.replace(/-/g, '_');
     const mmddSanitized = mmdd.replace(/\//g, '-');
     const dueDateParts = event.duedate.split('/');
-    const isReportedLocation = event.reportedlocationsflag == true 
-    const isSuspense = event.suspense == true 
-    const isReviewed = event.review == true 
+    const isReportedLocation = event.reportedlocationsflag == true
+    const isSuspense = event.suspense == true
+    const isReviewed = event.review == true
     const showCheckbox = !(hasReportFormat || isBulk || hasCustomReporting || isReportedLocation);
     // const showReportingButton = !hasReportFormat && !hasCustomReporting && event.reporters == null;
     const showReportingButton = !hasReportFormat && !hasCustomReporting && event.concise != null && !isReportedLocation;
@@ -5211,7 +5229,7 @@ export class SfIEvents extends LitElement {
     const configFlag = configHome.features != null && configHome.features.indexOf("understood") >= 0
     html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + (((event.module == "compliances" || event.module == null) && event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + (((event.module == "compliances" || event.module == null) && event.concise == null && configFlag) ? (event.review ? ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-reviewed" class="material-symbols-outlined d-flex align-center mb-20 ml-10 button-icon-review">flag_check</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood</button>')) : '') + '</div>';
     // }
-    
+
     return html;
 
   }
@@ -5920,7 +5938,9 @@ export class SfIEvents extends LitElement {
     let makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'];
     let docsOptional = event['docs'] == null ? [] : event['docs'];
     let uploadGuidance = event['uploadguidance'] ?? 0
-    console.log('rendering reporting', event, percentage)
+    this.reportedLocationsVals = (event['reportedlocations'] != null) ? (Util.isJSONParsable(event['reportedlocations']) ? JSON.parse(event['reportedlocations']) : [event['reportedlocations']]) : ['']
+    console.log('reportedLocations found', this.reportedLocationsVals)
+    console.log('rendering reporting', event, percentage, this.reportedLocationsVals)
     if (this.selectedItemIds.length > 0) {
       html += `<div class="d-flex justify-between ">
         <h4 class="m-0 bulk-upload-label" part="bulk-upload-label">${this.selectedItemIds.length - 1} other ` + ((this.selectedItemIds.length - 1) === 1 ? `item` : `items`) + ` also selected</h4>
@@ -5952,19 +5972,39 @@ export class SfIEvents extends LitElement {
         if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
           html += '<label part="input-label">Date of Completion*</label>';
           html += '<input id="input-approver-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" disabled/><br />';
-          html += '<div class="d-flex justify-start align-center">';
+          html += '<div class="d-flex justify-start align-center flex-wrap">';
           html += '<div class="d-flex flex-col flex-grow">';
           html += '<label part="input-label">Completion Percentage</label>';
           html += '<input id="input-reporter-percentage" part="input" type="number" value="' + percentage + '" max="100" min="0" step="1" disabled/><br />';
           html += '</div>'
-          html += '<div id="reporting-entity-container" class="d-flex flex-col flex-grow ml-20 hide">';
+          html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
           html += '<label part="input-label">Entity</label>';
-          html += '<select id="input-reporter-entity" part="input"></select><br />';
+          html += '<select id="input-reporter-entity-0" part="input" disabled></select>';
           html += '</div>'
-          html += '<div id="reporting-location-container" class="d-flex flex-col flex-grow ml-20 hide">';
+          html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
           html += '<label part="input-label">Location</label>';
-          html += '<select id="input-reporter-location" part="input"></select><br />';
+          html += '<select id="input-reporter-location-0"  class="input-reporter-location" part="input" disabled></select>';
           html += '</div>'
+          // html += '<button id="button-reporter-location-add-0" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">' + (this.reportedLocationsVals.length >= 1 ? 'remove' : 'add') + '</button><br /></div>'
+          if (this.reportedLocationsVals.length > 1) {
+            let indexLocation = 1;
+            while (indexLocation < this.reportedLocationsVals.length) {
+              html += '<div class="d-flex justify-start align-end flex-wrap">';
+              html += '<div class="d-flex flex-col flex-grow">';
+              html += '<label class="invisible" part="input-label">Completion Percentage*</label>';
+              html += '</div>'
+              html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide" disabled>';
+              html += '<label part="input-label">Entity</label>';
+              html += '<select id="input-reporter-entity-' + indexLocation + '" part="input"></select>';
+              html += '</div>'
+              html += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide" disabled>';
+              html += '<label part="input-label">Location</label>';
+              html += '<select id="input-reporter-location-' + indexLocation + '" class="input-reporter-location" part="input"></select>';
+              html += '</div>'
+              // html += '<button id="button-reporter-location-add-' + indexLocation + '" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">' + (indexLocation < this.reportedLocationsVals.length - 1 ? 'remove' : 'add') + '</button><br /></div>'
+              indexLocation++
+            }
+          }
           html += '</div>'
 
         }
@@ -6026,20 +6066,41 @@ export class SfIEvents extends LitElement {
         if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
           html += '<label part="input-label">Date of Completion*</label>';
           html += '<input id="input-reporter-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" max="' + (new Date().toISOString().substring(0, 10)) + '"/><br />';
-          html += '<div class="d-flex justify-start align-center">';
+          html += '<div class="d-flex justify-start align-end flex-wrap">';
           html += '<div class="d-flex flex-col flex-grow">';
           html += '<label part="input-label">Completion Percentage*</label>';
-          html += '<input id="input-reporter-percentage" part="input" type="number" value="' + percentage + '" max="100" min="0" step="1"/><br />';
+          html += '<input id="input-reporter-percentage" part="input" type="number" value="' + percentage + '" max="100" min="0" step="1"/>';
           html += '</div>'
-          html += '<div id="reporting-entity-container" class="d-flex flex-col flex-grow ml-20 hide">';
+          html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
           html += '<label part="input-label">Entity</label>';
-          html += '<select id="input-reporter-entity" part="input"></select><br />';
+          html += '<select id="input-reporter-entity-0" part="input"></select>';
           html += '</div>'
-          html += '<div id="reporting-location-container" class="d-flex flex-col flex-grow ml-20 hide">';
+          html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
           html += '<label part="input-label">Location</label>';
-          html += '<select id="input-reporter-location" part="input"></select><br />';
-          html += '</div>'
+          html += '<select id="input-reporter-location-0"  class="input-reporter-location" part="input"></select>';
           html += '</div>'
+          html += '<button id="button-reporter-location-add-0" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">remove</button><br /></div>'
+          if (this.reportedLocationsVals.length > 1) {
+            let indexLocation = 1;
+            while (indexLocation < this.reportedLocationsVals.length) {
+              html += '<div class="d-flex justify-start align-end flex-wrap">';
+              html += '<div class="d-flex flex-col flex-grow">';
+              html += '<label class="invisible" part="input-label">Completion Percentage*</label>';
+              html += '</div>'
+              html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+              html += '<label part="input-label">Entity</label>';
+              html += '<select id="input-reporter-entity-' + indexLocation + '" part="input"></select>';
+              html += '</div>'
+              html += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+              html += '<label part="input-label">Location</label>';
+              html += '<select id="input-reporter-location-' + indexLocation + '"  class="input-reporter-location" part="input"></select>';
+              html += '</div>'
+              html += '<button id="button-reporter-location-add-' + indexLocation + '" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">remove</button><br /></div>'
+              indexLocation++
+            }
+          }
+          html += '<div class="d-flex justify-end align-end mt-10" class="input-report-location-add-container">';
+          html += '<button id="button-reporter-location-add-0" part="button-icon-small" class="button-reporter-location-add material-icons ml-10-m-0 hide">add</button><br /></div>'
           html += '<div part="input-reporter-percentage-message" class="input-reporter-percentage-message mb-20">For reporting full non-compliance, choose 0%. For reporting compliance with gaps, choose the appropriate % value.</div><br />'
 
           // if(docsOptional.length === 0) {
@@ -6264,7 +6325,11 @@ export class SfIEvents extends LitElement {
     listReportingContainer.querySelector('#upload-guidance-button')?.addEventListener('click', async () => {
       console.log('upload guidance clicked', event);
       let inputReportingPercentage = (listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement)?.value ?? "100";
-      let selectReportedLocation = (listReportingContainer.querySelector('#input-reporter-location') as HTMLSelectElement)?.value ?? "";
+      let selectReportedLocations = (listReportingContainer.querySelectorAll('.input-reporter-location') as NodeListOf<HTMLSelectElement>);
+      let selectReportedLocationValue = "[]";
+      for (let selectReportedLocation of selectReportedLocations) {
+        selectReportedLocationValue = JSON.stringify([...JSON.parse(selectReportedLocationValue), selectReportedLocation.value])
+      }
       let approvercomments = (listReportingContainer.querySelector('#input-approver-comments') as HTMLInputElement)?.value ?? "";
       let reportercomments = (listReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement)?.value ?? "";
       let dateOfCompletion;
@@ -6278,97 +6343,161 @@ export class SfIEvents extends LitElement {
         dateOfCompletion = "";
       }
       console.log('dateOfCompletion', dateOfCompletion)
-      await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, "", "", true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocation, documents, dateOfCompletion);
+      await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, "", "", true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocationValue, documents, dateOfCompletion);
     })
     if (this.mode == "consumer" || this.mode == "next") {
       let inputReportingPercentage = listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement;
       let percentage = inputReportingPercentage.value
-
+      const entityContainers = listReportingContainer.querySelectorAll('.reporting-entity-container') as NodeListOf<HTMLDivElement>;
+      const locationsContainers = listReportingContainer.querySelectorAll('.reporting-location-container') as NodeListOf<HTMLDivElement>;
+      const addLocationButtons = listReportingContainer.querySelectorAll('.button-reporter-location-add') as NodeListOf<HTMLButtonElement>;
       if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-        (listReportingContainer.querySelector('#reporting-entity-container') as HTMLDivElement).classList.remove('hide');
-        (listReportingContainer.querySelector('#reporting-location-container') as HTMLDivElement).classList.remove('hide')
+        entityContainers.forEach(container => container.classList.remove('hide'));
+        locationsContainers.forEach(container => container.classList.remove('hide'));
+        addLocationButtons.forEach(container => container.classList.remove('hide'));
       } else {
-        (listReportingContainer.querySelector('#reporting-entity-container') as HTMLDivElement).classList.add('hide');
-        (listReportingContainer.querySelector('#reporting-location-container') as HTMLDivElement).classList.add('hide')
+        entityContainers.forEach(container => container.classList.add('hide'));
+        locationsContainers.forEach(container => container.classList.add('hide'));
+        addLocationButtons.forEach(container => container.classList.add('hide'));
       }
       inputReportingPercentage?.addEventListener('change', () => {
         setTimeout(() => {
           let percentage = inputReportingPercentage.value
-          console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value);
+          console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value, event.reportedlocations);
           if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-            (listReportingContainer.querySelector('#reporting-entity-container') as HTMLDivElement).classList.remove('hide');
-            (listReportingContainer.querySelector('#reporting-location-container') as HTMLDivElement).classList.remove('hide')
+            entityContainers.forEach(container => container.classList.remove('hide'));
+            locationsContainers.forEach(container => container.classList.remove('hide'));
+            addLocationButtons.forEach(container => container.classList.remove('hide'));
           } else {
-            (listReportingContainer.querySelector('#reporting-entity-container') as HTMLDivElement).classList.add('hide');
-            (listReportingContainer.querySelector('#reporting-location-container') as HTMLDivElement).classList.add('hide')
+            entityContainers.forEach(container => container.classList.add('hide'));
+            locationsContainers.forEach(container => container.classList.add('hide'));
+            addLocationButtons.forEach(container => container.classList.add('hide'));
           }
           if ((percentage != null && parseInt(percentage) == 0) || event.docsOptional.length > 0) {
             (listReportingContainer.querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents';
           } else {
             (listReportingContainer.querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents*';
           }
+          if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100 && (event.reportedlocations == "" || event.reportedlocations == "[]")) {
+            event.percentage = percentage
+            event.reportedlocations = JSON.stringify([""])
+            event.reportercomments = (listReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement).value;
+            event.dateofcompletion = (listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0 ? (new Date((listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
+            event.documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+            console.log('rendering list reporting', event.percentage, event.reportedlocations)
+            this.renderListReporting(listReportingContainer, event, mmddyyyy, eventsContainer);
+          }
         }, 200);
       })
-      let selectReportingEntity = listReportingContainer.querySelector('#input-reporter-entity') as HTMLSelectElement;
-      let selectReportingLocation = listReportingContainer.querySelector('#input-reporter-location') as HTMLSelectElement;
-      selectReportingEntity.innerHTML = '';
       let projectUserMap = Util.getProjectUsermap()
-      for (let country of Object.keys(projectUserMap)) {
-        if (country == "roles") {
-          continue;
-        }
-        for (let entity of Object.keys(projectUserMap[country])) {
-          let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "")
-          let option = new Option(entityName, entity)
-          selectReportingEntity.add(option);
-        }
-      }
-      selectReportingEntity.addEventListener('change', (e: any) => {
-        selectReportingLocation.innerHTML = ''
+      addLocationButtons.forEach((addLocationBtn) => {
+        addLocationBtn.addEventListener('click', () => {
+          let iconhtml = addLocationBtn.innerHTML
+          let index = parseInt(addLocationBtn.id.split('-')[4])
+          console.log('button clicked', iconhtml, addLocationBtn.id);
+          if (iconhtml == "add") {
+            console.log('this.reportedLocationsVals', this.reportedLocationsVals)
+            this.reportedLocationsVals.push("");
+          } else {
+            this.reportedLocationsVals.splice(index, 1);
+          }
+          event.percentage = inputReportingPercentage.value;
+          event.reportedlocations = JSON.stringify(this.reportedLocationsVals)
+          if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+            event.percentage = "100";
+          }
+          console.log('rendering list reporting', event.percentage, event.reportedlocations)
+          event.reportercomments = (listReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement).value;
+          event.dateofcompletion = (listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0 ? (new Date((listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
+          event.documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+          this.renderListReporting(listReportingContainer, event, mmddyyyy, eventsContainer);
+        })
+      })
+
+      for (let indexRepLoc = 0; indexRepLoc < this.reportedLocationsVals.length; indexRepLoc++) {
+        console.log('AddingEntities', indexRepLoc)
+        let selectReportingEntity = listReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc) as HTMLSelectElement;
+        let selectReportingLocation = listReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc) as HTMLSelectElement;
+        selectReportingEntity.innerHTML = '';
         for (let country of Object.keys(projectUserMap)) {
           if (country == "roles") {
             continue;
           }
           for (let entity of Object.keys(projectUserMap[country])) {
-            if (entity.indexOf(e.target.value) < 0) {
+            let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "")
+            let option = new Option(entityName, entity)
+            selectReportingEntity.add(option);
+          }
+        }
+        selectReportingEntity.addEventListener('change', (e: any) => {
+          selectReportingLocation.innerHTML = ''
+          for (let country of Object.keys(projectUserMap)) {
+            if (country == "roles") {
+              continue;
+            }
+            for (let entity of Object.keys(projectUserMap[country])) {
+              if (entity.indexOf(e.target.value) < 0) {
+                continue;
+              }
+              for (let location of Object.keys(projectUserMap[country][entity])) {
+                let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "")
+                let option = new Option(locationName, location)
+                selectReportingLocation.add(option);
+              }
+            }
+          }
+          (listReportingContainer.querySelector('#reporting-location-container-' + indexRepLoc) as HTMLDivElement).classList.remove('hide')
+          selectReportingLocation.value = event.reportedlocations != null ? (Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations) : "";
+        })
+        if(selectReportingLocation.innerHTML == ''){
+          for (let country of Object.keys(projectUserMap)) {
+            if (country == "roles") {
               continue;
             }
-            for (let location of Object.keys(projectUserMap[country][entity])) {
-              let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "")
-              let option = new Option(locationName, location)
-              selectReportingLocation.add(option);
+            for (let entity of Object.keys(projectUserMap[country])) {
+              for (let location of Object.keys(projectUserMap[country][entity])) {
+                let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "")
+                let option = new Option(locationName, location)
+                selectReportingLocation.add(option);
+                break;
+              }
+              break;
             }
+            break;
           }
         }
-        (listReportingContainer.querySelector('#reporting-location-container') as HTMLDivElement).classList.remove('hide')
-        selectReportingLocation.value = event.reportedlocations ?? "";
-      })
-      if (event.reportedlocations != null && event.reportedlocations.length > 0) {
-        console.log('setting reportedlocations', event.reportedlocations)
-        for (let country of Object.keys(projectUserMap)) {
-          if (country == "roles") {
-            continue;
-          }
-          for (let entity of Object.keys(projectUserMap[country])) {
-            let flagSetVal = false;
-            for (let location of Object.keys(projectUserMap[country][entity])) {
-              if (event.reportedlocations.indexOf(location) >= 0) {
-                selectReportingEntity.value = entity;
-                const changeEvent = new Event('change', { bubbles: true });
-                selectReportingEntity.dispatchEvent(changeEvent)
-                selectReportingLocation.value = location;
-                flagSetVal = true;
+        selectReportingLocation.addEventListener('change', (e: any) => {
+          let index = parseInt(e.target.id.split('-')[3])
+          this.reportedLocationsVals[index] = e.target.value
+        })
+        if (event.reportedlocations != null && event.reportedlocations.length > 0) {
+          console.log('setting reportedlocations', event.reportedlocations)
+          let tempReportedLocation = Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations
+          for (let country of Object.keys(projectUserMap)) {
+            if (country == "roles") {
+              continue;
+            }
+            for (let entity of Object.keys(projectUserMap[country])) {
+              let flagSetVal = false;
+              for (let location of Object.keys(projectUserMap[country][entity])) {
+                if (tempReportedLocation.indexOf(location) >= 0) {
+                  selectReportingEntity.value = entity;
+                  const changeEvent = new Event('change', { bubbles: true });
+                  selectReportingEntity.dispatchEvent(changeEvent)
+                  selectReportingLocation.value = location;
+                  flagSetVal = true;
+                  break;
+                }
+              }
+              if (flagSetVal) {
                 break;
               }
             }
-            if (flagSetVal) {
-              break;
-            }
           }
+        } else {
+          selectReportingEntity.value = "";
+          selectReportingLocation.value = "";
         }
-      } else {
-        selectReportingEntity.value = "";
-        selectReportingLocation.value = "";
       }
 
       listReportingContainer.querySelector('#button-uploader-submit-approve')?.addEventListener('click', async (ev: any) => {
@@ -6744,7 +6873,14 @@ export class SfIEvents extends LitElement {
 
                     } else {
                       let flagBulk = false;
-                      let reportedlocations = selectReportingLocation?.value ?? "";
+                      // let reportedlocations = selectReportingLocation?.value ?? "";
+                      let reportedlocations = "[]";
+                      if (parseInt(percentage) !== 100) {
+                        let selectReportedLocations = (listReportingContainer.querySelectorAll('.input-reporter-location') as NodeListOf<HTMLSelectElement>);
+                        for (let selectReportedLocation of selectReportedLocations) {
+                          reportedlocations = JSON.stringify([...JSON.parse(reportedlocations), selectReportedLocation.value])
+                        }
+                      }
                       if (this.selectedItemIds.length <= 1) {
 
                         if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "compliance", percentage, event.makercheckers, reportedlocations)) {
@@ -6753,6 +6889,8 @@ export class SfIEvents extends LitElement {
                             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].documents = docs
+                                this.events[mmdd][p].percentage = percentage
+                                this.events[mmdd][p].reportedlocations = reportedlocations
                                 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()
                               }
@@ -6779,6 +6917,8 @@ export class SfIEvents extends LitElement {
                             for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
                               if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
                                 this.nextEvents[this.nextTabRole][mmdd][p].documents = docs
+                                this.nextEvents[this.nextTabRole][mmdd][p].percentage = percentage
+                                this.nextEvents[this.nextTabRole][mmdd][p].reportedlocations = reportedlocations
                                 this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() })
                                 this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString()
                               }
@@ -7070,7 +7210,6 @@ export class SfIEvents extends LitElement {
         let listReportingContainer = eventsContainer.querySelector('#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLDivElement
         // console.log('mmddyyyy', this.events[mmdd][j], listReportingContainer, '#list-reporting-container-'+mmdd.replace(/\//g,'-')+'-'+j);
         if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
-          4
           this.renderListReporting(listReportingContainer, this.events[mmdd][j], mmdd + '/' + yyyy, eventsContainer)
         } else {
           listReportingContainer.innerHTML = '';
@@ -7098,11 +7237,11 @@ export class SfIEvents extends LitElement {
         const j = idArr[5];
         console.log('review clicked', mmdd, yyyy, j, this.events[mmdd][j], ev.target.checked);
         let eventKey = this.events[mmdd][j].entityid + ';' + this.events[mmdd][j].locationid + ';' + this.events[mmdd][j].id;
-        for(var p = 0; p < Object.keys(this.events).length; p++) {
+        for (var p = 0; p < Object.keys(this.events).length; p++) {
           let tempMmDd = Object.keys(this.events)[p];
-          for(var q = 0; q < this.events[tempMmDd].length; q++) {
+          for (var q = 0; q < this.events[tempMmDd].length; q++) {
             let tempEventKey = this.events[tempMmDd][q].entityid + ';' + this.events[tempMmDd][q].locationid + ';' + this.events[tempMmDd][q].id;
-            if(tempEventKey == eventKey) {
+            if (tempEventKey == eventKey) {
               this.events[tempMmDd][q].review = ev.target.innerHTML.indexOf('flag_check') < 0
             }
           }
@@ -16910,7 +17049,7 @@ export class SfIEvents extends LitElement {
       this.setSuccess("Renewal successful");
       setTimeout(() => {
         this.clearMessages()
-      },3000)
+      }, 3000)
     } else {
       if (xhr.status == 401) {
         let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
@@ -17141,8 +17280,8 @@ export class SfIEvents extends LitElement {
           reportformatvaluesStr = JSON.stringify(reportingReporting!.selectedValues())
         }
         let comparedObj = Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues))
-        console.log('reportformatvalues', reportformatvalues, JSON.parse(listEvent.reportformatvalues),comparedObj)
-        if(Object.keys(comparedObj).length > 0){
+        console.log('reportformatvalues', reportformatvalues, JSON.parse(listEvent.reportformatvalues), comparedObj)
+        if (Object.keys(comparedObj).length > 0) {
           await this.sendSuggestions(listEvent.id, comparedObj);
         }
         // return;
@@ -17841,12 +17980,12 @@ export class SfIEvents extends LitElement {
     console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
     console.log('previousid', previousId, 'nextid', nextId);
     console.log('confighome', Util.getProjectConfigHome())
-    let comments, docs, approved, /*dateOfCompletion,*/ makercheckers: Array<string>, docsOptional: boolean | any, documentType: string | any;
+    let comments, docs, approved /*,dateOfCompletion, makercheckers: Array<string>, docsOptional: boolean | any, documentType: string | any*/;
     let entityId: string = "";
     let locationId: string = "";
     let statuteName: string = "";
     let reportformatName: string = "";
-    let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+    // let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
     entityId = event.entityid;
     locationId = event.locationid;
     // let completeness = this.getCompletenessStatus(event);
@@ -17854,9 +17993,9 @@ export class SfIEvents extends LitElement {
     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];
+    // 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) {
@@ -18187,7 +18326,7 @@ export class SfIEvents extends LitElement {
 
     if (this.mode == "consumer" || this.mode == "next" || this.mode == "viewer") {
       if (this.mode != "viewer") {
-        html += '<div part="reporting-view-container">'
+        html += '<div part="reporting-view-container" id="reporting-view-container">'
         html += this.renderReporting(event, mmddyyyy);
         html += "</div>"
       }
@@ -18275,95 +18414,12 @@ export class SfIEvents extends LitElement {
 
     (this._SfDetailContainer as HTMLDivElement).innerHTML = html;
     (this._SfDetailContainer as HTMLDivElement).style.display = 'block';
-    // let attachmentUploaders = (this._SfDetailContainer as HTMLDivElement).querySelectorAll('.event-attachment') as NodeListOf<SfIUploader>
-    // for(let attachmentUploader of attachmentUploaders){
-    //   attachmentUploader.loadMode();
-    // }
     if (this.mode != "viewer" && (this._SfUploader[0]) != null) {
       let ddmmyyyy = mmddyyyy.split('/')[1] + '/' + mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[2];
 
       let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.statute[0] ?? ""}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Reporter</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.reporters[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Approver</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.approvers[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
       (this._SfUploader[0].querySelector('#uploader') as SfIUploader).emailcontent = emailcontent;
     }
-    (this._SfDetailContainer as HTMLDivElement).querySelector('.button-delete')?.addEventListener('click', async () => {
-
-      await this.fetchDeleteReview(event["id"], mmddyyyy, entityId, locationId);
-      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();
-      }
-      // }
-
-      var clickEvent = new MouseEvent("click", {
-        "view": window,
-        "bubbles": true,
-        "cancelable": false
-      });
-      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
-
-    });
-    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-auto-approve')?.addEventListener('click', async () => {
-      if (this.selectedItemIds.length <= 1) {
-        await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
-        this.setSuccess('Auto-Approved successfully!')
-        setTimeout(() => {
-          this.clearMessages()
-        }, 3000);
-      } 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);
-          let yearStr = this.getFinancialYear(mmddyyyy)
-          bulkBodyReview.push({
-            "mmddyyyy": mmddyyyy,
-            "projectid": this.projectId,
-            "type": "review",
-            "eventid": eventId,
-            "comments": "Auto approved",
-            "approved": true,
-            "entityid": entityId,
-            "locationid": locationId,
-            "username": this.userName,
-            "userid": this.userProfileId,
-            "userrole": this.myRole,
-            "year": yearStr,
-            "module": event.module ?? "compliance"
-          })
-        }
-        await this.uploadReviewsBulk(bulkBodyReview);
-      }
-      //console.log('deleted', resultDelete);
-      // if(this.getCurrentTab() == this.TAB_CUSTOM) {
-      //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
-      // } else {
-      if (currentColumnButton != null) {
-        currentColumnButton.click();
-      }
-      // }
-
-      var clickEvent = new MouseEvent("click", {
-        "view": window,
-        "bubbles": true,
-        "cancelable": false
-      });
-      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
-
-    });
 
     (this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close')?.addEventListener('click', () => {
 
@@ -18601,101 +18657,304 @@ export class SfIEvents extends LitElement {
     })
 
     if (this.mode == "consumer" || this.mode == "next") {
-      let inputReportingPercentage = (this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement;
-      let percentage = inputReportingPercentage.value
+      let eventDetailReportingContainer = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-view-container') as HTMLDivElement
+      if(eventDetailReportingContainer != null){
+        this.renderEventDetailReporting(eventDetailReportingContainer, event, mmddyyyy, (this._SfDetailContainer as HTMLDivElement))
+      }
+    }
+
+    this.fetchStatuteDefinitionDetails(statuteName);
+    console.log('customreporting', event['customreporting'])
+    if (event['customreporting'] != null) {
+      let reportingContainer = (this._SfDetailContainer as HTMLDivElement)
+      if (reportingContainer.querySelector('#report-format-container') != null) {
+        reportingContainer.querySelector('#report-format-container')!.innerHTML = `<slot name="reporting"></slot>`;
+        console.log('innerhtml', reportingContainer.querySelector('#report-format-container')!.innerHTML);
+        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).name = event.obligationtitle;
+        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).mode = "edit";
+        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).configjson = event['customreporting'];
+        // if(reportformatvalues != ""){
+        //   (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).prepopulateValJson = reportformatvalues
+        // }
+        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).loadMode();
+      }
+    } else if (event['reportformat'] != null && event['reportformat'].length > 0) {
+      this.fetchReportFormat((this._SfDetailContainer as HTMLDivElement), reportformatName, event['reportformatschema'] ?? "", event['reportformatvalues'] ?? "");
+    }
+  }
+
+  renderEventDetailReporting = (eventDetailReportingContainer: HTMLDivElement, event: any, mmddyyyy: any, eventDetailContainer: HTMLDivElement) => {
+    console.log('detailreporting event', event, this.graphFilter);
+    let html = ''
+    let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+
+    let reportformatName: string = '';
+    if (event['reportformat'] != null) {
+      reportformatName = (event['reportformat'][0] ?? "").trim().replace('&amp;', '&');
+    }
+    let docs = event['documents'] == null ? [] : event['documents'];
+    event.approved = event['approved'] == null ? false : event['approved'];
+    event.dateOfCompletion = event['dateofcompletion'] == null ? '' : event['dateofcompletion'];
+    event.makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'];
+    event.docsOptional = event['docs'] == null ? [] : event['docs'];
+    html = this.renderReporting(event, mmddyyyy);
+    console.log('reporting html', html);
+    let ddmmyyyy = mmddyyyy.split('/')[1] + '/' + mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[2];
+
+    let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${(event.statute[0] ?? "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Reporter</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.reporters[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Approver</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.approvers[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
+    eventDetailReportingContainer.innerHTML = html;
+    if (this._SfUploader[0] != null) {
+      (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.emailcontent = emailcontent;
+    }
+    eventDetailReportingContainer.querySelector('.button-delete')?.addEventListener('click', async () => {
+
+      await this.fetchDeleteReview(event["id"], mmddyyyy, event.entityid, event.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();
+        // }
+      }
 
+    });
+    eventDetailReportingContainer.querySelector('#button-auto-approve')?.addEventListener('click', async () => {
+      if (this.selectedItemIds.length <= 1) {
+        await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
+        this.setSuccess('Auto-Approved successfully!')
+        setTimeout(() => {
+          this.clearMessages()
+        }, 3000);
+      } else {
+        let bulkBodyReview = []
+        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];
+
+          //console.log(entityId, locationId, eventId, mmddyyyy);
+          let yearStr = this.getFinancialYear(mmddyyyy)
+          bulkBodyReview.push({
+            "mmddyyyy": mmddyyyy,
+            "projectid": this.projectId,
+            "type": "review",
+            "eventid": eventId,
+            "comments": "Auto approved",
+            "approved": true,
+            "entityid": entityId,
+            "locationid": locationId,
+            "username": this.userName,
+            "userid": this.userProfileId,
+            "userrole": this.myRole,
+            "year": yearStr,
+            "module": event.module ?? "compliance"
+          })
+        }
+        await this.uploadReviewsBulk(bulkBodyReview);
+      }
+      if (this.getCurrentTab() == this.TAB_CUSTOM) {
+        this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
+      } else {
+        // if(currentColumnButton != null) {
+        //   currentColumnButton.click();
+        // }
+      }
+
+    });
+    eventDetailReportingContainer.querySelector('#upload-guidance-button')?.addEventListener('click', async () => {
+      console.log('upload guidance clicked', event);
+      let inputReportingPercentage = (eventDetailReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement)?.value ?? "100";
+      let selectReportedLocations = (eventDetailReportingContainer.querySelectorAll('.input-reporter-location') as NodeListOf<HTMLSelectElement>);
+      let selectReportedLocationValue = "[]";
+      for (let selectReportedLocation of selectReportedLocations) {
+        selectReportedLocationValue = JSON.stringify([...JSON.parse(selectReportedLocationValue), selectReportedLocation.value])
+      }
+      let approvercomments = (eventDetailReportingContainer.querySelector('#input-approver-comments') as HTMLInputElement)?.value ?? "";
+      let reportercomments = (eventDetailReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement)?.value ?? "";
+      let dateOfCompletion;
+      if ((eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement) != null) {
+        dateOfCompletion = new Date((eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "";
+      } else {
+        dateOfCompletion = new Date((eventDetailReportingContainer.querySelector('#input-approver-doc') as HTMLInputElement).value).getTime() + "";
+      }
+      let documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader).selectedValues()
+      if (dateOfCompletion == "NaN") {
+        dateOfCompletion = "";
+      }
+      console.log('dateOfCompletion', dateOfCompletion)
+      await this.fetchEventDetails(event, mmddyyyy, null, eventDetailContainer, "", "", true, eventDetailReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocationValue, documents, dateOfCompletion);
+    })
+    if (this.mode == "consumer" || this.mode == "next") {
+      let inputReportingPercentage = eventDetailReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement;
+      let percentage = inputReportingPercentage.value
+      const entityContainers = eventDetailReportingContainer.querySelectorAll('.reporting-entity-container') as NodeListOf<HTMLDivElement>;
+      const locationsContainers = eventDetailReportingContainer.querySelectorAll('.reporting-location-container') as NodeListOf<HTMLDivElement>;
+      const addLocationButtons = eventDetailReportingContainer.querySelectorAll('.button-reporter-location-add') as NodeListOf<HTMLButtonElement>;
       if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-        ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-entity-container') as HTMLDivElement).classList.remove('hide');
-        ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-location-container') as HTMLDivElement).classList.remove('hide')
+        entityContainers.forEach(container => container.classList.remove('hide'));
+        locationsContainers.forEach(container => container.classList.remove('hide'));
+        addLocationButtons.forEach(container => container.classList.remove('hide'));
       } else {
-        ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-entity-container') as HTMLDivElement).classList.add('hide');
-        ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-location-container') as HTMLDivElement).classList.add('hide')
+        entityContainers.forEach(container => container.classList.add('hide'));
+        locationsContainers.forEach(container => container.classList.add('hide'));
+        addLocationButtons.forEach(container => container.classList.add('hide'));
       }
       inputReportingPercentage?.addEventListener('change', () => {
         setTimeout(() => {
           let percentage = inputReportingPercentage.value
-          console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value);
+          console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value, event.reportedlocations);
           if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-            ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-entity-container') as HTMLDivElement).classList.remove('hide');
-            ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-location-container') as HTMLDivElement).classList.remove('hide')
+            entityContainers.forEach(container => container.classList.remove('hide'));
+            locationsContainers.forEach(container => container.classList.remove('hide'));
+            addLocationButtons.forEach(container => container.classList.remove('hide'));
           } else {
-            ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-entity-container') as HTMLDivElement).classList.add('hide');
-            ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-location-container') as HTMLDivElement).classList.add('hide')
+            entityContainers.forEach(container => container.classList.add('hide'));
+            locationsContainers.forEach(container => container.classList.add('hide'));
+            addLocationButtons.forEach(container => container.classList.add('hide'));
           }
-          if ((percentage != null && parseInt(percentage) == 0) || docsOptional.length > 0) {
-            ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents';
+          if ((percentage != null && parseInt(percentage) == 0) || event.docsOptional.length > 0) {
+            (eventDetailReportingContainer.querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents';
           } else {
-            ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents*';
+            (eventDetailReportingContainer.querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents*';
+          }
+          if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100 && (event.reportedlocations == "" || event.reportedlocations == "[]")) {
+            event.percentage = percentage
+            event.reportedlocations = JSON.stringify([""])
+            event.reportercomments = (eventDetailReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement).value;
+            event.dateofcompletion = (eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0 ? (new Date((eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
+            event.documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+            console.log('rendering list reporting', event.percentage, event.reportedlocations)
+            this.renderEventDetailReporting(eventDetailReportingContainer, event, mmddyyyy, eventDetailContainer);
           }
         }, 200);
       })
-      let selectReportingEntity = (this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-entity') as HTMLSelectElement;
-      let selectReportingLocation = (this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-location') as HTMLSelectElement;
-      selectReportingEntity.innerHTML = '';
       let projectUserMap = Util.getProjectUsermap()
-      for (let country of Object.keys(projectUserMap)) {
-        if (country == "roles") {
-          continue;
-        }
-        for (let entity of Object.keys(projectUserMap[country])) {
-          let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "")
-          let option = new Option(entityName, entity)
-          selectReportingEntity.add(option);
-        }
-      }
-      selectReportingEntity.addEventListener('change', (e: any) => {
-        selectReportingLocation.innerHTML = ''
+      addLocationButtons.forEach((addLocationBtn) => {
+        addLocationBtn.addEventListener('click', () => {
+          let iconhtml = addLocationBtn.innerHTML
+          let index = parseInt(addLocationBtn.id.split('-')[4])
+          console.log('button clicked', iconhtml, addLocationBtn.id);
+          if (iconhtml == "add") {
+            console.log('this.reportedLocationsVals', this.reportedLocationsVals)
+            this.reportedLocationsVals.push("");
+          } else {
+            this.reportedLocationsVals.splice(index, 1);
+          }
+          event.percentage = inputReportingPercentage.value;
+          event.reportedlocations = JSON.stringify(this.reportedLocationsVals)
+          if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+            event.percentage = "100";
+          }
+          console.log('rendering list reporting', event.percentage, event.reportedlocations)
+          event.reportercomments = (eventDetailReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement).value;
+          event.dateofcompletion = (eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0 ? (new Date((eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
+          event.documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+          this.renderEventDetailReporting(eventDetailReportingContainer, event, mmddyyyy, eventDetailContainer);
+        })
+      })
+
+      for (let indexRepLoc = 0; indexRepLoc < this.reportedLocationsVals.length; indexRepLoc++) {
+        console.log('AddingEntities', indexRepLoc)
+        let selectReportingEntity = eventDetailReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc) as HTMLSelectElement;
+        let selectReportingLocation = eventDetailReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc) as HTMLSelectElement;
+        selectReportingEntity.innerHTML = '';
         for (let country of Object.keys(projectUserMap)) {
           if (country == "roles") {
             continue;
           }
           for (let entity of Object.keys(projectUserMap[country])) {
-            if (entity.indexOf(e.target.value) < 0) {
+            let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "")
+            let option = new Option(entityName, entity)
+            selectReportingEntity.add(option);
+          }
+        }
+        selectReportingEntity.addEventListener('change', (e: any) => {
+          selectReportingLocation.innerHTML = ''
+          for (let country of Object.keys(projectUserMap)) {
+            if (country == "roles") {
               continue;
             }
-            for (let location of Object.keys(projectUserMap[country][entity])) {
-              let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "")
-              let option = new Option(locationName, location)
-              selectReportingLocation.add(option);
+            for (let entity of Object.keys(projectUserMap[country])) {
+              if (entity.indexOf(e.target.value) < 0) {
+                continue;
+              }
+              for (let location of Object.keys(projectUserMap[country][entity])) {
+                let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "")
+                let option = new Option(locationName, location)
+                selectReportingLocation.add(option);
+              }
             }
           }
-        }
-        ((this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-location-container') as HTMLDivElement).classList.remove('hide')
-        selectReportingLocation.value = event.reportedlocations ?? "";
-      })
-      if (event.reportedlocations != null && event.reportedlocations.length > 0) {
-        console.log('setting reportedlocations', event.reportedlocations)
-        for (let country of Object.keys(projectUserMap)) {
-          if (country == "roles") {
-            continue;
-          }
-          for (let entity of Object.keys(projectUserMap[country])) {
-            let flagSetVal = false;
-            for (let location of Object.keys(projectUserMap[country][entity])) {
-              if (event.reportedlocations.indexOf(location) >= 0) {
-                selectReportingEntity.value = entity;
-                const changeEvent = new Event('change', { bubbles: true });
-                selectReportingEntity.dispatchEvent(changeEvent)
-                selectReportingLocation.value = location;
-                flagSetVal = true;
+          (eventDetailReportingContainer.querySelector('#reporting-location-container-' + indexRepLoc) as HTMLDivElement).classList.remove('hide')
+          selectReportingLocation.value = event.reportedlocations != null ? (Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations) : "";
+        })
+
+        if(selectReportingLocation.innerHTML == ''){
+          for (let country of Object.keys(projectUserMap)) {
+            if (country == "roles") {
+              continue;
+            }
+            for (let entity of Object.keys(projectUserMap[country])) {
+              for (let location of Object.keys(projectUserMap[country][entity])) {
+                let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "")
+                let option = new Option(locationName, location)
+                selectReportingLocation.add(option);
                 break;
               }
-            }
-            if (flagSetVal) {
               break;
             }
+            break;
           }
         }
-      } else {
-        selectReportingEntity.value = "";
-        selectReportingLocation.value = "";
+        selectReportingLocation.addEventListener('change', (e: any) => {
+          let index = parseInt(e.target.id.split('-')[3])
+          this.reportedLocationsVals[index] = e.target.value
+        })
+        if (event.reportedlocations != null && event.reportedlocations.length > 0) {
+          console.log('setting reportedlocations', event.reportedlocations)
+          let tempReportedLocation = Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations
+          for (let country of Object.keys(projectUserMap)) {
+            if (country == "roles") {
+              continue;
+            }
+            for (let entity of Object.keys(projectUserMap[country])) {
+              let flagSetVal = false;
+              for (let location of Object.keys(projectUserMap[country][entity])) {
+                if (tempReportedLocation.indexOf(location) >= 0) {
+                  selectReportingEntity.value = entity;
+                  const changeEvent = new Event('change', { bubbles: true });
+                  selectReportingEntity.dispatchEvent(changeEvent)
+                  selectReportingLocation.value = location;
+                  flagSetVal = true;
+                  break;
+                }
+              }
+              if (flagSetVal) {
+                break;
+              }
+            }
+          }
+        } else {
+          selectReportingEntity.value = "";
+          selectReportingLocation.value = "";
+        }
       }
 
-      (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-approve')?.addEventListener('click', async (ev: any) => {
+      eventDetailReportingContainer.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;
+        const comments = (eventDetailReportingContainer.querySelector('#input-approver-comments') as HTMLInputElement).value;
+        console.log('comments', comments, JSON.stringify(event.comments))
+        const approved = (eventDetailReportingContainer.querySelector('#input-approve-yes') as HTMLInputElement).checked;
         let currStatus = this.getCompletenessStatus(event);
         let newEvent = { ...event };
         newEvent.comments = comments;
@@ -18709,24 +18968,19 @@ export class SfIEvents extends LitElement {
           }, 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, event["id"], comments, approved, event.module ?? "compliance")) {
+          console.log('selectedevent', JSON.stringify(event));
+          if (await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
             for (var p = 0; p < this.events[mmdd].length; p++) {
-              if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-
+              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
+                console.log('selected event', this.events[mmdd][p]);
                 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 (approved) {
+                  this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+                }
               }
             }
             if (this.recentlyReported[mmdd] == null) {
@@ -18740,8 +18994,8 @@ export class SfIEvents extends LitElement {
 
             const selectedId = this.selectedItemIds[k];
             //console.log('selectedid', selectedId);
-            entityId = selectedId.split('-')[7].replace(/_/g, '-');
-            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+            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];
 
@@ -18754,8 +19008,8 @@ export class SfIEvents extends LitElement {
               "eventid": eventId,
               "comments": comments,
               "approved": approved,
-              "entityid": entityId,
-              "locationid": locationId,
+              "entityid": entityid,
+              "locationid": locationid,
               "username": this.userName,
               "userid": this.userProfileId,
               "userrole": this.myRole,
@@ -18775,17 +19029,16 @@ export class SfIEvents extends LitElement {
 
             const selectedId = this.selectedItemIds[k];
             //console.log('selectedid', selectedId);
-            entityId = selectedId.split('-')[7].replace(/_/g, '-');
-            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+            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]
             if (this.mode == "next") {
               for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-
-                  this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true
+                if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityid) {
                   flagBulk = true;
+                  this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true
                   if (this.recentlyReported[mmdd] == null) {
                     this.recentlyReported[mmdd] = []
                   }
@@ -18794,10 +19047,10 @@ export class SfIEvents extends LitElement {
               }
             } else {
               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) {
+                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;
+                  flagBulk = true
                   if (this.recentlyReported[mmdd] == null) {
                     this.recentlyReported[mmdd] = []
                   }
@@ -18811,7 +19064,7 @@ export class SfIEvents extends LitElement {
         if (this.mode == "next") {
           // this.fetchNext(this.nextPage)
           // this.renderRoleTabsNext(this.nextPage)
-          this.renderNextEvents(this.nextEvents, this.nextPage, this.myRole);
+          this.renderNextEvents(this.nextEvents, this.nextPage, this.nextTabRole)
         } else {
           // if(this.getCurrentTab() == this.TAB_CUSTOM) {
           //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
@@ -18823,41 +19076,19 @@ export class SfIEvents extends LitElement {
             if (this.selectedItemIds.length > 0) {
               await this.fetchBulkReportingData();
             }
+            console.log('events', this.events);
             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) => {
+      eventDetailReportingContainer.querySelector('#button-uploader-submit-audit')?.addEventListener('click', async (ev: any) => {
         let buttonClick = ev.target as HTMLButtonElement
         buttonClick.innerHTML = "Saving..."
-        const comments: string = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-auditor-comments') as HTMLInputElement).value;
-        const approved = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement).checked;
-        let currStatus = this.getCompletenessStatus(event);
-        let newEvent = { ...event };
-        newEvent.comments = comments;
-        newEvent.approved = approved;
-        let newStatus = this.getCompletenessStatus(newEvent);
-        console.log('status', currStatus, newStatus)
-        if (currStatus == newStatus) {
-          buttonClick.innerHTML = "Save"
-          this.setError(approved ? 'Already Approved!' : 'Already Rejected!');
-          setTimeout(() => {
-            this.clearMessages();
-          }, 3000);
-          return;
-        }
+        const comments = (eventDetailReportingContainer.querySelector('#input-auditor-comments') as HTMLInputElement).value;
+        const approved = (eventDetailReportingContainer.querySelector('#input-approve-yes') as HTMLInputElement).checked;
+
         if (comments.trim().length === 0) {
           buttonClick.innerHTML = "Save"
           this.setError('Comments cannot be blank!');
@@ -18868,22 +19099,14 @@ export class SfIEvents extends LitElement {
         } else {
           let flagBulk = false;
           if (this.selectedItemIds.length <= 1) {
-
-            if (await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
-              if (this.mode == "next") {
-                for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                  if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-                    this.nextEvents[this.nextTabRole][mmdd][p].approved = approved
-                    this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() })
-                    this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString()
-                  }
-                }
-              } else {
-                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
-                    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 (await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
+              for (var p = 0; p < this.events[mmdd].length; p++) {
+                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
+                  this.events[mmdd][p].approved = approved
+                  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 (approved) {
+                    this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
                   }
                 }
               }
@@ -18899,8 +19122,8 @@ export class SfIEvents extends LitElement {
               const selectedId = this.selectedItemIds[k];
               //console.log('selectedid', selectedId);
 
-              entityId = selectedId.split('-')[7].replace(/_/g, '-');
-              locationId = selectedId.split('-')[8].replace(/_/g, '-');
+              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];
 
@@ -18929,21 +19152,20 @@ export class SfIEvents extends LitElement {
 
               const selectedId = this.selectedItemIds[k];
               //console.log('selectedid', selectedId);
-              entityId = selectedId.split('-')[7].replace(/_/g, '-');
-              locationId = selectedId.split('-')[8].replace(/_/g, '-');
+              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]
               if (this.mode == "next") {
                 for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
                   if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-
-                    this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true
                     flagBulk = true;
+                    this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true
                     if (this.recentlyReported[mmdd] == null) {
                       this.recentlyReported[mmdd] = []
                     }
-                    this.recentlyReported[mmdd].push(this.events[mmdd][p])
+                    this.recentlyReported[mmdd].push(this.nextEvents[this.nextTabRole][mmdd][p])
                   }
                 }
               } else {
@@ -18960,15 +19182,7 @@ export class SfIEvents extends LitElement {
                 }
               }
             }
-
           }
-
-          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)
             this.renderNextEvents(this.nextEvents, this.nextPage, this.nextTabRole)
@@ -18997,42 +19211,42 @@ export class SfIEvents extends LitElement {
       });
 
       if (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) {
+        if (event.approved) {
 
-        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';
+          if ((eventDetailReportingContainer.querySelector('#button-uploader-submit-report') as HTMLElement) != null) {
+            (eventDetailReportingContainer.querySelector('#button-uploader-submit-report') as HTMLElement).style.visibility = 'hidden';
           }
 
 
         } else {
 
-          if (((this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report') as HTMLElement) != null) {
+          if ((eventDetailReportingContainer.querySelector('#button-uploader-submit-report') as HTMLElement) != null) {
 
 
-            ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report') as HTMLElement).style.visibility = 'visible';
+            (eventDetailReportingContainer.querySelector('#button-uploader-submit-report') as HTMLElement).style.visibility = 'visible';
 
-            (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-report')?.addEventListener('click', async (ev: any) => {
+            eventDetailReportingContainer.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;
+              const reportercomments = (eventDetailReportingContainer.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() + "") : "";
+              const reporterdoc = (eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0 ? (new Date((eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
               let docs: any[] = [];
 
               //console.log('reporter comments 2', reportercomments);
+
+              // if(docsOptional.length === 0) {
               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 ((eventDetailReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
+                percentage = (eventDetailReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement).value
               }
-              // if(docsOptional.length === 0) {
               docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
               // }
               let flag = false;
               do {
-                if (docs.length > 0 && docsOptional != null && docsOptional.length === 0 && parseInt(percentage) > 0) {
+                if (docs.length > 0 && event.docsOptional != null && event.docsOptional.length === 0 && parseInt(percentage) > 0) {
                   for (let doc of docs) {
                     if ((doc.jobId == null || doc.jobId.length === 0) && (doc.ext.toLowerCase() == 'pdf' || doc.ext.toLowerCase() == 'png' || doc.ext.toLowerCase() == 'jpeg' || doc.ext.toLowerCase() == 'jpg')) {
                       flag = false
@@ -19057,7 +19271,7 @@ export class SfIEvents extends LitElement {
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
 
-
+              console.log('percentage', percentage, (eventDetailReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement).value);
               if (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
 
                 //console.log('reporter comments 3', reportercomments);
@@ -19068,7 +19282,7 @@ export class SfIEvents extends LitElement {
                 }, 3000);
 
               } else {
-                if (docs.length === 0 && docsOptional.length === 0 && parseInt(percentage) > 0) {
+                if (docs.length == 0 && event.docsOptional != null && event.docsOptional.length === 0 && parseInt(percentage) > 0) {
 
                   //console.log('reporter comments 3', reportercomments);
                   buttonClick.innerHTML = "Save"
@@ -19107,68 +19321,76 @@ export class SfIEvents extends LitElement {
                       }, 3000);
 
                     } else {
+                      let flagBulk = false;
+                      // let reportedlocations = selectReportingLocation?.value ?? "";
+                      let reportedlocations = "[]";
+                      if (parseInt(percentage) !== 100) {
+                        let selectReportedLocations = (eventDetailReportingContainer.querySelectorAll('.input-reporter-location') as NodeListOf<HTMLSelectElement>);
+                        for (let selectReportedLocation of selectReportedLocations) {
+                          reportedlocations = JSON.stringify([...JSON.parse(reportedlocations), selectReportedLocation.value])
+                        }
+                      }
+                      if (this.selectedItemIds.length <= 1) {
 
+                        if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "compliance", percentage, event.makercheckers, reportedlocations)) {
 
-                      var clickEvent = new MouseEvent("click", {
-                        "view": window,
-                        "bubbles": true,
-                        "cancelable": false
-                      });
+                          if (this.mode != "next") {
+                            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].documents = docs
+                                this.events[mmdd][p].percentage = percentage
+                                this.events[mmdd][p].reportedlocations = reportedlocations
+                                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()
+                              }
+                            }
 
-                      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
-                      let flagBulk = false;
-                      let reportinglocation = selectReportingLocation.value;
-                      if (this.selectedItemIds.length <= 1) {
+                            if (event.makercheckers.length > 0) {
 
-                        //console.log('makerscheckers', makercheckers, reportercomments);
-                        // console.log('reportformatvalues', reportformatvalues)
-                        // console.log('reportformatschema',reportformatschema)
-                        if (await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "compliance", percentage, makercheckers, reportinglocation)) {
-                          if (this.mode == "next") {
+                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
+                              for (var p = 0; p < this.events[mmdd].length; p++) {
+                                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
+                                  this.events[mmdd][p].approved = true
+                                  // 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()
+                                }
+                              }
+                            }
+                            if (this.recentlyReported[mmdd] == null) {
+                              this.recentlyReported[mmdd] = []
+                            }
+                            this.recentlyReported[mmdd].push(event)
+                            console.log('recently reported', this.recentlyReported)
+                          } else {
                             for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                              if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                              if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
                                 this.nextEvents[this.nextTabRole][mmdd][p].documents = docs
+                                this.nextEvents[this.nextTabRole][mmdd][p].percentage = percentage
+                                this.nextEvents[this.nextTabRole][mmdd][p].reportedlocations = reportedlocations
                                 this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() })
                                 this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString()
                               }
                             }
-                          } else {
-                            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) {
-                                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()
-                              }
-                            }
-                          }
-                          if (makercheckers.length > 0) {
 
-                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
-                            if (this.mode == "next") {
+                            if (event.makercheckers.length > 0) {
+
+                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
                               for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
                                   this.nextEvents[this.nextTabRole][mmdd][p].approved = true
                                   // this.events[mmdd][p].documents = docs
                                   this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() })
                                   this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString()
                                 }
                               }
-                            } else {
-                              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
-                                  // 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()
-                                }
-                              }
                             }
+                            if (this.recentlyReported[mmdd] == null) {
+                              this.recentlyReported[mmdd] = []
+                            }
+                            this.recentlyReported[mmdd].push(event)
+                            console.log('recently reported', this.recentlyReported)
                           }
-                          if (this.recentlyReported[mmdd] == null) {
-                            this.recentlyReported[mmdd] = []
-                          }
-                          this.recentlyReported[mmdd].push(event)
                         }
                       } else {
                         let bulkBody = []
@@ -19179,31 +19401,13 @@ export class SfIEvents extends LitElement {
                           //console.log('selectedid', selectedId);
 
                           const makercheckersL = selectedId.split('-')[5];
-                          entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                          locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                          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];
 
                           //console.log(entityId, locationId, eventId, mmddyyyy);
-                          // bulkBody.push({ 
-                          //   "mmddyyyy": mmddyyyy,
-                          //   "projectid": this.projectId, 
-                          //   "type": "report",
-                          //   "eventid": eventId,
-                          //   "comments": reportercomments,
-                          //   "dateofcompletion": reporterdoc,
-                          //   "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": event.module ?? "compliance"
-                          // })
+
                           // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
                           // if(parseInt(makercheckersL) > 0) {
                           //   bulkBodyReview.push({ 
@@ -19239,7 +19443,7 @@ export class SfIEvents extends LitElement {
                             "comments": reportercomments,
                             "dateofcompletion": reporterdoc,
                             "percentage": percentage,
-                            "reportinglocation": reportinglocation,
+                            "reportedlocations": reportedlocations,
                             "entityid": entityId,
                             "locationid": locationId,
                             "event": null,
@@ -19260,11 +19464,13 @@ export class SfIEvents extends LitElement {
                           // this.clearMessages();
 
                         }
+                        // await this.uploadReportsBulk(bulkBody);
 
+                        // await this.fetchBulkReportingData();
                         if (bulkBody.length > 0) {
                           await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
                         }
-                        // await this.fetchBulkReportingData();
+
                         // if(bulkBodyReview.length > 0){
                         //   await this.uploadReportsReviewsBulk(bulkBodyReview)
                         // }
@@ -19272,17 +19478,16 @@ export class SfIEvents extends LitElement {
 
                           const selectedId = this.selectedItemIds[k];
                           //console.log('selectedid', selectedId);
-                          entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                          locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                          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]
                           if (this.mode == "next") {
                             for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
                               if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-
-                                this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true
                                 flagBulk = true;
+                                this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true
                                 if (this.recentlyReported[mmdd] == null) {
                                   this.recentlyReported[mmdd] = []
                                 }
@@ -19292,9 +19497,8 @@ export class SfIEvents extends LitElement {
                           } else {
                             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;
+                                this.events[mmdd][p].isbulk = true
                                 if (this.recentlyReported[mmdd] == null) {
                                   this.recentlyReported[mmdd] = []
                                 }
@@ -19303,7 +19507,6 @@ export class SfIEvents extends LitElement {
                             }
                           }
                         }
-
                       }
 
                       if (this.mode == "next") {
@@ -19326,10 +19529,7 @@ export class SfIEvents extends LitElement {
                           // }
                         }
                       }
-
                     }
-
-
                   }
                 }
               }
@@ -19342,37 +19542,44 @@ export class SfIEvents extends LitElement {
       }
 
       if (this._SfUploader[0] != null) {
-        (this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "none"
+        if ((eventDetailReportingContainer.querySelector('.uploader-analysis-message') as HTMLDivElement) != null) {
+          (eventDetailReportingContainer.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"
+
+          if ((eventDetailReportingContainer.querySelector('.uploader-analysis-message') as HTMLDivElement) != null) {
+            (eventDetailReportingContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "block"
+          }
         });
         this._SfUploader[0].querySelector('#uploader').addEventListener('analysisCompleted', (_ev: any) => {
           console.log('uploader analysisInProgress', _ev);
-          if ((this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement) != null) {
-            (this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "none"
+          if ((eventDetailReportingContainer.querySelector('.uploader-analysis-message') as HTMLDivElement) != null) {
+            (eventDetailReportingContainer.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;
+        if (event.documentType != null) {
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.docType = event.documentType;
         } else {
-          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.docType = ""
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.docType = "";
         }
 
         (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)!.current = 0;
         (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)!.current = docs.length;
           (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
         }
 
-        if (this.myRole == this.TAB_APPROVER || approved) {
+        if (this.myRole == this.TAB_APPROVER || event.approved) {
           (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.readOnly = true;
           (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
         } else {
@@ -19383,8 +19590,8 @@ export class SfIEvents extends LitElement {
         const dataPassthrough = {
           projectId: this.projectId,
           countryId: this.countryId,
-          entityId: entityId,
-          locationId: locationId,
+          entityId: event.entityid,
+          locationId: event.locationid,
           mmddyyyy: mmddyyyy,
           complianceId: event['id'],
           path: "uploadextract"
@@ -19398,6 +19605,7 @@ export class SfIEvents extends LitElement {
         (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('uploader prepopulate', (this._SfUploader[0].querySelector('#uploader') as SfIUploader).prepopulatedInputArr, (this._SfUploader[0].querySelector('#uploader') as SfIUploader).extract)
 
       }
 
@@ -19409,50 +19617,32 @@ export class SfIEvents extends LitElement {
         if (event["approved"] != null) {
           if (event["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 ((eventDetailReportingContainer.querySelector('#input-approve-yes') as HTMLInputElement) != null) {
+              (eventDetailReportingContainer.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;
+            if ((eventDetailReportingContainer.querySelector('#input-approve-no') as HTMLInputElement) != null) {
+              (eventDetailReportingContainer.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 ((eventDetailReportingContainer.querySelector('#input-approve-yes') as HTMLInputElement) != null) {
+              (eventDetailReportingContainer.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;
+            if ((eventDetailReportingContainer.querySelector('#input-approve-no') as HTMLInputElement) != null) {
+              (eventDetailReportingContainer.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 (eventDetailReportingContainer.querySelector('#input-approve-yes') as HTMLInputElement != null) {
+            (eventDetailReportingContainer.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;
+          if ((eventDetailReportingContainer.querySelector('#input-approve-no') as HTMLInputElement) != null) {
+            (eventDetailReportingContainer.querySelector('#input-approve-no') as HTMLInputElement).checked = true;
           }
-
         }
       }
-
     }
-
-    this.fetchStatuteDefinitionDetails(statuteName);
-    console.log('customreporting', event['customreporting'])
-    if (event['customreporting'] != null) {
-      let reportingContainer = (this._SfDetailContainer as HTMLDivElement)
-      if (reportingContainer.querySelector('#report-format-container') != null) {
-        reportingContainer.querySelector('#report-format-container')!.innerHTML = `<slot name="reporting"></slot>`;
-        console.log('innerhtml', reportingContainer.querySelector('#report-format-container')!.innerHTML);
-        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).name = event.obligationtitle;
-        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).mode = "edit";
-        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).configjson = event['customreporting'];
-        // if(reportformatvalues != ""){
-        //   (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).prepopulateValJson = reportformatvalues
-        // }
-        (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).loadMode();
-      }
-    } else if (event['reportformat'] != null && event['reportformat'].length > 0) {
-      this.fetchReportFormat((this._SfDetailContainer as HTMLDivElement), reportformatName, event['reportformatschema'] ?? "", event['reportformatvalues'] ?? "");
+    if (event['reportformat'] != null && event['reportformat'].length > 0) {
+      this.fetchReportFormat(eventDetailReportingContainer, reportformatName, event['reportformatschema'] ?? "", event['reportformatvalues'] ?? "");
     }
   }
 
@@ -27884,7 +28074,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  sendSuggestions = async (eventid: string, eventdelta:any) => {
+  sendSuggestions = async (eventid: string, eventdelta: any) => {
     let url = "https://" + this.apiIdRCMResources + "/sendsuggestions";
 
     const body = {
@@ -29323,7 +29513,7 @@ export class SfIEvents extends LitElement {
     let url = "https://" + this.apiId + "/markreviewed";
 
     //console.log('fetch calendar url', url);
-    let urlBody: any = { "projectid": this.projectId, "eventid": suspenseKey.split(';')[2], "entityid": suspenseKey.split(';')[0], "locationid": suspenseKey.split(';')[1], "year": year, "mark" : review };
+    let urlBody: any = { "projectid": this.projectId, "eventid": suspenseKey.split(';')[2], "entityid": suspenseKey.split(';')[0], "locationid": suspenseKey.split(';')[1], "year": year, "mark": review };
 
     //console.log('urlbody', urlBody);
 
@@ -31081,7 +31271,6 @@ export class SfIEvents extends LitElement {
         let listReportingContainer = nextEventsContainer.querySelector('#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLDivElement
         console.log('mmddyyyy', eventsData[role][mmdd][j], listReportingContainer, '#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j);
         if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
-          4
           this.renderListReporting(listReportingContainer, eventsData[role][mmdd][j], mmdd + '/' + yyyy, nextEventsContainer)
         } else {
           listReportingContainer.innerHTML = '';