sf-i-events 1.0.967 → 1.0.969

package/dev/index.html

@@ -1100,7 +1100,7 @@
     </div>
 
   </sf-i-events> -->
-  <sf-i-events name="Calendar" apiid="api2.flagggrc.tech/event" mode="consumer"
+  <!-- <sf-i-events name="Calendar" apiid="api2.flagggrc.tech/event" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
@@ -1127,7 +1127,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events>
+  </sf-i-events> -->
   <!-- <sf-i-events projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" mode="onboarding"
     locations="{&quot;India&quot;:{&quot;Maharashtra&quot;:[&quot;Pune&quot;,&quot;Mumbai&quot;],&quot;Telangana&quot;:[&quot;Telangana&quot;]},&quot;Canada&quot;:{&quot;CanadaSO&quot;:[&quot;CanadaLO&quot;]},&quot;Singapore&quot;:{&quot;SingaporeSO&quot;:[&quot;Orchard&quot;,&quot;Raffles&quot;,&quot;Robinson&quot;,&quot;Tanjong&quot;,&quot;Tras&quot;]},&quot;United Kingdom&quot;:{&quot;UnitedSO&quot;:[&quot;UnitedLO&quot;]},&quot;United States of America&quot;:{&quot;AmericaSO&quot;:[&quot;AmericaLO&quot;]}}"
     contractstartdate="1/4/2024" apiid="dwqyez2puoxmu.cloudfront.net/event" username="ninad.t@flagggrc.tech"
@@ -1202,6 +1202,44 @@
     </div>
 
   </sf-i-events> -->
+  <!-- <sf-i-events name="Calendar" apiid="api2.flagggrc.tech/event-api" mode="consumer"
+    apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
+    apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
+    apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
+    apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws"
+    apiidagreements="swago3unro2te55ikvjuqwcrr40wluqh.lambda-url.us-east-1.on.aws"
+    apiidlicenses="lbtsbsctcdsyah4qdszkv4rctq0tnvel.lambda-url.us-east-1.on.aws"
+    apiidrcmresources="jra3sghasmaxn5aiq7rtv6pjzq0oeuaw.lambda-url.us-east-1.on.aws" fill="solid"
+    username="Ankur Singhal" userprofileid="010834e8-108e-4a87-b58d-f5b429f184be"
+    projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" projectname="Signode"
+    countryid="4ab8901c-4407-4c4d-a2c7-df1a690aa0a3" selectedcriteria="Country - India" myrole="viewer"
+    showregisterexport="false" features="[&quot;contracts&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;}]"
+    eventpreviewfields="[&quot;obligation&quot;]"
+    eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]"
+    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;,&quot;zip&quot;]"
+        extract="yes" projectid="f0f17ddb-546a-45f5-8a94-a5689fde8e64" 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" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiIdUserProfiles="dnytrdlrmxgsy.cloudfront.net/userprofile" mode="reports" fill="pattern"
+    username="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410"
+    projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" calendarstartyyyy="2025"
+    myrole="reporter">
+  </sf-i-events>
+  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" mode="reports" fill="pattern"
+    username="Pushti Goenka" userprofileid="8ac7f984-a9e2-46ef-a815-c5116f3e4638"
+    projectid="7f928276-a9ff-4bcd-a8db-874f618a92ea" projectname="Transvolt" calendarstartyyyy="2025" myrole="reporter">
+  </sf-i-events> -->
   <script>
 
     function setCookie(name, value, days) {

package/package.json

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

package/sf-i-events.d.ts

@@ -150,6 +150,7 @@ export declare class SfIEvents extends LitElement {
     apiIdDetail: string;
     apiIdUsers: string;
     apiIdTags: string;
+    apiIdUserProfiles: string;
     apiIdNotices: string;
     apiIdAgreements: string;
     apiIdLicenses: string;
@@ -582,7 +583,7 @@ export declare class SfIEvents extends LitElement {
     loadOnboardingReportedLocations: () => Promise<void>;
     loadOnboardingSignoff: () => Promise<void>;
     loadOnboardingCalendar: () => Promise<void>;
-    loadOnboardingSuspense: () => Promise<void>;
+    loadOnboardingSuspense: (year?: string) => Promise<void>;
     calculateStartAndEndDateOfPast: (index?: number) => {
         startDate: string;
         endDate: string;
@@ -664,7 +665,8 @@ export declare class SfIEvents extends LitElement {
     refreshCalendar: () => Promise<void>;
     renderNewOnboarding: () => void;
     renderOnboardingSignoff: (signoff: any) => void;
-    renderOnboardingSuspense: (sourceArray: any, suspenseList: any) => void;
+    getAllPastFiscals: (startDate: Date) => number[];
+    renderOnboardingSuspense: (sourceArray: any, suspenseList: any, year: string) => void;
     renderOnboardingSuspenseOld: (_suspenseList: any) => void;
     renderOnboardingCalendar: (_calendarJobs: any) => void;
     renderOnboardingTriggers: (mappedTriggers: any, mappedSerializedAlertSchedules: any, triggersJobs: any) => void;
@@ -763,7 +765,7 @@ export declare class SfIEvents extends LitElement {
     uploadLocationsMapping: (data: any) => Promise<void>;
     uploadEntitiesMapping: (data: any) => Promise<void>;
     uploadCountriesMapping: (data: any) => Promise<void>;
-    uploadMappedSuspense: (data: any) => Promise<any>;
+    uploadMappedSuspense: (data: any, year: string) => Promise<any>;
     uploadOnboardingMapping: (data: any, onboardingstep: string) => Promise<void>;
     uploadToPresignedUrl: (data: any, url: string) => Promise<void>;
     uploadCompliancesMapping: (data: any) => Promise<void>;
@@ -852,7 +854,7 @@ export declare class SfIEvents extends LitElement {
     fetchCalendarJobs: () => Promise<any>;
     deleteFromSuspense: (suspenseKey: any, year: string) => Promise<any>;
     markReviewed: (suspenseKey: any, year: string, review: boolean) => Promise<any>;
-    fetchSuspenseList: () => Promise<any>;
+    fetchSuspenseList: (year?: string) => Promise<any>;
     fetchDetail: (value: any) => Promise<void>;
     fetchGetMappedCalendar: (year: string) => Promise<any>;
     sleepFunction: (ms: number) => Promise<unknown>;
@@ -893,10 +895,11 @@ export declare class SfIEvents extends LitElement {
     renderNextEvents: (eventsData: any, page: number, role: string) => void;
     fetchReports: () => Promise<void>;
     renderReports: (reportsData: any) => void;
-    renderDateSelector: (sortid: string) => void;
-    fetchReportCompliances: (selectedDate: Date, sortid: string) => Promise<void>;
-    renderReportsComplainces: (compliancesData: any, sortid: string) => void;
-    submitUpdateReporting: (mmddyyyy: string, sortid: string) => Promise<void>;
+    renderComplianceSelector: (sortid: string, processed?: boolean) => void;
+    markReport: (mmddyyyy: string, entityid: string, locationid: string, eventid: string, year: string, processed: boolean) => Promise<void>;
+    fetchReportCompliances: (reporterid: string, entityid: string, locationid: string, sortid: string, processed: boolean) => Promise<void>;
+    renderReportsCompliances: (compliancesData: any, sortid: string, processed: boolean) => void;
+    submitUpdateReporting: (mmddyyyy: string, entityid: string, locationid: string, sortid: string) => Promise<void>;
     loadMode: () => Promise<void>;
     constructor();
     protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;

package/sf-i-events.js

@@ -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');
@@ -17844,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"];
@@ -17870,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>');
             }
@@ -17993,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');
@@ -18005,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');
@@ -18090,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}}}
@@ -22343,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));
@@ -23972,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) {
@@ -24582,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());
@@ -25634,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 {
@@ -25656,6 +25684,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.renderReports = (reportsData) => {
+            var _a, _b;
             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)) {
@@ -25670,36 +25699,44 @@ let SfIEvents = class SfIEvents extends LitElement {
                 html += '<table>';
                 html += '<tr>';
                 html += '<th part="td-head">Select</th>';
-                html += '<th part="td-head">Zombie</th>';
+                html += '<th part="td-head">Processed</th>';
                 html += '<th part="td-head">Date</th>';
                 html += '<th part="td-head">Docs</th>';
                 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>';
                 html += '<td part="td-body"><button id="button-select-' + reportKey.replace(/-/g, '_') + '"  part="button-icon-small" class="material-icons button-expand mr-10 button-select">check</button></td>';
-                html += '<td part="td-body"><button id="button-check-' + reportKey.replace(/-/g, '_') + '"  part="button-icon-small" class="material-symbols-outlined button-expand mr-10 button-check">search_check</button></td>';
+                html += `<td part="td-body"><span class="material-symbols-outlined mr-10">${((_a = report['processed']) !== null && _a !== void 0 ? _a : false) ? "done_all" : ""}</span></td>`;
                 html += `<td part="td-body">${reportKey.split(';')[0]}</td>`;
                 html += `<td part="td-body">${JSON.parse(report['docs']).length}</td>`;
                 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 = (_b = JSON.parse(report['event'])['locationname']) !== null && _b !== void 0 ? _b : "";
                     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>';
                 }
@@ -25714,13 +25751,16 @@ let SfIEvents = class SfIEvents extends LitElement {
             const arrButtonSelect = this._SfIEventsC.querySelectorAll('.button-select');
             for (let buttonSelect of arrButtonSelect) {
                 buttonSelect.addEventListener('click', (ev) => {
+                    var _a;
                     const id = ev.target.id;
                     console.log('id', id);
                     const idArr = id.split("-");
                     console.log('idArr', idArr);
                     const sortid = idArr[2].replace(/_/g, '-');
                     console.log('selected sortid', sortid);
-                    this.renderDateSelector(sortid);
+                    let reportData = JSON.parse(reportsData[sortid]);
+                    console.log('selectedReportData', reportData);
+                    this.renderComplianceSelector(sortid, (_a = reportData.processed) !== null && _a !== void 0 ? _a : false);
                 });
             }
             const arrButtonCheck = this._SfIEventsC.querySelectorAll('.button-check');
@@ -25821,85 +25861,136 @@ let SfIEvents = class SfIEvents extends LitElement {
                 });
             }
         };
-        this.renderDateSelector = (sortid) => {
+        this.renderComplianceSelector = (sortid, processed = false) => {
             let html = '';
             html += '<div class="w-100-m-0 d-flex flex-col justify-center">';
             html += '<div class="w-100-m-0 d-flex justify-start">';
             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 += '<button id="button-reports-date-selector-back" class="button-back" part="button">back</button>';
+            html += `<sf-i-form id="input-user" class="m-20" name="Users" label="Select Reporter" apiId="${this.apiIdUserProfiles}" mode="select" searchPhrase="${this.projectName}" selectProjection="name" ignoreProjections="[&quot;updatetype&quot;,&quot;project&quot;,&quot;tagtype&quot;,&quot;userid&quot;,&quot;usermap&quot;,&quot;kra&quot;,&quot;role&quot;,&quot;trainingstatute&quot;,&quot;shortid&quot;,&quot;shortnumid&quot;,&quot;lastmodifiedby&quot;,&quot;lastmodifiedtime&quot;]"></sf-i-form>`;
+            html += `<sf-i-form id="input-entity-tags" class="m-20" name="Tags" label="Select Entity" apiId="${this.apiIdTags}" mode="select" searchPhrase="${this.projectName}&Entity" selectProjection="name" ignoreProjections="[&quot;updatetype&quot;,&quot;project&quot;,&quot;tagtype&quot;,&quot;shortid&quot;,&quot;shortnumid&quot;,&quot;lastmodifiedby&quot;,&quot;lastmodifiedtime&quot;]"></sf-i-form>`;
+            html += `<sf-i-form id="input-location-tags" class="m-20" 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;]"></sf-i-form>`;
+            html += '<div class="w-100-m-0 d-flex justify-start">';
+            html += '<button id="button-reports-search" part="button-icon" class="button-icon d-flex justify-between align-center ml-10" disabled><span class="material-icons">search</span>&nbsp;&nbsp;Search</button>';
+            html += `<button id="button-reports-mark" part="button-icon" class="button-icon d-flex justify-between align-center ml-10"><span class="material-icons">${processed ? "remove_done" : "done_all"}</span>&nbsp;&nbsp;${processed ? "Unmark" : "Mark"} Processed</button>`;
+            html += '</div>';
             html += '</div>';
             this._SfIEventsC.querySelector('#reports-data').innerHTML = html;
-            let inputComplianceDate = this._SfIEventsC.querySelector('#input-compliance-date');
-            inputComplianceDate.addEventListener('change', (ev) => {
-                let selectedDate = new Date(ev.target.value);
-                this.fetchReportCompliances(selectedDate, sortid);
+            let inputReporter = this._SfIEventsC.querySelector('#input-user');
+            let inputEntityForm = this._SfIEventsC.querySelector('#input-entity-tags');
+            let inputLocationForm = this._SfIEventsC.querySelector('#input-location-tags');
+            inputReporter.loadMode();
+            inputReporter.addEventListener('valueChanged', (ev) => {
+                let targetForm = ev.target;
+                let selectedReporter = targetForm.selectedTexts()[0];
+                console.log('reporter selected', selectedReporter);
+                checkButtonSearch();
+            });
+            let entityId = sortid.split(';')[1];
+            inputEntityForm.selectedSearchId = entityId;
+            inputEntityForm.loadMode();
+            inputEntityForm.addEventListener('valueChanged', (ev) => {
+                let targetForm = ev.target;
+                let selectedEntity = targetForm.selectedTexts()[0];
+                console.log('entity selected', selectedEntity);
+                inputLocationForm.searchPhrase = this.projectName + '&Location&' + selectedEntity.replace(/\([^)]*\)/g, "");
+                inputLocationForm.loadMode();
+                checkButtonSearch();
+            });
+            let locationId = sortid.split(';')[2];
+            inputLocationForm.selectedSearchId = locationId;
+            inputLocationForm.loadMode();
+            inputLocationForm.addEventListener('valueChanged', (ev) => {
+                let targetForm = ev.target;
+                let selectedLocation = targetForm.selectedTexts()[0];
+                console.log('location selected', selectedLocation);
+                checkButtonSearch();
             });
             let buttonBack = this._SfIEventsC.querySelector('#button-reports-date-selector-back');
             buttonBack.addEventListener('click', () => {
                 this.fetchReports();
             });
+            let buttonSearch = this._SfIEventsC.querySelector('#button-reports-search');
+            buttonSearch.addEventListener('click', () => {
+                let selectedReporterId = inputReporter.selectedValues()[0];
+                let selectedEntityId = inputEntityForm.selectedValues()[0];
+                let selectedLocationId = inputLocationForm.selectedValues()[0];
+                this.fetchReportCompliances(selectedReporterId, selectedEntityId, selectedLocationId, sortid, processed);
+            });
+            let buttonMark = this._SfIEventsC.querySelector('#button-reports-mark');
+            buttonMark.addEventListener('click', () => {
+                let [mmddyyyy, entityid, locationid, complianceid] = sortid.split(';');
+                let year = this.getFinancialYear(mmddyyyy);
+                this.markReport(mmddyyyy, entityid, locationid, complianceid, year, !processed);
+            });
+            function checkButtonSearch() {
+                let selectedReporterId = inputReporter.selectedValues()[0];
+                let selectedEntityId = inputEntityForm.selectedValues()[0];
+                let selectedLocationId = inputLocationForm.selectedValues()[0];
+                if (selectedReporterId != null && selectedEntityId != null && selectedLocationId != null) {
+                    buttonSearch.disabled = false;
+                }
+                else {
+                    buttonSearch.disabled = true;
+                }
+            }
         };
-        this.fetchReportCompliances = async (selectedDate, sortid) => {
-            console.log('fetching compliances', sortid);
-            let complianceEntityId = sortid.split(';')[1];
-            let complianceLocationId = sortid.split(';')[2];
-            let url = "https://" + this.apiId + "/getallcountryevents5";
-            let sDateObj = selectedDate;
-            sDateObj.setDate(selectedDate.getDate() - 60);
-            let day = '' + sDateObj.getDate();
-            let month = '' + (sDateObj.getMonth() + 1);
-            let year = '' + sDateObj.getFullYear();
-            if (month.length < 2)
-                month = '0' + month;
-            if (day.length < 2)
-                day = '0' + day;
-            let sDate = month + "/" + day + "/" + year;
-            let eDateObj = selectedDate;
-            eDateObj.setDate(selectedDate.getDate() + 120);
-            day = '' + eDateObj.getDate();
-            month = '' + (eDateObj.getMonth() + 1);
-            year = '' + eDateObj.getFullYear();
-            if (month.length < 2)
-                month = '0' + month;
-            if (day.length < 2)
-                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 };
+        this.markReport = async (mmddyyyy, entityid, locationid, eventid, year, processed) => {
+            console.log('marking report', eventid, processed);
+            let url = "https://" + this.apiId + "/markreportprocessed";
+            let urlBody = { "projectid": this.projectId, "eventid": eventid, "mmddyyyy": mmddyyyy, "entityid": entityid, "locationid": locationid, "year": year, "processed": processed };
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
             this._SfLoader.innerHTML = '';
             if (xhr.status == 200) {
-                const jsonRespose = JSON.parse(xhr.responseText);
-                console.log('jsonRespose', jsonRespose);
-                let arrCompliances = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
-                await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete);
-                console.log('receivedCompliacnes', arrCompliances);
-                this.renderReportsComplainces(arrCompliances, sortid);
+                this.setSuccess("Report " + ((processed == true) ? "marked" : "unmarked") + " successfully.");
+                this.fetchReports();
+                setTimeout(() => {
+                    this.clearMessages();
+                }, 5000);
             }
             else {
-                if (xhr.status == 401) {
-                    let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
-                    this.dispatchEvent(changeEvent);
-                }
-                if (xhr.status === 404) {
-                    this.showChosenProject();
-                    this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
-                    this.renderChosenProject();
-                }
-                else {
-                    const jsonRespose = JSON.parse(xhr.responseText);
-                    this.setError(jsonRespose.error);
+                const jsonResponse = JSON.parse(xhr.responseText);
+                this.setError(jsonResponse.error);
+                setTimeout(() => {
+                    this.clearMessages();
+                }, 5000);
+            }
+        };
+        this.fetchReportCompliances = async (reporterid, entityid, locationid, sortid, processed) => {
+            console.log('fetching compliances', sortid);
+            let url = "https://" + this.apiId + "/geteventfromreport";
+            let urlBody = { "projectid": this.projectId, "sortid": sortid, "reporterid": reporterid, "entityid": entityid, "locationid": locationid };
+            const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
+            const xhr = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
+            this._SfLoader.innerHTML = '';
+            if (xhr.status == 200) {
+                const jsonResponse = JSON.parse(xhr.responseText);
+                console.log('fetch compliances jsonRespose', jsonResponse);
+                if (jsonResponse.event == null) {
+                    this.setError("Compliance status is - " + jsonResponse.completenessstatus);
                     setTimeout(() => {
                         this.clearMessages();
                     }, 5000);
                 }
+                else {
+                    let returnedEvent = jsonResponse.event;
+                    let arrCompliances = [(returnedEvent)];
+                    let assocEvents = {};
+                    let mmdd = (returnedEvent.duedate).split('/')[1] + "/" + (returnedEvent.duedate).split('/')[0];
+                    assocEvents[mmdd] = arrCompliances;
+                    this.renderReportsCompliances(assocEvents, sortid, processed);
+                }
+            }
+            else {
+                const jsonResponse = JSON.parse(xhr.responseText);
+                this.setError(jsonResponse.error);
+                setTimeout(() => {
+                    this.clearMessages();
+                }, 5000);
             }
         };
-        this.renderReportsComplainces = (compliancesData, sortid) => {
+        this.renderReportsCompliances = (compliancesData, sortid, processed) => {
             let eventsData = {};
             let complianceId = sortid.split(';')[3];
             console.log('renderReportsComplainces', compliancesData, complianceId);
@@ -25994,21 +26085,22 @@ let SfIEvents = class SfIEvents extends LitElement {
                     const id = ev.target.id;
                     const idArr = id.split("-");
                     const mmdd = idArr[3] + "/" + idArr[4];
-                    // const j = idArr[5];
+                    const j = idArr[5];
+                    let eventObj = eventsData[mmdd][j];
                     console.log('move reporting', mmdd + '/' + this.calendarStartYYYY, sortid);
-                    this.submitUpdateReporting(mmdd + '/' + this.calendarStartYYYY, sortid);
+                    this.submitUpdateReporting(mmdd + '/' + this.calendarStartYYYY, eventObj['entityid'], eventObj['locationid'], sortid);
                 });
             }
             let buttonBack = this._SfIEventsC.querySelector('#button-reports-date-selector-back');
             buttonBack.addEventListener('click', () => {
-                this.renderDateSelector(sortid);
+                this.renderComplianceSelector(sortid, processed);
             });
         };
-        this.submitUpdateReporting = async (mmddyyyy, sortid) => {
+        this.submitUpdateReporting = async (mmddyyyy, entityid, locationid, sortid) => {
             let url = "https://" + this.apiId + "/updatereportdate";
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             console.log('this.myroles', this.myroles);
-            const xhr = (await this.prepareXhr({ "projectid": this.projectId, "mmddyyyy": mmddyyyy, "sortid": sortid }, url, this._SfLoader, authorization));
+            const xhr = (await this.prepareXhr({ "projectid": this.projectId, "mmddyyyy": mmddyyyy, "entityid": entityid, "locationid": locationid, "sortid": sortid }, url, this._SfLoader, authorization));
             this._SfLoader.innerHTML = '';
             if (xhr.status == 200) {
                 this.setSuccess("update successful!");
@@ -27841,6 +27933,9 @@ __decorate([
 __decorate([
     property()
 ], SfIEvents.prototype, "apiIdTags", void 0);
+__decorate([
+    property()
+], SfIEvents.prototype, "apiIdUserProfiles", void 0);
 __decorate([
     property()
 ], SfIEvents.prototype, "apiIdNotices", void 0);

package/src/sf-i-events.ts

@@ -1261,6 +1261,9 @@ export class SfIEvents extends LitElement {
   @property()
   apiIdTags!: string;
 
+  @property()
+  apiIdUserProfiles!: string;
+
   @property()
   apiIdNotices!: string;
 
@@ -10499,13 +10502,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) => {
@@ -22587,7 +22590,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);
@@ -22617,8 +22634,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) {
@@ -22771,6 +22793,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', () => {
@@ -22784,15 +22811,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;
@@ -22879,7 +22906,7 @@ export class SfIEvents extends LitElement {
             },
             () => {
               this.clearMessages();
-              this.renderOnboardingSuspense(sourceArray, tempSuspenseList);
+              this.renderOnboardingSuspense(sourceArray, tempSuspenseList, year);
             }
           ])
           // let tempObj:any = {"data":{"mappings":{"mappings":tempArr}}}
@@ -28156,7 +28183,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);
 
@@ -28165,6 +28192,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'));
@@ -30230,11 +30258,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) {
@@ -30944,7 +30974,7 @@ export class SfIEvents extends LitElement {
     this.edate = endDate;
 
 
-    path = "getstatistics";
+    path = "getstatistics1";
 
     let sDate = "";
     let eDate = "";
@@ -32175,15 +32205,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) {
@@ -32216,42 +32246,49 @@ export class SfIEvents extends LitElement {
 
       html += '<tr>';
       html += '<th part="td-head">Select</th>'
-      html += '<th part="td-head">Zombie</th>'
+      html += '<th part="td-head">Processed</th>'
       html += '<th part="td-head">Date</th>'
       html += '<th part="td-head">Docs</th>'
       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>';
       html += '<td part="td-body"><button id="button-select-' + reportKey.replace(/-/g, '_') + '"  part="button-icon-small" class="material-icons button-expand mr-10 button-select">check</button></td>'
-      html += '<td part="td-body"><button id="button-check-' + reportKey.replace(/-/g, '_') + '"  part="button-icon-small" class="material-symbols-outlined button-expand mr-10 button-check">search_check</button></td>'
+      html += `<td part="td-body"><span class="material-symbols-outlined mr-10">${report['processed'] ?? false ? "done_all" : ""}</span></td>`
       html += `<td part="td-body">${reportKey.split(';')[0]}</td>`;
       html += `<td part="td-body">${JSON.parse(report['docs']).length}</td>`;
       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>';
       }
@@ -32280,7 +32317,9 @@ export class SfIEvents extends LitElement {
         console.log('idArr', idArr)
         const sortid = idArr[2].replace(/_/g, '-')
         console.log('selected sortid', sortid)
-        this.renderDateSelector(sortid);
+        let reportData = JSON.parse(reportsData[sortid]);
+        console.log('selectedReportData', reportData);
+        this.renderComplianceSelector(sortid, reportData.processed ?? false);
       })
     }
 
@@ -32389,90 +32428,143 @@ export class SfIEvents extends LitElement {
     }
 
   }
-  renderDateSelector = (sortid: string) => {
+  renderComplianceSelector = (sortid: string, processed: boolean = false) => {
     let html = ''
     html += '<div class="w-100-m-0 d-flex flex-col justify-center">'
     html += '<div class="w-100-m-0 d-flex justify-start">'
     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 += '<button id="button-reports-date-selector-back" class="button-back" part="button">back</button>';
+    html += `<sf-i-form id="input-user" class="m-20" name="Users" label="Select Reporter" apiId="${this.apiIdUserProfiles}" mode="select" searchPhrase="${this.projectName}" selectProjection="name" ignoreProjections="[&quot;updatetype&quot;,&quot;project&quot;,&quot;tagtype&quot;,&quot;userid&quot;,&quot;usermap&quot;,&quot;kra&quot;,&quot;role&quot;,&quot;trainingstatute&quot;,&quot;shortid&quot;,&quot;shortnumid&quot;,&quot;lastmodifiedby&quot;,&quot;lastmodifiedtime&quot;]"></sf-i-form>`
+    html += `<sf-i-form id="input-entity-tags" class="m-20" name="Tags" label="Select Entity" apiId="${this.apiIdTags}" mode="select" searchPhrase="${this.projectName}&Entity" selectProjection="name" ignoreProjections="[&quot;updatetype&quot;,&quot;project&quot;,&quot;tagtype&quot;,&quot;shortid&quot;,&quot;shortnumid&quot;,&quot;lastmodifiedby&quot;,&quot;lastmodifiedtime&quot;]"></sf-i-form>`
+    html += `<sf-i-form id="input-location-tags" class="m-20" 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;]"></sf-i-form>`
+    html += '<div class="w-100-m-0 d-flex justify-start">'
+    html += '<button id="button-reports-search" part="button-icon" class="button-icon d-flex justify-between align-center ml-10" disabled><span class="material-icons">search</span>&nbsp;&nbsp;Search</button>'
+    html += `<button id="button-reports-mark" part="button-icon" class="button-icon d-flex justify-between align-center ml-10"><span class="material-icons">${processed ? "remove_done" : "done_all"}</span>&nbsp;&nbsp;${processed ? "Unmark" : "Mark"} Processed</button>`
+    html += '</div>';
     html += '</div>';
     (this._SfIEventsC.querySelector('#reports-data') as HTMLDivElement).innerHTML = html;
-    let inputComplianceDate = (this._SfIEventsC.querySelector('#input-compliance-date') as HTMLInputElement)
-    inputComplianceDate.addEventListener('change', (ev: any) => {
-      let selectedDate = new Date((ev.target as HTMLInputElement).value)
-      this.fetchReportCompliances(selectedDate, sortid)
+    let inputReporter = (this._SfIEventsC.querySelector('#input-user') as SfIForm)
+    let inputEntityForm = (this._SfIEventsC.querySelector('#input-entity-tags') as SfIForm);
+    let inputLocationForm = (this._SfIEventsC.querySelector('#input-location-tags') as SfIForm);
+
+    inputReporter.loadMode();
+    inputReporter.addEventListener('valueChanged', (ev: any) => {
+      let targetForm = ev.target as SfIForm;
+      let selectedReporter = targetForm.selectedTexts()[0]
+      console.log('reporter selected', selectedReporter)
+      checkButtonSearch()
+    })
+    let entityId = sortid.split(';')[1]
+    inputEntityForm.selectedSearchId = entityId;
+    inputEntityForm.loadMode();
+    inputEntityForm.addEventListener('valueChanged', (ev: any) => {
+      let targetForm = ev.target as SfIForm;
+      let selectedEntity = targetForm.selectedTexts()[0]
+      console.log('entity selected', selectedEntity)
+      inputLocationForm.searchPhrase = this.projectName + '&Location&' + selectedEntity.replace(/\([^)]*\)/g, "");
+      inputLocationForm.loadMode();
+      checkButtonSearch()
+    })
+    let locationId = sortid.split(';')[2]
+    inputLocationForm.selectedSearchId = locationId;
+    inputLocationForm.loadMode();
+    inputLocationForm.addEventListener('valueChanged', (ev: any) => {
+      let targetForm = ev.target as SfIForm;
+      let selectedLocation = targetForm.selectedTexts()[0]
+      console.log('location selected', selectedLocation)
+      checkButtonSearch()
     })
+
     let buttonBack = (this._SfIEventsC.querySelector('#button-reports-date-selector-back') as HTMLButtonElement)
     buttonBack.addEventListener('click', () => {
       this.fetchReports()
     })
+    let buttonSearch = (this._SfIEventsC.querySelector('#button-reports-search') as HTMLButtonElement)
+    buttonSearch.addEventListener('click', () => {
+      let selectedReporterId = inputReporter.selectedValues()[0];
+      let selectedEntityId = inputEntityForm.selectedValues()[0];
+      let selectedLocationId = inputLocationForm.selectedValues()[0];
+      this.fetchReportCompliances(selectedReporterId, selectedEntityId, selectedLocationId, sortid, processed)
+    })
+
+    let buttonMark = (this._SfIEventsC.querySelector('#button-reports-mark') as HTMLButtonElement)
+    buttonMark.addEventListener('click', () => {
+      let [mmddyyyy, entityid, locationid, complianceid] = sortid.split(';');
+      let year = this.getFinancialYear(mmddyyyy)
+      this.markReport(mmddyyyy, entityid, locationid, complianceid, year, !processed)
+    })
+    function checkButtonSearch() {
+      let selectedReporterId = inputReporter.selectedValues()[0];
+      let selectedEntityId = inputEntityForm.selectedValues()[0];
+      let selectedLocationId = inputLocationForm.selectedValues()[0];
+      if (selectedReporterId != null && selectedEntityId != null && selectedLocationId != null) {
+        buttonSearch.disabled = false;
+      } else {
+        buttonSearch.disabled = true;
+      }
+    }
 
   }
 
-  fetchReportCompliances = async (selectedDate: Date, sortid: string) => {
-    console.log('fetching compliances', sortid)
-    let complianceEntityId = sortid.split(';')[1]
-    let complianceLocationId = sortid.split(';')[2]
-    let url = "https://" + this.apiId + "/getallcountryevents5";
-    let sDateObj = selectedDate
-    sDateObj.setDate(selectedDate.getDate() - 60)
-    let day = '' + sDateObj.getDate();
-    let month = '' + (sDateObj.getMonth() + 1);
-    let year = '' + sDateObj.getFullYear();
-    if (month.length < 2)
-      month = '0' + month;
-    if (day.length < 2)
-      day = '0' + day;
-    let sDate = month + "/" + day + "/" + year
-    let eDateObj = selectedDate
-    eDateObj.setDate(selectedDate.getDate() + 120)
-    day = '' + eDateObj.getDate();
-    month = '' + (eDateObj.getMonth() + 1);
-    year = '' + eDateObj.getFullYear();
-    if (month.length < 2)
-      month = '0' + month;
-    if (day.length < 2)
-      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 };
+  markReport = async (mmddyyyy: string, entityid: string, locationid: string, eventid: string, year: string, processed: boolean) => {
+    console.log('marking report', eventid, processed)
+    let url = "https://" + this.apiId + "/markreportprocessed";
+
+    let urlBody: any = { "projectid": this.projectId, "eventid": eventid, "mmddyyyy": mmddyyyy, "entityid": entityid, "locationid": locationid, "year": year, "processed": processed };
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing')) as any;
     this._SfLoader.innerHTML = '';
     if (xhr.status == 200) {
-
-      const jsonRespose = JSON.parse(xhr.responseText);
-      console.log('jsonRespose', jsonRespose);
-      let arrCompliances = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
-      await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete);
-      console.log('receivedCompliacnes', arrCompliances)
-      this.renderReportsComplainces(arrCompliances, sortid);
+      this.setSuccess("Report " + ((processed == true) ? "marked" : "unmarked") + " successfully.");
+      this.fetchReports();
+      setTimeout(() => {
+        this.clearMessages();
+      }, 5000);
     } else {
-      if (xhr.status == 401) {
-        let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
-        this.dispatchEvent(changeEvent);
-      }
-      if (xhr.status === 404) {
+      const jsonResponse = JSON.parse(xhr.responseText);
+      this.setError(jsonResponse.error);
+      setTimeout(() => {
+        this.clearMessages();
+      }, 5000);
+    }
+  }
 
-        this.showChosenProject();
-        (this._SfTitleChosenProject as HTMLElement).innerHTML = (this._SfProject[0].querySelector('#sf-i-project') as SfIForm).selectedTexts()[0];
-        this.renderChosenProject();
+  fetchReportCompliances = async (reporterid: string, entityid: string, locationid: string, sortid: string, processed: boolean) => {
+    console.log('fetching compliances', sortid)
+    let url = "https://" + this.apiId + "/geteventfromreport";
 
-      } else {
-        const jsonRespose = JSON.parse(xhr.responseText);
-        this.setError(jsonRespose.error);
+    let urlBody: any = { "projectid": this.projectId, "sortid": sortid, "reporterid": reporterid, "entityid": entityid, "locationid": locationid };
+    const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
+    const xhr: any = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing')) as any;
+    this._SfLoader.innerHTML = '';
+    if (xhr.status == 200) {
+
+      const jsonResponse = JSON.parse(xhr.responseText);
+      console.log('fetch compliances jsonRespose', jsonResponse);
+
+      if (jsonResponse.event == null) {
+        this.setError("Compliance status is - " + jsonResponse.completenessstatus);
         setTimeout(() => {
           this.clearMessages();
         }, 5000);
+      } else {
+        let returnedEvent = jsonResponse.event
+        let arrCompliances = [(returnedEvent)];
+        let assocEvents: any = {};
+        let mmdd = (returnedEvent.duedate).split('/')[1] + "/" + (returnedEvent.duedate).split('/')[0];
+        assocEvents[mmdd] = arrCompliances;
+        this.renderReportsCompliances(assocEvents, sortid, processed);
       }
-
+    } else {
+      const jsonResponse = JSON.parse(xhr.responseText);
+      this.setError(jsonResponse.error);
+      setTimeout(() => {
+        this.clearMessages();
+      }, 5000);
     }
   }
 
-  renderReportsComplainces = (compliancesData: any, sortid: string) => {
+  renderReportsCompliances = (compliancesData: any, sortid: string, processed: boolean) => {
     let eventsData: any = {}
     let complianceId = sortid.split(';')[3]
     console.log('renderReportsComplainces', compliancesData, complianceId);
@@ -32577,24 +32669,25 @@ export class SfIEvents extends LitElement {
         const id = ev.target.id;
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
-        // const j = idArr[5];
+        const j = idArr[5];
+        let eventObj = eventsData[mmdd][j];
         console.log('move reporting', mmdd + '/' + this.calendarStartYYYY, sortid)
-        this.submitUpdateReporting(mmdd + '/' + this.calendarStartYYYY, sortid);
+        this.submitUpdateReporting(mmdd + '/' + this.calendarStartYYYY, eventObj['entityid'], eventObj['locationid'], sortid);
       })
     }
 
     let buttonBack = (this._SfIEventsC.querySelector('#button-reports-date-selector-back') as HTMLButtonElement)
     buttonBack.addEventListener('click', () => {
-      this.renderDateSelector(sortid)
+      this.renderComplianceSelector(sortid, processed)
     })
   }
 
-  submitUpdateReporting = async (mmddyyyy: string, sortid: string) => {
+  submitUpdateReporting = async (mmddyyyy: string, entityid: string, locationid: string, sortid: string) => {
     let url = "https://" + this.apiId + "/updatereportdate";
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     console.log('this.myroles', this.myroles)
-    const xhr: any = (await this.prepareXhr({ "projectid": this.projectId, "mmddyyyy": mmddyyyy, "sortid": sortid }, url, this._SfLoader, authorization)) as any;
+    const xhr: any = (await this.prepareXhr({ "projectid": this.projectId, "mmddyyyy": mmddyyyy, "entityid": entityid, "locationid": locationid, "sortid": sortid }, url, this._SfLoader, authorization)) as any;
     this._SfLoader.innerHTML = '';
     if (xhr.status == 200) {
       this.setSuccess("update successful!");