sf-i-events 1.0.824 → 1.0.826

package/src/sf-i-events.ts

@@ -5775,21 +5775,22 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length == 0){
           
-          await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-          for( var p = 0 ; p < this.events[mmdd].length; p ++){
-            if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-              this.events[mmdd][p].approved = approved 
-              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()
-              if(approved){
-                this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+          if(await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
+                this.events[mmdd][p].approved = approved 
+                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()
+                if(approved){
+                  this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+                }
               }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(event)
           }
-          if(this.recentlyReported[mmdd] == null){
-            this.recentlyReported[mmdd] = []
-          }
-          this.recentlyReported[mmdd].push(event)
         }else{
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -5886,21 +5887,22 @@ export class SfIEvents extends LitElement {
         } else {
           let flagBulk = false;
           if(this.selectedItemIds.length == 0){
-            await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-            for( var p = 0 ; p < this.events[mmdd].length; p ++){
-              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-                this.events[mmdd][p].approved = approved
-                this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-                this.events[mmdd][p].lastupdated = new Date().toString()
-                if(approved){
-                  this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+            if(await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
+                  this.events[mmdd][p].approved = approved
+                  this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                  this.events[mmdd][p].lastupdated = new Date().toString()
+                  if(approved){
+                    this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+                  }
                 }
               }
+              if(this.recentlyReported[mmdd] == null){
+                this.recentlyReported[mmdd] = []
+              }
+              this.recentlyReported[mmdd].push(event)
             }
-            if(this.recentlyReported[mmdd] == null){
-              this.recentlyReported[mmdd] = []
-            }
-            this.recentlyReported[mmdd].push(event)
           }else{
             let bulkBodyAudit = []
             for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -6071,35 +6073,36 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length == 0){
                         
-                        await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers)
+                        if(await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers)){
                         
-                        console.log('this.events', this.events);
-                        if(this.mode != "next"){
-                          for( var p = 0 ; p < this.events[mmdd].length; p ++){
-                            if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-                              this.events[mmdd][p].documents = docs
-                              this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
-                              this.events[mmdd][p].lastupdated = new Date().toString()
-                            }
-                          }
-                          
-                          if(event.makercheckers.length > 0) {
-
-                            // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                          console.log('this.events', this.events);
+                          if(this.mode != "next"){
                             for( var p = 0 ; p < this.events[mmdd].length; p ++){
                               if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-                                this.events[mmdd][p].approved = true
-                                // this.events[mmdd][p].documents = docs
-                                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                this.events[mmdd][p].documents = docs
+                                this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
                                 this.events[mmdd][p].lastupdated = new Date().toString()
                               }
                             }
+                            
+                            if(event.makercheckers.length > 0) {
+
+                              // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                                if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
+                                  this.events[mmdd][p].approved = true
+                                  // this.events[mmdd][p].documents = docs
+                                  this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                  this.events[mmdd][p].lastupdated = new Date().toString()
+                                }
+                              }
+                            }
+                            if(this.recentlyReported[mmdd] == null){
+                              this.recentlyReported[mmdd] = []
+                            }
+                            this.recentlyReported[mmdd].push(event)
+                            console.log('recently reported', this.recentlyReported)
                           }
-                          if(this.recentlyReported[mmdd] == null){
-                            this.recentlyReported[mmdd] = []
-                          }
-                          this.recentlyReported[mmdd].push(event)
-                          console.log('recently reported', this.recentlyReported)
                         }
                       }else{
                         let bulkBody = []
@@ -12443,7 +12446,10 @@ export class SfIEvents extends LitElement {
       console.log('jsonRespose notice details', jsonRespose);
       
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
 
         this.showChosenProject();
@@ -12658,19 +12664,20 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length === 0) {
           console.log('mmddyyyy', mmddyyyy)
-          await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")
-          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].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-              this.events[mmdd][p].lastupdated = new Date().toString()
+          if(await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")){
+            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].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                this.events[mmdd][p].lastupdated = new Date().toString()
+              }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(listEvent)
+            console.log('review single')
           }
-          if(this.recentlyReported[mmdd] == null){
-            this.recentlyReported[mmdd] = []
-          }
-          this.recentlyReported[mmdd].push(event)
-          console.log('review single')
         } else {
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -12785,18 +12792,19 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if(this.selectedItemIds.length === 0) {
 
-            await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")
-            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].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-                this.events[mmdd][p].lastupdated = new Date().toString()
+            if(await this.uploadAudit(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.isnotice != null ? "notices" : "events")){
+              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].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                  this.events[mmdd][p].lastupdated = new Date().toString()
+                }
               }
+              if(this.recentlyReported[mmdd] == null){
+                this.recentlyReported[mmdd] = []
+              }
+              this.recentlyReported[mmdd].push(listEvent)
             }
-            if(this.recentlyReported[mmdd] == null){
-              this.recentlyReported[mmdd] = []
-            }
-            this.recentlyReported[mmdd].push(event)
             console.log('uploadaudit single')
           } else {
             let bulkBodyAudit = []
@@ -12987,34 +12995,34 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length === 0) {
 
-                        await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers)
-                        console.log('this.events', this.events);
-                        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].documents = docs
-                            this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
-                            this.events[mmdd][p].lastupdated = new Date().toString()
-                          }
-                        }
-                        console.log('uploadReport single')
-                        if(makercheckers.length > 0) {
-
-                          // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                        if(await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers)){
+                          console.log('this.events', this.events);
                           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 = true
-                              // this.events[mmdd][p].documents = docs
-                              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                              this.events[mmdd][p].documents = docs
+                              this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
                               this.events[mmdd][p].lastupdated = new Date().toString()
                             }
                           }
-                          console.log('upload report auto approve single')
-                        }
-                        if(this.recentlyReported[mmdd] == null){
-                          this.recentlyReported[mmdd] = []
-                        }
-                        this.recentlyReported[mmdd].push(event)
+                          console.log('uploadReport single')
+                          if(makercheckers.length > 0) {
 
+                            // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                            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 = true
+                                // this.events[mmdd][p].documents = docs
+                                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                this.events[mmdd][p].lastupdated = new Date().toString()
+                              }
+                            }
+                            console.log('upload report auto approve single')
+                          }
+                          if(this.recentlyReported[mmdd] == null){
+                            this.recentlyReported[mmdd] = []
+                          }
+                          this.recentlyReported[mmdd].push(listEvent)
+                        }
                       } else {
                         let bulkBody = []
                         let bulkBodyReview = []
@@ -13280,7 +13288,10 @@ export class SfIEvents extends LitElement {
       }
 
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
 
         this.showChosenProject();
@@ -13953,18 +13964,19 @@ export class SfIEvents extends LitElement {
         let flagBulk = false;
         if(this.selectedItemIds.length === 0) {
           // console.log('mmddyyyy', mmddyyyy)
-          await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-          for( var p = 0 ; p < this.events[mmdd].length; p ++){
-            if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-              
-              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()
+          if(await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                
+                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()
+              }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(event)
           }
-          if(this.recentlyReported[mmdd] == null){
-            this.recentlyReported[mmdd] = []
-          }
-          this.recentlyReported[mmdd].push(event)
         } else {
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -14057,7 +14069,7 @@ export class SfIEvents extends LitElement {
       (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-audit')?.addEventListener('click', async (ev: any) => {
         let buttonClick = ev.target as HTMLButtonElement
         buttonClick.innerHTML = "Saving..."
-        const comments = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-auditor-comments') as HTMLInputElement).value;
+        const comments: string = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-auditor-comments') as HTMLInputElement).value;
         const approved = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-approve-yes') as HTMLInputElement).checked;
         if(approved == event.approved){
           buttonClick.innerHTML = "Save"
@@ -14078,18 +14090,19 @@ export class SfIEvents extends LitElement {
           let flagBulk = false;
           if(this.selectedItemIds.length === 0) {
 
-            await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")
-            for( var p = 0 ; p < this.events[mmdd].length; p ++){
-              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                this.events[mmdd][p].approved = approved
-                this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
-                this.events[mmdd][p].lastupdated = new Date().toString()
+            if(await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.isnotice != null ? "notices" : "events")){
+              for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                  this.events[mmdd][p].approved = approved
+                  this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                  this.events[mmdd][p].lastupdated = new Date().toString()
+                }
               }
+              if(this.recentlyReported[mmdd] == null){
+                this.recentlyReported[mmdd] = []
+              }
+              this.recentlyReported[mmdd].push(event)
             }
-            if(this.recentlyReported[mmdd] == null){
-              this.recentlyReported[mmdd] = []
-            }
-            this.recentlyReported[mmdd].push(event)
           } else {
             let bulkBodyAudit = []
             for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -14280,32 +14293,32 @@ export class SfIEvents extends LitElement {
                         //console.log('makerscheckers', makercheckers, reportercomments);
                         // console.log('reportformatvalues', reportformatvalues)
                         // console.log('reportformatschema',reportformatschema)
-                        await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers)
-                        console.log('this.events', this.events);
-                        for( var p = 0 ; p < this.events[mmdd].length; p ++){
-                          if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                            this.events[mmdd][p].documents = docs
-                            this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
-                            this.events[mmdd][p].lastupdated = new Date().toString()
-                          }
-                        }
-                        if(makercheckers.length > 0) {
-
-                          // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                        if(await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers)){
+                          console.log('this.events', this.events);
                           for( var p = 0 ; p < this.events[mmdd].length; p ++){
                             if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                              this.events[mmdd][p].approved = true
-                              // this.events[mmdd][p].documents = docs
-                              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                              this.events[mmdd][p].documents = docs
+                              this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
                               this.events[mmdd][p].lastupdated = new Date().toString()
                             }
                           }
-                        }
-                        if(this.recentlyReported[mmdd] == null){
-                          this.recentlyReported[mmdd] = []
-                        }
-                        this.recentlyReported[mmdd].push(event)
+                          if(makercheckers.length > 0) {
 
+                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                            for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                              if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                                this.events[mmdd][p].approved = true
+                                // this.events[mmdd][p].documents = docs
+                                this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                                this.events[mmdd][p].lastupdated = new Date().toString()
+                              }
+                            }
+                          }
+                          if(this.recentlyReported[mmdd] == null){
+                            this.recentlyReported[mmdd] = []
+                          }
+                          this.recentlyReported[mmdd].push(event)
+                        }
                       } else {
                         let bulkBody = []
                         let bulkBodyReview = []
@@ -22215,6 +22228,10 @@ export class SfIEvents extends LitElement {
       this._SfLoader.innerHTML = '';
       
     } 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(() => {
@@ -22260,6 +22277,10 @@ export class SfIEvents extends LitElement {
       this._SfLoader.innerHTML = '';
       
     } 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(() => {
@@ -22318,6 +22339,10 @@ export class SfIEvents extends LitElement {
       this._SfLoader.innerHTML = '';
       
     } 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(() => {
@@ -22348,6 +22373,10 @@ export class SfIEvents extends LitElement {
       }, 3000);
       
     } 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(() => {
@@ -22389,6 +22418,10 @@ export class SfIEvents extends LitElement {
       }, 5000);
       
     } 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(() => {
@@ -22422,6 +22455,10 @@ export class SfIEvents extends LitElement {
       }, 3000);
       
     } 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(() => {
@@ -22447,6 +22484,7 @@ export class SfIEvents extends LitElement {
       "username": this.userName,
       "module" : module
     } 
+    let retValue = true;
     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 = '';
@@ -22467,9 +22505,15 @@ export class SfIEvents extends LitElement {
       }, 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);
+      retValue = false;
     }
+    return retValue;
   }
   uploadAuditsBulk = async (bulkBody: any) => {
     let url = "https://"+this.apiId+"/uploadauditsbulk";
@@ -22485,6 +22529,10 @@ export class SfIEvents extends LitElement {
       }, 10000);
       
     } 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);
     }
@@ -22506,7 +22554,7 @@ export class SfIEvents extends LitElement {
       "username": this.userName,
       "module" : module
     } 
-
+    let retValue = true;
     //console.log('uploading review', body);
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;
@@ -22528,12 +22576,18 @@ export class SfIEvents extends LitElement {
       }, 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.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
+      retValue = false;
     }
+    return retValue;
   }
   uploadReportsReviewsBulk = async (bulkBody: any) => {
     let url = "https://"+this.apiId+"/uploadreportsreviewsbulk";
@@ -22548,8 +22602,12 @@ export class SfIEvents extends LitElement {
       }, 10000);
       
     } else {
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
@@ -22568,8 +22626,12 @@ export class SfIEvents extends LitElement {
       }, 10000);
       
     } else {
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
@@ -22577,7 +22639,7 @@ export class SfIEvents extends LitElement {
   }
 
   uploadReport = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string = "", reportformatschema: string = "", module: string = "events", percentage: string = "100", makercheckers: any) => {
-    let url = "https://"+this.apiId+"/uploadreport1";
+    let url = "https://"+this.apiId+"/uploadreport2";
 
     let body = { 
       "mmddyyyy": mmddyyyy,
@@ -22602,7 +22664,7 @@ export class SfIEvents extends LitElement {
     }
 
     //console.log(body);
-
+    let retValue = true;
     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 = '';
@@ -22623,16 +22685,23 @@ export class SfIEvents extends LitElement {
       }, 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.message);
+      console.log()
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
+      retValue = false;
     }
+    return retValue;
   }
 
   uploadReportsBulk = async (bulkBody: any, showSuccess: boolean = true) => {
-    let url = "https://"+this.apiId+"/uploadreportsbulk1"
+    let url = "https://"+this.apiId+"/uploadreportsbulk2"
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(bulkBody, url, this._SfLoader, authorization)) as any;
@@ -22648,8 +22717,12 @@ export class SfIEvents extends LitElement {
       }
       
     } else {
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       const jsonRespose = JSON.parse(xhr.responseText);
-      this.setError(jsonRespose.message);
+      this.setError(jsonRespose.error);
       setTimeout(() => {
         this.clearMessages();
       }, 3000);
@@ -22687,6 +22760,10 @@ export class SfIEvents extends LitElement {
       }, 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);
     }
@@ -22711,6 +22788,10 @@ export class SfIEvents extends LitElement {
       this.renderMappingTabs(this.TAB_REPORTER);
       
     } 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);
     }
@@ -22730,6 +22811,10 @@ export class SfIEvents extends LitElement {
       //console.log('jsonResponse sync', jsonRespose);
       
     } 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);
     }
@@ -22869,7 +22954,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -22891,7 +22979,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -22912,7 +23003,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -22964,7 +23058,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -22987,7 +23084,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23008,7 +23108,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23098,7 +23201,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23183,7 +23289,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23231,7 +23340,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23278,7 +23390,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23299,7 +23414,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23320,7 +23438,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23341,7 +23462,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23362,7 +23486,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23391,7 +23518,10 @@ export class SfIEvents extends LitElement {
       // return jsonRespose;
       
     } 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);
 
@@ -23590,7 +23720,10 @@ export class SfIEvents extends LitElement {
       // }
       
     } 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);
 
@@ -23636,7 +23769,10 @@ export class SfIEvents extends LitElement {
         }
         
       } 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);
   
@@ -23788,7 +23924,10 @@ export class SfIEvents extends LitElement {
       return resultPresigned;
       
     } 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);
 
@@ -23809,7 +23948,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23830,7 +23972,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23857,7 +24002,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23878,7 +24026,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23899,7 +24050,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -23907,342 +24061,7 @@ export class SfIEvents extends LitElement {
 
   }
 
-  // fetchInternalControlsJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getinternalcontrolsjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchExtensionsJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getalertschedulesjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchAlertSchedulesJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getalertschedulesjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchDueDatesJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getduedatesjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchApproversJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getapproversjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchFunctionHeadsJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getfunctionheadsjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchMakerCheckersJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getmakercheckersjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchDocsJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getdocsjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchAuditorsJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getauditorsjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchViewersJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getviewersjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
-  // fetchReportersJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getreportersjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-  
-  // fetchTagsJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/gettagsjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-  
-  // fetchLocationsJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getlocationsjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-  
-  // fetchCountriesJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getcountriesjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
   
-  // fetchEntitiesJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getentitiesjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-  
-  // fetchFunctionJobs = async () => {
-
-  //   let url = "https://"+this.apiId+"/getfunctionsjobs";
-  //   const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
-  //   const xhr : any = (await this.prepareXhr({"projectid": this.projectId}, url, this._SfLoader, authorization)) as any;
-  //   this._SfLoader.innerHTML = '';
-  //   if(xhr.status == 200) {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     //console.log(jsonRespose);
-  //     return jsonRespose;
-      
-  //   } else {
-
-  //     const jsonRespose = JSON.parse(xhr.responseText);
-  //     this.setError(jsonRespose.error);
-
-  //   }
-
-  // }
-
   fetchCalendarJobs = async () => {
 
     let url = "https://"+this.apiId+"/getcalendarjobs";
@@ -24256,7 +24075,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } 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);
 
@@ -24284,6 +24106,10 @@ export class SfIEvents extends LitElement {
       this.processEvent(jsonRespose.data.value)
       
     } 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);
     }
@@ -24307,6 +24133,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
       
     } else {
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       const jsonRespose = JSON.parse(xhr.responseText);
       return jsonRespose;
       
@@ -24379,6 +24209,9 @@ export class SfIEvents extends LitElement {
       //console.log(jsonRespose);
       return registers;
       
+    }else if(xhr.status == 401){
+      let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+      this.dispatchEvent(changeEvent);
     }
 
   }
@@ -24513,7 +24346,10 @@ export class SfIEvents extends LitElement {
 
       
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
 
         this.showChosenProject();
@@ -24589,7 +24425,10 @@ export class SfIEvents extends LitElement {
       this.renderAppropriateStream(this.sdate,this.edate,true);
       console.log('notices', notices, tempEvents);
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
 
         this.showChosenProject();
@@ -24672,6 +24511,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose.meta
 
     } 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);
     }
@@ -24731,6 +24574,9 @@ export class SfIEvents extends LitElement {
           // backgroundProcessButton.style.display = 'none'
         }
       }
+    }else if(xhr.status == 401){
+      let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+      this.dispatchEvent(changeEvent);
     }
   }
   
@@ -24755,7 +24601,10 @@ export class SfIEvents extends LitElement {
       // this.renderChosenProject(events);
       
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
 
         this.showChosenProject();
@@ -24794,7 +24643,10 @@ export class SfIEvents extends LitElement {
       // this.renderChosenProject(events);
       
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
 
         this.showChosenProject();
@@ -24822,7 +24674,10 @@ export class SfIEvents extends LitElement {
       //console.log(jsonRespose);
       
     } 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);
       this.fetchList();
@@ -24862,7 +24717,10 @@ export class SfIEvents extends LitElement {
       return jsonRespose;
 
     } 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);
       this.fetchList();
@@ -24900,7 +24758,10 @@ export class SfIEvents extends LitElement {
       }
       
     } 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);
       this.fetchList();
@@ -24953,6 +24814,10 @@ export class SfIEvents extends LitElement {
         //await this.fetchAdhoc(true);
         
       } 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);
       }
@@ -25215,6 +25080,10 @@ export class SfIEvents extends LitElement {
       }, 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(() => {
@@ -25258,7 +25127,10 @@ export class SfIEvents extends LitElement {
       // this.renderRoleTabsNext(jsonRespose.data, page)
       this.renderNextEvents(jsonRespose.data, page, role);
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
         const jsonRespose = JSON.parse(xhr.responseText);
         this.setError(jsonRespose.error);
@@ -25761,7 +25633,10 @@ export class SfIEvents extends LitElement {
       console.log('report',arrReports['3/31/*,30;c989a44e-7d3d-427e-b712-90eacf585075;38dc8c53-643f-4fee-83fe-f15239606277;0a5fb99f-c36f-46c0-85b4-7fa3d48fa134']);
       this.renderReports(arrReports)
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
         const jsonRespose = JSON.parse(xhr.responseText);
         this.setError(jsonRespose.error);
@@ -25938,7 +25813,10 @@ export class SfIEvents extends LitElement {
           console.log('receivedCompliacnes', arrCompliances)
           // this.renderReportsComplainces(arrCompliances, sortid);
         } else {
-
+          if(xhr.status == 401){
+            let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+            this.dispatchEvent(changeEvent);
+          }
           if(xhr.status === 404) {
 
             this.showChosenProject();
@@ -26020,7 +25898,10 @@ export class SfIEvents extends LitElement {
       console.log('receivedCompliacnes', arrCompliances)
       this.renderReportsComplainces(arrCompliances, sortid);
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
 
         this.showChosenProject();
@@ -26170,7 +26051,10 @@ export class SfIEvents extends LitElement {
       }, 3000)
       
     } else {
-
+      if(xhr.status == 401){
+        let changeEvent = new CustomEvent('tokenExpired',{bubbles:true});
+        this.dispatchEvent(changeEvent);
+      }
       if(xhr.status === 404) {
         const jsonRespose = JSON.parse(xhr.responseText);
         this.setError(jsonRespose.error);
@@ -26586,7 +26470,7 @@ export class SfIEvents extends LitElement {
       `;
 
     } else if(this.mode == "downloader") {
-      //disable
+      /* eslint-disable lit/no-unknown-attribute */
       return html`
           
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -26636,7 +26520,7 @@ export class SfIEvents extends LitElement {
         </div>
 
       `;
-
+      /* eslint-disable lit/no-unknown-attribute */
     } else if(this.mode == "next"){
 
       return html`