sf-i-events 1.0.939 → 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';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.939",
+  "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) && event.concise == 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);
                 });
             }
         };
@@ -13250,7 +13262,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (reportingReporting != null) {
                         reportformatvalues = reportingReporting.selectedValues();
                     }
-                    console.log('reportformatvalues', Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)));
+                    console.log('reportformatvalues', reportformatvalues, Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)));
+                    // return;
                     var clickEvent = new MouseEvent("click", {
                         "view": window,
                         "bubbles": true,
@@ -20552,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) && event.concise == 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);
       })
     }
   }
@@ -17100,7 +17112,8 @@ export class SfIEvents extends LitElement {
         if (reportingReporting != null) {
           reportformatvalues = reportingReporting!.selectedValues()
         }
-        console.log('reportformatvalues', Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)))
+        console.log('reportformatvalues', reportformatvalues, Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)))
+        // return;
         var clickEvent = new MouseEvent("click", {
           "view": window,
           "bubbles": true,
@@ -26069,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;