sf-i-events 1.0.865 → 1.0.866

package/src/sf-i-events.ts

@@ -3661,7 +3661,7 @@ export class SfIEvents extends LitElement {
 
     // console.log('about to expire', mmdd, event.duedate)
 
-    let dateArr  = event.duedate.split('/')
+    let dateArr = event.duedate.split('/')
     const dd = dateArr[0];
     const mm = dateArr[1];
 
@@ -4737,7 +4737,7 @@ export class SfIEvents extends LitElement {
     html += '<div class="stream-events-container flex-grow" part="' + bgStatus + '">';
     html += '<div class="hidden-tags hide">' + JSON.stringify(event['tags']) + '</div>'
     html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-    html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.reporters != null ? "100" : "60") + '"></sf-i-elastic-text>' + (event.reporters != null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div><button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.reporters != null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
+    html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? "reportformat" : "") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.reporters != null ? "100" : "60") + '"></sf-i-elastic-text>' + event.reporters != null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div>') + (((event.reportformat != null && event.reportformat.length > 0) || (event.customreporting != null)) ? '' : ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.reporters != null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
     if (event.reporters != null && remarks.length > 0) {
       html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">' + remarks + ', occurred on ' + occurrenceDate + '</div>';
     }
@@ -5060,7 +5060,7 @@ export class SfIEvents extends LitElement {
 
     let graphParam = this.getGraphParam(event);
     // console.log("graphParam", graphParam.split(';')[0]);
-    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.reporters != null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + (event.reporters != null ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
+    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.reporters != null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.reporters != null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
     // }
 
     return html;
@@ -5637,10 +5637,12 @@ export class SfIEvents extends LitElement {
         html += '<div class="d-flex m-20 flex-col">';
         html += '<label part="input-label">Approver Comments*</label>';
         html += '<input id="input-approver-comments" type="text" part="input" value=""/><br />';
-        html += '<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 />';
+        if (event.module != 'agreement') {
+          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">'
@@ -5696,24 +5698,28 @@ export class SfIEvents extends LitElement {
         html += '<div class="d-flex m-20 flex-col">';
         html += '<label part="input-label">Reporter Comments*</label>';
         html += '<input id="input-reporter-comments" type="text" part="input" value=""/><br />';
-        html += '<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 />';
-        html += '<div part="input-reporter-percentage-message" class="input-reporter-percentage-message mb-20">For reporting full non-compliance, choose 0%. For reporting compliance with gaps, choose the appropriate % value.</div><br />'
+        if (event.module != 'agreement') {
+          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 />';
+          html += '<div part="input-reporter-percentage-message" class="input-reporter-percentage-message mb-20">For reporting full non-compliance, choose 0%. For reporting compliance with gaps, choose the appropriate % value.</div><br />'
+        }
         // if(docsOptional.length === 0) {
         html += '<label part="input-label">Supporting Documents' + ((docsOptional.length > 0) ? '' : '*') + '</label>';
 
-        html += '<slot name="uploader"></slot>';
-        if (uploadGuidance == 1) {
-          html += '<div id="upload-guidance-button" part="upload-guidance-button" class="d-flex button-icon-small align-center align-self-start mt-10"><span class="material-symbols-outlined">help</span>&nbsp;<span>Get Help</span></div>'
-        } else if (uploadGuidance != 0) {
-          html += '<div part="upload-guidance-content">'
-          html += '<div part="detail-head" class="mb-5"><strong>Upload Guidance</strong></div>'
-          html += '<sf-i-elastic-text text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
-          html += '</div>'
+        if (event.module != 'agreement') {
+          html += '<slot name="uploader"></slot>';
+          if (uploadGuidance == 1) {
+            html += '<div id="upload-guidance-button" part="upload-guidance-button" class="d-flex button-icon-small align-center align-self-start mt-10"><span class="material-symbols-outlined">help</span>&nbsp;<span>Get Help</span></div>'
+          } else if (uploadGuidance != 0) {
+            html += '<div part="upload-guidance-content">'
+            html += '<div part="detail-head" class="mb-5"><strong>Upload Guidance</strong></div>'
+            html += '<sf-i-elastic-text text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
+            html += '</div>'
+          }
+          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 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) {
@@ -5750,11 +5756,13 @@ export class SfIEvents extends LitElement {
       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 += '<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 part="input-reporter-percentage-message" class="input-reporter-percentage-message mb-20">For reporting full non-compliance, choose 0%. For reporting compliance with gaps, choose the appropriate % value.</div><br />'
+      if (event.module != 'agreement') {
+        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 part="input-reporter-percentage-message" class="input-reporter-percentage-message mb-20">For reporting full non-compliance, choose 0%. For reporting compliance with gaps, choose the appropriate % value.</div><br />'
+      }
       html += '<div>'
       html += '<label part="input-label">Approve?</label><br />';
       html += '<div class="mt-5">'
@@ -6625,7 +6633,14 @@ export class SfIEvents extends LitElement {
       filterButton.innerHTML = (filterList.style.display != 'block' ? 'category' : 'close')
       const filterSubmitButton = filterList.querySelector('#button-submit-features') as HTMLButtonElement
       filterSubmitButton.addEventListener('click', () => {
-        this.processDateSelection(eventsContainer);
+        this.enableCustom();
+        this.renderTabs(this.selectedTab);
+        // this.processDateSelection(eventsContainer);
+        if (this.myRole == this.TAB_VIEWER) {
+          this.renderCustomViewer()
+        } else {
+          this.renderCustom();
+        }
       })
       // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
       // selectFeatureAll.addEventListener('click',async(ev: any) => {
@@ -7408,6 +7423,7 @@ export class SfIEvents extends LitElement {
       filterButton.innerHTML = (filterList.style.display != 'block' ? 'category' : 'close')
       const filterSubmitButton = filterList.querySelector('#button-submit-features') as HTMLButtonElement
       filterSubmitButton.addEventListener('click', () => {
+        this.renderTabs(this.selectedTab)
         this.processDateSelectionViewer(eventsContainer);
       })
       // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
@@ -10199,8 +10215,23 @@ export class SfIEvents extends LitElement {
     (this._SfCustomContainer as HTMLDivElement).querySelector('#button-this-year')?.addEventListener('click', () => {
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date-mobile') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
       ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-start-date') as HTMLInputElement).value = this.calendarStartYYYY + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
-      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = (parseInt(this.calendarStartYYYY) + 1) + '-' + this.calendarStartMM + '-' + this.calendarStartDD;
+      let year = parseInt(this.calendarStartYYYY);
+      let month = parseInt(this.calendarStartMM) - 1;
+
+      if (month === 0) {
+        month = 12;
+        year -= 1;
+      }
+
+      // Pad month
+      const monthStr = month < 10 ? '0' + month : '' + month;
+
+      // Determine last day of month (safe)
+      const lastDay = new Date(year, month, 0).getDate(); // day 0 of next month gives last day of `month`
+      const dayStr = lastDay < 10 ? '0' + lastDay : '' + lastDay;
+      const finalDate = `${year + 1}-${monthStr}-${dayStr}`;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date-mobile') as HTMLInputElement).value = finalDate;
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#stream-end-date') as HTMLInputElement).value = finalDate;
       this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
     });
 
@@ -10271,7 +10302,9 @@ export class SfIEvents extends LitElement {
       this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
     });
 
-
+    if (this.selectedFeatures.indexOf('agreements') >= 0) {
+      ((this._SfCustomContainer as HTMLDivElement).querySelector('#button-this-year') as HTMLButtonElement).click();
+    }
     // for(var i = 0; i < 3; i++) {
     //   (this._SfCustomContainer as HTMLDivElement).querySelector('#stream-month-' + i)?.addEventListener('click', (ev: any)=> {
     //     const target = parseInt((ev.target as HTMLDivElement).id.split('-')[2]);
@@ -11192,11 +11225,26 @@ export class SfIEvents extends LitElement {
         console.log('dateresult', dateResult, index);
         console.log('selectedfeatures', this.selectedFeatures);
         this.currentColumnIndex = index + "";
-        if (dateResult != null) {
-          await this.renderWithFeatures(dateResult.startDate, dateResult.endDate, "", "no", ("0" + monthResult).slice(-2));
+
+        if (this.selectedFeatures.indexOf('agreements') >= 0) {
+
+          this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
+          this.enableCustom();
+          this.renderTabs(this.TAB_CUSTOM);
+          console.log('stats clicked');
+          if (this.myRole == this.TAB_VIEWER) {
+            this.renderCustomViewer()
+          } else {
+            this.renderCustom();
+          }
+        } else {
+          if (dateResult != null) {
+            await this.renderWithFeatures(dateResult.startDate, dateResult.endDate, "", "no", ("0" + monthResult).slice(-2));
+          }
+          this.renderTabs(this.TAB_STREAM);
+          this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
+          this.renderStream(index, showGraph, showBackgroundButton);
         }
-        this.flowGraph = this.FLOW_GRAPH_COMPLETENESS;
-        this.renderStream(index, showGraph, showBackgroundButton);
       })
       // const selectFeatureAll = filterList.querySelector('.input-select-feature-all') as HTMLInputElement
       // selectFeatureAll?.addEventListener('click',async(ev: any) => {
@@ -13623,7 +13671,8 @@ export class SfIEvents extends LitElement {
     let docs = listEvent['documents'] == null ? [] : listEvent['documents'] == null ? [] : (listEvent['documents']);
     let approved = listEvent['approved'] == null ? false : listEvent['approved'] == null ? false : listEvent['approved'];
     let makercheckers = listEvent['makercheckers'] == null ? [] : listEvent['makercheckers'] == null ? [] : listEvent['makercheckers'];
-    let docsOptional = listEvent['docs'] == null ? [] : listEvent['docs'] == null ? [] : listEvent['docs']; let html: string = '';
+    // let docsOptional = listEvent['docs'] == null ? [] : listEvent['docs'] == null ? [] : listEvent['docs']; 
+    let html: string = '';
     let documentType = listEvent['documenttype'] == null ? null : listEvent['documenttype'][0] == null ? null : listEvent['documenttype'][0].split(" ")[0];
     html += `
         <div part="compliance-detail-title" class="d-flex justify-between">
@@ -13833,11 +13882,10 @@ export class SfIEvents extends LitElement {
               await this.renewAgreement(listEvent, reportformatvalues);
             } else {
               console.log('renew reporting', reportformatvalues)
-              return;
             }
             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 = 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()
               }
@@ -14090,13 +14138,14 @@ export class SfIEvents extends LitElement {
 
               //console.log('reporter comments 1', reportercomments);
 
-              const reporterdoc = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0 ? (new Date(((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
+              // const reporterdoc = ((((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement) != null) && ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0) ? (new Date(((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
+              const reporterdoc = new Date().getTime() + "";
               let docs: any[] = [];
 
               //console.log('reporter comments 2', reportercomments);
 
               // if(docsOptional.length === 0) {
-              docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+              // docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
               // }
 
               //console.log('docs', docs);
@@ -14104,6 +14153,7 @@ export class SfIEvents extends LitElement {
               let reportformatschema: string = "";
               if (listEvent.customreporting != null) {
                 let reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting') as SfIReporting
+                console.log('reportformatvalues', JSON.stringify(reportingReporting.selectedValues()))
                 reportformatvalues = JSON.stringify(reportingReporting!.selectedValues()) ?? "";
                 reportformatschema = reportingReporting!.configjson ?? "";
               }
@@ -14112,228 +14162,228 @@ export class SfIEvents extends LitElement {
               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 (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
+              // if (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
 
-                //console.log('reporter comments 3', reportercomments);
-                buttonClick.innerHTML = "Save"
-                this.setError('Invalid Percentage!');
-                setTimeout(() => {
-                  this.clearMessages();
-                }, 3000);
+              //   //console.log('reporter comments 3', reportercomments);
+              //   buttonClick.innerHTML = "Save"
+              //   this.setError('Invalid Percentage!');
+              //   setTimeout(() => {
+              //     this.clearMessages();
+              //   }, 3000);
 
-              } else {
-                if (docs.length === 0 && docsOptional.length === 0) {
+              // } else {
+              //   if (docs.length === 0 && docsOptional.length === 0) {
 
-                  //console.log('reporter comments 3', reportercomments);
-                  buttonClick.innerHTML = "Save"
-                  this.setError('No documents uploaded!');
-                  setTimeout(() => {
-                    this.clearMessages();
-                  }, 3000);
+              //     //console.log('reporter comments 3', reportercomments);
+              //     buttonClick.innerHTML = "Save"
+              //     this.setError('No documents uploaded!');
+              //     setTimeout(() => {
+              //       this.clearMessages();
+              //     }, 3000);
 
-                } else {
+              //   } else {
 
-                  //console.log('reporterdoc', reporterdoc);
+              //     //console.log('reporterdoc', reporterdoc);
 
-                  if (reporterdoc.length === 0) {
-                    buttonClick.innerHTML = "Save"
-                    this.setError('Date of completion not selected!');
-                    setTimeout(() => {
-                      this.clearMessages();
-                    }, 3000);
+              //     if (reporterdoc.length === 0) {
+              //       buttonClick.innerHTML = "Save"
+              //       this.setError('Date of completion not selected!');
+              //       setTimeout(() => {
+              //         this.clearMessages();
+              //       }, 3000);
 
-                  } else if (parseInt(reporterdoc) > new Date().getTime()) {
-                    buttonClick.innerHTML = "Save"
-                    this.setError('Date of completion cannot be in future!');
-                    setTimeout(() => {
-                      this.clearMessages();
-                    }, 3000);
+              //     } else if (parseInt(reporterdoc) > new Date().getTime()) {
+              //       buttonClick.innerHTML = "Save"
+              //       this.setError('Date of completion cannot be in future!');
+              //       setTimeout(() => {
+              //         this.clearMessages();
+              //       }, 3000);
 
-                  } else {
+              //     } else {
 
-                    //console.log('makerscheckers 1', reportercomments);
+              //console.log('makerscheckers 1', reportercomments);
 
-                    if (reportercomments.trim().length === 0) {
-                      buttonClick.innerHTML = "Save"
-                      this.setError('Comments cannot be blank!');
-                      setTimeout(() => {
-                        this.clearMessages();
-                      }, 3000);
-
-                    } else {
-
-
-                      var clickEvent = new MouseEvent("click", {
-                        "view": window,
-                        "bubbles": true,
-                        "cancelable": false
-                      });
-
-                      ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
-                      let flagBulk = false;
-                      if (this.selectedItemIds.length <= 1) {
-
-                        if (await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, listEvent.module, 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) {
-                              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()
-                            }
-                          }
-                          console.log('uploadReport single')
-                          if (makercheckers.length > 0) {
-
-                            // 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
-                                // 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()
-                              }
-                            }
-                            await this.renewAgreement(listEvent, reportformatvalues);
-                            console.log('upload report auto approve single')
-                          }
-                          if (this.recentlyReported[mmdd] == null) {
-                            this.recentlyReported[mmdd] = []
-                          }
-                          this.recentlyReported[mmdd].push(listEvent)
-                        }
-                      } 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];
-                          entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                          locationId = selectedId.split('-')[8].replace(/_/g, '-');
-                          const eventId = selectedId.split('-')[9].replace(/_/g, '-');
-                          mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
-
-                          //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.module ?? "events"
-                          //   } )
-                          //   // await this.uploadReview(entityId, locationId, mmddyyyy, eventId, "Auto approved", true);
+              if (reportercomments.trim().length === 0) {
+                buttonClick.innerHTML = "Save"
+                this.setError('Comments cannot be blank!');
+                setTimeout(() => {
+                  this.clearMessages();
+                }, 3000);
 
-                          // }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": listEvent.module ?? "events",
-                            "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
-                          })
-                          // }
+              } else {
 
-                          // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
-                          // await this.sleep(2000);
-                          // this.clearMessages();
 
-                        }
+                var clickEvent = new MouseEvent("click", {
+                  "view": window,
+                  "bubbles": true,
+                  "cancelable": false
+                });
 
-                        // await this.uploadReportsBulk(bulkBody);
-                        // await this.fetchBulkReportingData();
-                        if (bulkBody.length > 0) {
-                          await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
+                ((this._SfDetailContainer as HTMLDivElement).querySelector('#button-detail-close') as HTMLButtonElement)!.dispatchEvent(clickEvent);
+                let flagBulk = false;
+                if (this.selectedItemIds.length <= 1) {
+
+                  if (await this.uploadReport(entityId, locationId, mmddyyyy, listEvent["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, listEvent.module, 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) {
+                        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()
+                      }
+                    }
+                    console.log('uploadReport single')
+                    if (makercheckers.length > 0) {
+
+                      // 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
+                          // 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()
                         }
+                      }
+                      await this.renewAgreement(listEvent, reportformatvalues);
+                      console.log('upload report auto approve single')
+                    }
+                    if (this.recentlyReported[mmdd] == null) {
+                      this.recentlyReported[mmdd] = []
+                    }
+                    this.recentlyReported[mmdd].push(listEvent)
+                  }
+                } 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];
+                    entityId = selectedId.split('-')[7].replace(/_/g, '-');
+                    locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                    const eventId = selectedId.split('-')[9].replace(/_/g, '-');
+                    mmddyyyy = selectedId.split('-')[10] + '/' + selectedId.split('-')[11] + '/' + selectedId.split('-')[12];
+
+                    //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.module ?? "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": listEvent.module ?? "events",
+                      "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
+                    })
+                    // }
+
+                    // this.setSuccess("Updating " + (k + 1) + "/" + this.selectedItemIds.length + ", please wait...");
+                    // await this.sleep(2000);
+                    // this.clearMessages();
 
-                        // if(bulkBodyReview.length > 0){
-                        //   await this.uploadReportsReviewsBulk(bulkBodyReview)
-                        // }
-                        await this.fetchBulkReportingData();
-                        console.log('uploadReport bulk')
-                        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) {
-
-                              this.events[mmdd][p].isbulk = true
-                              flagBulk = true;
-                              if (this.recentlyReported[mmdd] == null) {
-                                this.recentlyReported[mmdd] = []
-                              }
-                              this.recentlyReported[mmdd].push(this.events[mmdd][p])
-                            }
-                          }
-                        }
+                  }
 
-                      }
+                  // await this.uploadReportsBulk(bulkBody);
+                  // await this.fetchBulkReportingData();
+                  if (bulkBody.length > 0) {
+                    await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
+                  }
 
-                      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();
-                          // }
+                  // if(bulkBodyReview.length > 0){
+                  //   await this.uploadReportsReviewsBulk(bulkBodyReview)
+                  // }
+                  await this.fetchBulkReportingData();
+                  console.log('uploadReport bulk')
+                  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) {
+
+                        this.events[mmdd][p].isbulk = true
+                        flagBulk = true;
+                        if (this.recentlyReported[mmdd] == null) {
+                          this.recentlyReported[mmdd] = []
                         }
+                        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();
+                    }
+                    this.renderAppropriateStream(this.sdate, this.edate, true, flagBulk)
+                    // if(currentColumnButton != null) {
+                    //   currentColumnButton.click();
+                    // }
                   }
                 }
+
               }
+
+
+              //     }
+              //   }
+              // }
             });
 
           }
@@ -22245,7 +22295,7 @@ export class SfIEvents extends LitElement {
             buttonListReporting[i].style.display = 'block';
           }
         }
-        if (buttonSelect[i] != null && buttonSelect[i].id.indexOf('-bulk') < 0) buttonSelect[i].style.display = "flex"
+        if (buttonSelect[i] != null && buttonSelect[i].id.indexOf('-bulk') < 0 && buttonSelect[i].id.indexOf('-reportformat') < 0) buttonSelect[i].style.display = "flex"
         if (eventTitles[i] != null) (eventTitles[i]).style.display = 'flex';
         divs[i].style.display = 'block'
       } else {
@@ -22556,12 +22606,14 @@ export class SfIEvents extends LitElement {
 
     html += '<button class="tab-button mb-10" id="calendar-tab-month" part="' + (selectedTab == this.TAB_STREAM ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Month</button>';
     html += '<button class="tab-button mb-10" id="calendar-tab-custom" part="' + (selectedTab == this.TAB_CUSTOM ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">' + (this.myRole == this.TAB_VIEWER ? "Statistics" : "Range") + '</button>';
-    html += '<button class="tab-button mb-10" id="calendar-tab-register" part="' + (selectedTab == this.TAB_REGISTERS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Registers</button>';
-    html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_FIND ? '' : 'hide') + '" id="calendar-tab-find" part="' + (selectedTab == this.TAB_FIND ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Search</button>';
-    html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_THIS ? '' : 'hide') + '" id="calendar-tab-this" part="' + (selectedTab == this.TAB_THIS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Current</button>';
-    html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_YEAR ? '' : 'hide') + '" id="calendar-tab-year" part="' + (selectedTab == this.TAB_YEAR ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Overview</button>';
-    html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_ADHOC ? '' : 'hide') + '" id="calendar-tab-adhoc" part="' + (selectedTab == this.TAB_ADHOC ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Adhoc</button>';
-    html += '<button class="tab-button mb-10" id="calendar-tab-next" part="calendar-tab-button-not-selected"><span class="material-symbols-outlined">arrow_forward_ios</span></button>';
+    if (this.selectedFeatures.indexOf('agreements') < 0) {
+      html += '<button class="tab-button mb-10" id="calendar-tab-register" part="' + (selectedTab == this.TAB_REGISTERS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Registers</button>';
+      html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_FIND ? '' : 'hide') + '" id="calendar-tab-find" part="' + (selectedTab == this.TAB_FIND ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Search</button>';
+      html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_THIS ? '' : 'hide') + '" id="calendar-tab-this" part="' + (selectedTab == this.TAB_THIS ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Current</button>';
+      html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_YEAR ? '' : 'hide') + '" id="calendar-tab-year" part="' + (selectedTab == this.TAB_YEAR ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Overview</button>';
+      html += '<button class="tab-button tab-button-secondary mb-10 ' + (selectedTab == this.TAB_ADHOC ? '' : 'hide') + '" id="calendar-tab-adhoc" part="' + (selectedTab == this.TAB_ADHOC ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected') + '">Adhoc</button>';
+      html += '<button class="tab-button mb-10" id="calendar-tab-next" part="calendar-tab-button-not-selected"><span class="material-symbols-outlined">arrow_forward_ios</span></button>';
+    }
 
 
     // html += '<button class="tab-button mb-10" id="calendar-tab-upcoming" part="'+(selectedTab == this.TAB_UPCOMING ? 'calendar-tab-button-selected' : 'calendar-tab-button-not-selected')+'">Upcoming</button>';
@@ -23894,7 +23946,7 @@ export class SfIEvents extends LitElement {
       "makercheckers": makercheckers
     }
 
-    //console.log(body);
+    console.log(body);
     let retValue = true;
     const authorization = btoa(Util.readCookie('email') + ":" + Util.readCookie('accessToken'));
     const xhr: any = (await this.prepareXhr(body, url, this._SfLoader, authorization)) as any;