sf-i-events 1.0.922 → 1.0.924

package/dev/index.html

@@ -838,12 +838,12 @@
     eventhidefields="["comments","documents","lastupdated","approved","tags"]"
     blocksize="10" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2025">
     <div slot="uploader"><sf-i-uploader id="uploader" max="10" apiid="1peg5170d3"
-        allowedextensions="[&quot;jpg&quot;,&quot;jpeg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]"
+        allowedextensions="[&quot;jpg&quot;,&quot;jpeg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;,&quot;zip&quot;]"
         extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" 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> -->
-  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
@@ -853,8 +853,8 @@
     apiidrcmresources="jra3sghasmaxn5aiq7rtv6pjzq0oeuaw.lambda-url.us-east-1.on.aws" fill="solid"
     username="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410"
     projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global"
-    countryid="8ee18117-0cca-49be-80f4-1f712d871fef" selectedcriteria="Country - Singapore" myrole="reporter"
-    showregisterexport="false"
+    entityid="c989a44e-7d3d-427e-b712-90eacf585075" locationid="38dc8c53-643f-4fee-83fe-f15239606277"
+    selectedcriteria="Location - Mumbai" myrole="reporter" showregisterexport="false"
     features="[&quot;notices&quot;,&quot;contracts&quot;,&quot;licenses&quot;,&quot;rcmresources&quot;]"
     eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]"
     eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]"
@@ -864,7 +864,7 @@
 
     <div slot="uploader">
       <sf-i-uploader id="uploader" max="10" apiid="1peg5170d3"
-        allowedextensions="[&quot;jpg&quot;,&quot;jpeg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]"
+        allowedextensions="[&quot;jpg&quot;,&quot;jpeg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;,&quot;zip&quot;]"
         extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="31457280"
         allowdownload="yes"></sf-i-uploader>
     </div>
@@ -872,8 +872,8 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events> -->
-  <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  </sf-i-events>
+  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
@@ -901,7 +901,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events>
+  </sf-i-events> -->
   <!-- <sf-i-events id="sf-i-events-next" name="Next Compliances" apiid="dwqyez2puoxmu.cloudfront.net/event"
     apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.922",
+  "version": "1.0.924",
   "description": "Superflows Navigation Component",
   "main": "sf-i-events.js",
   "module": "sf-i-events.js",

package/sf-i-events.d.ts

@@ -292,6 +292,7 @@ export declare class SfIEvents extends LitElement {
     changedOnboardingItemIds: string[];
     selectedCountryIndex: number;
     selectedRegisterIndex: number;
+    showReportedLocations: boolean;
     selectallblock: string;
     graphFilter: string;
     recentlyReported: any;

package/sf-i-events.js

@@ -1250,6 +1250,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.changedOnboardingItemIds = [];
         this.selectedCountryIndex = 0;
         this.selectedRegisterIndex = -1;
+        this.showReportedLocations = false;
         this.selectallblock = "100";
         this.graphFilter = "";
         this.recentlyReported = {};
@@ -2290,6 +2291,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             else {
                 html += '<div class="align-center d-flex flex-wrap align-center mb-10 w-100-m-0" part="last-update-title-container"><h6 part="last-update-title" class="align-center d-flex"><span class="material-symbols-outlined">update</span>&nbsp;&nbsp;Last Updated on ' + this.lastupdated + '</h6></div>';
             }
+            // html += '<div class="align-center d-flex flex-wrap align-center mb-10 w-100-m-0" part="show-reported-locations-container"><input class="mr-10" type="checkbox" part="input" id="input-show-reported-locations" ' + (this.showReportedLocations ? 'checked' : '' ) +'/><span part="show-reported-locations-title">Show reporting daviations</span></div>';
             if (showGraph) {
                 html += '<div part="stream-event-chart-selection" class="mb-20">';
                 html += '<div part="td-head" class="mb-5">Select Chart</div>';
@@ -18507,6 +18509,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             console.log('rendering chart settings', selectedSummary);
             var html = '';
             html += '<div class="d-flex justify-end align-start">';
+            html += '<button class="tab-button" id="input-show-reported-locations" part="' + (this.showReportedLocations ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '" class="mr-10"><span class="material-symbols-outlined">arrow_or_edge</span></button>';
             if (selectedTab === 0) {
                 //html += '<button class="tab-button" id="chart-control-filters" part="calendar-tab-button-selected" class="mr-10"><span class="material-icons">filter_list</span></button>';
             }
@@ -18535,6 +18538,15 @@ let SfIEvents = class SfIEvents extends LitElement {
                     console.log('summary clicked');
                     this.renderChartSummary();
                 });
+                const buttonRefresh = container.querySelector('#button-refresh');
+                if (buttonRefresh != null) {
+                    const inputShowReportedLocations = container.querySelector('#input-show-reported-locations');
+                    inputShowReportedLocations === null || inputShowReportedLocations === void 0 ? void 0 : inputShowReportedLocations.addEventListener('click', () => {
+                        this.showReportedLocations = !this.showReportedLocations;
+                        let clickEvent = new Event('click', {});
+                        buttonRefresh === null || buttonRefresh === void 0 ? void 0 : buttonRefresh.dispatchEvent(clickEvent);
+                    });
+                }
             }
             // (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-filters')?.addEventListener('click', () => {
             //   this.renderChartSettings(container, 0, ctx);
@@ -22600,7 +22612,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             else {
                 view = "entity";
             }
-            path = "getallcountryevents2";
+            path = "getallcountryevents3";
             let sDate = "";
             let eDate = "";
             //console.log('currenttab', this.getCurrentTab());
@@ -22618,6 +22630,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             if (searchString.length > 0) {
                 urlBody["searchstring"] = searchString;
             }
+            if (this.showReportedLocations) {
+                urlBody["reportedlocations"] = "yes";
+            }
             //console.log('urlbody', urlBody);
             this.getallcountryevetsParams = JSON.stringify(urlBody);
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
@@ -22704,7 +22719,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             else {
                 view = "entity";
             }
-            path = "getallcountryevents2";
+            path = "getallcountryevents3";
             let url = "https://" + this.apiId + "/" + path;
             let temptagid = tagid;
             if (temptagid == "" && locationid != "") {
@@ -22718,6 +22733,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             if (searchString.length > 0) {
                 urlBody["searchstring"] = searchString;
             }
+            if (this.showReportedLocations) {
+                urlBody["reportedlocations"] = "yes";
+            }
             console.log('fetchOnlyYearlyUserCalendar', `TagId:${this.tagId}, CountryId:${this.countryId}, LocationId:${this.locationId}, EntityId:${this.entityId}, FunctionId:${this.functionId}, View:${view}, urlBody:`, urlBody);
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
@@ -23846,10 +23864,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                         console.log('next isBulk', eventsData[role][mmdd][j].isbulk);
                         if (eventsData[role][mmdd][j].isbulk == null || eventsData[role][mmdd][j].isbulk == false) {
                             eventHtml += '<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>';
-                            eventHtml += '</div>';
-                            eventHtml += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j + '"></div>';
                         }
                         eventHtml += '</div>';
+                        eventHtml += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j + '"></div>';
+                        eventHtml += '</div>';
                         html += eventHtml;
                     }
                     html += '</div>';
@@ -24174,7 +24192,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         day = '0' + day;
                     let eDate = month + "/" + day + "/" + year;
                     let urlBody = { "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 url = "https://" + this.apiId + "/getallcountryevents2";
+                    let url = "https://" + this.apiId + "/getallcountryevents3";
                     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
                     const xhr = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
                     this._SfLoader.innerHTML = '';
@@ -24259,7 +24277,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             console.log('fetching compliances', sortid);
             let complianceEntityId = sortid.split(';')[1];
             let complianceLocationId = sortid.split(';')[2];
-            let url = "https://" + this.apiId + "/getallcountryevents2";
+            let url = "https://" + this.apiId + "/getallcountryevents3";
             let sDateObj = selectedDate;
             sDateObj.setDate(selectedDate.getDate() - 60);
             let day = '' + sDateObj.getDate();

package/src/sf-i-events.ts

@@ -1676,6 +1676,8 @@ export class SfIEvents extends LitElement {
 
   selectedRegisterIndex: number = -1;
 
+  showReportedLocations: boolean = false;
+
   @property()
   selectallblock: string = "100";
 
@@ -4445,6 +4447,7 @@ export class SfIEvents extends LitElement {
     } else {
       html += '<div class="align-center d-flex flex-wrap align-center mb-10 w-100-m-0" part="last-update-title-container"><h6 part="last-update-title" class="align-center d-flex"><span class="material-symbols-outlined">update</span>&nbsp;&nbsp;Last Updated on ' + this.lastupdated + '</h6></div>';
     }
+    // html += '<div class="align-center d-flex flex-wrap align-center mb-10 w-100-m-0" part="show-reported-locations-container"><input class="mr-10" type="checkbox" part="input" id="input-show-reported-locations" ' + (this.showReportedLocations ? 'checked' : '' ) +'/><span part="show-reported-locations-title">Show reporting daviations</span></div>';
     if (showGraph) {
       html += '<div part="stream-event-chart-selection" class="mb-20">';
       html += '<div part="td-head" class="mb-5">Select Chart</div>';
@@ -7206,6 +7209,7 @@ export class SfIEvents extends LitElement {
     buttonRefresh.addEventListener('click', async () => {
       this.processDateSelection(eventsContainer)
     })
+
     this.attachListReportingListeners(eventsContainer);
     const buttonArr = eventsContainer.querySelectorAll('.button-expand') as NodeListOf<HTMLButtonElement>;
 
@@ -8468,21 +8472,21 @@ export class SfIEvents extends LitElement {
             filterString += "filtered by \"" + searchFilterString + "\""
           }
         }
-        if(filterString != "") {
+        if (filterString != "") {
           filterString += '<span class="material-symbols-outlined ml-5" id="filter-delete" part="filter-delete">delete</span>'
         }
         divFilterString.innerHTML = filterString
         const filterDeleteButton = divFilterString.querySelector('#filter-delete') as HTMLSpanElement;
         filterDeleteButton?.addEventListener('click', () => {
-          for(let col of Object.keys(this.registerFilters)){
-            for(let filterVal of Object.keys(this.registerFilters[col])){
+          for (let col of Object.keys(this.registerFilters)) {
+            for (let filterVal of Object.keys(this.registerFilters[col])) {
               this.registerFilters[col][filterVal] = true;
             }
           }
           this.processRegisterFilters(events, meta, searchCountryIndex, searchIndex, "");
         })
       }
-      
+
       const arrButtonCountries = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.button-icon-country') as NodeListOf<HTMLButtonElement>;
 
       for (i = 0; i < arrButtonCountries.length; i++) {
@@ -8570,12 +8574,12 @@ export class SfIEvents extends LitElement {
       for (i = 0; i < arrButtonStatuteSearch.length; i++) {
         const button = Util.clearListeners(arrButtonStatuteSearch[i]);
         button.addEventListener('click', (e: any) => {
-          const inputId = e.currentTarget.id.replace('button-','stream-')
+          const inputId = e.currentTarget.id.replace('button-', 'stream-')
           const searchedValue = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector(inputId).value;
           const countryIndex = e.currentTarget.id.split('-')[3];
           const searchIndex = e.currentTarget.id.split('-')[4];
           this.processRegisterFilters(events, meta, countryIndex, searchIndex, searchedValue);
-          
+
         })
       }
 
@@ -11797,6 +11801,7 @@ export class SfIEvents extends LitElement {
       await this.renderWithFeatures(dateResult.startDate, dateResult.endDate);
       this.renderThis(index, showGraph, showBackgroundButton);
     })
+
     this.attachListReportingListeners(this._SfThisContainer as HTMLDivElement);
     const buttonArr = (this._SfThisContainer as HTMLDivElement).querySelectorAll('.button-expand') as NodeListOf<HTMLButtonElement>;
 
@@ -12417,6 +12422,7 @@ export class SfIEvents extends LitElement {
       this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
       this.renderStream(index, showGraph, showBackgroundButton);
     })
+
     this.attachListReportingListeners(this._SfStreamContainer as HTMLDivElement);
     const buttonArr = (this._SfStreamContainer as HTMLDivElement).querySelectorAll('.button-expand') as NodeListOf<HTMLButtonElement>;
 
@@ -23795,6 +23801,7 @@ export class SfIEvents extends LitElement {
     var html = '';
 
     html += '<div class="d-flex justify-end align-start">';
+    html += '<button class="tab-button" id="input-show-reported-locations" part="' + (this.showReportedLocations ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '" class="mr-10"><span class="material-symbols-outlined">arrow_or_edge</span></button>';
     if (selectedTab === 0) {
       //html += '<button class="tab-button" id="chart-control-filters" part="calendar-tab-button-selected" class="mr-10"><span class="material-icons">filter_list</span></button>';
     } else {
@@ -23825,6 +23832,15 @@ export class SfIEvents extends LitElement {
         this.renderChartSummary();
 
       });
+      const buttonRefresh = container.querySelector('#button-refresh') as HTMLButtonElement
+      if (buttonRefresh != null) {
+        const inputShowReportedLocations = container.querySelector('#input-show-reported-locations') as HTMLButtonElement
+        inputShowReportedLocations?.addEventListener('click', () => {
+          this.showReportedLocations = !this.showReportedLocations;
+          let clickEvent = new Event('click', {})
+          buttonRefresh?.dispatchEvent(clickEvent);
+        })
+      }
     }
 
     // (container.querySelector('#chart-settings-controls') as HTMLDivElement).querySelector('#chart-control-filters')?.addEventListener('click', () => {
@@ -28812,7 +28828,7 @@ export class SfIEvents extends LitElement {
       view = "entity";
     }
 
-    path = "getallcountryevents2";
+    path = "getallcountryevents3";
 
     let sDate = "";
     let eDate = "";
@@ -28836,6 +28852,9 @@ export class SfIEvents extends LitElement {
     if (searchString.length > 0) {
       urlBody["searchstring"] = searchString;
     }
+    if (this.showReportedLocations) {
+      urlBody["reportedlocations"] = "yes";
+    }
 
     //console.log('urlbody', urlBody);
     this.getallcountryevetsParams = JSON.stringify(urlBody);
@@ -28949,7 +28968,7 @@ export class SfIEvents extends LitElement {
       view = "entity";
     }
 
-    path = "getallcountryevents2";
+    path = "getallcountryevents3";
 
     let url = "https://" + this.apiId + "/" + path;
     let temptagid = tagid;
@@ -28964,6 +28983,9 @@ export class SfIEvents extends LitElement {
     if (searchString.length > 0) {
       urlBody["searchstring"] = searchString;
     }
+    if (this.showReportedLocations) {
+      urlBody["reportedlocations"] = "yes";
+    }
 
     console.log('fetchOnlyYearlyUserCalendar', `TagId:${this.tagId}, CountryId:${this.countryId}, LocationId:${this.locationId}, EntityId:${this.entityId}, FunctionId:${this.functionId}, View:${view}, urlBody:`, urlBody);
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
@@ -30237,6 +30259,7 @@ export class SfIEvents extends LitElement {
 
 
         for (var j = 0; j < (eventsData[role][mmdd] as Array<any>).length; j++) {
+
           let eventHtml = '';
           eventsData[role][mmdd][j]['mmdd'] = mmdd
 
@@ -30290,9 +30313,10 @@ export class SfIEvents extends LitElement {
           console.log('next isBulk', eventsData[role][mmdd][j].isbulk);
           if (eventsData[role][mmdd][j].isbulk == null || eventsData[role][mmdd][j].isbulk == false) {
             eventHtml += '<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>'
-            eventHtml += '</div>';
-            eventHtml += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j + '"></div>'
           }
+          eventHtml += '</div>';
+          eventHtml += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j + '"></div>'
+
           eventHtml += '</div>';
           html += eventHtml
 
@@ -30670,7 +30694,7 @@ export class SfIEvents extends LitElement {
           day = '0' + day;
         let eDate = month + "/" + day + "/" + year
         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 url = "https://" + this.apiId + "/getallcountryevents2";
+        let url = "https://" + this.apiId + "/getallcountryevents3";
         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 = '';
@@ -30763,7 +30787,7 @@ export class SfIEvents extends LitElement {
     console.log('fetching compliances', sortid)
     let complianceEntityId = sortid.split(';')[1]
     let complianceLocationId = sortid.split(';')[2]
-    let url = "https://" + this.apiId + "/getallcountryevents2";
+    let url = "https://" + this.apiId + "/getallcountryevents3";
     let sDateObj = selectedDate
     sDateObj.setDate(selectedDate.getDate() - 60)
     let day = '' + sDateObj.getDate();