npm - sf-i-events - Versions diffs - 1.0.800 → 1.0.802 - Mend

sf-i-events 1.0.800 → 1.0.802

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dev/index.html CHANGED Viewed

@@ -625,6 +625,50 @@
         height: 60vh;
         overflow-y: auto;
       }
+      sf-i-events::part(event-status-past-due-date),
+      sf-i-events::part(event-status-pending-approval) {
+        margin-bottom: 3px;
+        border-left: solid 5px #f8ee24;
+        background-color: #fcfbe5;
+        border-top-right-radius: 5px;
+        border-bottom-right-radius: 5px;
+      }
+      sf-i-events::part(event-status-complied),
+      sf-i-events::part(event-status-approved) {
+        margin-bottom: 3px;
+        border-left: solid 5px #9bf468;
+        background-color: #f6fbf4;
+        border-top-right-radius: 5px;
+        border-bottom-right-radius: 5px;
+      }
+      sf-i-events::part(event-status-not-complied),
+      sf-i-events::part(event-status-rejected),
+      sf-i-events::part(event-status-late-approved) {
+        margin-bottom: 3px;
+        border-left: solid 5px  #C80036;
+        background-color: #f9e6e6;
+        border-top-right-radius: 5px;
+        border-bottom-right-radius: 5px;
+      }
+      sf-i-events::part(event-status-partially-complied),
+      sf-i-events::part(event-status-late-reported) {
+        margin-bottom: 3px;
+        border-left: solid 5px  #Ef9C66;
+        background-color: #f8ebe2;
+        border-top-right-radius: 5px;
+        border-bottom-right-radius: 5px;
+      }
     </style>
   </head>
   <body>

package/package.json CHANGED Viewed

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

package/sf-i-events.js CHANGED Viewed

@@ -1292,6 +1292,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this.barCharDataSet4.pop();
                 }
             }
+            console.log('calling processGraphFilter 1');
             this.processGraphFilter(this.graphFilter);
             this.selectedFilters = null;
         };
@@ -2648,13 +2649,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;
         };
@@ -2682,6 +2685,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             this.eventsInWindow = [];
             var lastDay = iLast;
             this.clearGraphData();
+            console.log('this.clearSelectedGraphParam(); 1', this.graphFilter);
             this.clearSelectedGraphParam();
             this.clearSelectedLegend();
             html += this.renderCalendarGraphs(showGraph, parametersTitle, showBackgroundButton);
@@ -2894,6 +2898,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             // var lastDay = iLast;
             // var slice = 2;
             this.clearGraphData();
+            console.log('this.clearSelectedGraphParam(); 2');
             this.clearSelectedGraphParam();
             this.clearSelectedLegend();
             html += this.renderCalendarStatisticsGraphs(showGraph, parametersTitle);
@@ -3240,8 +3245,8 @@ let SfIEvents = class SfIEvents extends LitElement {
             return html;
         };
         this.renderListReporting = (listReportingContainer, event, mmddyyyy, eventsContainer) => {
-            var _a, _b, _c, _f, _g, _h, _j, _k;
-            console.log('listreporting event', event);
+            var _a, _b, _c, _f, _g, _h, _j, _k, _l;
+            console.log('listreporting event', event, this.graphFilter);
             let html = '';
             let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1];
             let reportformatName = '';
@@ -3277,7 +3282,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             let streamEventTitles = eventsContainer.querySelectorAll('.stream-event-title');
             for (let streamEventTitle of streamEventTitles) {
-                if (streamEventTitle.id == 'stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j) {
+                if (streamEventTitle.id == 'stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j + '-' + (((_b = event.isnotice) !== null && _b !== void 0 ? _b : false) ? 'isnotice' : 'isevent')) {
                     streamEventTitle.setAttribute('part', 'stream-event-title-selected');
                 }
                 else {
@@ -3285,7 +3290,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
             listReportingContainer.innerHTML = html;
-            (_b = listReportingContainer.querySelector('.button-delete')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', async () => {
+            (_c = listReportingContainer.querySelector('.button-delete')) === null || _c === void 0 ? void 0 : _c.addEventListener('click', async () => {
                 await this.fetchDeleteReview(event["id"], mmddyyyy, event.entityid, event.locationid);
                 this.setSuccess('Deleted successfully!');
                 setTimeout(() => {
@@ -3301,7 +3306,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     // }
                 }
             });
-            (_c = listReportingContainer.querySelector('#button-auto-approve')) === null || _c === void 0 ? void 0 : _c.addEventListener('click', async () => {
+            (_f = listReportingContainer.querySelector('#button-auto-approve')) === null || _f === void 0 ? void 0 : _f.addEventListener('click', async () => {
                 if (this.selectedItemIds.length == 0) {
                     await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
                     this.setSuccess('Auto-Approved successfully!');
@@ -3347,7 +3352,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             });
             if (this.mode == "consumer" || this.mode == "next") {
-                (_f = listReportingContainer.querySelector('#button-uploader-submit-approve')) === null || _f === void 0 ? void 0 : _f.addEventListener('click', async (ev) => {
+                (_g = listReportingContainer.querySelector('#button-uploader-submit-approve')) === null || _g === void 0 ? void 0 : _g.addEventListener('click', async (ev) => {
                     let buttonClick = ev.target;
                     buttonClick.innerHTML = "Saving...";
                     const comments = listReportingContainer.querySelector('#input-approver-comments').value;
@@ -3442,7 +3447,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         }
                     }
                 });
-                (_g = listReportingContainer.querySelector('#button-uploader-submit-audit')) === null || _g === void 0 ? void 0 : _g.addEventListener('click', async (ev) => {
+                (_h = listReportingContainer.querySelector('#button-uploader-submit-audit')) === null || _h === void 0 ? void 0 : _h.addEventListener('click', async (ev) => {
                     let buttonClick = ev.target;
                     buttonClick.innerHTML = "Saving...";
                     const comments = listReportingContainer.querySelector('#input-auditor-comments').value;
@@ -3553,7 +3558,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     else {
                         if (listReportingContainer.querySelector('#button-uploader-submit-report') != null) {
                             listReportingContainer.querySelector('#button-uploader-submit-report').style.visibility = 'visible';
-                            (_h = listReportingContainer.querySelector('#button-uploader-submit-report')) === null || _h === void 0 ? void 0 : _h.addEventListener('click', async (ev) => {
+                            (_j = listReportingContainer.querySelector('#button-uploader-submit-report')) === null || _j === void 0 ? void 0 : _j.addEventListener('click', async (ev) => {
                                 var _a, _b;
                                 let buttonClick = ev.target;
                                 buttonClick.innerHTML = "Saving...";
@@ -3572,7 +3577,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     reportformatvalues = (_a = JSON.stringify(this._SfReporting[0].querySelector('#reporting-format').selectedValues())) !== null && _a !== void 0 ? _a : "";
                                     reportformatschema = (_b = this._SfReporting[0].querySelector('#reporting-format').configjson) !== null && _b !== void 0 ? _b : "";
                                 }
-                                console.log('docs', docs, 'docsOptional', event.docsOptional);
+                                console.log('docs', docs, 'docsOptional', event.docsOptional, this.graphFilter);
                                 if (docs.length == 0 && event.docsOptional != null && event.docsOptional.length === 0) {
                                     //console.log('reporter comments 3', reportercomments);
                                     buttonClick.innerHTML = "Save";
@@ -3829,7 +3834,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
             if (event['reportformat'] != null && event['reportformat'].length > 0) {
-                this.fetchReportFormat(listReportingContainer, reportformatName, (_j = event['reportformatschema']) !== null && _j !== void 0 ? _j : "", (_k = event['reportformatvalues']) !== null && _k !== void 0 ? _k : "");
+                this.fetchReportFormat(listReportingContainer, reportformatName, (_k = event['reportformatschema']) !== null && _k !== void 0 ? _k : "", (_l = event['reportformatvalues']) !== null && _l !== void 0 ? _l : "");
             }
         };
         this.attachListReportingListeners = (eventsContainer) => {
@@ -3867,7 +3872,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) => {
@@ -3888,7 +3893,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) => {
@@ -3899,7 +3904,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;
@@ -4084,7 +4089,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             listReportingContainer.innerHTML = '';
                             let buttonListReporting = eventsContainer.querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j);
                             buttonListReporting.setAttribute('part', 'button-list-reporting');
-                            let streamEventTitle = eventsContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j);
+                            let streamEventTitle = eventsContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j + '-' + isnotice);
                             streamEventTitle.removeAttribute('part');
                         }
                         if (this.selectedItemIds.length === 0) {
@@ -4831,9 +4836,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.renderSelectAllButtons = () => {
-            let selectAllHtml = '<div class="d-flex justify-end w-100" style="position: fixed; bottom: 70px; left: 0px;" part="button-select-all-container">';
-            selectAllHtml += '<button part="button-select-all" id="button-select-all" class="d-flex align-center mt-10 mr-10 ml-10"><span class="material-symbols-outlined">select_all</span>&nbsp;<h4>Select All</h4><span>&nbsp;(Max ' + this.selectallblock + ')</span></button>';
-            selectAllHtml += '<button part="button-unselect-all" id="button-unselect-all" class="d-flex align-center mt-10 mr-10 ml-10"><span class="material-symbols-outlined">remove_selection</span>&nbsp;<h4>Unselect</h4></button>';
+            let selectAllHtml = '<div class="d-flex justify-end w-100" style="position: fixed; bottom: 70px; left: 0px; pointer-events: none" part="button-select-all-container">';
+            selectAllHtml += '<button part="button-select-all" id="button-select-all" class="d-flex align-center mt-10 mr-10 ml-10" style="pointer-events: all"><span class="material-symbols-outlined">select_all</span>&nbsp;<h4>Select All</h4><span>&nbsp;(Max ' + this.selectallblock + ')</span></button>';
+            selectAllHtml += '<button part="button-unselect-all" id="button-unselect-all" class="d-flex align-center mt-10 mr-10 ml-10" style="pointer-events: all"><span class="material-symbols-outlined">remove_selection</span>&nbsp;<h4>Unselect</h4></button>';
             selectAllHtml += '</div>';
             return selectAllHtml;
         };
@@ -6747,6 +6752,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             //console.log('renderingFind');
             var _a;
             this.clearGraphData();
+            console.log('this.clearSelectedGraphParam(); 3');
             this.clearSelectedGraphParam();
             this.clearSelectedLegend();
             var html = '';
@@ -6779,6 +6785,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.renderCustom = () => {
             var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m;
             this.clearGraphData();
+            console.log('this.clearSelectedGraphParam(); 4');
             this.clearSelectedGraphParam();
             this.clearSelectedLegend();
             var html = '';
@@ -7490,7 +7497,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         listReportingContainer.innerHTML = '';
                         let buttonListReporting = this._SfThisContainer.querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j);
                         buttonListReporting.setAttribute('part', 'button-list-reporting');
-                        let streamEventTitle = this._SfThisContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j);
+                        let streamEventTitle = this._SfThisContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j + '-' + isnotice);
                         streamEventTitle.removeAttribute('part');
                     }
                     if (this.selectedItemIds.length === 0) {
@@ -7973,7 +7980,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         listReportingContainer.innerHTML = '';
                         let buttonListReporting = this._SfStreamContainer.querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j);
                         buttonListReporting.setAttribute('part', 'button-list-reporting');
-                        let streamEventTitle = this._SfStreamContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j);
+                        let streamEventTitle = this._SfStreamContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j + '-' + isnotice);
                         streamEventTitle.removeAttribute('part');
                     }
                     if (this.selectedItemIds.length === 0) {
@@ -8045,7 +8052,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 });
             }
             if (showGraph) {
-                console.log('showing graph', showGraph);
+                console.log('showing graph', showGraph, this.flowGraph);
                 switch (this.flowGraph) {
                     case this.FLOW_GRAPH_COMPLETENESS:
                         this.renderCompletenessGraph(this._SfStreamContainer);
@@ -8313,6 +8320,16 @@ let SfIEvents = class SfIEvents extends LitElement {
             for (var i = 0; i < itemsCompliance.length; i++) {
                 itemsCompliance[i].style.display = 'none';
             }
+            let flagFilterFound = false;
+            for (let label of data.labels) {
+                if (label.toLowerCase().replace(/ /g, "-").replace('status-', '') === this.graphFilter) {
+                    flagFilterFound = true;
+                    break;
+                }
+            }
+            if (!flagFilterFound) {
+                this.graphFilter = "";
+            }
             this.renderChartSettings(divContainer, selectedTab, selectedSummary, ctx);
             this.renderChart(ctx, 'doughnut', data, title);
         };
@@ -8363,6 +8380,18 @@ let SfIEvents = class SfIEvents extends LitElement {
             for (var i = 0; i < itemsCompliance.length; i++) {
                 itemsCompliance[i].style.display = 'flex';
             }
+            let flagFilterFound = false;
+            for (let label of data.labels) {
+                console.log('finding flag', this.graphFilter, label.toLowerCase());
+                if (label.toLowerCase() === this.graphFilter) {
+                    flagFilterFound = true;
+                    break;
+                }
+            }
+            if (!flagFilterFound) {
+                console.log('resetting flagFilter', this.graphFilter);
+                this.graphFilter = "";
+            }
             this.renderChartSettings(divContainer, -1, -1, ctx);
             this.renderChart(ctx, 'doughnut', data, "Compliance");
         };
@@ -8413,6 +8442,16 @@ let SfIEvents = class SfIEvents extends LitElement {
             for (var i = 0; i < itemsCompliance.length; i++) {
                 itemsCompliance[i].style.display = 'none';
             }
+            let flagFilterFound = false;
+            for (let label of data.labels) {
+                if (label.toLowerCase().replace(/ /g, "-").replace('status-', '') === this.graphFilter) {
+                    flagFilterFound = true;
+                    break;
+                }
+            }
+            if (!flagFilterFound) {
+                this.graphFilter = "";
+            }
             this.renderChartSettings(divContainer, -1, -1, ctx);
             this.renderChart(ctx, 'doughnut', data, "Timeliness");
         };
@@ -8643,6 +8682,16 @@ let SfIEvents = class SfIEvents extends LitElement {
             for (var i = 0; i < itemsCompliance.length; i++) {
                 itemsCompliance[i].style.display = 'flex';
             }
+            let flagFilterFound = false;
+            for (let label of data.labels) {
+                if (label.toLowerCase() === this.graphFilter) {
+                    flagFilterFound = true;
+                    break;
+                }
+            }
+            if (!flagFilterFound) {
+                this.graphFilter = "";
+            }
         };
         this.renderEventDetailShort = (compliance) => {
             var _a, _b, _c, _f, _g;
@@ -10508,7 +10557,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     });
                     this._SfUploader[0].querySelector('#uploader').addEventListener('analysisCompleted', (_ev) => {
                         console.log('uploader analysisInProgress', _ev);
-                        this._SfDetailContainer.querySelector('.uploader-analysis-message').style.display = "none";
+                        if (this._SfDetailContainer.querySelector('.uploader-analysis-message') != null) {
+                            this._SfDetailContainer.querySelector('.uploader-analysis-message').style.display = "none";
+                        }
                     });
                     //console.log('documentType checking', documentType);
                     if (documentType != null) {
@@ -15332,6 +15383,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         }
                     },
                     onClick: (_event, array) => {
+                        console.log('chartclick', array[0]);
                         if (array == null)
                             return;
                         if (array[0] == null)
@@ -15573,6 +15625,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 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>';
                 (_a = streamEventFilters.querySelector('#button-filter-cancel')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => {
                     this.clearSelectedGraphParam();
+                    this.graphFilter = "";
                 });
                 setTimeout(() => {
                     this.recentlyReported = {};
@@ -15773,6 +15826,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             //console.log('pieIndex', labelClicked);
             if (!callingFromBar) {
                 console.log('pieIndex', labelClicked);
+                console.log('calling processGraphFilter 2');
                 this.processGraphFilter(labelClicked);
             }
         };
@@ -15787,6 +15841,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
             if (!callingFromPie) {
+                console.log('calling processGraphFilter 3');
                 this.processGraphFilter(labelClicked);
             }
             //console.log('clickonbar trigger', this.graphParam, '><', this.barCharDataSet2);

package/src/sf-i-events.ts CHANGED Viewed

@@ -3094,7 +3094,7 @@ export class SfIEvents extends LitElement {
         this.barCharDataSet4.pop();
       }
     }
+    console.log('calling processGraphFilter 1')
     this.processGraphFilter(this.graphFilter);
     this.selectedFilters = null;
   }
@@ -4874,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;
   }
@@ -4911,6 +4912,7 @@ export class SfIEvents extends LitElement {
     var lastDay = iLast;
     this.clearGraphData();
+    console.log('this.clearSelectedGraphParam(); 1', this.graphFilter);
     this.clearSelectedGraphParam();
     this.clearSelectedLegend();
@@ -5164,6 +5166,7 @@ export class SfIEvents extends LitElement {
     // var lastDay = iLast;
     // var slice = 2;
     this.clearGraphData();
+    console.log('this.clearSelectedGraphParam(); 2');
     this.clearSelectedGraphParam();
     this.clearSelectedLegend();
@@ -5574,7 +5577,7 @@ export class SfIEvents extends LitElement {
   }
   renderListReporting = (listReportingContainer: HTMLDivElement, event: any, mmddyyyy: any, eventsContainer: HTMLDivElement) => {
-    console.log('listreporting event', event);
+    console.log('listreporting event', event, this.graphFilter);
     let html = ''
     let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
@@ -5612,7 +5615,7 @@ export class SfIEvents extends LitElement {
     }
     let streamEventTitles = eventsContainer.querySelectorAll('.stream-event-title') as NodeListOf<SfIElasticText>
     for(let streamEventTitle of streamEventTitles){
-      if(streamEventTitle.id == 'stream-event-title-'+mmdd.replace(/\//g, '-') + '-' + j){
+      if(streamEventTitle.id == 'stream-event-title-'+mmdd.replace(/\//g, '-') + '-' + j + '-'+((event.isnotice ?? false)?'isnotice':'isevent')){
         streamEventTitle.setAttribute('part','stream-event-title-selected')
       }else{
         streamEventTitle.removeAttribute('part')
@@ -5938,7 +5941,7 @@ export class SfIEvents extends LitElement {
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
-              console.log('docs', docs, 'docsOptional', event.docsOptional)
+              console.log('docs', docs, 'docsOptional', event.docsOptional, this.graphFilter)
               if(docs.length == 0 && event.docsOptional != null && event.docsOptional.length === 0) {
                 //console.log('reporter comments 3', reportercomments);
@@ -6266,7 +6269,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);
@@ -6300,7 +6303,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);
@@ -6317,7 +6320,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)
@@ -6527,7 +6530,7 @@ export class SfIEvents extends LitElement {
             listReportingContainer.innerHTML = '';
             let buttonListReporting = eventsContainer.querySelector('#button-list-reporting-' + mmdd.replace(/\//g,'-') + '-' + j) as HTMLButtonElement
             buttonListReporting.setAttribute('part','button-list-reporting')
-            let streamEventTitle = eventsContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j) as SfIElasticText
+            let streamEventTitle = eventsContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + isnotice) as SfIElasticText
             streamEventTitle.removeAttribute('part')
           }
@@ -7372,9 +7375,9 @@ export class SfIEvents extends LitElement {
     }
   }
   renderSelectAllButtons = () => {
-    let selectAllHtml = '<div class="d-flex justify-end w-100" style="position: fixed; bottom: 70px; left: 0px;" part="button-select-all-container">';
-      selectAllHtml += '<button part="button-select-all" id="button-select-all" class="d-flex align-center mt-10 mr-10 ml-10"><span class="material-symbols-outlined">select_all</span>&nbsp;<h4>Select All</h4><span>&nbsp;(Max ' + this.selectallblock + ')</span></button>';
-      selectAllHtml += '<button part="button-unselect-all" id="button-unselect-all" class="d-flex align-center mt-10 mr-10 ml-10"><span class="material-symbols-outlined">remove_selection</span>&nbsp;<h4>Unselect</h4></button>';
+    let selectAllHtml = '<div class="d-flex justify-end w-100" style="position: fixed; bottom: 70px; left: 0px; pointer-events: none" part="button-select-all-container">';
+      selectAllHtml += '<button part="button-select-all" id="button-select-all" class="d-flex align-center mt-10 mr-10 ml-10" style="pointer-events: all"><span class="material-symbols-outlined">select_all</span>&nbsp;<h4>Select All</h4><span>&nbsp;(Max ' + this.selectallblock + ')</span></button>';
+      selectAllHtml += '<button part="button-unselect-all" id="button-unselect-all" class="d-flex align-center mt-10 mr-10 ml-10" style="pointer-events: all"><span class="material-symbols-outlined">remove_selection</span>&nbsp;<h4>Unselect</h4></button>';
     selectAllHtml += '</div>';
     return selectAllHtml
   }
@@ -9733,6 +9736,7 @@ export class SfIEvents extends LitElement {
     //console.log('renderingFind');
     this.clearGraphData();
+    console.log('this.clearSelectedGraphParam(); 3');
     this.clearSelectedGraphParam();
     this.clearSelectedLegend();
@@ -9779,6 +9783,7 @@ export class SfIEvents extends LitElement {
   renderCustom = () => {
     this.clearGraphData();
+    console.log('this.clearSelectedGraphParam(); 4');
     this.clearSelectedGraphParam();
     this.clearSelectedLegend();
@@ -10638,7 +10643,7 @@ export class SfIEvents extends LitElement {
           listReportingContainer.innerHTML = '';
           let buttonListReporting = (this._SfThisContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g,'-') + '-' + j) as HTMLButtonElement
           buttonListReporting.setAttribute('part','button-list-reporting')
-          let streamEventTitle = (this._SfThisContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j) as SfIElasticText
+          let streamEventTitle = (this._SfThisContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + isnotice) as SfIElasticText
           streamEventTitle.removeAttribute('part')
         }
@@ -11228,7 +11233,7 @@ export class SfIEvents extends LitElement {
           listReportingContainer.innerHTML = '';
           let buttonListReporting = (this._SfStreamContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g,'-') + '-' + j) as HTMLButtonElement
           buttonListReporting.setAttribute('part','button-list-reporting')
-          let streamEventTitle = (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j) as SfIElasticText
+          let streamEventTitle = (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g,'-') + '-' + j + '-' + isnotice) as SfIElasticText
           streamEventTitle.removeAttribute('part')
         }
@@ -11317,7 +11322,7 @@ export class SfIEvents extends LitElement {
     }
     if(showGraph) {
-      console.log('showing graph', showGraph)
+      console.log('showing graph', showGraph, this.flowGraph)
       switch (this.flowGraph) {
         case this.FLOW_GRAPH_COMPLETENESS:
           this.renderCompletenessGraph((this._SfStreamContainer as HTMLDivElement));
@@ -11659,6 +11664,16 @@ export class SfIEvents extends LitElement {
     for(var i = 0; i < itemsCompliance.length; i++) {
       itemsCompliance[i].style.display = 'none';
     }
+    let flagFilterFound = false;
+    for(let label of data.labels){
+      if(label.toLowerCase().replace(/ /g, "-").replace('status-', '') === this.graphFilter){
+        flagFilterFound = true;
+        break;
+      }
+    }
+    if(!flagFilterFound){
+      this.graphFilter = ""
+    }
     this.renderChartSettings(divContainer, selectedTab, selectedSummary, ctx);
     this.renderChart(ctx, 'doughnut', data, title)
@@ -11720,7 +11735,18 @@ export class SfIEvents extends LitElement {
     for(var i = 0; i < itemsCompliance.length; i++) {
       itemsCompliance[i].style.display = 'flex';
     }
+    let flagFilterFound = false;
+    for(let label of data.labels){
+      console.log('finding flag', this.graphFilter, label.toLowerCase());
+      if(label.toLowerCase() === this.graphFilter){
+        flagFilterFound = true;
+        break;
+      }
+    }
+    if(!flagFilterFound){
+      console.log('resetting flagFilter', this.graphFilter);
+      this.graphFilter = ""
+    }
     this.renderChartSettings(divContainer, -1, -1, ctx);
     this.renderChart(ctx, 'doughnut', data, "Compliance")
@@ -11781,7 +11807,16 @@ export class SfIEvents extends LitElement {
     for(var i = 0; i < itemsCompliance.length; i++) {
       itemsCompliance[i].style.display = 'none';
     }
+    let flagFilterFound = false;
+    for(let label of data.labels){
+      if(label.toLowerCase().replace(/ /g, "-").replace('status-', '') === this.graphFilter){
+        flagFilterFound = true;
+        break;
+      }
+    }
+    if(!flagFilterFound){
+      this.graphFilter = ""
+    }
     this.renderChartSettings(divContainer, -1, -1, ctx);
     this.renderChart(ctx, 'doughnut', data, "Timeliness")
@@ -12032,7 +12067,7 @@ export class SfIEvents extends LitElement {
     console.log('rendering graph chart2');
     this.clearSelectedGraphParam();
     // this.clearSelectedLegend();
     this.csvGraphStats = "";
     this.csvCompletenessStats = "";
     this.csvTimelinessStats = "";
@@ -12091,7 +12126,16 @@ export class SfIEvents extends LitElement {
     for(var i = 0; i < itemsCompliance.length; i++) {
       itemsCompliance[i].style.display = 'flex';
     }
+    let flagFilterFound = false;
+    for(let label of data.labels){
+      if(label.toLowerCase() === this.graphFilter){
+        flagFilterFound = true;
+        break;
+      }
+    }
+    if(!flagFilterFound){
+      this.graphFilter = ""
+    }
   }
@@ -14288,7 +14332,9 @@ export class SfIEvents extends LitElement {
         });
         this._SfUploader[0].querySelector('#uploader').addEventListener('analysisCompleted', (_ev: any) => {
           console.log('uploader analysisInProgress', _ev);
-          (this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "none"
+          if((this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement) != null){
+            (this._SfDetailContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "none"
+          }
         });
@@ -20475,7 +20521,7 @@ export class SfIEvents extends LitElement {
           }
         },
         onClick: (_event: any, array: any) => {
+          console.log('chartclick', array[0]);
           if(array == null) return;
           if(array[0] == null) return;
           const pieIndex = array[0].index;
@@ -20488,8 +20534,7 @@ export class SfIEvents extends LitElement {
             this.clickOnBar(true, 2, array[0].index);
           }
         }
-      },
+      },
     });
     this.chart.canvas.parentNode.style.height = '450px';
@@ -20756,6 +20801,7 @@ export class SfIEvents extends LitElement {
       (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>';
       (streamEventFilters as HTMLDivElement).querySelector('#button-filter-cancel')?.addEventListener('click', () => {
         this.clearSelectedGraphParam();
+        this.graphFilter = "";
       });
       setTimeout(() => {
         this.recentlyReported = {}
@@ -20988,6 +21034,7 @@ export class SfIEvents extends LitElement {
     if(!callingFromBar) {
       console.log('pieIndex', labelClicked);
+      console.log('calling processGraphFilter 2')
       this.processGraphFilter(labelClicked);
     }
@@ -21006,6 +21053,7 @@ export class SfIEvents extends LitElement {
     }
     if(!callingFromPie) {
+      console.log('calling processGraphFilter 3')
       this.processGraphFilter(labelClicked);
     }