sf-i-events 1.0.816 → 1.0.818

package/src/sf-i-events.ts

@@ -6052,7 +6052,7 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length == 0){
                         
-                        await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage)
+                        await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, event.makercheckers)
                         
                         console.log('this.events', this.events);
                         if(this.mode != "next"){
@@ -6066,7 +6066,7 @@ export class SfIEvents extends LitElement {
                           
                           if(event.makercheckers.length > 0) {
 
-                            await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                            // await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
                             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 = true
@@ -6099,31 +6099,31 @@ export class SfIEvents extends LitElement {
                           //console.log(entityId, locationId, eventId, mmddyyyy);
                           
                           // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
-                          if(parseInt(makercheckersL) > 0) {
-                            bulkBodyReview.push({ 
-                              "mmddyyyy": mmddyyyy,
-                              "projectid": this.projectId, 
-                              "type": "report",
-                              "eventid": eventId,
-                              "comments": reportercomments,
-                              "dateofcompletion": reporterdoc,
-                              "percentage": percentage,
-                              "entityid": entityId,
-                              "locationid": locationId,
-                              "event": null,
-                              "docs": JSON.stringify(docs),
-                              "approved": true,
-                              "username": this.userName,
-                              "reportformatvalues": reportformatvalues,
-                              "reportformatschema": reportformatschema,
-                              "userid": this.userProfileId,
-                              "userrole": this.myRole,
-                              "year": this.calendarStartYYYY,
-                              "module": event.isnotice != null ? "notices" : "events"
-                            } )
-                            // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
-
-                          }else{
+                          // if(parseInt(makercheckersL) > 0) {
+                          //   bulkBodyReview.push({ 
+                          //     "mmddyyyy": mmddyyyy,
+                          //     "projectid": this.projectId, 
+                          //     "type": "report",
+                          //     "eventid": eventId,
+                          //     "comments": reportercomments,
+                          //     "dateofcompletion": reporterdoc,
+                          //     "percentage": percentage,
+                          //     "entityid": entityId,
+                          //     "locationid": locationId,
+                          //     "event": null,
+                          //     "docs": JSON.stringify(docs),
+                          //     "approved": true,
+                          //     "username": this.userName,
+                          //     "reportformatvalues": reportformatvalues,
+                          //     "reportformatschema": reportformatschema,
+                          //     "userid": this.userProfileId,
+                          //     "userrole": this.myRole,
+                          //     "year": this.calendarStartYYYY,
+                          //     "module": event.isnotice != null ? "notices" : "events"
+                          //   } )
+                          //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
+
+                          // }else{
                             bulkBody.push({ 
                               "mmddyyyy": mmddyyyy,
                               "projectid": this.projectId, 
@@ -6142,9 +6142,10 @@ export class SfIEvents extends LitElement {
                               "userid": this.userProfileId,
                               "userrole": this.myRole,
                               "year": this.calendarStartYYYY,
-                              "module": event.isnotice != null ? "notices" : "events"
+                              "module": event.isnotice != null ? "notices" : "events",
+                              "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                             })
-                          }
+                          // }
 
                           // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
                           // await this.sleep(2000);
@@ -6158,9 +6159,9 @@ export class SfIEvents extends LitElement {
                           await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
                         }
                         
-                        if(bulkBodyReview.length > 0){
-                          await this.uploadReportsReviewsBulk(bulkBodyReview)
-                        }
+                        // if(bulkBodyReview.length > 0){
+                        //   await this.uploadReportsReviewsBulk(bulkBodyReview)
+                        // }
                         for(var k = 0; k < this.selectedItemIds.length; k++) {
               
                           const selectedId = this.selectedItemIds[k];
@@ -12953,7 +12954,7 @@ export class SfIEvents extends LitElement {
                       let flagBulk = false;
                       if(this.selectedItemIds.length === 0) {
 
-                        await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage)
+                        await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage, makercheckers)
                         console.log('this.events', this.events);
                         for( var p = 0 ; p < this.events[mmdd].length; p ++){
                           if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
@@ -12965,7 +12966,7 @@ export class SfIEvents extends LitElement {
                         console.log('uploadReport single')
                         if(makercheckers.length > 0) {
 
-                          await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
+                          // await this.uploadReview(entityId, locationId, mmddyyyy, listEvent["id"], "Auto approved", true, "notices");
                           for( var p = 0 ; p < this.events[mmdd].length; p ++){
                             if(this.events[mmdd][p].id == listEvent.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
                               this.events[mmdd][p].approved = true
@@ -12998,31 +12999,31 @@ export class SfIEvents extends LitElement {
                           //console.log(entityId, locationId, eventId, mmddyyyy);
                           
                           // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
-                          if(parseInt(makercheckersL) > 0) {
-                            bulkBodyReview.push({ 
-                              "mmddyyyy": mmddyyyy,
-                              "projectid": this.projectId, 
-                              "type": "report",
-                              "eventid": eventId,
-                              "comments": reportercomments,
-                              "dateofcompletion": reporterdoc,
-                              "percentage": percentage,
-                              "entityid": entityId,
-                              "locationid": locationId,
-                              "event": null,
-                              "docs": JSON.stringify(docs),
-                              "approved": true,
-                              "username": this.userName,
-                              "reportformatvalues": reportformatvalues,
-                              "reportformatschema": reportformatschema,
-                              "userid": this.userProfileId,
-                              "userrole": this.myRole,
-                              "year": this.calendarStartYYYY,
-                              "module": listEvent.isnotice != null ? "notices" : "events"
-                            } )
-                            // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
-
-                          }else{
+                          // if(parseInt(makercheckersL) > 0) {
+                          //   bulkBodyReview.push({ 
+                          //     "mmddyyyy": mmddyyyy,
+                          //     "projectid": this.projectId, 
+                          //     "type": "report",
+                          //     "eventid": eventId,
+                          //     "comments": reportercomments,
+                          //     "dateofcompletion": reporterdoc,
+                          //     "percentage": percentage,
+                          //     "entityid": entityId,
+                          //     "locationid": locationId,
+                          //     "event": null,
+                          //     "docs": JSON.stringify(docs),
+                          //     "approved": true,
+                          //     "username": this.userName,
+                          //     "reportformatvalues": reportformatvalues,
+                          //     "reportformatschema": reportformatschema,
+                          //     "userid": this.userProfileId,
+                          //     "userrole": this.myRole,
+                          //     "year": this.calendarStartYYYY,
+                          //     "module": listEvent.isnotice != null ? "notices" : "events"
+                          //   } )
+                          //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
+
+                          // }else{
                             bulkBody.push({ 
                               "mmddyyyy": mmddyyyy,
                               "projectid": this.projectId, 
@@ -13041,9 +13042,10 @@ export class SfIEvents extends LitElement {
                               "userid": this.userProfileId,
                               "userrole": this.myRole,
                               "year": this.calendarStartYYYY,
-                              "module": listEvent.isnotice != null ? "notices" : "events"
+                              "module": listEvent.isnotice != null ? "notices" : "events",
+                              "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                             })
-                          }
+                          // }
 
                           // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
                           // await this.sleep(2000);
@@ -13057,9 +13059,9 @@ export class SfIEvents extends LitElement {
                           await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
                         }
                         
-                        if(bulkBodyReview.length > 0){
-                          await this.uploadReportsReviewsBulk(bulkBodyReview)
-                        }
+                        // if(bulkBodyReview.length > 0){
+                        //   await this.uploadReportsReviewsBulk(bulkBodyReview)
+                        // }
                         await this.fetchBulkReportingData();
                         console.log('uploadReport bulk')
                         for(var k = 0; k < this.selectedItemIds.length; k++) {
@@ -13532,204 +13534,34 @@ export class SfIEvents extends LitElement {
       html += '</div>';
     html += '</div>';
 
-    html += '</div>';
-
-    // html += '<div class="d-flex m-20 flex-wrap">';
-
-    // for(var k = 0; k < Object.keys(event).length; k++) {
-    //   if(!this.getEventPreviewFields().includes(Object.keys(event)[k])) {
-
-    //     if(!this.getEventHideFields().includes(Object.keys(event)[k])) {
-    //       html += '<div class="m-20">';
-    //       html += '<div part="detail-head"><strong>'+Object.keys(event)[k]+'</strong></div>'
-    //       //console.log(Object.keys(event)[k], event[Object.keys(event)[k]]);
-    //       if((event[Object.keys(event)[k]] + "").indexOf("[") >= 0) {
-    //         html += this.getEventTexts(Object.keys(event)[k], JSON.parse(event[Object.keys(event)[k]]), event);
-    //       } else {
-    //         html += '<sf-i-elastic-text text="'+(event[Object.keys(event)[k]] + "").replace(/"/g, "")+'" minLength="20"></sf-i-elastic-text>';
-    //       }
-    //       html += '</div>';
-    //     }
-        
-    //   }
-    // }
-
-    if(this.mode == "consumer" || this.mode == "next") {
-
-      
-      //console.log('docs received', event['documents']);
-      //console.log('docs received', comments);
-      //console.log('docs received', approved);
-        
-      /* if(this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_FUNCTION_HEAD) {
-
-        if(comments.length > 0) {
-
-          html += '<div class="d-flex justify-between m-20">';
-          html += '<h3 part="results-title" class="m-0"><br />Approve Compliance</h3>';
-          html += '</div>';
-          html += '<div class="m-20" part="report-container">';
-          html += '<div class="d-flex justify-between align-center">'
-            html += '<button class="invisible" part="button">Save</button>'
-            html += '<button id="button-uploader-submit-approve" class="button-submit" part="button">Save</button>'
-          html += '</div>'
-          
-          if(this.myRole != this.TAB_FUNCTION_HEAD && docs.length > 0) {
-            html += '<div class="m-20">';
-            html += '<label part="input-label">Supporting Documents</label>';
-            html += '<slot name="uploader"></slot>';
-            html += '<div part="uploader-analysis-message" class="uploader-analysis-message mt-20">The analysis is running in the background. You can proceed further.</div>'
-            html += '</div>';  
-          }
-
-          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 += '<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 />';
-            html += '<div>'
-              html += '<label part="input-label">Approve?*</label><br />';
-              html += '<div class="mt-5">'
-              html += '<input id="input-approve-yes" name="radio-approved" type="radio"/> Yes';
-              html += '<input id="input-approve-no" name="radio-approved" type="radio" checked/> No';
-              html += '</div>'
-            html += '</div>';
-          html += '</div>';
-          html += '</div>';
-
-        }
-
-      } 
+    html += '<div class="accordian-section section-feedback pl-20 pr-20" part="accordian-section">';
+      html += '<div class="d-flex justify-between accordian-head head-feedback" part="accordian-head">';
+        html += '<h3>Feedback</h3>'
+        html += '<h3 class="head-indicator-feedback">+</h3>'
+      html += '</div>';
+      html += '<div class="d-flex flex-wrap accordian-body body-feedback hide" part="accordian-body">';
       
-      if(this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) {
-
-        html += '<div class="d-flex justify-between m-20">';
-        html += '<h3 part="results-title" class="m-0"><br />Report Compliance</h3>';
-        html += '</div>';
-
-        var showSubmissionSection = true;
-        var showGoogleFormLink = false;
-
-        if(event['form'].length > 5) {
-
-          if(event['form'].indexOf('docs.google.com/forms') >= 0) {
-            showSubmissionSection = false;
-            if(!approved) {
-              showGoogleFormLink = true;
-              
-            }
-          }
-          
-        }
-
-        if(showGoogleFormLink) {
-          html += ('<div part="detail-summary-form" class="mt-20 pl-20 pr-20"><button part="button" onclick="window.open(\'' + event['form'] + (this.projectId + '_' + entityId + '_' + locationId + '_' + event['id'] + '_' + mmddyyyy) + '\',\'_blank\')">Submit Via Link</button></div>');
-        }
-
-        if(showSubmissionSection) {
-
-          html += '<div class="m-20" part="report-container">';
-          html += '<div class="d-flex justify-between align-center">'
-            html += '<button class="invisible" part="button">Save</button>'
-            html += '<button id="button-uploader-submit-report" class="button-submit" part="button">Save</button>'
-          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 += '<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 />';
-            // if(docsOptional.length === 0) {
-              html += '<label part="input-label">Supporting Documents' + ((docsOptional.length > 0) ? '' : '*') + '</label>';
-
-              if(event['uploadguidance'] != null && event['uploadguidance'].length > 0) {
-                html += ('<div part="uploader-analysis-message">'+event['uploadguidance']+'</div>');
-              }
-
-              html += '<slot name="uploader"></slot>';
-              html += '<div part="uploader-analysis-message" class="uploader-analysis-message mt-20">The analysis is running in the background. You can proceed further.</div>'
-            // }
-            html += '<br />';
-            if(event['reportformat'] != null && event['reportformat'].length > 0){
-              html += '<div id="report-format-container"><div class="box"></div></div>'
-            }
-            html += '<br />';
-            if(makercheckers.length > 0) {
-              html += '<div part="td-head" class="td-head d-flex justify-center align-center"><span class="material-symbols-outlined">check_small</span><div>&nbsp;Auto-approve Enabled</div></div>';
-            
-              if(completeness == "pending-approval" && this.enableDeleteLatestReport) {
-                html += '<div part="td-head" class="td-head d-flex justify-center align-center"><button class="mt-5" part="button" id="button-auto-approve">Auto Approve</button></div>';
-              }
-            }
-          html += '</div>';
-          html += '</div>';
-
-        }
-
-
-        
-
-      }
-
-      if(this.myRole == this.TAB_AUDITOR) {
-
-        html += '<div class="d-flex justify-between m-20">';
-        html += '<h3 part="results-title" class="m-0"><br />Audit Compliance</h3>';
-        html += '</div>';
-        html += '<div class="m-20" part="report-container">';
-        html += '<div class="d-flex justify-between align-center">'
-          html += '<button class="invisible" part="button">Save</button>'
-          html += '<button id="button-uploader-submit-audit" class="button-submit" part="button">Save</button>'
+      html += '<div class="d-flex justify-end w-100 flex-wrap">'
+        html += '<div class="d-flex w-100 mb-10">'
+          html += '<div part="feedback-message">Do you wish to send us feedback about this compliance? Any doubts? Need guidance or more clarity? Drop us a feedback and we will revert soon.</div>'
         html += '</div>'
-
-        html += '<div class="d-flex m-20 flex-col">';
-          html += '<label part="input-label">Auditor Comments</label>';
-          html += '<input id="input-auditor-comments" type="text" part="input" value=""/><br />';
-          html += '<label part="input-label">Date of Completion</label>';
-          html += '<input id="input-auditor-doc" part="input" type="date" value="'+(dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0,10))+'" max="'+(new Date().toISOString().substring(0, 10))+'" readonly/><br />';
-          html += '<div>'
-              html += '<label part="input-label">Approve?</label><br />';
-              html += '<div class="mt-5">'
-              html += '<input id="input-approve-yes" name="radio-approved" type="radio" checked/> Yes';
-              html += '<input id="input-approve-no" name="radio-approved" type="radio"/> No';
-              html += '</div>'
-            html += '</div>';
-          html += '<br />';
-          if(docs.length > 0) {
-            html += '<label part="input-label">Supporting Documents</label>';
-            html += '<slot name="uploader"></slot>';
-            html += '<div part="uploader-analysis-message" class="uploader-analysis-message mt-20">The analysis is running in the background. You can proceed further.</div>'
-          }
-        html += '</div>';
-        html += '</div>';
-
-      }
+        html += '<div class="d-flex justify-end w-100 mb-10">'
+          html += '<textarea part="input" id="feedback-message" class="w-100 mt-10 mb-10 hide" placeholder="Type your feedback message here..."></textarea>'
+        html += '</div>'
+        html += '<div class="d-flex w-100">'
+          html += ('<button part="button-lg-short" id="button-feedback" class="d-flex justify-center align-center"><span class="material-symbols-outlined">comment</span><span>&nbsp;&nbsp;Send Feedback</span></button>');
+          html += ('<button part="button-lg-short-secondary" id="button-feedback-cancel" class="hide d-flex justify-center align-center mr-10"><span class="material-symbols-outlined">close</span><span>&nbsp;&nbsp;Cancel</span></button>');
+          html += ('<button part="button-lg-short" id="button-feedback-confirm" class="hide d-flex justify-center align-center"><span class="material-symbols-outlined">commentcheck</span><span>&nbsp;&nbsp;Submit Feedback</span></button>');
+        html += '</div>'
+      html += '</div>'
       
-      if(this.myRole == this.TAB_VIEWER) {
+      html += '</div>';
+    html += '</div>';
 
-        html += '<div class="d-flex justify-between m-20">';
-        html += '<h3 part="results-title" class="m-0"><br />View Compliance</h3>';
-        html += '</div>';
-        html += '<div class="m-20" part="report-container">';
+    html += '</div>';
 
-        html += '<div class="d-flex m-20 flex-col">';
-          html += '<div>'
-              html += '<label part="input-label">Approve?</label><br />';
-              html += '<div class="mt-5">'
-              html += '<input id="input-approve-yes" name="radio-approved" type="radio" checked/> Yes';
-              html += '<input id="input-approve-no" name="radio-approved" type="radio"/> No';
-              html += '</div>'
-            html += '</div>';
-          html += '<br />';
-          if(docs.length === 0) {
-            html += '<label part="input-label">Supporting Documents</label>';
-            html += '<slot name="uploader"></slot>';
-            html += '<div part="uploader-analysis-message" class="uploader-analysis-message mt-20">The analysis is running in the background. You can proceed further.</div>'
-          }
-        html += '</div>';
-        html += '</div>';
+    if(this.mode == "consumer" || this.mode == "next") {
 
-      } */
       html += '<div part="reporting-view-container">'
       html += this.renderReporting(event, mmddyyyy);
       html += "</div>"
@@ -13949,6 +13781,118 @@ export class SfIEvents extends LitElement {
       }
     });
 
+    (this._SfDetailContainer as HTMLDivElement).querySelector('.head-feedback')?.addEventListener('click', () => {
+      if(((this._SfDetailContainer as HTMLDivElement).querySelector('.body-feedback') as HTMLDivElement).style.display == 'flex') {
+        ((this._SfDetailContainer as HTMLDivElement).querySelector('.body-feedback') as HTMLDivElement).style.display = 'none';
+        ((this._SfDetailContainer as HTMLDivElement).querySelector('.head-indicator-feedback') as HTMLDivElement).innerHTML = '+';
+      } else {
+        ((this._SfDetailContainer as HTMLDivElement).querySelector('.body-feedback') as HTMLDivElement).style.display = 'flex';
+        ((this._SfDetailContainer as HTMLDivElement).querySelector('.head-indicator-feedback') as HTMLDivElement).innerHTML = '-';
+      }
+    });
+
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close')?.addEventListener('click', () => {
+
+      (this._SfDetailContainer as HTMLDivElement).innerHTML = '';
+      (this._SfDetailContainer as HTMLDivElement).style.display = 'none';
+
+    });
+
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback')?.addEventListener('click', () => {
+
+      const feedbackMessage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#feedback-message') as HTMLTextAreaElement);
+      const buttonFeedback = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback') as HTMLButtonElement);
+      const buttonCancel = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-cancel') as HTMLButtonElement);
+      const buttonConfirm = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-confirm') as HTMLButtonElement);
+      
+      console.log(buttonConfirm.classList);
+
+      if(feedbackMessage.classList.contains('hide')) {
+        feedbackMessage.classList.remove('hide');
+      }
+      
+      if(buttonConfirm.classList.contains('hide')) {
+        buttonConfirm.classList.remove('hide');
+      }
+
+      if(buttonCancel.classList.contains('hide')) {
+        buttonCancel.classList.remove('hide');
+      }
+
+      if(!buttonFeedback.classList.contains('hide')) {
+        buttonFeedback.classList.add('hide');
+      }
+
+      // const body = {
+      //   projectid: this.projectId,
+      //   complianceid: compliance.id
+      // }
+      // console.log(body);
+
+    });
+
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-cancel')?.addEventListener('click', () => {
+
+      const feedbackMessage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#feedback-message') as HTMLTextAreaElement);
+      const buttonFeedback = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback') as HTMLButtonElement);
+      const buttonCancel = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-cancel') as HTMLButtonElement);
+      const buttonConfirm = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-confirm') as HTMLButtonElement);
+      
+      console.log(buttonConfirm.classList);
+
+      if(!feedbackMessage.classList.contains('hide')) {
+        feedbackMessage.classList.add('hide');
+      }
+      
+      if(!buttonConfirm.classList.contains('hide')) {
+        buttonConfirm.classList.add('hide');
+      }
+
+      if(!buttonCancel.classList.contains('hide')) {
+        buttonCancel.classList.add('hide');
+      }
+
+      if(buttonFeedback.classList.contains('hide')) {
+        buttonFeedback.classList.remove('hide');
+      }
+
+    });
+
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-confirm')?.addEventListener('click', async () => {
+
+      const feedbackMessage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#feedback-message') as HTMLTextAreaElement);
+      const buttonCancel = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-cancel') as HTMLButtonElement);
+      const buttonClose = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement);
+      console.log('sending feedback', event);
+      if(feedbackMessage.value.length === 0) {
+        feedbackMessage.setAttribute('style', 'border:solid 2px ' + this.COLOR_REJECTED + ' !important');
+      } else {
+        feedbackMessage.setAttribute('style', 'border:');
+        this.uploadTriggerMyEvent(
+          event.id + ";" + event.shortid, 
+          feedbackMessage.value, 
+          event.countries.join(",").replace(/ *\([^)]*\) */g, ""), 
+          event.entities.join(',').replace(/ *\([^)]*\) */g, ""), 
+          event.locations.join(',').replace(/ *\([^)]*\) */g, ""), 
+          event.statute[0], 
+          event.subcategory[0]);
+        buttonCancel.click();
+        buttonClose.click();
+      }
+      
+    });
+
+    (this._SfDetailContainer as HTMLDivElement).querySelector('#feedback-message')?.addEventListener('keyup', (e: any) => {
+
+      if(e.code == "Enter") {
+
+        const buttonConfirm = ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-feedback-confirm') as HTMLButtonElement);
+        buttonConfirm.click();
+
+      }
+
+    })
+
     if(this.mode == "consumer" || this.mode == "next") {
 
       (this._SfDetailContainer as HTMLDivElement).querySelector('#button-uploader-submit-approve')?.addEventListener('click', async (ev:any) => {
@@ -14288,7 +14232,7 @@ export class SfIEvents extends LitElement {
                         //console.log('makerscheckers', makercheckers, reportercomments);
                         // console.log('reportformatvalues', reportformatvalues)
                         // console.log('reportformatschema',reportformatschema)
-                        await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage)
+                        await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage, makercheckers)
                         console.log('this.events', this.events);
                         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){
@@ -14299,12 +14243,12 @@ export class SfIEvents extends LitElement {
                         }
                         if(makercheckers.length > 0) {
 
-                          await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                          // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
                           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 = true
                               // this.events[mmdd][p].documents = docs
-                              this.events[mmdd][p].comments.push({'author': 'Auditor', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                              this.events[mmdd][p].comments.push({'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
                               this.events[mmdd][p].lastupdated = new Date().toString()
                             }
                           }
@@ -14349,31 +14293,31 @@ export class SfIEvents extends LitElement {
                           //   "module": event.isnotice != null ? "notices" : "events"
                           // })
                           // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
-                          if(parseInt(makercheckersL) > 0) {
-                            bulkBodyReview.push({ 
-                              "mmddyyyy": mmddyyyy,
-                              "projectid": this.projectId, 
-                              "type": "report",
-                              "eventid": eventId,
-                              "comments": reportercomments,
-                              "dateofcompletion": reporterdoc,
-                              "percentage": percentage,
-                              "entityid": entityId,
-                              "locationid": locationId,
-                              "event": null,
-                              "docs": JSON.stringify(docs),
-                              "approved": true,
-                              "username": this.userName,
-                              "reportformatvalues": reportformatvalues,
-                              "reportformatschema": reportformatschema,
-                              "userid": this.userProfileId,
-                              "userrole": this.myRole,
-                              "year": this.calendarStartYYYY,
-                              "module": event.isnotice != null ? "notices" : "events"
-                            } )
-                            // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
-
-                          }else{
+                          // if(parseInt(makercheckersL) > 0) {
+                          //   bulkBodyReview.push({ 
+                          //     "mmddyyyy": mmddyyyy,
+                          //     "projectid": this.projectId, 
+                          //     "type": "report",
+                          //     "eventid": eventId,
+                          //     "comments": reportercomments,
+                          //     "dateofcompletion": reporterdoc,
+                          //     "percentage": percentage,
+                          //     "entityid": entityId,
+                          //     "locationid": locationId,
+                          //     "event": null,
+                          //     "docs": JSON.stringify(docs),
+                          //     "approved": true,
+                          //     "username": this.userName,
+                          //     "reportformatvalues": reportformatvalues,
+                          //     "reportformatschema": reportformatschema,
+                          //     "userid": this.userProfileId,
+                          //     "userrole": this.myRole,
+                          //     "year": this.calendarStartYYYY,
+                          //     "module": event.isnotice != null ? "notices" : "events"
+                          //   } )
+                          //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
+
+                          // }else{
                             bulkBody.push({ 
                               "mmddyyyy": mmddyyyy,
                               "projectid": this.projectId, 
@@ -14392,9 +14336,10 @@ export class SfIEvents extends LitElement {
                               "userid": this.userProfileId,
                               "userrole": this.myRole,
                               "year": this.calendarStartYYYY,
-                              "module": event.isnotice != null ? "notices" : "events"
+                              "module": event.isnotice != null ? "notices" : "events",
+                              "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                             })
-                          }
+                          // }
 
                           // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
                           // await this.sleep(2000);
@@ -14406,9 +14351,9 @@ export class SfIEvents extends LitElement {
                           await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
                         }
                         // await this.fetchBulkReportingData();
-                        if(bulkBodyReview.length > 0){
-                          await this.uploadReportsReviewsBulk(bulkBodyReview)
-                        }
+                        // if(bulkBodyReview.length > 0){
+                        //   await this.uploadReportsReviewsBulk(bulkBodyReview)
+                        // }
                         for(var k = 0; k < this.selectedItemIds.length; k++) {
               
                           const selectedId = this.selectedItemIds[k];
@@ -22583,8 +22528,8 @@ 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 = "events", percentage: string = "100") => {
-    let url = "https://"+this.apiId+"/uploadreport";
+  uploadReport = async (entityId: string, locationId: string, mmddyyyy: string, eventid: string, comments: string, doc: string, docs: any, event: any, reportformatvalues: string = "", reportformatschema: string = "", module: string = "events", percentage: string = "100", makercheckers: any) => {
+    let url = "https://"+this.apiId+"/uploadreport1";
 
     let body = { 
       "mmddyyyy": mmddyyyy,
@@ -22604,7 +22549,8 @@ export class SfIEvents extends LitElement {
       "userid": this.userProfileId,
       "userrole": this.myRole,
       "year": this.calendarStartYYYY,
-      "module": module
+      "module": module,
+      "makercheckers": makercheckers
     }
 
     //console.log(body);
@@ -22638,7 +22584,7 @@ export class SfIEvents extends LitElement {
   }
 
   uploadReportsBulk = async (bulkBody: any, showSuccess: boolean = true) => {
-    let url = "https://"+this.apiId+"/uploadreportsbulk"
+    let url = "https://"+this.apiId+"/uploadreportsbulk1"
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(bulkBody, url, this._SfLoader, authorization)) as any;