sf-i-events 1.0.966 → 1.0.968

package/sf-i-events.js

@@ -2597,7 +2597,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '</div>';
             return html;
         };
-        this.renderCalendarRowDivItemDivStart = (mmdd, event, itemNumber, partStatus, bgStatus) => {
+        this.renderCalendarRowDivItemDivStart = (mmdd, event, itemNumber, partStatus, bgStatus, fromDrilldown) => {
             var _a, _b, _c, _f, _g;
             var html = '';
             var remarks = "";
@@ -2644,7 +2644,7 @@ let SfIEvents = 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;
@@ -2983,7 +2983,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             return graphParam;
         };
-        this.renderCalendarAnnotations = (event, mmdd, j) => {
+        this.renderCalendarAnnotations = (event, mmdd, j, fromDrilldown) => {
             var html = '';
             html += '<div class="hidden-filtername hide"><table><thead><th part="badge-filter-name" class="filtername"></th></thead></table></div>';
             // if(event.concise == null && event.approvers != null){
@@ -2993,7 +2993,7 @@ let SfIEvents = 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;
         };
@@ -3378,13 +3378,13 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 htmlSummaryValues += '</td></tr>';
                             }
                         }
-                        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();
                     }
@@ -7631,13 +7631,13 @@ let SfIEvents = class SfIEvents extends LitElement {
             const calendarJobs = await this.fetchCalendarJobs();
             this.renderOnboardingCalendar(calendarJobs);
         };
-        this.loadOnboardingSuspense = async () => {
+        this.loadOnboardingSuspense = async (year = this.getCurrentYearGeneric()) => {
             this.hideTabContainers();
             this._SfOnboardingSuspenseContainer.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);
         };
         this.calculateStartAndEndDateOfPast = (index = 0) => {
             //console.log('calculating start and end of past');
@@ -10745,42 +10745,8 @@ let SfIEvents = 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.style.display = 'block';
             this._SfDetailListContainer.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());
@@ -10806,13 +10772,179 @@ let SfIEvents = class SfIEvents extends LitElement {
                 this._SfDetailListContainer.innerHTML = '';
                 this._SfDetailListContainer.style.display = 'none';
             });
-            // 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.querySelectorAll('.button-expand');
+            for (i = 0; i < buttonArr.length; i++) {
+                let indexPrevNext = i;
+                buttonArr[i].addEventListener('click', (ev) => {
+                    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])) {
+                                    prevString = buttonArr[indexPrev - 1].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])) {
+                                    nextString = buttonArr[indexNext + 1].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.querySelector('#stream-month-' + this.currentColumnIndex), this._SfStreamContainer, prevString, nextString, false, null, null, null, null, null, null, null, true);
+                    }
+                });
+            }
+            const titleArr = this._SfDetailListContainer.querySelectorAll('.button-event-title');
+            for (var i = 0; i < titleArr.length; i++) {
+                let indexPrevNext = i;
+                titleArr[i].addEventListener('click', (ev) => {
+                    var _a, _b;
+                    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])) {
+                                    prevString = titleArr[indexPrev - 1].id;
+                                    let prevIdArr = prevString.split("-");
+                                    if (((_a = prevIdArr[7]) !== null && _a !== void 0 ? _a : "") == "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])) {
+                                    nextString = titleArr[indexNext + 1].id;
+                                    let nextIdArr = nextString.split("-");
+                                    if (((_b = nextIdArr[7]) !== null && _b !== void 0 ? _b : "") == "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, prevString, nextString, false, null, null, null, null, null, null, null, true);
+                    }
+                });
+            }
         };
         this.renderEventDetailShort = (compliance) => {
             var _a, _b, _c, _f, _g;
@@ -14107,7 +14239,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
-        this.fetchEventDetails = async (listEvent, mmddyyyy, currentColumnButton, eventsContainer, previousId = "", nextId = "", flagUploadGuidance = false, listEventContainer = null, reportercomments = null, approvercomments = null, inputReportingPercentage = null, selectReportedLocation = null, documents = null, dateOfCompletion = null) => {
+        this.fetchEventDetails = async (listEvent, mmddyyyy, currentColumnButton, eventsContainer, previousId = "", nextId = "", flagUploadGuidance = false, listEventContainer = null, reportercomments = null, approvercomments = null, inputReportingPercentage = null, selectReportedLocation = null, documents = null, dateOfCompletion = null, fromDrilldown = false) => {
             console.log('listEvent', listEvent, listEvent.id);
             let url = "https://" + this.apiId + "/getalleventdetails";
             //console.log('fetch calendar url', url);
@@ -14147,7 +14279,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 }
                 else {
-                    this.renderEventDetail(jsonRespose.data, mmddyyyy, currentColumnButton, eventsContainer, previousId, nextId);
+                    this.renderEventDetail(jsonRespose.data, mmddyyyy, currentColumnButton, eventsContainer, previousId, nextId, fromDrilldown);
                 }
             }
             else {
@@ -14166,7 +14298,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
-        this.renderEventDetail = (event, mmddyyyy, currentColumnButton, eventsContainer, previousId, nextId) => {
+        this.renderEventDetail = (event, mmddyyyy, currentColumnButton, eventsContainer, previousId, nextId, fromDrilldown) => {
             var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
             console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
             console.log('previousid', previousId, 'nextid', nextId);
@@ -14476,7 +14608,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '</div>';
             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>";
@@ -17712,7 +17844,21 @@ let SfIEvents = class SfIEvents extends LitElement {
                 this.loadOnboardingSignoff();
             });
         };
-        this.renderOnboardingSuspense = (sourceArray, suspenseList) => {
+        this.getAllPastFiscals = (startDate) => {
+            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;
+        };
+        this.renderOnboardingSuspense = (sourceArray, suspenseList, year) => {
             console.log('sourceList', sourceArray);
             console.log('suspenseList', suspenseList);
             let sourceCols = ["shortid", "obligationtitle", "obligationtype"];
@@ -17738,7 +17884,13 @@ let SfIEvents = 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) {
                 html += ('<div class="left-sticky d-flex justify-between align-center mr-10"><h4 part="results-title" class="d-flex align-center m-0"><span class="color-pending material-icons">pending</span>&nbsp;&nbsp;' + changed + ' Items changed</h4></div>');
             }
@@ -17861,6 +18013,11 @@ let SfIEvents = class SfIEvents extends LitElement {
             // html += '</div>';
             html += '</div>';
             this._SfOnboardingSuspenseContainer.innerHTML = html;
+            const inputYear = this._SfOnboardingSuspenseContainer.querySelector('#select-year');
+            inputYear.addEventListener('change', (e) => {
+                const selectedYear = e.currentTarget.value;
+                this.loadOnboardingSuspense(selectedYear);
+            });
             const buttonApply = this._SfOnboardingSuspenseContainer.querySelector('.button-apply');
             buttonApply.addEventListener('click', () => {
                 let inputSuspenseCheckboxes = this._SfOnboardingSuspenseContainer.querySelectorAll('.suspense-input');
@@ -17873,14 +18030,14 @@ let SfIEvents = class SfIEvents extends LitElement {
                         tempSuspenseList[suspenseKey] = true;
                     }
                 }
-                this.renderOnboardingSuspense(sourceArray, tempSuspenseList);
+                this.renderOnboardingSuspense(sourceArray, tempSuspenseList, year);
             });
             const buttonSave = this._SfOnboardingSuspenseContainer.querySelector('.button-save');
             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.querySelector('.button-toggle-more-back');
             const buttonToggleMore = this._SfOnboardingSuspenseContainer.querySelector('.button-toggle-more');
@@ -17909,6 +18066,8 @@ let SfIEvents = 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);
@@ -17956,7 +18115,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             },
                             () => {
                                 this.clearMessages();
-                                this.renderOnboardingSuspense(sourceArray, tempSuspenseList);
+                                this.renderOnboardingSuspense(sourceArray, tempSuspenseList, year);
                             }
                         ]);
                         // let tempObj:any = {"data":{"mappings":{"mappings":tempArr}}}
@@ -22209,12 +22368,13 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.uploadCountriesMapping = async (data) => {
             await this.uploadOnboardingMapping(data, 'countries');
         };
-        this.uploadMappedSuspense = async (data) => {
+        this.uploadMappedSuspense = async (data, year) => {
             //console.log('uploading..', data);
             let url = "https://" + this.apiId + "/updatemappedsuspense";
             const body = {
                 "projectid": this.projectId,
                 "data": JSON.stringify(data),
+                "year": year
             };
             let authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             let xhr = (await this.prepareXhr(body, url, this._SfLoader, authorization));
@@ -23838,10 +23998,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
-        this.fetchSuspenseList = async () => {
+        this.fetchSuspenseList = async (year = "") => {
             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 = (await this.prepareXhr({ "projectid": this.projectId, "year": year }, url, this._SfLoader, authorization));
             this._SfLoader.innerHTML = '';
             if (xhr.status == 200) {
@@ -24448,7 +24610,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             let path = "";
             this.sdate = startDate;
             this.edate = endDate;
-            path = "getstatistics";
+            path = "getstatistics1";
             let sDate = "";
             let eDate = "";
             //console.log('currenttab', this.getCurrentTab());
@@ -25500,14 +25662,14 @@ let SfIEvents = class SfIEvents extends LitElement {
             let url = "https://" + this.apiId + "/getreports";
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             console.log('this.myroles', this.myroles);
-            const xhr = (await this.prepareXhr({ "projectid": this.projectId, "userprofileid": this.userProfileId }, url, this._SfLoader, authorization));
+            const xhr = (await this.prepareXhr({ "projectid": this.projectId, "userprofileid": this.userProfileId, "year": this.calendarStartYYYY }, url, this._SfLoader, authorization));
             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 {
@@ -25522,6 +25684,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.renderReports = (reportsData) => {
+            var _a;
             let html = '<div class="d-flex flex-col w-100-m-0">';
             html += '<div part="stream-event-list" class="d-flex flex-col align-stretch">';
             for (let reportKey of Object.keys(reportsData)) {
@@ -25542,6 +25705,7 @@ let SfIEvents = 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>';
                 html += '<tr>';
@@ -25552,20 +25716,27 @@ let SfIEvents = 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 = (_a = JSON.parse(report['event'])['locationname']) !== null && _a !== void 0 ? _a : "";
                     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>';
                 }
@@ -25694,24 +25865,49 @@ let SfIEvents = 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').innerHTML = html;
             let inputComplianceDate = this._SfIEventsC.querySelector('#input-compliance-date');
+            let inputLocationForm = this._SfIEventsC.querySelector('#input-location-tags');
             inputComplianceDate.addEventListener('change', (ev) => {
                 let selectedDate = new Date(ev.target.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) => {
+                let form = ev.target;
+                let selectedDate = new Date(inputComplianceDate.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');
             buttonBack.addEventListener('click', () => {
                 this.fetchReports();
             });
         };
-        this.fetchReportCompliances = async (selectedDate, sortid) => {
+        this.fetchReportCompliances = async (selectedDate, locationid, sortid) => {
             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);
@@ -25734,7 +25930,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 day = '0' + day;
             let eDate = month + "/" + day + "/" + year;
             //console.log('fetch calendar url', url);
-            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 urlBody = { "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 = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
             this._SfLoader.innerHTML = '';
@@ -25744,7 +25940,7 @@ let SfIEvents = 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) {
@@ -25765,7 +25961,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
-        this.renderReportsComplainces = (compliancesData, sortid) => {
+        this.renderReportsCompliances = (compliancesData, sortid) => {
             let eventsData = {};
             let complianceId = sortid.split(';')[3];
             console.log('renderReportsComplainces', compliancesData, complianceId);