sf-i-events 1.0.902 → 1.0.904

package/dev/index.html

@@ -25,7 +25,7 @@
     import { SfISubSelect } from 'https://esm.run/sf-i-sub-select@1.0.83/sf-i-sub-select.js';
     import { SfIForm } from 'https://esm.run/sf-i-form@1.0.185/sf-i-form.js';
     import { SfIElasticText } from 'https://esm.run/sf-i-elastic-text@1.0.17/sf-i-elastic-text.js';
-    import { SfIUploader } from 'https://esm.run/sf-i-uploader@1.0.122/sf-i-uploader.js';
+    import { SfIUploader } from 'https://esm.run/sf-i-uploader@1.0.123/sf-i-uploader.js';
     import { SfIMultitextarea } from 'https://esm.run/sf-i-multitextarea@1.0.23/sf-i-multitextarea.js';
     // import { SfIReporting } from 'https://esm.run/sf-i-reporting@1.0.89/sf-i-reporting.js';
     import { SfIReporting } from '../../sf-i-reporting/sf-i-reporting.js';
@@ -44,7 +44,7 @@
     // import {SfIForm} from 'https://unpkg.com/sf-i-form@1.0.184/sf-i-form.js?module';
     // import {SfIEvents} from 'https://unpkg.com/sf-i-events@1.0.423/sf-i-events.js?module';
     // import {SfIElasticText} from 'https://unpkg.com/sf-i-elastic-text@1.0.7/sf-i-elastic-text.js?module';
-    // import {SfIUploader} from 'https://unpkg.com/sf-i-uploader@1.0.120/sf-i-uploader.js?module';
+    // import {SfIUploader} from 'https://unpkg.com/sf-i-uploader@1.0.123/sf-i-uploader.js?module';
     // import {SfRandomText} from 'https://unpkg.com/sf-random-text@1.0.2/sf-random-text.js?module';
     // import {SfNewFeature} from 'https://unpkg.com/sf-new-feature@1.0.1/sf-new-feature.js?module';
 
@@ -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"
@@ -786,8 +786,8 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events>
-  <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" mode="consumer"
+  </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"
@@ -815,7 +815,7 @@
       <sf-i-reporting id="reporting-format" mode="view"></sf-i-reporting>
     </div>
 
-  </sf-i-events> -->
+  </sf-i-events>
   <!-- <sf-i-events id="sf-i-events-next" name="Next Compliances" apiid="dwqyez2puoxmu.cloudfront.net/event"
     apiidstatutes="dnytrdlrmxgsy.cloudfront.net/statute" apiidcompliances="dnytrdlrmxgsy.cloudfront.net/compliance"
     apiidreportformats="dwqyez2puoxmu.cloudfront.net/reportformat"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-i-events",
   "private": false,
-  "version": "1.0.902",
+  "version": "1.0.904",
   "description": "Superflows Navigation Component",
   "main": "sf-i-events.js",
   "module": "sf-i-events.js",
@@ -63,7 +63,7 @@
     "sf-i-reporting": "^1.0.89",
     "sf-i-select": "^1.0.80",
     "sf-i-sub-select": "^1.0.68",
-    "sf-i-uploader": "^1.0.120",
+    "sf-i-uploader": "^1.0.123",
     "sf-new-feature": "^1.0.1",
     "sinon": "^15.0.1",
     "update": "^0.7.4"

package/sf-i-events.d.ts

@@ -627,7 +627,7 @@ export declare class SfIEvents extends LitElement {
     fetchRCMResourceDetails: (listEvent: any, mmddyyyy: string) => Promise<void>;
     renewRCMResource: (listEvent: any, reportformatvalues: any) => Promise<void>;
     renderRCMResourceDetails: (listEvent: any, mmddyyyy: string) => Promise<void>;
-    fetchEventDetails: (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance?: boolean, listEventContainer?: HTMLDivElement | null) => Promise<void>;
+    fetchEventDetails: (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance?: boolean, listEventContainer?: HTMLDivElement | null, reportercomments?: string | null, approvercomments?: string | null, inputReportingPercentage?: string | null, selectReportedLocation?: string | null, documents?: any | null, dateOfCompletion?: string | null) => Promise<void>;
     renderEventDetail: (event: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement) => void;
     renderCalendar: () => void;
     matchesOnBoardingFilter: (country: string, state: string, subcategory: string, statute: string) => boolean;

package/sf-i-events.js

@@ -3524,7 +3524,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             return html;
         };
         this.renderReporting = (event, mmddyyyy) => {
-            var _a;
+            var _a, _b, _c;
             let html = '';
             let completeness = this.getCompletenessStatus(event);
             let docs = event['documents'] == null ? [] : event['documents'];
@@ -3559,7 +3559,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                     html += '<div class="d-flex m-20 flex-col">';
                     html += '<label part="input-label">Approver Comments*</label>';
-                    html += '<input id="input-approver-comments" type="text" part="input" value=""/><br />';
+                    html += ('<input id="input-approver-comments" type="text" part="input" value="' + ((_b = event.approvercomments) !== null && _b !== void 0 ? _b : "") + '"/><br />');
                     if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
                         html += '<label part="input-label">Date of Completion*</label>';
                         html += '<input id="input-approver-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" disabled/><br />';
@@ -3616,7 +3616,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     html += '</div>';
                     html += '<div class="d-flex m-20 flex-col">';
                     html += '<label part="input-label">Reporter Comments*</label>';
-                    html += '<input id="input-reporter-comments" type="text" part="input" value=""/><br />';
+                    html += ('<input id="input-reporter-comments" type="text" part="input" value="' + ((_c = event.reportercomments) !== null && _c !== void 0 ? _c : "") + '"/><br />');
                     if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
                         html += '<label part="input-label">Date of Completion*</label>';
                         html += '<input id="input-reporter-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" max="' + (new Date().toISOString().substring(0, 10)) + '"/><br />';
@@ -3838,8 +3838,21 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             });
             (_h = listReportingContainer.querySelector('#upload-guidance-button')) === null || _h === void 0 ? void 0 : _h.addEventListener('click', async () => {
+                var _a, _b, _c, _f, _g, _h, _j, _k;
                 console.log('upload guidance clicked', event);
-                await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, true, listReportingContainer);
+                let inputReportingPercentage = (_b = (_a = listReportingContainer.querySelector('#input-reporter-percentage')) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : "100";
+                let selectReportedLocation = (_f = (_c = listReportingContainer.querySelector('#input-reporter-location')) === null || _c === void 0 ? void 0 : _c.value) !== null && _f !== void 0 ? _f : "";
+                let approvercomments = (_h = (_g = listReportingContainer.querySelector('#input-approver-comments')) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : "";
+                let reportercomments = (_k = (_j = listReportingContainer.querySelector('#input-reporter-comments')) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : "";
+                let dateOfCompletion;
+                if (listReportingContainer.querySelector('#input-reporter-doc') != null) {
+                    dateOfCompletion = new Date(listReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "";
+                }
+                else {
+                    dateOfCompletion = new Date(listReportingContainer.querySelector('#input-approver-doc').value).getTime() + "";
+                }
+                let documents = this._SfUploader[0].querySelector('#uploader').selectedValues();
+                await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocation, documents, dateOfCompletion);
             });
             if (this.mode == "consumer" || this.mode == "next") {
                 let inputReportingPercentage = listReportingContainer.querySelector('#input-reporter-percentage');
@@ -4377,7 +4390,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                     this._SfUploader[0].querySelector('#uploader').addEventListener('analysisInProgress', (_ev) => {
                         console.log('uploader analysisInProgress', _ev);
-                        listReportingContainer.querySelector('.uploader-analysis-message').style.display = "block";
+                        if (listReportingContainer.querySelector('.uploader-analysis-message') != null) {
+                            listReportingContainer.querySelector('.uploader-analysis-message').style.display = "block";
+                        }
                     });
                     this._SfUploader[0].querySelector('#uploader').addEventListener('analysisCompleted', (_ev) => {
                         console.log('uploader analysisInProgress', _ev);
@@ -4394,9 +4409,11 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                     this._SfUploader[0].querySelector('#uploader').prepopulatedInputArr = JSON.stringify([]);
                     console.log('uploader', this._SfUploader[0].querySelector('#uploader'));
+                    this._SfUploader[0].querySelector('#uploader').current = 0;
                     this._SfUploader[0].querySelector('#uploader').loadMode();
                     if (docs.length > 0) {
                         this._SfUploader[0].querySelector('#uploader').prepopulatedInputArr = JSON.stringify(docs);
+                        this._SfUploader[0].querySelector('#uploader').current = docs.length;
                         this._SfUploader[0].querySelector('#uploader').loadMode();
                     }
                     if (this.myRole == this.TAB_APPROVER || event.approved) {
@@ -12972,7 +12989,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
-        this.fetchEventDetails = async (listEvent, mmddyyyy, currentColumnButton, eventsContainer, flagUploadGuidance = false, listEventContainer = null) => {
+        this.fetchEventDetails = async (listEvent, mmddyyyy, currentColumnButton, eventsContainer, flagUploadGuidance = false, listEventContainer = null, reportercomments = null, approvercomments = null, inputReportingPercentage = null, selectReportedLocation = null, documents = null, dateOfCompletion = null) => {
             console.log('listEvent', listEvent, listEvent.id);
             let url = "https://" + this.apiId + "/getalleventdetails";
             //console.log('fetch calendar url', url);
@@ -12994,7 +13011,20 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 }
                             }
                         }
-                        this.renderListReporting(listEventContainer, jsonRespose.data, mmddyyyy, eventsContainer);
+                        let data = jsonRespose.data;
+                        if (reportercomments != null) {
+                            data.reportercomments = reportercomments;
+                        }
+                        else if (approvercomments != null) {
+                            data.approvercomments = approvercomments;
+                        }
+                        if (inputReportingPercentage != null) {
+                            data.percentage = inputReportingPercentage;
+                        }
+                        data.dateofcompletion = dateOfCompletion;
+                        data.reportedlocations = selectReportedLocation;
+                        data.documents = documents;
+                        this.renderListReporting(listEventContainer, data, mmddyyyy, eventsContainer);
                     }
                 }
                 else {
@@ -13082,7 +13112,12 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div class="accordian-container m-20 pb-20" part="accordian-container">';
             html += '<div part="detail-summary">';
             html += ('<div part="detail-summary-title" class="pl-20 pr-20"><h1>' + event['obligationtitle'] + '</h1></div>');
-            html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + event['obligation'].replace(/\n/g, '<br />') + '</h3></div>');
+            let obligationArr = event['obligation'].split('More information:');
+            html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\n/g, '<br />') + '</h3></div>');
+            if (obligationArr.length > 1) {
+                let tempObligationArr = obligationArr.slice(1);
+                html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+            }
             html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
             html += '</div>';
             html += '<br />';

package/src/sf-i-events.ts

@@ -5890,7 +5890,7 @@ export class SfIEvents extends LitElement {
 
         html += '<div class="d-flex m-20 flex-col">';
         html += '<label part="input-label">Approver Comments*</label>';
-        html += '<input id="input-approver-comments" type="text" part="input" value=""/><br />';
+        html += ('<input id="input-approver-comments" type="text" part="input" value="' + (event.approvercomments ?? "") + '"/><br />');
         if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
           html += '<label part="input-label">Date of Completion*</label>';
           html += '<input id="input-approver-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" disabled/><br />';
@@ -5960,7 +5960,7 @@ export class SfIEvents extends LitElement {
 
         html += '<div class="d-flex m-20 flex-col">';
         html += '<label part="input-label">Reporter Comments*</label>';
-        html += '<input id="input-reporter-comments" type="text" part="input" value=""/><br />';
+        html += ('<input id="input-reporter-comments" type="text" part="input" value="' + (event.reportercomments ?? "") + '"/><br />');
         if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
           html += '<label part="input-label">Date of Completion*</label>';
           html += '<input id="input-reporter-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" max="' + (new Date().toISOString().substring(0, 10)) + '"/><br />';
@@ -6197,7 +6197,18 @@ export class SfIEvents extends LitElement {
     });
     listReportingContainer.querySelector('#upload-guidance-button')?.addEventListener('click', async () => {
       console.log('upload guidance clicked', event);
-      await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, true, listReportingContainer);
+      let inputReportingPercentage = (listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement)?.value ?? "100";
+      let selectReportedLocation = (listReportingContainer.querySelector('#input-reporter-location') as HTMLSelectElement)?.value ?? "";
+      let approvercomments = (listReportingContainer.querySelector('#input-approver-comments') as HTMLInputElement)?.value ?? "";
+      let reportercomments = (listReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement)?.value ?? "";
+      let dateOfCompletion;
+      if((listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement) != null) {
+        dateOfCompletion = new Date((listReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "";
+      } else {
+        dateOfCompletion = new Date((listReportingContainer.querySelector('#input-approver-doc') as HTMLInputElement).value).getTime() + "";
+      }
+      let documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader).selectedValues()
+      await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage,selectReportedLocation, documents, dateOfCompletion);
     })
     if (this.mode == "consumer" || this.mode == "next") {
       let inputReportingPercentage = listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement;
@@ -6778,7 +6789,10 @@ export class SfIEvents extends LitElement {
         }
         this._SfUploader[0].querySelector('#uploader').addEventListener('analysisInProgress', (_ev: any) => {
           console.log('uploader analysisInProgress', _ev);
-          (listReportingContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "block"
+
+          if ((listReportingContainer.querySelector('.uploader-analysis-message') as HTMLDivElement) != null) {
+            (listReportingContainer.querySelector('.uploader-analysis-message') as HTMLDivElement).style.display = "block"
+          }
         });
         this._SfUploader[0].querySelector('#uploader').addEventListener('analysisCompleted', (_ev: any) => {
           console.log('uploader analysisInProgress', _ev);
@@ -6798,10 +6812,12 @@ export class SfIEvents extends LitElement {
 
         (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.prepopulatedInputArr = JSON.stringify([]);
         console.log('uploader', (this._SfUploader[0].querySelector('#uploader') as SfIUploader));
+        (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.current = 0;
         (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
 
         if (docs.length > 0) {
           (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.prepopulatedInputArr = JSON.stringify(docs);
+          (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.current = docs.length;
           (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
         }
 
@@ -7131,7 +7147,7 @@ export class SfIEvents extends LitElement {
         const j = idArr[5];
         const module = idArr[6];
         const flag = idArr[7];
-        if(flag != null && flag == "reportedlocations"){
+        if (flag != null && flag == "reportedlocations") {
           return;
         }
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
@@ -11406,7 +11422,7 @@ export class SfIEvents extends LitElement {
         const j = idArr[5];
         const module = idArr[6];
         const flag = idArr[7];
-        if(flag != null && flag == "reportedlocations"){
+        if (flag != null && flag == "reportedlocations") {
           return;
         }
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
@@ -12031,7 +12047,7 @@ export class SfIEvents extends LitElement {
         const j = idArr[5];
         const module = idArr[6];
         const flag = idArr[7];
-        if(flag != null && flag == "reportedlocations"){
+        if (flag != null && flag == "reportedlocations") {
           return;
         }
         var yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
@@ -16917,7 +16933,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null) => {
+  fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, flagUploadGuidance: boolean = false, listEventContainer: HTMLDivElement | null = null, reportercomments: string | null = null, approvercomments: string | null = null, inputReportingPercentage: string | null = null, selectReportedLocation:string | null = null, documents: any | null = null, dateOfCompletion: string | null = null) => {
     console.log('listEvent', listEvent, listEvent.id)
     let url = "https://" + this.apiId + "/getalleventdetails";
 
@@ -16943,7 +16959,19 @@ export class SfIEvents extends LitElement {
               }
             }
           }
-          this.renderListReporting(listEventContainer, jsonRespose.data, mmddyyyy, eventsContainer)
+          let data = jsonRespose.data;
+          if( reportercomments != null) {
+            data.reportercomments = reportercomments;
+          }else if(approvercomments != null) {
+            data.approvercomments = approvercomments;
+          }
+          if(inputReportingPercentage != null) {
+            data.percentage = inputReportingPercentage;
+          }
+          data.dateofcompletion = dateOfCompletion;
+          data.reportedlocations = selectReportedLocation;
+          data.documents = documents;
+          this.renderListReporting(listEventContainer, data, mmddyyyy, eventsContainer)
         }
       } else {
         this.renderEventDetail(jsonRespose.data, mmddyyyy, currentColumnButton, eventsContainer);
@@ -17041,7 +17069,12 @@ export class SfIEvents extends LitElement {
 
     html += '<div part="detail-summary">';
     html += ('<div part="detail-summary-title" class="pl-20 pr-20"><h1>' + event['obligationtitle'] + '</h1></div>');
-    html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + event['obligation'].replace(/\n/g, '<br />') + '</h3></div>');
+    let obligationArr = event['obligation'].split('More information:');
+    html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\n/g, '<br />') + '</h3></div>');
+    if(obligationArr.length > 1) {
+      let tempObligationArr = obligationArr.slice(1);
+      html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');  
+    }
     html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
     html += '</div>';