sf-i-events 1.0.689 → 1.0.691

package/package.json

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

package/sf-i-events.d.ts

@@ -755,6 +755,7 @@ export declare class SfIEvents extends LitElement {
     renderAppropriateStream: (startDate: string, endDate: string, showGraph?: boolean) => void;
     fetchRegisters: (searchString?: string) => Promise<any>;
     fetchAndYearlyRenderUserCalendar_2: (startDate?: string, endDate?: string, searchString?: string, list?: string, month?: string) => Promise<void>;
+    fetchBulkReportingData: () => Promise<void>;
     fetchUserCalendar: () => Promise<void>;
     fetchCalendar: () => Promise<void>;
     fetchReprogramAdhoc: () => Promise<void>;

package/sf-i-events.js

@@ -2224,7 +2224,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div class="stream-events-container flex-grow">';
             html += '<div class="hidden-tags hide">' + JSON.stringify(event['tags']) + '</div>';
             html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>';
-            html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((event.reportformat != null && event.reportformat.length > 0) ? 'hide' : '') + '" type="checkbox"/>') + '<sf-i-elastic-text text="' + event['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>' + (lastUpdated.length > 0 ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
+            html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + ((event.isbulk == null || event.isbulk == false) ? ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((event.reportformat != null && event.reportformat.length > 0) ? 'hide' : '') + '" type="checkbox"/>') : ('')) + '<sf-i-elastic-text text="' + event['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>' + (lastUpdated.length > 0 ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
             if (remarks.length > 0) {
                 html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">' + remarks + ', occurred on ' + occurrenceDate + '</div>';
             }
@@ -2260,6 +2260,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<table class="stream-events-container-table" part="' + partStatus + '">';
             html += '<thead>';
             html += '<th part="td-head">';
+            // if(event.isbulk == null || event.isbulk == false) html += 'Open'
             html += 'Open';
             html += '</th>';
             html += '<th part="td-head">';
@@ -2326,7 +2327,12 @@ let SfIEvents = class SfIEvents extends LitElement {
             var html = '';
             html += '<tbody>';
             html += '<td id="td-expand-' + i + '" part="td-body">';
-            html += '<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>';
+            if (event.isbulk == null || !event.isbulk) {
+                html += '<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>';
+            }
+            else {
+                html += '<div class="lds-dual-ring1"></div>';
+            }
             html += '</td>';
             html += '<td part="td-body">';
             html += this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i);
@@ -6893,6 +6899,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                             // this.clearMessages();
                         }
                         await this.uploadReviewsBulk(bulkBodyReview);
+                        for (var k = 0; k < this.selectedItemIds.length; k++) {
+                            const selectedId = this.selectedItemIds[k];
+                            //console.log('selectedid', selectedId);
+                            entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                            const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                            mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+                            for (var p = 0; p < this.events[mmdd].length; p++) {
+                                if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                    this.events[mmdd][p].isbulk = true;
+                                }
+                            }
+                        }
                     }
                     if (this.mode == "next") {
                         // this.fetchNext(this.nextPage)
@@ -6967,6 +6986,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 // await this.uploadAudit(entityId, locationId, mmddyyyy, eventId, comments, approved);
                             }
                             await this.uploadAuditsBulk(bulkBodyAudit);
+                            for (var k = 0; k < this.selectedItemIds.length; k++) {
+                                const selectedId = this.selectedItemIds[k];
+                                //console.log('selectedid', selectedId);
+                                entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                                locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                                const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                                mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+                                for (var p = 0; p < this.events[mmdd].length; p++) {
+                                    if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                        this.events[mmdd][p].isbulk = true;
+                                    }
+                                }
+                            }
                         }
                         var clickEvent = new MouseEvent("click", {
                             "view": window,
@@ -7131,6 +7163,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 if (bulkBodyReview.length > 0) {
                                                     await this.uploadReviewsBulk(bulkBodyReview);
                                                 }
+                                                for (var k = 0; k < this.selectedItemIds.length; k++) {
+                                                    const selectedId = this.selectedItemIds[k];
+                                                    //console.log('selectedid', selectedId);
+                                                    entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                                                    locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                                                    const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                                                    mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+                                                    for (var p = 0; p < this.events[mmdd].length; p++) {
+                                                        if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                                            this.events[mmdd][p].isbulk = true;
+                                                        }
+                                                    }
+                                                }
                                             }
                                             if (this.mode == "next") {
                                                 this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus);
@@ -11957,7 +12002,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                         graphparamnames2[i].style.display = 'block';
                     if (graphparamnames3 != null && graphparamnames3[i] != null)
                         graphparamnames3[i].style.display = 'block';
-                    eventTitles[i].style.display = 'flex';
+                    if (eventTitles[i] != null)
+                        eventTitles[i].style.display = 'flex';
                     if (eventSubTitles[i] != null) {
                         eventSubTitles[i].style.display = 'flex';
                     }
@@ -14468,6 +14514,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 this.events = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
                 await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete);
                 this.renderAppropriateStream(startDate, endDate, list == "no");
+                this.fetchBulkReportingData();
                 // this.events = {}
                 // this.events = {...JSON.parse(JSON.stringify(jsonRespose.data.events))};
                 // let lastEvaluatedKey = jsonRespose.lastEvaluatedKey;
@@ -14515,6 +14562,38 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
+        this.fetchBulkReportingData = async () => {
+            let path = "getbulkreportjobs";
+            let urlBody = { "projectid": this.projectId };
+            let url = "https://" + this.apiId + "/" + path;
+            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('bulk reports jsonRespose', jsonRespose);
+                if (jsonRespose.result == true) {
+                    for (let sortid of Object.keys(jsonRespose.data)) {
+                        let sortidArr = sortid.split(';');
+                        let mmddyyyy = sortidArr[0];
+                        let entityid = sortidArr[1];
+                        let locationid = sortidArr[2];
+                        let eventid = sortidArr[3];
+                        let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1];
+                        console.log('mmdd', mmdd, Object.keys(this.events));
+                        for (let i = 0; i < this.events[mmdd].length; i++) {
+                            if (this.events[mmdd][i].entityid == entityid && this.events[mmdd][i].locationid == locationid && this.events[mmdd][i].id == eventid) {
+                                this.events[mmdd][i].isbulk = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (Object.keys(jsonRespose.data).length > 0) {
+                        this.renderAppropriateStream(this.sdate, this.edate, true);
+                    }
+                }
+            }
+        };
         this.fetchUserCalendar = async () => {
             let url = "https://" + this.apiId + "/getuserevents";
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
@@ -16291,6 +16370,32 @@ SfIEvents.styles = css `
 
     }
 
+    .lds-dual-ring1 {
+      display: inline-block;
+      width: 15px;
+      height: 15px;
+    }
+    .lds-dual-ring1:after {
+      content: " ";
+      display: block;
+      width: 15px;
+      height: 15px;
+      margin: 0px;
+      border-radius: 50%;
+      border: 2px solid #fff;
+      border-color: #666 #ddd #666 #ddd;
+      animation: lds-dual-ring 0.8s linear infinite;
+    }
+  
+    @keyframes lds-dual-ring1 {
+      0% {
+        transform: rotate(0deg);
+      }
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+
     sf-i-uploader::part(button-icon) {
       border-width: 0px;      
       border-radius: 5px;

package/src/sf-i-events.ts

@@ -1602,6 +1602,32 @@ export class SfIEvents extends LitElement {
 
     }
 
+    .lds-dual-ring1 {
+      display: inline-block;
+      width: 15px;
+      height: 15px;
+    }
+    .lds-dual-ring1:after {
+      content: " ";
+      display: block;
+      width: 15px;
+      height: 15px;
+      margin: 0px;
+      border-radius: 50%;
+      border: 2px solid #fff;
+      border-color: #666 #ddd #666 #ddd;
+      animation: lds-dual-ring 0.8s linear infinite;
+    }
+  
+    @keyframes lds-dual-ring1 {
+      0% {
+        transform: rotate(0deg);
+      }
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+
     sf-i-uploader::part(button-icon) {
       border-width: 0px;      
       border-radius: 5px;
@@ -4274,7 +4300,7 @@ export class SfIEvents extends LitElement {
     html += '<div class="stream-events-container flex-grow">';
     html += '<div class="hidden-tags hide">'+JSON.stringify(event['tags'])+'</div>'
     html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-    html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + ('<input id="button-select-'+mmdd.replace('/', '-')+'-'+itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') +  '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g,'_') +  '" class="button-select mr-10 ' + ((event.reportformat != null && event.reportformat.length > 0) ? 'hide' : '') + '" type="checkbox"/>') + '<sf-i-elastic-text text="'+event['obligationtitle']+'" minLength="100"></sf-i-elastic-text>' + (lastUpdated.length > 0 ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
+    html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + ((event.isbulk == null || event.isbulk == false) ? ('<input id="button-select-'+mmdd.replace('/', '-')+'-'+itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') +  '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g,'_') +  '" class="button-select mr-10 ' + ((event.reportformat != null && event.reportformat.length > 0) ? 'hide' : '') + '" type="checkbox"/>') : ('')) + '<sf-i-elastic-text text="'+event['obligationtitle']+'" minLength="100"></sf-i-elastic-text>' + (lastUpdated.length > 0 ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
     if(remarks.length > 0) {
       html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">'+remarks+', occurred on '+occurrenceDate+'</div>';  
     }
@@ -4327,6 +4353,7 @@ export class SfIEvents extends LitElement {
     html += '<table class="stream-events-container-table" part="'+partStatus+'">';
     html += '<thead>';
     html += '<th part="td-head">';
+    // if(event.isbulk == null || event.isbulk == false) html += 'Open'
     html += 'Open'
     html += '</th>';
     html += '<th part="td-head">';
@@ -4400,7 +4427,11 @@ export class SfIEvents extends LitElement {
 
     html += '<tbody>';
     html += '<td id="td-expand-'+i+'" part="td-body">';
-    html += '<button id="button-unmapped-expand-'+mmdd.replace('/', '-')+'-'+j+'" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>'
+    if(event.isbulk == null || !event.isbulk){
+      html += '<button id="button-unmapped-expand-'+mmdd.replace('/', '-')+'-'+j+'" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>'
+    }else{
+      html += '<div class="lds-dual-ring1"></div>';
+    }
     html += '</td>';
     html += '<td part="td-body">';
     html += this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i);
@@ -10232,6 +10263,22 @@ export class SfIEvents extends LitElement {
 
           }
           await this.uploadReviewsBulk(bulkBodyReview);
+
+          for(var k = 0; k < this.selectedItemIds.length; k++) {
+            
+            const selectedId = this.selectedItemIds[k];
+            //console.log('selectedid', selectedId);
+            entityId = selectedId.split('-')[7].replace(/_/g, '-');
+            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+            const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+            mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+              if(this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                
+                this.events[mmdd][p].isbulk = true
+              }
+            }
+          }
         }
         
         if(this.mode == "next"){
@@ -10315,6 +10362,21 @@ export class SfIEvents extends LitElement {
             }
 
             await this.uploadAuditsBulk(bulkBodyAudit);
+            for(var k = 0; k < this.selectedItemIds.length; k++) {
+            
+              const selectedId = this.selectedItemIds[k];
+              //console.log('selectedid', selectedId);
+              entityId = selectedId.split('-')[7].replace(/_/g, '-');
+              locationId = selectedId.split('-')[8].replace(/_/g, '-');
+              const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+              mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                if(this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                  
+                  this.events[mmdd][p].isbulk = true
+                }
+              }
+            }
 
           }
           
@@ -10518,6 +10580,21 @@ export class SfIEvents extends LitElement {
                       if(bulkBodyReview.length > 0){
                         await this.uploadReviewsBulk(bulkBodyReview)
                       }
+                      for(var k = 0; k < this.selectedItemIds.length; k++) {
+            
+                        const selectedId = this.selectedItemIds[k];
+                        //console.log('selectedid', selectedId);
+                        entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                        locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                        const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                        mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+                        for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                          if(this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                            
+                            this.events[mmdd][p].isbulk = true
+                          }
+                        }
+                      }
 
                     }
 
@@ -16770,7 +16847,7 @@ export class SfIEvents extends LitElement {
         (graphparamnames1[i] as HTMLDivElement).style.display = 'block';
         if(graphparamnames2 != null && graphparamnames2[i] != null) (graphparamnames2[i] as HTMLDivElement).style.display = 'block';
         if(graphparamnames3 != null && graphparamnames3[i] != null) (graphparamnames3[i] as HTMLDivElement).style.display = 'block';
-        (eventTitles[i] as HTMLDivElement).style.display = 'flex';
+        if(eventTitles[i] != null)(eventTitles[i] as HTMLDivElement).style.display = 'flex';
         if(eventSubTitles[i] != null) {
           (eventSubTitles[i] as HTMLDivElement).style.display = 'flex';
         }
@@ -20127,7 +20204,7 @@ export class SfIEvents extends LitElement {
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
 
         this.renderAppropriateStream(startDate, endDate, list == "no");
-
+        this.fetchBulkReportingData();
         // this.events = {}
         // this.events = {...JSON.parse(JSON.stringify(jsonRespose.data.events))};
 
@@ -20202,6 +20279,40 @@ export class SfIEvents extends LitElement {
     }
 
   }
+
+  fetchBulkReportingData = async() => {
+    let path = "getbulkreportjobs"
+    let urlBody :any = {"projectid": this.projectId}
+    let url = "https://"+this.apiId+"/"+ path;
+    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('bulk reports jsonRespose', jsonRespose);
+      if(jsonRespose.result == true){
+        for(let sortid of Object.keys(jsonRespose.data)){
+          let sortidArr = sortid.split(';')
+          let mmddyyyy = sortidArr[0]
+          let entityid = sortidArr[1]
+          let locationid = sortidArr[2]
+          let eventid = sortidArr[3]
+          let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+          console.log('mmdd', mmdd, Object.keys(this.events));
+          for (let i = 0 ; i < this.events[mmdd].length; i ++){
+            if(this.events[mmdd][i].entityid == entityid && this.events[mmdd][i].locationid == locationid && this.events[mmdd][i].id == eventid){
+              this.events[mmdd][i].isbulk = true;
+              break
+            }
+          }
+        }
+        if(Object.keys(jsonRespose.data).length > 0){
+          this.renderAppropriateStream(this.sdate,this.edate,true)
+        }
+      }
+    }
+  }
   
   fetchUserCalendar = async() => {
 

package/src/util.ts

@@ -219,7 +219,7 @@ const validateName = (name: string) => {
       if (interval > 1) {
         return Math.floor(interval) + " minutes later";
       }
-      return Math.floor(Math.abs(seconds)) + " seconds later";
+      return Math.floor(Math.abs(seconds)) + " seconds";
 
     }
   }

package/util.js

@@ -191,7 +191,7 @@ const timeSince = (date) => {
         if (interval > 1) {
             return Math.floor(interval) + " minutes later";
         }
-        return Math.floor(Math.abs(seconds)) + " seconds later";
+        return Math.floor(Math.abs(seconds)) + " seconds";
     }
 };
 function readCookie(key) {