sf-i-events 1.0.799 → 1.0.801

package/package.json

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

package/sf-i-events.d.ts

@@ -283,6 +283,7 @@ export declare class SfIEvents extends LitElement {
     selectedRegisterIndex: number;
     selectallblock: string;
     graphFilter: string;
+    recentlyReported: any;
     static styles: import("lit").CSSResult;
     _SfIEventsC: any;
     _SfRowError: any;

package/sf-i-events.js

@@ -1235,6 +1235,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.selectedRegisterIndex = -1;
         this.selectallblock = "100";
         this.graphFilter = "";
+        this.recentlyReported = {};
         this.isSelectedLegend = (value) => {
             return this.chartSelectedLegend.includes(value);
         };
@@ -2647,13 +2648,15 @@ let SfIEvents = class SfIEvents extends LitElement {
             return str.trim();
         };
         this.getGraphParam = (event) => {
+            var _a;
             let graphParam = '';
             //console.log('getGraphParam', this.flowGraph, event);
             if (Array.isArray(event[this.flowGraph])) {
                 graphParam = event[this.flowGraph].toString().replace(/ *\([^)]*\) */g, "").replace(/,/g, ' • ');
             }
             else {
-                graphParam = event[this.flowGraph].replace(/ *\([^)]*\) */g, "").replace(/,/g, ' • ');
+                console.log('event[this.flowGraph]', event[this.flowGraph], event, this.flowGraph);
+                graphParam = ((_a = event[this.flowGraph]) !== null && _a !== void 0 ? _a : "").replace(/ *\([^)]*\) */g, "").replace(/,/g, ' • ');
             }
             return graphParam;
         };
@@ -3364,6 +3367,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 }
                             }
                         }
+                        if (this.recentlyReported[mmdd] == null) {
+                            this.recentlyReported[mmdd] = [];
+                        }
+                        this.recentlyReported[mmdd].push(event);
                     }
                     else {
                         let bulkBodyReview = [];
@@ -3408,6 +3415,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 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]);
                                 }
                             }
                         }
@@ -3459,6 +3470,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     }
                                 }
                             }
+                            if (this.recentlyReported[mmdd] == null) {
+                                this.recentlyReported[mmdd] = [];
+                            }
+                            this.recentlyReported[mmdd].push(event);
                         }
                         else {
                             let bulkBodyAudit = [];
@@ -3500,6 +3515,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     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]);
                                     }
                                 }
                             }
@@ -3600,11 +3619,16 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         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': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                            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);
                                             }
                                             else {
                                                 let bulkBody = [];
@@ -3687,6 +3711,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         if (this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                                                             flagBulk = true;
                                                             this.events[mmdd][p].isbulk = true;
+                                                            if (this.recentlyReported[mmdd] == null) {
+                                                                this.recentlyReported[mmdd] = [];
+                                                            }
+                                                            this.recentlyReported[mmdd].push(this.events[mmdd][p]);
                                                         }
                                                     }
                                                 }
@@ -3841,7 +3869,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             let firstDay = new Date(year, month, 1);
             let endDay = new Date(year, month, 1);
             endDay === null || endDay === void 0 ? void 0 : endDay.setDate(endDay.getDate() + lastDay + 1);
-            var period = ("0" + (month + 1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + new Date().getFullYear() + ' - ' + ("0" + (month + 1)).slice(-2) + "/" + ("0" + lastDay).slice(-2) + '/' + new Date().getFullYear();
+            var period = ("0" + (month + 1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + firstDay.getFullYear() + ' - ' + ("0" + (month + 1)).slice(-2) + "/" + ("0" + lastDay).slice(-2) + '/' + endDay.getFullYear();
             return this.renderEvents(firstDay, endDay, 1, lastDay, showGraph, index, month, period, null, this.monthNames[month] + " " + year, showBackgroundButton);
         };
         this.renderThisEvents = (index, startDate, showGraph = true, showBackgroundButton = false) => {
@@ -3862,7 +3890,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             let firstDay = new Date(firstDate.getFullYear(), firstDate.getMonth(), firstDate.getDate());
             let endDay = new Date(firstDate.getFullYear(), firstDate.getMonth(), firstDate.getDate());
             endDay === null || endDay === void 0 ? void 0 : endDay.setDate(endDay.getDate() + lastDay + 1);
-            var period = ("0" + (firstDate.getMonth() + 1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + firstDate.getFullYear() + ' - ' + ("0" + (firstDate.getMonth() + 1)).slice(-2) + "/" + ("0" + count).slice(-2) + '/' + firstDate.getFullYear();
+            var period = ("0" + (firstDay.getMonth() + 1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + firstDay.getFullYear() + ' - ' + ("0" + (endDay.getMonth() + 1)).slice(-2) + "/" + ("0" + count).slice(-2) + '/' + endDay.getFullYear();
             return this.renderEvents(firstDay, endDay, 1, lastDay, showGraph, index, (firstDate.getMonth()), period, null, "This " + (index === 0 ? "Week" : "Month"), showBackgroundButton);
         };
         this.renderRangeEvents = (firstDate, count, eventsContainer, showBackgroundButton = false) => {
@@ -3873,7 +3901,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             let firstDay = new Date(firstDate.getFullYear(), firstDate.getMonth(), firstDate.getDate());
             let endDay = new Date(firstDate.getFullYear(), firstDate.getMonth(), firstDate.getDate());
             endDay === null || endDay === void 0 ? void 0 : endDay.setDate(endDay.getDate() + lastDay + 1);
-            var period = ("0" + (firstDate.getMonth() + 1)).slice(-2) + "/" + ("0" + firstDate.getDate()).slice(-2) + '/' + firstDate.getFullYear() + ' - ' + ("0" + (lastDate.getMonth() + 1)).slice(-2) + "/" + ("0" + lastDate.getDate()).slice(-2) + '/' + lastDate.getFullYear();
+            var period = ("0" + (firstDay.getMonth() + 1)).slice(-2) + "/" + ("0" + firstDay.getDate()).slice(-2) + '/' + firstDay.getFullYear() + ' - ' + ("0" + (endDay.getMonth() + 1)).slice(-2) + "/" + ("0" + endDay.getDate()).slice(-2) + '/' + endDay.getFullYear();
             console.log('rangeperiod', period);
             var html = this.renderEvents(firstDay, endDay, 1, lastDay, true, 0, (firstDate.getMonth()), period, firstDate, "From " + firstDay.toLocaleDateString('en-IN') + " To " + endDay.toLocaleDateString('en-IN'), showBackgroundButton);
             eventsContainer.querySelector('.calendar-right-data').innerHTML = html;
@@ -7124,10 +7152,10 @@ let SfIEvents = class SfIEvents extends LitElement {
             this._SfCustomContainer.querySelector('#button-year-to-date').click();
         };
         this.renderThis = (index = 1, showGraph = true, showBackgroundButton) => {
+            // this.clearGraphData();
+            // this.clearSelectedGraphParam();
+            // this.clearSelectedLegend();
             var _a, _b;
-            this.clearGraphData();
-            this.clearSelectedGraphParam();
-            this.clearSelectedLegend();
             this.streamIndex = index;
             var html = '';
             html += '<div class="scroll-x w-100 mobile-only">';
@@ -7601,9 +7629,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             //console.log('flowgraph renderStream', this.flowGraph);
             var _a, _b;
             this.streamIndex = index;
-            this.clearGraphData();
-            this.clearSelectedGraphParam();
-            this.clearSelectedLegend();
+            // this.clearGraphData();
+            // this.clearSelectedGraphParam();
+            // this.clearSelectedLegend();
             var startDate = new Date(this.calendarStartMM + '/' + this.calendarStartDD + '/' + this.calendarStartYYYY);
             var html = '';
             html += '<div class="scroll-x w-100 mobile-only">';
@@ -8112,7 +8140,6 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.clearGraphData = () => {
-            console.log('this.chart2 clearing graph data');
             this.chart = null;
             this.chart2 = null;
             this.chart3 = null;
@@ -8227,6 +8254,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.renderCompletenessGraph = (divContainer, selectedTab = -1, selectedSummary = -1, title = "Completeness") => {
             this.clearSelectedGraphParam();
             // this.clearSelectedLegend();
+            this.graphFilter = "";
             this.csvGraphStats = "";
             this.csvCompletenessStats = "";
             this.csvTimelinessStats = "";
@@ -8295,6 +8323,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             //console.log('Rendering compliance graph...');
             this.clearSelectedGraphParam();
             // this.clearSelectedLegend();
+            this.graphFilter = "";
             this.csvGraphStats = "";
             this.csvCompletenessStats = "";
             this.csvTimelinessStats = "";
@@ -8344,6 +8373,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.renderTimelinessGraph = (divContainer) => {
             this.clearSelectedGraphParam();
             // this.clearSelectedLegend();
+            this.graphFilter = "";
             this.csvGraphStats = "";
             this.csvCompletenessStats = "";
             this.csvTimelinessStats = "";
@@ -8574,6 +8604,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             console.log('rendering graph chart2');
             this.clearSelectedGraphParam();
             // this.clearSelectedLegend();
+            this.graphFilter = "";
             this.csvGraphStats = "";
             this.csvCompletenessStats = "";
             this.csvTimelinessStats = "";
@@ -8935,6 +8966,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 this.events[mmdd][p].lastupdated = new Date().toString();
                             }
                         }
+                        if (this.recentlyReported[mmdd] == null) {
+                            this.recentlyReported[mmdd] = [];
+                        }
+                        this.recentlyReported[mmdd].push(event);
                         console.log('review single');
                     }
                     else {
@@ -8980,6 +9015,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 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]);
                                 }
                             }
                         }
@@ -9037,6 +9076,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     this.events[mmdd][p].lastupdated = new Date().toString();
                                 }
                             }
+                            if (this.recentlyReported[mmdd] == null) {
+                                this.recentlyReported[mmdd] = [];
+                            }
+                            this.recentlyReported[mmdd].push(event);
                             console.log('uploadaudit single');
                         }
                         else {
@@ -9079,6 +9122,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     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]);
                                     }
                                 }
                             }
@@ -9192,12 +9239,16 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         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': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                            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(event);
                                             }
                                             else {
                                                 let bulkBody = [];
@@ -9282,6 +9333,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         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]);
                                                         }
                                                     }
                                                 }
@@ -10035,6 +10090,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 this.events[mmdd][p].lastupdated = new Date().toString();
                             }
                         }
+                        if (this.recentlyReported[mmdd] == null) {
+                            this.recentlyReported[mmdd] = [];
+                        }
+                        this.recentlyReported[mmdd].push(event);
                     }
                     else {
                         let bulkBodyReview = [];
@@ -10079,6 +10138,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 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]);
                                 }
                             }
                         }
@@ -10135,6 +10198,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     this.events[mmdd][p].lastupdated = new Date().toString();
                                 }
                             }
+                            if (this.recentlyReported[mmdd] == null) {
+                                this.recentlyReported[mmdd] = [];
+                            }
+                            this.recentlyReported[mmdd].push(event);
                         }
                         else {
                             let bulkBodyAudit = [];
@@ -10176,6 +10243,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     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]);
                                     }
                                 }
                             }
@@ -10295,6 +10366,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         }
                                                     }
                                                 }
+                                                if (this.recentlyReported[mmdd] == null) {
+                                                    this.recentlyReported[mmdd] = [];
+                                                }
+                                                this.recentlyReported[mmdd].push(event);
                                             }
                                             else {
                                                 let bulkBody = [];
@@ -10395,6 +10470,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         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]);
                                                         }
                                                     }
                                                 }
@@ -15440,6 +15519,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.processGraphFilter = (clickedValue) => {
             var _a;
             let eventContainer = null;
+            console.log('processGraphFilter called', clickedValue);
             if (this.getCurrentTab() == this.TAB_STREAM) {
                 eventContainer = this._SfStreamContainer;
             }
@@ -15480,6 +15560,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             if (streamEventSummary == null) {
                 return;
             }
+            console.log('recentlyReported', this.recentlyReported);
             if (this.graphParam == clickedValue) {
                 this.graphParam = "";
                 streamEventSummary.style.display = 'flex';
@@ -15496,10 +15577,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                 };
                 streamEventFilters.style.display = 'block';
                 streamEventFilters.innerHTML = '<div part="badge-dashboard" class="d-flex align-center justify-between mr-10 mb-10 no-shrink"><div><span>Filtered by</span>&nbsp;&nbsp;<span id="graph-total" part="badge-filter-name">' + clickedValue + '</span></div><button id="button-filter-cancel" part="button-icon"><span class="material-symbols-outlined">close</span></button></div>';
-                console.log('processGraphFilter called');
                 (_a = streamEventFilters.querySelector('#button-filter-cancel')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
                     this.clearSelectedGraphParam();
                 });
+                setTimeout(() => {
+                    this.recentlyReported = {};
+                }, 10000);
             }
             for (var i = 0; i < divs.length; i++) {
                 // console.log('processGraphFilter', graphparamnames1[i], (graphparamnames1[i] as HTMLDivElement).innerHTML.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '), this.graphParam.toLowerCase().replace('&amp;', '&').replace(/-/g, ' '));
@@ -15514,8 +15597,23 @@ let SfIEvents = class SfIEvents extends LitElement {
                         break;
                     }
                 }
-                if (buttonSelect[i] != null)
+                if (buttonSelect[i] != null) {
                     buttonSelect[i].checked = false;
+                    let selectid = buttonSelect[i].id;
+                    let selectidArr = selectid.split('-');
+                    let selectMmdd = selectidArr[2] + '/' + selectidArr[3];
+                    let selectEntityid = selectidArr[7].replace(/_/g, '-');
+                    let selectLocationid = selectidArr[8].replace(/_/g, '-');
+                    let selectEventid = selectidArr[9].replace(/_/g, '-');
+                    if (this.recentlyReported[selectMmdd] != null) {
+                        for (let recentlyReportedEvent of this.recentlyReported[selectMmdd]) {
+                            if (recentlyReportedEvent.id == selectEventid && recentlyReportedEvent.locationid == selectLocationid && recentlyReportedEvent.entityid == selectEntityid) {
+                                filterFound = true;
+                                break;
+                            }
+                        }
+                    }
+                }
                 if (filterFound) {
                     if (tables[i] != null) {
                         tables[i].style.display = 'block';
@@ -15556,7 +15654,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             buttonListReporting[i].style.display = 'none';
                         }
                     }
-                    console.log('eventTitle', divs[i]);
+                    // console.log('eventTitle', divs[i]);
                     if (buttonSelect[i] != null)
                         buttonSelect[i].style.display = "none";
                     if (eventTitles[i] != null)

package/src/sf-i-events.ts

@@ -1647,6 +1647,8 @@ export class SfIEvents extends LitElement {
 
   graphFilter:string = "";
 
+  recentlyReported: any = {}
+
   static override styles = css`
 
     .bg-white {
@@ -4872,7 +4874,8 @@ export class SfIEvents extends LitElement {
     if(Array.isArray(event[this.flowGraph])) {
       graphParam = event[this.flowGraph].toString().replace(/ *\([^)]*\) */g, "").replace(/,/g,' • ');
     } else {
-      graphParam = event[this.flowGraph].replace(/ *\([^)]*\) */g, "").replace(/,/g,' • ');
+      console.log('event[this.flowGraph]', event[this.flowGraph], event, this.flowGraph)
+      graphParam = (event[this.flowGraph] ?? "").replace(/ *\([^)]*\) */g, "").replace(/,/g,' • ');
     }
     return graphParam;
   }
@@ -5700,6 +5703,10 @@ export class SfIEvents extends LitElement {
               }
             }
           }
+          if(this.recentlyReported[mmdd] == null){
+            this.recentlyReported[mmdd] = []
+          }
+          this.recentlyReported[mmdd].push(event)
         }else{
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -5750,6 +5757,10 @@ export class SfIEvents extends LitElement {
                 
                 this.events[mmdd][p].isbulk = true
                 flagBulk = true
+                if(this.recentlyReported[mmdd] == null){
+                  this.recentlyReported[mmdd] = []
+                }
+                this.recentlyReported[mmdd].push(this.events[mmdd][p])
               }
             }
           }
@@ -5803,6 +5814,10 @@ export class SfIEvents extends LitElement {
                 }
               }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(event)
           }else{
             let bulkBodyAudit = []
             for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -5850,6 +5865,10 @@ export class SfIEvents extends LitElement {
                   
                   this.events[mmdd][p].isbulk = true
                   flagBulk = true;
+                  if(this.recentlyReported[mmdd] == null){
+                    this.recentlyReported[mmdd] = []
+                  }
+                  this.recentlyReported[mmdd].push(this.events[mmdd][p])
                 }
               }
             }
@@ -5966,6 +5985,7 @@ export class SfIEvents extends LitElement {
                           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");
@@ -5973,11 +5993,16 @@ export class SfIEvents extends LitElement {
                           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': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                            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)
                     }else{
                       let bulkBody = []
                       let bulkBodyReview = []
@@ -6068,6 +6093,10 @@ export class SfIEvents extends LitElement {
                           if(this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                             flagBulk = true;
                             this.events[mmdd][p].isbulk = true
+                            if(this.recentlyReported[mmdd] == null){
+                              this.recentlyReported[mmdd] = []
+                            }
+                            this.recentlyReported[mmdd].push(this.events[mmdd][p])
                           }
                         }
                       }
@@ -6238,7 +6267,7 @@ export class SfIEvents extends LitElement {
     let firstDay = new Date(year, month, 1);
     let endDay = new Date(year, month, 1);
     endDay?.setDate(endDay.getDate() + lastDay + 1);
-    var period = ("0" + (month+1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + new Date().getFullYear() + ' - ' + ("0" + (month+1)).slice(-2) + "/" + ("0" + lastDay).slice(-2) + '/' + new Date().getFullYear()   
+    var period = ("0" + (month+1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + firstDay.getFullYear() + ' - ' + ("0" + (month+1)).slice(-2) + "/" + ("0" + lastDay).slice(-2) + '/' + endDay.getFullYear()   
 
     return this.renderEvents(firstDay, endDay, 1, lastDay, showGraph, index, month, period, null, this.monthNames[month] + " " + year, showBackgroundButton);
 
@@ -6272,7 +6301,7 @@ export class SfIEvents extends LitElement {
     let endDay = new Date(firstDate.getFullYear(), firstDate.getMonth(), firstDate.getDate());
     endDay?.setDate(endDay.getDate() + lastDay + 1);
 
-    var period = ("0" + (firstDate.getMonth()+1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + firstDate.getFullYear() + ' - ' + ("0" + (firstDate.getMonth()+1)).slice(-2) + "/" + ("0" + count).slice(-2) + '/' + firstDate.getFullYear()   
+    var period = ("0" + (firstDay.getMonth()+1)).slice(-2) + "/" + ("0" + 1).slice(-2) + '/' + firstDay.getFullYear() + ' - ' + ("0" + (endDay.getMonth()+1)).slice(-2) + "/" + ("0" + count).slice(-2) + '/' + endDay.getFullYear()   
 
     return this.renderEvents(firstDay, endDay, 1, lastDay, showGraph, index, (firstDate.getMonth()), period, null, "This " + (index === 0 ? "Week" : "Month"), showBackgroundButton);
 
@@ -6289,7 +6318,7 @@ export class SfIEvents extends LitElement {
     let endDay = new Date(firstDate.getFullYear(), firstDate.getMonth(), firstDate.getDate());
     endDay?.setDate(endDay.getDate() + lastDay + 1);
 
-    var period = ("0" + (firstDate.getMonth()+1)).slice(-2) + "/" + ("0" + firstDate.getDate()).slice(-2) + '/' + firstDate.getFullYear() + ' - ' + ("0" + (lastDate.getMonth()+1)).slice(-2) + "/" + ("0" + lastDate.getDate()).slice(-2) + '/' + lastDate.getFullYear();
+    var period = ("0" + (firstDay.getMonth()+1)).slice(-2) + "/" + ("0" + firstDay.getDate()).slice(-2) + '/' + firstDay.getFullYear() + ' - ' + ("0" + (endDay.getMonth()+1)).slice(-2) + "/" + ("0" + endDay.getDate()).slice(-2) + '/' + endDay.getFullYear();
 
     console.log('rangeperiod', period)
 
@@ -10195,9 +10224,9 @@ export class SfIEvents extends LitElement {
 
   renderThis = (index: number = 1, showGraph: boolean = true, showBackgroundButton: boolean) => {
     
-    this.clearGraphData();
-    this.clearSelectedGraphParam();
-    this.clearSelectedLegend();
+    // this.clearGraphData();
+    // this.clearSelectedGraphParam();
+    // this.clearSelectedLegend();
 
     this.streamIndex = index;
 
@@ -10769,9 +10798,9 @@ export class SfIEvents extends LitElement {
 
     this.streamIndex = index;
     
-    this.clearGraphData();
-    this.clearSelectedGraphParam();
-    this.clearSelectedLegend();
+    // this.clearGraphData();
+    // this.clearSelectedGraphParam();
+    // this.clearSelectedLegend();
     
 
     var startDate = new Date(this.calendarStartMM + '/' + this.calendarStartDD + '/' + this.calendarStartYYYY);
@@ -11404,7 +11433,6 @@ export class SfIEvents extends LitElement {
   }
 
   clearGraphData = () => {
-    console.log('this.chart2 clearing graph data');
     this.chart = null;
     this.chart2 = null;
     this.chart3 = null;
@@ -11562,7 +11590,7 @@ export class SfIEvents extends LitElement {
 
     this.clearSelectedGraphParam();
     // this.clearSelectedLegend();
-    
+    this.graphFilter = "";
     this.csvGraphStats = "";
     this.csvCompletenessStats = "";
     this.csvTimelinessStats = "";
@@ -11643,6 +11671,7 @@ export class SfIEvents extends LitElement {
 
     this.clearSelectedGraphParam();
     // this.clearSelectedLegend();
+    this.graphFilter = "";
 
     this.csvGraphStats = "";
     this.csvCompletenessStats = "";
@@ -11703,6 +11732,7 @@ export class SfIEvents extends LitElement {
 
     this.clearSelectedGraphParam();
     // this.clearSelectedLegend();
+    this.graphFilter = "";
 
     this.csvGraphStats = "";
     this.csvCompletenessStats = "";
@@ -12005,7 +12035,8 @@ export class SfIEvents extends LitElement {
     console.log('rendering graph chart2');
     this.clearSelectedGraphParam();
     // this.clearSelectedLegend();
-
+    this.graphFilter = "";
+    
     this.csvGraphStats = "";
     this.csvCompletenessStats = "";
     this.csvTimelinessStats = "";
@@ -12470,6 +12501,10 @@ export class SfIEvents extends LitElement {
               this.events[mmdd][p].lastupdated = new Date().toString()
             }
           }
+          if(this.recentlyReported[mmdd] == null){
+            this.recentlyReported[mmdd] = []
+          }
+          this.recentlyReported[mmdd].push(event)
           console.log('review single')
         } else {
           let bulkBodyReview = []
@@ -12521,6 +12556,10 @@ export class SfIEvents extends LitElement {
                 
                 this.events[mmdd][p].isbulk = true
                 flagBulk = true;
+                if(this.recentlyReported[mmdd] == null){
+                  this.recentlyReported[mmdd] = []
+                }
+                this.recentlyReported[mmdd].push(this.events[mmdd][p])
               }
             }
           }
@@ -12582,6 +12621,10 @@ export class SfIEvents extends LitElement {
                 this.events[mmdd][p].lastupdated = new Date().toString()
               }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(event)
             console.log('uploadaudit single')
           } else {
             let bulkBodyAudit = []
@@ -12630,6 +12673,10 @@ export class SfIEvents extends LitElement {
                   
                   this.events[mmdd][p].isbulk = true
                   flagBulk = true;
+                  if(this.recentlyReported[mmdd] == null){
+                    this.recentlyReported[mmdd] = []
+                  }
+                  this.recentlyReported[mmdd].push(this.events[mmdd][p])
                 }
               }
             }
@@ -12772,12 +12819,16 @@ export class SfIEvents extends LitElement {
                           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': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                            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(event)
 
                     } else {
                       let bulkBody = []
@@ -12872,6 +12923,10 @@ export class SfIEvents extends LitElement {
                             
                             this.events[mmdd][p].isbulk = true
                             flagBulk = true;
+                            if(this.recentlyReported[mmdd] == null){
+                              this.recentlyReported[mmdd] = []
+                            }
+                            this.recentlyReported[mmdd].push(this.events[mmdd][p])
                           }
                         }
                       }
@@ -13753,6 +13808,10 @@ export class SfIEvents extends LitElement {
               this.events[mmdd][p].lastupdated = new Date().toString()
             }
           }
+          if(this.recentlyReported[mmdd] == null){
+            this.recentlyReported[mmdd] = []
+          }
+          this.recentlyReported[mmdd].push(event)
         } else {
           let bulkBodyReview = []
           for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -13803,6 +13862,10 @@ export class SfIEvents extends LitElement {
                 
                 this.events[mmdd][p].isbulk = true
                 flagBulk = true;
+                if(this.recentlyReported[mmdd] == null){
+                  this.recentlyReported[mmdd] = []
+                }
+                this.recentlyReported[mmdd].push(this.events[mmdd][p])
               }
             }
           }
@@ -13863,6 +13926,10 @@ export class SfIEvents extends LitElement {
                 this.events[mmdd][p].lastupdated = new Date().toString()
               }
             }
+            if(this.recentlyReported[mmdd] == null){
+              this.recentlyReported[mmdd] = []
+            }
+            this.recentlyReported[mmdd].push(event)
           } else {
             let bulkBodyAudit = []
             for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -13910,6 +13977,10 @@ export class SfIEvents extends LitElement {
                   
                   this.events[mmdd][p].isbulk = true
                   flagBulk = true;
+                  if(this.recentlyReported[mmdd] == null){
+                    this.recentlyReported[mmdd] = []
+                  }
+                  this.recentlyReported[mmdd].push(this.events[mmdd][p])
                 }
               }
             }
@@ -14057,6 +14128,10 @@ export class SfIEvents extends LitElement {
                           }
                         }
                       }
+                      if(this.recentlyReported[mmdd] == null){
+                        this.recentlyReported[mmdd] = []
+                      }
+                      this.recentlyReported[mmdd].push(event)
 
                     } else {
                       let bulkBody = []
@@ -14165,6 +14240,10 @@ export class SfIEvents extends LitElement {
                             
                             this.events[mmdd][p].isbulk = true
                             flagBulk = true;
+                            if(this.recentlyReported[mmdd] == null){
+                              this.recentlyReported[mmdd] = []
+                            }
+                            this.recentlyReported[mmdd].push(this.events[mmdd][p])
                           }
                         }
                       }
@@ -20610,7 +20689,7 @@ export class SfIEvents extends LitElement {
   processGraphFilter = (clickedValue: string) => {
 
     let eventContainer = null;
-
+    console.log('processGraphFilter called', clickedValue);
     if(this.getCurrentTab() == this.TAB_STREAM) {
       eventContainer = (this._SfStreamContainer as HTMLDivElement);
     }
@@ -20660,7 +20739,7 @@ export class SfIEvents extends LitElement {
     if(streamEventSummary == null) {
       return;
     }
-
+    console.log('recentlyReported', this.recentlyReported);
     if(this.graphParam == clickedValue) {
 
       this.graphParam = "";
@@ -20679,11 +20758,12 @@ export class SfIEvents extends LitElement {
       };
       (streamEventFilters as HTMLDivElement).style.display = 'block';
       (streamEventFilters as HTMLDivElement).innerHTML = '<div part="badge-dashboard" class="d-flex align-center justify-between mr-10 mb-10 no-shrink"><div><span>Filtered by</span>&nbsp;&nbsp;<span id="graph-total" part="badge-filter-name">'+clickedValue+'</span></div><button id="button-filter-cancel" part="button-icon"><span class="material-symbols-outlined">close</span></button></div>';
-      console.log('processGraphFilter called');
       (streamEventFilters as HTMLDivElement).querySelector('#button-filter-cancel')?.addEventListener('click', () => {
         this.clearSelectedGraphParam();
       });
-
+      setTimeout(() => {
+        this.recentlyReported = {}
+      }, 10000);
     }
 
 
@@ -20701,7 +20781,24 @@ export class SfIEvents extends LitElement {
           break;
         }
       }
-      if(buttonSelect[i] != null)buttonSelect[i].checked = false
+      if(buttonSelect[i] != null){
+        buttonSelect[i].checked = false
+        let selectid = buttonSelect[i].id
+        let selectidArr = selectid.split('-')
+        let selectMmdd = selectidArr[2] + '/' + selectidArr[3] 
+        let selectEntityid = selectidArr[7].replace(/_/g,'-') 
+        let selectLocationid = selectidArr[8].replace(/_/g,'-') 
+        let selectEventid = selectidArr[9].replace(/_/g,'-') 
+        if(this.recentlyReported[selectMmdd] != null){
+          for(let recentlyReportedEvent of this.recentlyReported[selectMmdd]){
+            if(recentlyReportedEvent.id == selectEventid && recentlyReportedEvent.locationid == selectLocationid && recentlyReportedEvent.entityid == selectEntityid){
+              filterFound = true;
+              break;
+            }
+          }
+        }
+      }
+
       if(filterFound) {
         if(tables[i] != null){
           (tables[i] as HTMLDivElement).style.display = 'block';
@@ -20735,7 +20832,7 @@ export class SfIEvents extends LitElement {
             buttonListReporting[i].style.display = 'none';
           }
         }
-        console.log('eventTitle', divs[i]);
+        // console.log('eventTitle', divs[i]);
         if(buttonSelect[i] != null)buttonSelect[i].style.display = "none"
         if(eventTitles[i] != null)(eventTitles[i]).style.display = 'none';
         if(divs[i] != null) divs[i].style.display = 'none'
@@ -20755,7 +20852,6 @@ export class SfIEvents extends LitElement {
     for(let streamEventTitle of streamEventTitles){
       streamEventTitle.removeAttribute('part')
     }
-
   }
 
   processClickOnLegend = (index: number, legendItem: any) => {