sf-i-events 1.0.824 → 1.0.826

package/sf-i-events.js

@@ -3435,21 +3435,22 @@ let SfIEvents = 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 = [];
@@ -3538,21 +3539,22 @@ let SfIEvents = 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 = [];
@@ -3696,32 +3698,33 @@ let SfIEvents = class SfIEvents extends LitElement {
                                             else {
                                                 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);
-                                                    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");
+                                                    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].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 {
@@ -8935,6 +8938,10 @@ let SfIEvents = 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();
                     this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -9122,18 +9129,19 @@ let SfIEvents = 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 = [];
@@ -9239,18 +9247,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                     else {
                         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 {
@@ -9407,32 +9416,33 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
                                                 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] = [];
+                                                        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);
                                                     }
-                                                    this.recentlyReported[mmdd].push(event);
                                                 }
                                                 else {
                                                     let bulkBody = [];
@@ -9665,6 +9675,10 @@ let SfIEvents = 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();
                     this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -10211,17 +10225,18 @@ let SfIEvents = 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 = [];
@@ -10326,18 +10341,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                     else {
                         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 = [];
@@ -10495,30 +10511,31 @@ let SfIEvents = 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 (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);
                                                     }
-                                                    if (this.recentlyReported[mmdd] == null) {
-                                                        this.recentlyReported[mmdd] = [];
-                                                    }
-                                                    this.recentlyReported[mmdd].push(event);
                                                 }
                                                 else {
                                                     let bulkBody = [];
@@ -16756,6 +16773,10 @@ let SfIEvents = 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(() => {
@@ -16792,6 +16813,10 @@ let SfIEvents = 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(() => {
@@ -16836,6 +16861,10 @@ let SfIEvents = 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(() => {
@@ -16859,6 +16888,10 @@ let SfIEvents = 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(() => {
@@ -16893,6 +16926,10 @@ let SfIEvents = 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(() => {
@@ -16919,6 +16956,10 @@ let SfIEvents = 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(() => {
@@ -16941,6 +16982,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 "username": this.userName,
                 "module": module
             };
+            let retValue = true;
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(body, url, this._SfLoader, authorization));
             this._SfLoader.innerHTML = '';
@@ -16960,9 +17002,15 @@ let SfIEvents = 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;
         };
         this.uploadAuditsBulk = async (bulkBody) => {
             let url = "https://" + this.apiId + "/uploadauditsbulk";
@@ -16976,6 +17024,10 @@ let SfIEvents = 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);
             }
@@ -16995,6 +17047,7 @@ let SfIEvents = 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 = (await this.prepareXhr(body, url, this._SfLoader, authorization));
@@ -17015,12 +17068,18 @@ let SfIEvents = 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;
         };
         this.uploadReportsReviewsBulk = async (bulkBody) => {
             let url = "https://" + this.apiId + "/uploadreportsreviewsbulk";
@@ -17034,8 +17093,12 @@ let SfIEvents = 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);
@@ -17053,15 +17116,19 @@ let SfIEvents = 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);
             }
         };
         this.uploadReport = async (entityId, locationId, mmddyyyy, eventid, comments, doc, docs, event, reportformatvalues = "", reportformatschema = "", module = "events", percentage = "100", makercheckers) => {
-            let url = "https://" + this.apiId + "/uploadreport1";
+            let url = "https://" + this.apiId + "/uploadreport2";
             let body = {
                 "mmddyyyy": mmddyyyy,
                 "projectid": this.projectId,
@@ -17084,6 +17151,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 "makercheckers": makercheckers
             };
             //console.log(body);
+            let retValue = true;
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(body, url, this._SfLoader, authorization));
             this._SfLoader.innerHTML = '';
@@ -17103,15 +17171,22 @@ let SfIEvents = 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;
         };
         this.uploadReportsBulk = async (bulkBody, showSuccess = true) => {
-            let url = "https://" + this.apiId + "/uploadreportsbulk1";
+            let url = "https://" + this.apiId + "/uploadreportsbulk2";
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(bulkBody, url, this._SfLoader, authorization));
             if (showSuccess) {
@@ -17126,8 +17201,12 @@ let SfIEvents = 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);
@@ -17161,6 +17240,10 @@ let SfIEvents = 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);
             }
@@ -17180,6 +17263,10 @@ let SfIEvents = 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);
             }
@@ -17195,6 +17282,10 @@ let SfIEvents = 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);
             }
@@ -17291,6 +17382,10 @@ let SfIEvents = 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);
             }
@@ -17306,6 +17401,10 @@ let SfIEvents = 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);
             }
@@ -17321,6 +17420,10 @@ let SfIEvents = 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);
             }
@@ -17357,6 +17460,10 @@ let SfIEvents = 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);
             }
@@ -17372,6 +17479,10 @@ let SfIEvents = 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);
             }
@@ -17387,6 +17498,10 @@ let SfIEvents = 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);
             }
@@ -17460,6 +17575,10 @@ let SfIEvents = 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);
             }
@@ -17535,6 +17654,10 @@ let SfIEvents = 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);
             }
@@ -17573,6 +17696,10 @@ let SfIEvents = 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);
             }
@@ -17609,6 +17736,10 @@ let SfIEvents = 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);
             }
@@ -17624,6 +17755,10 @@ let SfIEvents = 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);
             }
@@ -17639,6 +17774,10 @@ let SfIEvents = 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);
             }
@@ -17654,6 +17793,10 @@ let SfIEvents = 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);
             }
@@ -17669,6 +17812,10 @@ let SfIEvents = 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);
             }
@@ -17691,6 +17838,10 @@ let SfIEvents = 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);
             }
@@ -17815,6 +17966,10 @@ let SfIEvents = 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);
             }
@@ -17847,6 +18002,10 @@ let SfIEvents = 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);
                 }
@@ -17933,6 +18092,10 @@ let SfIEvents = 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);
             }
@@ -17948,6 +18111,10 @@ let SfIEvents = 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);
             }
@@ -17963,6 +18130,10 @@ let SfIEvents = 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);
             }
@@ -17983,6 +18154,10 @@ let SfIEvents = 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);
             }
@@ -17998,6 +18173,10 @@ let SfIEvents = 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);
             }
@@ -18013,234 +18192,14 @@ let SfIEvents = 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);
             }
         };
-        // 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);
-        //   }
-        // }
         this.fetchCalendarJobs = async () => {
             let url = "https://" + this.apiId + "/getcalendarjobs";
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
@@ -18252,6 +18211,10 @@ let SfIEvents = 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);
             }
@@ -18272,6 +18235,10 @@ let SfIEvents = 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);
             }
@@ -18291,6 +18258,10 @@ let SfIEvents = 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;
             }
@@ -18347,6 +18318,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                 //console.log(jsonRespose);
                 return registers;
             }
+            else if (xhr.status == 401) {
+                let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+                this.dispatchEvent(changeEvent);
+            }
         };
         this.renderWithFeatures = async (startDate = "", endDate = "", searchString = "", list = "yes", month = "00") => {
             this.events = [];
@@ -18449,6 +18424,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                 // } while(1)
             }
             else {
+                if (xhr.status == 401) {
+                    let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+                    this.dispatchEvent(changeEvent);
+                }
                 if (xhr.status === 404) {
                     this.showChosenProject();
                     this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -18514,6 +18493,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                 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();
                     this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -18586,6 +18569,10 @@ let SfIEvents = 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);
             }
@@ -18644,6 +18631,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 }
             }
+            else if (xhr.status == 401) {
+                let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
+                this.dispatchEvent(changeEvent);
+            }
         };
         this.fetchUserCalendar = async () => {
             let url = "https://" + this.apiId + "/getuserevents";
@@ -18662,6 +18653,10 @@ let SfIEvents = 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();
                     this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -18692,6 +18687,10 @@ let SfIEvents = 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();
                     this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -18713,6 +18712,10 @@ let SfIEvents = 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();
@@ -18747,6 +18750,10 @@ let SfIEvents = 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();
@@ -18780,6 +18787,10 @@ let SfIEvents = 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();
@@ -18814,6 +18825,10 @@ let SfIEvents = 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);
                 }
@@ -19028,6 +19043,10 @@ let SfIEvents = 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(() => {
@@ -19073,6 +19092,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                 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);
@@ -19490,6 +19513,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                 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);
@@ -19642,6 +19669,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                         // 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();
                             this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -19718,6 +19749,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                 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();
                     this._SfTitleChosenProject.innerHTML = this._SfProject[0].querySelector('#sf-i-project').selectedTexts()[0];
@@ -19851,6 +19886,10 @@ let SfIEvents = 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);
@@ -20276,7 +20315,7 @@ let SfIEvents = 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">
@@ -20326,6 +20365,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         </div>
 
       `;
+            /* eslint-disable lit/no-unknown-attribute */
         }
         else if (this.mode == "next") {
             return html `