sf-i-events 1.0.803 → 1.0.804

package/src/sf-i-events.ts

@@ -116,6 +116,7 @@ export class SfIEvents extends LitElement {
   COLOR_NOT_COMPLIED = "#C80036";
   COLOR_PARTIALLY_COMPLIED = "#F79256";
   COLOR_COMPLIED = "#50cf01";
+  COLOR_COMPLIED_WITH_EXCEPTION = "#ffe505";
   STATUS_NOT_STARTED = "not-started";
   STATUS_PENDING_APPROVAL = "pending-approval";
   STATUS_REJECTED = "rejected";
@@ -431,6 +432,9 @@ export class SfIEvents extends LitElement {
         .color-complied {
           color: #50cf01;
         }
+        .color-complied-with-exception {
+          color: #ffe505;
+        }
         .color-scheduled {
           color: #888888;
         }
@@ -637,6 +641,9 @@ export class SfIEvents extends LitElement {
         .color-complied {
           color: #50cf01;
         }
+        .color-complied-with-exception {
+          color: #ffe505;
+        }
         .color-scheduled {
           color: #888888;
         }
@@ -2121,6 +2128,9 @@ export class SfIEvents extends LitElement {
     .color-complied {
       color: #50cf01;
     }
+    .color-complied-with-exception {
+      color: #ffe505;
+    }
     .color-scheduled {
       color: #888888;
     }
@@ -3896,6 +3906,9 @@ export class SfIEvents extends LitElement {
       if(arrComplianceData[name]["complied"] == null) {
         arrComplianceData[name]["complied"] = 0;
       }
+      if(arrComplianceData[name]["complied-with-exception"] == null) {
+        arrComplianceData[name]["complied-with-exception"] = 0;
+      }
 
       arrComplianceData[name][complianceStatus]++;
 
@@ -4190,7 +4203,7 @@ export class SfIEvents extends LitElement {
 
   }
 
-  getComplianceStatus = (completeness: string, timeliness: string) => {
+  getComplianceStatus = (completeness: string, timeliness: string, percentage?: string) => {
 
     if(completeness == "not-started") {
 
@@ -4221,7 +4234,11 @@ export class SfIEvents extends LitElement {
     } else {
 
       if(timeliness == "in-time" || timeliness == "late-reported" || timeliness == "late-approved") {
-        return "complied";
+        if(percentage != null && parseInt(percentage) < 100){
+          return "complied-with-exception"
+        }else{
+          return "complied";
+        }
       } else {
         return "not-complied";
       }
@@ -4406,6 +4423,7 @@ export class SfIEvents extends LitElement {
     html += '<div part="badge-dashboard" id="chip-compliance-1" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-not-complied">disabled_by_default</span>&nbsp;&nbsp;<span>Not Complied:</span>&nbsp;<span id="graph-not-complied">DASHBOARD_NOT_COMPLIED</span></div>';
     html += '<div part="badge-dashboard" id="chip-compliance-2" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-partially-complied">rule</span>&nbsp;&nbsp;<span>Partially Complied:</span>&nbsp;<span id="graph-partially-complied">DASHBOARD_PARTIALLY_COMPLIED</span></div>';
     html += '<div part="badge-dashboard" id="chip-compliance-3" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied">sweep</span>&nbsp;&nbsp;<span>Complied:</span>&nbsp;<span id="graph-complied">DASHBOARD_COMPLIED</span></div>';
+    html += '<div part="badge-dashboard" id="chip-compliance-4" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied-with-exception">rule</span>&nbsp;&nbsp;<span>Complied With Exception:</span>&nbsp;<span id="graph-complied-with-exception">DASHBOARD_COMPLIED_WITH_EXCEPTION</span></div>';
     html += '</div>';
 
     html += '<div id="stream-event-filter" part="stream-event-total" class="d-flex flex-wrap"></div>';
@@ -4433,6 +4451,7 @@ export class SfIEvents extends LitElement {
     html += '<div part="badge-dashboard" id="chip-compliance-1" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-not-complied">disabled_by_default</span>&nbsp;&nbsp;<span>Not Complied:</span>&nbsp;<span id="graph-not-complied">DASHBOARD_NOT_COMPLIED</span></div>';
     html += '<div part="badge-dashboard" id="chip-compliance-2" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-icons color-partially-complied">rule</span>&nbsp;&nbsp;<span>Partially Complied:</span>&nbsp;<span id="graph-partially-complied">DASHBOARD_PARTIALLY_COMPLIED</span></div>';
     html += '<div part="badge-dashboard" id="chip-compliance-3" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied">sweep</span>&nbsp;&nbsp;<span>Complied:</span>&nbsp;<span id="graph-complied">DASHBOARD_COMPLIED</span></div>';
+    html += '<div part="badge-dashboard" id="chip-compliance-4" class="chip stat-compliance justify-center align-center mr-10 mb-10 no-shrink compliance-statuses"><span class="material-symbols-outlined color-complied-with-exception">rule</span>&nbsp;&nbsp;<span>Complied With Exception:</span>&nbsp;<span id="graph-complied-with-exception">DASHBOARD_COMPLIED_WITH_EXCEPTION</span></div>';
     html += '</div>';
 
     html += '<div id="stream-event-filter" part="stream-event-total" class="d-flex flex-wrap"></div>';
@@ -4826,6 +4845,7 @@ export class SfIEvents extends LitElement {
     html += (complianceStatus == "not-complied" ? '<span class="material-symbols-outlined color-not-complied color-not-complied-item color-not-complied-item-'+i+'">disabled_by_default</span>' : '');
     html += (complianceStatus == "partially-complied" ? '<span class="material-symbols-outlined color-partially-complied color-partially-complied-item color-partially-complied-item-'+i+'">rule</span>' : '');
     html += (complianceStatus == "complied" ? '<span class="material-symbols-outlined color-complied color-complied-item color-complied-item-'+i+'">sweep</span>' : '');
+    html += (complianceStatus == "complied-with-exception" ? '<span class="material-symbols-outlined color-complied-with-exception color-complied-with-exception-item color-complied-with-exception-item-'+i+'">rule</span>' : '');
     
     html += (partStatus == "not-started" ? '<span class="material-symbols-outlined color-not-started color-not-started-item color-not-started-item-'+i+'">schedule</span>' : '');
     html += (partStatus == "pending-approval" ? '<span class="material-symbols-outlined color-pending color-pending-item color-pending-item-'+i+'">pending</span>' : '');
@@ -4899,7 +4919,7 @@ export class SfIEvents extends LitElement {
   }
 
   renderEvents = (_firstDay: any, _endDay: any, iInit: number, iLast: number, showGraph: boolean, index: number, month: number, period: string, firstDate: any = null, parametersTitle: string, showBackgroundButton: boolean) => {
-    var total = 0, notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0, inTime = 0, pastDueDate = 0, lateExecuted = 0, lateApproved = 0, lateReported = 0, scheduled = 0, partiallyComplied = 0, notComplied = 0, complied = 0;
+    var total = 0, notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0, inTime = 0, pastDueDate = 0, lateExecuted = 0, lateApproved = 0, lateReported = 0, scheduled = 0, partiallyComplied = 0, notComplied = 0, complied = 0, compliedWithException = 0;
     var html = '';
     this.selectedItemIds = [];
     this.selectedItems = [];
@@ -4973,7 +4993,7 @@ export class SfIEvents extends LitElement {
 
           partStatus = this.getCompletenessStatus(JSON.parse(JSON.stringify(this.events[mmdd][j])));
           lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(this.events[mmdd][j])), partStatus);
-          complianceStatus = this.getComplianceStatus(partStatus, lateStatus);
+          complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(this.events[mmdd][j])).percentage);
           if(this.flowGraph == this.FLOW_GRAPH_TIMELINESS){
             bgStatus += lateStatus
           }else if(this.flowGraph == this.FLOW_GRAPH_COMPLIANCE){
@@ -4997,6 +5017,7 @@ export class SfIEvents extends LitElement {
           partiallyComplied = partiallyComplied + (complianceStatus == "partially-complied" ? 1 : 0);
           notComplied = notComplied + (complianceStatus == "not-complied" ? 1 : 0);
           complied = complied + (complianceStatus == "complied" ? 1 : 0);
+          compliedWithException = compliedWithException + (complianceStatus == "complied-with-exception" ? 1 : 0);
 
           this.events[mmdd][j][this.FLOW_GRAPH_COMPLETENESS] = partStatus;
           this.events[mmdd][j][this.FLOW_GRAPH_TIMELINESS] = lateStatus;
@@ -5137,6 +5158,7 @@ export class SfIEvents extends LitElement {
     html = html.replace("DASHBOARD_NOT_COMPLIED", notComplied+"");
     html = html.replace("DASHBOARD_PARTIALLY_COMPLIED", partiallyComplied+"");
     html = html.replace("DASHBOARD_COMPLIED", complied+"");
+    html = html.replace("DASHBOARD_COMPLIED_WITH_EXCEPTION", compliedWithException+"");
 
     this.csvDataStats = 'Period,Total,Not Started,Approved,Pending Approval,Rejected,Past Due Date,Late Reported,Late Executed,Late Approved,Scheduled,Not Complied,Partially Complied,Complied\n';
     this.csvDataStats += this.period + "," + total + "," + notStarted + "," + approved + "," + pendingApproval + "," + rejected + "," + pastDueDate + "," + lateReported + "," + lateExecuted + "," + lateApproved + "," + scheduled + "," + notComplied + "," + partiallyComplied + "," + complied;
@@ -5397,13 +5419,16 @@ export class SfIEvents extends LitElement {
     return html;
   }
   renderReporting = (event: any, mmddyyyy: any) => {
+    
     let html = '';
     let completeness = this.getCompletenessStatus(event);
     let docs = event['documents'] == null ? [] : event['documents'];
     let approved = event['approved'] == null ? false : event['approved'];
     let dateOfCompletion = event['dateofcompletion'] == null ? '' : event['dateofcompletion'];
+    let percentage = event['percentage'] == null ? '100' : event['percentage'];
     let makercheckers = event['makercheckers'] == null ? [] : event['makercheckers']; 
     let docsOptional = event['docs'] == null ? [] : event['docs'];
+    console.log('rendering reporting', event, percentage)
     if(this.selectedItemIds.length > 0){
       html += `<div class="d-flex justify-between ">
         <h4 class="m-0 bulk-upload-label" part="bulk-upload-label">${this.selectedItemIds.length - 1} other ` + ((this.selectedItemIds.length - 1) === 1 ? `item` : `items`) + ` also selected</h4>
@@ -5434,6 +5459,8 @@ export class SfIEvents extends LitElement {
           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 += '<label part="input-label">Percentage</label>';
+          html += '<input id="input-reporter-percentage" part="input" type="number" max="100" min="0" step="1" value="' + percentage + '" disabled/><br />';
           html += '<div>'
             html += '<label part="input-label">Approve?*</label><br />';
             html += '<div class="mt-5">'
@@ -5486,6 +5513,8 @@ export class SfIEvents extends LitElement {
           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 />';
+          html += '<label part="input-label">Completion Percentage*</label>';
+          html += '<input id="input-reporter-percentage" part="input" type="number" value="' + percentage + '" max="100" min="0" step="1"/><br />';
           // if(docsOptional.length === 0) {
             html += '<label part="input-label">Supporting Documents' + ((docsOptional.length > 0) ? '' : '*') + '</label>';
 
@@ -5531,6 +5560,8 @@ export class SfIEvents extends LitElement {
         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 += '<label part="input-label">Percentage</label>';
+        html += '<input id="input-reporter-percentage" part="input" type="number" max="100" min="0" step="1" value="' + percentage + '" disabled/><br />';
         html += '<div>'
             html += '<label part="input-label">Approve?</label><br />';
             html += '<div class="mt-5">'
@@ -5940,8 +5971,10 @@ export class SfIEvents extends LitElement {
                 reportformatvalues = JSON.stringify((this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.selectedValues()) ?? "";
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
-              
-              console.log('docs', docs, 'docsOptional', event.docsOptional, this.graphFilter)
+              let percentage: string = "100";
+              if((listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement) != null){
+                percentage = (listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement).value
+              }
               if(docs.length == 0 && event.docsOptional != null && event.docsOptional.length === 0) {
 
                 //console.log('reporter comments 3', reportercomments);
@@ -5952,182 +5985,193 @@ export class SfIEvents extends LitElement {
                 }, 3000);
 
               } else {
+                if(docs.length == 0 && event.docsOptional != null && event.docsOptional.length === 0) {
 
-                //console.log('reporterdoc', reporterdoc);
-
-                if(reporterdoc.length === 0) {
+                  //console.log('reporter comments 3', reportercomments);
                   buttonClick.innerHTML = "Save"
-                  this.setError('Date of completion not selected!');
+                  this.setError('No documents uploaded!');
                   setTimeout(() => {
                     this.clearMessages();
                   }, 3000);
 
                 } else {
 
-                  //console.log('makerscheckers 1', reportercomments);
+                  //console.log('reporterdoc', reporterdoc);
 
-                  if(reportercomments.trim().length === 0) {
+                  if(reporterdoc.length === 0) {
                     buttonClick.innerHTML = "Save"
-                    this.setError('Comments cannot be blank!');
+                    this.setError('Date of completion not selected!');
                     setTimeout(() => {
                       this.clearMessages();
                     }, 3000);
 
                   } else {
-                    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")
-                      
-                      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 == 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().toString()})
-                          this.events[mmdd][p].lastupdated = new Date().toString()
-                        }
-                      }
-                      
-                      if(event.makercheckers.length > 0) {
 
-                        await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, event.isnotice != null ? "notices" : "events");
+                    //console.log('makerscheckers 1', reportercomments);
+
+                    if(reportercomments.trim().length === 0) {
+                      buttonClick.innerHTML = "Save"
+                      this.setError('Comments cannot be blank!');
+                      setTimeout(() => {
+                        this.clearMessages();
+                      }, 3000);
+
+                    } else {
+                      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)
+                        
+                        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 == 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': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString()})
+                            this.events[mmdd][p].documents = docs
+                            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(this.recentlyReported[mmdd] == null){
-                        this.recentlyReported[mmdd] = []
-                      }
-                      this.recentlyReported[mmdd].push(event)
-                      console.log('recently reported', this.recentlyReported)
-                    }else{
-                      let bulkBody = []
-                      let bulkBodyReview = []
-                      for(var k = 0; k < this.selectedItemIds.length; k++) {
                         
-                        const selectedId = this.selectedItemIds[k];
-                        //console.log('selectedid', selectedId);
-
-                        const makercheckersL = selectedId.split('-')[5];
-                        let entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                        let locationId = selectedId.split('-')[8].replace(/_/g, '-');
-                        const eventId = selectedId.split('-')[9].replace(/_/g, '-');
-                        mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+                        if(event.makercheckers.length > 0) {
+
+                          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
+                              // this.events[mmdd][p].documents = docs
+                              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()
+                            }
+                          }
+                        }
+                        if(this.recentlyReported[mmdd] == null){
+                          this.recentlyReported[mmdd] = []
+                        }
+                        this.recentlyReported[mmdd].push(event)
+                        console.log('recently reported', this.recentlyReported)
+                      }else{
+                        let bulkBody = []
+                        let bulkBodyReview = []
+                        for(var k = 0; k < this.selectedItemIds.length; k++) {
+                          
+                          const selectedId = this.selectedItemIds[k];
+                          //console.log('selectedid', selectedId);
 
-                        //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,
-                            "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);
+                          const makercheckersL = selectedId.split('-')[5];
+                          let entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                          let locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                          const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                          mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
 
-                        }else{
-                          bulkBody.push({ 
-                            "mmddyyyy": mmddyyyy,
-                            "projectid": this.projectId, 
-                            "type": "report",
-                            "eventid": eventId,
-                            "comments": reportercomments,
-                            "dateofcompletion": reporterdoc,
-                            "entityid": entityId,
-                            "locationid": locationId,
-                            "event": null,
-                            "docs": JSON.stringify(docs),
-                            "username": this.userName,
-                            "reportformatvalues": reportformatvalues,
-                            "reportformatschema": reportformatschema,
-                            "userid": this.userProfileId,
-                            "userrole": this.myRole,
-                            "year": this.calendarStartYYYY,
-                            "module": event.isnotice != null ? "notices" : "events"
-                          })
-                        }
+                          //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{
+                            bulkBody.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),
+                              "username": this.userName,
+                              "reportformatvalues": reportformatvalues,
+                              "reportformatschema": reportformatschema,
+                              "userid": this.userProfileId,
+                              "userrole": this.myRole,
+                              "year": this.calendarStartYYYY,
+                              "module": event.isnotice != null ? "notices" : "events"
+                            })
+                          }
 
-                        // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
-                        // await this.sleep(2000);
-                        // this.clearMessages();
+                          // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
+                          // await this.sleep(2000);
+                          // this.clearMessages();
 
-                      }
-                      // await this.uploadReportsBulk(bulkBody);
-                      
-                      // await this.fetchBulkReportingData();
-                      if(bulkBody.length > 0){
-                        await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
-                      }
-                      
-                      if(bulkBodyReview.length > 0){
-                        await this.uploadReportsReviewsBulk(bulkBodyReview)
-                      }
-                      for(var k = 0; k < this.selectedItemIds.length; k++) {
-            
-                        const selectedId = this.selectedItemIds[k];
-                        //console.log('selectedid', selectedId);
-                        let entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                        let locationId = selectedId.split('-')[8].replace(/_/g, '-');
-                        const eventId = selectedId.split('-')[9].replace(/_/g, '-');
-                        mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
-                        let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
-                        for( var p = 0 ; p < this.events[mmdd].length; p ++){
-                          if(this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
-                            flagBulk = true;
-                            this.events[mmdd][p].isbulk = true
-                            if(this.recentlyReported[mmdd] == null){
-                              this.recentlyReported[mmdd] = []
+                        }
+                        // await this.uploadReportsBulk(bulkBody);
+                        
+                        // await this.fetchBulkReportingData();
+                        if(bulkBody.length > 0){
+                          await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
+                        }
+                        
+                        if(bulkBodyReview.length > 0){
+                          await this.uploadReportsReviewsBulk(bulkBodyReview)
+                        }
+                        for(var k = 0; k < this.selectedItemIds.length; k++) {
+              
+                          const selectedId = this.selectedItemIds[k];
+                          //console.log('selectedid', selectedId);
+                          let entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                          let locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                          const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                          mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+                          let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
+                          for( var p = 0 ; p < this.events[mmdd].length; p ++){
+                            if(this.events[mmdd][p].id == eventId && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId){
+                              flagBulk = true;
+                              this.events[mmdd][p].isbulk = true
+                              if(this.recentlyReported[mmdd] == null){
+                                this.recentlyReported[mmdd] = []
+                              }
+                              this.recentlyReported[mmdd].push(this.events[mmdd][p])
                             }
-                            this.recentlyReported[mmdd].push(this.events[mmdd][p])
                           }
                         }
                       }
-                    }
 
-                    if(this.mode == "next"){
-                      this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
-                    }else{
-                      // if(this.getCurrentTab() == this.TAB_CUSTOM) {
-                      //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
-                      // } else 
-                      if(this.getCurrentTab() == this.TAB_FIND) {
-                        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.mode == "next"){
+                        this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
+                      }else{
+                        // if(this.getCurrentTab() == this.TAB_CUSTOM) {
+                        //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
+                        // } else 
+                        if(this.getCurrentTab() == this.TAB_FIND) {
+                          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();
+                          }
+                          this.renderAppropriateStream(this.sdate,this.edate,true, flagBulk)
+                          // if(currentColumnButton != null) {
+                          //   currentColumnButton.click();
+                          // }
                         }
-                        this.renderAppropriateStream(this.sdate,this.edate,true, flagBulk)
-                        // if(currentColumnButton != null) {
-                        //   currentColumnButton.click();
-                        // }
                       }
                     }
-
                   }
                 }
               }
-      
             });
 
           }
@@ -11696,6 +11740,7 @@ export class SfIEvents extends LitElement {
     var dataScheduled = (divContainer.querySelector('#graph-scheduled') as HTMLSpanElement).innerHTML;
     var dataPartiallyComplied = (divContainer.querySelector('#graph-partially-complied') as HTMLSpanElement).innerHTML;
     var dataComplied = (divContainer.querySelector('#graph-complied') as HTMLSpanElement).innerHTML;
+    var dataCompliedWithException = (divContainer.querySelector('#graph-complied-with-exception') as HTMLSpanElement).innerHTML;
 
     const ctx = divContainer.querySelector('#myChart') as ChartItem;
     this.showGraph(divContainer, 1);
@@ -11704,22 +11749,23 @@ export class SfIEvents extends LitElement {
     this.clearGraph(divContainer, 4);
 
     const data = {
-      labels: ['Scheduled', 'Not Complied', 'Partially Complied', 'Complied'],
+      labels: ['Scheduled', 'Not Complied', 'Partially Complied', 'Complied', 'Complied With Exception'],
       datasets: [{
         label: 'Compliances',
-        data: [dataScheduled, dataNotComplied, dataPartiallyComplied, dataComplied],
+        data: [dataScheduled, dataNotComplied, dataPartiallyComplied, dataComplied, dataCompliedWithException],
         borderWidth: 1,
         backgroundColor: [
           this.COLOR_SCHEDULED,
           this.COLOR_NOT_COMPLIED,
           this.COLOR_PARTIALLY_COMPLIED,
-          this.COLOR_COMPLIED
+          this.COLOR_COMPLIED,
+          this.COLOR_COMPLIED_WITH_EXCEPTION
         ]
       }]
     }
 
-    this.csvGraphStats += 'Compliance,Scheduled,Not Complied,Partially Complied,Complied,Total\n';
-    this.csvGraphStats += 'Count,'+parseInt(dataScheduled)+','+parseInt(dataNotComplied)+','+parseInt(dataPartiallyComplied)+','+parseInt(dataComplied)+','+parseInt(dataTotal)+'\n';
+    this.csvGraphStats += 'Compliance,Scheduled,Not Complied,Partially Complied,Complied,Complied With Exception,Total\n';
+    this.csvGraphStats += 'Count,'+parseInt(dataScheduled)+','+parseInt(dataNotComplied)+','+parseInt(dataPartiallyComplied)+','+parseInt(dataComplied)+','+parseInt(dataCompliedWithException)+','+parseInt(dataTotal)+'\n';
 
     //console.log('rendering timeliness graph', this.csvGraphStats);
 
@@ -12015,6 +12061,13 @@ export class SfIEvents extends LitElement {
     }
     dataBar2['datasets'][3]['backgroundColor'] = this.COLOR_COMPLIED;
 
+    dataBar2['datasets'][3]['label'] = 'Complied With Exception';
+    dataBar2['datasets'][3]['data'] = [];
+    for(i = 0; i < Object.keys(complianceData).length; i++) {
+      dataBar2['datasets'][3]['data'].push(complianceData[Object.keys(complianceData)[i]]['complied-with-exception']);
+    }
+    dataBar2['datasets'][3]['backgroundColor'] = this.COLOR_COMPLIED_WITH_EXCEPTION;
+
     return dataBar2;
 
   }
@@ -12797,6 +12850,10 @@ export class SfIEvents extends LitElement {
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
               
+              let percentage: string = "100";
+              if(((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement) != null){
+                percentage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement).value
+              }
 
               if(docs.length === 0 && docsOptional.length === 0) {
 
@@ -12842,7 +12899,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")
+                      await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, "notices", percentage)
                       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){
@@ -12895,6 +12952,7 @@ export class SfIEvents extends LitElement {
                             "eventid": eventId,
                             "comments": reportercomments,
                             "dateofcompletion": reporterdoc,
+                            "percentage": percentage,
                             "entityid": entityId,
                             "locationid": locationId,
                             "event": null,
@@ -12918,6 +12976,7 @@ export class SfIEvents extends LitElement {
                             "eventid": eventId,
                             "comments": reportercomments,
                             "dateofcompletion": reporterdoc,
+                            "percentage": percentage,
                             "entityid": entityId,
                             "locationid": locationId,
                             "event": null,
@@ -13101,7 +13160,7 @@ export class SfIEvents extends LitElement {
 
   fetchEventDetails = async (listEvent: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement) => {
     console.log('listEvent', listEvent, listEvent.id)
-    let url = "https://"+this.apiId+"/getalleventdetails";
+    let url = "https://"+this.apiId+"/getalleventdetails1";
     
     //console.log('fetch calendar url', url);
     let urlBody :any = {"projectid": this.projectId, "userprofileid": this.userProfileId, "role": this.myRole, "eventid": listEvent.id, "entityid": listEvent.entityid, "locationid": listEvent.locationid, "mmddyyyy": mmddyyyy, "year": this.calendarStartYYYY};
@@ -14099,7 +14158,10 @@ export class SfIEvents extends LitElement {
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
               
-
+              let percentage: string = "100";
+              if(((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement) != null){
+                percentage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement).value
+              }
               if(docs.length === 0 && docsOptional.length === 0) {
 
                 //console.log('reporter comments 3', reportercomments);
@@ -14147,7 +14209,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")
+                      await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, event.isnotice != null ? "notices" : "events", percentage)
                       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){
@@ -14216,6 +14278,7 @@ export class SfIEvents extends LitElement {
                             "eventid": eventId,
                             "comments": reportercomments,
                             "dateofcompletion": reporterdoc,
+                            "percentage": percentage,
                             "entityid": entityId,
                             "locationid": locationId,
                             "event": null,
@@ -14239,6 +14302,7 @@ export class SfIEvents extends LitElement {
                             "eventid": eventId,
                             "comments": reportercomments,
                             "dateofcompletion": reporterdoc,
+                            "percentage": percentage,
                             "entityid": entityId,
                             "locationid": locationId,
                             "event": null,
@@ -19364,6 +19428,9 @@ export class SfIEvents extends LitElement {
         .color-complied {
           color: #50cf01;
         }
+        .color-complied-with-exception {
+          color: #ffe505;
+        }
         .color-scheduled {
           color: #888888;
         }
@@ -22391,7 +22458,7 @@ export class SfIEvents extends LitElement {
     }
   }
   uploadReportsReviewsBulk = async (bulkBody: any) => {
-    let url = "https://"+this.apiId+"/uploadreportsreviewsbulk1";
+    let url = "https://"+this.apiId+"/uploadreportsreviewsbulk2";
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(bulkBody, url, this._SfLoader, authorization)) as any;
@@ -22431,8 +22498,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") => {
-    let url = "https://"+this.apiId+"/uploadreport1";
+  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+"/uploadreport2";
 
     let body = { 
       "mmddyyyy": mmddyyyy,
@@ -22441,6 +22508,7 @@ export class SfIEvents extends LitElement {
       "eventid": eventid,
       "comments": comments,
       "dateofcompletion": doc,
+      "percentage": percentage,
       "entityid": entityId,
       "locationid": locationId,
       "event": event == null ? null : JSON.stringify(event),
@@ -22485,7 +22553,7 @@ export class SfIEvents extends LitElement {
   }
 
   uploadReportsBulk = async (bulkBody: any, showSuccess: boolean = true) => {
-    let url = "https://"+this.apiId+"/uploadreportsbulk1"
+    let url = "https://"+this.apiId+"/uploadreportsbulk2"
 
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr : any = (await this.prepareXhr(bulkBody, url, this._SfLoader, authorization)) as any;
@@ -24258,7 +24326,7 @@ export class SfIEvents extends LitElement {
       view = "entity";
     }
 
-    path = "getallcountryevents2";
+    path = "getallcountryevents3";
 
     let sDate = "";
     let eDate = "";
@@ -25301,7 +25369,7 @@ export class SfIEvents extends LitElement {
     console.log('eventsData', eventsData)
     console.log('role', role)
     // if(Object.keys(eventsData[role]).length > 0){
-      var notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0, inTime = 0, pastDueDate = 0, lateExecuted = 0, lateApproved = 0, lateReported = 0, scheduled = 0, partiallyComplied = 0, notComplied = 0, complied = 0;
+      var notStarted = 0, approved = 0, pendingApproval = 0, rejected = 0, inTime = 0, pastDueDate = 0, lateExecuted = 0, lateApproved = 0, lateReported = 0, scheduled = 0, partiallyComplied = 0, notComplied = 0, complied = 0, compliedWithException = 0;
       var html = '';
       this.selectedItemIds = [];
       this.selectedStatus = "";
@@ -25334,7 +25402,7 @@ export class SfIEvents extends LitElement {
             var complianceStatus = "";
             partStatus = this.getCompletenessStatus(JSON.parse(JSON.stringify(eventsData[role][mmdd][j])));
             lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(eventsData[role][mmdd][j])), partStatus);
-            complianceStatus = this.getComplianceStatus(partStatus, lateStatus);
+            complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(eventsData[role][mmdd][j])).percentage);
             notStarted = notStarted + (partStatus == "not-started" ? 1 : 0);
             pendingApproval = pendingApproval + (partStatus == "pending-approval" ? 1 : 0);
             rejected = rejected + (partStatus == "rejected" ? 1 : 0);
@@ -25348,6 +25416,7 @@ export class SfIEvents extends LitElement {
             partiallyComplied = partiallyComplied + (complianceStatus == "partially-complied" ? 1 : 0);
             notComplied = notComplied + (complianceStatus == "not-complied" ? 1 : 0);
             complied = complied + (complianceStatus == "complied" ? 1 : 0);
+            compliedWithException = compliedWithException + (complianceStatus == "complied-with-exception" ? 1 : 0);
 
             eventsData[role][mmdd][j][this.FLOW_GRAPH_COMPLETENESS] = partStatus;
             eventsData[role][mmdd][j][this.FLOW_GRAPH_TIMELINESS] = lateStatus;
@@ -25907,7 +25976,7 @@ export class SfIEvents extends LitElement {
           partStatus = this.getCompletenessStatus(JSON.parse(JSON.stringify(eventsData[mmdd][j])));
           if(partStatus != "not-started"){ continue; }
           lateStatus = this.getTimelinessStatus(mmdd, JSON.parse(JSON.stringify(eventsData[mmdd][j])), partStatus);
-          complianceStatus = this.getComplianceStatus(partStatus, lateStatus);
+          complianceStatus = this.getComplianceStatus(partStatus, lateStatus, JSON.parse(JSON.stringify(eventsData[mmdd][j])).percentage);
           // notStarted = notStarted + (partStatus == "not-started" ? 1 : 0);
           // pendingApproval = pendingApproval + (partStatus == "pending-approval" ? 1 : 0);
           // rejected = rejected + (partStatus == "rejected" ? 1 : 0);