sf-i-events 1.0.938 → 1.0.940

package/dev/index.html

@@ -25,7 +25,8 @@
     import { SfISubSelect } from 'https://esm.run/sf-i-sub-select@1.0.83/sf-i-sub-select.js';
     import { SfIForm } from 'https://esm.run/sf-i-form@1.0.185/sf-i-form.js';
     import { SfIElasticText } from 'https://esm.run/sf-i-elastic-text@1.0.18/sf-i-elastic-text.js';
-    import { SfIUploader } from 'https://esm.run/sf-i-uploader@1.0.125/sf-i-uploader.js';
+    // import { SfIUploader } from 'https://esm.run/sf-i-uploader@1.0.125/sf-i-uploader.js';
+    import { SfIUploader } from '../../sf-i-uploader/sf-i-uploader.js';
     import { SfIMultitextarea } from 'https://esm.run/sf-i-multitextarea@1.0.23/sf-i-multitextarea.js';
     // import { SfIReporting } from 'https://esm.run/sf-i-reporting@1.0.89/sf-i-reporting.js';
     import { SfIReporting } from '../../sf-i-reporting/sf-i-reporting.js';
@@ -1082,6 +1083,35 @@
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidusers="dnytrdlrmxgsy.cloudfront.net/userprofile"
     disablesignoff="yes" disableclientresponse="yes">
 
+  </sf-i-events> -->
+  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+    apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
+    apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
+    apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
+    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="Madhura Zende Internal" userprofileid="8d3edbb1-8318-4525-978a-ecc4c5a8e713"
+    projectid="d7d4d17e-3e20-4eaa-a06a-fb1c87f26532" projectname="FlaggGRC Global"
+    countryid="c48d7cc1-62df-41b3-807a-5744973db3d9" selectedcriteria="Country - India" myrole="approver"
+    showregisterexport="false" features="[&quot;rcmresources&quot;]"
+    eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]"
+    eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]"
+    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="d7d4d17e-3e20-4eaa-a06a-fb1c87f26532" 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> -->
   <script>
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.938",
+  "version": "1.0.940",
   "description": "Superflows Navigation Component",
   "main": "sf-i-events.js",
   "module": "sf-i-events.js",
@@ -60,7 +60,7 @@
     "sf-i-elastic-text": "^1.0.17",
     "sf-i-form": "^1.0.186",
     "sf-i-multitextarea": "^1.0.7",
-    "sf-i-reporting": "^1.0.89",
+    "sf-i-reporting": "^1.0.117",
     "sf-i-select": "^1.0.80",
     "sf-i-sub-select": "^1.0.68",
     "sf-i-uploader": "^1.0.123",

package/sf-i-events.js

@@ -2613,15 +2613,19 @@ let SfIEvents = class SfIEvents extends LitElement {
           </button>
         ` : ''}
         ${showReview ? `
-          <input 
-            type="checkbox"
+          ${isReviewed ? `<button 
             id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
-            part="input-checkbox" 
-            class="material-icons ml-10 input-checkbox-review"
-            ${isReviewed ? 'checked' : ''}
-          />
-          <label for="input-checkbox-review-${mmddSanitized}-${itemNumber}" part="label-checkbox" class="label-checkbox">${isReviewed ? 'Reviewed' : 'Review'}</label>
+            part="button-icon-reviewed" 
+            class="d-flex align-center ml-10 button-icon-review">
+            <span class="material-symbols-outlined" title="Mark as not reviewed">flag_check</span>&nbsp;&nbsp;Reviewed
+          </button>` : `<button 
+            id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
+            part="button-icon-review" 
+            class="ml-10 button-icon-review">
+            Mark Reviewed
+          </button>`}
         ` : ''}
+
         ${showLastUpdated ? `
           &nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">
             ${lastUpdated}
@@ -2914,7 +2918,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             let approverStr = event.concise == null ? this.getApproverStringFromEvent(event) : "";
             let graphParam = this.getGraphParam(event);
             // console.log("graphParam", graphParam.split(';')[0]);
-            html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + ((event.module == "compliances" || event.module == null) ? ('<input type="checkbox" id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="input-checkbox" class="material-icons mb-20 ml-10 input-checkbox-review"' + (event.review ? 'checked' : '') + '/><label for="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="label-checkbox" class="label-checkbox mb-20">' + (event.review ? 'Reviewed' : 'Review') + '</label></div>') : '</div>');
+            html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + (((event.module == "compliances" || event.module == null) && event.concise == null) ? (event.review ? ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-reviewed" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as not reviewed">flag_check</span>&nbsp;&nbsp;Reviewed</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="mb-20 ml-10 button-icon-review">Mark Reviewed</button>')) : '') + '</div>';
             // }
             return html;
         };
@@ -4645,9 +4649,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.attachReviewListeners = (eventsContainer) => {
-            let inputReviews = eventsContainer.querySelectorAll('.input-checkbox-review');
-            for (let inputReview of inputReviews) {
-                inputReview === null || inputReview === void 0 ? void 0 : inputReview.addEventListener('click', async (ev) => {
+            let buttonReviews = eventsContainer.querySelectorAll('.button-icon-review');
+            for (let buttonReview of buttonReviews) {
+                buttonReview === null || buttonReview === void 0 ? void 0 : buttonReview.addEventListener('click', async (ev) => {
                     const id = ev.target.id;
                     const idArr = id.split("-");
                     const mmdd = idArr[3] + "/" + idArr[4];
@@ -4656,9 +4660,17 @@ let SfIEvents = class SfIEvents extends LitElement {
                     const j = idArr[5];
                     console.log('review clicked', mmdd, yyyy, j, this.events[mmdd][j], ev.target.checked);
                     let eventKey = this.events[mmdd][j].entityid + ';' + this.events[mmdd][j].locationid + ';' + this.events[mmdd][j].id;
-                    await this.markReviewed(eventKey, yyyy, ev.target.checked);
-                    const buttonRefresh = eventsContainer.querySelector('#button-refresh');
-                    buttonRefresh.click();
+                    for (var p = 0; p < Object.keys(this.events).length; p++) {
+                        let tempMmDd = Object.keys(this.events)[p];
+                        for (var q = 0; q < this.events[tempMmDd].length; q++) {
+                            let tempEventKey = this.events[tempMmDd][q].entityid + ';' + this.events[tempMmDd][q].locationid + ';' + this.events[tempMmDd][q].id;
+                            if (tempEventKey == eventKey) {
+                                this.events[tempMmDd][q].review = ev.target.innerHTML.indexOf('flag_check') < 0;
+                            }
+                        }
+                    }
+                    this.markReviewed(eventKey, yyyy, ev.target.innerHTML.indexOf('flag_check') < 0);
+                    this.renderAppropriateStream(this.sdate, this.edate, true);
                 });
             }
         };
@@ -13164,12 +13176,15 @@ let SfIEvents = class SfIEvents extends LitElement {
                     reportingReporting.prepopulateValJson = reportingSchemaValues;
                 reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view";
                 reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true";
+                // reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
+                // reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
                 reportingReporting.flow = "reporting";
                 setTimeout(() => {
                     reportingReporting.loadMode();
                     console.log('list-customreporting', reportingSchemaJson);
                     console.log('list-customreporting1', reportingSchemaValues);
                     console.log('list-customreporting2', reportingReporting.mode);
+                    console.log('list-customreporting3', this.myRole);
                 }, 500);
             }
             (_a = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
@@ -13223,7 +13238,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             });
             if (this.mode == "consumer" || this.mode == "next") {
                 (_f = this._SfDetailContainer.querySelector('#button-uploader-submit-approve')) === null || _f === void 0 ? void 0 : _f.addEventListener('click', async (ev) => {
-                    var _a, _b, _c, _f, _g;
+                    var _a, _b, _c, _f;
                     let buttonClick = ev.target;
                     buttonClick.innerHTML = "Saving...";
                     const comments = this._SfDetailContainer.querySelector('#input-approver-comments').value;
@@ -13241,12 +13256,14 @@ let SfIEvents = class SfIEvents extends LitElement {
                         }, 3000);
                         return;
                     }
-                    let reportformatvalues = "";
+                    let reportformatvalues = {};
                     let reportingReporting = this._SfDetailContainer.querySelector('#reporting-reporting');
                     console.log('renew reporting', reportingReporting);
                     if (reportingReporting != null) {
-                        reportformatvalues = (_a = JSON.stringify(reportingReporting.selectedValues())) !== null && _a !== void 0 ? _a : "";
+                        reportformatvalues = reportingReporting.selectedValues();
                     }
+                    console.log('reportformatvalues', reportformatvalues, Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)));
+                    // return;
                     var clickEvent = new MouseEvent("click", {
                         "view": window,
                         "bubbles": true,
@@ -13257,7 +13274,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     let flagBulk = false;
                     if (this.selectedItemIds.length <= 1) {
                         console.log('mmddyyyy', mmddyyyy);
-                        if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, (_b = listEvent.module) !== null && _b !== void 0 ? _b : "compliance")) {
+                        if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, (_a = listEvent.module) !== null && _a !== void 0 ? _a : "compliance")) {
                             if (approved) {
                                 await this.renewRCMResource(listEvent, reportformatvalues);
                             }
@@ -13267,7 +13284,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             for (var p = 0; p < this.events[mmdd].length; p++) {
                                 if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                                     this.events[mmdd][p].approved = approved;
-                                    this.events[mmdd][p].terminated = (_c = (JSON.parse(reportformatvalues).terminated)) !== null && _c !== void 0 ? _c : false;
+                                    this.events[mmdd][p].terminated = (_b = (reportformatvalues.terminated)) !== null && _b !== void 0 ? _b : false;
                                     this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
                                     this.events[mmdd][p].lastupdated = new Date().toString();
                                 }
@@ -13303,7 +13320,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
                                 "year": yearStr,
-                                "module": (_f = listEvent.module) !== null && _f !== void 0 ? _f : "compliance"
+                                "module": (_c = listEvent.module) !== null && _c !== void 0 ? _c : "compliance"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
                             // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
@@ -13354,7 +13371,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "bubbles": true,
                                 "cancelable": false
                             });
-                            (_g = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _g === void 0 ? void 0 : _g.dispatchEvent(clickEvent);
+                            (_f = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _f === void 0 ? void 0 : _f.dispatchEvent(clickEvent);
                             // if(currentColumnButton != null) {
                             //   currentColumnButton.click();
                             // }
@@ -20548,7 +20565,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 let graphparamname1Arr = graphparamnames1[i].innerHTML.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ').split(' • ');
                 let filterFound = false;
                 for (let tempFilterStr of graphparamname1Arr) {
-                    console.log('graphparamname1Arr', tempFilterStr, this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '), tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '));
+                    // console.log('graphparamname1Arr', tempFilterStr, this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '), tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '));
                     if (tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ') || this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ') == "") {
                         filterFound = true;
                         break;

package/src/sf-i-events.ts

@@ -4844,15 +4844,19 @@ export class SfIEvents extends LitElement {
           </button>
         ` : ''}
         ${showReview ? `
-          <input 
-            type="checkbox"
+          ${isReviewed ? `<button 
             id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
-            part="input-checkbox" 
-            class="material-icons ml-10 input-checkbox-review"
-            ${isReviewed ? 'checked' : ''}
-          />
-          <label for="input-checkbox-review-${mmddSanitized}-${itemNumber}" part="label-checkbox" class="label-checkbox">${isReviewed ? 'Reviewed' : 'Review'}</label>
+            part="button-icon-reviewed" 
+            class="d-flex align-center ml-10 button-icon-review">
+            <span class="material-symbols-outlined" title="Mark as not reviewed">flag_check</span>&nbsp;&nbsp;Reviewed
+          </button>` : `<button 
+            id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
+            part="button-icon-review" 
+            class="ml-10 button-icon-review">
+            Mark Reviewed
+          </button>`}
         ` : ''}
+
         ${showLastUpdated ? `
           &nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">
             ${lastUpdated}
@@ -5187,7 +5191,7 @@ export class SfIEvents extends LitElement {
 
     let graphParam = this.getGraphParam(event);
     // console.log("graphParam", graphParam.split(';')[0]);
-    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + ((event.module == "compliances" || event.module == null) ? ('<input type="checkbox" id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="input-checkbox" class="material-icons mb-20 ml-10 input-checkbox-review"' + (event.review ? 'checked' : '') + '/><label for="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="label-checkbox" class="label-checkbox mb-20">' + (event.review ? 'Reviewed' : 'Review') + '</label></div>') : '</div>');
+    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + (((event.module == "compliances" || event.module == null) && event.concise == null) ? (event.review ? ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-reviewed" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as not reviewed">flag_check</span>&nbsp;&nbsp;Reviewed</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="mb-20 ml-10 button-icon-review">Mark Reviewed</button>')) : '') + '</div>';
     // }
     
     return html;
@@ -7065,9 +7069,9 @@ export class SfIEvents extends LitElement {
   }
 
   attachReviewListeners = (eventsContainer: HTMLDivElement) => {
-    let inputReviews = eventsContainer.querySelectorAll('.input-checkbox-review') as NodeListOf<HTMLInputElement>
-    for (let inputReview of inputReviews) {
-      inputReview?.addEventListener('click', async (ev: any) => {
+    let buttonReviews = eventsContainer.querySelectorAll('.button-icon-review') as NodeListOf<HTMLButtonElement>
+    for (let buttonReview of buttonReviews) {
+      buttonReview?.addEventListener('click', async (ev: any) => {
         const id = ev.target.id;
         const idArr = id.split("-")
         const mmdd = idArr[3] + "/" + idArr[4];
@@ -7076,9 +7080,17 @@ export class SfIEvents extends LitElement {
         const j = idArr[5];
         console.log('review clicked', mmdd, yyyy, j, this.events[mmdd][j], ev.target.checked);
         let eventKey = this.events[mmdd][j].entityid + ';' + this.events[mmdd][j].locationid + ';' + this.events[mmdd][j].id;
-        await this.markReviewed(eventKey, yyyy, ev.target.checked);
-        const buttonRefresh = eventsContainer.querySelector('#button-refresh') as HTMLButtonElement
-        buttonRefresh.click();
+        for(var p = 0; p < Object.keys(this.events).length; p++) {
+          let tempMmDd = Object.keys(this.events)[p];
+          for(var q = 0; q < this.events[tempMmDd].length; q++) {
+            let tempEventKey = this.events[tempMmDd][q].entityid + ';' + this.events[tempMmDd][q].locationid + ';' + this.events[tempMmDd][q].id;
+            if(tempEventKey == eventKey) {
+              this.events[tempMmDd][q].review = ev.target.innerHTML.indexOf('flag_check') < 0
+            }
+          }
+        }
+        this.markReviewed(eventKey, yyyy, ev.target.innerHTML.indexOf('flag_check') < 0);
+        this.renderAppropriateStream(this.sdate, this.edate, true);
       })
     }
   }
@@ -17005,12 +17017,15 @@ export class SfIEvents extends LitElement {
       if (reportingSchemaValues != "") reportingReporting.prepopulateValJson = reportingSchemaValues
       reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
       reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
+      // reportingReporting.mode = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "edit" : "view"
+      // reportingReporting.editdisable = (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) ? "false" : "true"
       reportingReporting.flow = "reporting"
       setTimeout(() => {
         reportingReporting.loadMode();
         console.log('list-customreporting', reportingSchemaJson);
         console.log('list-customreporting1', reportingSchemaValues);
         console.log('list-customreporting2', reportingReporting.mode);
+        console.log('list-customreporting3', this.myRole);
       }, 500)
     }
 
@@ -17091,12 +17106,14 @@ export class SfIEvents extends LitElement {
           }, 3000);
           return;
         }
-        let reportformatvalues = ""
+        let reportformatvalues: any = {}
         let reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting') as SfIReporting
         console.log('renew reporting', reportingReporting)
         if (reportingReporting != null) {
-          reportformatvalues = JSON.stringify(reportingReporting!.selectedValues()) ?? "";
+          reportformatvalues = reportingReporting!.selectedValues()
         }
+        console.log('reportformatvalues', reportformatvalues, Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)))
+        // return;
         var clickEvent = new MouseEvent("click", {
           "view": window,
           "bubbles": true,
@@ -17117,7 +17134,7 @@ export class SfIEvents extends LitElement {
             for (var p = 0; p < this.events[mmdd].length; p++) {
               if (this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                 this.events[mmdd][p].approved = approved
-                this.events[mmdd][p].terminated = (JSON.parse(reportformatvalues).terminated) ?? false
+                this.events[mmdd][p].terminated = (reportformatvalues.terminated) ?? false
                 this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() })
                 this.events[mmdd][p].lastupdated = new Date().toString()
               }
@@ -26065,7 +26082,7 @@ export class SfIEvents extends LitElement {
       let graphparamname1Arr = (graphparamnames1[i] as HTMLDivElement).innerHTML.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ').split(' • ');
       let filterFound = false;
       for (let tempFilterStr of graphparamname1Arr) {
-        console.log('graphparamname1Arr', tempFilterStr, this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '), tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '));
+        // console.log('graphparamname1Arr', tempFilterStr, this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '), tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '));
         if (tempFilterStr == this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ') || this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' ') == "") {
           filterFound = true;
           break;

package/src/util.ts

@@ -589,8 +589,67 @@ function isVisible(el: HTMLElement): boolean {
   );
 }
 
+function compareObjects (obj1: any, obj2: any): any {
+  if (obj1 === obj2) return {};
+
+  // If both are arrays
+  if (Array.isArray(obj1) && Array.isArray(obj2)) {
+    const maxLength = Math.max(obj1.length, obj2.length);
+    const result: any[] = [];
+
+    for (let i = 0; i < maxLength; i++) {
+      if (i >= obj1.length) {
+        result[i] = obj2[i]; // new item
+      } else if (i >= obj2.length) {
+        result[i] = undefined; // removed item
+      } else {
+        const diff = compareObjects(obj1[i], obj2[i]);
+        if (Object.keys(diff).length > 0) {
+          result[i] = diff;
+        }
+      }
+    }
+
+    return result.filter(v => v !== undefined).length > 0 ? result : {};
+  }
+  // If both are objects
+  if (
+    typeof obj1 === "object" &&
+    obj1 !== null &&
+    typeof obj2 === "object" &&
+    obj2 !== null
+  ) {
+    const keys = new Set([...Object.keys(obj1), ...Object.keys(obj2)]);
+    const diff: Record<string, any> = {};
+
+    for (const key of keys) {
+      if (!(key in obj1)) {
+        diff[key] = [null,(obj2 as any)[key]];
+      } else if (!(key in obj2)) {
+        diff[key] = [(obj1 as any)[key], null];
+      } else {
+        const valueDiff = compareObjects((obj1 as any)[key], (obj2 as any)[key]);
+        if (
+          typeof valueDiff === "object" &&
+          valueDiff !== null &&
+          Object.keys(valueDiff).length === 0
+        ) {
+          continue;
+        }
+        if (valueDiff !== undefined) {
+          diff[key] = valueDiff;
+        }
+      }
+    }
+
+    return Object.keys(diff).length > 0 ? diff : {};
+  }
+
+  // Primitive comparison
+  return obj1 !== obj2 ? [obj1,obj2] : [];
+}
 const exportFunctions = {
-  callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal, getDateTimeStrings, getUsermap, setFeatures, getFeatures, getProjectUsermap, downloadExcelFromCSV, isJSONParsable, isVisible
+  callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal, getDateTimeStrings, getUsermap, setFeatures, getFeatures, getProjectUsermap, downloadExcelFromCSV, isJSONParsable, isVisible, compareObjects
 };
 
 export default exportFunctions;

package/util.d.ts

@@ -24,6 +24,7 @@ declare function getFeatures(): any;
 export declare const downloadExcelFromCSV: (csvString: string, fileName: string | undefined, title: string, projectname: string) => void;
 declare function isJSONParsable(str: unknown): boolean;
 declare function isVisible(el: HTMLElement): boolean;
+declare function compareObjects(obj1: any, obj2: any): any;
 declare const exportFunctions: {
     callApiPresignedDelete: typeof callApiPresignedDelete;
     callApiPresignedGet: typeof callApiPresignedGet;
@@ -53,6 +54,7 @@ declare const exportFunctions: {
     downloadExcelFromCSV: (csvString: string, fileName: string | undefined, title: string, projectname: string) => void;
     isJSONParsable: typeof isJSONParsable;
     isVisible: typeof isVisible;
+    compareObjects: typeof compareObjects;
 };
 export default exportFunctions;
 //# sourceMappingURL=util.d.ts.map

package/util.js

@@ -495,8 +495,62 @@ function isVisible(el) {
         style.visibility !== "hidden" &&
         style.opacity !== "0");
 }
+function compareObjects(obj1, obj2) {
+    if (obj1 === obj2)
+        return {};
+    // If both are arrays
+    if (Array.isArray(obj1) && Array.isArray(obj2)) {
+        const maxLength = Math.max(obj1.length, obj2.length);
+        const result = [];
+        for (let i = 0; i < maxLength; i++) {
+            if (i >= obj1.length) {
+                result[i] = obj2[i]; // new item
+            }
+            else if (i >= obj2.length) {
+                result[i] = undefined; // removed item
+            }
+            else {
+                const diff = compareObjects(obj1[i], obj2[i]);
+                if (Object.keys(diff).length > 0) {
+                    result[i] = diff;
+                }
+            }
+        }
+        return result.filter(v => v !== undefined).length > 0 ? result : {};
+    }
+    // If both are objects
+    if (typeof obj1 === "object" &&
+        obj1 !== null &&
+        typeof obj2 === "object" &&
+        obj2 !== null) {
+        const keys = new Set([...Object.keys(obj1), ...Object.keys(obj2)]);
+        const diff = {};
+        for (const key of keys) {
+            if (!(key in obj1)) {
+                diff[key] = [null, obj2[key]];
+            }
+            else if (!(key in obj2)) {
+                diff[key] = [obj1[key], null];
+            }
+            else {
+                const valueDiff = compareObjects(obj1[key], obj2[key]);
+                if (typeof valueDiff === "object" &&
+                    valueDiff !== null &&
+                    Object.keys(valueDiff).length === 0) {
+                    continue;
+                }
+                if (valueDiff !== undefined) {
+                    diff[key] = valueDiff;
+                }
+            }
+        }
+        return Object.keys(diff).length > 0 ? diff : {};
+    }
+    // Primitive comparison
+    return obj1 !== obj2 ? [obj1, obj2] : [];
+}
 const exportFunctions = {
-    callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal, getDateTimeStrings, getUsermap, setFeatures, getFeatures, getProjectUsermap, downloadExcelFromCSV, isJSONParsable, isVisible
+    callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal, getDateTimeStrings, getUsermap, setFeatures, getFeatures, getProjectUsermap, downloadExcelFromCSV, isJSONParsable, isVisible, compareObjects
 };
 export default exportFunctions;
 //# sourceMappingURL=util.js.map