sf-i-events 1.0.885 → 1.0.887

package/dev/index.html

@@ -699,7 +699,7 @@
   <!-- <sf-i-events projectid="a81b6ae1-98de-4b72-8cf0-9aaee5b61891" projectname="Khaitan" mode="onboarding" locations="{}" contractstartdate="01/01/2025" 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"
+  <!-- <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"
@@ -726,7 +726,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events>
+  </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="Precisionmed Functionhead" userprofileid="8b73b571-f993-49cf-96e1-bf84f628f26f" projectid="63d20443-b9cc-4a86-b39d-bf81c1c93ba5" projectname="PrecisionMed ABC" countryid="f443b70d-6609-42e0-b6a4-446bfa05d20a" myrole="viewer" showregisterexport="false" features="[]" 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">
@@ -757,7 +757,7 @@
         </div>
         
     </sf-i-events> -->
-  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  <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"
@@ -785,7 +785,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events> -->
+  </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"

package/package.json

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

package/sf-i-events.js

@@ -849,7 +849,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", "entities", "locations", "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"];
         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;
@@ -2888,7 +2888,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         };
         //(firstDay, endDay, 1, lastDay, true, 0, (firstDate.getMonth()), period, firstDate,"From " + firstDay.toLocaleDateString('en-IN') + " To " + endDay.toLocaleDateString('en-IN'), showBackgroundButton)
         this.renderEvents = (_firstDay, _endDay, iInit, iLast, showGraph, index, month, period, firstDate = null, parametersTitle, showBackgroundButton, fromDrilldown = false) => {
-            var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44;
+            var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45;
             var total = 0, notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0, inTime = 0, pastDueDate = 0, lateExecuted = 0, lateApproved = 0, lateReported = 0, scheduled = 0, partiallyComplied = 0, notComplied = 0, complied = 0, compliedWithGaps = 0, reportedNonCompliance = 0, active = 0, aboutToExpire = 0, expired = 0, terminated = 0;
             var html = '';
             this.selectedItemIds = [];
@@ -3058,14 +3058,14 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 csvValues += ('"' + ((((_p = ((_o = this.events[mmdd][j]["functionheads"]) !== null && _o !== void 0 ? _o : [])[0]) !== null && _p !== void 0 ? _p : "").split(';')[0] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + (((_u = (_t = (_s = (_r = (_q = this.events) === null || _q === void 0 ? void 0 : _q[mmdd]) === null || _r === void 0 ? void 0 : _r[j]) === null || _s === void 0 ? void 0 : _s.statute) === null || _t === void 0 ? void 0 : _t.state) !== null && _u !== void 0 ? _u : "") + '",'));
                                 csvValues += ('"' + (this.events[mmdd][j]["jurisdiction"] + '",'));
-                                csvValues += ('"' + ((_z = (_y = (_x = (_w = (_v = this.events) === null || _v === void 0 ? void 0 : _v[mmdd]) === null || _w === void 0 ? void 0 : _w[j]) === null || _x === void 0 ? void 0 : _x.complianceobj) === null || _y === void 0 ? void 0 : _y.category) !== null && _z !== void 0 ? _z : "" + '",'));
+                                csvValues += ('"' + (((_z = (_y = (_x = (_w = (_v = this.events) === null || _v === void 0 ? void 0 : _v[mmdd]) === null || _w === void 0 ? void 0 : _w[j]) === null || _x === void 0 ? void 0 : _x.complianceobj) === null || _y === void 0 ? void 0 : _y.category) !== null && _z !== void 0 ? _z : "") + '",'));
                                 csvValues += ('"' + (this.events[mmdd][j]["subcategory"] + '",'));
-                                csvValues += ('"' + (((_3 = (_2 = (_1 = (_0 = this.events) === null || _0 === void 0 ? void 0 : _0[mmdd]) === null || _1 === void 0 ? void 0 : _1[j]) === null || _2 === void 0 ? void 0 : _2.statute) === null || _3 === void 0 ? void 0 : _3.name) + '",'));
+                                csvValues += ('"' + (((_4 = (_3 = (_2 = (_1 = (_0 = this.events) === null || _0 === void 0 ? void 0 : _0[mmdd]) === null || _1 === void 0 ? void 0 : _1[j]) === null || _2 === void 0 ? void 0 : _2.statute) === null || _3 === void 0 ? void 0 : _3.name) !== null && _4 !== void 0 ? _4 : "") + '",'));
+                                csvValues += ('"' + ((this.events[mmdd][j]["obligationtype"] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["risk"] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["riskarea"] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["frequency"] + "").replace(/"/g, "") + '",'));
-                                csvValues += ('"' + ((((_8 = (_7 = (_6 = (_5 = (_4 = this.events) === null || _4 === void 0 ? void 0 : _4[mmdd]) === null || _5 === void 0 ? void 0 : _5[j]) === null || _6 === void 0 ? void 0 : _6.complianceobj) === null || _7 === void 0 ? void 0 : _7.subfrequency) !== null && _8 !== void 0 ? _8 : "") + "").replace(/"/g, "") + '",'));
-                                csvValues += ('"' + ((this.events[mmdd][j]["obligationtype"] + "").replace(/"/g, "") + '",'));
+                                csvValues += ('"' + ((((_9 = (_8 = (_7 = (_6 = (_5 = this.events) === null || _5 === void 0 ? void 0 : _5[mmdd]) === null || _6 === void 0 ? void 0 : _6[j]) === null || _7 === void 0 ? void 0 : _7.complianceobj) === null || _8 === void 0 ? void 0 : _8.subfrequency) !== null && _9 !== void 0 ? _9 : "") + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["duedate"] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + (this.renderStatusString(partStatus, lateStatus, complianceStatus) + '",'));
                                 csvValues += ('"' + (this.getGraphParam(this.events[mmdd][j]) + '"\n'));
@@ -3076,16 +3076,16 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (this.events[mmdd][j]["countryname"] + "").replace(/\((.*?)\)/g, "") + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (this.events[mmdd][j]["entityname"] + "").replace(/\((.*?)\)/g, "") + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (this.events[mmdd][j]["locationname"] + "").replace(/\((.*?)\)/g, "") + '</td>'
-                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + ((_13 = (_12 = (_11 = (_10 = (_9 = this.events) === null || _9 === void 0 ? void 0 : _9[mmdd]) === null || _10 === void 0 ? void 0 : _10[j]) === null || _11 === void 0 ? void 0 : _11.statute) === null || _12 === void 0 ? void 0 : _12.state) !== null && _13 !== void 0 ? _13 : "") + '</td>'
+                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + ((_14 = (_13 = (_12 = (_11 = (_10 = this.events) === null || _10 === void 0 ? void 0 : _10[mmdd]) === null || _11 === void 0 ? void 0 : _11[j]) === null || _12 === void 0 ? void 0 : _12.statute) === null || _13 === void 0 ? void 0 : _13.state) !== null && _14 !== void 0 ? _14 : "") + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["jurisdiction"] + '</td>'
-                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + ((_18 = (_17 = (_16 = (_15 = (_14 = this.events) === null || _14 === void 0 ? void 0 : _14[mmdd]) === null || _15 === void 0 ? void 0 : _15[j]) === null || _16 === void 0 ? void 0 : _16.complianceobj) === null || _17 === void 0 ? void 0 : _17.category) !== null && _18 !== void 0 ? _18 : "") + '</td>'
+                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + ((_19 = (_18 = (_17 = (_16 = (_15 = this.events) === null || _15 === void 0 ? void 0 : _15[mmdd]) === null || _16 === void 0 ? void 0 : _16[j]) === null || _17 === void 0 ? void 0 : _17.complianceobj) === null || _18 === void 0 ? void 0 : _18.category) !== null && _19 !== void 0 ? _19 : "") + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["subcategory"] + '</td>'
-                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + ((_23 = (_22 = (_21 = (_20 = (_19 = this.events) === null || _19 === void 0 ? void 0 : _19[mmdd]) === null || _20 === void 0 ? void 0 : _20[j]) === null || _21 === void 0 ? void 0 : _21.statute) === null || _22 === void 0 ? void 0 : _22.name) !== null && _23 !== void 0 ? _23 : "") + '</td>'
+                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + ((_24 = (_23 = (_22 = (_21 = (_20 = this.events) === null || _20 === void 0 ? void 0 : _20[mmdd]) === null || _21 === void 0 ? void 0 : _21[j]) === null || _22 === void 0 ? void 0 : _22.statute) === null || _23 === void 0 ? void 0 : _23.name) !== null && _24 !== void 0 ? _24 : "") + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["obligationtype"] + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["risk"] + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">' + this.events[mmdd][j]["riskarea"] + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["frequency"] + '</td>'
-                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (((_28 = (_27 = (_26 = (_25 = (_24 = this.events) === null || _24 === void 0 ? void 0 : _24[mmdd]) === null || _25 === void 0 ? void 0 : _25[j]) === null || _26 === void 0 ? void 0 : _26.complianceobj) === null || _27 === void 0 ? void 0 : _27.subfrequency) !== null && _28 !== void 0 ? _28 : "") + "").replace(/"/g, "") + '</td>'
+                                    + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + (((_29 = (_28 = (_27 = (_26 = (_25 = this.events) === null || _25 === void 0 ? void 0 : _25[mmdd]) === null || _26 === void 0 ? void 0 : _26[j]) === null || _27 === void 0 ? void 0 : _27.complianceobj) === null || _28 === void 0 ? void 0 : _28.subfrequency) !== null && _29 !== void 0 ? _29 : "") + "").replace(/"/g, "") + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin">' + this.events[mmdd][j]["duedate"] + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide text-center status-format">' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '</td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide status-format">' + this.getGraphParam(this.events[mmdd][j]) + '</td>'
@@ -3099,9 +3099,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 csvValues += ('"' + ((this.events[mmdd][j]["countryname"] + "").replace(/\((.*?)\)/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["entityname"] + "").replace(/\((.*?)\)/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["locationname"] + "").replace(/\((.*?)\)/g, "") + '",'));
-                                csvValues += ('"' + ((((_30 = ((_29 = this.events[mmdd][j]["reporters"]) !== null && _29 !== void 0 ? _29 : [])[0]) !== null && _30 !== void 0 ? _30 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
-                                csvValues += ('"' + ((((_32 = ((_31 = this.events[mmdd][j]["approvers"]) !== null && _31 !== void 0 ? _31 : [])[0]) !== null && _32 !== void 0 ? _32 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
-                                csvValues += ('"' + ((((_34 = ((_33 = this.events[mmdd][j]["functionheads"]) !== null && _33 !== void 0 ? _33 : [])[0]) !== null && _34 !== void 0 ? _34 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
+                                csvValues += ('"' + ((((_31 = ((_30 = this.events[mmdd][j]["reporters"]) !== null && _30 !== void 0 ? _30 : [])[0]) !== null && _31 !== void 0 ? _31 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
+                                csvValues += ('"' + ((((_33 = ((_32 = this.events[mmdd][j]["approvers"]) !== null && _32 !== void 0 ? _32 : [])[0]) !== null && _33 !== void 0 ? _33 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
+                                csvValues += ('"' + ((((_35 = ((_34 = this.events[mmdd][j]["functionheads"]) !== null && _34 !== void 0 ? _34 : [])[0]) !== null && _35 !== void 0 ? _35 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + (this.events[mmdd][j]["lastcheckeddate"] + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["duedate"] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["terminated"] ? "Yes" : "No").replace(/"/g, "") + '",'));
@@ -3127,10 +3127,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 csvValues += ('"' + ((this.events[mmdd][j]["countryname"] + "").replace(/\((.*?)\)/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["entityname"] + "").replace(/\((.*?)\)/g, "") + '",'));
                                 csvValues += ('"' + ((this.events[mmdd][j]["locationname"] + "").replace(/\((.*?)\)/g, "") + '",'));
-                                csvValues += ('"' + ((((_36 = ((_35 = this.events[mmdd][j]["functions"]) !== null && _35 !== void 0 ? _35 : [])[0]) !== null && _36 !== void 0 ? _36 : "").split(';')[0] + "").replace(/\((.*?)\)/g, "") + '",'));
-                                csvValues += ('"' + ((((_38 = ((_37 = this.events[mmdd][j]["reporters"]) !== null && _37 !== void 0 ? _37 : [])[0]) !== null && _38 !== void 0 ? _38 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
-                                csvValues += ('"' + ((((_40 = ((_39 = this.events[mmdd][j]["approvers"]) !== null && _39 !== void 0 ? _39 : [])[0]) !== null && _40 !== void 0 ? _40 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
-                                csvValues += ('"' + ((((_42 = ((_41 = this.events[mmdd][j]["functionheads"]) !== null && _41 !== void 0 ? _41 : [])[0]) !== null && _42 !== void 0 ? _42 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
+                                csvValues += ('"' + ((((_37 = ((_36 = this.events[mmdd][j]["functions"]) !== null && _36 !== void 0 ? _36 : [])[0]) !== null && _37 !== void 0 ? _37 : "").split(';')[0] + "").replace(/\((.*?)\)/g, "") + '",'));
+                                csvValues += ('"' + ((((_39 = ((_38 = this.events[mmdd][j]["reporters"]) !== null && _38 !== void 0 ? _38 : [])[0]) !== null && _39 !== void 0 ? _39 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
+                                csvValues += ('"' + ((((_41 = ((_40 = this.events[mmdd][j]["approvers"]) !== null && _40 !== void 0 ? _40 : [])[0]) !== null && _41 !== void 0 ? _41 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
+                                csvValues += ('"' + ((((_43 = ((_42 = this.events[mmdd][j]["functionheads"]) !== null && _42 !== void 0 ? _42 : [])[0]) !== null && _43 !== void 0 ? _43 : "").split(';')[0] + "").replace(/"/g, "") + '",'));
                                 csvValues += ('"' + (this.events[mmdd][j]["state"] + '",'));
                                 csvValues += ('"' + (this.events[mmdd][j]["jurisdiction"] + '",'));
                                 csvValues += ('"' + (this.events[mmdd][j]["category"] + '",'));
@@ -3199,7 +3199,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">');
-                                for (let document of (_43 = this.events[mmdd][j].contractdocuments) !== null && _43 !== void 0 ? _43 : []) {
+                                for (let document of (_44 = this.events[mmdd][j].contractdocuments) !== null && _44 !== void 0 ? _44 : []) {
                                     htmlSummaryValues += `<sf-i-uploader class="summary-report-doc" 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;]" prepopulatedInputArr="${JSON.stringify([{ "key": document.key, "ext": document.ext }]).replace(/"/g, '&quot;')}" projectid="${this.projectId} " extract="no" mode="view" maximize="yes" hidepreview="yes"></sf-i-uploader><br />`;
                                 }
                                 htmlSummaryValues += '</td></tr>';
@@ -3209,7 +3209,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
                                     + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">');
-                                for (let document of (_44 = this.events[mmdd][j].licensedocuments) !== null && _44 !== void 0 ? _44 : []) {
+                                for (let document of (_45 = this.events[mmdd][j].licensedocuments) !== null && _45 !== void 0 ? _45 : []) {
                                     htmlSummaryValues += `<sf-i-uploader class="summary-report-doc" 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;]" prepopulatedInputArr="${JSON.stringify([{ "key": document.key, "ext": document.ext }]).replace(/"/g, '&quot;')}" projectid="${this.projectId} " extract="no" mode="view" maximize="yes" hidepreview="yes"></sf-i-uploader><br />`;
                                 }
                                 htmlSummaryValues += '</td></tr>';
@@ -3779,6 +3779,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                         mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                         //console.log(entityId, locationId, eventId, mmddyyyy);
+                        let yearStr = this.getFinancialYear(mmddyyyy);
                         bulkBodyReview.push({
                             "mmddyyyy": mmddyyyy,
                             "projectid": this.projectId,
@@ -3791,7 +3792,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             "username": this.userName,
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
-                            "year": this.calendarStartYYYY,
+                            "year": yearStr,
                             "module": (_b = event.module) !== null && _b !== void 0 ? _b : "compliance"
                         });
                     }
@@ -3862,6 +3863,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                             //console.log(entityId, locationId, eventId, mmddyyyy);
+                            let yearStr = this.getFinancialYear(mmddyyyy);
                             bulkBodyReview.push({
                                 "mmddyyyy": mmddyyyy,
                                 "projectid": this.projectId,
@@ -3874,7 +3876,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "username": this.userName,
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
-                                "year": this.calendarStartYYYY,
+                                "year": yearStr,
                                 "module": (_b = event.module) !== null && _b !== void 0 ? _b : "compliance"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -4172,6 +4174,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         //   } )
                                                         //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
                                                         // }else{
+                                                        let yearStr = this.getFinancialYear(mmddyyyy);
                                                         bulkBody.push({
                                                             "mmddyyyy": mmddyyyy,
                                                             "projectid": this.projectId,
@@ -4189,7 +4192,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                             "reportformatschema": reportformatschema,
                                                             "userid": this.userProfileId,
                                                             "userrole": this.myRole,
-                                                            "year": this.calendarStartYYYY,
+                                                            "year": yearStr,
                                                             "module": (_f = event.module) !== null && _f !== void 0 ? _f : "compliance",
                                                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                                                         });
@@ -5468,14 +5471,22 @@ let SfIEvents = class SfIEvents extends LitElement {
                         this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
                         this.csvDataRegisters += ('\n');
                     }
+                    html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
+                    html += '<table>';
+                    let tablecols = [];
                     for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
                         const complianceId = Object.keys(objCountry[statute])[j];
                         const compliance = objCountry[statute][complianceId];
                         const data = JSON.parse(compliance.data);
                         const cols = JSON.parse(compliance.cols);
+                        for (let col of cols) {
+                            if (!tablecols.includes(col.toLowerCase()) && !this.EXCLUDE_COLS_FROM_REGS.includes(col.toLowerCase())) {
+                                tablecols.push(col);
+                            }
+                        }
                         this.csvDataRegisters += ('"' + complianceId + '",');
-                        html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
-                        html += '<table>';
+                        // html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
+                        // html += '<table>';
                         html += '<tr>';
                         html += ('<td class="td-body left-sticky" part="td-body-register"><button part="button-icon" id="button-icon-country-' + index + '-' + i + '-' + j + '" class="button-icon-country"><span class="material-symbols-outlined">open_in_new</span></button></td>');
                         html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">ID</span><br /><sf-i-elastic-text text="' + complianceId + '" minLength="10" lineSize="4"></sf-i-elastic-text></td>');
@@ -5486,13 +5497,33 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 // this.csvDataRegisters += ('",');
                             }
                         }
+                        if (compliance['entities'] != null && Array.isArray(compliance['entities'])) {
+                            let entities = '';
+                            for (let entity of compliance['entities']) {
+                                entities += entity.split(';')[0].replace(/\([^)]*\)/g, "") + ',';
+                            }
+                            entities = entities.slice(0, entities.length - 1);
+                            html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">entities</span><br /><sf-i-elastic-text text="' + entities + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+                            // this.csvDataRegisters += ('"' + (data[k] + "").replace(/"/g, '') + '",');
+                        }
+                        if (compliance['locations'] != null && Array.isArray(compliance['locations'])) {
+                            let locations = '';
+                            for (let location of compliance['locations']) {
+                                locations += location.split(';')[0].replace(/\([^)]*\)/g, "") + ',';
+                            }
+                            locations = locations.slice(0, locations.length - 1);
+                            html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">locations</span><br /><sf-i-elastic-text text="' + locations + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+                            // this.csvDataRegisters += ('"' + (data[k] + "").replace(/"/g, '') + '",');
+                        }
                         this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
                         this.csvDataRegisters += ('\n');
                         console.log('enter');
                         html += '</tr>';
-                        html += '</table>';
-                        html += '</div>';
+                        // html += '</table>';
+                        // html += '</div>';
                     }
+                    html += '</table>';
+                    html += '</div>';
                     //   html += '</table>';
                     // html += '</div>';
                 }
@@ -9443,12 +9474,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                 filterString = `${filter} - ${filtervalue}`;
             }
             else if (filter == "function") {
-                await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, this.countryId, this.locationId, filterid, this.functionId);
+                await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, "", "", filterid, this.functionId);
                 // filterString = `tagid="${filterid}" selectedcriteria="Tag - ${filtervalue}"`;
                 filterString = `Function - ${filtervalue}`;
             }
             else if (filter == "location") {
-                await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, this.countryId, filterid, this.tagId, this.functionId);
+                await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, "", filterid, this.tagId, this.functionId);
                 // filterString = `locationid="${filterid}" selectedcriteria="Location - ${filtervalue}"`;
                 filterString = `Location - ${filtervalue}`;
             }
@@ -9886,6 +9917,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                             //console.log(entityId, locationId, eventId, mmddyyyy);
+                            let yearStr = this.getFinancialYear(mmddyyyy);
                             bulkBodyReview.push({
                                 "mmddyyyy": mmddyyyy,
                                 "projectid": this.projectId,
@@ -9898,7 +9930,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "username": this.userName,
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
-                                "year": this.calendarStartYYYY,
+                                "year": yearStr,
                                 "module": (_b = listEvent.module) !== null && _b !== void 0 ? _b : "compliance"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -10227,6 +10259,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         //   } )
                                                         //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
                                                         // }else{
+                                                        let yearStr = this.getFinancialYear(mmddyyyy);
                                                         bulkBody.push({
                                                             "mmddyyyy": mmddyyyy,
                                                             "projectid": this.projectId,
@@ -10244,7 +10277,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                             "reportformatschema": reportformatschema,
                                                             "userid": this.userProfileId,
                                                             "userrole": this.myRole,
-                                                            "year": this.calendarStartYYYY,
+                                                            "year": yearStr,
                                                             "module": (_c = listEvent.module) !== null && _c !== void 0 ? _c : "compliance",
                                                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                                                         });
@@ -10674,6 +10707,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                             //console.log(entityId, locationId, eventId, mmddyyyy);
+                            let yearStr = this.getFinancialYear(mmddyyyy);
                             bulkBodyReview.push({
                                 "mmddyyyy": mmddyyyy,
                                 "projectid": this.projectId,
@@ -10686,7 +10720,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "username": this.userName,
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
-                                "year": this.calendarStartYYYY,
+                                "year": yearStr,
                                 "module": (_f = listEvent.module) !== null && _f !== void 0 ? _f : "compliance"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -11016,6 +11050,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                             //   } )
                                             //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
                                             // }else{
+                                            let yearStr = this.getFinancialYear(mmddyyyy);
                                             bulkBody.push({
                                                 "mmddyyyy": mmddyyyy,
                                                 "projectid": this.projectId,
@@ -11033,7 +11068,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 "reportformatschema": reportformatschema,
                                                 "userid": this.userProfileId,
                                                 "userrole": this.myRole,
-                                                "year": this.calendarStartYYYY,
+                                                "year": yearStr,
                                                 "module": (_f = listEvent.module) !== null && _f !== void 0 ? _f : "compliance",
                                                 "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                                             });
@@ -11464,6 +11499,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                             //console.log(entityId, locationId, eventId, mmddyyyy);
+                            let yearStr = this.getFinancialYear(mmddyyyy);
                             bulkBodyReview.push({
                                 "mmddyyyy": mmddyyyy,
                                 "projectid": this.projectId,
@@ -11476,7 +11512,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "username": this.userName,
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
-                                "year": this.calendarStartYYYY,
+                                "year": yearStr,
                                 "module": (_f = listEvent.module) !== null && _f !== void 0 ? _f : "compliance"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -11806,6 +11842,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                             //   } )
                                             //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
                                             // }else{
+                                            let yearStr = this.getFinancialYear(mmddyyyy);
                                             bulkBody.push({
                                                 "mmddyyyy": mmddyyyy,
                                                 "projectid": this.projectId,
@@ -11823,7 +11860,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 "reportformatschema": reportformatschema,
                                                 "userid": this.userProfileId,
                                                 "userrole": this.myRole,
-                                                "year": this.calendarStartYYYY,
+                                                "year": yearStr,
                                                 "module": (_f = listEvent.module) !== null && _f !== void 0 ? _f : "compliance",
                                                 "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                                             });
@@ -12254,6 +12291,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                             //console.log(entityId, locationId, eventId, mmddyyyy);
+                            let yearStr = this.getFinancialYear(mmddyyyy);
                             bulkBodyReview.push({
                                 "mmddyyyy": mmddyyyy,
                                 "projectid": this.projectId,
@@ -12266,7 +12304,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "username": this.userName,
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
-                                "year": this.calendarStartYYYY,
+                                "year": yearStr,
                                 "module": (_f = listEvent.module) !== null && _f !== void 0 ? _f : "compliance"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -12596,6 +12634,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                             //   } )
                                             //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
                                             // }else{
+                                            let yearStr = this.getFinancialYear(mmddyyyy);
                                             bulkBody.push({
                                                 "mmddyyyy": mmddyyyy,
                                                 "projectid": this.projectId,
@@ -12613,7 +12652,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 "reportformatschema": reportformatschema,
                                                 "userid": this.userProfileId,
                                                 "userrole": this.myRole,
-                                                "year": this.calendarStartYYYY,
+                                                "year": yearStr,
                                                 "module": (_f = listEvent.module) !== null && _f !== void 0 ? _f : "compliance",
                                                 "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                                             });
@@ -13186,6 +13225,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                         mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                         //console.log(entityId, locationId, eventId, mmddyyyy);
+                        let yearStr = this.getFinancialYear(mmddyyyy);
                         bulkBodyReview.push({
                             "mmddyyyy": mmddyyyy,
                             "projectid": this.projectId,
@@ -13198,7 +13238,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             "username": this.userName,
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
-                            "year": this.calendarStartYYYY,
+                            "year": yearStr,
                             "module": (_b = event.module) !== null && _b !== void 0 ? _b : "compliance"
                         });
                     }
@@ -13405,6 +13445,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             const eventId = selectedId.split('-')[9].replace(/_/g, '-');
                             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
                             //console.log(entityId, locationId, eventId, mmddyyyy);
+                            let yearStr = this.getFinancialYear(mmddyyyy);
                             bulkBodyReview.push({
                                 "mmddyyyy": mmddyyyy,
                                 "projectid": this.projectId,
@@ -13417,7 +13458,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "username": this.userName,
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
-                                "year": this.calendarStartYYYY,
+                                "year": yearStr,
                                 "module": (_b = event.module) !== null && _b !== void 0 ? _b : "compliance"
                             });
                             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -13764,6 +13805,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         //   } )
                                                         //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
                                                         // }else{
+                                                        let yearStr = this.getFinancialYear(mmddyyyy);
                                                         bulkBody.push({
                                                             "mmddyyyy": mmddyyyy,
                                                             "projectid": this.projectId,
@@ -13781,7 +13823,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                             "reportformatschema": reportformatschema,
                                                             "userid": this.userProfileId,
                                                             "userrole": this.myRole,
-                                                            "year": this.calendarStartYYYY,
+                                                            "year": yearStr,
                                                             "module": (_f = event.module) !== null && _f !== void 0 ? _f : "compliance",
                                                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                                                         });
@@ -20401,6 +20443,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         };
         this.uploadReport = async (entityId, locationId, mmddyyyy, eventid, comments, doc, docs, event, reportformatvalues = "", reportformatschema = "", module = "compliance", percentage = "100", makercheckers) => {
             let url = "https://" + this.apiId + "/uploadreport1";
+            let yearStr = this.getFinancialYear(mmddyyyy);
             let body = {
                 "mmddyyyy": mmddyyyy,
                 "projectid": this.projectId,
@@ -20418,7 +20461,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 "reportformatschema": reportformatschema,
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
-                "year": this.calendarStartYYYY,
+                "year": yearStr,
                 "module": module,
                 "makercheckers": makercheckers
             };
@@ -21729,25 +21772,33 @@ let SfIEvents = class SfIEvents extends LitElement {
         };
         this.fetchOnlyYearlyUserCalendar = async (startDate = "", endDate = "", searchString = "", list = "yes", month = "00", year = this.calendarStartYYYY, userprofileid = this.userProfileId, userrole = this.myRole, entityid = this.entityId, countryid = this.countryId, locationid = this.locationId, tagid = this.tagId, functionid = this.functionId) => {
             let path = "", view = "";
-            if (this.tagId != null && this.tagId != "") {
+            if (tagid != null && tagid != "") {
                 view = "tag";
             }
-            else if (this.countryId != null && this.countryId != "") {
-                view = "country";
+            else if (countryid != null && countryid != "") {
+                view = "tag";
             }
-            else if (this.locationId != null && this.locationId != "") {
-                view = "location";
+            else if (locationid != null && locationid != "") {
+                view = "tag";
             }
             else {
                 view = "entity";
             }
             path = "getallcountryevents";
             let url = "https://" + this.apiId + "/" + path;
+            let temptagid = tagid;
+            if (temptagid == "" && locationid != "") {
+                temptagid = locationid;
+            }
+            else if (temptagid == "" && userprofileid != this.userProfileId) {
+                temptagid = "allevents";
+            }
             //console.log('fetch calendar url', url);
-            let urlBody = { "projectid": this.projectId, "userprofileid": userprofileid, "role": userrole, "entityid": entityid, "countryid": countryid, "functionid": functionid, "locationid": locationid, "tagid": tagid, "adhoc": "false", "exclusivestartkey": 0, "sdate": startDate, "edate": endDate, "view": view, "year": year, "list": list, "month": month };
+            let urlBody = { "projectid": this.projectId, "userprofileid": userprofileid, "role": userrole, "entityid": entityid, "countryid": countryid, "functionid": functionid, "locationid": "", "tagid": temptagid, "adhoc": "false", "exclusivestartkey": 0, "sdate": startDate, "edate": endDate, "view": view, "year": year, "list": list, "month": month };
             if (searchString.length > 0) {
                 urlBody["searchstring"] = searchString;
             }
+            console.log('fetchOnlyYearlyUserCalendar', `TagId:${this.tagId}, CountryId:${this.countryId}, LocationId:${this.locationId}, EntityId:${this.entityId}, FunctionId:${this.functionId}, View:${view}, urlBody:`, urlBody);
             const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
             const xhr = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing'));
             this._SfLoader.innerHTML = '';

package/src/sf-i-events.ts

@@ -857,7 +857,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", "entities", "locations", "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"]
 
   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"] };
 
@@ -5327,14 +5327,14 @@ export class SfIEvents extends LitElement {
               csvValues += ('"' + ((((this.events[mmdd][j]["functionheads"] ?? [])[0] ?? "").split(';')[0] + "").replace(/"/g, "") + '",'));
               csvValues += ('"' + ((this.events?.[mmdd]?.[j]?.statute?.state ?? "") + '",'));
               csvValues += ('"' + (this.events[mmdd][j]["jurisdiction"] + '",'));
-              csvValues += ('"' + (this.events?.[mmdd]?.[j]?.complianceobj?.category ?? "" + '",'));
+              csvValues += ('"' + ((this.events?.[mmdd]?.[j]?.complianceobj?.category ?? "") + '",'));
               csvValues += ('"' + (this.events[mmdd][j]["subcategory"] + '",'));
-              csvValues += ('"' + (this.events?.[mmdd]?.[j]?.statute?.name + '",'));
+              csvValues += ('"' + ((this.events?.[mmdd]?.[j]?.statute?.name ?? "") + '",'));
+              csvValues += ('"' + ((this.events[mmdd][j]["obligationtype"] + "").replace(/"/g, "") + '",'));
               csvValues += ('"' + ((this.events[mmdd][j]["risk"] + "").replace(/"/g, "") + '",'));
               csvValues += ('"' + ((this.events[mmdd][j]["riskarea"] + "").replace(/"/g, "") + '",'));
               csvValues += ('"' + ((this.events[mmdd][j]["frequency"] + "").replace(/"/g, "") + '",'));
               csvValues += ('"' + (((this.events?.[mmdd]?.[j]?.complianceobj?.subfrequency ?? "") + "").replace(/"/g, "") + '",'));
-              csvValues += ('"' + ((this.events[mmdd][j]["obligationtype"] + "").replace(/"/g, "") + '",'));
               csvValues += ('"' + ((this.events[mmdd][j]["duedate"] + "").replace(/"/g, "") + '",'));
               csvValues += ('"' + (this.renderStatusString(partStatus, lateStatus, complianceStatus) + '",'));
               csvValues += ('"' + (this.getGraphParam(this.events[mmdd][j]) + '"\n'));
@@ -6132,6 +6132,7 @@ export class SfIEvents extends LitElement {
           mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
           //console.log(entityId, locationId, eventId, mmddyyyy);
+          let yearStr = this.getFinancialYear(mmddyyyy)
           bulkBodyReview.push({
             "mmddyyyy": mmddyyyy,
             "projectid": this.projectId,
@@ -6144,7 +6145,7 @@ export class SfIEvents extends LitElement {
             "username": this.userName,
             "userid": this.userProfileId,
             "userrole": this.myRole,
-            "year": this.calendarStartYYYY,
+            "year": yearStr,
             "module": event.module ?? "compliance"
           })
         }
@@ -6216,6 +6217,7 @@ export class SfIEvents extends LitElement {
             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
             //console.log(entityId, locationId, eventId, mmddyyyy);
+            let yearStr = this.getFinancialYear(mmddyyyy)
             bulkBodyReview.push({
               "mmddyyyy": mmddyyyy,
               "projectid": this.projectId,
@@ -6228,7 +6230,7 @@ export class SfIEvents extends LitElement {
               "username": this.userName,
               "userid": this.userProfileId,
               "userrole": this.myRole,
-              "year": this.calendarStartYYYY,
+              "year": yearStr,
               "module": event.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -6566,6 +6568,7 @@ export class SfIEvents extends LitElement {
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
                           // }else{
+                          let yearStr = this.getFinancialYear(mmddyyyy)
                           bulkBody.push({
                             "mmddyyyy": mmddyyyy,
                             "projectid": this.projectId,
@@ -6583,7 +6586,7 @@ export class SfIEvents extends LitElement {
                             "reportformatschema": reportformatschema,
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
-                            "year": this.calendarStartYYYY,
+                            "year": yearStr,
                             "module": event.module ?? "compliance",
                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                           })
@@ -8031,15 +8034,22 @@ export class SfIEvents extends LitElement {
           this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
           this.csvDataRegisters += ('\n');
         }
-
+        html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
+          html += '<table>';
+      let tablecols: string[] = []
         for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
           const complianceId = Object.keys(objCountry[statute])[j];
           const compliance = objCountry[statute][complianceId];
           const data = JSON.parse(compliance.data);
           const cols = JSON.parse(compliance.cols);
+          for(let col of cols){
+            if(!tablecols.includes(col.toLowerCase()) && !this.EXCLUDE_COLS_FROM_REGS.includes(col.toLowerCase())){
+              tablecols.push(col)
+            }
+          }
           this.csvDataRegisters += ('"' + complianceId + '",');
-          html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
-          html += '<table>';
+          // html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
+          // html += '<table>';
           html += '<tr>';
           html += ('<td class="td-body left-sticky" part="td-body-register"><button part="button-icon" id="button-icon-country-' + index + '-' + i + '-' + j + '" class="button-icon-country"><span class="material-symbols-outlined">open_in_new</span></button></td>');
           html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">ID</span><br /><sf-i-elastic-text text="' + complianceId + '" minLength="10" lineSize="4"></sf-i-elastic-text></td>');
@@ -8050,13 +8060,33 @@ export class SfIEvents extends LitElement {
               // this.csvDataRegisters += ('",');
             }
           }
+          if(compliance['entities'] != null && Array.isArray(compliance['entities'])){
+            let entities = '';
+            for(let entity of compliance['entities']){
+              entities += entity.split(';')[0].replace(/\([^)]*\)/g, "") + ','
+            }
+            entities = entities.slice(0, entities.length - 1)
+            html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">entities</span><br /><sf-i-elastic-text text="' + entities + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+              // this.csvDataRegisters += ('"' + (data[k] + "").replace(/"/g, '') + '",');
+          }
+          if(compliance['locations'] != null && Array.isArray(compliance['locations'])){
+            let locations = '';
+            for(let location of compliance['locations']){
+              locations += location.split(';')[0].replace(/\([^)]*\)/g, "") + ','
+            }
+            locations = locations.slice(0, locations.length - 1)
+            html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">locations</span><br /><sf-i-elastic-text text="' + locations + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+              // this.csvDataRegisters += ('"' + (data[k] + "").replace(/"/g, '') + '",');
+          }
           this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
           this.csvDataRegisters += ('\n');
           console.log('enter');
           html += '</tr>';
-          html += '</table>';
-          html += '</div>';
+          // html += '</table>';
+          // html += '</div>';
         }
+        html += '</table>';
+          html += '</div>';
 
         //   html += '</table>';
         // html += '</div>';
@@ -12893,6 +12923,7 @@ export class SfIEvents extends LitElement {
     // let username = this.userName;
     let filterString = `countryid="${this.countryId}" locationid="${this.locationId}" entityid="${this.entityId}" tagid="${this.tagId}" selectedcriteria="${this.selectedCriteria}"`;
     let rolestr = "viewer"
+    ;
     if (filter == "reporter" || filter == "approver" || filter == "functionhead") {
       userid = filterid;
       // username = filtervalue;
@@ -12900,11 +12931,11 @@ export class SfIEvents extends LitElement {
       await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, userid, rolestr, this.entityId, this.countryId, this.locationId, this.tagId, this.functionId);
       filterString = `${filter} - ${filtervalue}`;
     } else if (filter == "function") {
-      await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, this.countryId, this.locationId, filterid, this.functionId);
+      await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, "", "", filterid, this.functionId);
       // filterString = `tagid="${filterid}" selectedcriteria="Tag - ${filtervalue}"`;
       filterString = `Function - ${filtervalue}`;
     } else if (filter == "location") {
-      await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, this.countryId, filterid, this.tagId, this.functionId);
+      await this.fetchOnlyYearlyUserCalendar(this.sdate, this.edate, "", "yes", "00", this.calendarStartYYYY, this.userProfileId, rolestr, this.entityId, "", filterid, this.tagId, this.functionId);
       // filterString = `locationid="${filterid}" selectedcriteria="Location - ${filtervalue}"`;
       filterString = `Location - ${filtervalue}`;
     }
@@ -13436,6 +13467,7 @@ export class SfIEvents extends LitElement {
             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
             //console.log(entityId, locationId, eventId, mmddyyyy);
+            let yearStr = this.getFinancialYear(mmddyyyy)
             bulkBodyReview.push({
               "mmddyyyy": mmddyyyy,
               "projectid": this.projectId,
@@ -13448,7 +13480,7 @@ export class SfIEvents extends LitElement {
               "username": this.userName,
               "userid": this.userProfileId,
               "userrole": this.myRole,
-              "year": this.calendarStartYYYY,
+              "year": yearStr,
               "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -13823,6 +13855,7 @@ export class SfIEvents extends LitElement {
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
                           // }else{
+                          let yearStr = this.getFinancialYear(mmddyyyy)
                           bulkBody.push({
                             "mmddyyyy": mmddyyyy,
                             "projectid": this.projectId,
@@ -13840,7 +13873,7 @@ export class SfIEvents extends LitElement {
                             "reportformatschema": reportformatschema,
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
-                            "year": this.calendarStartYYYY,
+                            "year": yearStr,
                             "module": listEvent.module ?? "compliance",
                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                           })
@@ -14324,6 +14357,7 @@ export class SfIEvents extends LitElement {
             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
             //console.log(entityId, locationId, eventId, mmddyyyy);
+            let yearStr = this.getFinancialYear(mmddyyyy)
             bulkBodyReview.push({
               "mmddyyyy": mmddyyyy,
               "projectid": this.projectId,
@@ -14336,7 +14370,7 @@ export class SfIEvents extends LitElement {
               "username": this.userName,
               "userid": this.userProfileId,
               "userrole": this.myRole,
-              "year": this.calendarStartYYYY,
+              "year": yearStr,
               "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -14716,6 +14750,7 @@ export class SfIEvents extends LitElement {
                     //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
                     // }else{
+                    let yearStr = this.getFinancialYear(mmddyyyy)
                     bulkBody.push({
                       "mmddyyyy": mmddyyyy,
                       "projectid": this.projectId,
@@ -14733,7 +14768,7 @@ export class SfIEvents extends LitElement {
                       "reportformatschema": reportformatschema,
                       "userid": this.userProfileId,
                       "userrole": this.myRole,
-                      "year": this.calendarStartYYYY,
+                      "year": yearStr,
                       "module": listEvent.module ?? "compliance",
                       "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                     })
@@ -15219,6 +15254,7 @@ export class SfIEvents extends LitElement {
             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
             //console.log(entityId, locationId, eventId, mmddyyyy);
+            let yearStr = this.getFinancialYear(mmddyyyy)
             bulkBodyReview.push({
               "mmddyyyy": mmddyyyy,
               "projectid": this.projectId,
@@ -15231,7 +15267,7 @@ export class SfIEvents extends LitElement {
               "username": this.userName,
               "userid": this.userProfileId,
               "userrole": this.myRole,
-              "year": this.calendarStartYYYY,
+              "year": yearStr,
               "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -15611,6 +15647,7 @@ export class SfIEvents extends LitElement {
                     //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
                     // }else{
+                    let yearStr = this.getFinancialYear(mmddyyyy)
                     bulkBody.push({
                       "mmddyyyy": mmddyyyy,
                       "projectid": this.projectId,
@@ -15628,7 +15665,7 @@ export class SfIEvents extends LitElement {
                       "reportformatschema": reportformatschema,
                       "userid": this.userProfileId,
                       "userrole": this.myRole,
-                      "year": this.calendarStartYYYY,
+                      "year": yearStr,
                       "module": listEvent.module ?? "compliance",
                       "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                     })
@@ -16114,6 +16151,7 @@ export class SfIEvents extends LitElement {
             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
             //console.log(entityId, locationId, eventId, mmddyyyy);
+            let yearStr = this.getFinancialYear(mmddyyyy)
             bulkBodyReview.push({
               "mmddyyyy": mmddyyyy,
               "projectid": this.projectId,
@@ -16126,7 +16164,7 @@ export class SfIEvents extends LitElement {
               "username": this.userName,
               "userid": this.userProfileId,
               "userrole": this.myRole,
-              "year": this.calendarStartYYYY,
+              "year": yearStr,
               "module": listEvent.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -16506,6 +16544,7 @@ export class SfIEvents extends LitElement {
                     //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
                     // }else{
+                    let yearStr = this.getFinancialYear(mmddyyyy)
                     bulkBody.push({
                       "mmddyyyy": mmddyyyy,
                       "projectid": this.projectId,
@@ -16523,7 +16562,7 @@ export class SfIEvents extends LitElement {
                       "reportformatschema": reportformatschema,
                       "userid": this.userProfileId,
                       "userrole": this.myRole,
-                      "year": this.calendarStartYYYY,
+                      "year": yearStr,
                       "module": listEvent.module ?? "compliance",
                       "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                     })
@@ -17204,6 +17243,7 @@ export class SfIEvents extends LitElement {
           mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
           //console.log(entityId, locationId, eventId, mmddyyyy);
+          let yearStr = this.getFinancialYear(mmddyyyy)
           bulkBodyReview.push({
             "mmddyyyy": mmddyyyy,
             "projectid": this.projectId,
@@ -17216,7 +17256,7 @@ export class SfIEvents extends LitElement {
             "username": this.userName,
             "userid": this.userProfileId,
             "userrole": this.myRole,
-            "year": this.calendarStartYYYY,
+            "year": yearStr,
             "module": event.module ?? "compliance"
           })
         }
@@ -17469,6 +17509,7 @@ export class SfIEvents extends LitElement {
             mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
             //console.log(entityId, locationId, eventId, mmddyyyy);
+            let yearStr = this.getFinancialYear(mmddyyyy)
             bulkBodyReview.push({
               "mmddyyyy": mmddyyyy,
               "projectid": this.projectId,
@@ -17481,7 +17522,7 @@ export class SfIEvents extends LitElement {
               "username": this.userName,
               "userid": this.userProfileId,
               "userrole": this.myRole,
-              "year": this.calendarStartYYYY,
+              "year": yearStr,
               "module": event.module ?? "compliance"
             })
             // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, comments, approved)
@@ -17872,6 +17913,7 @@ export class SfIEvents extends LitElement {
                           //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
 
                           // }else{
+                          let yearStr = this.getFinancialYear(mmddyyyy)
                           bulkBody.push({
                             "mmddyyyy": mmddyyyy,
                             "projectid": this.projectId,
@@ -17889,7 +17931,7 @@ export class SfIEvents extends LitElement {
                             "reportformatschema": reportformatschema,
                             "userid": this.userProfileId,
                             "userrole": this.myRole,
-                            "year": this.calendarStartYYYY,
+                            "year": yearStr,
                             "module": event.module ?? "compliance",
                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                           })
@@ -26215,7 +26257,7 @@ export class SfIEvents extends LitElement {
 
   uploadReport = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string = "", reportformatschema: string = "", module: string = "compliance", percentage: string = "100", makercheckers: any) => {
     let url = "https://" + this.apiId + "/uploadreport1";
-
+    let yearStr = this.getFinancialYear(mmddyyyy)
     let body = {
       "mmddyyyy": mmddyyyy,
       "projectid": this.projectId,
@@ -26233,7 +26275,7 @@ export class SfIEvents extends LitElement {
       "reportformatschema": reportformatschema,
       "userid": this.userProfileId,
       "userrole": this.myRole,
-      "year": this.calendarStartYYYY,
+      "year": yearStr,
       "module": module,
       "makercheckers": makercheckers
     }
@@ -27955,27 +27997,33 @@ export class SfIEvents extends LitElement {
   fetchOnlyYearlyUserCalendar = async (startDate: string = "", endDate: string = "", searchString: string = "", list: string = "yes", month: string = "00", year: string = this.calendarStartYYYY, userprofileid: string = this.userProfileId, userrole: string = this.myRole, entityid = this.entityId, countryid = this.countryId, locationid = this.locationId, tagid = this.tagId, functionid = this.functionId) => {
 
     let path = "", view = "";
-    if (this.tagId != null && this.tagId != "") {
+    if (tagid != null && tagid != "") {
+      view = "tag";
+    } else if (countryid != null && countryid != "") {
+      view = "tag";
+    } else if (locationid != null && locationid != "") {
       view = "tag";
-    } else if (this.countryId != null && this.countryId != "") {
-      view = "country";
-    } else if (this.locationId != null && this.locationId != "") {
-      view = "location";
     } else {
       view = "entity";
     }
-
+    
     path = "getallcountryevents";
 
     let url = "https://" + this.apiId + "/" + path;
-
+    let temptagid = tagid;
+    if(temptagid == "" && locationid != "") {
+      temptagid = locationid
+    }else if(temptagid == "" && userprofileid != this.userProfileId) {
+      temptagid = "allevents"
+    }
     //console.log('fetch calendar url', url);
-    let urlBody: any = { "projectid": this.projectId, "userprofileid": userprofileid, "role": userrole, "entityid": entityid, "countryid": countryid, "functionid": functionid, "locationid": locationid, "tagid": tagid, "adhoc": "false", "exclusivestartkey": 0, "sdate": startDate, "edate": endDate, "view": view, "year": year, "list": list, "month": month };
+    let urlBody: any = { "projectid": this.projectId, "userprofileid": userprofileid, "role": userrole, "entityid": entityid, "countryid": countryid, "functionid": functionid, "locationid": "", "tagid": temptagid, "adhoc": "false", "exclusivestartkey": 0, "sdate": startDate, "edate": endDate, "view": view, "year": year, "list": list, "month": month };
 
     if (searchString.length > 0) {
       urlBody["searchstring"] = searchString;
     }
 
+    console.log('fetchOnlyYearlyUserCalendar', `TagId:${this.tagId}, CountryId:${this.countryId}, LocationId:${this.locationId}, EntityId:${this.entityId}, FunctionId:${this.functionId}, View:${view}, urlBody:`, urlBody);
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(urlBody, url, this._SfLoader, authorization, 'Preparing')) as any;
     this._SfLoader.innerHTML = '';