sf-i-events 1.0.919 → 1.0.920

package/package.json

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

package/sf-i-events.js

@@ -850,7 +850,7 @@ let SfIEvents = class SfIEvents extends LitElement {
   
   `;
         this.AUTOSAVE_FLAG = true;
-        this.EXCLUDE_COLS_FROM_REGS = ["updatetype", "question", "invalidations", "activations", "alertschedule", "clientquestion", "countryname", "countryid", "entityname", "entityid", "locationname", "locationid", "reporters", "approvers", "timeframe", "responsedays", "execmodule", "functions", "shortid", "shortnumid", "countries", "tagsmap", "reportersmap", "approversmap", "functionheadsmap", "auditorsmap", "viewersmap", "approved", "documents", "comments", "lastupdated", "dateofcompletion", "mmdd", "completeness", "timeliness", "compliance", "delta", "triggers"];
+        this.EXCLUDE_COLS_FROM_REGS = ["updatetype", "question", "invalidations", "activations", "alertschedule", "clientquestion", "countryname", "countryid", "entityname", "entityid", "locationname", "locationid", "reporters", "approvers", "timeframe", "responsedays", "execmodule", "functions", "shortid", "shortnumid", "countries", "tagsmap", "reportersmap", "approversmap", "functionheadsmap", "auditorsmap", "viewersmap", "approved", "documents", "comments", "lastupdated", "dateofcompletion", "mmdd", "completeness", "timeliness", "compliance", "delta", "triggers", "lastmodifiedby", "lastmodifiedtime"];
         this.CHARTS_LIST_BY_MODULES = { "compliances": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "notices": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "contracts": ["compliance", "timeliness", "completeness", "location"], "licenses": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "rcmresources": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"] };
         this.chartSelectedLegend = [];
         this.selectedFilters = null;
@@ -5677,7 +5677,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             return [buttonSelectAll, buttonUnselectAll];
         };
         this.renderRegisterEvents = (events, meta = "", searchCountryIndex = -1, searchIndex = -1, searchVal = "") => {
-            var _a;
+            var _a, _b;
             var html = '';
             this.csvDataRegisters = '';
             let flagUpdateFilters = Object.keys(this.registerFilters).length == 0;
@@ -5701,6 +5701,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                 });
             }
             this.tablecols = [];
+            let linesCount = 0;
+            let searchFilterString = "";
             if (this.selectedCountryTab >= 0) {
                 const index = this.selectedCountryTab;
                 //console.log('indexclicked', index);
@@ -5708,6 +5710,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 //console.log('indexclicked', objCountry);
                 var html = '';
                 this.csvDataRegisters += '"ID",';
+                linesCount = 0;
                 for (var i = 0; i < Object.keys(objCountry).length; i++) {
                     const statute = Object.keys(objCountry)[i];
                     // this.csvDataRegisters += ('\n\n"' + statute + '"\n\n');
@@ -5725,8 +5728,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
                         this.csvDataRegisters += ('\n');
                     }
+                    else {
+                        continue;
+                    }
                     html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
-                    html += '<div class="d-flex align-end left-sticky">';
+                    html += '<div class="d-flex flex-col left-sticky">';
+                    html += '<div class="d-flex align-end">';
                     html += '<div class="title-item-date">';
                     html += '<label part="input-label">Search In Statute</label><br />';
                     html += '<input id="stream-search-statute-' + index + '-' + i + '" class="stream-search-statute" part="input" type="text" value="' + ((searchCountryIndex == index && searchIndex == i) ? searchVal : "") + '"/>';
@@ -5735,6 +5742,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                     html += '<button id="button-download-statute-' + index + '-' + i + '" part="button" class="button-download-statute d-flex justify-center align-center ml-10"><span class="material-symbols-outlined">download</span>&nbsp;&nbsp;<span>Export</span></button>';
                     html += '</div>';
                     html += '</div>';
+                    html += '<div id="filter-string" part="filter-string">Test String</div>';
+                    html += '</div>';
                     html += '<table>';
                     let tableBodyHtml = '';
                     for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
@@ -5757,6 +5766,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         if (compliance.hide != null && compliance.hide == true) {
                             continue;
                         }
+                        linesCount++;
                         this.csvDataRegisters += ('"' + complianceId + '",');
                         // html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
                         // html += '<table>';
@@ -5792,7 +5802,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 entities += entity.split(';')[0].replace(/\([^)]*\)/g, "") + ',';
                             }
                             entities = entities.slice(0, entities.length - 1);
-                            tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">entities</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + entities + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+                            tableBodyHtml += ('<td class="td-body" part="td-body-register"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + entities + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
                             if (!this.tablecols.includes('entities') && !this.EXCLUDE_COLS_FROM_REGS.includes('entities')) {
                                 this.tablecols.push('entities');
                             }
@@ -5810,7 +5820,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 locations += location.split(';')[0].replace(/\([^)]*\)/g, "") + ',';
                             }
                             locations = locations.slice(0, locations.length - 1);
-                            tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">locations</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + locations + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+                            tableBodyHtml += ('<td class="td-body" part="td-body-register"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + locations + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
                             if (!this.tablecols.includes('locations') && !this.EXCLUDE_COLS_FROM_REGS.includes('locations')) {
                                 this.tablecols.push('locations');
                             }
@@ -5831,19 +5841,30 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                     html += '<thead><tr>';
                     html += '<th class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important"></span></th>';
+                    searchFilterString = "";
                     for (let colName of this.tablecols) {
                         let allSelected = true;
                         for (let subfilterObj of Object.keys((_a = this.registerFilters[colName]) !== null && _a !== void 0 ? _a : {})) {
                             if (this.registerFilters[colName][subfilterObj] == false) {
                                 allSelected = false;
+                                for (let subfilterObjVal of Object.keys((_b = this.registerFilters[colName]) !== null && _b !== void 0 ? _b : {})) {
+                                    if (this.registerFilters[colName][subfilterObjVal] == true) {
+                                        if (searchFilterString == "") {
+                                            searchFilterString += subfilterObjVal;
+                                        }
+                                        else {
+                                            searchFilterString += ', ' + subfilterObjVal;
+                                        }
+                                    }
+                                }
                                 break;
                             }
                         }
-                        html += '<th class="td-body" part="td-body-register"><div class="d-flex align-start"><span part="' + (allSelected ? 'td-head' : 'td-head-selected') + '" style="padding-left: 0px !important">' + colName + '</span><div class="filter-button-container ml-10"><button part="' + (allSelected ? 'col-icon' : 'col-icon-selected') + '" id="filter-button-' + this.tablecols.indexOf(colName) + '" class="filter-button material-symbols-outlined">filter_list</button>';
+                        html += '<th class="td-body" part="td-body-register"><div class="d-flex align-start"><span part="' + (allSelected ? 'td-head' : 'td-head-selected') + '" style="' + (allSelected ? 'padding-left: 0px !important' : '') + '">' + colName + '</span><div class="filter-button-container ml-10"><button part="' + (allSelected ? 'col-icon' : 'col-icon-selected') + '" id="filter-button-' + this.tablecols.indexOf(colName) + '" class="filter-button material-symbols-outlined">filter_list</button>';
                         html += '<div id="filter-list-container-' + this.tablecols.indexOf(colName) + '" 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-${this.tablecols.indexOf(colName)}" class="filter-label-container d-flex justify-between align-center" part="filter-label-container"><div class="d-flex align-center"><input class="input-select-filter" type="checkbox" ${allSelected ? 'checked' : ''} id="input-select-filter-${this.tablecols.indexOf(colName)}-all" name="features" part="input-select-feature" value="all-${colName}"></input><label class="filter-label" part="filter-label" for="input-select-filter-${this.tablecols.indexOf(colName)}-all">All</label></div><button id="button-submit-filters-${this.tablecols.indexOf(colName)}" part="col-option-icon" class="button-submit-filters material-icons invisible">check</button></div>`;
                         for (let [index, filterKey] of Object.keys(this.registerFilters[colName]).entries()) {
-                            console.log('rendering filter', filterKey);
+                            // console.log('rendering filter', filterKey);
                             html += `<div class="filter-input-container d-flex justify-start align-start"><input class="input-select-filter" type="checkbox" ${this.registerFilters[colName][filterKey] == true ? 'checked' : ''} id="input-select-filter-${this.tablecols.indexOf(colName)}-${index}" name="features" part="input-select-feature" value="${filterKey}"></input><label for="input-select-filter-${this.tablecols.indexOf(colName)}-${index}" id="input-select-filter-label-${this.tablecols.indexOf(colName)}-${index}" class="input-select-filter-label"  part="input-select-feature-label">${filterKey}</label></div>`;
                         }
                         html += '</div></div></th>';
@@ -5856,8 +5877,25 @@ let SfIEvents = class SfIEvents extends LitElement {
                     // html += '</div>';
                 }
                 divRegisterList.innerHTML = html;
-                console.log('registerFilters', flagUpdateFilters, this.registerFilters);
+                console.log('registerFilters', flagUpdateFilters, this.registerFilters, html.indexOf('input-select-filter-0-0'));
                 // console.log('csvdataregisters', this.csvDataRegisters);
+                if (this.selectedRegisterIndex >= 0) {
+                    const divFilterString = this._SfRegisterContainer.querySelector('.calendar-right-data-register').querySelector('#filter-string');
+                    let filterString = "";
+                    if (searchVal != "" || searchFilterString != "") {
+                        filterString = linesCount + " result(s) when ";
+                        if (searchVal != "") {
+                            filterString += "searched by \"" + searchVal + "\"";
+                            if (searchFilterString != "") {
+                                filterString += ", filtered by \"" + searchFilterString + "\"";
+                            }
+                        }
+                        else if (searchFilterString != "") {
+                            filterString += "filtered by \"" + searchFilterString + "\"";
+                        }
+                    }
+                    divFilterString.innerHTML = filterString;
+                }
                 const arrButtonCountries = this._SfRegisterContainer.querySelector('.calendar-right-data-register').querySelectorAll('.button-icon-country');
                 for (i = 0; i < arrButtonCountries.length; i++) {
                     const button = Util.clearListeners(arrButtonCountries[i]);

package/src/sf-i-events.ts

@@ -858,7 +858,7 @@ export class SfIEvents extends LitElement {
 
   AUTOSAVE_FLAG = true;
 
-  EXCLUDE_COLS_FROM_REGS: Array<string> = ["updatetype", "question", "invalidations", "activations", "alertschedule", "clientquestion", "countryname", "countryid", "entityname", "entityid", "locationname", "locationid", "reporters", "approvers", "timeframe", "responsedays", "execmodule", "functions", "shortid", "shortnumid", "countries", "tagsmap", "reportersmap", "approversmap", "functionheadsmap", "auditorsmap", "viewersmap", "approved", "documents", "comments", "lastupdated", "dateofcompletion", "mmdd", "completeness", "timeliness", "compliance", "delta", "triggers"]
+  EXCLUDE_COLS_FROM_REGS: Array<string> = ["updatetype", "question", "invalidations", "activations", "alertschedule", "clientquestion", "countryname", "countryid", "entityname", "entityid", "locationname", "locationid", "reporters", "approvers", "timeframe", "responsedays", "execmodule", "functions", "shortid", "shortnumid", "countries", "tagsmap", "reportersmap", "approversmap", "functionheadsmap", "auditorsmap", "viewersmap", "approved", "documents", "comments", "lastupdated", "dateofcompletion", "mmdd", "completeness", "timeliness", "compliance", "delta", "triggers", "lastmodifiedby", "lastmodifiedtime"]
 
   CHARTS_LIST_BY_MODULES: { [key: string]: Array<string> } = { "compliances": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "notices": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "contracts": ["compliance", "timeliness", "completeness", "location"], "licenses": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"], "rcmresources": ["compliance", "timeliness", "completeness", "riskSeverity", "riskArea", "location", "function", "obligationType", "jurisdiction", "frequency", "subCategory"] };
 
@@ -8251,6 +8251,8 @@ export class SfIEvents extends LitElement {
       });
     }
     this.tablecols = []
+    let linesCount = 0;
+    let searchFilterString = ""
     if (this.selectedCountryTab >= 0) {
 
       const index = this.selectedCountryTab;
@@ -8261,6 +8263,7 @@ export class SfIEvents extends LitElement {
 
       var html = '';
       this.csvDataRegisters += '"ID",';
+      linesCount = 0
       for (var i = 0; i < Object.keys(objCountry).length; i++) {
 
         const statute = Object.keys(objCountry)[i];
@@ -8283,10 +8286,13 @@ export class SfIEvents extends LitElement {
           }
           this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
           this.csvDataRegisters += ('\n');
+        } else {
+          continue;
         }
         html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
 
-        html += '<div class="d-flex align-end left-sticky">';
+        html += '<div class="d-flex flex-col left-sticky">';
+        html += '<div class="d-flex align-end">'
         html += '<div class="title-item-date">';
         html += '<label part="input-label">Search In Statute</label><br />'
         html += '<input id="stream-search-statute-' + index + '-' + i + '" class="stream-search-statute" part="input" type="text" value="' + ((searchCountryIndex == index && searchIndex == i) ? searchVal : "") + '"/>'
@@ -8295,8 +8301,11 @@ export class SfIEvents extends LitElement {
         html += '<button id="button-download-statute-' + index + '-' + i + '" part="button" class="button-download-statute d-flex justify-center align-center ml-10"><span class="material-symbols-outlined">download</span>&nbsp;&nbsp;<span>Export</span></button>';
         html += '</div>';
         html += '</div>';
+        html += '<div id="filter-string" part="filter-string">Test String</div>'
+        html += '</div>';
         html += '<table>';
         let tableBodyHtml = ''
+
         for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
 
           const complianceId = Object.keys(objCountry[statute])[j];
@@ -8321,6 +8330,7 @@ export class SfIEvents extends LitElement {
           if (compliance.hide != null && compliance.hide == true) {
             continue;
           }
+          linesCount++
           this.csvDataRegisters += ('"' + complianceId + '",');
           // html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
           // html += '<table>';
@@ -8356,7 +8366,7 @@ export class SfIEvents extends LitElement {
               entities += entity.split(';')[0].replace(/\([^)]*\)/g, "") + ','
             }
             entities = entities.slice(0, entities.length - 1)
-            tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">entities</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + entities + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+            tableBodyHtml += ('<td class="td-body" part="td-body-register"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + entities + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
             if (!this.tablecols.includes('entities') && !this.EXCLUDE_COLS_FROM_REGS.includes('entities')) {
               this.tablecols.push('entities')
             }
@@ -8374,7 +8384,7 @@ export class SfIEvents extends LitElement {
               locations += location.split(';')[0].replace(/\([^)]*\)/g, "") + ','
             }
             locations = locations.slice(0, locations.length - 1)
-            tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">locations</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + locations + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+            tableBodyHtml += ('<td class="td-body" part="td-body-register"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + locations + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
             if (!this.tablecols.includes('locations') && !this.EXCLUDE_COLS_FROM_REGS.includes('locations')) {
               this.tablecols.push('locations')
             }
@@ -8395,21 +8405,30 @@ export class SfIEvents extends LitElement {
         }
         html += '<thead><tr>';
         html += '<th class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important"></span></th>'
-
+        searchFilterString = ""
         for (let colName of this.tablecols) {
           let allSelected = true;
           for (let subfilterObj of Object.keys(this.registerFilters[colName] ?? {})) {
             if (this.registerFilters[colName][subfilterObj] == false) {
               allSelected = false;
+              for (let subfilterObjVal of Object.keys(this.registerFilters[colName] ?? {})) {
+                if (this.registerFilters[colName][subfilterObjVal] == true) {
+                  if (searchFilterString == "") {
+                    searchFilterString += subfilterObjVal
+                  } else {
+                    searchFilterString += ', ' + subfilterObjVal
+                  }
+                }
+              }
               break;
             }
           }
 
-          html += '<th class="td-body" part="td-body-register"><div class="d-flex align-start"><span part="' + (allSelected ? 'td-head' : 'td-head-selected') + '" style="padding-left: 0px !important">' + colName + '</span><div class="filter-button-container ml-10"><button part="' + (allSelected ? 'col-icon' : 'col-icon-selected') + '" id="filter-button-' + this.tablecols.indexOf(colName) + '" class="filter-button material-symbols-outlined">filter_list</button>'
+          html += '<th class="td-body" part="td-body-register"><div class="d-flex align-start"><span part="' + (allSelected ? 'td-head' : 'td-head-selected') + '" style="' + (allSelected ? 'padding-left: 0px !important' : '') + '">' + colName + '</span><div class="filter-button-container ml-10"><button part="' + (allSelected ? 'col-icon' : 'col-icon-selected') + '" id="filter-button-' + this.tablecols.indexOf(colName) + '" class="filter-button material-symbols-outlined">filter_list</button>'
           html += '<div id="filter-list-container-' + this.tablecols.indexOf(colName) + '" 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-${this.tablecols.indexOf(colName)}" class="filter-label-container d-flex justify-between align-center" part="filter-label-container"><div class="d-flex align-center"><input class="input-select-filter" type="checkbox" ${allSelected ? 'checked' : ''} id="input-select-filter-${this.tablecols.indexOf(colName)}-all" name="features" part="input-select-feature" value="all-${colName}"></input><label class="filter-label" part="filter-label" for="input-select-filter-${this.tablecols.indexOf(colName)}-all">All</label></div><button id="button-submit-filters-${this.tablecols.indexOf(colName)}" part="col-option-icon" class="button-submit-filters material-icons invisible">check</button></div>`
           for (let [index, filterKey] of Object.keys(this.registerFilters[colName]).entries()) {
-            console.log('rendering filter', filterKey);
+            // console.log('rendering filter', filterKey);
             html += `<div class="filter-input-container d-flex justify-start align-start"><input class="input-select-filter" type="checkbox" ${this.registerFilters[colName][filterKey] == true ? 'checked' : ''} id="input-select-filter-${this.tablecols.indexOf(colName)}-${index}" name="features" part="input-select-feature" value="${filterKey}"></input><label for="input-select-filter-${this.tablecols.indexOf(colName)}-${index}" id="input-select-filter-label-${this.tablecols.indexOf(colName)}-${index}" class="input-select-filter-label"  part="input-select-feature-label">${filterKey}</label></div>`
           }
           html += '</div></div></th>'
@@ -8425,9 +8444,24 @@ export class SfIEvents extends LitElement {
       }
 
       divRegisterList!.innerHTML = html;
-      console.log('registerFilters', flagUpdateFilters, this.registerFilters);
+      console.log('registerFilters', flagUpdateFilters, this.registerFilters, html.indexOf('input-select-filter-0-0'));
       // console.log('csvdataregisters', this.csvDataRegisters);
-
+      if (this.selectedRegisterIndex >= 0) {
+        const divFilterString = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector('#filter-string') as HTMLDivElement
+        let filterString = ""
+        if (searchVal != "" || searchFilterString != "") {
+          filterString = linesCount + " result(s) when "
+          if (searchVal != "") {
+            filterString += "searched by \"" + searchVal + "\""
+            if (searchFilterString != "") {
+              filterString += ", filtered by \"" + searchFilterString + "\""
+            }
+          } else if (searchFilterString != "") {
+            filterString += "filtered by \"" + searchFilterString + "\""
+          }
+        }
+        divFilterString.innerHTML = filterString
+      }
       const arrButtonCountries = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.button-icon-country') as NodeListOf<HTMLButtonElement>;
 
       for (i = 0; i < arrButtonCountries.length; i++) {