sf-i-events 1.0.763 → 1.0.765

package/src/sf-i-events.ts

@@ -1620,7 +1620,7 @@ export class SfIEvents extends LitElement {
     return ['compliances',...JSON.parse(this.features)]
   }
 
-  selectedFeatures: string[] = this.getFeatures()
+  selectedFeatures: string[] = ['compliances']
 
   nextPage: number = 0;
 
@@ -3581,26 +3581,38 @@ export class SfIEvents extends LitElement {
 
   }
 
-  getYearFromMonthAndCalendarStart = (mm: string) => {
+  // getYearFromMonthAndCalendarStart = (mm: string) => {
 
-    var yyyy = "";
+  //   var yyyy = "";
 
-    var currMonth = new Date().getMonth() + 1;
+  //   var currMonth = new Date().getMonth() + 1;
+  //   console.log('CurrentMonth', currMonth, "MM", mm);
+  //   if(parseInt(mm) < parseInt(this.calendarStartMM) && currMonth < parseInt(this.calendarStartMM)) {
+  //     //console.log('getpastduedate returning', 0);
+  //     yyyy = parseInt(this.calendarStartYYYY) + "";
+  //   } else if(parseInt(mm) >= parseInt(this.calendarStartMM) && currMonth < parseInt(this.calendarStartMM)) {
+  //     //console.log('getpastduedate returning', 1);
+  //     yyyy = (parseInt(this.calendarStartYYYY) - 1) + "";
+  //   } else if(parseInt(mm) < parseInt(this.calendarStartMM) && currMonth >= parseInt(this.calendarStartMM)) {
+  //     //console.log('getpastduedate returning', 2);
+  //     yyyy = (parseInt(this.calendarStartYYYY) + 1) + "";
+  //   } else if(parseInt(mm) >= parseInt(this.calendarStartMM) && currMonth >= parseInt(this.calendarStartMM)) {
+  //     //console.log('getpastduedate returning', 3);
+  //     yyyy = (parseInt(this.calendarStartYYYY)) + "";
+  //   }
 
-    if(parseInt(mm) < parseInt(this.calendarStartMM) && currMonth < parseInt(this.calendarStartMM)) {
-      //console.log('getpastduedate returning', 0);
-      yyyy = parseInt(this.calendarStartYYYY) + "";
-    } else if(parseInt(mm) >= parseInt(this.calendarStartMM) && currMonth < parseInt(this.calendarStartMM)) {
-      //console.log('getpastduedate returning', 1);
-      yyyy = (parseInt(this.calendarStartYYYY) - 1) + "";
-    } else if(parseInt(mm) < parseInt(this.calendarStartMM) && currMonth >= parseInt(this.calendarStartMM)) {
-      //console.log('getpastduedate returning', 2);
+  //   return yyyy;
+
+  // }
+  getYearFromMonthAndCalendarStart = (mm: string) => {
+
+    var yyyy = "";
+    if(parseInt(mm) < parseInt(this.calendarStartMM)){
       yyyy = (parseInt(this.calendarStartYYYY) + 1) + "";
-    } else if(parseInt(mm) >= parseInt(this.calendarStartMM) && currMonth >= parseInt(this.calendarStartMM)) {
-      //console.log('getpastduedate returning', 3);
-      yyyy = (parseInt(this.calendarStartYYYY)) + "";
+    }else{
+      yyyy = parseInt(this.calendarStartYYYY) + "";
     }
-
+    
     return yyyy;
 
   }
@@ -4245,15 +4257,15 @@ export class SfIEvents extends LitElement {
     html += '<div class="mb-20 stream-event-list" part="stream-event-list-charts">';
       html += '<div class="align-center d-flex flex-wrap align-start justify-between mb-10 w-100-m-0" part="duration-title-container"><h4 part="duration-title" class="m-0">' + parametersTitle + '</h4>'
       if(this.getFeatures().length > 1){
-        html += '<div class="filter-button-container"><button part="button-icon" id="filter-button" class="material-icons">filter_list</button>'
+        html += '<div class="filter-button-container"><button part="button-icon" id="filter-button" class="material-symbols-outlined">category</button>'
         html += '<div id="filter-list-container" class="filter-list-container hide flex-col justify-between align-start p-10" part="filter-list-container" anchor="filter-button">'
         html += '<div id="filter-label-container" class="filter-label-container d-flex justify-between align-center" part="filter-label-container"><label class="filter-label"  part="filter-label">Filters</label><button id="button-submit-features" part="button-icon-small" class="material-icons button-expand invisible">check</button></div>' 
-        html += `<div class="filter-input-container d-flex"><input class="input-select-feature-all" type="checkbox" ${this.selectedFeatures.length >= (this.getFeatures().length) ? 'checked' : ''} id="input-select-feature-all"  part="input-select-feature" name="all"></input><label for="input-select-feature-all" class="input-select-feature-label-all" id="input-select-feature-label-all"
-         part="input-select-feature-label">all</label></div>`
+        // html += `<div class="filter-input-container d-flex"><input class="input-select-feature-all" type="checkbox" ${this.selectedFeatures.length >= (this.getFeatures().length) ? 'checked' : ''} id="input-select-feature-all"  part="input-select-feature" name="all"></input><label for="input-select-feature-all" class="input-select-feature-label-all" id="input-select-feature-label-all"
+        //  part="input-select-feature-label">all</label></div>`
         // html += `<div class="filter-input-container d-flex"><input class="input-select-feature-compliances" type="checkbox" ${this.selectedFeatures.indexOf('compliances') >= 0 ? 'checked' : ''} id="input-select-feature-compliances"  part="input-select-feature" name="compliances"></input><label for="input-select-feature-compliances" class="input-select-feature-label"  part="input-select-feature-label">compliances</label></div>`
         for(let [index,feature] of this.getFeatures().entries()){
           console.log('rendering features', feature, this.selectedFeatures);
-          html += `<div class="filter-input-container d-flex"><input class="input-select-feature" type="checkbox" ${this.selectedFeatures.indexOf(feature) >= 0 ? 'checked' : ''} id="input-select-feature-${index}"  part="input-select-feature" name="${feature}"></input><label for="input-select-feature-${index}" id="input-select-feature-label-${index}" class="input-select-feature-label"  part="input-select-feature-label">${feature}</label></div>`
+          html += `<div class="filter-input-container d-flex"><input class="input-select-feature" type="radio" ${this.selectedFeatures.indexOf(feature) >= 0 ? 'checked' : ''} id="input-select-feature-${index}" name="features" part="input-select-feature" value="${feature}"></input><label for="input-select-feature-${index}" id="input-select-feature-label-${index}" class="input-select-feature-label"  part="input-select-feature-label">${feature}</label></div>`
         }
         html += '</div></div>'
       }
@@ -4309,7 +4321,21 @@ export class SfIEvents extends LitElement {
     var html = '';
 
     html += '<div class="mb-20 stream-event-list" part="stream-event-list-charts">';
-      html += '<div class="align-center d-flex flex-wrap mb-10 w-100-m-0" part="duration-title-container"><h4 part="duration-title">' + parametersTitle + '</h4><button id="button-refresh" part="button-duration-title" class="align-center d-flex justify-center"><h4 part="duration-title">' + parametersTitle + '</h4><span part="duration-title-icon" class="material-icons ml-10">refresh</span></button></div>';
+      html += '<div class="align-center justify-between d-flex flex-wrap mb-10 w-100-m-0" part="duration-title-container"><h4 part="duration-title">' + parametersTitle + '</h4>'
+      if(this.getFeatures().length > 1){
+        html += '<div class="filter-button-container"><button part="button-icon" id="filter-button" class="material-symbols-outlined">category</button>'
+        html += '<div id="filter-list-container" class="filter-list-container hide flex-col justify-between align-start p-10" part="filter-list-container" anchor="filter-button">'
+        html += '<div id="filter-label-container" class="filter-label-container d-flex justify-between align-center" part="filter-label-container"><label class="filter-label"  part="filter-label">Filters</label><button id="button-submit-features" part="button-icon-small" class="material-icons button-expand invisible">check</button></div>' 
+        // html += `<div class="filter-input-container d-flex"><input class="input-select-feature-all" type="checkbox" ${this.selectedFeatures.length >= (this.getFeatures().length) ? 'checked' : ''} id="input-select-feature-all"  part="input-select-feature" name="all"></input><label for="input-select-feature-all" class="input-select-feature-label-all" id="input-select-feature-label-all"
+        //  part="input-select-feature-label">all</label></div>`
+        // html += `<div class="filter-input-container d-flex"><input class="input-select-feature-compliances" type="checkbox" ${this.selectedFeatures.indexOf('compliances') >= 0 ? 'checked' : ''} id="input-select-feature-compliances"  part="input-select-feature" name="compliances"></input><label for="input-select-feature-compliances" class="input-select-feature-label"  part="input-select-feature-label">compliances</label></div>`
+        for(let [index,feature] of this.getFeatures().entries()){
+          console.log('rendering features statistics', feature, this.selectedFeatures);
+          html += `<div class="filter-input-container d-flex"><input class="input-select-feature" type="radio" ${this.selectedFeatures.indexOf(feature) >= 0 ? 'checked' : ''} id="input-select-feature-${index}" name="features" part="input-select-feature" value="${feature}"></input><label for="input-select-feature-${index}" id="input-select-feature-label-${index}" class="input-select-feature-label"  part="input-select-feature-label">${feature}</label></div>`
+        }
+        html += '</div></div>'
+      }
+      html +='<button id="button-refresh" part="button-duration-title" class="align-center d-flex justify-center"><h4 part="duration-title">' + parametersTitle + '</h4><span part="duration-title-icon" class="material-icons ml-10">refresh</span></button></div>';
       html += '<div class="align-center d-flex flex-wrap mb-10 w-100-m-0" part="last-update-title-container"><h6 part="last-update-title" class="align-center d-flex"><span class="material-symbols-outlined">update</span>&nbsp;&nbsp;Last Updated on ' + this.lastupdated + '</h6></div>';
       if(showGraph) {
         html += '<div class="chart-container d-flex scroll-x align-center"><div part="chart-item" class="chart-item"><canvas id="myChart"></canvas></div><div part="chart-item" class="chart-item"><canvas id="myChart4" class="gone"></canvas></div><div part="chart-item chart-item-middle" class="chart-item"><canvas id="myChart2" class="gone"></canvas></div><div part="chart-item" class="chart-item"><canvas id="myChart3" class="gone"></canvas></div></div>';
@@ -6078,37 +6104,37 @@ export class SfIEvents extends LitElement {
     filterButton?.addEventListener('click',() => {
       const filterList = eventsContainer.querySelector('#filter-list-container') as HTMLDivElement
       filterList.style.display = (filterList.style.display != 'block' ? 'block' : 'none')
-      filterButton.innerHTML = (filterList.style.display != 'block' ? 'filter_list' : 'close')
+      filterButton.innerHTML = (filterList.style.display != 'block' ? 'category' : 'close')
       const filterSubmitButton = filterList.querySelector('#button-submit-features') as HTMLButtonElement
       filterSubmitButton.addEventListener('click',() => {
         this.processDateSelection(eventsContainer);
       })
-      const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
-      selectFeatureAll.addEventListener('click',async(ev: any) => {
-        let target = ev.target;
-        if(target.checked){
-          for(let feature of this.getFeatures()){
-            if(this.selectedFeatures.indexOf(feature) < 0){
-              this.selectedFeatures.push(feature);
-            }
-          }
-        }else{
-          this.selectedFeatures = []
-        }
-        const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
-        for(let selectFeature of selectFeatures){
-          let id = selectFeature.id;
-          let i = id.split('-')[3];
-          let selectedFeature = this.getFeatures()[parseInt(i)]
-          selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
-        }
-        filterSubmitButton.style.visibility = 'visible'
-      })
-      const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
-      selectFeatureAllLabel.addEventListener('click',()=>{
-        selectFeatureAll.checked = !selectFeatureAll.checked
-        selectFeatureAll.click();
-      })
+      // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
+      // selectFeatureAll.addEventListener('click',async(ev: any) => {
+      //   let target = ev.target;
+      //   if(target.checked){
+      //     for(let feature of this.getFeatures()){
+      //       if(this.selectedFeatures.indexOf(feature) < 0){
+      //         this.selectedFeatures.push(feature);
+      //       }
+      //     }
+      //   }else{
+      //     this.selectedFeatures = []
+      //   }
+      //   const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
+      //   for(let selectFeature of selectFeatures){
+      //     let id = selectFeature.id;
+      //     let i = id.split('-')[3];
+      //     let selectedFeature = this.getFeatures()[parseInt(i)]
+      //     selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
+      //   }
+      //   filterSubmitButton.style.visibility = 'visible'
+      // })
+      // const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
+      // selectFeatureAllLabel.addEventListener('click',()=>{
+      //   selectFeatureAll.checked = !selectFeatureAll.checked
+      //   selectFeatureAll.click();
+      // })
       const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
       const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label') as NodeListOf<HTMLLabelElement>
       for(let [i,selectFeature] of selectFeatures.entries()){
@@ -6119,15 +6145,18 @@ export class SfIEvents extends LitElement {
           let selectedFeature = this.getFeatures()[index]
           if(target.checked){
             if(this.selectedFeatures.indexOf(selectedFeature) < 0){
-              this.selectedFeatures.push(selectedFeature)
-            }
-          }else{
-            selectFeatureAll.checked = false;
-            if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
-              this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
+              // this.selectedFeatures.push(selectedFeature)
+              this.selectedFeatures = [selectedFeature]
             }
           }
-          filterSubmitButton.style.visibility = 'visible'
+          // else{
+          //   // selectFeatureAll.checked = false;
+          //   if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
+          //     this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
+          //   }
+          // }
+          // filterSubmitButton.style.visibility = 'visible'
+          filterSubmitButton.click();
         })
         selectFeatureLabels[i].addEventListener('click',() => {
           selectFeature.checked = !selectFeature.checked
@@ -6799,6 +6828,70 @@ export class SfIEvents extends LitElement {
 
     eventsContainer.querySelector('.calendar-right-data')!.innerHTML = html;
     this.renderButtonRefresh(eventsContainer);
+    const filterButton = eventsContainer.querySelector('#filter-button') as HTMLButtonElement
+    filterButton?.addEventListener('click',() => {
+      const filterList = eventsContainer.querySelector('#filter-list-container') as HTMLDivElement
+      filterList.style.display = (filterList.style.display != 'block' ? 'block' : 'none')
+      filterButton.innerHTML = (filterList.style.display != 'block' ? 'category' : 'close')
+      const filterSubmitButton = filterList.querySelector('#button-submit-features') as HTMLButtonElement
+      filterSubmitButton.addEventListener('click',() => {
+        this.processDateSelectionViewer(eventsContainer);
+      })
+      // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
+      // selectFeatureAll.addEventListener('click',async(ev: any) => {
+      //   let target = ev.target;
+      //   if(target.checked){
+      //     for(let feature of this.getFeatures()){
+      //       if(this.selectedFeatures.indexOf(feature) < 0){
+      //         this.selectedFeatures.push(feature);
+      //       }
+      //     }
+      //   }else{
+      //     this.selectedFeatures = []
+      //   }
+      //   const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
+      //   for(let selectFeature of selectFeatures){
+      //     let id = selectFeature.id;
+      //     let i = id.split('-')[3];
+      //     let selectedFeature = this.getFeatures()[parseInt(i)]
+      //     selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
+      //   }
+      //   filterSubmitButton.style.visibility = 'visible'
+      // })
+      // const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
+      // selectFeatureAllLabel.addEventListener('click',()=>{
+      //   selectFeatureAll.checked = !selectFeatureAll.checked
+      //   selectFeatureAll.click();
+      // })
+      const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
+      const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label') as NodeListOf<HTMLLabelElement>
+      for(let [i,selectFeature] of selectFeatures.entries()){
+        selectFeature.addEventListener('click',(ev: any) => {
+          let target = ev.target;
+          let id = target.id;
+          let index = id.split('-')[3];
+          let selectedFeature = this.getFeatures()[index]
+          if(target.checked){
+            if(this.selectedFeatures.indexOf(selectedFeature) < 0){
+              // this.selectedFeatures.push(selectedFeature)
+              this.selectedFeatures = [selectedFeature]
+            }
+          }
+          // else{
+          //   // selectFeatureAll.checked = false;
+          //   if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
+          //     this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
+          //   }
+          // }
+          // filterSubmitButton.style.visibility = 'visible'
+          filterSubmitButton.click();
+        })
+        selectFeatureLabels[i].addEventListener('click',() => {
+          selectFeature.checked = !selectFeature.checked
+          selectFeature.click();
+        })
+      }
+    })
     // let innerhtml = eventsContainer.innerHTML;
     // innerhtml += this.renderSelectAllButtons();
     // eventsContainer.innerHTML = innerhtml
@@ -7370,7 +7463,8 @@ export class SfIEvents extends LitElement {
       tsStart.setDate(tsStart.getDate() - 2);
       tsEnd.setDate(tsEnd.getDate() + 2);
 
-      await this.fetchAndYearlyRenderUserCalendar_2((tsStart.getMonth() + 1) + "/" + tsStart.getDate() + "/" + tsStart.getFullYear(), (tsEnd.getMonth() + 1) + "/" + tsEnd.getDate() + "/" + tsEnd.getFullYear());
+      await this.renderWithFeatures((tsStart.getMonth() + 1) + "/" + tsStart.getDate() + "/" + tsStart.getFullYear(), (tsEnd.getMonth() + 1) + "/" + tsEnd.getDate() + "/" + tsEnd.getFullYear())
+      // await this.fetchAndYearlyRenderUserCalendar_2((tsStart.getMonth() + 1) + "/" + tsStart.getDate() + "/" + tsStart.getFullYear(), (tsEnd.getMonth() + 1) + "/" + tsEnd.getDate() + "/" + tsEnd.getFullYear());
       this.renderRangeEvents(new Date(valueStart), ((new Date(valueEnd).getTime()+24*60*60*1000) - new Date(valueStart).getTime())/(1000*60*60*24), (this._SfCustomContainer as HTMLDivElement));
     } else if(valueStart != "" && valueEnd == "") {
       (this._SfStreamEventStatus as HTMLDivElement).innerHTML = "Please select End Date";
@@ -8535,14 +8629,14 @@ export class SfIEvents extends LitElement {
 
     for(var j = 0; j < 12; j++) {
       if(j === index) {
-
+        
         let currentMonth = month;
         let nowMonth = new Date().getMonth() + 1;
         //let nowYear = new Date().getFullYear();
         let nowYear = parseInt(this.getCurrentYear(nowMonth + ""));
         let lastMonth = -1;
         let nextMonth = -1;
-
+        console.log('calculating startAndEndOfStream', index, nowMonth, currentMonth)
         let lastMonthsYear = -1;
         let nextMonthsYear = -1;
 
@@ -8742,8 +8836,8 @@ export class SfIEvents extends LitElement {
         //   nextMonthsYear = parseInt(this.calendarStartYYYY) + 1;
         // }
 
-        let startDate = lastMonth + "/25/" + lastMonthsYear;
-        let endDate = nextMonth + "/01/" + nextMonthsYear;
+        let startDate = ("0" + lastMonth).slice(-2) + "/25/" + lastMonthsYear;
+        let endDate = ("0" + nextMonth).slice(-2) + "/01/" + nextMonthsYear;
 
         return {startDate: startDate, endDate: endDate};
         
@@ -9798,7 +9892,7 @@ export class SfIEvents extends LitElement {
     filterButton?.addEventListener('click',() => {
       const filterList = (this._SfThisContainer as HTMLDivElement).querySelector('#filter-list-container') as HTMLDivElement
       filterList.style.display = (filterList.style.display != 'block' ? 'block' : 'none')
-      filterButton.innerHTML = (filterList.style.display != 'block' ? 'filter_list' : 'close')
+      filterButton.innerHTML = (filterList.style.display != 'block' ? 'category' : 'close')
       const filterSubmitButton = filterList.querySelector('#button-submit-features') as HTMLButtonElement
       filterSubmitButton.addEventListener('click',async() => {
         const dateResult = this.calculateStartAndEndDateOfStream(index);
@@ -9811,32 +9905,32 @@ export class SfIEvents extends LitElement {
         this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
         this.renderStream(index);
       })
-      const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
-      selectFeatureAll.addEventListener('click',async(ev: any) => {
-        let target = ev.target;
-        if(target.checked){
-          for(let feature of this.getFeatures()){
-            if(this.selectedFeatures.indexOf(feature) < 0){
-              this.selectedFeatures.push(feature);
-            }
-          }
-        }else{
-          this.selectedFeatures = []
-        }
-        const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
-        for(let selectFeature of selectFeatures){
-          let id = selectFeature.id;
-          let i = id.split('-')[3];
-          let selectedFeature = this.getFeatures()[parseInt(i)]
-          selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
-        }
-        filterSubmitButton.style.visibility = 'visible'
-      })
-      const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
-      selectFeatureAllLabel.addEventListener('click',()=>{
-        selectFeatureAll.checked = !selectFeatureAll.checked
-        selectFeatureAll.click();
-      })
+      // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
+      // selectFeatureAll.addEventListener('click',async(ev: any) => {
+      //   let target = ev.target;
+      //   if(target.checked){
+      //     for(let feature of this.getFeatures()){
+      //       if(this.selectedFeatures.indexOf(feature) < 0){
+      //         this.selectedFeatures.push(feature);
+      //       }
+      //     }
+      //   }else{
+      //     this.selectedFeatures = []
+      //   }
+      //   const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
+      //   for(let selectFeature of selectFeatures){
+      //     let id = selectFeature.id;
+      //     let i = id.split('-')[3];
+      //     let selectedFeature = this.getFeatures()[parseInt(i)]
+      //     selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
+      //   }
+      //   filterSubmitButton.style.visibility = 'visible'
+      // })
+      // const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
+      // selectFeatureAllLabel.addEventListener('click',()=>{
+      //   selectFeatureAll.checked = !selectFeatureAll.checked
+      //   selectFeatureAll.click();
+      // })
       const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
       const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label') as NodeListOf<HTMLLabelElement>
       for(let [i,selectFeature] of selectFeatures.entries()){
@@ -9847,15 +9941,18 @@ export class SfIEvents extends LitElement {
           let selectedFeature = this.getFeatures()[i]
           if(target.checked){
             if(this.selectedFeatures.indexOf(selectedFeature) < 0){
-              this.selectedFeatures.push(selectedFeature)
-            }
-          }else{
-            selectFeatureAll.checked = false;
-            if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
-              this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
+              // this.selectedFeatures.push(selectedFeature)
+              this.selectedFeatures = [selectedFeature]
             }
           }
-          filterSubmitButton.style.visibility = 'visible'
+          // else{
+          //   // selectFeatureAll.checked = false;
+          //   if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
+          //     this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
+          //   }
+          // }
+          // filterSubmitButton.style.visibility = 'visible'
+          filterSubmitButton.click();
         })
         selectFeatureLabels[i].addEventListener('click',() => {
           selectFeature.checked = !selectFeature.checked
@@ -10023,7 +10120,8 @@ export class SfIEvents extends LitElement {
       this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
       this.currentColumnIndex = index + "";
       const dateResult = this.calculateStartAndEndDateOfThis(index);
-      await this.fetchAndYearlyRenderUserCalendar_2(dateResult.startDate, dateResult.endDate);
+      // await this.fetchAndYearlyRenderUserCalendar_2(dateResult.startDate, dateResult.endDate);
+      await this.renderWithFeatures(dateResult.startDate, dateResult.endDate);
       this.renderThis(index);
     })
     this.attachListReportingListeners(this._SfThisContainer as HTMLDivElement);
@@ -10308,7 +10406,7 @@ export class SfIEvents extends LitElement {
     filterButton?.addEventListener('click',() => {
       const filterList = (this._SfStreamContainer as HTMLDivElement).querySelector('#filter-list-container') as HTMLDivElement
       filterList.style.display = (filterList.style.display != 'block' ? 'block' : 'none')
-      filterButton.innerHTML = (filterList.style.display != 'block' ? 'filter_list' : 'close')
+      filterButton.innerHTML = (filterList.style.display != 'block' ? 'category' : 'close')
       const filterSubmitButton = filterList.querySelector('#button-submit-features') as HTMLButtonElement
       filterSubmitButton.addEventListener('click',async() => {
         const dateResult = this.calculateStartAndEndDateOfStream(index);
@@ -10323,32 +10421,32 @@ export class SfIEvents extends LitElement {
         this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
         this.renderStream(index);
       })
-      const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
-      selectFeatureAll.addEventListener('click',async(ev: any) => {
-        let target = ev.target;
-        if(target.checked){
-          for(let feature of this.getFeatures()){
-            if(this.selectedFeatures.indexOf(feature) < 0){
-              this.selectedFeatures.push(feature);
-            }
-          }
-        }else{
-          this.selectedFeatures = []
-        }
-        const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
-        for(let selectFeature of selectFeatures){
-          let id = selectFeature.id;
-          let i = id.split('-')[3];
-          let selectedFeature = this.getFeatures()[parseInt(i)]
-          selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
-        }
-        filterSubmitButton.style.visibility = 'visible'
-      })
-      const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
-      selectFeatureAllLabel.addEventListener('click',()=>{
-        selectFeatureAll.checked = !selectFeatureAll.checked;
-        selectFeatureAll.click();
-      })
+      // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
+      // selectFeatureAll?.addEventListener('click',async(ev: any) => {
+      //   let target = ev.target;
+      //   if(target.checked){
+      //     for(let feature of this.getFeatures()){
+      //       if(this.selectedFeatures.indexOf(feature) < 0){
+      //         this.selectedFeatures.push(feature);
+      //       }
+      //     }
+      //   }else{
+      //     this.selectedFeatures = []
+      //   }
+      //   const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
+      //   for(let selectFeature of selectFeatures){
+      //     let id = selectFeature.id;
+      //     let i = id.split('-')[3];
+      //     let selectedFeature = this.getFeatures()[parseInt(i)]
+      //     selectFeature.checked = this.selectedFeatures.indexOf(selectedFeature) >= 0
+      //   }
+      //   filterSubmitButton.style.visibility = 'visible'
+      // })
+      // const selectFeatureAllLabel = filterList.querySelector('#input-select-feature-label-all') as HTMLLabelElement
+      // selectFeatureAllLabel?.addEventListener('click',()=>{
+      //   selectFeatureAll.checked = !selectFeatureAll.checked;
+      //   selectFeatureAll.click();
+      // })
       const selectFeatures = filterList.querySelectorAll('.input-select-feature') as NodeListOf<HTMLInputElement>
       const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label') as NodeListOf<HTMLLabelElement>
       for(let [i,selectFeature] of selectFeatures.entries()){
@@ -10359,16 +10457,18 @@ export class SfIEvents extends LitElement {
           let selectedFeature = this.getFeatures()[i]
           if(target.checked){
             if(this.selectedFeatures.indexOf(selectedFeature) < 0){
-              this.selectedFeatures.push(selectedFeature)
-            }
-          }else{
-            selectFeatureAll.checked = false;
-            if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
-              this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
+              // this.selectedFeatures.push(selectedFeature)
+              this.selectedFeatures = [selectedFeature]
             }
           }
-          filterSubmitButton.style.visibility = 'visible'
-          
+          // else{
+          //   // selectFeatureAll.checked = false;
+          //   if(this.selectedFeatures.indexOf(selectedFeature) >= 0){
+          //     this.selectedFeatures.splice(this.selectedFeatures.indexOf(selectedFeature),1);
+          //   }
+          // }
+          // filterSubmitButton.style.visibility = 'visible'
+          filterSubmitButton.click();
         })
         selectFeatureLabels[i].addEventListener('click',() => {
           selectFeature.checked = !selectFeature.checked
@@ -10541,7 +10641,8 @@ export class SfIEvents extends LitElement {
       console.log('dateresult', dateResult);
       this.currentColumnIndex = index + "";
       if(dateResult != null) {
-        await this.fetchAndYearlyRenderUserCalendar_2(dateResult.startDate, dateResult.endDate,"","yes",("0" + monthResult).slice(-2));
+        await this.renderWithFeatures(dateResult.startDate, dateResult.endDate,"","yes",("0" + monthResult).slice(-2));
+        // await this.fetchAndYearlyRenderUserCalendar_2(dateResult.startDate, dateResult.endDate,"","yes",("0" + monthResult).slice(-2));
       }
       this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
       this.renderStream(index);
@@ -10784,6 +10885,12 @@ export class SfIEvents extends LitElement {
     //   yyyy = (parseInt(this.calendarStartYYYY) + 1) + "";
     // }
 
+    // if(parseInt(mm) >= 4){
+    //   return new Date().getFullYear() + ""
+    // }else{
+    //   return (new Date().getFullYear() + 1) + ""
+    // }
+
     var yyyy = this.getYearFromMonthAndCalendarStart(mm);
 
     return yyyy;
@@ -23433,9 +23540,9 @@ export class SfIEvents extends LitElement {
       console.log('rendering appropriate string', list);
         this.renderAppropriateStream(startDate, endDate, list == "no");
         this.fetchBulkReportingData();
-        if(this.selectedFeatures.indexOf('notices') >= 0){
-          this.fetchAndRenderNotices(startDate, endDate);
-        }
+        // if(this.selectedFeatures.indexOf('notices') >= 0){
+        //   this.fetchAndRenderNotices(startDate, endDate);
+        // }
         // this.events = {}
         // this.events = {...JSON.parse(JSON.stringify(jsonRespose.data.events))};
 
@@ -23562,7 +23669,7 @@ export class SfIEvents extends LitElement {
       console.log('jsonRespose', jsonRespose);
       let notices = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
-      // this.lastupdated = new Date().toLocaleDateString('en-IN') + " - " + new Date().toLocaleTimeString('en-IN')
+      this.lastupdated = new Date().toLocaleDateString('en-IN') + " - " + new Date().toLocaleTimeString('en-IN')
       let tempEvents = this.events
       for(let mmddyyyy of Object.keys(notices)){
         tempEvents[mmddyyyy] = [...(tempEvents[mmddyyyy] ?? []),...notices[mmddyyyy]]
@@ -23609,8 +23716,12 @@ export class SfIEvents extends LitElement {
       eDate = endDate;
     }
 
-
-    let url = "https://"+this.apiId+"/"+ path;
+    let url = ""
+    if(this.selectedFeatures.indexOf('compliances') >= 0){
+      url = "https://"+this.apiId+"/"+ path;
+    }else if(this.selectedFeatures.indexOf('notices') >= 0){
+      url = "https://"+this.apiIdNotices+"/"+ path;
+    }
     
     //console.log('fetch calendar url', url);
     let urlBody :any = {"projectid": this.projectId, "userid": this.userProfileId, "role": this.myRole, "sdate": sDate, "edate": eDate,"filtercriteria": filtercriteria};
@@ -25147,7 +25258,7 @@ export class SfIEvents extends LitElement {
       if(tempRole != "") {
         this._SfRoleTabContainer.innerHTML = '';
       }
-      this.selectedFeatures = this.getFeatures()
+      // this.selectedFeatures = this.getFeatures()
       //console.log('stream received', this.stream, this.TAB_STREAM, this.TAB_YEAR);
 
       if(this.stream == this.TAB_YEAR) {

package/src/util.ts

@@ -457,8 +457,16 @@ function percentageString(val: number, valTotal: number){
   return " (" + (Math.round((num + Number.EPSILON) * 100) / 100) + "%)"
 }
 
+function getCurrentFiscal(){
+  let date = new Date()
+  if(date.getMonth() < 4){
+      return (date.getFullYear() - 1)
+  }
+  return date.getFullYear();
+}
+
 const exportFunctions = {
-  callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString
+  callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal
 };
 
 export default exportFunctions;

package/util.d.ts

@@ -15,6 +15,7 @@ declare function parseCsv(csv: string): any;
 declare function titleCase(str: string): string;
 declare function alphabeticalSort(arr: string[]): string[];
 declare function percentageString(val: number, valTotal: number): string;
+declare function getCurrentFiscal(): number;
 declare const exportFunctions: {
     callApiPresignedDelete: typeof callApiPresignedDelete;
     callApiPresignedGet: typeof callApiPresignedGet;
@@ -35,6 +36,7 @@ declare const exportFunctions: {
     titleCase: typeof titleCase;
     alphabeticalSort: typeof alphabeticalSort;
     percentageString: typeof percentageString;
+    getCurrentFiscal: typeof getCurrentFiscal;
 };
 export default exportFunctions;
 //# sourceMappingURL=util.d.ts.map

package/util.js

@@ -382,8 +382,15 @@ function percentageString(val, valTotal) {
     let num = (100 * val) / valTotal;
     return " (" + (Math.round((num + Number.EPSILON) * 100) / 100) + "%)";
 }
+function getCurrentFiscal() {
+    let date = new Date();
+    if (date.getMonth() < 4) {
+        return (date.getFullYear() - 1);
+    }
+    return date.getFullYear();
+}
 const exportFunctions = {
-    callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString
+    callApiPresignedDelete, callApiPresignedGet, callApiPresigned, jsonObjectToHtml, clearListeners, isInteger, callApi, validateName, readCookie, timeSince, createDiagonalPattern1, createDiagonalPattern2, createDiagonalPattern3, getRandomColor, convertToCSV, parseCsv, titleCase, alphabeticalSort, percentageString, getCurrentFiscal
 };
 export default exportFunctions;
 //# sourceMappingURL=util.js.map