sf-i-events 1.0.940 → 1.0.941

package/dev/index.html

@@ -941,7 +941,7 @@
     </div>
 
   </sf-i-events> -->
-  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  <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"
@@ -969,7 +969,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events> -->
+  </sf-i-events>
   <!-- <sf-i-events id="sf-i-events-next" name="Next Compliances" apiid="dwqyez2puoxmu.cloudfront.net/event"
     apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"

package/package.json

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

package/sf-i-events.js

@@ -2616,13 +2616,13 @@ let SfIEvents = class SfIEvents extends LitElement {
           ${isReviewed ? `<button 
             id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
             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
+            class="material-symbols-outlined d-flex align-center ml-10 button-icon-review">
+            flag_check
           </button>` : `<button 
             id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
             part="button-icon-review" 
-            class="ml-10 button-icon-review">
-            Mark Reviewed
+            class="d-flex align-center ml-10 button-icon-review">
+            <span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood
           </button>`}
         ` : ''}
 
@@ -2918,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) ? (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>';
+            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="material-symbols-outlined d-flex align-center mb-20 ml-10 button-icon-review">flag_check</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood</button>')) : '') + '</div>';
             // }
             return html;
         };
@@ -13178,7 +13178,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 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";
+                // reportingReporting.flow = "reporting"
                 setTimeout(() => {
                     reportingReporting.loadMode();
                     console.log('list-customreporting', reportingSchemaJson);
@@ -13262,7 +13262,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (reportingReporting != null) {
                         reportformatvalues = reportingReporting.selectedValues();
                     }
-                    console.log('reportformatvalues', reportformatvalues, Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)));
+                    let comparedObj = Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues));
+                    console.log('reportformatvalues', reportformatvalues, comparedObj);
                     // return;
                     var clickEvent = new MouseEvent("click", {
                         "view": window,

package/src/sf-i-events.ts

@@ -4847,13 +4847,13 @@ export class SfIEvents extends LitElement {
           ${isReviewed ? `<button 
             id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
             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
+            class="material-symbols-outlined d-flex align-center ml-10 button-icon-review">
+            flag_check
           </button>` : `<button 
             id="input-checkbox-review-${mmddSanitized}-${itemNumber}" 
             part="button-icon-review" 
-            class="ml-10 button-icon-review">
-            Mark Reviewed
+            class="d-flex align-center ml-10 button-icon-review">
+            <span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood
           </button>`}
         ` : ''}
 
@@ -5191,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) ? (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>';
+    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="material-symbols-outlined d-flex align-center mb-20 ml-10 button-icon-review">flag_check</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood</button>')) : '') + '</div>';
     // }
     
     return html;
@@ -17019,7 +17019,7 @@ export class SfIEvents extends LitElement {
       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"
+      // reportingReporting.flow = "reporting"
       setTimeout(() => {
         reportingReporting.loadMode();
         console.log('list-customreporting', reportingSchemaJson);
@@ -17112,7 +17112,8 @@ export class SfIEvents extends LitElement {
         if (reportingReporting != null) {
           reportformatvalues = reportingReporting!.selectedValues()
         }
-        console.log('reportformatvalues', reportformatvalues, Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues)))
+        let comparedObj = Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues))
+        console.log('reportformatvalues', reportformatvalues, comparedObj)
         // return;
         var clickEvent = new MouseEvent("click", {
           "view": window,