sf-i-events 1.0.969 → 1.0.971

package/dev/index.html

@@ -1231,11 +1231,40 @@
     </div>
 
   </sf-i-events> -->
-  <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiIdUserProfiles="dnytrdlrmxgsy.cloudfront.net/userprofile" mode="reports" fill="pattern"
+  <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="Madhura Zende Internal" userprofileid="8d3edbb1-8318-4525-978a-ecc4c5a8e713"
+    projectid="d7d4d17e-3e20-4eaa-a06a-fb1c87f26532" projectname="FlaggGRC Global"
+    countryid="c48d7cc1-62df-41b3-807a-5744973db3d9" selectedcriteria="Country - India" myrole="approver"
+    showregisterexport="false" features="[&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;jpeg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;,&quot;zip&quot;]"
+        extract="yes" projectid="d7d4d17e-3e20-4eaa-a06a-fb1c87f26532" 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 name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" apiIdUserProfiles="dnytrdlrmxgsy.cloudfront.net/userprofile" mode="reports" fill="pattern"
     username="Local Reporter 1" userprofileid="e9684b5d-ddbc-46d3-ae07-51706bf75410"
     projectid="41ab3c86-ccc0-4c0e-8e31-cd079a07a710" projectname="ABC Global" calendarstartyyyy="2025"
     myrole="reporter">
-  </sf-i-events>
+  </sf-i-events> -->
   <!-- <sf-i-events name="Calendar" apiid="dwqyez2puoxmu.cloudfront.net/event" apiidtags="dnytrdlrmxgsy.cloudfront.net/tagging" mode="reports" fill="pattern"
     username="Pushti Goenka" userprofileid="8ac7f984-a9e2-46ef-a815-c5116f3e4638"
     projectid="7f928276-a9ff-4bcd-a8db-874f618a92ea" projectname="Transvolt" calendarstartyyyy="2025" myrole="reporter">

package/package.json

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

package/sf-i-events.d.ts

@@ -141,6 +141,7 @@ export declare class SfIEvents extends LitElement {
     disableclientresponse: string;
     disablesignoff: string;
     apiId: string;
+    apiId2: string;
     apiIdStatutes: string;
     apiIdDefinitions: string;
     apiidReportformats: string;
@@ -646,7 +647,7 @@ export declare class SfIEvents extends LitElement {
     fetchLicenseDetails: (listEvent: any, mmddyyyy: string) => Promise<void>;
     renewLicense: (listEvent: any, reportformatvalues: any) => Promise<void>;
     renderLicenseDetails: (listEvent: any, mmddyyyy: string) => Promise<void>;
-    fetchRCMResourceDetails: (listEvent: any, mmddyyyy: string) => Promise<void>;
+    fetchRCMResourceDetails: (listEvent: any, mmddyyyy: string, flagReturn?: boolean) => Promise<any>;
     renewRCMResource: (listEvent: any, reportformatvalues: any) => Promise<void>;
     renderRCMResourceDetails: (listEvent: any, mmddyyyy: string) => Promise<void>;
     fetchEventDetails: (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement, previousId?: string, nextId?: string, flagUploadGuidance?: boolean, listEventContainer?: HTMLDivElement | null, reportercomments?: string | null, approvercomments?: string | null, inputReportingPercentage?: string | null, selectReportedLocation?: string | null, documents?: any | null, dateOfCompletion?: string | null, fromDrilldown?: boolean) => Promise<void>;

package/sf-i-events.js

@@ -2985,6 +2985,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         };
         this.renderCalendarAnnotations = (event, mmdd, j, fromDrilldown) => {
             var html = '';
+            console.log('rendering Annotations', event.module, event.completenessstatus);
             html += '<div class="hidden-filtername hide"><table><thead><th part="badge-filter-name" class="filtername"></th></thead></table></div>';
             // if(event.concise == null && event.approvers != null){
             let reporterStr = event.concise == null ? this.getReporterStringFromEvent(event) : "";
@@ -2993,7 +2994,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             // console.log("graphParam", graphParam.split(';')[0]);
             const configHome = Util.getProjectConfigHome();
             const configFlag = configHome.features != null && configHome.features.indexOf("understood") >= 0;
-            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.module == "compliances" || event.module == null) && event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true)) && !fromDrilldown) ? ('<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>') : '') + (((event.module == "compliances" || event.module == null) && event.concise == null && configFlag) ? (event.review ? ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-reviewed" class="material-symbols-outlined d-flex align-center mb-20 ml-10 button-icon-review">flag_check</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood</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.module == "compliances" || event.module == null) && event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true)) && !fromDrilldown) ? ('<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>') : '') + (((event.module == "compliances" || event.module == null) && event.concise == null && configFlag) ? (event.review ? ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-reviewed" class="material-symbols-outlined d-flex align-center mb-20 ml-10 button-icon-review">flag_check</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood</button>')) : '') + ((event.module == "rcmresource" && event.completenessstatus == "approved") ? '<button id="button-renew-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="d-flex align-center mb-20 ml-10 button-icon button-renew"><span class="material-symbols-outlined" title="Renew">replay</span>&nbsp;&nbsp;Renew</button>' : '') + '</div>';
             // }
             return html;
         };
@@ -3098,6 +3099,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         // const tempEvents1 = JSON.parse(JSON.stringify(this.events));
                         // //console.log('eventlog1', tempEvents1['06/30'][7].comments, mmdd, j);
                         partStatus = this.getCompletenessStatus(JSON.parse(JSON.stringify(this.events[mmdd][j])));
+                        this.events[mmdd][j].completenessstatus = partStatus;
                         lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(this.events[mmdd][j])), partStatus);
                         complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(this.events[mmdd][j])).percentage, JSON.parse(JSON.stringify(this.events[mmdd][j])));
                         console.log("agreement partStatus", partStatus, lateStatus, complianceStatus);
@@ -5270,6 +5272,21 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 });
             }
+            const buttonRenewArr = eventsContainer.querySelectorAll('.button-renew');
+            for (var i = 0; i < buttonRenewArr.length; i++) {
+                buttonRenewArr[i].addEventListener('click', async (ev) => {
+                    const id = ev.target.id;
+                    const idArr = id.split("-");
+                    console.log('idArr', idArr);
+                    const mmdd = idArr[2] + "/" + idArr[3];
+                    const j = idArr[4];
+                    const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+                    let renewEvent = this.events[mmdd][j];
+                    let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+                    console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+                    this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+                });
+            }
             const streamEventsContainer = eventsContainer.querySelectorAll('.stream-events-container');
             const buttonSelect = eventsContainer.querySelectorAll('.button-select');
             if (eventsContainer.innerHTML.indexOf('button-select-all') >= 0) {
@@ -9249,6 +9266,21 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 });
             }
+            const buttonRenewArr = this._SfThisContainer.querySelectorAll('.button-renew');
+            for (var i = 0; i < buttonRenewArr.length; i++) {
+                buttonRenewArr[i].addEventListener('click', async (ev) => {
+                    const id = ev.target.id;
+                    const idArr = id.split("-");
+                    console.log('idArr', idArr);
+                    const mmdd = idArr[2] + "/" + idArr[3];
+                    const j = idArr[4];
+                    const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+                    let renewEvent = this.events[mmdd][j];
+                    let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+                    console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+                    this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+                });
+            }
             const streamEventsContainer = this._SfThisContainer.querySelectorAll('.stream-events-container');
             const buttonSelect = this._SfThisContainer.querySelectorAll('.button-select');
             let selectAllArr = this.attachSelectAllListeners(this._SfThisContainer, buttonSelect);
@@ -9879,6 +9911,21 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 });
             }
+            const buttonRenewArr = this._SfStreamContainer.querySelectorAll('.button-renew');
+            for (var i = 0; i < buttonRenewArr.length; i++) {
+                buttonRenewArr[i].addEventListener('click', async (ev) => {
+                    const id = ev.target.id;
+                    const idArr = id.split("-");
+                    console.log('idArr', idArr);
+                    const mmdd = idArr[2] + "/" + idArr[3];
+                    const j = idArr[4];
+                    const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+                    let renewEvent = this.events[mmdd][j];
+                    let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+                    console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+                    this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+                });
+            }
             const streamEventsContainer = this._SfStreamContainer.querySelectorAll('.stream-events-container');
             const buttonSelect = this._SfStreamContainer.querySelectorAll('.button-select');
             let selectAllArr = this.attachSelectAllListeners(this._SfStreamContainer, buttonSelect);
@@ -10945,6 +10992,21 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 });
             }
+            const buttonRenewArr = this._SfDetailListContainer.querySelectorAll('.button-renew');
+            for (var i = 0; i < buttonRenewArr.length; i++) {
+                buttonRenewArr[i].addEventListener('click', async (ev) => {
+                    const id = ev.target.id;
+                    const idArr = id.split("-");
+                    console.log('idArr', idArr);
+                    const mmdd = idArr[2] + "/" + idArr[3];
+                    const j = idArr[4];
+                    const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+                    let renewEvent = this.events[mmdd][j];
+                    let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+                    console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+                    this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+                });
+            }
         };
         this.renderEventDetailShort = (compliance) => {
             var _a, _b, _c, _f, _g;
@@ -13456,7 +13518,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
         };
-        this.fetchRCMResourceDetails = async (listEvent, mmddyyyy) => {
+        this.fetchRCMResourceDetails = async (listEvent, mmddyyyy, flagReturn = false) => {
             let entityId = listEvent.entityid;
             let locationId = listEvent.locationid;
             let url = "https://" + this.apiIdRCMResources + "/getallobjectdetails";
@@ -13469,7 +13531,12 @@ let SfIEvents = class SfIEvents extends LitElement {
             if (xhr.status == 200) {
                 const jsonRespose = JSON.parse(xhr.responseText);
                 console.log('jsonRespose agreement details', jsonRespose);
-                this.renderRCMResourceDetails(jsonRespose.object, mmddyyyy);
+                if (flagReturn) {
+                    return jsonRespose.object;
+                }
+                else {
+                    this.renderRCMResourceDetails(jsonRespose.object, mmddyyyy);
+                }
             }
             else {
                 if (xhr.status == 401) {
@@ -13704,12 +13771,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                         return;
                     }
                     let reportformatvalues = {};
-                    let reportformatvaluesStr = "";
+                    // let reportformatvaluesStr: string = ""
                     let reportingReporting = this._SfDetailContainer.querySelector('#reporting-reporting-0');
                     console.log('renew reporting', reportingReporting);
                     if (reportingReporting != null) {
                         reportformatvalues = reportingReporting.selectedValues();
-                        reportformatvaluesStr = JSON.stringify(reportingReporting.selectedValues());
+                        // reportformatvaluesStr = JSON.stringify(reportingReporting!.selectedValues())
                     }
                     let comparedObj = Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues));
                     console.log('reportformatvalues', reportformatvalues, JSON.parse(listEvent.reportformatvalues), comparedObj);
@@ -13729,7 +13796,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         console.log('mmddyyyy', mmddyyyy);
                         if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, (_a = listEvent.module) !== null && _a !== void 0 ? _a : "compliance")) {
                             if (approved) {
-                                await this.renewRCMResource(listEvent, reportformatvaluesStr);
+                                // await this.renewRCMResource(listEvent, reportformatvaluesStr);
                             }
                             else {
                                 console.log('renew reporting', reportformatvalues);
@@ -14028,7 +14095,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         this.events[mmdd][p].lastupdated = new Date().toString();
                                                     }
                                                 }
-                                                await this.renewRCMResource(listEvent, reportformatvalues);
+                                                // await this.renewRCMResource(listEvent, reportformatvalues);
                                                 console.log('upload report auto approve single');
                                             }
                                             if (this.recentlyReported[mmdd] == null) {
@@ -22688,6 +22755,9 @@ let SfIEvents = class SfIEvents extends LitElement {
         };
         this.uploadReview = async (entityId, locationId, mmddyyyy, eventid, comments, approved, module = "compliance") => {
             let url = "https://" + this.apiId + "/uploadreview1";
+            if (module == "rcmresource" && this.apiId2 != null) {
+                url = "https://" + this.apiId2 + "/uploadreview1";
+            }
             const body = {
                 "mmddyyyy": mmddyyyy,
                 "projectid": this.projectId,
@@ -22783,6 +22853,9 @@ let SfIEvents = class SfIEvents extends LitElement {
         };
         this.uploadReport = async (entityId, locationId, mmddyyyy, eventid, comments, doc, docs, event, reportformatvalues = "", reportformatschema = "", module = "compliance", percentage = "100", makercheckers, reportedlocations = "") => {
             let url = "https://" + this.apiId + "/uploadreport2";
+            if (module == "rcmresource" && this.apiId2 != null) {
+                url = "https://" + this.apiId2 + "/uploadreport2";
+            }
             let yearStr = this.getFinancialYear(mmddyyyy);
             let body = {
                 "mmddyyyy": mmddyyyy,
@@ -27906,6 +27979,9 @@ __decorate([
 __decorate([
     property()
 ], SfIEvents.prototype, "apiId", void 0);
+__decorate([
+    property()
+], SfIEvents.prototype, "apiId2", void 0);
 __decorate([
     property()
 ], SfIEvents.prototype, "apiIdStatutes", void 0);

package/src/sf-i-events.ts

@@ -1234,6 +1234,9 @@ export class SfIEvents extends LitElement {
   @property()
   apiId!: string;
 
+  @property()
+  apiId2!: string;
+
   @property()
   apiIdStatutes!: string;
 
@@ -5282,7 +5285,7 @@ export class SfIEvents extends LitElement {
   renderCalendarAnnotations = (event: any, mmdd: string, j: number, fromDrilldown: boolean) => {
 
     var html = '';
-
+    console.log('rendering Annotations', event.module, event.completenessstatus)
     html += '<div class="hidden-filtername hide"><table><thead><th part="badge-filter-name" class="filtername"></th></thead></table></div>'
     // if(event.concise == null && event.approvers != null){
     let reporterStr = event.concise == null ? this.getReporterStringFromEvent(event) : "";
@@ -5292,7 +5295,7 @@ export class SfIEvents extends LitElement {
     // console.log("graphParam", graphParam.split(';')[0]);
     const configHome = Util.getProjectConfigHome();
     const configFlag = configHome.features != null && configHome.features.indexOf("understood") >= 0
-    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.module == "compliances" || event.module == null) && event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true)) && !fromDrilldown) ? ('<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>') : '') + (((event.module == "compliances" || event.module == null) && event.concise == null && configFlag) ? (event.review ? ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-reviewed" class="material-symbols-outlined d-flex align-center mb-20 ml-10 button-icon-review">flag_check</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood</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.module == "compliances" || event.module == null) && event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true)) && !fromDrilldown) ? ('<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>') : '') + (((event.module == "compliances" || event.module == null) && event.concise == null && configFlag) ? (event.review ? ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-reviewed" class="material-symbols-outlined d-flex align-center mb-20 ml-10 button-icon-review">flag_check</button>') : ('<button id="input-checkbox-review-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-review" class="d-flex align-center mb-20 ml-10 button-icon-review"><span class="material-symbols-outlined" title="Mark as reviewed">flag</span>&nbsp;&nbsp;Mark Understood</button>')) : '') + ((event.module == "rcmresource" && event.completenessstatus == "approved") ? '<button id="button-renew-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="d-flex align-center mb-20 ml-10 button-icon button-renew"><span class="material-symbols-outlined" title="Renew">replay</span>&nbsp;&nbsp;Renew</button>' : '') +'</div>';
     // }
 
     return html;
@@ -5410,6 +5413,7 @@ export class SfIEvents extends LitElement {
           // //console.log('eventlog1', tempEvents1['06/30'][7].comments, mmdd, j);
 
           partStatus = this.getCompletenessStatus(JSON.parse(JSON.stringify(this.events[mmdd][j])));
+          this.events[mmdd][j].completenessstatus = partStatus;
           lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(this.events[mmdd][j])), partStatus);
           complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(this.events[mmdd][j])).percentage, JSON.parse(JSON.stringify(this.events[mmdd][j])));
           console.log("agreement partStatus", partStatus, lateStatus, complianceStatus);
@@ -7742,6 +7746,23 @@ export class SfIEvents extends LitElement {
 
     }
 
+    const buttonRenewArr = eventsContainer.querySelectorAll('.button-renew') as NodeListOf<HTMLButtonElement>;
+
+    for (var i = 0; i < buttonRenewArr.length; i++) {
+      buttonRenewArr[i].addEventListener('click', async (ev: any) => {
+        const id = ev.target.id;
+        const idArr = id.split("-")
+        console.log('idArr', idArr);
+        const mmdd = idArr[2] + "/" + idArr[3];
+        const j = idArr[4];
+        const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+        let renewEvent = this.events[mmdd][j];
+        let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+        console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+        this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+      })
+    }
+
     const streamEventsContainer = eventsContainer.querySelectorAll('.stream-events-container') as NodeListOf<HTMLDivElement>;
     const buttonSelect = eventsContainer.querySelectorAll('.button-select') as NodeListOf<HTMLButtonElement>;
     if (eventsContainer.innerHTML.indexOf('button-select-all') >= 0) {
@@ -12437,6 +12458,23 @@ export class SfIEvents extends LitElement {
 
     }
 
+    const buttonRenewArr = (this._SfThisContainer as HTMLDivElement).querySelectorAll('.button-renew') as NodeListOf<HTMLButtonElement>;
+
+    for (var i = 0; i < buttonRenewArr.length; i++) {
+      buttonRenewArr[i].addEventListener('click', async (ev: any) => {
+        const id = ev.target.id;
+        const idArr = id.split("-")
+        console.log('idArr', idArr);
+        const mmdd = idArr[2] + "/" + idArr[3];
+        const j = idArr[4];
+        const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+        let renewEvent = this.events[mmdd][j];
+        let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+        console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+        this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+      })
+    }
+
     const streamEventsContainer = (this._SfThisContainer as HTMLDivElement).querySelectorAll('.stream-events-container') as NodeListOf<HTMLDivElement>;
     const buttonSelect = (this._SfThisContainer as HTMLDivElement).querySelectorAll('.button-select') as NodeListOf<HTMLButtonElement>;
     let selectAllArr = this.attachSelectAllListeners((this._SfThisContainer as HTMLDivElement), buttonSelect)
@@ -13153,6 +13191,23 @@ export class SfIEvents extends LitElement {
 
     }
 
+    const buttonRenewArr = (this._SfStreamContainer as HTMLDivElement).querySelectorAll('.button-renew') as NodeListOf<HTMLButtonElement>;
+
+    for (var i = 0; i < buttonRenewArr.length; i++) {
+      buttonRenewArr[i].addEventListener('click', async (ev: any) => {
+        const id = ev.target.id;
+        const idArr = id.split("-")
+        console.log('idArr', idArr);
+        const mmdd = idArr[2] + "/" + idArr[3];
+        const j = idArr[4];
+        const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+        let renewEvent = this.events[mmdd][j];
+        let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+        console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+        this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+      })
+    }
+
     const streamEventsContainer = (this._SfStreamContainer as HTMLDivElement).querySelectorAll('.stream-events-container') as NodeListOf<HTMLDivElement>;
     const buttonSelect = (this._SfStreamContainer as HTMLDivElement).querySelectorAll('.button-select') as NodeListOf<HTMLButtonElement>;
     let selectAllArr = this.attachSelectAllListeners((this._SfStreamContainer as HTMLDivElement), buttonSelect)
@@ -14430,6 +14485,23 @@ export class SfIEvents extends LitElement {
 
     }
 
+    const buttonRenewArr = (this._SfDetailListContainer as HTMLDivElement).querySelectorAll('.button-renew') as NodeListOf<HTMLButtonElement>;
+
+    for (var i = 0; i < buttonRenewArr.length; i++) {
+      buttonRenewArr[i].addEventListener('click', async (ev: any) => {
+        const id = ev.target.id;
+        const idArr = id.split("-")
+        console.log('idArr', idArr);
+        const mmdd = idArr[2] + "/" + idArr[3];
+        const j = idArr[4];
+        const yyyy = this.getYearFromMonthBetween(this.sdate, this.edate, idArr[3]);
+        let renewEvent = this.events[mmdd][j];
+        let fullEvent = await this.fetchRCMResourceDetails(renewEvent, mmdd + "/" + yyyy, true);
+        console.log('renew clicked', fullEvent, fullEvent.reportformatvalues);
+        this.renewRCMResource(fullEvent, fullEvent.reportformatvalues);
+      })
+    }
+
   }
   renderEventDetailShort = (compliance: any) => {
     var html = `
@@ -17299,7 +17371,7 @@ export class SfIEvents extends LitElement {
     }
   }
 
-  fetchRCMResourceDetails = async (listEvent: any, mmddyyyy: string) => {
+  fetchRCMResourceDetails = async (listEvent: any, mmddyyyy: string, flagReturn: boolean = false) => {
     let entityId = listEvent.entityid;
     let locationId = listEvent.locationid;
     let url = "https://" + this.apiIdRCMResources + "/getallobjectdetails";
@@ -17316,7 +17388,11 @@ export class SfIEvents extends LitElement {
 
       const jsonRespose = JSON.parse(xhr.responseText);
       console.log('jsonRespose agreement details', jsonRespose);
-      this.renderRCMResourceDetails(jsonRespose.object, mmddyyyy)
+      if (flagReturn) {
+        return jsonRespose.object;
+      }else{
+        this.renderRCMResourceDetails(jsonRespose.object, mmddyyyy)
+      }
     } else {
       if (xhr.status == 401) {
         let changeEvent = new CustomEvent('tokenExpired', { bubbles: true });
@@ -17574,12 +17650,12 @@ export class SfIEvents extends LitElement {
           return;
         }
         let reportformatvalues: any = {}
-        let reportformatvaluesStr: string = ""
+        // let reportformatvaluesStr: string = ""
         let reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting-0') as SfIReporting
         console.log('renew reporting', reportingReporting)
         if (reportingReporting != null) {
           reportformatvalues = reportingReporting!.selectedValues()
-          reportformatvaluesStr = JSON.stringify(reportingReporting!.selectedValues())
+          // reportformatvaluesStr = JSON.stringify(reportingReporting!.selectedValues())
         }
         let comparedObj = Util.compareObjects(reportformatvalues, JSON.parse(listEvent.reportformatvalues))
         console.log('reportformatvalues', reportformatvalues, JSON.parse(listEvent.reportformatvalues), comparedObj)
@@ -17600,7 +17676,7 @@ export class SfIEvents extends LitElement {
           console.log('mmddyyyy', mmddyyyy)
           if (await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], comments, approved, listEvent.module ?? "compliance")) {
             if (approved) {
-              await this.renewRCMResource(listEvent, reportformatvaluesStr);
+              // await this.renewRCMResource(listEvent, reportformatvaluesStr);
             } else {
               console.log('renew reporting', reportformatvalues)
             }
@@ -17936,7 +18012,7 @@ export class SfIEvents extends LitElement {
                           this.events[mmdd][p].lastupdated = new Date().toString()
                         }
                       }
-                      await this.renewRCMResource(listEvent, reportformatvalues);
+                      // await this.renewRCMResource(listEvent, reportformatvalues);
                       console.log('upload report auto approve single')
                     }
                     if (this.recentlyReported[mmdd] == null) {
@@ -28567,7 +28643,9 @@ export class SfIEvents extends LitElement {
 
   uploadReview = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, approved: any, module: string = "compliance") => {
     let url = "https://" + this.apiId + "/uploadreview1";
-
+    if(module == "rcmresource" && this.apiId2 != null) {
+      url = "https://" + this.apiId2 + "/uploadreview1";
+    }
     const body = {
       "mmddyyyy": mmddyyyy,
       "projectid": this.projectId,
@@ -28667,6 +28745,9 @@ 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, reportedlocations: string = "") => {
     let url = "https://" + this.apiId + "/uploadreport2";
+    if(module == "rcmresource" && this.apiId2 != null) {
+      url = "https://" + this.apiId2 + "/uploadreport2";
+    }
     let yearStr = this.getFinancialYear(mmddyyyy)
     let body = {
       "mmddyyyy": mmddyyyy,