sf-i-events 1.0.886 → 1.0.888

package/dev/index.html

@@ -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"
@@ -814,7 +814,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"
@@ -841,7 +841,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="Viewer J1" userprofileid="344c84d2-5976-47ff-949b-49f6fa9627eb" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" countryid="07d73b44-648d-4301-82c4-d6df43397824" myrole="viewer" showregisterexport="false" features="[&quot;notices&quot;]" eventfielddependencies="[{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;country&quot;, &quot;child&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;category&quot;, &quot;child&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;foreignkey&quot;, &quot;parent&quot;: &quot;frequency&quot;, &quot;child&quot;: &quot;subfrequency&quot;}]" eventfields="[{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/riskarea&quot;, &quot;field&quot;: &quot;riskarea&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/jurisdiction&quot;, &quot;field&quot;: &quot;jurisdiction&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/updatetype&quot;, &quot;field&quot;: &quot;updatetype&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/country&quot;, &quot;field&quot;: &quot;country&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/specificity&quot;, &quot;field&quot;: &quot;specificity&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/risk&quot;, &quot;field&quot;: &quot;risk&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/frequency&quot;, &quot;field&quot;: &quot;frequency&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/category&quot;, &quot;field&quot;: &quot;category&quot;},{&quot;type&quot;: &quot;sf-i-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/obligationtype&quot;, &quot;field&quot;: &quot;obligationtype&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/state&quot;, &quot;field&quot;: &quot;state&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subfrequency&quot;, &quot;field&quot;: &quot;subfrequency&quot;},{&quot;type&quot;: &quot;sf-i-sub-select&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/subcategory&quot;, &quot;field&quot;: &quot;subcategory&quot;},{&quot;type&quot;: &quot;sf-i-form&quot;, &quot;apiId&quot;: &quot;dnytrdlrmxgsy.cloudfront.net/statute&quot;, &quot;field&quot;: &quot;statute&quot;, &quot;projectField&quot;: &quot;name&quot;}]" eventpreviewfields="[&quot;obligation&quot;]" eventhidefields="[&quot;comments&quot;,&quot;documents&quot;,&quot;lastupdated&quot;,&quot;approved&quot;,&quot;tags&quot;]" calendarstartdd="01" calendarstartmm="04" calendarstartyyyy="2025">
 
         <div slot="uploader">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.886",
+  "version": "1.0.888",
   "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;
@@ -2547,7 +2547,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div class="stream-events-container flex-grow" part="' + bgStatus + '">';
             html += '<div class="hidden-tags hide">' + JSON.stringify(event['tags']) + '</div>';
             html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>';
-            // html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? "reportformat" : "") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.reporters != null ? "100" : "60") + '"></sf-i-elastic-text>' + event.reporters != null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div>') + (((event.reportformat != null && event.reportformat.length > 0) || (event.customreporting != null)) ? '' : ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.reporters != null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
+            // html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? "reportformat" : "") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.concise == null ? "100" : "60") + '"></sf-i-elastic-text>' + event.concise == null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div>') + (((event.reportformat != null && event.reportformat.length > 0) || (event.customreporting != null)) ? '' : ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.concise == null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
             const isBulk = event.isbulk === true;
             const hasReportFormat = ((_a = event.reportformat) === null || _a === void 0 ? void 0 : _a.length) > 0;
             const hasCustomReporting = event.customreporting != null;
@@ -2563,7 +2563,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             const showCheckbox = !(hasReportFormat || isBulk || hasCustomReporting);
             const showReportingButton = !hasReportFormat && !hasCustomReporting && event.reporters == null;
             const showLocationRisk = event.reporters == null;
-            const showLastUpdated = event.reporters != null && lastUpdated.length > 0;
+            const showLastUpdated = event.concise == null && lastUpdated.length > 0;
             html += `
       <div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">
         <input 
@@ -2576,7 +2576,7 @@ let SfIEvents = class SfIEvents extends LitElement {
           class="stream-event-title${!isBulk ? ' button-event-title' : ''}" 
           id="stream-event-title-${mmddSanitized}-${itemNumber}-${moduleType}" 
           text="${event.obligationtitle}" 
-          minLength="${event.reporters != null ? '100' : '60'}">
+          minLength="${event.concise == null ? '100' : '60'}">
         </sf-i-elastic-text>
         ${showLocationRisk ? `
           <div part="stream-event-location" class="stream-event-location ml-5">
@@ -2601,7 +2601,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         ` : ''}
       </div>
     `;
-            if (event.reporters != null && remarks.length > 0) {
+            if (event.concise == null && remarks.length > 0) {
                 html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">' + remarks + ', occurred on ' + occurrenceDate + '</div>';
             }
             // console.log('returning divstarthtml', html);
@@ -2877,12 +2877,12 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.renderCalendarAnnotations = (event, mmdd, j) => {
             var html = '';
             html += '<div class="hidden-filtername hide"><table><thead><th part="badge-filter-name" class="filtername"></th></thead></table></div>';
-            // if(event.reporters != null && event.approvers != null){
-            let reporterStr = event.reporters != null ? this.getReporterStringFromEvent(event) : "";
+            // if(event.concise == null && event.approvers != null){
+            let reporterStr = event.concise == null ? this.getReporterStringFromEvent(event) : "";
             let approverStr = event.approvers != null ? this.getApproverStringFromEvent(event) : "";
             let graphParam = this.getGraphParam(event);
             // console.log("graphParam", graphParam.split(';')[0]);
-            html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.reporters != null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.reporters != null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
+            html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
             // }
             return html;
         };
@@ -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>';
                 }
@@ -7449,8 +7480,20 @@ let SfIEvents = class SfIEvents extends LitElement {
             (_j = this._SfCustomContainer.querySelector('#button-this-year-mobile')) === null || _j === void 0 ? void 0 : _j.addEventListener('click', () => {
                 this._SfCustomContainer.querySelector('#stream-start-date-mobile').value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
                 this._SfCustomContainer.querySelector('#stream-start-date').value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-                this._SfCustomContainer.querySelector('#stream-end-date-mobile').value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-                this._SfCustomContainer.querySelector('#stream-end-date').value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
+                let year = parseInt(this.calendarStartYYYY);
+                let month = parseInt(this.calendarStartMM) - 1;
+                if (month === 0) {
+                    month = 12;
+                    year -= 1;
+                }
+                // Pad month
+                const monthStr = month < 10 ? '0' + month : '' + month;
+                // Determine last day of month (safe)
+                const lastDay = new Date(year, month, 0).getDate(); // day 0 of next month gives last day of `month`
+                const dayStr = lastDay < 10 ? '0' + lastDay : '' + lastDay;
+                const finalDate = `${year + 1}-${monthStr}-${dayStr}`;
+                this._SfCustomContainer.querySelector('#stream-end-date-mobile').value = finalDate;
+                this._SfCustomContainer.querySelector('#stream-end-date').value = finalDate;
                 this.processDateSelection(this._SfCustomContainer);
             });
             (_k = this._SfCustomContainer.querySelector('#button-this-year')) === null || _k === void 0 ? void 0 : _k.addEventListener('click', () => {
@@ -7657,15 +7700,39 @@ let SfIEvents = class SfIEvents extends LitElement {
             (_j = this._SfCustomContainer.querySelector('#button-this-year-mobile')) === null || _j === void 0 ? void 0 : _j.addEventListener('click', () => {
                 this._SfCustomContainer.querySelector('#stream-start-date-mobile').value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
                 this._SfCustomContainer.querySelector('#stream-start-date').value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-                this._SfCustomContainer.querySelector('#stream-end-date-mobile').value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-                this._SfCustomContainer.querySelector('#stream-end-date').value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
+                let year = parseInt(this.calendarStartYYYY);
+                let month = parseInt(this.calendarStartMM) - 1;
+                if (month === 0) {
+                    month = 12;
+                    year -= 1;
+                }
+                // Pad month
+                const monthStr = month < 10 ? '0' + month : '' + month;
+                // Determine last day of month (safe)
+                const lastDay = new Date(year, month, 0).getDate(); // day 0 of next month gives last day of `month`
+                const dayStr = lastDay < 10 ? '0' + lastDay : '' + lastDay;
+                const finalDate = `${year + 1}-${monthStr}-${dayStr}`;
+                this._SfCustomContainer.querySelector('#stream-end-date-mobile').value = finalDate;
+                this._SfCustomContainer.querySelector('#stream-end-date').value = finalDate;
                 this.processDateSelectionViewer(this._SfCustomContainer);
             });
             (_k = this._SfCustomContainer.querySelector('#button-this-year')) === null || _k === void 0 ? void 0 : _k.addEventListener('click', () => {
                 this._SfCustomContainer.querySelector('#stream-start-date-mobile').value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
                 this._SfCustomContainer.querySelector('#stream-start-date').value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-                this._SfCustomContainer.querySelector('#stream-end-date-mobile').value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-                this._SfCustomContainer.querySelector('#stream-end-date').value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
+                let year = parseInt(this.calendarStartYYYY);
+                let month = parseInt(this.calendarStartMM) - 1;
+                if (month === 0) {
+                    month = 12;
+                    year -= 1;
+                }
+                // Pad month
+                const monthStr = month < 10 ? '0' + month : '' + month;
+                // Determine last day of month (safe)
+                const lastDay = new Date(year, month, 0).getDate(); // day 0 of next month gives last day of `month`
+                const dayStr = lastDay < 10 ? '0' + lastDay : '' + lastDay;
+                const finalDate = `${year + 1}-${monthStr}-${dayStr}`;
+                this._SfCustomContainer.querySelector('#stream-end-date-mobile').value = finalDate;
+                this._SfCustomContainer.querySelector('#stream-end-date').value = finalDate;
                 this.processDateSelectionViewer(this._SfCustomContainer);
             });
             (_l = this._SfCustomContainer.querySelector('#button-this-quarter-mobile')) === null || _l === void 0 ? void 0 : _l.addEventListener('click', () => {
@@ -9886,6 +9953,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 +9966,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 +10295,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 +10313,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 +10743,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 +10756,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 +11086,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 +11104,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 +11535,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 +11548,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 +11878,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 +11896,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 +12327,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 +12340,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 +12670,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 +12688,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 +13261,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 +13274,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 +13481,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 +13494,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 +13841,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 +13859,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 +20479,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 +20497,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 "reportformatschema": reportformatschema,
                 "userid": this.userProfileId,
                 "userrole": this.myRole,
-                "year": this.calendarStartYYYY,
+                "year": yearStr,
                 "module": module,
                 "makercheckers": makercheckers
             };

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"] };
 
@@ -4759,7 +4759,7 @@ export class SfIEvents extends LitElement {
     html += '<div class="stream-events-container flex-grow" part="' + bgStatus + '">';
     html += '<div class="hidden-tags hide">' + JSON.stringify(event['tags']) + '</div>'
     html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-    // html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? "reportformat" : "") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.reporters != null ? "100" : "60") + '"></sf-i-elastic-text>' + event.reporters != null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div>') + (((event.reportformat != null && event.reportformat.length > 0) || (event.customreporting != null)) ? '' : ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.reporters != null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
+    // html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? "reportformat" : "") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.concise == null ? "100" : "60") + '"></sf-i-elastic-text>' + event.concise == null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div>') + (((event.reportformat != null && event.reportformat.length > 0) || (event.customreporting != null)) ? '' : ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.concise == null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
 
     const isBulk = event.isbulk === true;
     const hasReportFormat = event.reportformat?.length > 0;
@@ -4776,7 +4776,7 @@ export class SfIEvents extends LitElement {
     const showCheckbox = !(hasReportFormat || isBulk || hasCustomReporting);
     const showReportingButton = !hasReportFormat && !hasCustomReporting && event.reporters == null;
     const showLocationRisk = event.reporters == null;
-    const showLastUpdated = event.reporters != null && lastUpdated.length > 0;
+    const showLastUpdated = event.concise == null && lastUpdated.length > 0;
 
     html += `
       <div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">
@@ -4790,7 +4790,7 @@ export class SfIEvents extends LitElement {
           class="stream-event-title${!isBulk ? ' button-event-title' : ''}" 
           id="stream-event-title-${mmddSanitized}-${itemNumber}-${moduleType}" 
           text="${event.obligationtitle}" 
-          minLength="${event.reporters != null ? '100' : '60'}">
+          minLength="${event.concise == null ? '100' : '60'}">
         </sf-i-elastic-text>
         ${showLocationRisk ? `
           <div part="stream-event-location" class="stream-event-location ml-5">
@@ -4816,7 +4816,7 @@ export class SfIEvents extends LitElement {
       </div>
     `;
 
-    if (event.reporters != null && remarks.length > 0) {
+    if (event.concise == null && remarks.length > 0) {
       html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">' + remarks + ', occurred on ' + occurrenceDate + '</div>';
     }
     // console.log('returning divstarthtml', html);
@@ -5132,13 +5132,13 @@ export class SfIEvents extends LitElement {
     var html = '';
 
     html += '<div class="hidden-filtername hide"><table><thead><th part="badge-filter-name" class="filtername"></th></thead></table></div>'
-    // if(event.reporters != null && event.approvers != null){
-    let reporterStr = event.reporters != null ? this.getReporterStringFromEvent(event) : "";
+    // if(event.concise == null && event.approvers != null){
+    let reporterStr = event.concise == null ? this.getReporterStringFromEvent(event) : "";
     let approverStr = event.approvers != null ? this.getApproverStringFromEvent(event) : "";
 
     let graphParam = this.getGraphParam(event);
     // console.log("graphParam", graphParam.split(';')[0]);
-    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.reporters != null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.reporters != null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
+    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
     // }
 
     return html;
@@ -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>';
@@ -10473,8 +10503,23 @@ export class SfIEvents extends LitElement {
     (this._SfCustomContainer as HTMLDivElement).querySelector('#button-this-year-mobile')?.addEventListener('click', () => {
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date-mobile') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
+      let year = parseInt(this.calendarStartYYYY);
+      let month = parseInt(this.calendarStartMM) - 1;
+
+      if (month === 0) {
+        month = 12;
+        year -= 1;
+      }
+
+      // Pad month
+      const monthStr = month < 10 ? '0' + month : '' + month;
+
+      // Determine last day of month (safe)
+      const lastDay = new Date(year, month, 0).getDate(); // day 0 of next month gives last day of `month`
+      const dayStr = lastDay < 10 ? '0' + lastDay : '' + lastDay;
+      const finalDate = `${year + 1}-${monthStr}-${dayStr}`;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = finalDate;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = finalDate;
       this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
     });
     (this._SfCustomContainer as HTMLDivElement).querySelector('#button-this-year')?.addEventListener('click', () => {
@@ -10721,15 +10766,45 @@ export class SfIEvents extends LitElement {
     (this._SfCustomContainer as HTMLDivElement).querySelector('#button-this-year-mobile')?.addEventListener('click', () => {
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date-mobile') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
+      let year = parseInt(this.calendarStartYYYY);
+      let month = parseInt(this.calendarStartMM) - 1;
+
+      if (month === 0) {
+        month = 12;
+        year -= 1;
+      }
+
+      // Pad month
+      const monthStr = month < 10 ? '0' + month : '' + month;
+
+      // Determine last day of month (safe)
+      const lastDay = new Date(year, month, 0).getDate(); // day 0 of next month gives last day of `month`
+      const dayStr = lastDay < 10 ? '0' + lastDay : '' + lastDay;
+      const finalDate = `${year + 1}-${monthStr}-${dayStr}`;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = finalDate;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = finalDate;
       this.processDateSelectionViewer((this._SfCustomContainer as HTMLDivElement));
     });
     (this._SfCustomContainer as HTMLDivElement).querySelector('#button-this-year')?.addEventListener('click', () => {
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date-mobile') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
+      let year = parseInt(this.calendarStartYYYY);
+      let month = parseInt(this.calendarStartMM) - 1;
+
+      if (month === 0) {
+        month = 12;
+        year -= 1;
+      }
+
+      // Pad month
+      const monthStr = month < 10 ? '0' + month : '' + month;
+
+      // Determine last day of month (safe)
+      const lastDay = new Date(year, month, 0).getDate(); // day 0 of next month gives last day of `month`
+      const dayStr = lastDay < 10 ? '0' + lastDay : '' + lastDay;
+      const finalDate = `${year + 1}-${monthStr}-${dayStr}`;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = finalDate;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = finalDate;
       this.processDateSelectionViewer((this._SfCustomContainer as HTMLDivElement));
     });
 
@@ -13437,6 +13512,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,
@@ -13449,7 +13525,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)
@@ -13824,6 +13900,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,
@@ -13841,7 +13918,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
                           })
@@ -14325,6 +14402,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,
@@ -14337,7 +14415,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)
@@ -14717,6 +14795,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,
@@ -14734,7 +14813,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
                     })
@@ -15220,6 +15299,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,
@@ -15232,7 +15312,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)
@@ -15612,6 +15692,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,
@@ -15629,7 +15710,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
                     })
@@ -16115,6 +16196,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,
@@ -16127,7 +16209,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)
@@ -16507,6 +16589,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,
@@ -16524,7 +16607,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
                     })
@@ -17205,6 +17288,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,
@@ -17217,7 +17301,7 @@ export class SfIEvents extends LitElement {
             "username": this.userName,
             "userid": this.userProfileId,
             "userrole": this.myRole,
-            "year": this.calendarStartYYYY,
+            "year": yearStr,
             "module": event.module ?? "compliance"
           })
         }
@@ -17470,6 +17554,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,
@@ -17482,7 +17567,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)
@@ -17873,6 +17958,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,
@@ -17890,7 +17976,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
                           })
@@ -26216,7 +26302,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,
@@ -26234,7 +26320,7 @@ export class SfIEvents extends LitElement {
       "reportformatschema": reportformatschema,
       "userid": this.userProfileId,
       "userrole": this.myRole,
-      "year": this.calendarStartYYYY,
+      "year": yearStr,
       "module": module,
       "makercheckers": makercheckers
     }