sf-i-events 1.0.968 → 1.0.969

package/dev/index.html

@@ -1128,14 +1128,14 @@
     </div>
 
   </sf-i-events> -->
-  <sf-i-events projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" mode="onboarding"
+  <!-- <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"
     apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidusers="dnytrdlrmxgsy.cloudfront.net/userprofile"
     disablesignoff="yes" disableclientresponse="yes">
 
-  </sf-i-events>
+  </sf-i-events> -->
   <!-- <sf-i-events projectid="a81b6ae1-98de-4b72-8cf0-9aaee5b61891" projectname="Khaitan" mode="onboarding" locations="{}"
     contractstartdate="01/01/2025" apiid="dwqyez2puoxmu.cloudfront.net/event" username="ninad.t@flagggrc.tech"
     apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance"
@@ -1231,11 +1231,11 @@
     </div>
 
   </sf-i-events> -->
-  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" mode="reports" fill="pattern"
+  <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>
   <!-- <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">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.968",
+  "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;
@@ -894,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, locationid: string, sortid: string) => Promise<void>;
-    renderReportsCompliances: (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

@@ -25684,7 +25684,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.renderReports = (reportsData) => {
-            var _a;
+            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)) {
@@ -25699,7 +25699,7 @@ 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>';
@@ -25710,7 +25710,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 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>`;
@@ -25719,7 +25719,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 let locationname = "";
                 let eventHtml = "";
                 if (report['event'] != null) {
-                    locationname = (_a = JSON.parse(report['event'])['locationname']) !== null && _a !== void 0 ? _a : "";
+                    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())) {
                             eventHtml += '<td part="td-body-register">';
@@ -25751,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');
@@ -25858,110 +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 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 += `<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');
+            let inputReporter = this._SfIEventsC.querySelector('#input-user');
+            let inputEntityForm = this._SfIEventsC.querySelector('#input-entity-tags');
             let inputLocationForm = this._SfIEventsC.querySelector('#input-location-tags');
-            inputComplianceDate.addEventListener('change', (ev) => {
-                let selectedDate = new Date(ev.target.value);
-                let selectedLocation = inputLocationForm.selectedValues()[0];
-                if (selectedLocation == null || selectedLocation == '') {
-                    return;
-                    // let locationId = sortid.split(';')[2]
-                    // selectedLocation = locationId;
-                }
-                this.fetchReportCompliances(selectedDate, selectedLocation, sortid);
+            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 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 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, locationid, 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": locationid, "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.renderReportsCompliances(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.renderReportsCompliances = (compliancesData, sortid) => {
+        this.renderReportsCompliances = (compliancesData, sortid, processed) => {
             let eventsData = {};
             let complianceId = sortid.split(';')[3];
             console.log('renderReportsComplainces', compliancesData, complianceId);
@@ -26056,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!");
@@ -27903,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;
 
@@ -22632,11 +22635,11 @@ export class SfIEvents extends LitElement {
       }
     }
     let pastFiscals = [parseInt(this.getCurrentYearGeneric())]
-    if(this.contractStartDate != null) {
+    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>`
+      return `<option value="${fiscal}"${fiscal == parseInt(year) ? " selected" : ""}>${fiscal}-${(fiscal % 100) + 1}</option>`
     })}</select></div>`);
 
 
@@ -32243,7 +32246,7 @@ 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>'
@@ -32255,7 +32258,7 @@ export class SfIEvents extends LitElement {
 
       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>`;
@@ -32314,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);
       })
     }
 
@@ -32423,117 +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 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 += `<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)
+    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);
 
-    inputComplianceDate.addEventListener('change', (ev: any) => {
-      let selectedDate = new Date((ev.target as HTMLInputElement).value)
-      let selectedLocation = inputLocationForm.selectedValues()[0];
-      if (selectedLocation == null || selectedLocation == '') {
-        return;
-        // let locationId = sortid.split(';')[2]
-        // selectedLocation = locationId;
-      }
-      this.fetchReportCompliances(selectedDate, selectedLocation, sortid)
+    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 form = ev.target as SfIForm
-      let selectedDate = new Date((inputComplianceDate as HTMLInputElement).value)
-      if (selectedDate.toString() == 'Invalid Date') {
-        return;
-        // let mmddyyyy = sortid.split(';')[0];
-        // let mm = mmddyyyy.split('/')[0];
-        // let dd = mmddyyyy.split('/')[1];
-        // let yyyy = mmddyyyy.split('/')[2];
-        // selectedDate = new Date(parseInt(yyyy), parseInt(mm) - 1, parseInt(dd));
-      }
-      let selectedLocation = form.selectedValues()[0];
-      this.fetchReportCompliances(selectedDate, selectedLocation, sortid)
+      let 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, locationid: string, 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": locationid, "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.renderReportsCompliances(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);
     }
   }
 
-  renderReportsCompliances = (compliancesData: any, sortid: string) => {
+  renderReportsCompliances = (compliancesData: any, sortid: string, processed: boolean) => {
     let eventsData: any = {}
     let complianceId = sortid.split(';')[3]
     console.log('renderReportsComplainces', compliancesData, complianceId);
@@ -32638,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!");