sf-i-events 1.0.762 → 1.0.764

package/dev/index.html

@@ -631,7 +631,7 @@
     <!-- <sf-i-events projectid="c7d18a84-c2df-4dc2-b75f-5820549f5e5c" projectname="Chitale" mode="onboarding" locations="{&quot;India&quot;:{&quot;Maharashtra&quot;:[&quot;Reg_Offce&quot;,&quot;SHRIKRISHNA&quot;,&quot;SHEDNO25&quot;,&quot;SHEDNO31&quot;,&quot;SHEDNO44&quot;,&quot;CBM_SADAN&quot;,&quot;RANJE_CBM&quot;,&quot;ISHITA_TOWER&quot;,&quot;CBM_ANAND&quot;,&quot;CBM_SADAN_WH&quot;,&quot;CBM_ANAND_SHED25&quot;,&quot;CBM_KATRAJ&quot;,&quot;CBM_KHADKI&quot;,&quot;CBM_PANVEL&quot;,&quot;CBM_NAGPUR&quot;,&quot;CBM_ISHITA&quot;,&quot;Dugdhalaya&quot;,&quot;ExpressStores_MH&quot;,&quot;FranchiseStore_MH&quot;],&quot;Goa&quot;:[&quot;ExpressStores_Goa&quot;]},&quot;United States of America&quot;:{&quot;USA&quot;:[&quot;North_Carolina&quot;]}}" contractstartdate="01/04/2024" apiid="dwqyez2puoxmu.cloudfront.net/event" username="ninad.t@flagggrc.tech" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidusers="dnytrdlrmxgsy.cloudfront.net/userprofile" disablesignoff="yes" disableclientresponse="yes">
 
     </sf-i-events> -->
-    <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="58c90fb5-9d1d-46bc-9b1a-2cf3e353eed0" myrole="reporter" showregisterexport="false" features="[&quot;notices&quot;]" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
+    <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition" apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat" apiidnotices="gghnbi7hku2qj5twrea6xxcaya0aqeis.lambda-url.us-east-1.on.aws" fill="solid" username="Viewer J1" userprofileid="344c84d2-5976-47ff-949b-49f6fa9627eb" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="58c90fb5-9d1d-46bc-9b1a-2cf3e353eed0" myrole="viewer" showregisterexport="false" features="[&quot;notices&quot;]" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2024">
 
         <div slot="uploader">
             <sf-i-uploader id="uploader" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="5242880" allowdownload="yes"></sf-i-uploader>

package/package.json

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

package/sf-i-events.js

@@ -1222,7 +1222,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.getFeatures = () => {
             return ['compliances', ...JSON.parse(this.features)];
         };
-        this.selectedFeatures = this.getFeatures();
+        this.selectedFeatures = ['compliances'];
         this.nextPage = 0;
         this.nextTabRole = "";
         this.nextTabStatus = "";
@@ -2139,15 +2139,15 @@ let SfIEvents = 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>';
             }
@@ -2196,7 +2196,21 @@ let SfIEvents = class SfIEvents extends LitElement {
             //console.log('flowGraph', this.flowGraph);
             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>';
@@ -3677,38 +3691,37 @@ let SfIEvents = class SfIEvents extends LitElement {
             filterButton === null || filterButton === void 0 ? void 0 : filterButton.addEventListener('click', () => {
                 const filterList = eventsContainer.querySelector('#filter-list-container');
                 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');
                 filterSubmitButton.addEventListener('click', () => {
                     this.processDateSelection(eventsContainer);
                 });
-                const selectFeatureAll = filterList.querySelector('.input-select-feature-all');
-                selectFeatureAll.addEventListener('click', async (ev) => {
-                    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');
-                    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');
-                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');
                 const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label');
                 for (let [i, selectFeature] of selectFeatures.entries()) {
@@ -3719,16 +3732,18 @@ let SfIEvents = 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;
@@ -4291,6 +4306,70 @@ let SfIEvents = class SfIEvents extends LitElement {
             var html = this.renderStatistics(firstDay, endDay, 1, lastDay, true, 0, (firstDate.getMonth()), period, firstDate, "From " + firstDay.toLocaleDateString('en-IN') + " To " + endDay.toLocaleDateString('en-IN'));
             eventsContainer.querySelector('.calendar-right-data').innerHTML = html;
             this.renderButtonRefresh(eventsContainer);
+            const filterButton = eventsContainer.querySelector('#filter-button');
+            filterButton === null || filterButton === void 0 ? void 0 : filterButton.addEventListener('click', () => {
+                const filterList = eventsContainer.querySelector('#filter-list-container');
+                filterList.style.display = (filterList.style.display != 'block' ? 'block' : 'none');
+                filterButton.innerHTML = (filterList.style.display != 'block' ? 'category' : 'close');
+                const filterSubmitButton = filterList.querySelector('#button-submit-features');
+                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');
+                const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label');
+                for (let [i, selectFeature] of selectFeatures.entries()) {
+                    selectFeature.addEventListener('click', (ev) => {
+                        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
@@ -4762,7 +4841,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                 const tsEnd = new Date(valueEnd);
                 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);
             }
             else if (valueStart != "" && valueEnd == "") {
@@ -6738,7 +6818,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             filterButton === null || filterButton === void 0 ? void 0 : filterButton.addEventListener('click', () => {
                 const filterList = this._SfThisContainer.querySelector('#filter-list-container');
                 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');
                 filterSubmitButton.addEventListener('click', async () => {
                     const dateResult = this.calculateStartAndEndDateOfStream(index);
@@ -6751,33 +6831,32 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
                     this.renderStream(index);
                 });
-                const selectFeatureAll = filterList.querySelector('.input-select-feature-all');
-                selectFeatureAll.addEventListener('click', async (ev) => {
-                    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');
-                    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');
-                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');
                 const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label');
                 for (let [i, selectFeature] of selectFeatures.entries()) {
@@ -6788,16 +6867,18 @@ let SfIEvents = class SfIEvents extends LitElement {
                         let selectedFeature = this.getFeatures()[i];
                         if (target.checked) {
                             if (this.selectedFeatures.indexOf(selectedFeature) < 0) {
-                                this.selectedFeatures.push(selectedFeature);
+                                // 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';
+                        // 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;
@@ -6919,7 +7000,8 @@ let SfIEvents = 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);
@@ -7153,7 +7235,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             filterButton === null || filterButton === void 0 ? void 0 : filterButton.addEventListener('click', () => {
                 const filterList = this._SfStreamContainer.querySelector('#filter-list-container');
                 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');
                 filterSubmitButton.addEventListener('click', async () => {
                     const dateResult = this.calculateStartAndEndDateOfStream(index);
@@ -7168,33 +7250,32 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
                     this.renderStream(index);
                 });
-                const selectFeatureAll = filterList.querySelector('.input-select-feature-all');
-                selectFeatureAll.addEventListener('click', async (ev) => {
-                    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');
-                    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');
-                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');
                 const selectFeatureLabels = filterList.querySelectorAll('.input-select-feature-label');
                 for (let [i, selectFeature] of selectFeatures.entries()) {
@@ -7205,16 +7286,18 @@ let SfIEvents = 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;
@@ -7339,7 +7422,8 @@ let SfIEvents = 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);
@@ -8218,7 +8302,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         <div class="box-large" id="shimmer-container-notices" part="shimmer-container-notices">
         </div>
     `;
-            html += '<sf-i-reporting id="detail-reporting" class="hide" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdNotices + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
+            html += '<sf-i-reporting id="detail-reporting" class="hide" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, commentbox:reporting-commentbox, comment-username:reporting-comment-username, detail-head:reporting-detail-head, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label, reporting-commentbox:reporting-reporting-commentbox, reporting-comment-username:reporting-reporting-comment-username, reporting-detail-head:reporting-reporting-detail-head" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdNotices + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
             html += '<div part="reporting-view-container">';
             html += this.renderReporting(listEvent, mmddyyyy);
             html += "</div>";
@@ -17437,9 +17521,9 @@ let SfIEvents = 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))};
                 // let lastEvaluatedKey = jsonRespose.lastEvaluatedKey;
@@ -17531,7 +17615,7 @@ let SfIEvents = 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] = [...((_a = tempEvents[mmddyyyy]) !== null && _a !== void 0 ? _a : []), ...notices[mmddyyyy]];
@@ -17569,7 +17653,13 @@ let SfIEvents = class SfIEvents extends LitElement {
                 sDate = startDate;
                 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 = { "projectid": this.projectId, "userid": this.userProfileId, "role": this.myRole, "sdate": sDate, "edate": eDate, "filtercriteria": filtercriteria };
             if (filtercriteria == 'function') {
@@ -18860,7 +18950,7 @@ let SfIEvents = 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) {
                     this.renderTabs(this.TAB_YEAR);

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;
 
@@ -4245,15 +4245,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 +4309,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 +6092,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 +6133,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 +6816,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 +7451,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";
@@ -9798,7 +9880,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 +9893,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 +9929,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 +10108,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 +10394,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 +10409,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 +10445,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 +10629,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);
@@ -11688,7 +11777,7 @@ export class SfIEvents extends LitElement {
         <div class="box-large" id="shimmer-container-notices" part="shimmer-container-notices">
         </div>
     `
-    html += '<sf-i-reporting id="detail-reporting" class="hide" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdNotices + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
+    html += '<sf-i-reporting id="detail-reporting" class="hide" exportparts="uploader-extracted-text:reporting-uploader-extracted-text, uploader-sf-upload-message:reporting-uploader-sf-upload-message, uploader-sf-upload-submessage:reporting-uploader-sf-upload-submessage, uploader-extracted-text-chip:reporting-uploader-extracted-text-chip, uploader-extracted-text-chip-failed:reporting-uploader-extracted-text-chip-failed, uploader-doctype-verify-badge:reporting-uploader-doctype-verify-badge,span-submit-published:reporting-span-submit-published, span-submit-unpublished:reporting-span-submit-unpublished, reporting-container:reporting-reporting-container, button-icon:reporting-button-icon, uploader-button-icon:reporting-uploader-button-icon, sf-i-form-modal-container:reporting-sf-i-form-modal-container, next-calendar-date:reporting-next-calendar-date, last-calendar-date:reporting-last-calendar-date, input-publish-checkbox:reporting-input-publish-checkbox, button-icon-light:reporting-button-icon-light, button-icon-small:reporting-button-icon-small, uploader-input-label:reporting-uploader-input-label, input-radio:reporting-input-radio, radio-label:reporting-radio-label, input-textarea:reporting-input-textarea, input-date:reporting-input-date, input-select-single:reporting-input-select-single, textarea-container:reporting-textarea-container, section-body:reporting-section-body, section-container:reporting-section-container, date-container:reporting-date-container, input-sf-i-uploader:reporting-input-sf-i-uploader, published-container:reporting-published-container, selected-option:reporting-selected-option, input-select-multi-option:reporting-input-select-multi-option, select-option-label:reporting-select-option-label, input-sf-i-form:reporting-input-sf-i-form, input-sf-i-bricks:reporting-input-sf-i-bricks, uploader-input:reporting-uploader-input, form-container:reporting-form-container, published-container:reporting-published-container, form-container-published:reporting-form-container-published, subsection:reporting-subsection, results-title:reporting-results-title, td-head:reporting-td-head, td-action:reporting-td-action, td-body:reporting-td-body, td-body-2:reporting-td-body-2, add-button:reporting-add-button, uploader-button:reporting-uploader-button, section-head-collapsed:reporting-section-head-collapsed, section-title-expanded:reporting-section-title-expanded, section-title-collapsed:reporting-section-title-collapsed, section-head-expanded:reporting-section-head-expanded, progress-bar-finished:reporting-progress-bar-finished, progress-bar-complete:reporting-progress-bar-complete, progress-bar-incomplete:reporting-progress-bar-incomplete, section-success-icon:reporting-section-success-icon, section-body:reporting-section-body, title-section:reporting-title-section, button-lg:reporting-button-lg, uploader-detail-container:reporting-uploader-detail-container, textarea-label:reporting-textarea-label, date-label:reporting-date-label, commentbox:reporting-commentbox, comment-username:reporting-comment-username, detail-head:reporting-detail-head, reporting-uploader-extracted-text:reporting-reporting-uploader-extracted-text, reporting-uploader-sf-upload-message:reporting-reporting-uploader-sf-upload-message, reporting-uploader-sf-upload-submessage:reporting-reporting-uploader-sf-upload-submessage, reporting-uploader-extracted-text-chip:reporting-reporting-uploader-extracted-text-chip, reporting-uploader-extracted-text-chip-failed:reporting-reporting-uploader-extracted-text-chip-failed, reporting-uploader-doctype-verify-badge:reporting-reporting-uploader-doctype-verify-badge, reporting-span-submit-published:reporting-reporting-span-submit-published, reporting-span-submit-unpublished:reporting-reporting-span-submit-unpublished, reporting-reporting-container:reporting-reporting-reporting-container, reporting-button-icon:reporting-reporting-button-icon, reporting-uploader-button-icon:reporting-reporting-uploader-button-icon, reporting-sf-i-form-modal-container:reporting-reporting-sf-i-form-modal-container, reporting-next-calendar-date:reporting-reporting-next-calendar-date, reporting-last-calendar-date:reporting-reporting-last-calendar-date, reporting-input-publish-checkbox:reporting-reporting-input-publish-checkbox, reporting-button-icon-light:reporting-reporting-button-icon-light, reporting-button-icon-small:reporting-reporting-button-icon-small, reporting-uploader-input-label:reporting-reporting-uploader-input-label, reporting-input-radio:reporting-reporting-input-radio, reporting-radio-label:reporting-reporting-radio-label, reporting-input-textarea:reporting-reporting-input-textarea, reporting-input-date:reporting-reporting-input-date, reporting-input-select-single:reporting-reporting-input-select-single, reporting-textarea-container:reporting-reporting-textarea-container, reporting-section-body:reporting-reporting-section-body, reporting-section-container:reporting-reporting-section-container, reporting-date-container:reporting-reporting-date-container, reporting-input-sf-i-uploader:reporting-reporting-input-sf-i-uploader, reporting-published-container:reporting-reporting-published-container, reporting-selected-option:reporting-reporting-selected-option, reporting-input-select-multi-option:reporting-reporting-input-select-multi-option, reporting-select-option-label:reporting-reporting-select-option-label, reporting-input-sf-i-form:reporting-reporting-input-sf-i-form, reporting-input-sf-i-bricks:reporting-reporting-input-sf-i-bricks, reporting-uploader-input:reporting-reporting-uploader-input, reporting-form-container:reporting-reporting-form-container, reporting-published-container:reporting-reporting-published-container, reporting-form-container-published:reporting-reporting-form-container-published, reporting-subsection:reporting-reporting-subsection, reporting-results-title:reporting-reporting-results-title, reporting-td-head:reporting-reporting-td-head, reporting-td-action:reporting-reporting-td-action, reporting-td-body:reporting-reporting-td-body, reporting-td-body-2:reporting-reporting-td-body-2, reporting-add-button:reporting-reporting-add-button, reporting-uploader-button:reporting-reporting-uploader-button, reporting-section-head-collapsed:reporting-reporting-section-head-collapsed, reporting-section-title-expanded:reporting-reporting-section-title-expanded, reporting-section-title-collapsed:reporting-reporting-section-title-collapsed, reporting-section-head-expanded:reporting-reporting-section-head-expanded, reporting-progress-bar-finished:reporting-reporting-progress-bar-finished, reporting-progress-bar-complete:reporting-reporting-progress-bar-complete, reporting-progress-bar-incomplete:reporting-reporting-progress-bar-incomplete, reporting-section-success-icon:reporting-reporting-section-success-icon, reporting-section-body:reporting-reporting-section-body, reporting-title-section:reporting-reporting-title-section, reporting-button-lg:reporting-reporting-button-lg, reporting-uploader-detail-container:reporting-reporting-uploader-detail-container, reporting-textarea-label:reporting-reporting-textarea-label, reporting-date-label:reporting-reporting-date-label, reporting-commentbox:reporting-reporting-commentbox, reporting-comment-username:reporting-reporting-comment-username, reporting-detail-head:reporting-reporting-detail-head" name="Notice Details" apiiduploader="1peg5170d3" apiid="' + this.apiIdNotices + '" mode="admin" flow="details" projectid="' + this.projectId + '" projectname="' + this.projectName + '" editdisable="true" formviewclass="flex-wrap"></sf-i-reporting>';
 
     html += '<div part="reporting-view-container">'
       html += this.renderReporting(listEvent, mmddyyyy);
@@ -23433,9 +23522,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 +23651,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 +23698,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 +25240,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) {