sf-i-events 1.0.905 → 1.0.907

package/dev/index.html

@@ -787,7 +787,7 @@
     </div>
 
   </sf-i-events> -->
-  <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
@@ -815,8 +815,8 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events>
-  <!-- <sf-i-events id="sf-i-events-next" name="Next Compliances" apiid="dwqyez2puoxmu.cloudfront.net/event"
+  </sf-i-events> -->
+  <sf-i-events id="sf-i-events-next" name="Next Compliances" apiid="dwqyez2puoxmu.cloudfront.net/event"
     apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" mode="next" fill="solid" username="Local Reporter 1"
@@ -829,7 +829,7 @@
         extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="31457280"
         allowdownload="yes"></sf-i-uploader></div>
     <div slot="reporting"><sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting></div>
-  </sf-i-events> -->
+  </sf-i-events>
   <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"

package/package.json

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

package/sf-i-events.js

@@ -4223,7 +4223,6 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 let reportedlocations = (_c = selectReportingLocation === null || selectReportingLocation === void 0 ? void 0 : selectReportingLocation.value) !== null && _c !== void 0 ? _c : "";
                                                 if (this.selectedItemIds.length <= 1) {
                                                     if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, (_f = event.module) !== null && _f !== void 0 ? _f : "compliance", percentage, event.makercheckers, reportedlocations)) {
-                                                        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) {
@@ -4249,6 +4248,31 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                             this.recentlyReported[mmdd].push(event);
                                                             console.log('recently reported', this.recentlyReported);
                                                         }
+                                                        else {
+                                                            for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].documents = docs;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
+                                                                    this.nextEvents[this.nextTabRole][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.module ?? "compliance");
+                                                                for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                                                    if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
+                                                                        this.nextEvents[this.nextTabRole][mmdd][p].approved = true;
+                                                                        // this.events[mmdd][p].documents = docs
+                                                                        this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                        this.nextEvents[this.nextTabRole][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);
+                                                        }
                                                     }
                                                 }
                                                 else {
@@ -13818,11 +13842,22 @@ let SfIEvents = class SfIEvents extends LitElement {
                         let flagBulk = false;
                         if (this.selectedItemIds.length <= 1) {
                             if (await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, (_a = event.module) !== null && _a !== void 0 ? _a : "compliance")) {
-                                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.mode == "next") {
+                                    for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                        if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                            this.nextEvents[this.nextTabRole][mmdd][p].approved = approved;
+                                            this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                            this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString();
+                                        }
+                                    }
+                                }
+                                else {
+                                    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) {
@@ -13867,14 +13902,28 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                                 mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                                 let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1];
-                                for (var p = 0; p < this.events[mmdd].length; p++) {
-                                    if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                        this.events[mmdd][p].isbulk = true;
-                                        flagBulk = true;
-                                        if (this.recentlyReported[mmdd] == null) {
-                                            this.recentlyReported[mmdd] = [];
+                                if (this.mode == "next") {
+                                    for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                        if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                            this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true;
+                                            flagBulk = true;
+                                            if (this.recentlyReported[mmdd] == null) {
+                                                this.recentlyReported[mmdd] = [];
+                                            }
+                                            this.recentlyReported[mmdd].push(this.events[mmdd][p]);
+                                        }
+                                    }
+                                }
+                                else {
+                                    for (var p = 0; p < this.events[mmdd].length; p++) {
+                                        if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+                                            this.events[mmdd][p].isbulk = true;
+                                            flagBulk = true;
+                                            if (this.recentlyReported[mmdd] == null) {
+                                                this.recentlyReported[mmdd] = [];
+                                            }
+                                            this.recentlyReported[mmdd].push(this.events[mmdd][p]);
                                         }
-                                        this.recentlyReported[mmdd].push(this.events[mmdd][p]);
                                     }
                                 }
                             }
@@ -13886,7 +13935,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                         });
                         this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
                         if (this.mode == "next") {
-                            this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus);
+                            // this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
+                            this.renderNextEvents(this.nextEvents, this.nextPage, this.nextTabRole);
                         }
                         else {
                             // if(this.getCurrentTab() == this.TAB_CUSTOM) {
@@ -13996,25 +14046,48 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                     // console.log('reportformatvalues', reportformatvalues)
                                                     // console.log('reportformatschema',reportformatschema)
                                                     if (await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, (_c = event.module) !== null && _c !== void 0 ? _c : "compliance", percentage, makercheckers, reportinglocation)) {
-                                                        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 (this.mode == "next") {
+                                                            for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].documents = docs;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString();
+                                                                }
                                                             }
                                                         }
-                                                        if (makercheckers.length > 0) {
-                                                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
+                                                        else {
+                                                            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.module ?? "compliance");
+                                                            if (this.mode == "next") {
+                                                                for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                                                    if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                                                        this.nextEvents[this.nextTabRole][mmdd][p].approved = true;
+                                                                        // this.events[mmdd][p].documents = docs
+                                                                        this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                                        this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString();
+                                                                    }
+                                                                }
+                                                            }
+                                                            else {
+                                                                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] = [];
                                                         }
@@ -14877,11 +14950,11 @@ let SfIEvents = class SfIEvents extends LitElement {
                             //   break;
                             // }
                         }
-                        if (k < taggingArray.data.mappings.mappings.length) {
+                        if (i < taggingArray.data.mappings.mappings.length) {
                             html += '<td part="td-body" class="' + classBg + '">';
                             html += '<div class="' + (!showSearch ? 'truncate' : '') + '">';
                             // html += '<textarea part="input" id="extra-field-'+i+'-'+j+'" class="extra-field extra-field-'+j+'" '+ (taggingArray.data.mappings.mappings[k].extraFields != null ? (taggingArray.data.mappings.mappings[k].extraFields[j] != null ?  ((taggingArray.data.mappings.mappings[k].extraFields[j].toLowerCase() == "client remarks" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : ((taggingArray.data.mappings.mappings[k].extraFields[j].toLowerCase() == "flagggrc response" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : '')) : "") : "") +' >'+(taggingArray.data.mappings.mappings[k].extraFields != null ? (taggingArray.data.mappings.mappings[k].extraFields[j] != null ? taggingArray.data.mappings.mappings[k].extraFields[j] : "") : "")+'</textarea>';
-                            html += '<textarea part="input" id="extra-field-' + i + '-' + j + '" class="extra-field extra-field-' + j + '" ' + (extraFields != null ? (extraFields[j] != null ? ((extraFields[j].toLowerCase() == "client remarks" && this.disableclientresponse.toLowerCase() == "yes") ? 'disabled' : ((extraFields[j].toLowerCase() == "flagggrc response" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : '')) : "") : "") + ' >' + (taggingArray.data.mappings.mappings[k].extraFields != null ? (taggingArray.data.mappings.mappings[k].extraFields[j] != null ? (typeof taggingArray.data.mappings.mappings[k].extraFields[j] == 'string' ? taggingArray.data.mappings.mappings[k].extraFields[j] : "") : "") : "") + '</textarea>';
+                            html += '<textarea part="input" id="extra-field-' + i + '-' + j + '" class="extra-field extra-field-' + j + '" ' + (extraFields != null ? (extraFields[j] != null ? ((extraFields[j].toLowerCase() == "client remarks" && this.disableclientresponse.toLowerCase() == "yes") ? 'disabled' : ((extraFields[j].toLowerCase() == "flagggrc response" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : '')) : "") : "") + ' >' + (taggingArray.data.mappings.mappings[i].extraFields != null ? (taggingArray.data.mappings.mappings[i].extraFields[j] != null ? (typeof taggingArray.data.mappings.mappings[i].extraFields[j] == 'string' ? taggingArray.data.mappings.mappings[i].extraFields[j] : "") : "") : "") + '</textarea>';
                             html += '</div>';
                             html += '</td>';
                         }
@@ -23160,7 +23233,6 @@ let SfIEvents = class SfIEvents extends LitElement {
             else {
                 this._SfIEventsC.querySelector('#next-calendar-data').querySelector('#button-load-next').addEventListener('click', () => {
                     this._SfIEventsC.querySelector('#next-calendar-data').querySelector('#button-load-next').style.display = 'none';
-                    this._SfIEventsC.querySelector('#next-calendar-data').querySelector('#next-tooltip').style.display = 'none';
                     this._SfIEventsC.querySelector('#next-calendar-data').classList.add('flex-col');
                     this.renderRoleTabsNext(0);
                 });
@@ -23280,7 +23352,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         eventHtml += '<div class="stream-events-container flex-grow">';
                         eventHtml += '<div class="hidden-tags hide">' + JSON.stringify(eventsData[role][mmdd][j]['tags']) + '</div>';
                         eventHtml += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>';
-                        eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + (eventsData[role][mmdd][j].isbulk ? ('<div class="lds-dual-ring1 bulk-loader mr-10"></div>') : ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + j + '-' + (((eventsData[role][mmdd][j].makercheckers != null && (eventsData[role][mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((eventsData[role][mmdd][j].docs != null && (eventsData[role][mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + eventsData[role][mmdd][j].entityid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].locationid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].id.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].duedate.split('/')[1] + '-' + eventsData[role][mmdd][j].duedate.split('/')[0] + '-' + eventsData[role][mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((eventsData[role][mmdd][j].reportformat != null && eventsData[role][mmdd][j].reportformat.length > 0) ? 'hide' : '') + '" type="checkbox" />')) + '<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>' + '<sf-i-elastic-text text="' + eventsData[role][mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text text="' + eventsData[role][mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i);
+                        eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + (eventsData[role][mmdd][j].isbulk ? ('<div class="lds-dual-ring1 bulk-loader mr-10"></div>') : ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + j + '-' + (((eventsData[role][mmdd][j].makercheckers != null && (eventsData[role][mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((eventsData[role][mmdd][j].docs != null && (eventsData[role][mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + eventsData[role][mmdd][j].entityid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].locationid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].id.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].duedate.split('/')[1] + '-' + eventsData[role][mmdd][j].duedate.split('/')[0] + '-' + eventsData[role][mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((eventsData[role][mmdd][j].reportformat != null && eventsData[role][mmdd][j].reportformat.length > 0) ? 'hide' : '') + '" type="checkbox" />')) + (eventsData[role][mmdd][j].isbulk ? ('<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>') : '') + '<sf-i-elastic-text text="' + eventsData[role][mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text text="' + eventsData[role][mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i);
                         console.log('next isBulk', eventsData[role][mmdd][j].isbulk);
                         if (eventsData[role][mmdd][j].isbulk == null || eventsData[role][mmdd][j].isbulk == false) {
                             eventHtml += '<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>';
@@ -24390,8 +24462,7 @@ let SfIEvents = class SfIEvents extends LitElement {
           <div class="d-flex mb-20" id="status-tab-container" part="status-tab-container">
           </div>
           <div id="next-calendar-data" class="calendar-right-data d-flex w-100">
-            <button id="button-load-next" part="button-icon" class="material-icons button-icon align-self-start ml-5"><span class="material-symbols-outlined">keyboard_arrow_down</span></button>
-            <div part="next-tooltip" id="next-tooltip" class="align-center d-flex pl-10">Click to view compliances</div>
+            <button id="button-load-next" part="button-icon" class="d-flex align-center button-icon align-self-start ml-5">View Obligations<span class="material-symbols-outlined">keyboard_arrow_down</span></button>
           </div>
           <div id="detail-container" class="hide" part="detail-container">
           </div>

package/src/sf-i-events.ts

@@ -6202,17 +6202,17 @@ export class SfIEvents extends LitElement {
       let approvercomments = (listReportingContainer.querySelector('#input-approver-comments') as HTMLInputElement)?.value ?? "";
       let reportercomments = (listReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement)?.value ?? "";
       let dateOfCompletion;
-      if((listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement) != null) {
+      if ((listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement) != null) {
         dateOfCompletion = new Date((listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "";
       } else {
         dateOfCompletion = new Date((listReportingContainer.querySelector('#input-approver-doc') as HTMLInputElement).value).getTime() + "";
       }
       let documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader).selectedValues()
-      if(dateOfCompletion == "NaN") {
+      if (dateOfCompletion == "NaN") {
         dateOfCompletion = "";
       }
       console.log('dateOfCompletion', dateOfCompletion)
-      await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage,selectReportedLocation, documents, dateOfCompletion);
+      await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocation, documents, dateOfCompletion);
     })
     if (this.mode == "consumer" || this.mode == "next") {
       let inputReportingPercentage = listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement;
@@ -6609,7 +6609,6 @@ export class SfIEvents extends LitElement {
 
                         if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "compliance", percentage, event.makercheckers, reportedlocations)) {
 
-                          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) {
@@ -6636,6 +6635,32 @@ export class SfIEvents extends LitElement {
                             }
                             this.recentlyReported[mmdd].push(event)
                             console.log('recently reported', this.recentlyReported)
+                          } else {
+                            for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                              if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
+                                this.nextEvents[this.nextTabRole][mmdd][p].documents = docs
+                                this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() })
+                                this.nextEvents[this.nextTabRole][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.module ?? "compliance");
+                              for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
+                                  this.nextEvents[this.nextTabRole][mmdd][p].approved = true
+                                  // this.events[mmdd][p].documents = docs
+                                  this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() })
+                                  this.nextEvents[this.nextTabRole][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)
                           }
                         }
                       } else {
@@ -16937,7 +16962,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null, reportercomments: string | null = null, approvercomments: string | null = null, inputReportingPercentage: string | null = null, selectReportedLocation:string | null = null, documents: any | null = null, dateOfCompletion: string | null = null) => {
+  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null, reportercomments: string | null = null, approvercomments: string | null = null, inputReportingPercentage: string | null = null, selectReportedLocation: string | null = null, documents: any | null = null, dateOfCompletion: string | null = null) => {
     console.log('listEvent', listEvent, listEvent.id)
     let url = "https://" + this.apiId + "/getalleventdetails";
 
@@ -16964,12 +16989,12 @@ export class SfIEvents extends LitElement {
             }
           }
           let data = jsonRespose.data;
-          if( reportercomments != null) {
+          if (reportercomments != null) {
             data.reportercomments = reportercomments;
-          }else if(approvercomments != null) {
+          } else if (approvercomments != null) {
             data.approvercomments = approvercomments;
           }
-          if(inputReportingPercentage != null) {
+          if (inputReportingPercentage != null) {
             data.percentage = inputReportingPercentage;
           }
           console.log('dateOfCompletion', dateOfCompletion, dateOfCompletion == null, dateOfCompletion == "");
@@ -17076,9 +17101,9 @@ export class SfIEvents extends LitElement {
     html += ('<div part="detail-summary-title" class="pl-20 pr-20"><h1>' + event['obligationtitle'] + '</h1></div>');
     let obligationArr = event['obligation'].split('More information:');
     html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\n/g, '<br />') + '</h3></div>');
-    if(obligationArr.length > 1) {
+    if (obligationArr.length > 1) {
       let tempObligationArr = obligationArr.slice(1);
-      html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');  
+      html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
     }
     html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
     html += '</div>';
@@ -17893,11 +17918,21 @@ export class SfIEvents extends LitElement {
           if (this.selectedItemIds.length <= 1) {
 
             if (await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, event.module ?? "compliance")) {
-              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.mode == "next") {
+                for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                  if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                    this.nextEvents[this.nextTabRole][mmdd][p].approved = approved
+                    this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() })
+                    this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString()
+                  }
+                }
+              } else {
+                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) {
@@ -17947,15 +17982,29 @@ export class SfIEvents extends LitElement {
               const eventId = selectedId.split('-')[9].replace(/_/g, '-');
               mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
               let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
-              for (var p = 0; p < this.events[mmdd].length; p++) {
-                if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+              if (this.mode == "next") {
+                for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                  if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
 
-                  this.events[mmdd][p].isbulk = true
-                  flagBulk = true;
-                  if (this.recentlyReported[mmdd] == null) {
-                    this.recentlyReported[mmdd] = []
+                    this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true
+                    flagBulk = true;
+                    if (this.recentlyReported[mmdd] == null) {
+                      this.recentlyReported[mmdd] = []
+                    }
+                    this.recentlyReported[mmdd].push(this.events[mmdd][p])
+                  }
+                }
+              } else {
+                for (var p = 0; p < this.events[mmdd].length; p++) {
+                  if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
+
+                    this.events[mmdd][p].isbulk = true
+                    flagBulk = true;
+                    if (this.recentlyReported[mmdd] == null) {
+                      this.recentlyReported[mmdd] = []
+                    }
+                    this.recentlyReported[mmdd].push(this.events[mmdd][p])
                   }
-                  this.recentlyReported[mmdd].push(this.events[mmdd][p])
                 }
               }
             }
@@ -17969,7 +18018,8 @@ export class SfIEvents extends LitElement {
           });
           ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
           if (this.mode == "next") {
-            this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
+            // this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
+            this.renderNextEvents(this.nextEvents, this.nextPage, this.nextTabRole)
           } else {
             // if(this.getCurrentTab() == this.TAB_CUSTOM) {
             //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
@@ -18104,23 +18154,44 @@ export class SfIEvents extends LitElement {
                         // console.log('reportformatvalues', reportformatvalues)
                         // console.log('reportformatschema',reportformatschema)
                         if (await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.module ?? "compliance", percentage, makercheckers, reportinglocation)) {
-                          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 (this.mode == "next") {
+                            for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                              if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                this.nextEvents[this.nextTabRole][mmdd][p].documents = docs
+                                this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() })
+                                this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString()
+                              }
+                            }
+                          } else {
+                            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.module ?? "compliance");
-                            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.mode == "next") {
+                              for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                  this.nextEvents[this.nextTabRole][mmdd][p].approved = true
+                                  // this.events[mmdd][p].documents = docs
+                                  this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() })
+                                  this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString()
+                                }
+                              }
+                            } else {
+                              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()
+                                }
                               }
                             }
                           }
@@ -19217,15 +19288,14 @@ export class SfIEvents extends LitElement {
 
           }
 
-          if (k < taggingArray.data.mappings.mappings.length) {
+          if (i < taggingArray.data.mappings.mappings.length) {
 
             html += '<td part="td-body" class="' + classBg + '">';
             html += '<div class="' + (!showSearch ? 'truncate' : '') + '">'
             // html += '<textarea part="input" id="extra-field-'+i+'-'+j+'" class="extra-field extra-field-'+j+'" '+ (taggingArray.data.mappings.mappings[k].extraFields != null ? (taggingArray.data.mappings.mappings[k].extraFields[j] != null ?  ((taggingArray.data.mappings.mappings[k].extraFields[j].toLowerCase() == "client remarks" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : ((taggingArray.data.mappings.mappings[k].extraFields[j].toLowerCase() == "flagggrc response" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : '')) : "") : "") +' >'+(taggingArray.data.mappings.mappings[k].extraFields != null ? (taggingArray.data.mappings.mappings[k].extraFields[j] != null ? taggingArray.data.mappings.mappings[k].extraFields[j] : "") : "")+'</textarea>';
-            html += '<textarea part="input" id="extra-field-' + i + '-' + j + '" class="extra-field extra-field-' + j + '" ' + (extraFields != null ? (extraFields[j] != null ? ((extraFields[j].toLowerCase() == "client remarks" && this.disableclientresponse.toLowerCase() == "yes") ? 'disabled' : ((extraFields[j].toLowerCase() == "flagggrc response" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : '')) : "") : "") + ' >' + (taggingArray.data.mappings.mappings[k].extraFields != null ? (taggingArray.data.mappings.mappings[k].extraFields[j] != null ? (typeof taggingArray.data.mappings.mappings[k].extraFields[j] == 'string' ? taggingArray.data.mappings.mappings[k].extraFields[j] : "") : "") : "") + '</textarea>';
+            html += '<textarea part="input" id="extra-field-' + i + '-' + j + '" class="extra-field extra-field-' + j + '" ' + (extraFields != null ? (extraFields[j] != null ? ((extraFields[j].toLowerCase() == "client remarks" && this.disableclientresponse.toLowerCase() == "yes") ? 'disabled' : ((extraFields[j].toLowerCase() == "flagggrc response" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : '')) : "") : "") + ' >' + (taggingArray.data.mappings.mappings[i].extraFields != null ? (taggingArray.data.mappings.mappings[i].extraFields[j] != null ? (typeof taggingArray.data.mappings.mappings[i].extraFields[j] == 'string' ? taggingArray.data.mappings.mappings[i].extraFields[j] : "") : "") : "") + '</textarea>';
             html += '</div>';
             html += '</td>';
-
           } else {
 
             html += '<td part="td-body" class="' + classBg + '">';
@@ -19233,7 +19303,6 @@ export class SfIEvents extends LitElement {
             html += '<textarea part="input" id="extra-field-' + i + '-' + j + '" class="extra-field extra-field-' + j + '" type="text" value="" ' + ((extraFields[j].toLowerCase() == "flagggrc response" && this.disableflagggrcresponse.toLowerCase() == "yes") ? 'disabled' : '') + ' ></textarea>';
             html += '</div>';
             html += '</td>';
-
           }
 
 
@@ -29576,7 +29645,6 @@ export class SfIEvents extends LitElement {
     } else {
       (this._SfIEventsC.querySelector('#next-calendar-data').querySelector('#button-load-next') as HTMLButtonElement).addEventListener('click', () => {
         (this._SfIEventsC.querySelector('#next-calendar-data').querySelector('#button-load-next') as HTMLButtonElement).style.display = 'none';
-        (this._SfIEventsC.querySelector('#next-calendar-data').querySelector('#next-tooltip') as HTMLButtonElement).style.display = 'none';
         (this._SfIEventsC.querySelector('#next-calendar-data') as HTMLDivElement).classList.add('flex-col');
         this.renderRoleTabsNext(0)
       })
@@ -29723,7 +29791,7 @@ export class SfIEvents extends LitElement {
           eventHtml += '<div class="stream-events-container flex-grow">';
           eventHtml += '<div class="hidden-tags hide">' + JSON.stringify(eventsData[role][mmdd][j]['tags']) + '</div>'
           eventHtml += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-          eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + (eventsData[role][mmdd][j].isbulk ? ('<div class="lds-dual-ring1 bulk-loader mr-10"></div>') : ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + j + '-' + (((eventsData[role][mmdd][j].makercheckers != null && (eventsData[role][mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((eventsData[role][mmdd][j].docs != null && (eventsData[role][mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + eventsData[role][mmdd][j].entityid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].locationid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].id.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].duedate.split('/')[1] + '-' + eventsData[role][mmdd][j].duedate.split('/')[0] + '-' + eventsData[role][mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((eventsData[role][mmdd][j].reportformat != null && eventsData[role][mmdd][j].reportformat.length > 0) ? 'hide' : '') + '" type="checkbox" />')) + '<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>' + '<sf-i-elastic-text text="' + eventsData[role][mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text text="' + eventsData[role][mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i)
+          eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + (eventsData[role][mmdd][j].isbulk ? ('<div class="lds-dual-ring1 bulk-loader mr-10"></div>') : ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + j + '-' + (((eventsData[role][mmdd][j].makercheckers != null && (eventsData[role][mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((eventsData[role][mmdd][j].docs != null && (eventsData[role][mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + eventsData[role][mmdd][j].entityid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].locationid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].id.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].duedate.split('/')[1] + '-' + eventsData[role][mmdd][j].duedate.split('/')[0] + '-' + eventsData[role][mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((eventsData[role][mmdd][j].reportformat != null && eventsData[role][mmdd][j].reportformat.length > 0) ? 'hide' : '') + '" type="checkbox" />')) + (eventsData[role][mmdd][j].isbulk ? ('<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>') : '' ) + '<sf-i-elastic-text text="' + eventsData[role][mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text text="' + eventsData[role][mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i)
 
           console.log('next isBulk', eventsData[role][mmdd][j].isbulk);
           if (eventsData[role][mmdd][j].isbulk == null || eventsData[role][mmdd][j].isbulk == false) {
@@ -30898,8 +30966,7 @@ export class SfIEvents extends LitElement {
           <div class="d-flex mb-20" id="status-tab-container" part="status-tab-container">
           </div>
           <div id="next-calendar-data" class="calendar-right-data d-flex w-100">
-            <button id="button-load-next" part="button-icon" class="material-icons button-icon align-self-start ml-5"><span class="material-symbols-outlined">keyboard_arrow_down</span></button>
-            <div part="next-tooltip" id="next-tooltip" class="align-center d-flex pl-10">Click to view compliances</div>
+            <button id="button-load-next" part="button-icon" class="d-flex align-center button-icon align-self-start ml-5">View Obligations<span class="material-symbols-outlined">keyboard_arrow_down</span></button>
           </div>
           <div id="detail-container" class="hide" part="detail-container">
           </div>