sf-i-events 1.0.1069 → 1.0.1071

package/dev/index.html

@@ -893,36 +893,6 @@
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidusers="dnytrdlrmxgsy.cloudfront.net/userprofile"
     disablesignoff="yes" disableclientresponse="yes">
 
-  </sf-i-events> -->
-  <!-- <sf-i-events name="Calendar" apiid="api2.flagggrc.tech/event-api" 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"
-    apiidagreements="swago3unro2te55ikvjuqwcrr40wluqh.lambda-url.us-east-1.on.aws"
-    apiidlicenses="lbtsbsctcdsyah4qdszkv4rctq0tnvel.lambda-url.us-east-1.on.aws"
-    apiidrcmresources="jra3sghasmaxn5aiq7rtv6pjzq0oeuaw.lambda-url.us-east-1.on.aws" fill="solid"
-    username="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410"
-    projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global"
-    entityid="c989a44e-7d3d-427e-b712-90eacf585075" locationid="38dc8c53-643f-4fee-83fe-f15239606277"
-    selectedcriteria="Location - Mumbai" myrole="reporter" showregisterexport="false"
-    features="[&quot;notices&quot;,&quot;contracts&quot;,&quot;licenses&quot;,&quot;rcmresources&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">
-      <sf-i-uploader id="uploader" max="10" apiid="1peg5170d3"
-        allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]"
-        extract="yes" projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" maxsize="31457280"
-        allowdownload="yes"></sf-i-uploader>
-    </div>
-    <div slot="reporting">
-      <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
-    </div>
-
   </sf-i-events> -->
 
   <!-- <sf-i-events projectid="5a05b884-d7ed-4f63-b623-4d305ea2cfd6" projectname="Standard Radiators Private Limited"
@@ -1213,6 +1183,14 @@
     </div>
 
   </sf-i-events> -->
+  <sf-i-events projectid="a40e4c8f-f95f-4e14-b8b2-ddcc12f56de0" projectname="Japfa" mode="onboarding" locations="{}"
+    contractstartdate="23/12/2025" apiid="api2.flagggrc.tech/event-api" 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"
+    apiidmodules="4ejumlje4owzzcvlnndedwbpte0wpkou.lambda-url.us-east-1.on.aws" disablesignoff="yes"
+    disableclientresponse="yes">
+
+  </sf-i-events>
   <!-- <sf-i-events name="Calendar" apiid="api2.flagggrc.tech/event-api"
     apiid2="3mefupehxkw4pwsq3oyk7lf2pq0pisdx.lambda-url.us-east-1.on.aws" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
@@ -1350,7 +1328,7 @@
     </div>
 
   </sf-i-events> -->
-  <sf-i-events name="Calendar" apiid="api2.flagggrc.tech/event-api"
+  <!-- <sf-i-events name="Calendar" apiid="api2.flagggrc.tech/event-api"
     apiid2="3mefupehxkw4pwsq3oyk7lf2pq0pisdx.lambda-url.us-east-1.on.aws" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"
     apiiddefinitions="dwqyez2puoxmu.cloudfront.net/definition"
@@ -1381,7 +1359,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="api2.flagggrc.tech/event-api"
     apiid2="3mefupehxkw4pwsq3oyk7lf2pq0pisdx.lambda-url.us-east-1.on.aws" mode="consumer"
     apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute"

package/package.json

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

package/sf-i-events.js

@@ -8651,7 +8651,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 html += '<span class="mt-10 pt-10 pb-10 mr-10 ml-10" part="ad-hoc-review-message">Please review the questions. Click yes to trigger associated ad hoc compliances wherever applicable. Click the finished button after you have completed the review.</span>';
                 html += '<button part="button-mark-adhoc-reviewed" id="radio-mark-reviewed" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10">I have completed the review</button>';
                 html += '</div>';
-                // html += '<button part="button-lg-short" id="radio-submit" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10 hide"><span class="material-symbols-outlined">bolt</span>&nbsp;<span>Trigger</span></button>';
+                html += '<button part="button-lg-short" id="radio-submit" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10"><span class="material-symbols-outlined">bolt</span>&nbsp;<span>Trigger</span></button>';
             }
             else {
                 html += '<button part="button-lg-short" id="radio-submit" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10"><span class="material-symbols-outlined">bolt</span>&nbsp;<span>Trigger</span></button>';
@@ -19890,15 +19890,24 @@ let SfIEvents = class SfIEvents extends LitElement {
             });
         };
         this.getAllPastFiscals = (startDate) => {
-            let retArr = [];
+            const retArr = [];
+            // Normalize startDate to its fiscal year start
+            const startFY = new Date(startDate);
+            startFY.setDate(1);
+            startFY.setMonth(3); // April
+            if (startDate.getMonth() < 3) {
+                startFY.setFullYear(startFY.getFullYear() - 1);
+            }
+            // Current fiscal year anchor
             let date = new Date();
-            while (date.getTime() > startDate.getTime()) {
-                if (date.getMonth() < 3) {
-                    retArr.push(date.getFullYear() - 1);
-                }
-                else {
-                    retArr.push(date.getFullYear());
-                }
+            date.setDate(1);
+            date.setMonth(3);
+            // If today is before April, shift to last FY start
+            if (new Date().getMonth() < 3) {
+                date.setFullYear(date.getFullYear() - 1);
+            }
+            while (date.getTime() >= startFY.getTime()) {
+                retArr.push(date.getFullYear());
                 date.setFullYear(date.getFullYear() - 1);
             }
             return retArr;
@@ -20682,8 +20691,13 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             let pastFiscals = [parseInt(this.getCurrentYearGeneric())];
             if (this.contractStartDate != null) {
-                pastFiscals = this.getAllPastFiscals(new Date(this.contractStartDate));
+                console.log('contractStartDate', this.contractStartDate);
+                let startDD = this.contractStartDate.split('/')[0];
+                let startMM = this.contractStartDate.split('/')[1];
+                let startYYYY = this.contractStartDate.split('/')[2];
+                pastFiscals = this.getAllPastFiscals(new Date(startMM + '/' + startDD + '/' + startYYYY));
             }
+            console.log('pastFiscals', pastFiscals);
             html += (`<div class="left-sticky d-flex justify-between align-center mr-10"><h4 id="mapped-stats-title" part="results-title" class="d-flex align-center m-0">${status}&nbsp;&nbsp; ${tagged} in Suspense List out of ${sourceArray.data.mappings.mappings.length}</h4><h6 class="ml-20" part="onboarding-suspense-year-label">Year</h6><select id="select-year" part="input">${pastFiscals.map((fiscal) => {
                 return `<option value="${fiscal}"${fiscal == parseInt(year) ? " selected" : ""}>${fiscal}-${(fiscal % 100) + 1}</option>`;
             })}</select></div>`);
@@ -27862,7 +27876,13 @@ let SfIEvents = class SfIEvents extends LitElement {
                 const jsonRespose = JSON.parse(xhr.responseText);
                 console.log('jsonRespose', jsonRespose);
                 if (JSON.stringify(urlBody) == this.getallcountryevetsParams) {
-                    this.events = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
+                    let tempEvents = await this.fetchPresignedUrl(jsonRespose.signedUrlGet);
+                    for (let mmdd of Object.keys(tempEvents)) {
+                        tempEvents[mmdd] = tempEvents[mmdd].sort((a, b) => {
+                            return a.obligationtitle.localeCompare(b.obligationtitle);
+                        });
+                    }
+                    this.events = tempEvents;
                 }
                 await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete);
                 if (JSON.stringify(urlBody) == this.getallcountryevetsParams) {

package/src/sf-i-events.ts

@@ -10039,7 +10039,7 @@ export class SfIEvents extends LitElement {
       if (meta != null) {
         this.renderStatisticsFilters((this._SfCustomContainer as HTMLDivElement))
         if (this.statisticsLoadLocation && this.locationId != "") {
-          
+
           ((this._SfCustomContainer as HTMLDivElement).querySelector('#select-filter-criteria') as HTMLSelectElement).value = 'location';
           ((this._SfCustomContainer as HTMLDivElement).querySelector('#select-filter-criteria') as HTMLSelectElement).dispatchEvent(new Event('change'))
           await new Promise((resolve) => setTimeout(resolve, 500));
@@ -11697,7 +11697,7 @@ export class SfIEvents extends LitElement {
       html += '<span class="mt-10 pt-10 pb-10 mr-10 ml-10" part="ad-hoc-review-message">Please review the questions. Click yes to trigger associated ad hoc compliances wherever applicable. Click the finished button after you have completed the review.</span>'
       html += '<button part="button-mark-adhoc-reviewed" id="radio-mark-reviewed" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10">I have completed the review</button>'
       html += '</div>'
-      // html += '<button part="button-lg-short" id="radio-submit" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10 hide"><span class="material-symbols-outlined">bolt</span>&nbsp;<span>Trigger</span></button>';
+      html += '<button part="button-lg-short" id="radio-submit" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10"><span class="material-symbols-outlined">bolt</span>&nbsp;<span>Trigger</span></button>';
     } else {
       html += '<button part="button-lg-short" id="radio-submit" class="d-flex align-center mt-10 pt-10 pb-10 mr-10 ml-10"><span class="material-symbols-outlined">bolt</span>&nbsp;<span>Trigger</span></button>';
     }
@@ -24888,18 +24888,34 @@ export class SfIEvents extends LitElement {
   }
 
   getAllPastFiscals = (startDate: Date) => {
-    let retArr = []
-    let date = new Date()
-    while (date.getTime() > startDate.getTime()) {
-      if (date.getMonth() < 3) {
-        retArr.push(date.getFullYear() - 1)
-      } else {
-        retArr.push(date.getFullYear())
-      }
-      date.setFullYear(date.getFullYear() - 1)
+    const retArr: number[] = [];
+
+    // Normalize startDate to its fiscal year start
+    const startFY = new Date(startDate);
+    startFY.setDate(1);
+    startFY.setMonth(3); // April
+
+    if (startDate.getMonth() < 3) {
+      startFY.setFullYear(startFY.getFullYear() - 1);
     }
+
+    // Current fiscal year anchor
+    let date = new Date();
+    date.setDate(1);
+    date.setMonth(3);
+
+    // If today is before April, shift to last FY start
+    if (new Date().getMonth() < 3) {
+      date.setFullYear(date.getFullYear() - 1);
+    }
+
+    while (date.getTime() >= startFY.getTime()) {
+      retArr.push(date.getFullYear());
+      date.setFullYear(date.getFullYear() - 1);
+    }
+
     return retArr;
-  }
+  };
 
   renderOnboardingGovUsers = (sourceLocationsArray: any, mappedModuleUsers: any, changedIndices: number[] = []) => {
 
@@ -25777,8 +25793,13 @@ export class SfIEvents extends LitElement {
     }
     let pastFiscals = [parseInt(this.getCurrentYearGeneric())]
     if (this.contractStartDate != null) {
-      pastFiscals = this.getAllPastFiscals(new Date(this.contractStartDate));
+      console.log('contractStartDate', this.contractStartDate);
+      let startDD = this.contractStartDate.split('/')[0]
+      let startMM = this.contractStartDate.split('/')[1]
+      let startYYYY = this.contractStartDate.split('/')[2]
+      pastFiscals = this.getAllPastFiscals(new Date(startMM + '/' + startDD + '/' + startYYYY));
     }
+    console.log('pastFiscals', pastFiscals)
     html += (`<div class="left-sticky d-flex justify-between align-center mr-10"><h4 id="mapped-stats-title" part="results-title" class="d-flex align-center m-0">${status}&nbsp;&nbsp; ${tagged} in Suspense List out of ${sourceArray.data.mappings.mappings.length}</h4><h6 class="ml-20" part="onboarding-suspense-year-label">Year</h6><select id="select-year" part="input">${pastFiscals.map((fiscal) => {
       return `<option value="${fiscal}"${fiscal == parseInt(year) ? " selected" : ""}>${fiscal}-${(fiscal % 100) + 1}</option>`
     })}</select></div>`);
@@ -34541,7 +34562,13 @@ export class SfIEvents extends LitElement {
       const jsonRespose = JSON.parse(xhr.responseText);
       console.log('jsonRespose', jsonRespose);
       if (JSON.stringify(urlBody) == this.getallcountryevetsParams) {
-        this.events = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
+        let tempEvents = await this.fetchPresignedUrl(jsonRespose.signedUrlGet);
+        for (let mmdd of Object.keys(tempEvents)) {
+          tempEvents[mmdd] = tempEvents[mmdd].sort((a: any, b: any) => {
+            return a.obligationtitle.localeCompare(b.obligationtitle);
+          });
+        }
+        this.events = tempEvents;
       }
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
       if (JSON.stringify(urlBody) == this.getallcountryevetsParams) {
@@ -35092,7 +35119,7 @@ export class SfIEvents extends LitElement {
         let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
         this.dispatchEvent(changeEvent);
       }
-      if(xhr.status != 200){
+      if (xhr.status != 200) {
         const jsonRespose = JSON.parse(xhr.responseText);
         this.setError(jsonRespose.error);
       }