sf-i-events 1.0.940 → 1.0.942

package/dev/index.html

@@ -1084,7 +1084,7 @@
     disablesignoff="yes" disableclientresponse="yes">
 
   </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"
@@ -1112,7 +1112,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events> -->
+  </sf-i-events>
   <script>
 
     function setCookie(name, value, days) {

package/package.json

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

package/sf-i-events.d.ts

@@ -769,6 +769,7 @@ export declare class SfIEvents extends LitElement {
     uploadReviewsBulk: (bulkBody: any) => Promise<void>;
     uploadReport: (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string | undefined, reportformatschema: string | undefined, module: string | undefined, percentage: string | undefined, makercheckers: any, reportedlocations?: string) => Promise<boolean>;
     uploadReportsBulk: (bulkBody: any, showSuccess?: boolean) => Promise<void>;
+    sendSuggestions: (eventid: string, eventdelta: any) => Promise<boolean>;
     uploadMapping: () => Promise<void>;
     uploadEvents: () => Promise<void>;
     uploadReprogramTrigger: (eventid: string, timestamp: string) => Promise<void>;

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;
         };
@@ -13262,7 +13262,9 @@ 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);
+                    // await this.sendSuggestions(listEvent.id, comparedObj);
                     // return;
                     var clickEvent = new MouseEvent("click", {
                         "view": window,
@@ -13921,20 +13923,27 @@ let SfIEvents = class SfIEvents extends LitElement {
             var html = `
     
       <div part="compliance-detail-title" class="d-flex justify-between">
+        ${(previousId != "" || nextId != "") ? `
+          <div part="compliance-detail-prev-next" class="d-flex justify-center align-center">
+        <button id="button-detail-previous" part="button-icon" class="mr-10 material-icons${previousId != "" ? "" : " gone"}">chevron_left</button>
+        <button id="button-detail-next" part="button-icon" class="material-icons${nextId != "" ? "" : " gone"}">chevron_right</button>
+      </div>
+      ` : `
         <button part="button-icon" class="material-icons invisible">close</button>
+      `}
         <h3 part="results-title" class="m-0">Compliance Details</h3>
         <button id="button-detail-close" part="button-icon" class="material-icons">close</button>
       </div>
     
     `;
-            if (previousId != "" || nextId != "") {
-                html += `
-      <div part="compliance-detail-prev-next" class="d-flex justify-between m-20">
-        <button id="button-detail-previous" part="button-icon" class="material-icons${previousId != "" ? "" : " invisible"}">chevron_left</button>
-        <button id="button-detail-next" part="button-icon" class="material-icons${nextId != "" ? "" : " invisible"}">chevron_right</button>
-      </div>
-      `;
-            }
+            // if (previousId != "" || nextId != "") {
+            //   html += `
+            //   <div part="compliance-detail-prev-next" class="d-flex justify-between m-20">
+            //     <button id="button-detail-previous" part="button-icon" class="material-icons${previousId != "" ? "" : " invisible"}">chevron_left</button>
+            //     <button id="button-detail-next" part="button-icon" class="material-icons${nextId != "" ? "" : " invisible"}">chevron_right</button>
+            //   </div>
+            //   `
+            // }
             if (this.selectedItemIds.length > 1) {
                 html += `
     
@@ -22013,6 +22022,47 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }, 3000);
             }
         };
+        this.sendSuggestions = async (eventid, eventdelta) => {
+            let url = "https://" + this.apiId + "/sendsuggestions";
+            const body = {
+                "projectid": this.projectId,
+                "objectid": eventid,
+                "objectdelta": JSON.stringify(eventdelta),
+            };
+            let retValue = true;
+            console.log('uploading suggestion', body);
+            const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
+            const xhr = (await this.prepareXhr(body, url, this._SfLoader, authorization));
+            this._SfLoader.innerHTML = '';
+            if (xhr.status == 200) {
+                // const jsonRespose = JSON.parse(xhr.responseText);
+                //console.log('jsonResponse sync', jsonRespose);
+                this.setSuccess("Report uploaded successfully!");
+                setTimeout(() => {
+                    this.clearMessages();
+                    // this.showChosenMapping();
+                    // this.fetchEventMap();
+                    // if(this.myRole == this.TAB_REPORTER) {
+                    //   this.renderMappingTabs(this.TAB_REPORTER);
+                    // } else {
+                    //   this.renderMappingTabs(this.TAB_APPROVER);
+                    // }
+                }, 2000);
+            }
+            else {
+                if (xhr.status == 401) {
+                    let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+                    this.dispatchEvent(changeEvent);
+                }
+                const jsonRespose = JSON.parse(xhr.responseText);
+                this.setError(jsonRespose.error);
+                setTimeout(() => {
+                    this.clearMessages();
+                }, 3000);
+                retValue = false;
+            }
+            return retValue;
+        };
         this.uploadMapping = async () => {
             let url = "https://" + this.apiId + "/mapevents";
             const mapping = this.transformMappingsForUpload({
@@ -22333,7 +22383,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     this._SfDetailContainer.querySelector('#button-show-definition').addEventListener('click', (_e) => {
                                         this._SfDetailContainer.querySelector('#container-definition').innerHTML = '<div  class="m-20"><div part="detail-head" class="mb-10"><strong>Definitions</strong></div><sf-i-uploader class="gone" id="sf-i-definitions" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;]" extract="no" mandatory="" mode="view" maximize="yes"></sf-i-uploader></div>';
                                         this._SfDetailContainer.querySelector('#sf-i-definitions').classList.remove('gone');
-                                        this._SfDetailContainer.querySelector('#sf-i-definitions').prepopulatedInputArr = JSON.stringify(JSON.parse('[' + attachmentKey + ']'));
+                                        this._SfDetailContainer.querySelector('#sf-i-definitions').prepopulatedInputArr = JSON.stringify([attachmentKey]);
                                         this._SfDetailContainer.querySelector('#sf-i-definitions').loadMode();
                                     });
                                 }

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;
@@ -17112,7 +17112,9 @@ 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)
+        // await this.sendSuggestions(listEvent.id, comparedObj);
         // return;
         var clickEvent = new MouseEvent("click", {
           "view": window,
@@ -17855,21 +17857,28 @@ export class SfIEvents extends LitElement {
     var html = `
     
       <div part="compliance-detail-title" class="d-flex justify-between">
+        ${(previousId != "" || nextId != "") ? `
+          <div part="compliance-detail-prev-next" class="d-flex justify-center align-center">
+        <button id="button-detail-previous" part="button-icon" class="mr-10 material-icons${previousId != "" ? "" : " gone"}">chevron_left</button>
+        <button id="button-detail-next" part="button-icon" class="material-icons${nextId != "" ? "" : " gone"}">chevron_right</button>
+      </div>
+      ` : `
         <button part="button-icon" class="material-icons invisible">close</button>
+      `}
         <h3 part="results-title" class="m-0">Compliance Details</h3>
         <button id="button-detail-close" part="button-icon" class="material-icons">close</button>
       </div>
     
     `;
 
-    if (previousId != "" || nextId != "") {
-      html += `
-      <div part="compliance-detail-prev-next" class="d-flex justify-between m-20">
-        <button id="button-detail-previous" part="button-icon" class="material-icons${previousId != "" ? "" : " invisible"}">chevron_left</button>
-        <button id="button-detail-next" part="button-icon" class="material-icons${nextId != "" ? "" : " invisible"}">chevron_right</button>
-      </div>
-      `
-    }
+    // if (previousId != "" || nextId != "") {
+    //   html += `
+    //   <div part="compliance-detail-prev-next" class="d-flex justify-between m-20">
+    //     <button id="button-detail-previous" part="button-icon" class="material-icons${previousId != "" ? "" : " invisible"}">chevron_left</button>
+    //     <button id="button-detail-next" part="button-icon" class="material-icons${nextId != "" ? "" : " invisible"}">chevron_right</button>
+    //   </div>
+    //   `
+    // }
 
     if (this.selectedItemIds.length > 1) {
 
@@ -27844,6 +27853,50 @@ export class SfIEvents extends LitElement {
     }
   }
 
+  sendSuggestions = async (eventid: string, eventdelta:any) => {
+    let url = "https://" + this.apiId + "/sendsuggestions";
+
+    const body = {
+      "projectid": this.projectId,
+      "objectid": eventid,
+      "objectdelta": JSON.stringify(eventdelta),
+    }
+    let retValue = true;
+    console.log('uploading suggestion', body);
+    const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
+    const xhr: any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
+    this._SfLoader.innerHTML = '';
+    if (xhr.status == 200) {
+
+      // const jsonRespose = JSON.parse(xhr.responseText);
+      //console.log('jsonResponse sync', jsonRespose);
+      this.setSuccess("Report uploaded successfully!");
+      setTimeout(() => {
+        this.clearMessages()
+        // this.showChosenMapping();
+        // this.fetchEventMap();
+        // if(this.myRole == this.TAB_REPORTER) {
+        //   this.renderMappingTabs(this.TAB_REPORTER);
+        // } else {
+        //   this.renderMappingTabs(this.TAB_APPROVER);
+        // }
+      }, 2000);
+
+    } else {
+      if (xhr.status == 401) {
+        let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+        this.dispatchEvent(changeEvent);
+      }
+      const jsonRespose = JSON.parse(xhr.responseText);
+      this.setError(jsonRespose.error);
+      setTimeout(() => {
+        this.clearMessages();
+      }, 3000);
+      retValue = false;
+    }
+    return retValue;
+  }
+
   uploadMapping = async () => {
 
     let url = "https://" + this.apiId + "/mapevents";
@@ -28264,7 +28317,7 @@ export class SfIEvents extends LitElement {
                 ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-show-definition') as HTMLButtonElement)!.addEventListener('click', (_e: any) => {
                   (this._SfDetailContainer as HTMLDivElement).querySelector('#container-definition')!.innerHTML = '<div  class="m-20"><div part="detail-head" class="mb-10"><strong>Definitions</strong></div><sf-i-uploader class="gone" id="sf-i-definitions" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;]" extract="no" mandatory="" mode="view" maximize="yes"></sf-i-uploader></div>';
                   ((this._SfDetailContainer as HTMLDivElement).querySelector('#sf-i-definitions') as SfIUploader).classList.remove('gone');
-                  ((this._SfDetailContainer as HTMLDivElement).querySelector('#sf-i-definitions') as SfIUploader).prepopulatedInputArr = JSON.stringify(JSON.parse('[' + attachmentKey + ']'));
+                  ((this._SfDetailContainer as HTMLDivElement).querySelector('#sf-i-definitions') as SfIUploader).prepopulatedInputArr = JSON.stringify([attachmentKey]);
                   ((this._SfDetailContainer as HTMLDivElement).querySelector('#sf-i-definitions') as SfIUploader).loadMode();
                 });