sf-i-events 1.0.714 → 1.0.716

package/package.json

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

package/sf-i-events.d.ts

@@ -465,6 +465,7 @@ export declare class SfIEvents extends LitElement {
     renderEvents: (_firstDay: any, _endDay: any, iInit: number, iLast: number, showGraph: boolean, index: number, month: number, period: string, firstDate: any, parametersTitle: string) => string;
     renderReporting: (event: any, mmddyyyy: any) => string;
     renderListReporting: (listReportingContainer: HTMLDivElement, event: any, mmddyyyy: any, eventsContainer: HTMLDivElement) => void;
+    attachListReportingListeners: (eventsContainer: HTMLDivElement) => void;
     renderStreamEvents: (index: number, month: number, year: number, showGraph?: boolean) => string;
     renderThisEvents: (index: number, startDate: Date, showGraph?: boolean) => string;
     renderRangeEvents: (firstDate: Date, count: number, eventsContainer: HTMLDivElement) => void;

package/sf-i-events.js

@@ -2496,7 +2496,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             let approverStr = this.getApproverStringFromEvent(event);
             let graphParam = this.getGraphParam(event);
             console.log("graphParam", graphParam.split(';')[0]);
-            html += '<div class="d-flex align-center"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + '<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + i + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">summarize</button></div>';
+            html += '<div class="d-flex align-center"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + '<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + i + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button></div>';
             return html;
         };
         this.renderEvents = (_firstDay, _endDay, iInit, iLast, showGraph, index, month, period, firstDate = null, parametersTitle) => {
@@ -2655,7 +2655,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         html += this.renderCalendarRowDivItemDivTableHead(this.events[mmdd][j], partStatus);
                         html += this.renderCalendarRowDivItemDivTableBody(this.events[mmdd][j], partStatus, lateStatus, complianceStatus, mmdd, i, j);
                         html += this.renderCalendarAnnotations(this.events[mmdd][j], mmdd, i, j);
-                        html += '<div class="list-reporting-container d-flex flex-col hide" id="list-reporting-container-' + i + '-' + j + '"></div>';
+                        html += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + i + '-' + j + '"></div>';
                         html += this.renderCalendarRowDivItemDivEnd();
                     }
                     html += this.renderCalendarRowDivEnd();
@@ -2710,7 +2710,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             let docsOptional = event['docs'] == null ? [] : event['docs'] == null ? [] : event['docs'];
             if (this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) {
                 if (event.comments.length > 0) {
-                    html += '<div class="d-flex justify-between m-20">';
+                    html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
                     html += '<h3 part="results-title" class="m-0"><br />Approve Compliance</h3>';
                     html += '</div>';
                     html += '<div class="m-20" part="report-container">';
@@ -2742,7 +2742,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
             if (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) {
-                html += '<div class="d-flex justify-between m-20">';
+                html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
                 html += '<h3 part="results-title" class="m-0"><br />Report Compliance</h3>';
                 html += '</div>';
                 var showSubmissionSection = true;
@@ -2793,7 +2793,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             }
             if (this.myRole == this.TAB_AUDITOR) {
-                html += '<div class="d-flex justify-between m-20">';
+                html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
                 html += '<h3 part="results-title" class="m-0"><br />Audit Compliance</h3>';
                 html += '</div>';
                 html += '<div class="m-20" part="report-container">';
@@ -2823,7 +2823,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 html += '</div>';
             }
             if (this.myRole == this.TAB_VIEWER) {
-                html += '<div class="d-flex justify-between m-20">';
+                html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
                 html += '<h3 part="results-title" class="m-0"><br />View Compliance</h3>';
                 html += '</div>';
                 html += '<div class="m-20" part="report-container">';
@@ -2902,8 +2902,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                     await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved);
                     for (var p = 0; p < this.events[mmdd].length; p++) {
                         if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
-                            this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString() });
-                            this.events[mmdd][p].lastupdated = new Date().toISOString();
+                            this.events[mmdd][p].approved = approved;
+                            this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                            this.events[mmdd][p].lastupdated = new Date().toString();
+                            if (approved) {
+                                this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
+                            }
                         }
                     }
                     if (this.mode == "next") {
@@ -2919,9 +2923,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                             this.processFindSelection(this._SfFindContainer, searchString);
                         }
                         else {
-                            if (this.selectedItemIds.length > 0) {
-                                await this.fetchBulkReportingData();
-                            }
+                            // if(this.selectedItemIds.length > 0) {  
+                            //   await this.fetchBulkReportingData();
+                            // }
+                            console.log('events', this.events);
                             this.renderAppropriateStream(this.sdate, this.edate, true);
                         }
                     }
@@ -2940,8 +2945,11 @@ let SfIEvents = class SfIEvents extends LitElement {
                         for (var p = 0; p < this.events[mmdd].length; p++) {
                             if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
                                 this.events[mmdd][p].approved = approved;
-                                this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString() });
-                                this.events[mmdd][p].lastupdated = new Date().toISOString();
+                                this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                this.events[mmdd][p].lastupdated = new Date().toString();
+                                if (approved) {
+                                    this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
+                                }
                             }
                         }
                         if (this.mode == "next") {
@@ -3022,8 +3030,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                             for (var p = 0; p < this.events[mmdd].length; p++) {
                                                 if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
                                                     this.events[mmdd][p].documents = docs;
-                                                    this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toISOString() });
-                                                    this.events[mmdd][p].lastupdated = new Date().toISOString();
+                                                    this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
+                                                    this.events[mmdd][p].lastupdated = new Date().toString();
                                                 }
                                             }
                                             if (event.makercheckers.length > 0) {
@@ -3032,8 +3040,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                     if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
                                                         this.events[mmdd][p].approved = true;
                                                         // this.events[mmdd][p].documents = docs
-                                                        this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toISOString() });
-                                                        this.events[mmdd][p].lastupdated = new Date().toISOString();
+                                                        this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                        this.events[mmdd][p].lastupdated = new Date().toString();
                                                     }
                                                 }
                                             }
@@ -3112,6 +3120,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this._SfUploader[0].querySelector('#uploader').callbackUrlHost = callbackUrlHost;
                     this._SfUploader[0].querySelector('#uploader').callbackUrlPath = callbackUrlPath;
                     this._SfUploader[0].querySelector('#uploader').loadMode();
+                    console.log('uploader prepopulate', this._SfUploader[0].querySelector('#uploader').prepopulatedInputArr);
                 }
                 //console.log('approved 1', event["approved"], this.myRole, this.TAB_APPROVER);
                 if (this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_VIEWER || this.myRole == this.TAB_AUDITOR || this.myRole == this.TAB_FUNCTION_HEAD) {
@@ -3149,6 +3158,28 @@ let SfIEvents = class SfIEvents extends LitElement {
                 this.fetchReportFormat(listReportingContainer, reportformatName, (_j = event['reportformatschema']) !== null && _j !== void 0 ? _j : "", (_k = event['reportformatvalues']) !== null && _k !== void 0 ? _k : "");
             }
         };
+        this.attachListReportingListeners = (eventsContainer) => {
+            let buttonListReports = eventsContainer.querySelectorAll('.button-list-reporting');
+            for (let buttonListReport of buttonListReports) {
+                buttonListReport === null || buttonListReport === void 0 ? void 0 : buttonListReport.addEventListener('click', (ev) => {
+                    const id = ev.target.id;
+                    const idArr = id.split("-");
+                    const mmdd = idArr[3] + "/" + idArr[4];
+                    const yyyy = this.getCurrentYear(idArr[3]);
+                    const i = idArr[5];
+                    const j = idArr[6];
+                    let listReportingContainer = eventsContainer.querySelector('#list-reporting-container-' + i + '-' + j);
+                    console.log('mmddyyyy', this.events[mmdd][j], 'display', listReportingContainer.style.display);
+                    if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
+                        this.renderListReporting(listReportingContainer, this.events[mmdd][j], mmdd + '/' + yyyy, eventsContainer);
+                    }
+                    else {
+                        listReportingContainer.innerHTML = '';
+                        listReportingContainer.style.display = 'none';
+                    }
+                });
+            }
+        };
         this.renderStreamEvents = (index, month, year, showGraph = true) => {
             //console.log('flowgraph renderStreamEvents', this.flowGraph);
             const lastDay = this.getLastDayOfMonth(month, year);
@@ -3208,26 +3239,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             buttonRefresh.addEventListener('click', async () => {
                 this.processDateSelection(eventsContainer);
             });
-            let buttonListReports = eventsContainer.querySelectorAll('.button-list-reporting');
-            for (let buttonListReport of buttonListReports) {
-                buttonListReport === null || buttonListReport === void 0 ? void 0 : buttonListReport.addEventListener('click', (ev) => {
-                    const id = ev.target.id;
-                    const idArr = id.split("-");
-                    const mmdd = idArr[3] + "/" + idArr[4];
-                    const yyyy = this.getCurrentYear(idArr[3]);
-                    const i = idArr[5];
-                    const j = idArr[6];
-                    let listReportingContainer = eventsContainer.querySelector('#list-reporting-container-' + i + '-' + j);
-                    console.log('mmddyyyy', this.events[mmdd][j], 'display', listReportingContainer.style.display);
-                    if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
-                        this.renderListReporting(listReportingContainer, this.events[mmdd][j], mmdd + '/' + yyyy, this._SfStreamContainer);
-                    }
-                    else {
-                        listReportingContainer.innerHTML = '';
-                        listReportingContainer.style.display = 'none';
-                    }
-                });
-            }
+            this.attachListReportingListeners(eventsContainer);
             const buttonArr = eventsContainer.querySelectorAll('.button-expand');
             for (var i = 0; i < buttonArr.length; i++) {
                 buttonArr[i].addEventListener('click', (ev) => {
@@ -5837,26 +5849,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 await this.fetchAndYearlyRenderUserCalendar_2(dateResult.startDate, dateResult.endDate);
                 this.renderThis(index);
             });
-            let buttonListReports = this._SfThisContainer.querySelectorAll('.button-list-reporting');
-            for (let buttonListReport of buttonListReports) {
-                buttonListReport === null || buttonListReport === void 0 ? void 0 : buttonListReport.addEventListener('click', (ev) => {
-                    const id = ev.target.id;
-                    const idArr = id.split("-");
-                    const mmdd = idArr[3] + "/" + idArr[4];
-                    const yyyy = this.getCurrentYear(idArr[3]);
-                    const i = idArr[5];
-                    const j = idArr[6];
-                    let listReportingContainer = this._SfThisContainer.querySelector('#list-reporting-container-' + i + '-' + j);
-                    console.log('mmddyyyy', this.events[mmdd][j], 'display', listReportingContainer.style.display);
-                    if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
-                        this.renderListReporting(listReportingContainer, this.events[mmdd][j], mmdd + '/' + yyyy, this._SfStreamContainer);
-                    }
-                    else {
-                        listReportingContainer.innerHTML = '';
-                        listReportingContainer.style.display = 'none';
-                    }
-                });
-            }
+            this.attachListReportingListeners(this._SfThisContainer);
             const buttonArr = this._SfThisContainer.querySelectorAll('.button-expand');
             for (i = 0; i < buttonArr.length; i++) {
                 buttonArr[i].addEventListener('click', (ev) => {
@@ -6177,26 +6170,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
                 this.renderStream(index);
             });
-            let buttonListReports = this._SfStreamContainer.querySelectorAll('.button-list-reporting');
-            for (let buttonListReport of buttonListReports) {
-                buttonListReport === null || buttonListReport === void 0 ? void 0 : buttonListReport.addEventListener('click', (ev) => {
-                    const id = ev.target.id;
-                    const idArr = id.split("-");
-                    const mmdd = idArr[3] + "/" + idArr[4];
-                    const yyyy = this.getCurrentYear(idArr[3]);
-                    const i = idArr[5];
-                    const j = idArr[6];
-                    let listReportingContainer = this._SfStreamContainer.querySelector('#list-reporting-container-' + i + '-' + j);
-                    console.log('mmddyyyy', this.events[mmdd][j], 'display', listReportingContainer.style.display);
-                    if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
-                        this.renderListReporting(listReportingContainer, this.events[mmdd][j], mmdd + '/' + yyyy, this._SfStreamContainer);
-                    }
-                    else {
-                        listReportingContainer.innerHTML = '';
-                        listReportingContainer.style.display = 'none';
-                    }
-                });
-            }
+            this.attachListReportingListeners(this._SfStreamContainer);
             const buttonArr = this._SfStreamContainer.querySelectorAll('.button-expand');
             for (i = 0; i < buttonArr.length; i++) {
                 buttonArr[i].addEventListener('click', (ev) => {
@@ -7422,7 +7396,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                   html += '</div>';
           
                 } */
+                html += '<div part="reporting-view-container">';
                 html += this.renderReporting(event, mmddyyyy);
+                html += "</div>";
                 html += '<div class="d-flex justify-between m-20">';
                 html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
                 html += '</div>';
@@ -7621,8 +7597,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                         await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved);
                         for (var p = 0; p < this.events[mmdd].length; p++) {
                             if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString() });
-                                this.events[mmdd][p].lastupdated = new Date().toISOString();
+                                this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                this.events[mmdd][p].lastupdated = new Date().toString();
                             }
                         }
                     }
@@ -7715,8 +7691,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                             for (var p = 0; p < this.events[mmdd].length; p++) {
                                 if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                                     this.events[mmdd][p].approved = approved;
-                                    this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString() });
-                                    this.events[mmdd][p].lastupdated = new Date().toISOString();
+                                    this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                    this.events[mmdd][p].lastupdated = new Date().toString();
                                 }
                             }
                         }
@@ -7856,8 +7832,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 for (var p = 0; p < this.events[mmdd].length; p++) {
                                                     if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                                                         this.events[mmdd][p].documents = docs;
-                                                        this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toISOString() });
-                                                        this.events[mmdd][p].lastupdated = new Date().toISOString();
+                                                        this.events[mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
+                                                        this.events[mmdd][p].lastupdated = new Date().toString();
                                                     }
                                                 }
                                                 if (makercheckers.length > 0) {
@@ -7866,8 +7842,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
                                                             this.events[mmdd][p].approved = true;
                                                             // this.events[mmdd][p].documents = docs
-                                                            this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toISOString() });
-                                                            this.events[mmdd][p].lastupdated = new Date().toISOString();
+                                                            this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
+                                                            this.events[mmdd][p].lastupdated = new Date().toString();
                                                         }
                                                     }
                                                 }
@@ -12780,6 +12756,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             const graphparamnames3 = eventContainer.querySelectorAll('.graphparamname3');
             const streamEventSummary = eventContainer.querySelector('#stream-event-summary');
             const streamEventFilters = eventContainer.querySelector('#stream-event-filter');
+            const buttonListReporting = eventContainer.querySelector('.button-list-reporting');
             if (hide) {
                 //this.graphParam = clickedValue;
                 streamEventSummary.style.display = 'none';
@@ -12826,6 +12803,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (eventSubTitles[i] != null) {
                         eventSubTitles[i].style.display = 'flex';
                     }
+                    buttonListReporting.style.display = "block";
                 }
                 else {
                     var found = false;
@@ -12850,6 +12828,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         if (eventSubTitles[i] != null) {
                             eventSubTitles[i].style.display = 'none';
                         }
+                        buttonListReporting.style.display = 'none';
                     }
                 }
                 // var found = false;
@@ -12908,6 +12887,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             const graphparamnames3 = eventContainer.querySelectorAll('.graphparamname3');
             const streamEventSummary = eventContainer.querySelector('#stream-event-summary');
             const streamEventFilters = eventContainer.querySelector('#stream-event-filter');
+            const buttonListReporting = eventContainer.querySelectorAll('.button-list-reporting');
             if (streamEventSummary == null) {
                 return;
             }
@@ -12955,6 +12935,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (eventSubTitles[i] != null) {
                         eventSubTitles[i].style.display = 'flex';
                     }
+                    if (buttonListReporting[i] != null) {
+                        buttonListReporting[i].style.display = 'block';
+                    }
                 }
                 else {
                     tables[i].style.display = 'none';
@@ -12968,6 +12951,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (eventSubTitles[i] != null) {
                         eventSubTitles[i].style.display = 'none';
                     }
+                    if (buttonListReporting[i] != null) {
+                        buttonListReporting[i].style.display = 'none';
+                    }
                 }
             }
         };

package/src/sf-i-events.ts

@@ -4650,7 +4650,7 @@ export class SfIEvents extends LitElement {
 
     let graphParam = this.getGraphParam(event);
     console.log("graphParam", graphParam.split(';')[0]);
-    html += '<div class="d-flex align-center"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + '<button id="button-list-reporting-'+mmdd.replace('/', '-')+'-'+ i + '-' + j +'" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">summarize</button></div>';
+    html += '<div class="d-flex align-center"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + '<button id="button-list-reporting-'+mmdd.replace('/', '-')+'-'+ i + '-' + j +'" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button></div>';
 
     return html;
 
@@ -4843,7 +4843,7 @@ export class SfIEvents extends LitElement {
           html += this.renderCalendarRowDivItemDivTableHead(this.events[mmdd][j], partStatus);
           html += this.renderCalendarRowDivItemDivTableBody(this.events[mmdd][j], partStatus, lateStatus, complianceStatus, mmdd, i, j);
           html += this.renderCalendarAnnotations(this.events[mmdd][j], mmdd, i, j);
-          html += '<div class="list-reporting-container d-flex flex-col hide" id="list-reporting-container-' + i + '-' + j + '"></div>'
+          html += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + i + '-' + j + '"></div>'
           html += this.renderCalendarRowDivItemDivEnd();
 
         }
@@ -4919,7 +4919,7 @@ export class SfIEvents extends LitElement {
     if(this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) {
       if(event.comments.length > 0) {
 
-        html += '<div class="d-flex justify-between m-20">';
+        html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
         html += '<h3 part="results-title" class="m-0"><br />Approve Compliance</h3>';
         html += '</div>';
         html += '<div class="m-20" part="report-container">';
@@ -4957,7 +4957,7 @@ export class SfIEvents extends LitElement {
     
     if(this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) {
 
-      html += '<div class="d-flex justify-between m-20">';
+      html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
       html += '<h3 part="results-title" class="m-0"><br />Report Compliance</h3>';
       html += '</div>';
 
@@ -5024,7 +5024,7 @@ export class SfIEvents extends LitElement {
 
     if(this.myRole == this.TAB_AUDITOR) {
 
-      html += '<div class="d-flex justify-between m-20">';
+      html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
       html += '<h3 part="results-title" class="m-0"><br />Audit Compliance</h3>';
       html += '</div>';
       html += '<div class="m-20" part="report-container">';
@@ -5058,7 +5058,7 @@ export class SfIEvents extends LitElement {
     
     if(this.myRole == this.TAB_VIEWER) {
 
-      html += '<div class="d-flex justify-between m-20">';
+      html += '<div class="d-flex justify-between m-20" part="list-report-results-title-container">';
       html += '<h3 part="results-title" class="m-0"><br />View Compliance</h3>';
       html += '</div>';
       html += '<div class="m-20" part="report-container">';
@@ -5141,9 +5141,12 @@ export class SfIEvents extends LitElement {
         await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved)
         for( var p = 0 ; p < this.events[mmdd].length; p ++){
           if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
-            
-            this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString()})
-            this.events[mmdd][p].lastupdated = new Date().toISOString()
+            this.events[mmdd][p].approved = approved 
+            this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+            this.events[mmdd][p].lastupdated = new Date().toString()
+            if(approved){
+              this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+            }
           }
         }
         
@@ -5157,9 +5160,10 @@ export class SfIEvents extends LitElement {
             const searchString = ((this._SfFindContainer as HTMLDivElement).querySelector('#stream-search') as HTMLInputElement).value;
             this.processFindSelection((this._SfFindContainer as HTMLDivElement), searchString);
           } else {
-            if(this.selectedItemIds.length > 0) {  
-              await this.fetchBulkReportingData();
-            }
+            // if(this.selectedItemIds.length > 0) {  
+            //   await this.fetchBulkReportingData();
+            // }
+            console.log('events', this.events);
             this.renderAppropriateStream(this.sdate,this.edate, true);
           }
         }
@@ -5183,8 +5187,11 @@ export class SfIEvents extends LitElement {
           for( var p = 0 ; p < this.events[mmdd].length; p ++){
             if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
               this.events[mmdd][p].approved = approved
-              this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString()})
-              this.events[mmdd][p].lastupdated = new Date().toISOString()
+              this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+              this.events[mmdd][p].lastupdated = new Date().toString()
+              if(approved){
+                this.events[mmdd][p].dateofcompletion = new Date().getTime() + ""
+              }
             }
           }
           if(this.mode == "next"){
@@ -5290,8 +5297,8 @@ export class SfIEvents extends LitElement {
                     for( var p = 0 ; p < this.events[mmdd].length; p ++){
                       if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
                         this.events[mmdd][p].documents = docs
-                        this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toISOString()})
-                        this.events[mmdd][p].lastupdated = new Date().toISOString()
+                        this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
+                        this.events[mmdd][p].lastupdated = new Date().toString()
                       }
                     }
                     if(event.makercheckers.length > 0) {
@@ -5301,8 +5308,8 @@ export class SfIEvents extends LitElement {
                         if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid){
                           this.events[mmdd][p].approved = true
                           // this.events[mmdd][p].documents = docs
-                          this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toISOString()})
-                          this.events[mmdd][p].lastupdated = new Date().toISOString()
+                          this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                          this.events[mmdd][p].lastupdated = new Date().toString()
                         }
                       }
                     }
@@ -5393,6 +5400,7 @@ export class SfIEvents extends LitElement {
         (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.callbackUrlHost = callbackUrlHost;
         (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.callbackUrlPath = callbackUrlPath;
         (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.loadMode();
+        console.log('uploader prepopulate', (this._SfUploader[0].querySelector('#uploader') as SfIUploader).prepopulatedInputArr)
 
       }
 
@@ -5433,6 +5441,27 @@ export class SfIEvents extends LitElement {
     }
   }
  
+  attachListReportingListeners = (eventsContainer: HTMLDivElement) => {
+    let buttonListReports = eventsContainer.querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>
+    for(let buttonListReport of buttonListReports){
+      buttonListReport?.addEventListener('click',(ev:any) => {
+        const id = ev.target.id;
+        const idArr = id.split("-")
+        const mmdd = idArr[3] + "/" + idArr[4];
+        const yyyy = this.getCurrentYear(idArr[3]);
+        const i = idArr[5];
+        const j = idArr[6];
+        let listReportingContainer = eventsContainer.querySelector('#list-reporting-container-'+i+'-'+j) as HTMLDivElement
+        console.log('mmddyyyy', this.events[mmdd][j], 'display',listReportingContainer.style.display);
+        if(listReportingContainer.style.display == 'none' || listReportingContainer.style.display == ''){
+          this.renderListReporting(listReportingContainer,this.events[mmdd][j], mmdd + '/' + yyyy, eventsContainer)
+        }else{
+          listReportingContainer.innerHTML = '';
+          listReportingContainer.style.display = 'none';
+        }
+      })
+    }
+  }
   renderStreamEvents = (index: number, month: number, year: number, showGraph: boolean = true) => {
  
     //console.log('flowgraph renderStreamEvents', this.flowGraph);
@@ -5523,25 +5552,7 @@ export class SfIEvents extends LitElement {
     buttonRefresh.addEventListener('click',async ()=>{
       this.processDateSelection(eventsContainer)
     })
-    let buttonListReports = eventsContainer.querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>
-    for(let buttonListReport of buttonListReports){
-      buttonListReport?.addEventListener('click',(ev:any) => {
-        const id = ev.target.id;
-        const idArr = id.split("-")
-        const mmdd = idArr[3] + "/" + idArr[4];
-        const yyyy = this.getCurrentYear(idArr[3]);
-        const i = idArr[5];
-        const j = idArr[6];
-        let listReportingContainer = eventsContainer.querySelector('#list-reporting-container-'+i+'-'+j) as HTMLDivElement
-        console.log('mmddyyyy', this.events[mmdd][j], 'display',listReportingContainer.style.display);
-        if(listReportingContainer.style.display == 'none' || listReportingContainer.style.display == ''){
-          this.renderListReporting(listReportingContainer,this.events[mmdd][j], mmdd + '/' + yyyy, (this._SfStreamContainer as HTMLDivElement))
-        }else{
-          listReportingContainer.innerHTML = '';
-          listReportingContainer.style.display = 'none';
-        }
-      })
-    }
+    this.attachListReportingListeners(eventsContainer);
     const buttonArr = eventsContainer.querySelectorAll('.button-expand') as NodeListOf<HTMLButtonElement>;
 
     for(var i = 0; i < buttonArr.length; i++) {
@@ -8792,25 +8803,7 @@ export class SfIEvents extends LitElement {
       await this.fetchAndYearlyRenderUserCalendar_2(dateResult.startDate, dateResult.endDate);
       this.renderThis(index);
     })
-    let buttonListReports = (this._SfThisContainer as HTMLDivElement).querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>
-    for(let buttonListReport of buttonListReports){
-      buttonListReport?.addEventListener('click',(ev:any) => {
-        const id = ev.target.id;
-        const idArr = id.split("-")
-        const mmdd = idArr[3] + "/" + idArr[4];
-        const yyyy = this.getCurrentYear(idArr[3]);
-        const i = idArr[5];
-        const j = idArr[6];
-        let listReportingContainer = (this._SfThisContainer as HTMLDivElement).querySelector('#list-reporting-container-'+i+'-'+j) as HTMLDivElement
-        console.log('mmddyyyy', this.events[mmdd][j], 'display',listReportingContainer.style.display);
-        if(listReportingContainer.style.display == 'none' || listReportingContainer.style.display == ''){
-          this.renderListReporting(listReportingContainer,this.events[mmdd][j], mmdd + '/' + yyyy, (this._SfStreamContainer as HTMLDivElement))
-        }else{
-          listReportingContainer.innerHTML = '';
-          listReportingContainer.style.display = 'none';
-        }
-      })
-    }
+    this.attachListReportingListeners(this._SfThisContainer as HTMLDivElement);
     const buttonArr = (this._SfThisContainer as HTMLDivElement).querySelectorAll('.button-expand') as NodeListOf<HTMLButtonElement>;
 
     for(i = 0; i < buttonArr.length; i++) {
@@ -9230,26 +9223,7 @@ export class SfIEvents extends LitElement {
       this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
       this.renderStream(index);
     })
-
-    let buttonListReports = (this._SfStreamContainer as HTMLDivElement).querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>
-    for(let buttonListReport of buttonListReports){
-      buttonListReport?.addEventListener('click',(ev:any) => {
-        const id = ev.target.id;
-        const idArr = id.split("-")
-        const mmdd = idArr[3] + "/" + idArr[4];
-        const yyyy = this.getCurrentYear(idArr[3]);
-        const i = idArr[5];
-        const j = idArr[6];
-        let listReportingContainer = (this._SfStreamContainer as HTMLDivElement).querySelector('#list-reporting-container-'+i+'-'+j) as HTMLDivElement
-        console.log('mmddyyyy', this.events[mmdd][j], 'display',listReportingContainer.style.display);
-        if(listReportingContainer.style.display == 'none' || listReportingContainer.style.display == ''){
-          this.renderListReporting(listReportingContainer,this.events[mmdd][j], mmdd + '/' + yyyy, (this._SfStreamContainer as HTMLDivElement))
-        }else{
-          listReportingContainer.innerHTML = '';
-          listReportingContainer.style.display = 'none';
-        }
-      })
-    }
+    this.attachListReportingListeners(this._SfStreamContainer as HTMLDivElement);
     const buttonArr = (this._SfStreamContainer as HTMLDivElement).querySelectorAll('.button-expand') as NodeListOf<HTMLButtonElement>;
 
     for(i = 0; i < buttonArr.length; i++) {
@@ -10806,7 +10780,9 @@ export class SfIEvents extends LitElement {
         html += '</div>';
 
       } */
+      html += '<div part="reporting-view-container">'
       html += this.renderReporting(event, mmddyyyy);
+      html += "</div>"
 
       html += '<div class="d-flex justify-between m-20">';
       html += '<h3 part="results-title" class="m-0"><br />Comments</h3>';
@@ -11044,8 +11020,8 @@ export class SfIEvents extends LitElement {
           for( var p = 0 ; p < this.events[mmdd].length; p ++){
             if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
               
-              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString()})
-              this.events[mmdd][p].lastupdated = new Date().toISOString()
+              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+              this.events[mmdd][p].lastupdated = new Date().toString()
             }
           }
         } else {
@@ -11150,8 +11126,8 @@ export class SfIEvents extends LitElement {
             for( var p = 0 ; p < this.events[mmdd].length; p ++){
               if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                 this.events[mmdd][p].approved = approved
-                this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toISOString()})
-                this.events[mmdd][p].lastupdated = new Date().toISOString()
+                this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString()})
+                this.events[mmdd][p].lastupdated = new Date().toString()
               }
             }
           } else {
@@ -11328,8 +11304,8 @@ export class SfIEvents extends LitElement {
                       for( var p = 0 ; p < this.events[mmdd].length; p ++){
                         if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                           this.events[mmdd][p].documents = docs
-                          this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toISOString()})
-                          this.events[mmdd][p].lastupdated = new Date().toISOString()
+                          this.events[mmdd][p].comments.push({'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString()})
+                          this.events[mmdd][p].lastupdated = new Date().toString()
                         }
                       }
                       if(makercheckers.length > 0) {
@@ -11339,8 +11315,8 @@ export class SfIEvents extends LitElement {
                           if(this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                             this.events[mmdd][p].approved = true
                             // this.events[mmdd][p].documents = docs
-                            this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toISOString()})
-                            this.events[mmdd][p].lastupdated = new Date().toISOString()
+                            this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                            this.events[mmdd][p].lastupdated = new Date().toString()
                           }
                         }
                       }
@@ -17656,7 +17632,7 @@ export class SfIEvents extends LitElement {
     const graphparamnames3 = eventContainer!.querySelectorAll('.graphparamname3') as NodeListOf<HTMLTableCellElement>;
     const streamEventSummary = eventContainer!.querySelector('#stream-event-summary') as HTMLDivElement;
     const streamEventFilters = eventContainer!.querySelector('#stream-event-filter') as HTMLDivElement;
-
+    const buttonListReporting = eventContainer!.querySelector('.button-list-reporting') as HTMLButtonElement;
     if(hide) {
       //this.graphParam = clickedValue;
       streamEventSummary.style.display = 'none';
@@ -17708,7 +17684,7 @@ export class SfIEvents extends LitElement {
           if(eventSubTitles[i] != null) {
             (eventSubTitles[i] as HTMLDivElement).style.display = 'flex';
           }
-          
+          buttonListReporting.style.display = "block";
       } else {
 
         var found = false;
@@ -17734,6 +17710,7 @@ export class SfIEvents extends LitElement {
           if(eventSubTitles[i] != null) {
             (eventSubTitles[i] as HTMLDivElement).style.display = 'none';  
           }
+          buttonListReporting.style.display = 'none';
         } 
       }
 
@@ -17807,6 +17784,7 @@ export class SfIEvents extends LitElement {
     const graphparamnames3 = eventContainer!.querySelectorAll('.graphparamname3') as NodeListOf<HTMLTableCellElement>;
     const streamEventSummary = eventContainer!.querySelector('#stream-event-summary') as HTMLDivElement;
     const streamEventFilters = eventContainer!.querySelector('#stream-event-filter') as HTMLDivElement;
+    const buttonListReporting = eventContainer!.querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>;
 
     if(streamEventSummary == null) {
       return;
@@ -17859,6 +17837,9 @@ export class SfIEvents extends LitElement {
         if(eventSubTitles[i] != null) {
           (eventSubTitles[i] as HTMLDivElement).style.display = 'flex';
         }
+        if(buttonListReporting[i] != null){
+          buttonListReporting[i].style.display = 'block';
+        }
       } else {
         (tables[i] as HTMLDivElement).style.display = 'none';
         //(hiddenFilternames[i] as HTMLDivElement).style.display = 'none';
@@ -17869,6 +17850,9 @@ export class SfIEvents extends LitElement {
         if(eventSubTitles[i] != null) {
           (eventSubTitles[i] as HTMLDivElement).style.display = 'none';
         }
+        if(buttonListReporting[i] != null){
+          buttonListReporting[i].style.display = 'none';
+        }
       }
 
     }