sf-i-events 1.0.966 → 1.0.968

package/src/sf-i-events.ts

@@ -4842,7 +4842,7 @@ export class SfIEvents extends LitElement {
 
   }
 
-  renderCalendarRowDivItemDivStart = (mmdd: string, event: any, itemNumber: number, partStatus: string, bgStatus: string) => {
+  renderCalendarRowDivItemDivStart = (mmdd: string, event: any, itemNumber: number, partStatus: string, bgStatus: string, fromDrilldown: boolean) => {
 
     var html = '';
 
@@ -4899,7 +4899,7 @@ export class SfIEvents extends LitElement {
     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;
+    const showReportingButton = !hasReportFormat && !hasCustomReporting && event.concise != null && !isReportedLocation && !fromDrilldown;
     const showLocationRisk = event.concise != null;
     const configHome = Util.getProjectConfigHome();
     const showReview = event.concise != null && configHome.features != null && configHome.features.indexOf("understood") >= 0;
@@ -5276,7 +5276,7 @@ export class SfIEvents extends LitElement {
     return graphParam;
   }
 
-  renderCalendarAnnotations = (event: any, mmdd: string, j: number) => {
+  renderCalendarAnnotations = (event: any, mmdd: string, j: number, fromDrilldown: boolean) => {
 
     var html = '';
 
@@ -5289,7 +5289,7 @@ export class SfIEvents extends LitElement {
     // console.log("graphParam", graphParam.split(';')[0]);
     const configHome = Util.getProjectConfigHome();
     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>';
+    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)) && !fromDrilldown) ? ('<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;
@@ -5691,13 +5691,13 @@ export class SfIEvents extends LitElement {
             }
           }
 
-          html += this.renderCalendarRowDivItemDivStart(mmdd, this.events[mmdd][j], j, partStatus, bgStatus);
+          html += this.renderCalendarRowDivItemDivStart(mmdd, this.events[mmdd][j], j, partStatus, bgStatus, fromDrilldown);
           // if (this.events[mmdd][j]["countryname"] != null) {
           if (this.events[mmdd][j]["concise"] == null) {
             html += this.renderCalendarRowDivItemDivTableHead(this.events[mmdd][j], partStatus);
             html += this.renderCalendarRowDivItemDivTableBody(this.events[mmdd][j], partStatus, lateStatus, complianceStatus, mmdd, i, j);
           }
-          html += this.renderCalendarAnnotations(this.events[mmdd][j], mmdd, j);
+          html += this.renderCalendarAnnotations(this.events[mmdd][j], mmdd, j, fromDrilldown);
           html += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j + '"></div>'
           html += this.renderCalendarRowDivItemDivEnd();
 
@@ -10499,13 +10499,13 @@ export class SfIEvents extends LitElement {
     this.renderOnboardingCalendar(calendarJobs);
   }
 
-  loadOnboardingSuspense = async () => {
+  loadOnboardingSuspense = async (year: string = this.getCurrentYearGeneric()) => {
     this.hideTabContainers();
     (this._SfOnboardingSuspenseContainer as HTMLDivElement).style.display = 'flex';
     const mappedSerializedLocations = await this.fetchMappedSerializedLocations();
-    const suspenseList = await this.fetchSuspenseList();
+    const suspenseList = await this.fetchSuspenseList(year);
     console.log('suspenseList', suspenseList);
-    this.renderOnboardingSuspense(mappedSerializedLocations, suspenseList);
+    this.renderOnboardingSuspense(mappedSerializedLocations, suspenseList, year);
   }
 
   calculateStartAndEndDateOfPast = (index: number = 0) => {
@@ -14224,46 +14224,9 @@ export class SfIEvents extends LitElement {
     html += `
       <div id="list-container" class="list-container m-20 pb-20" part="list-container"></div>
     `;
-    // html += `
-    //   <sf-i-events id="statistics-drilldown" name="Statistics" apiid="dwqyez2puoxmu.cloudfront.net/event" exportparts="detail-container" mode="viewer"
-    //     apiidtags="${this.apiIdTags}"
-    //     apiidusers="${this.apiIdUsers}"
-    //     apiidstatutes="${this.apiIdStatutes}"
-    //     apiiddefinitions="${this.apiIdDefinitions}"
-    //     apiidreportformats="${this.apiidReportformats}"
-    //     apiidnotices="${this.apiIdNotices}"
-    //     apiidagreements="${this.apiIdAgreements}"
-    //     apiidlicenses="${this.apiIdLicenses}" username="${username}"
-    //     userprofileid="${userid}" projectid="${this.projectId}"
-    //     projectname="${this.projectName}" ${filterString}
-    //     myrole="${rolestr}" showregisterexport="false"
-    //     features="${this.features.replace(/"/g, "&quot;")}"
-    //     selectedfeatures="${JSON.stringify(this.selectedFeatures).replace(/"/g, "&quot;")}"
-    //     eventfielddependencies="${this.eventFieldDependencies.replace(/"/g, "&quot;")}"
-    //     eventfields="${this.eventFields.replace(/"/g, "&quot;")}"
-    //     eventpreviewfields="${this.eventPreviewFields.replace(/"/g, "&quot;")}"
-    //     eventhidefields="${this.eventHideFields.replace(/"/g, "&quot;")}"
-    //     calendarstartdd="${this.calendarStartDD}" calendarstartmm="${this.calendarStartMM}" calendarstartyyyy="${this.calendarStartYYYY}"
-    //     sdate="${this.sdate}" edate="${this.edate}"
-    //     flowgraphcompleteness="${this.FLOW_GRAPH_COMPLETENESS}">
-
-    //     <div slot="uploader">
-    //       <sf-i-uploader id="uploader" max="10" apiid="1peg5170d3"
-    //         allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]"
-    //         extract="yes" projectid="${this.projectId}" maxsize="31457280"
-    //         allowdownload="yes"></sf-i-uploader>
-    //     </div>
-    //     <div slot="reporting">
-    //       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
-    //     </div>
-
-    //   </sf-i-events>
-    // `;
     (this._SfDetailListContainer as HTMLDivElement).style.display = 'block';
     (this._SfDetailListContainer as HTMLDivElement).innerHTML = html;
 
-    // this.renderRangeEvents(new Date(this.sdate), ((new Date(this.edate).getTime()) - new Date(this.sdate).getTime()) / (1000 * 60 * 60 * 24), (this._SfDetailListContainer as HTMLDivElement).querySelector('.list-container') as HTMLDivElement);
-
     const lastDay = ((new Date(this.edate).getTime()) - new Date(this.sdate).getTime()) / (1000 * 60 * 60 * 24)
     let firstDay = new Date((new Date(this.sdate)).getFullYear(), (new Date(this.sdate)).getMonth(), (new Date(this.sdate)).getDate());
     let endDay = new Date((new Date(this.sdate)).getFullYear(), (new Date(this.sdate)).getMonth(), (new Date(this.sdate)).getDate());
@@ -14295,13 +14258,175 @@ export class SfIEvents extends LitElement {
 
     });
 
-    // let statisticsDrilldown = (this._SfDetailContainer as HTMLDivElement).querySelector('#statistics-drilldown') as SfIEvents;
-    // statisticsDrilldown.sdate = this.sdate
-    // statisticsDrilldown.edate = this.edate
-    // statisticsDrilldown.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
-    // setTimeout(() => {
-    //   statisticsDrilldown.loadMode();
-    // }, 1000);
+    const buttonArr = (this._SfDetailListContainer as HTMLDivElement).querySelectorAll('.button-expand') as NodeListOf<HTMLButtonElement>;
+
+    for (i = 0; i < buttonArr.length; i++) {
+      let indexPrevNext = i;
+      buttonArr[i].addEventListener('click', (ev: any) => {
+        const id = ev.target.id;
+        const idArr = id.split("-")
+        const mmdd = idArr[3] + "/" + idArr[4];
+        const j = idArr[5];
+        const module = idArr[6];
+        var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+        if (module === "notice") {
+          this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "contract") {
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else {
+          let found = false;
+          for (var k = 0; k < this.selectedItemIds.length; k++) {
+            console.log('selectedItems', this.selectedItemIds[k], idArr[3] + '-' + idArr[4] + '-' + idArr[5], this.selectedItemIds[k].indexOf(idArr[3] + '-' + idArr[4] + '-' + idArr[5]));
+            if (this.selectedItemIds[k].indexOf(idArr[3] + '-' + idArr[4] + '-' + idArr[5]) >= 0) {
+              found = true;
+            }
+          }
+          if (!found) {
+            this.selectedItemIds = [];
+            this.clearButtonSelection();
+          }
+
+          // (this._SfDetailContainer as HTMLDivElement).style.display = 'block';
+
+          //console.log('commentsinlist', (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-month-'+this.currentColumnIndex) as HTMLButtonElement, this.events[mmdd][j].comments, mmdd, j);
+
+
+          let prevString = "";
+          let flagPrev = true;
+          let indexPrev = indexPrevNext
+          while (flagPrev) {
+            if (indexPrev > 0) {
+              if (Util.isVisible((buttonArr[indexPrev - 1] as HTMLButtonElement))) {
+                prevString = (buttonArr[indexPrev - 1] as HTMLButtonElement).id;
+                flagPrev = false;
+              } else {
+                prevString = "";
+                indexPrev--
+              }
+            } else {
+              flagPrev = false;
+            }
+          }
+          let nextString = "";
+          let flagNext = true;
+          let indexNext = indexPrevNext
+          while (flagNext) {
+            if (indexNext < buttonArr.length - 1) {
+              if (Util.isVisible((buttonArr[indexNext + 1] as HTMLButtonElement))) {
+                nextString = (buttonArr[indexNext + 1] as HTMLButtonElement).id;
+                flagNext = false;
+              } else {
+                nextString = "";
+                indexNext++
+              }
+            } else {
+              flagNext = false;
+            }
+          }
+          // this.renderEventDetail(this.events[mmdd][j], mmdd + "/" + yyyy, (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-month-'+this.currentColumnIndex) as HTMLButtonElement);
+          // console.log('errorFetchEvent', mmdd, j, buttonArr[i].outerHTML, idArr);
+          console.log('previous event clicked', buttonArr[indexPrevNext - 1], prevString, indexPrevNext);
+          this.fetchEventDetails(this.events[mmdd][j], mmdd + "/" + yyyy, (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-month-' + this.currentColumnIndex) as HTMLButtonElement, this._SfStreamContainer as HTMLDivElement, prevString, nextString, false, null, null, null, null, null, null, null, true);
+        }
+
+      })
+
+    }
+
+    const titleArr = (this._SfDetailListContainer as HTMLDivElement).querySelectorAll('.button-event-title') as NodeListOf<HTMLButtonElement>;
+
+    for (var i = 0; i < titleArr.length; i++) {
+      let indexPrevNext = i;
+      titleArr[i].addEventListener('click', (ev: any) => {
+
+        const id = ev.target.id;
+        const idArr = id.split("-")
+        const mmdd = idArr[3] + "/" + idArr[4];
+        const j = idArr[5];
+        const module = idArr[6];
+        const flag = idArr[7];
+        if (flag != null && flag == "reportedlocations") {
+          return;
+        }
+        var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+        if (module === "notice") {
+          this.renderNoticeDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "contract") {
+          this.fetchContractDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "license") {
+          this.fetchLicenseDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else if (module === "rcmresource") {
+          this.fetchRCMResourceDetails(this.events[mmdd][j], mmdd + "/" + yyyy)
+        } else {
+          let found = false;
+          for (var k = 0; k < this.selectedItemIds.length; k++) {
+            if (this.selectedItemIds[k].indexOf(idArr[3] + '-' + idArr[4] + '-' + idArr[5]) >= 0) {
+              found = true;
+            }
+          }
+          if (!found) {
+            this.selectedItemIds = [];
+            this.selectedItems = [];
+            this.clearButtonSelection();
+          }
+
+          // (this._SfDetailContainer as HTMLDivElement).style.display = 'block'
+
+
+          let prevString = "";
+          let flagPrev = true;
+          let indexPrev = indexPrevNext
+          while (flagPrev) {
+            if (indexPrev > 0) {
+              if (Util.isVisible((titleArr[indexPrev - 1] as HTMLButtonElement))) {
+                prevString = (titleArr[indexPrev - 1] as HTMLButtonElement).id;
+                let prevIdArr = prevString.split("-")
+                if ((prevIdArr[7] ?? "") == "reportedlocations") {
+                  prevString = "";
+                  indexPrev--;
+                } else {
+                  flagPrev = false;
+                }
+              } else {
+                prevString = "";
+                indexPrev--;
+              }
+            } else {
+              flagPrev = false;
+            }
+          }
+          let nextString = "";
+          let flagNext = true;
+          let indexNext = indexPrevNext
+          while (flagNext) {
+            if (indexNext < titleArr.length - 1) {
+              if (Util.isVisible((titleArr[indexNext + 1] as HTMLButtonElement))) {
+                nextString = (titleArr[indexNext + 1] as HTMLButtonElement).id;
+                let nextIdArr = nextString.split("-")
+                if ((nextIdArr[7] ?? "") == "reportedlocations") {
+                  nextString = "";
+                  indexNext++;
+                } else {
+                  flagNext = false;
+                }
+              } else {
+                indexNext++;
+              }
+            } else {
+              flagNext = false;
+            }
+          }
+          // this.renderEventDetail(this.events[mmdd][j], mmdd + "/" + yyyy, null);
+          this.fetchEventDetails(this.events[mmdd][j], mmdd + "/" + yyyy, null, (this._SfStreamContainer as HTMLDivElement), prevString, nextString, false, null, null, null, null, null, null, null, true);
+        }
+      })
+
+    }
+
   }
   renderEventDetailShort = (compliance: any) => {
     var html = `
@@ -18049,7 +18174,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, previousId: string = "", nextId: string = "", flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null, reportercomments: string | null = null, approvercomments: string | null = null, inputReportingPercentage: string | null = null, selectReportedLocation: string | null = null, documents: any | null = null, dateOfCompletion: string | null = null) => {
+  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, previousId: string = "", nextId: string = "", flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null, reportercomments: string | null = null, approvercomments: string | null = null, inputReportingPercentage: string | null = null, selectReportedLocation: string | null = null, documents: any | null = null, dateOfCompletion: string | null = null, fromDrilldown: boolean = false) => {
     console.log('listEvent', listEvent, listEvent.id)
     let url = "https://" + this.apiId + "/getalleventdetails";
 
@@ -18091,7 +18216,7 @@ export class SfIEvents extends LitElement {
           this.renderListReporting(listEventContainer, data, mmddyyyy, eventsContainer)
         }
       } else {
-        this.renderEventDetail(jsonRespose.data, mmddyyyy, currentColumnButton, eventsContainer, previousId, nextId);
+        this.renderEventDetail(jsonRespose.data, mmddyyyy, currentColumnButton, eventsContainer, previousId, nextId, fromDrilldown);
       }
 
     } else {
@@ -18113,7 +18238,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  renderEventDetail = (event: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, previousId: string, nextId: string) => {
+  renderEventDetail = (event: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, previousId: string, nextId: string, fromDrilldown: boolean) => {
     console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
     console.log('previousid', previousId, 'nextid', nextId);
     console.log('confighome', Util.getProjectConfigHome())
@@ -18473,7 +18598,7 @@ export class SfIEvents extends LitElement {
     html += '</div>';
 
     if (this.mode == "consumer" || this.mode == "next" || this.mode == "viewer") {
-      if (this.mode != "viewer") {
+      if (this.mode != "viewer" && !fromDrilldown) {
         html += '<div part="reporting-view-container" id="reporting-view-container">'
         html += this.renderReporting(event, mmddyyyy);
         html += "</div>"
@@ -22462,7 +22587,21 @@ export class SfIEvents extends LitElement {
 
   }
 
-  renderOnboardingSuspense = (sourceArray: any, suspenseList: any) => {
+  getAllPastFiscals = (startDate: Date) => {
+    let retArr = []
+    let date = new Date()
+    while (date.getTime() > startDate.getTime()) {
+      if (date.getMonth() < 3) {
+        retArr.push(date.getFullYear() - 1)
+      } else {
+        retArr.push(date.getFullYear())
+      }
+      date.setFullYear(date.getFullYear() - 1)
+    }
+    return retArr;
+  }
+
+  renderOnboardingSuspense = (sourceArray: any, suspenseList: any, year: string) => {
 
     console.log('sourceList', sourceArray);
     console.log('suspenseList', suspenseList);
@@ -22492,8 +22631,13 @@ export class SfIEvents extends LitElement {
         changed++;
       }
     }
-
-    html += ('<div class="left-sticky d-flex justify-between align-center mr-10"><h4 id="mapped-stats-title" part="results-title" class="d-flex align-center m-0">' + status + '&nbsp;&nbsp; ' + tagged + ' in Suspense List out of ' + sourceArray.data.mappings.mappings.length + '</h4></div>');
+    let pastFiscals = [parseInt(this.getCurrentYearGeneric())]
+    if(this.contractStartDate != null) {
+      pastFiscals = this.getAllPastFiscals(new Date(this.contractStartDate));
+    }
+    html += (`<div class="left-sticky d-flex justify-between align-center mr-10"><h4 id="mapped-stats-title" part="results-title" class="d-flex align-center m-0">${status}&nbsp;&nbsp; ${tagged} in Suspense List out of ${sourceArray.data.mappings.mappings.length}</h4><h6 class="ml-20" part="onboarding-suspense-year-label">Year</h6><select id="select-year" part="input">${pastFiscals.map((fiscal) => {
+        return `<option value="${fiscal}"${fiscal == parseInt(year) ? " selected" : ""}>${fiscal}-${(fiscal % 100) + 1}</option>`
+    })}</select></div>`);
 
 
     if (changed > 0) {
@@ -22646,6 +22790,11 @@ export class SfIEvents extends LitElement {
     html += '</div>';
 
     (this._SfOnboardingSuspenseContainer as HTMLDivElement).innerHTML = html;
+    const inputYear = (this._SfOnboardingSuspenseContainer as HTMLDivElement).querySelector('#select-year') as HTMLSelectElement;
+    inputYear.addEventListener('change', (e: any) => {
+      const selectedYear = e.currentTarget.value;
+      this.loadOnboardingSuspense(selectedYear);
+    })
 
     const buttonApply = (this._SfOnboardingSuspenseContainer as HTMLDivElement).querySelector('.button-apply') as HTMLButtonElement;
     buttonApply.addEventListener('click', () => {
@@ -22659,15 +22808,15 @@ export class SfIEvents extends LitElement {
           tempSuspenseList[suspenseKey] = true
         }
       }
-      this.renderOnboardingSuspense(sourceArray, tempSuspenseList)
+      this.renderOnboardingSuspense(sourceArray, tempSuspenseList, year)
     })
 
     const buttonSave = (this._SfOnboardingSuspenseContainer as HTMLDivElement).querySelector('.button-save') as HTMLButtonElement;
     buttonSave.addEventListener('click', async () => {
       console.log('saving suspense', suspenseList, Object.keys(suspenseList).length);
-      let response = await this.uploadMappedSuspense(suspenseList)
+      let response = await this.uploadMappedSuspense(suspenseList, year)
       console.log('suspense save response', response);
-      this.loadOnboardingSuspense()
+      this.loadOnboardingSuspense(year)
     })
 
     const buttonToggleMoreBack = (this._SfOnboardingSuspenseContainer as HTMLDivElement).querySelector('.button-toggle-more-back') as HTMLButtonElement;
@@ -22701,6 +22850,9 @@ export class SfIEvents extends LitElement {
               tempCsvObj['cols_' + colKey] = dataArr[j]
             }
           }
+          let suspenseKey = tempCsvObj.entityid + ';' + tempCsvObj.locationid + ';' + tempCsvObj.id;
+          tempCsvObj.suspense = (suspenseList[suspenseKey] != null && suspenseList[suspenseKey] != false) ? true : false;
+
           csvArray[i] = tempCsvObj
         }
         console.log('csv array', csvArray)
@@ -22751,7 +22903,7 @@ export class SfIEvents extends LitElement {
             },
             () => {
               this.clearMessages();
-              this.renderOnboardingSuspense(sourceArray, tempSuspenseList);
+              this.renderOnboardingSuspense(sourceArray, tempSuspenseList, year);
             }
           ])
           // let tempObj:any = {"data":{"mappings":{"mappings":tempArr}}}
@@ -28028,7 +28180,7 @@ export class SfIEvents extends LitElement {
     await this.uploadOnboardingMapping(data, 'countries');
   }
 
-  uploadMappedSuspense = async (data: any) => {
+  uploadMappedSuspense = async (data: any, year: string) => {
 
     //console.log('uploading..', data);
 
@@ -28037,6 +28189,7 @@ export class SfIEvents extends LitElement {
     const body = {
       "projectid": this.projectId,
       "data": JSON.stringify(data),
+      "year": year
     }
 
     let authorization: any = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
@@ -30102,11 +30255,13 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  fetchSuspenseList = async () => {
+  fetchSuspenseList = async (year: string = "") => {
 
     let url = "https://" + this.apiId + "/getsuspenselist1";
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-    const year = this.getCurrentYearGeneric();
+    if (year == "") {
+      year = this.getCurrentYearGeneric();
+    }
     const xhr: any = (await this.prepareXhr({ "projectid": this.projectId, "year": year }, url, this._SfLoader, authorization)) as any;
     this._SfLoader.innerHTML = '';
     if (xhr.status == 200) {
@@ -30816,7 +30971,7 @@ export class SfIEvents extends LitElement {
     this.edate = endDate;
 
 
-    path = "getstatistics";
+    path = "getstatistics1";
 
     let sDate = "";
     let eDate = "";
@@ -32047,15 +32202,15 @@ export class SfIEvents extends LitElement {
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     console.log('this.myroles', this.myroles)
-    const xhr: any = (await this.prepareXhr({ "projectid": this.projectId, "userprofileid": this.userProfileId }, url, this._SfLoader, authorization)) as any;
+    const xhr: any = (await this.prepareXhr({ "projectid": this.projectId, "userprofileid": this.userProfileId, "year": this.calendarStartYYYY }, url, this._SfLoader, authorization)) as any;
     this._SfLoader.innerHTML = '';
     if (xhr.status == 200) {
 
       const jsonRespose = JSON.parse(xhr.responseText);
       let arrReports = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
-      console.log('reports response', arrReports);
-      console.log('report', arrReports['3/31/*,30;c989a44e-7d3d-427e-b712-90eacf585075;38dc8c53-643f-4fee-83fe-f15239606277;0a5fb99f-c36f-46c0-85b4-7fa3d48fa134']);
+      console.log('reports response', Object.keys(arrReports).length);
+      console.log('report', arrReports);
       this.renderReports(arrReports)
     } else {
       if (xhr.status == 401) {
@@ -32094,6 +32249,7 @@ export class SfIEvents extends LitElement {
       html += '<th part="td-head">Comments</th>'
       html += '<th part="td-head">LastUpdated</th>'
       html += '<th part="td-head">CompletionDate</th>'
+      html += '<th part="td-head">Location</th>'
       html += '<th part="td-head">Compliance</th>'
       html += '</tr>';
 
@@ -32105,25 +32261,31 @@ export class SfIEvents extends LitElement {
       html += `<td part="td-body">${report['comments'].length}</td>`;
       html += `<td part="td-body">${Util.getDateTimeStrings(new Date(report['lastupdated']).getTime())}</td>`;
       html += `<td part="td-body">${new Date(parseInt(report['dateofcompletion'])).toLocaleDateString('en-US', { timeZone: 'Asia/Kolkata' })}</td>`;
-      html += '<th part="td-head">';
-
-      // const jsonReportEvent = JSON.parse(report['comments'].reportevent);
-      console.log('jsonReportEvent', report['event']);
+      let locationname = ""
+      let eventHtml = ""
       if (report['event'] != null) {
-        html += '<table>';
-        html += '<tr>';
+        locationname = JSON.parse(report['event'])['locationname'] ?? "";
         for (var i = 0; i < Object.keys(JSON.parse(report['event'])).length; i++) {
-
           if (!this.EXCLUDE_COLS_FROM_REGS.includes(Object.keys(JSON.parse(report['event']))[i].toLowerCase())) {
 
-            html += '<td part="td-body-register">';
-            html += ('<span part="td-head" style="padding-left: 0px !important">' + Object.keys(JSON.parse(report['event']))[i] + '</span>');
-            html += ('<span part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + JSON.parse(report['event'])[Object.keys(JSON.parse(report['event']))[i]] + '" lineSize="4" minLength="60"></sf-i-elastic-text>' + '</span>');
-            html += '</td>';
+            eventHtml += '<td part="td-body-register">';
+            eventHtml += ('<span part="td-head" style="padding-left: 0px !important">' + Object.keys(JSON.parse(report['event']))[i] + '</span>');
+            eventHtml += ('<span part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + JSON.parse(report['event'])[Object.keys(JSON.parse(report['event']))[i]] + '" lineSize="4" minLength="60"></sf-i-elastic-text>' + '</span>');
+            eventHtml += '</td>';
 
           }
 
         }
+      }
+      html += `<td part="td-body">${locationname}</td>`;
+      html += '<th part="td-head">';
+
+      // const jsonReportEvent = JSON.parse(report['comments'].reportevent);
+      // console.log('jsonReportEvent', report['event']);
+      if (report['event'] != null) {
+        html += '<table>';
+        html += '<tr>';
+        html += eventHtml;
         html += '</tr>';
         html += '</table>';
       }
@@ -32268,15 +32430,42 @@ export class SfIEvents extends LitElement {
     html += '<button id="button-reports-date-selector-back" part="button-icon" class="button-icon"><span class="material-icons">keyboard_backspace</span></button>'
     html += '</div>'
     html += '<label part="input-label" class="mt-20">Select Date</label>'
-    html += '<input part="input" id="input-compliance-date" type="date" class="w-100-m-0" mandatory="" autocomplete="off" style="display: block;">'
+    html += `<input id="input-compliance-date" part="input-text" class="input-text mb-20" type="date" />`
+    html += `<sf-i-form id="input-location-tags" name="Tags" label="Select Location" apiId="${this.apiIdTags}" mode="select" searchPhrase="${this.projectName}&Location" selectProjection="name" ignoreProjections="[&quot;updatetype&quot;,&quot;project&quot;,&quot;tagtype&quot;,&quot;shortid&quot;,&quot;shortnumid&quot;,&quot;lastmodifiedby&quot;,&quot;lastmodifiedtime&quot;]" mandatory></sf-i-form>`
     // html += '<button id="button-reports-date-selector-back" class="button-back" part="button">back</button>';
     html += '</div>';
     (this._SfIEventsC.querySelector('#reports-data') as HTMLDivElement).innerHTML = html;
     let inputComplianceDate = (this._SfIEventsC.querySelector('#input-compliance-date') as HTMLInputElement)
+    let inputLocationForm = (this._SfIEventsC.querySelector('#input-location-tags') as SfIForm);
+
     inputComplianceDate.addEventListener('change', (ev: any) => {
       let selectedDate = new Date((ev.target as HTMLInputElement).value)
-      this.fetchReportCompliances(selectedDate, sortid)
+      let selectedLocation = inputLocationForm.selectedValues()[0];
+      if (selectedLocation == null || selectedLocation == '') {
+        return;
+        // let locationId = sortid.split(';')[2]
+        // selectedLocation = locationId;
+      }
+      this.fetchReportCompliances(selectedDate, selectedLocation, sortid)
     })
+    let locationId = sortid.split(';')[2]
+    inputLocationForm.selectedSearchId = locationId;
+    inputLocationForm.loadMode();
+    inputLocationForm.addEventListener('valueChanged', (ev: any) => {
+      let form = ev.target as SfIForm
+      let selectedDate = new Date((inputComplianceDate as HTMLInputElement).value)
+      if (selectedDate.toString() == 'Invalid Date') {
+        return;
+        // let mmddyyyy = sortid.split(';')[0];
+        // let mm = mmddyyyy.split('/')[0];
+        // let dd = mmddyyyy.split('/')[1];
+        // let yyyy = mmddyyyy.split('/')[2];
+        // selectedDate = new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
+      }
+      let selectedLocation = form.selectedValues()[0];
+      this.fetchReportCompliances(selectedDate, selectedLocation, sortid)
+    })
+
     let buttonBack = (this._SfIEventsC.querySelector('#button-reports-date-selector-back') as HTMLButtonElement)
     buttonBack.addEventListener('click', () => {
       this.fetchReports()
@@ -32284,10 +32473,10 @@ export class SfIEvents extends LitElement {
 
   }
 
-  fetchReportCompliances = async (selectedDate: Date, sortid: string) => {
+  fetchReportCompliances = async (selectedDate: Date, locationid: string, sortid: string) => {
     console.log('fetching compliances', sortid)
     let complianceEntityId = sortid.split(';')[1]
-    let complianceLocationId = sortid.split(';')[2]
+    // let complianceLocationId = sortid.split(';')[2]
     let url = "https://" + this.apiId + "/getallcountryevents5";
     let sDateObj = selectedDate
     sDateObj.setDate(selectedDate.getDate() - 60)
@@ -32310,7 +32499,7 @@ export class SfIEvents extends LitElement {
       day = '0' + day;
     let eDate = month + "/" + day + "/" + year
     //console.log('fetch calendar url', url);
-    let urlBody: any = { "projectid": this.projectId, "userprofileid": this.userProfileId, "role": this.myRole, "entityid": complianceEntityId, "countryid": "", "functionid": "", "locationid": complianceLocationId, "tagid": this.tagId, "adhoc": "false", "exclusivestartkey": 0, "sdate": sDate, "edate": eDate, "view": "location", "year": this.calendarStartYYYY };
+    let urlBody: any = { "projectid": this.projectId, "userprofileid": this.userProfileId, "role": this.myRole, "entityid": complianceEntityId, "countryid": "", "functionid": "", "locationid": locationid, "tagid": this.tagId, "adhoc": "false", "exclusivestartkey": 0, "sdate": sDate, "edate": eDate, "view": "location", "year": this.calendarStartYYYY };
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing')) as any;
     this._SfLoader.innerHTML = '';
@@ -32321,7 +32510,7 @@ export class SfIEvents extends LitElement {
       let arrCompliances = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete);
       console.log('receivedCompliacnes', arrCompliances)
-      this.renderReportsComplainces(arrCompliances, sortid);
+      this.renderReportsCompliances(arrCompliances, sortid);
     } else {
       if (xhr.status == 401) {
         let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
@@ -32344,7 +32533,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  renderReportsComplainces = (compliancesData: any, sortid: string) => {
+  renderReportsCompliances = (compliancesData: any, sortid: string) => {
     let eventsData: any = {}
     let complianceId = sortid.split(';')[3]
     console.log('renderReportsComplainces', compliancesData, complianceId);