sf-i-events 1.0.950 → 1.0.951

package/sf-i-events.js

@@ -1274,6 +1274,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         this.registerFilters = {};
         this.suspenseFlag = false;
         this.tablecols = [];
+        this.reportedLocationsVals = [];
         this.isSelectedLegend = (value) => {
             return this.chartSelectedLegend.includes(value);
         };
@@ -3579,7 +3580,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             let makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'];
             let docsOptional = event['docs'] == null ? [] : event['docs'];
             let uploadGuidance = (_a = event['uploadguidance']) !== null && _a !== void 0 ? _a : 0;
-            console.log('rendering reporting', event, percentage);
+            this.reportedLocationsVals = (event['reportedlocations'] != null) ? (Util.isJSONParsable(event['reportedlocations']) ? JSON.parse(event['reportedlocations']) : [event['reportedlocations']]) : [''];
+            console.log('reportedLocations found', this.reportedLocationsVals);
+            console.log('rendering reporting', event, percentage, this.reportedLocationsVals);
             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>
@@ -3608,19 +3611,39 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
                         html += '<label part="input-label">Date of Completion*</label>';
                         html += '<input id="input-approver-doc" part="input" type="date" value="' + (dateOfCompletion == "" ? dateOfCompletion : new Date(parseInt(dateOfCompletion)).toISOString().substring(0, 10)) + '" disabled/><br />';
-                        html += '<div class="d-flex justify-start align-center">';
+                        html += '<div class="d-flex justify-start align-center flex-wrap">';
                         html += '<div class="d-flex flex-col flex-grow">';
                         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" disabled/><br />';
                         html += '</div>';
-                        html += '<div id="reporting-entity-container" class="d-flex flex-col flex-grow ml-20 hide">';
+                        html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
                         html += '<label part="input-label">Entity</label>';
-                        html += '<select id="input-reporter-entity" part="input"></select><br />';
+                        html += '<select id="input-reporter-entity-0" part="input" disabled></select>';
                         html += '</div>';
-                        html += '<div id="reporting-location-container" class="d-flex flex-col flex-grow ml-20 hide">';
+                        html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
                         html += '<label part="input-label">Location</label>';
-                        html += '<select id="input-reporter-location" part="input"></select><br />';
+                        html += '<select id="input-reporter-location-0"  class="input-reporter-location" part="input" disabled></select>';
                         html += '</div>';
+                        // html += '<button id="button-reporter-location-add-0" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">' + (this.reportedLocationsVals.length >= 1 ? 'remove' : 'add') + '</button><br /></div>'
+                        if (this.reportedLocationsVals.length > 1) {
+                            let indexLocation = 1;
+                            while (indexLocation < this.reportedLocationsVals.length) {
+                                html += '<div class="d-flex justify-start align-end flex-wrap">';
+                                html += '<div class="d-flex flex-col flex-grow">';
+                                html += '<label class="invisible" part="input-label">Completion Percentage*</label>';
+                                html += '</div>';
+                                html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide" disabled>';
+                                html += '<label part="input-label">Entity</label>';
+                                html += '<select id="input-reporter-entity-' + indexLocation + '" part="input"></select>';
+                                html += '</div>';
+                                html += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide" disabled>';
+                                html += '<label part="input-label">Location</label>';
+                                html += '<select id="input-reporter-location-' + indexLocation + '" class="input-reporter-location" part="input"></select>';
+                                html += '</div>';
+                                // html += '<button id="button-reporter-location-add-' + indexLocation + '" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">' + (indexLocation < this.reportedLocationsVals.length - 1 ? 'remove' : 'add') + '</button><br /></div>'
+                                indexLocation++;
+                            }
+                        }
                         html += '</div>';
                     }
                     html += '<div>';
@@ -3669,20 +3692,41 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (event.module != 'contract' && event.module != 'license' && event.module != 'rcmresource') {
                         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 += '<div class="d-flex justify-start align-center">';
+                        html += '<div class="d-flex justify-start align-end flex-wrap">';
                         html += '<div class="d-flex flex-col flex-grow">';
                         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 += '<input id="input-reporter-percentage" part="input" type="number" value="' + percentage + '" max="100" min="0" step="1"/>';
                         html += '</div>';
-                        html += '<div id="reporting-entity-container" class="d-flex flex-col flex-grow ml-20 hide">';
+                        html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
                         html += '<label part="input-label">Entity</label>';
-                        html += '<select id="input-reporter-entity" part="input"></select><br />';
+                        html += '<select id="input-reporter-entity-0" part="input"></select>';
                         html += '</div>';
-                        html += '<div id="reporting-location-container" class="d-flex flex-col flex-grow ml-20 hide">';
+                        html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
                         html += '<label part="input-label">Location</label>';
-                        html += '<select id="input-reporter-location" part="input"></select><br />';
-                        html += '</div>';
+                        html += '<select id="input-reporter-location-0"  class="input-reporter-location" part="input"></select>';
                         html += '</div>';
+                        html += '<button id="button-reporter-location-add-0" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">remove</button><br /></div>';
+                        if (this.reportedLocationsVals.length > 1) {
+                            let indexLocation = 1;
+                            while (indexLocation < this.reportedLocationsVals.length) {
+                                html += '<div class="d-flex justify-start align-end flex-wrap">';
+                                html += '<div class="d-flex flex-col flex-grow">';
+                                html += '<label class="invisible" part="input-label">Completion Percentage*</label>';
+                                html += '</div>';
+                                html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+                                html += '<label part="input-label">Entity</label>';
+                                html += '<select id="input-reporter-entity-' + indexLocation + '" part="input"></select>';
+                                html += '</div>';
+                                html += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+                                html += '<label part="input-label">Location</label>';
+                                html += '<select id="input-reporter-location-' + indexLocation + '"  class="input-reporter-location" part="input"></select>';
+                                html += '</div>';
+                                html += '<button id="button-reporter-location-add-' + indexLocation + '" part="button-icon-small" class="button-reporter-location-add material-icons ml-10 hide">remove</button><br /></div>';
+                                indexLocation++;
+                            }
+                        }
+                        html += '<div class="d-flex justify-end align-end mt-10" class="input-report-location-add-container">';
+                        html += '<button id="button-reporter-location-add-0" part="button-icon-small" class="button-reporter-location-add material-icons ml-10-m-0 hide">add</button><br /></div>';
                         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 id="input-label-docs" part="input-label">Supporting Documents' + ((docsOptional.length > 0) ? '' : '*') + '</label>';
@@ -3891,12 +3935,16 @@ let SfIEvents = class SfIEvents extends LitElement {
                 }
             });
             (_h = listReportingContainer.querySelector('#upload-guidance-button')) === null || _h === void 0 ? void 0 : _h.addEventListener('click', async () => {
-                var _a, _b, _c, _f, _g, _h, _j, _k;
+                var _a, _b, _c, _f, _g, _h;
                 console.log('upload guidance clicked', event);
                 let inputReportingPercentage = (_b = (_a = listReportingContainer.querySelector('#input-reporter-percentage')) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : "100";
-                let selectReportedLocation = (_f = (_c = listReportingContainer.querySelector('#input-reporter-location')) === null || _c === void 0 ? void 0 : _c.value) !== null && _f !== void 0 ? _f : "";
-                let approvercomments = (_h = (_g = listReportingContainer.querySelector('#input-approver-comments')) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : "";
-                let reportercomments = (_k = (_j = listReportingContainer.querySelector('#input-reporter-comments')) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : "";
+                let selectReportedLocations = listReportingContainer.querySelectorAll('.input-reporter-location');
+                let selectReportedLocationValue = "[]";
+                for (let selectReportedLocation of selectReportedLocations) {
+                    selectReportedLocationValue = JSON.stringify([...JSON.parse(selectReportedLocationValue), selectReportedLocation.value]);
+                }
+                let approvercomments = (_f = (_c = listReportingContainer.querySelector('#input-approver-comments')) === null || _c === void 0 ? void 0 : _c.value) !== null && _f !== void 0 ? _f : "";
+                let reportercomments = (_h = (_g = listReportingContainer.querySelector('#input-reporter-comments')) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : "";
                 let dateOfCompletion;
                 if (listReportingContainer.querySelector('#input-reporter-doc') != null) {
                     dateOfCompletion = new Date(listReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "";
@@ -3909,30 +3957,37 @@ let SfIEvents = class SfIEvents extends LitElement {
                     dateOfCompletion = "";
                 }
                 console.log('dateOfCompletion', dateOfCompletion);
-                await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, "", "", true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocation, documents, dateOfCompletion);
+                await this.fetchEventDetails(event, mmddyyyy, null, eventsContainer, "", "", true, listReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocationValue, documents, dateOfCompletion);
             });
             if (this.mode == "consumer" || this.mode == "next") {
                 let inputReportingPercentage = listReportingContainer.querySelector('#input-reporter-percentage');
                 let percentage = inputReportingPercentage.value;
+                const entityContainers = listReportingContainer.querySelectorAll('.reporting-entity-container');
+                const locationsContainers = listReportingContainer.querySelectorAll('.reporting-location-container');
+                const addLocationButtons = listReportingContainer.querySelectorAll('.button-reporter-location-add');
                 if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-                    listReportingContainer.querySelector('#reporting-entity-container').classList.remove('hide');
-                    listReportingContainer.querySelector('#reporting-location-container').classList.remove('hide');
+                    entityContainers.forEach(container => container.classList.remove('hide'));
+                    locationsContainers.forEach(container => container.classList.remove('hide'));
+                    addLocationButtons.forEach(container => container.classList.remove('hide'));
                 }
                 else {
-                    listReportingContainer.querySelector('#reporting-entity-container').classList.add('hide');
-                    listReportingContainer.querySelector('#reporting-location-container').classList.add('hide');
+                    entityContainers.forEach(container => container.classList.add('hide'));
+                    locationsContainers.forEach(container => container.classList.add('hide'));
+                    addLocationButtons.forEach(container => container.classList.add('hide'));
                 }
                 inputReportingPercentage === null || inputReportingPercentage === void 0 ? void 0 : inputReportingPercentage.addEventListener('change', () => {
                     setTimeout(() => {
                         let percentage = inputReportingPercentage.value;
-                        console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value);
+                        console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value, event.reportedlocations);
                         if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-                            listReportingContainer.querySelector('#reporting-entity-container').classList.remove('hide');
-                            listReportingContainer.querySelector('#reporting-location-container').classList.remove('hide');
+                            entityContainers.forEach(container => container.classList.remove('hide'));
+                            locationsContainers.forEach(container => container.classList.remove('hide'));
+                            addLocationButtons.forEach(container => container.classList.remove('hide'));
                         }
                         else {
-                            listReportingContainer.querySelector('#reporting-entity-container').classList.add('hide');
-                            listReportingContainer.querySelector('#reporting-location-container').classList.add('hide');
+                            entityContainers.forEach(container => container.classList.add('hide'));
+                            locationsContainers.forEach(container => container.classList.add('hide'));
+                            addLocationButtons.forEach(container => container.classList.add('hide'));
                         }
                         if ((percentage != null && parseInt(percentage) == 0) || event.docsOptional.length > 0) {
                             listReportingContainer.querySelector('#input-label-docs').innerHTML = 'Supporting Documents';
@@ -3940,70 +3995,127 @@ let SfIEvents = class SfIEvents extends LitElement {
                         else {
                             listReportingContainer.querySelector('#input-label-docs').innerHTML = 'Supporting Documents*';
                         }
+                        if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100 && (event.reportedlocations == "" || event.reportedlocations == "[]")) {
+                            event.percentage = percentage;
+                            event.reportedlocations = JSON.stringify([""]);
+                            event.reportercomments = listReportingContainer.querySelector('#input-reporter-comments').value;
+                            event.dateofcompletion = listReportingContainer.querySelector('#input-reporter-doc').value.length > 0 ? (new Date(listReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "") : "";
+                            event.documents = this._SfUploader[0].querySelector('#uploader').selectedValues();
+                            console.log('rendering list reporting', event.percentage, event.reportedlocations);
+                            this.renderListReporting(listReportingContainer, event, mmddyyyy, eventsContainer);
+                        }
                     }, 200);
                 });
-                let selectReportingEntity = listReportingContainer.querySelector('#input-reporter-entity');
-                let selectReportingLocation = listReportingContainer.querySelector('#input-reporter-location');
-                selectReportingEntity.innerHTML = '';
                 let projectUserMap = Util.getProjectUsermap();
-                for (let country of Object.keys(projectUserMap)) {
-                    if (country == "roles") {
-                        continue;
-                    }
-                    for (let entity of Object.keys(projectUserMap[country])) {
-                        let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "");
-                        let option = new Option(entityName, entity);
-                        selectReportingEntity.add(option);
-                    }
-                }
-                selectReportingEntity.addEventListener('change', (e) => {
-                    var _a;
-                    selectReportingLocation.innerHTML = '';
+                addLocationButtons.forEach((addLocationBtn) => {
+                    addLocationBtn.addEventListener('click', () => {
+                        let iconhtml = addLocationBtn.innerHTML;
+                        let index = parseInt(addLocationBtn.id.split('-')[4]);
+                        console.log('button clicked', iconhtml, addLocationBtn.id);
+                        if (iconhtml == "add") {
+                            console.log('this.reportedLocationsVals', this.reportedLocationsVals);
+                            this.reportedLocationsVals.push("");
+                        }
+                        else {
+                            this.reportedLocationsVals.splice(index, 1);
+                        }
+                        event.percentage = inputReportingPercentage.value;
+                        event.reportedlocations = JSON.stringify(this.reportedLocationsVals);
+                        if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+                            event.percentage = "100";
+                        }
+                        console.log('rendering list reporting', event.percentage, event.reportedlocations);
+                        event.reportercomments = listReportingContainer.querySelector('#input-reporter-comments').value;
+                        event.dateofcompletion = listReportingContainer.querySelector('#input-reporter-doc').value.length > 0 ? (new Date(listReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "") : "";
+                        event.documents = this._SfUploader[0].querySelector('#uploader').selectedValues();
+                        this.renderListReporting(listReportingContainer, event, mmddyyyy, eventsContainer);
+                    });
+                });
+                for (let indexRepLoc = 0; indexRepLoc < this.reportedLocationsVals.length; indexRepLoc++) {
+                    console.log('AddingEntities', indexRepLoc);
+                    let selectReportingEntity = listReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc);
+                    let selectReportingLocation = listReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc);
+                    selectReportingEntity.innerHTML = '';
                     for (let country of Object.keys(projectUserMap)) {
                         if (country == "roles") {
                             continue;
                         }
                         for (let entity of Object.keys(projectUserMap[country])) {
-                            if (entity.indexOf(e.target.value) < 0) {
+                            let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "");
+                            let option = new Option(entityName, entity);
+                            selectReportingEntity.add(option);
+                        }
+                    }
+                    selectReportingEntity.addEventListener('change', (e) => {
+                        selectReportingLocation.innerHTML = '';
+                        for (let country of Object.keys(projectUserMap)) {
+                            if (country == "roles") {
                                 continue;
                             }
-                            for (let location of Object.keys(projectUserMap[country][entity])) {
-                                let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "");
-                                let option = new Option(locationName, location);
-                                selectReportingLocation.add(option);
+                            for (let entity of Object.keys(projectUserMap[country])) {
+                                if (entity.indexOf(e.target.value) < 0) {
+                                    continue;
+                                }
+                                for (let location of Object.keys(projectUserMap[country][entity])) {
+                                    let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "");
+                                    let option = new Option(locationName, location);
+                                    selectReportingLocation.add(option);
+                                }
                             }
                         }
-                    }
-                    listReportingContainer.querySelector('#reporting-location-container').classList.remove('hide');
-                    selectReportingLocation.value = (_a = event.reportedlocations) !== null && _a !== void 0 ? _a : "";
-                });
-                if (event.reportedlocations != null && event.reportedlocations.length > 0) {
-                    console.log('setting reportedlocations', event.reportedlocations);
-                    for (let country of Object.keys(projectUserMap)) {
-                        if (country == "roles") {
-                            continue;
-                        }
-                        for (let entity of Object.keys(projectUserMap[country])) {
-                            let flagSetVal = false;
-                            for (let location of Object.keys(projectUserMap[country][entity])) {
-                                if (event.reportedlocations.indexOf(location) >= 0) {
-                                    selectReportingEntity.value = entity;
-                                    const changeEvent = new Event('change', { bubbles: true });
-                                    selectReportingEntity.dispatchEvent(changeEvent);
-                                    selectReportingLocation.value = location;
-                                    flagSetVal = true;
+                        listReportingContainer.querySelector('#reporting-location-container-' + indexRepLoc).classList.remove('hide');
+                        selectReportingLocation.value = event.reportedlocations != null ? (Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations) : "";
+                    });
+                    if (selectReportingLocation.innerHTML == '') {
+                        for (let country of Object.keys(projectUserMap)) {
+                            if (country == "roles") {
+                                continue;
+                            }
+                            for (let entity of Object.keys(projectUserMap[country])) {
+                                for (let location of Object.keys(projectUserMap[country][entity])) {
+                                    let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "");
+                                    let option = new Option(locationName, location);
+                                    selectReportingLocation.add(option);
                                     break;
                                 }
-                            }
-                            if (flagSetVal) {
                                 break;
                             }
+                            break;
                         }
                     }
-                }
-                else {
-                    selectReportingEntity.value = "";
-                    selectReportingLocation.value = "";
+                    selectReportingLocation.addEventListener('change', (e) => {
+                        let index = parseInt(e.target.id.split('-')[3]);
+                        this.reportedLocationsVals[index] = e.target.value;
+                    });
+                    if (event.reportedlocations != null && event.reportedlocations.length > 0) {
+                        console.log('setting reportedlocations', event.reportedlocations);
+                        let tempReportedLocation = Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations;
+                        for (let country of Object.keys(projectUserMap)) {
+                            if (country == "roles") {
+                                continue;
+                            }
+                            for (let entity of Object.keys(projectUserMap[country])) {
+                                let flagSetVal = false;
+                                for (let location of Object.keys(projectUserMap[country][entity])) {
+                                    if (tempReportedLocation.indexOf(location) >= 0) {
+                                        selectReportingEntity.value = entity;
+                                        const changeEvent = new Event('change', { bubbles: true });
+                                        selectReportingEntity.dispatchEvent(changeEvent);
+                                        selectReportingLocation.value = location;
+                                        flagSetVal = true;
+                                        break;
+                                    }
+                                }
+                                if (flagSetVal) {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        selectReportingEntity.value = "";
+                        selectReportingLocation.value = "";
+                    }
                 }
                 (_j = listReportingContainer.querySelector('#button-uploader-submit-approve')) === null || _j === void 0 ? void 0 : _j.addEventListener('click', async (ev) => {
                     var _a, _b;
@@ -4263,7 +4375,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         if (listReportingContainer.querySelector('#button-uploader-submit-report') != null) {
                             listReportingContainer.querySelector('#button-uploader-submit-report').style.visibility = 'visible';
                             (_l = listReportingContainer.querySelector('#button-uploader-submit-report')) === null || _l === void 0 ? void 0 : _l.addEventListener('click', async (ev) => {
-                                var _a, _b, _c, _f, _g;
+                                var _a, _b, _c, _f;
                                 let buttonClick = ev.target;
                                 buttonClick.innerHTML = "Saving...";
                                 const reportercomments = listReportingContainer.querySelector('#input-reporter-comments').value;
@@ -4351,13 +4463,22 @@ let SfIEvents = class SfIEvents extends LitElement {
                                             }
                                             else {
                                                 let flagBulk = false;
-                                                let reportedlocations = (_c = selectReportingLocation === null || selectReportingLocation === void 0 ? void 0 : selectReportingLocation.value) !== null && _c !== void 0 ? _c : "";
+                                                // let reportedlocations = selectReportingLocation?.value ?? "";
+                                                let reportedlocations = "[]";
+                                                if (parseInt(percentage) !== 100) {
+                                                    let selectReportedLocations = listReportingContainer.querySelectorAll('.input-reporter-location');
+                                                    for (let selectReportedLocation of selectReportedLocations) {
+                                                        reportedlocations = JSON.stringify([...JSON.parse(reportedlocations), selectReportedLocation.value]);
+                                                    }
+                                                }
                                                 if (this.selectedItemIds.length <= 1) {
-                                                    if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, (_f = event.module) !== null && _f !== void 0 ? _f : "compliance", percentage, event.makercheckers, reportedlocations)) {
+                                                    if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, (_c = event.module) !== null && _c !== void 0 ? _c : "compliance", percentage, event.makercheckers, reportedlocations)) {
                                                         if (this.mode != "next") {
                                                             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].percentage = percentage;
+                                                                    this.events[mmdd][p].reportedlocations = reportedlocations;
                                                                     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();
                                                                 }
@@ -4383,6 +4504,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                             for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
                                                                 if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
                                                                     this.nextEvents[this.nextTabRole][mmdd][p].documents = docs;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].percentage = percentage;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].reportedlocations = reportedlocations;
                                                                     this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
                                                                     this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString();
                                                                 }
@@ -4463,7 +4586,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                             "userid": this.userProfileId,
                                                             "userrole": this.myRole,
                                                             "year": yearStr,
-                                                            "module": (_g = event.module) !== null && _g !== void 0 ? _g : "compliance",
+                                                            "module": (_f = event.module) !== null && _f !== void 0 ? _f : "compliance",
                                                             "makercheckers": (parseInt(makercheckersL) > 0) ? ["makercheckers"] : null
                                                         });
                                                         // }
@@ -4650,7 +4773,6 @@ let SfIEvents = class SfIEvents extends LitElement {
                     let listReportingContainer = eventsContainer.querySelector('#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j);
                     // console.log('mmddyyyy', this.events[mmdd][j], listReportingContainer, '#list-reporting-container-'+mmdd.replace(/\//g,'-')+'-'+j);
                     if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
-                        4;
                         this.renderListReporting(listReportingContainer, this.events[mmdd][j], mmdd + '/' + yyyy, eventsContainer);
                     }
                     else {
@@ -13906,16 +14028,16 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
         };
         this.renderEventDetail = (event, mmddyyyy, currentColumnButton, eventsContainer, previousId, nextId) => {
-            var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+            var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
             console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
             console.log('previousid', previousId, 'nextid', nextId);
             console.log('confighome', Util.getProjectConfigHome());
-            let comments, docs, approved, /*dateOfCompletion,*/ makercheckers, docsOptional, documentType;
+            let comments, docs, approved /*,dateOfCompletion, makercheckers: Array<string>, docsOptional: boolean | any, documentType: string | any*/;
             let entityId = "";
             let locationId = "";
             let statuteName = "";
             let reportformatName = "";
-            let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1];
+            // let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1]
             entityId = event.entityid;
             locationId = event.locationid;
             // let completeness = this.getCompletenessStatus(event);
@@ -13923,9 +14045,9 @@ let SfIEvents = class SfIEvents extends LitElement {
             docs = event['documents'] == null ? [] : event['documents'] == null ? [] : (event['documents']);
             approved = event['approved'] == null ? false : event['approved'] == null ? false : event['approved'];
             // dateOfCompletion = event['dateofcompletion'] == null ? '' : event['dateofcompletion'] == null ? '' : event['dateofcompletion'];
-            makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'] == null ? [] : event['makercheckers'];
-            docsOptional = event['docs'] == null ? [] : event['docs'] == null ? [] : event['docs'];
-            documentType = event['documenttype'] == null ? null : event['documenttype'][0] == null ? null : event['documenttype'][0].split(" ")[0];
+            // makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'] == null ? [] : event['makercheckers'];
+            // docsOptional = event['docs'] == null ? [] : event['docs'] == null ? [] : event['docs'];
+            // documentType = event['documenttype'] == null ? null : event['documenttype'][0] == null ? null : event['documenttype'][0].split(" ")[0];
             statuteName = event['statute'][0].trim();
             if (event['reportformat'] != null) {
                 reportformatName = ((_a = event['reportformat'][0]) !== null && _a !== void 0 ? _a : "").trim().replace('&amp;', '&');
@@ -14205,7 +14327,7 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '</div>';
             if (this.mode == "consumer" || this.mode == "next" || this.mode == "viewer") {
                 if (this.mode != "viewer") {
-                    html += '<div part="reporting-view-container">';
+                    html += '<div part="reporting-view-container" id="reporting-view-container">';
                     html += this.renderReporting(event, mmddyyyy);
                     html += "</div>";
                 }
@@ -14272,94 +14394,16 @@ let SfIEvents = class SfIEvents extends LitElement {
             }
             this._SfDetailContainer.innerHTML = html;
             this._SfDetailContainer.style.display = 'block';
-            // let attachmentUploaders = (this._SfDetailContainer as HTMLDivElement).querySelectorAll('.event-attachment') as NodeListOf<SfIUploader>
-            // for(let attachmentUploader of attachmentUploaders){
-            //   attachmentUploader.loadMode();
-            // }
             if (this.mode != "viewer" && (this._SfUploader[0]) != null) {
                 let ddmmyyyy = mmddyyyy.split('/')[1] + '/' + mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[2];
                 let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${(_b = event.statute[0]) !== null && _b !== void 0 ? _b : ""}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Reporter</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.reporters[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Approver</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.approvers[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
                 this._SfUploader[0].querySelector('#uploader').emailcontent = emailcontent;
             }
-            (_c = this._SfDetailContainer.querySelector('.button-delete')) === null || _c === void 0 ? void 0 : _c.addEventListener('click', async () => {
-                await this.fetchDeleteReview(event["id"], mmddyyyy, entityId, locationId);
-                this.setSuccess('Deleted successfully!');
-                setTimeout(() => {
-                    this.clearMessages();
-                }, 3000);
-                //console.log('deleted', resultDelete);
-                // if(this.getCurrentTab() == this.TAB_CUSTOM) {
-                //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
-                // } else {
-                if (currentColumnButton != null) {
-                    currentColumnButton.click();
-                }
-                // }
-                var clickEvent = new MouseEvent("click", {
-                    "view": window,
-                    "bubbles": true,
-                    "cancelable": false
-                });
-                this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
-            });
-            (_f = this._SfDetailContainer.querySelector('#button-auto-approve')) === null || _f === void 0 ? void 0 : _f.addEventListener('click', async () => {
-                var _a, _b;
-                if (this.selectedItemIds.length <= 1) {
-                    await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, (_a = event.module) !== null && _a !== void 0 ? _a : "compliance");
-                    this.setSuccess('Auto-Approved successfully!');
-                    setTimeout(() => {
-                        this.clearMessages();
-                    }, 3000);
-                }
-                else {
-                    let bulkBodyReview = [];
-                    for (var k = 0; k < this.selectedItemIds.length; k++) {
-                        const selectedId = this.selectedItemIds[k];
-                        //console.log('selectedid', selectedId);
-                        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);
-                        let yearStr = this.getFinancialYear(mmddyyyy);
-                        bulkBodyReview.push({
-                            "mmddyyyy": mmddyyyy,
-                            "projectid": this.projectId,
-                            "type": "review",
-                            "eventid": eventId,
-                            "comments": "Auto approved",
-                            "approved": true,
-                            "entityid": entityId,
-                            "locationid": locationId,
-                            "username": this.userName,
-                            "userid": this.userProfileId,
-                            "userrole": this.myRole,
-                            "year": yearStr,
-                            "module": (_b = event.module) !== null && _b !== void 0 ? _b : "compliance"
-                        });
-                    }
-                    await this.uploadReviewsBulk(bulkBodyReview);
-                }
-                //console.log('deleted', resultDelete);
-                // if(this.getCurrentTab() == this.TAB_CUSTOM) {
-                //   this.processDateSelection((this._SfCustomContainer as HTMLDivElement));
-                // } else {
-                if (currentColumnButton != null) {
-                    currentColumnButton.click();
-                }
-                // }
-                var clickEvent = new MouseEvent("click", {
-                    "view": window,
-                    "bubbles": true,
-                    "cancelable": false
-                });
-                this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
-            });
-            (_g = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _g === void 0 ? void 0 : _g.addEventListener('click', () => {
+            (_c = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _c === void 0 ? void 0 : _c.addEventListener('click', () => {
                 this._SfDetailContainer.innerHTML = '';
                 this._SfDetailContainer.style.display = 'none';
             });
-            (_h = this._SfDetailContainer.querySelector('#button-detail-previous')) === null || _h === void 0 ? void 0 : _h.addEventListener('click', () => {
+            (_f = this._SfDetailContainer.querySelector('#button-detail-previous')) === null || _f === void 0 ? void 0 : _f.addEventListener('click', () => {
                 var _a;
                 var clickEvent = new MouseEvent("click", {
                     "view": window,
@@ -14368,7 +14412,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 });
                 (_a = eventsContainer.querySelector('#' + previousId)) === null || _a === void 0 ? void 0 : _a.dispatchEvent(clickEvent);
             });
-            (_j = this._SfDetailContainer.querySelector('#button-detail-next')) === null || _j === void 0 ? void 0 : _j.addEventListener('click', () => {
+            (_g = this._SfDetailContainer.querySelector('#button-detail-next')) === null || _g === void 0 ? void 0 : _g.addEventListener('click', () => {
                 var _a;
                 var clickEvent = new MouseEvent("click", {
                     "view": window,
@@ -14377,7 +14421,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 });
                 (_a = eventsContainer.querySelector('#' + nextId)) === null || _a === void 0 ? void 0 : _a.dispatchEvent(clickEvent);
             });
-            (_k = this._SfDetailContainer.querySelector('.head-basic')) === null || _k === void 0 ? void 0 : _k.addEventListener('click', () => {
+            (_h = this._SfDetailContainer.querySelector('.head-basic')) === null || _h === void 0 ? void 0 : _h.addEventListener('click', () => {
                 //console.log('head basic clicked', ((this._SfDetailContainer as HTMLDivElement).querySelector('.body-basic') as HTMLDivElement).style.display);
                 if (this._SfDetailContainer.querySelector('.body-basic').style.display == 'flex' || this._SfDetailContainer.querySelector('.body-basic').style.display == '') {
                     this._SfDetailContainer.querySelector('.body-basic').style.display = 'none';
@@ -14388,7 +14432,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this._SfDetailContainer.querySelector('.head-indicator-basic').innerHTML = '-';
                 }
             });
-            (_l = this._SfDetailContainer.querySelector('.head-statute')) === null || _l === void 0 ? void 0 : _l.addEventListener('click', () => {
+            (_j = this._SfDetailContainer.querySelector('.head-statute')) === null || _j === void 0 ? void 0 : _j.addEventListener('click', () => {
                 //console.log('head statute clicked', ((this._SfDetailContainer as HTMLDivElement).querySelector('.body-statute') as HTMLDivElement).style.display);
                 if (this._SfDetailContainer.querySelector('.body-statute').style.display == 'flex' || this._SfDetailContainer.querySelector('.body-statute').style.display == '') {
                     this._SfDetailContainer.querySelector('.body-statute').style.display = 'none';
@@ -14399,7 +14443,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this._SfDetailContainer.querySelector('.head-indicator-statute').innerHTML = '-';
                 }
             });
-            (_m = this._SfDetailContainer.querySelector('.head-compliance')) === null || _m === void 0 ? void 0 : _m.addEventListener('click', () => {
+            (_k = this._SfDetailContainer.querySelector('.head-compliance')) === null || _k === void 0 ? void 0 : _k.addEventListener('click', () => {
                 if (this._SfDetailContainer.querySelector('.body-compliance').style.display == 'flex' || this._SfDetailContainer.querySelector('.body-compliance').style.display == '') {
                     this._SfDetailContainer.querySelector('.body-compliance').style.display = 'none';
                     this._SfDetailContainer.querySelector('.head-indicator-compliance').innerHTML = '+';
@@ -14409,7 +14453,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this._SfDetailContainer.querySelector('.head-indicator-compliance').innerHTML = '-';
                 }
             });
-            (_o = this._SfDetailContainer.querySelector('.head-grc')) === null || _o === void 0 ? void 0 : _o.addEventListener('click', () => {
+            (_l = this._SfDetailContainer.querySelector('.head-grc')) === null || _l === void 0 ? void 0 : _l.addEventListener('click', () => {
                 if (this._SfDetailContainer.querySelector('.body-grc').style.display == 'flex' || this._SfDetailContainer.querySelector('.body-grc').style.display == '') {
                     this._SfDetailContainer.querySelector('.body-grc').style.display = 'none';
                     this._SfDetailContainer.querySelector('.head-indicator-grc').innerHTML = '+';
@@ -14419,7 +14463,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this._SfDetailContainer.querySelector('.head-indicator-grc').innerHTML = '-';
                 }
             });
-            (_p = this._SfDetailContainer.querySelector('.head-feedback')) === null || _p === void 0 ? void 0 : _p.addEventListener('click', () => {
+            (_m = this._SfDetailContainer.querySelector('.head-feedback')) === null || _m === void 0 ? void 0 : _m.addEventListener('click', () => {
                 if (this._SfDetailContainer.querySelector('.body-feedback').style.display == 'flex') {
                     this._SfDetailContainer.querySelector('.body-feedback').style.display = 'none';
                     this._SfDetailContainer.querySelector('.head-indicator-feedback').innerHTML = '+';
@@ -14429,11 +14473,11 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this._SfDetailContainer.querySelector('.head-indicator-feedback').innerHTML = '-';
                 }
             });
-            (_q = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _q === void 0 ? void 0 : _q.addEventListener('click', () => {
+            (_o = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _o === void 0 ? void 0 : _o.addEventListener('click', () => {
                 this._SfDetailContainer.innerHTML = '';
                 this._SfDetailContainer.style.display = 'none';
             });
-            (_r = this._SfDetailContainer.querySelector('#button-feedback')) === null || _r === void 0 ? void 0 : _r.addEventListener('click', () => {
+            (_p = this._SfDetailContainer.querySelector('#button-feedback')) === null || _p === void 0 ? void 0 : _p.addEventListener('click', () => {
                 const feedbackMessage = this._SfDetailContainer.querySelector('#feedback-message');
                 const feedbackSuspense = this._SfDetailContainer.querySelector('#feedback-suspense');
                 const feedbackSuspenseLabel = this._SfDetailContainer.querySelector('#feedback-suspense-label');
@@ -14469,7 +14513,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 // }
                 // console.log(body);
             });
-            (_s = this._SfDetailContainer.querySelector('#button-feedback-cancel')) === null || _s === void 0 ? void 0 : _s.addEventListener('click', () => {
+            (_q = this._SfDetailContainer.querySelector('#button-feedback-cancel')) === null || _q === void 0 ? void 0 : _q.addEventListener('click', () => {
                 const feedbackMessage = this._SfDetailContainer.querySelector('#feedback-message');
                 const feedbackSuspense = this._SfDetailContainer.querySelector('#feedback-suspense');
                 const feedbackSuspenseLabel = this._SfDetailContainer.querySelector('#feedback-suspense-label');
@@ -14500,7 +14544,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     buttonFeedback.classList.remove('hide');
                 }
             });
-            (_t = this._SfDetailContainer.querySelector('#button-feedback-confirm')) === null || _t === void 0 ? void 0 : _t.addEventListener('click', async () => {
+            (_r = this._SfDetailContainer.querySelector('#button-feedback-confirm')) === null || _r === void 0 ? void 0 : _r.addEventListener('click', async () => {
                 var _a, _b, _c;
                 const feedbackMessage = this._SfDetailContainer.querySelector('#feedback-message');
                 const feedbackSuspense = this._SfDetailContainer.querySelector('#feedback-suspense');
@@ -14540,112 +14584,313 @@ let SfIEvents = class SfIEvents extends LitElement {
                     buttonClose.click();
                 }
             });
-            (_u = this._SfDetailContainer.querySelector('#feedback-message')) === null || _u === void 0 ? void 0 : _u.addEventListener('keyup', (e) => {
+            (_s = this._SfDetailContainer.querySelector('#feedback-message')) === null || _s === void 0 ? void 0 : _s.addEventListener('keyup', (e) => {
                 if (e.code == "Enter") {
                     const buttonConfirm = this._SfDetailContainer.querySelector('#button-feedback-confirm');
                     buttonConfirm.click();
                 }
             });
             if (this.mode == "consumer" || this.mode == "next") {
-                let inputReportingPercentage = this._SfDetailContainer.querySelector('#input-reporter-percentage');
+                let eventDetailReportingContainer = this._SfDetailContainer.querySelector('#reporting-view-container');
+                if (eventDetailReportingContainer != null) {
+                    this.renderEventDetailReporting(eventDetailReportingContainer, event, mmddyyyy, this._SfDetailContainer);
+                }
+            }
+            this.fetchStatuteDefinitionDetails(statuteName);
+            console.log('customreporting', event['customreporting']);
+            if (event['customreporting'] != null) {
+                let reportingContainer = this._SfDetailContainer;
+                if (reportingContainer.querySelector('#report-format-container') != null) {
+                    reportingContainer.querySelector('#report-format-container').innerHTML = `<slot name="reporting"></slot>`;
+                    console.log('innerhtml', reportingContainer.querySelector('#report-format-container').innerHTML);
+                    this._SfReporting[0].querySelector('#reporting-format').name = event.obligationtitle;
+                    this._SfReporting[0].querySelector('#reporting-format').mode = "edit";
+                    this._SfReporting[0].querySelector('#reporting-format').configjson = event['customreporting'];
+                    // if(reportformatvalues != ""){
+                    //   (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).prepopulateValJson = reportformatvalues
+                    // }
+                    this._SfReporting[0].querySelector('#reporting-format').loadMode();
+                }
+            }
+            else if (event['reportformat'] != null && event['reportformat'].length > 0) {
+                this.fetchReportFormat(this._SfDetailContainer, reportformatName, (_t = event['reportformatschema']) !== null && _t !== void 0 ? _t : "", (_u = event['reportformatvalues']) !== null && _u !== void 0 ? _u : "");
+            }
+        };
+        this.renderEventDetailReporting = (eventDetailReportingContainer, event, mmddyyyy, eventDetailContainer) => {
+            var _a, _b, _c, _f, _g, _h, _j, _k, _l, _m;
+            console.log('detailreporting event', event, this.graphFilter);
+            let html = '';
+            let mmdd = mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[1];
+            let reportformatName = '';
+            if (event['reportformat'] != null) {
+                reportformatName = ((_a = event['reportformat'][0]) !== null && _a !== void 0 ? _a : "").trim().replace('&amp;', '&');
+            }
+            let docs = event['documents'] == null ? [] : event['documents'];
+            event.approved = event['approved'] == null ? false : event['approved'];
+            event.dateOfCompletion = event['dateofcompletion'] == null ? '' : event['dateofcompletion'];
+            event.makercheckers = event['makercheckers'] == null ? [] : event['makercheckers'];
+            event.docsOptional = event['docs'] == null ? [] : event['docs'];
+            html = this.renderReporting(event, mmddyyyy);
+            console.log('reporting html', html);
+            let ddmmyyyy = mmddyyyy.split('/')[1] + '/' + mmddyyyy.split('/')[0] + '/' + mmddyyyy.split('/')[2];
+            let emailcontent = `<table border="0" cellspacing="0" style="color:#666666;border-radius:5px;border:solid 1px #efefef;width:100%; margin-top:20px"><tbody><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Compliance ID</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.id}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Country</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.countryname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Entity</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${event.entityname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Location</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.locationname.replace(/ *\([^)]*\) */g, "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%;font-weight:bold">Statute</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#fbfbfb;font-size:110%">${((_b = event.statute[0]) !== null && _b !== void 0 ? _b : "")}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Subcategory</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.subcategory}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Reporter</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.reporters[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Approver</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${event.approvers[0].split(';')[0]}</td></tr><tr><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%;font-weight:bold">Due Date</td><td style="padding:10px;padding-top:10px;padding-bottom:10px;vertical-align:top;background-color:#f5f5f5;font-size:110%">${ddmmyyyy}</td></tr></tbody></table>`;
+            eventDetailReportingContainer.innerHTML = html;
+            if (this._SfUploader[0] != null) {
+                this._SfUploader[0].querySelector('#uploader').emailcontent = emailcontent;
+            }
+            (_c = eventDetailReportingContainer.querySelector('.button-delete')) === null || _c === void 0 ? void 0 : _c.addEventListener('click', async () => {
+                await this.fetchDeleteReview(event["id"], mmddyyyy, event.entityid, event.locationid);
+                this.setSuccess('Deleted successfully!');
+                setTimeout(() => {
+                    this.clearMessages();
+                }, 3000);
+                //console.log('deleted', resultDelete);
+                if (this.getCurrentTab() == this.TAB_CUSTOM) {
+                    this.processDateSelection(this._SfCustomContainer);
+                }
+                else {
+                    // if(currentColumnButton != null) {
+                    //   currentColumnButton.click();
+                    // }
+                }
+            });
+            (_f = eventDetailReportingContainer.querySelector('#button-auto-approve')) === null || _f === void 0 ? void 0 : _f.addEventListener('click', async () => {
+                var _a, _b;
+                if (this.selectedItemIds.length <= 1) {
+                    await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], "Auto approved", true, (_a = event.module) !== null && _a !== void 0 ? _a : "compliance");
+                    this.setSuccess('Auto-Approved successfully!');
+                    setTimeout(() => {
+                        this.clearMessages();
+                    }, 3000);
+                }
+                else {
+                    let 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];
+                        //console.log(entityId, locationId, eventId, mmddyyyy);
+                        let yearStr = this.getFinancialYear(mmddyyyy);
+                        bulkBodyReview.push({
+                            "mmddyyyy": mmddyyyy,
+                            "projectid": this.projectId,
+                            "type": "review",
+                            "eventid": eventId,
+                            "comments": "Auto approved",
+                            "approved": true,
+                            "entityid": entityId,
+                            "locationid": locationId,
+                            "username": this.userName,
+                            "userid": this.userProfileId,
+                            "userrole": this.myRole,
+                            "year": yearStr,
+                            "module": (_b = event.module) !== null && _b !== void 0 ? _b : "compliance"
+                        });
+                    }
+                    await this.uploadReviewsBulk(bulkBodyReview);
+                }
+                if (this.getCurrentTab() == this.TAB_CUSTOM) {
+                    this.processDateSelection(this._SfCustomContainer);
+                }
+                else {
+                    // if(currentColumnButton != null) {
+                    //   currentColumnButton.click();
+                    // }
+                }
+            });
+            (_g = eventDetailReportingContainer.querySelector('#upload-guidance-button')) === null || _g === void 0 ? void 0 : _g.addEventListener('click', async () => {
+                var _a, _b, _c, _f, _g, _h;
+                console.log('upload guidance clicked', event);
+                let inputReportingPercentage = (_b = (_a = eventDetailReportingContainer.querySelector('#input-reporter-percentage')) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : "100";
+                let selectReportedLocations = eventDetailReportingContainer.querySelectorAll('.input-reporter-location');
+                let selectReportedLocationValue = "[]";
+                for (let selectReportedLocation of selectReportedLocations) {
+                    selectReportedLocationValue = JSON.stringify([...JSON.parse(selectReportedLocationValue), selectReportedLocation.value]);
+                }
+                let approvercomments = (_f = (_c = eventDetailReportingContainer.querySelector('#input-approver-comments')) === null || _c === void 0 ? void 0 : _c.value) !== null && _f !== void 0 ? _f : "";
+                let reportercomments = (_h = (_g = eventDetailReportingContainer.querySelector('#input-reporter-comments')) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : "";
+                let dateOfCompletion;
+                if (eventDetailReportingContainer.querySelector('#input-reporter-doc') != null) {
+                    dateOfCompletion = new Date(eventDetailReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "";
+                }
+                else {
+                    dateOfCompletion = new Date(eventDetailReportingContainer.querySelector('#input-approver-doc').value).getTime() + "";
+                }
+                let documents = this._SfUploader[0].querySelector('#uploader').selectedValues();
+                if (dateOfCompletion == "NaN") {
+                    dateOfCompletion = "";
+                }
+                console.log('dateOfCompletion', dateOfCompletion);
+                await this.fetchEventDetails(event, mmddyyyy, null, eventDetailContainer, "", "", true, eventDetailReportingContainer, reportercomments, approvercomments, inputReportingPercentage, selectReportedLocationValue, documents, dateOfCompletion);
+            });
+            if (this.mode == "consumer" || this.mode == "next") {
+                let inputReportingPercentage = eventDetailReportingContainer.querySelector('#input-reporter-percentage');
                 let percentage = inputReportingPercentage.value;
+                const entityContainers = eventDetailReportingContainer.querySelectorAll('.reporting-entity-container');
+                const locationsContainers = eventDetailReportingContainer.querySelectorAll('.reporting-location-container');
+                const addLocationButtons = eventDetailReportingContainer.querySelectorAll('.button-reporter-location-add');
                 if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-                    this._SfDetailContainer.querySelector('#reporting-entity-container').classList.remove('hide');
-                    this._SfDetailContainer.querySelector('#reporting-location-container').classList.remove('hide');
+                    entityContainers.forEach(container => container.classList.remove('hide'));
+                    locationsContainers.forEach(container => container.classList.remove('hide'));
+                    addLocationButtons.forEach(container => container.classList.remove('hide'));
                 }
                 else {
-                    this._SfDetailContainer.querySelector('#reporting-entity-container').classList.add('hide');
-                    this._SfDetailContainer.querySelector('#reporting-location-container').classList.add('hide');
+                    entityContainers.forEach(container => container.classList.add('hide'));
+                    locationsContainers.forEach(container => container.classList.add('hide'));
+                    addLocationButtons.forEach(container => container.classList.add('hide'));
                 }
                 inputReportingPercentage === null || inputReportingPercentage === void 0 ? void 0 : inputReportingPercentage.addEventListener('change', () => {
                     setTimeout(() => {
                         let percentage = inputReportingPercentage.value;
-                        console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value);
+                        console.log('percentage', percentage, inputReportingPercentage, inputReportingPercentage.value, event.reportedlocations);
                         if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100) {
-                            this._SfDetailContainer.querySelector('#reporting-entity-container').classList.remove('hide');
-                            this._SfDetailContainer.querySelector('#reporting-location-container').classList.remove('hide');
+                            entityContainers.forEach(container => container.classList.remove('hide'));
+                            locationsContainers.forEach(container => container.classList.remove('hide'));
+                            addLocationButtons.forEach(container => container.classList.remove('hide'));
                         }
                         else {
-                            this._SfDetailContainer.querySelector('#reporting-entity-container').classList.add('hide');
-                            this._SfDetailContainer.querySelector('#reporting-location-container').classList.add('hide');
+                            entityContainers.forEach(container => container.classList.add('hide'));
+                            locationsContainers.forEach(container => container.classList.add('hide'));
+                            addLocationButtons.forEach(container => container.classList.add('hide'));
                         }
-                        if ((percentage != null && parseInt(percentage) == 0) || docsOptional.length > 0) {
-                            this._SfDetailContainer.querySelector('#input-label-docs').innerHTML = 'Supporting Documents';
+                        if ((percentage != null && parseInt(percentage) == 0) || event.docsOptional.length > 0) {
+                            eventDetailReportingContainer.querySelector('#input-label-docs').innerHTML = 'Supporting Documents';
                         }
                         else {
-                            this._SfDetailContainer.querySelector('#input-label-docs').innerHTML = 'Supporting Documents*';
+                            eventDetailReportingContainer.querySelector('#input-label-docs').innerHTML = 'Supporting Documents*';
+                        }
+                        if (percentage != null && percentage.length > 0 && parseInt(percentage) < 100 && (event.reportedlocations == "" || event.reportedlocations == "[]")) {
+                            event.percentage = percentage;
+                            event.reportedlocations = JSON.stringify([""]);
+                            event.reportercomments = eventDetailReportingContainer.querySelector('#input-reporter-comments').value;
+                            event.dateofcompletion = eventDetailReportingContainer.querySelector('#input-reporter-doc').value.length > 0 ? (new Date(eventDetailReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "") : "";
+                            event.documents = this._SfUploader[0].querySelector('#uploader').selectedValues();
+                            console.log('rendering list reporting', event.percentage, event.reportedlocations);
+                            this.renderEventDetailReporting(eventDetailReportingContainer, event, mmddyyyy, eventDetailContainer);
                         }
                     }, 200);
                 });
-                let selectReportingEntity = this._SfDetailContainer.querySelector('#input-reporter-entity');
-                let selectReportingLocation = this._SfDetailContainer.querySelector('#input-reporter-location');
-                selectReportingEntity.innerHTML = '';
                 let projectUserMap = Util.getProjectUsermap();
-                for (let country of Object.keys(projectUserMap)) {
-                    if (country == "roles") {
-                        continue;
-                    }
-                    for (let entity of Object.keys(projectUserMap[country])) {
-                        let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "");
-                        let option = new Option(entityName, entity);
-                        selectReportingEntity.add(option);
-                    }
-                }
-                selectReportingEntity.addEventListener('change', (e) => {
-                    var _a;
-                    selectReportingLocation.innerHTML = '';
+                addLocationButtons.forEach((addLocationBtn) => {
+                    addLocationBtn.addEventListener('click', () => {
+                        let iconhtml = addLocationBtn.innerHTML;
+                        let index = parseInt(addLocationBtn.id.split('-')[4]);
+                        console.log('button clicked', iconhtml, addLocationBtn.id);
+                        if (iconhtml == "add") {
+                            console.log('this.reportedLocationsVals', this.reportedLocationsVals);
+                            this.reportedLocationsVals.push("");
+                        }
+                        else {
+                            this.reportedLocationsVals.splice(index, 1);
+                        }
+                        event.percentage = inputReportingPercentage.value;
+                        event.reportedlocations = JSON.stringify(this.reportedLocationsVals);
+                        if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+                            event.percentage = "100";
+                        }
+                        console.log('rendering list reporting', event.percentage, event.reportedlocations);
+                        event.reportercomments = eventDetailReportingContainer.querySelector('#input-reporter-comments').value;
+                        event.dateofcompletion = eventDetailReportingContainer.querySelector('#input-reporter-doc').value.length > 0 ? (new Date(eventDetailReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "") : "";
+                        event.documents = this._SfUploader[0].querySelector('#uploader').selectedValues();
+                        this.renderEventDetailReporting(eventDetailReportingContainer, event, mmddyyyy, eventDetailContainer);
+                    });
+                });
+                for (let indexRepLoc = 0; indexRepLoc < this.reportedLocationsVals.length; indexRepLoc++) {
+                    console.log('AddingEntities', indexRepLoc);
+                    let selectReportingEntity = eventDetailReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc);
+                    let selectReportingLocation = eventDetailReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc);
+                    selectReportingEntity.innerHTML = '';
                     for (let country of Object.keys(projectUserMap)) {
                         if (country == "roles") {
                             continue;
                         }
                         for (let entity of Object.keys(projectUserMap[country])) {
-                            if (entity.indexOf(e.target.value) < 0) {
+                            let entityName = entity.split(';')[0].replace(/ *\([^)]*\) */g, "");
+                            let option = new Option(entityName, entity);
+                            selectReportingEntity.add(option);
+                        }
+                    }
+                    selectReportingEntity.addEventListener('change', (e) => {
+                        selectReportingLocation.innerHTML = '';
+                        for (let country of Object.keys(projectUserMap)) {
+                            if (country == "roles") {
                                 continue;
                             }
-                            for (let location of Object.keys(projectUserMap[country][entity])) {
-                                let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "");
-                                let option = new Option(locationName, location);
-                                selectReportingLocation.add(option);
+                            for (let entity of Object.keys(projectUserMap[country])) {
+                                if (entity.indexOf(e.target.value) < 0) {
+                                    continue;
+                                }
+                                for (let location of Object.keys(projectUserMap[country][entity])) {
+                                    let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "");
+                                    let option = new Option(locationName, location);
+                                    selectReportingLocation.add(option);
+                                }
                             }
                         }
-                    }
-                    this._SfDetailContainer.querySelector('#reporting-location-container').classList.remove('hide');
-                    selectReportingLocation.value = (_a = event.reportedlocations) !== null && _a !== void 0 ? _a : "";
-                });
-                if (event.reportedlocations != null && event.reportedlocations.length > 0) {
-                    console.log('setting reportedlocations', event.reportedlocations);
-                    for (let country of Object.keys(projectUserMap)) {
-                        if (country == "roles") {
-                            continue;
+                        eventDetailReportingContainer.querySelector('#reporting-location-container-' + indexRepLoc).classList.remove('hide');
+                        selectReportingLocation.value = event.reportedlocations != null ? (Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations) : "";
+                    });
+                    if (selectReportingLocation.innerHTML == '') {
+                        for (let country of Object.keys(projectUserMap)) {
+                            if (country == "roles") {
+                                continue;
+                            }
+                            for (let entity of Object.keys(projectUserMap[country])) {
+                                for (let location of Object.keys(projectUserMap[country][entity])) {
+                                    let locationName = location.split(';')[0].replace(/ *\([^)]*\) */g, "");
+                                    let option = new Option(locationName, location);
+                                    selectReportingLocation.add(option);
+                                    break;
+                                }
+                                break;
+                            }
+                            break;
                         }
-                        for (let entity of Object.keys(projectUserMap[country])) {
-                            let flagSetVal = false;
-                            for (let location of Object.keys(projectUserMap[country][entity])) {
-                                if (event.reportedlocations.indexOf(location) >= 0) {
-                                    selectReportingEntity.value = entity;
-                                    const changeEvent = new Event('change', { bubbles: true });
-                                    selectReportingEntity.dispatchEvent(changeEvent);
-                                    selectReportingLocation.value = location;
-                                    flagSetVal = true;
+                    }
+                    selectReportingLocation.addEventListener('change', (e) => {
+                        let index = parseInt(e.target.id.split('-')[3]);
+                        this.reportedLocationsVals[index] = e.target.value;
+                    });
+                    if (event.reportedlocations != null && event.reportedlocations.length > 0) {
+                        console.log('setting reportedlocations', event.reportedlocations);
+                        let tempReportedLocation = Util.isJSONParsable(event.reportedlocations) ? JSON.parse(event.reportedlocations)[indexRepLoc] : event.reportedlocations;
+                        for (let country of Object.keys(projectUserMap)) {
+                            if (country == "roles") {
+                                continue;
+                            }
+                            for (let entity of Object.keys(projectUserMap[country])) {
+                                let flagSetVal = false;
+                                for (let location of Object.keys(projectUserMap[country][entity])) {
+                                    if (tempReportedLocation.indexOf(location) >= 0) {
+                                        selectReportingEntity.value = entity;
+                                        const changeEvent = new Event('change', { bubbles: true });
+                                        selectReportingEntity.dispatchEvent(changeEvent);
+                                        selectReportingLocation.value = location;
+                                        flagSetVal = true;
+                                        break;
+                                    }
+                                }
+                                if (flagSetVal) {
                                     break;
                                 }
                             }
-                            if (flagSetVal) {
-                                break;
-                            }
                         }
                     }
+                    else {
+                        selectReportingEntity.value = "";
+                        selectReportingLocation.value = "";
+                    }
                 }
-                else {
-                    selectReportingEntity.value = "";
-                    selectReportingLocation.value = "";
-                }
-                (_v = this._SfDetailContainer.querySelector('#button-uploader-submit-approve')) === null || _v === void 0 ? void 0 : _v.addEventListener('click', async (ev) => {
-                    var _a, _b, _c;
+                (_h = eventDetailReportingContainer.querySelector('#button-uploader-submit-approve')) === null || _h === void 0 ? void 0 : _h.addEventListener('click', async (ev) => {
+                    var _a, _b;
                     let buttonClick = ev.target;
                     buttonClick.innerHTML = "Saving...";
-                    const comments = this._SfDetailContainer.querySelector('#input-approver-comments').value;
-                    const approved = this._SfDetailContainer.querySelector('#input-approve-yes').checked;
+                    const comments = eventDetailReportingContainer.querySelector('#input-approver-comments').value;
+                    console.log('comments', comments, JSON.stringify(event.comments));
+                    const approved = eventDetailReportingContainer.querySelector('#input-approve-yes').checked;
                     let currStatus = this.getCompletenessStatus(event);
                     let newEvent = { ...event };
                     newEvent.comments = comments;
@@ -14659,22 +14904,19 @@ let SfIEvents = class SfIEvents extends LitElement {
                         }, 3000);
                         return;
                     }
-                    var clickEvent = new MouseEvent("click", {
-                        "view": window,
-                        "bubbles": true,
-                        "cancelable": false
-                    });
-                    this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
-                    // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved)
                     let flagBulk = false;
                     if (this.selectedItemIds.length <= 1) {
-                        // console.log('mmddyyyy', mmddyyyy)
-                        if (await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], comments, approved, (_a = event.module) !== null && _a !== void 0 ? _a : "compliance")) {
+                        console.log('selectedevent', JSON.stringify(event));
+                        if (await this.uploadReview(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, (_a = event.module) !== null && _a !== void 0 ? _a : "compliance")) {
                             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) {
+                                if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
                                     this.events[mmdd][p].approved = approved;
+                                    console.log('selected event', this.events[mmdd][p]);
                                     this.events[mmdd][p].comments.push({ 'author': 'Approver', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
                                     this.events[mmdd][p].lastupdated = new Date().toString();
+                                    if (approved) {
+                                        this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
+                                    }
                                 }
                             }
                             if (this.recentlyReported[mmdd] == null) {
@@ -14688,8 +14930,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                         for (var k = 0; k < this.selectedItemIds.length; k++) {
                             const selectedId = this.selectedItemIds[k];
                             //console.log('selectedid', selectedId);
-                            entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                            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];
                             //console.log(entityId, locationId, eventId, mmddyyyy);
@@ -14701,8 +14943,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 "eventid": eventId,
                                 "comments": comments,
                                 "approved": approved,
-                                "entityid": entityId,
-                                "locationid": locationId,
+                                "entityid": entityid,
+                                "locationid": locationid,
                                 "username": this.userName,
                                 "userid": this.userProfileId,
                                 "userrole": this.myRole,
@@ -14718,16 +14960,16 @@ let SfIEvents = class SfIEvents extends LitElement {
                         for (var k = 0; k < this.selectedItemIds.length; k++) {
                             const selectedId = this.selectedItemIds[k];
                             //console.log('selectedid', selectedId);
-                            entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                            locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                            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];
                             if (this.mode == "next") {
                                 for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                                    if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-                                        this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true;
+                                    if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityid) {
                                         flagBulk = true;
+                                        this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true;
                                         if (this.recentlyReported[mmdd] == null) {
                                             this.recentlyReported[mmdd] = [];
                                         }
@@ -14737,7 +14979,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                             }
                             else {
                                 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) {
+                                    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) {
@@ -14752,7 +14994,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (this.mode == "next") {
                         // this.fetchNext(this.nextPage)
                         // this.renderRoleTabsNext(this.nextPage)
-                        this.renderNextEvents(this.nextEvents, this.nextPage, this.myRole);
+                        this.renderNextEvents(this.nextEvents, this.nextPage, this.nextTabRole);
                     }
                     else {
                         // if(this.getCurrentTab() == this.TAB_CUSTOM) {
@@ -14766,39 +15008,17 @@ let SfIEvents = class SfIEvents extends LitElement {
                             if (this.selectedItemIds.length > 0) {
                                 await this.fetchBulkReportingData();
                             }
+                            console.log('events', this.events);
                             this.renderAppropriateStream(this.sdate, this.edate, true, flagBulk);
-                            var clickEvent = new MouseEvent("click", {
-                                "view": window,
-                                "bubbles": true,
-                                "cancelable": false
-                            });
-                            (_c = this._SfDetailContainer.querySelector('#button-detail-close')) === null || _c === void 0 ? void 0 : _c.dispatchEvent(clickEvent);
-                            // if(currentColumnButton != null) {
-                            //   currentColumnButton.click();
-                            // }
                         }
                     }
                 });
-                (_w = this._SfDetailContainer.querySelector('#button-uploader-submit-audit')) === null || _w === void 0 ? void 0 : _w.addEventListener('click', async (ev) => {
+                (_j = eventDetailReportingContainer.querySelector('#button-uploader-submit-audit')) === null || _j === void 0 ? void 0 : _j.addEventListener('click', async (ev) => {
                     var _a, _b;
                     let buttonClick = ev.target;
                     buttonClick.innerHTML = "Saving...";
-                    const comments = this._SfDetailContainer.querySelector('#input-auditor-comments').value;
-                    const approved = this._SfDetailContainer.querySelector('#input-approve-yes').checked;
-                    let currStatus = this.getCompletenessStatus(event);
-                    let newEvent = { ...event };
-                    newEvent.comments = comments;
-                    newEvent.approved = approved;
-                    let newStatus = this.getCompletenessStatus(newEvent);
-                    console.log('status', currStatus, newStatus);
-                    if (currStatus == newStatus) {
-                        buttonClick.innerHTML = "Save";
-                        this.setError(approved ? 'Already Approved!' : 'Already Rejected!');
-                        setTimeout(() => {
-                            this.clearMessages();
-                        }, 3000);
-                        return;
-                    }
+                    const comments = eventDetailReportingContainer.querySelector('#input-auditor-comments').value;
+                    const approved = eventDetailReportingContainer.querySelector('#input-approve-yes').checked;
                     if (comments.trim().length === 0) {
                         buttonClick.innerHTML = "Save";
                         this.setError('Comments cannot be blank!');
@@ -14809,22 +15029,14 @@ let SfIEvents = class SfIEvents extends LitElement {
                     else {
                         let flagBulk = false;
                         if (this.selectedItemIds.length <= 1) {
-                            if (await this.uploadAudit(entityId, locationId, mmddyyyy, event["id"], comments, approved, (_a = event.module) !== null && _a !== void 0 ? _a : "compliance")) {
-                                if (this.mode == "next") {
-                                    for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                                        if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-                                            this.nextEvents[this.nextTabRole][mmdd][p].approved = approved;
-                                            this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                            this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString();
-                                        }
-                                    }
-                                }
-                                else {
-                                    for (var p = 0; p < this.events[mmdd].length; p++) {
-                                        if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                            this.events[mmdd][p].approved = approved;
-                                            this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
-                                            this.events[mmdd][p].lastupdated = new Date().toString();
+                            if (await this.uploadAudit(event.entityid, event.locationid, mmddyyyy, event["id"], comments, approved, (_a = event.module) !== null && _a !== void 0 ? _a : "compliance")) {
+                                for (var p = 0; p < this.events[mmdd].length; p++) {
+                                    if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == event.locationid && this.events[mmdd][p].entityid == event.entityid) {
+                                        this.events[mmdd][p].approved = approved;
+                                        this.events[mmdd][p].comments.push({ 'author': 'Auditor', 'comment': comments + ` (Approved: ${approved ? 'Yes' : 'No'})`, 'timestamp': new Date().toString() });
+                                        this.events[mmdd][p].lastupdated = new Date().toString();
+                                        if (approved) {
+                                            this.events[mmdd][p].dateofcompletion = new Date().getTime() + "";
                                         }
                                     }
                                 }
@@ -14839,8 +15051,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                             for (var k = 0; k < this.selectedItemIds.length; k++) {
                                 const selectedId = this.selectedItemIds[k];
                                 //console.log('selectedid', selectedId);
-                                entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                                locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                                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];
                                 //console.log(entityId, locationId, eventId, mmddyyyy);
@@ -14865,20 +15077,20 @@ let SfIEvents = class SfIEvents extends LitElement {
                             for (var k = 0; k < this.selectedItemIds.length; k++) {
                                 const selectedId = this.selectedItemIds[k];
                                 //console.log('selectedid', selectedId);
-                                entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                                locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                                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];
                                 if (this.mode == "next") {
                                     for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
                                         if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-                                            this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true;
                                             flagBulk = true;
+                                            this.nextEvents[this.nextTabRole][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.nextEvents[this.nextTabRole][mmdd][p]);
                                         }
                                     }
                                 }
@@ -14896,12 +15108,6 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 }
                             }
                         }
-                        var clickEvent = new MouseEvent("click", {
-                            "view": window,
-                            "bubbles": true,
-                            "cancelable": false
-                        });
-                        this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
                         if (this.mode == "next") {
                             // this.fetchNext(this.nextPage, this.nextTabRole, this.nextTabStatus)
                             this.renderNextEvents(this.nextEvents, this.nextPage, this.nextTabRole);
@@ -14927,33 +15133,33 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 });
                 if (this.myRole == this.TAB_REPORTER || this.myRole == this.TAB_FUNCTION_HEAD) {
-                    if (approved) {
-                        if (this._SfDetailContainer.querySelector('#button-uploader-submit-report') != null) {
-                            this._SfDetailContainer.querySelector('#button-uploader-submit-report').style.visibility = 'hidden';
+                    if (event.approved) {
+                        if (eventDetailReportingContainer.querySelector('#button-uploader-submit-report') != null) {
+                            eventDetailReportingContainer.querySelector('#button-uploader-submit-report').style.visibility = 'hidden';
                         }
                     }
                     else {
-                        if (this._SfDetailContainer.querySelector('#button-uploader-submit-report') != null) {
-                            this._SfDetailContainer.querySelector('#button-uploader-submit-report').style.visibility = 'visible';
-                            (_x = this._SfDetailContainer.querySelector('#button-uploader-submit-report')) === null || _x === void 0 ? void 0 : _x.addEventListener('click', async (ev) => {
+                        if (eventDetailReportingContainer.querySelector('#button-uploader-submit-report') != null) {
+                            eventDetailReportingContainer.querySelector('#button-uploader-submit-report').style.visibility = 'visible';
+                            (_k = eventDetailReportingContainer.querySelector('#button-uploader-submit-report')) === null || _k === void 0 ? void 0 : _k.addEventListener('click', async (ev) => {
                                 var _a, _b, _c, _f;
                                 let buttonClick = ev.target;
                                 buttonClick.innerHTML = "Saving...";
-                                const reportercomments = this._SfDetailContainer.querySelector('#input-reporter-comments').value;
+                                const reportercomments = eventDetailReportingContainer.querySelector('#input-reporter-comments').value;
                                 //console.log('reporter comments 1', reportercomments);
-                                const reporterdoc = this._SfDetailContainer.querySelector('#input-reporter-doc').value.length > 0 ? (new Date(this._SfDetailContainer.querySelector('#input-reporter-doc').value).getTime() + "") : "";
+                                const reporterdoc = eventDetailReportingContainer.querySelector('#input-reporter-doc').value.length > 0 ? (new Date(eventDetailReportingContainer.querySelector('#input-reporter-doc').value).getTime() + "") : "";
                                 let docs = [];
                                 //console.log('reporter comments 2', reportercomments);
+                                // if(docsOptional.length === 0) {
                                 let percentage = "100";
-                                if (this._SfDetailContainer.querySelector('#input-reporter-percentage') != null) {
-                                    percentage = this._SfDetailContainer.querySelector('#input-reporter-percentage').value;
+                                if (eventDetailReportingContainer.querySelector('#input-reporter-percentage') != null) {
+                                    percentage = eventDetailReportingContainer.querySelector('#input-reporter-percentage').value;
                                 }
-                                // if(docsOptional.length === 0) {
                                 docs = this._SfUploader[0].querySelector('#uploader').selectedValues();
                                 // }
                                 let flag = false;
                                 do {
-                                    if (docs.length > 0 && docsOptional != null && docsOptional.length === 0 && parseInt(percentage) > 0) {
+                                    if (docs.length > 0 && event.docsOptional != null && event.docsOptional.length === 0 && parseInt(percentage) > 0) {
                                         for (let doc of docs) {
                                             if ((doc.jobId == null || doc.jobId.length === 0) && (doc.ext.toLowerCase() == 'pdf' || doc.ext.toLowerCase() == 'png' || doc.ext.toLowerCase() == 'jpeg' || doc.ext.toLowerCase() == 'jpg')) {
                                                 flag = false;
@@ -14979,6 +15185,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     reportformatvalues = (_a = JSON.stringify(this._SfReporting[0].querySelector('#reporting-format').selectedValues())) !== null && _a !== void 0 ? _a : "";
                                     reportformatschema = (_b = this._SfReporting[0].querySelector('#reporting-format').configjson) !== null && _b !== void 0 ? _b : "";
                                 }
+                                console.log('percentage', percentage, eventDetailReportingContainer.querySelector('#input-reporter-percentage').value);
                                 if (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
                                     //console.log('reporter comments 3', reportercomments);
                                     buttonClick.innerHTML = "Save";
@@ -14988,7 +15195,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     }, 3000);
                                 }
                                 else {
-                                    if (docs.length === 0 && docsOptional.length === 0 && parseInt(percentage) > 0) {
+                                    if (docs.length == 0 && event.docsOptional != null && event.docsOptional.length === 0 && parseInt(percentage) > 0) {
                                         //console.log('reporter comments 3', reportercomments);
                                         buttonClick.innerHTML = "Save";
                                         this.setError('No documents uploaded!');
@@ -15022,43 +15229,58 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                 }, 3000);
                                             }
                                             else {
-                                                var clickEvent = new MouseEvent("click", {
-                                                    "view": window,
-                                                    "bubbles": true,
-                                                    "cancelable": false
-                                                });
-                                                this._SfDetailContainer.querySelector('#button-detail-close').dispatchEvent(clickEvent);
                                                 let flagBulk = false;
-                                                let reportinglocation = selectReportingLocation.value;
+                                                // let reportedlocations = selectReportingLocation?.value ?? "";
+                                                let reportedlocations = "[]";
+                                                if (parseInt(percentage) !== 100) {
+                                                    let selectReportedLocations = eventDetailReportingContainer.querySelectorAll('.input-reporter-location');
+                                                    for (let selectReportedLocation of selectReportedLocations) {
+                                                        reportedlocations = JSON.stringify([...JSON.parse(reportedlocations), selectReportedLocation.value]);
+                                                    }
+                                                }
                                                 if (this.selectedItemIds.length <= 1) {
-                                                    //console.log('makerscheckers', makercheckers, reportercomments);
-                                                    // console.log('reportformatvalues', reportformatvalues)
-                                                    // console.log('reportformatschema',reportformatschema)
-                                                    if (await this.uploadReport(entityId, locationId, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, (_c = event.module) !== null && _c !== void 0 ? _c : "compliance", percentage, makercheckers, reportinglocation)) {
-                                                        if (this.mode == "next") {
-                                                            for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                                                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-                                                                    this.nextEvents[this.nextTabRole][mmdd][p].documents = docs;
-                                                                    this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
-                                                                    this.nextEvents[this.nextTabRole][mmdd][p].lastupdated = new Date().toString();
-                                                                }
-                                                            }
-                                                        }
-                                                        else {
-                                                            console.log('this.events', this.events);
+                                                    if (await this.uploadReport(event.entityid, event.locationid, mmddyyyy, event["id"], reportercomments, reporterdoc, docs, event, reportformatvalues, reportformatschema, (_c = event.module) !== null && _c !== void 0 ? _c : "compliance", percentage, event.makercheckers, reportedlocations)) {
+                                                        if (this.mode != "next") {
                                                             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) {
+                                                                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].percentage = percentage;
+                                                                    this.events[mmdd][p].reportedlocations = reportedlocations;
                                                                     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.module ?? "compliance");
+                                                                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);
                                                         }
-                                                        if (makercheckers.length > 0) {
-                                                            // await this.uploadReview(entityId, locationId, mmddyyyy, event["id"], "Auto approved", true, event.module ?? "compliance");
-                                                            if (this.mode == "next") {
+                                                        else {
+                                                            for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
+                                                                if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].documents = docs;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].percentage = percentage;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].reportedlocations = reportedlocations;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Reporter', 'comment': reportercomments + ` (Documents Saved: ${docs.length}})`, 'timestamp': new Date().toString() });
+                                                                    this.nextEvents[this.nextTabRole][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.module ?? "compliance");
                                                                 for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
-                                                                    if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
+                                                                    if (this.nextEvents[this.nextTabRole][mmdd][p].id == event.id && this.nextEvents[this.nextTabRole][mmdd][p].locationid == event.locationid && this.nextEvents[this.nextTabRole][mmdd][p].entityid == event.entityid) {
                                                                         this.nextEvents[this.nextTabRole][mmdd][p].approved = true;
                                                                         // this.events[mmdd][p].documents = docs
                                                                         this.nextEvents[this.nextTabRole][mmdd][p].comments.push({ 'author': 'Approver', 'comment': `Auto approved (Approved: Yes})`, 'timestamp': new Date().toString() });
@@ -15066,21 +15288,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                                     }
                                                                 }
                                                             }
-                                                            else {
-                                                                for (var p = 0; p < this.events[mmdd].length; p++) {
-                                                                    if (this.events[mmdd][p].id == event.id && this.events[mmdd][p].locationid == locationId && this.events[mmdd][p].entityid == entityId) {
-                                                                        this.events[mmdd][p].approved = true;
-                                                                        // this.events[mmdd][p].documents = docs
-                                                                        this.events[mmdd][p].comments.push({ 'author': '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);
                                                         }
-                                                        if (this.recentlyReported[mmdd] == null) {
-                                                            this.recentlyReported[mmdd] = [];
-                                                        }
-                                                        this.recentlyReported[mmdd].push(event);
                                                     }
                                                 }
                                                 else {
@@ -15090,30 +15303,11 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         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, '-');
+                                                        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];
                                                         //console.log(entityId, locationId, eventId, mmddyyyy);
-                                                        // 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.module ?? "compliance"
-                                                        // })
                                                         // await this.uploadReport(entityId, locationId, mmddyyyy, eventId, reportercomments, reporterdoc, docs, null)
                                                         // if(parseInt(makercheckersL) > 0) {
                                                         //   bulkBodyReview.push({ 
@@ -15148,7 +15342,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                             "comments": reportercomments,
                                                             "dateofcompletion": reporterdoc,
                                                             "percentage": percentage,
-                                                            "reportinglocation": reportinglocation,
+                                                            "reportedlocations": reportedlocations,
                                                             "entityid": entityId,
                                                             "locationid": locationId,
                                                             "event": null,
@@ -15167,26 +15361,27 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         // await this.sleep(2000);
                                                         // this.clearMessages();
                                                     }
+                                                    // await this.uploadReportsBulk(bulkBody);
+                                                    // await this.fetchBulkReportingData();
                                                     if (bulkBody.length > 0) {
                                                         await this.uploadReportsBulk(bulkBody, bulkBodyReview.length == 0);
                                                     }
-                                                    // await this.fetchBulkReportingData();
                                                     // 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);
-                                                        entityId = selectedId.split('-')[7].replace(/_/g, '-');
-                                                        locationId = selectedId.split('-')[8].replace(/_/g, '-');
+                                                        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];
                                                         if (this.mode == "next") {
                                                             for (var p = 0; p < this.nextEvents[this.nextTabRole][mmdd].length; p++) {
                                                                 if (this.nextEvents[this.nextTabRole][mmdd][p].id == eventId && this.nextEvents[this.nextTabRole][mmdd][p].locationid == locationId && this.nextEvents[this.nextTabRole][mmdd][p].entityid == entityId) {
-                                                                    this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true;
                                                                     flagBulk = true;
+                                                                    this.nextEvents[this.nextTabRole][mmdd][p].isbulk = true;
                                                                     if (this.recentlyReported[mmdd] == null) {
                                                                         this.recentlyReported[mmdd] = [];
                                                                     }
@@ -15197,8 +15392,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                                         else {
                                                             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;
+                                                                    this.events[mmdd][p].isbulk = true;
                                                                     if (this.recentlyReported[mmdd] == null) {
                                                                         this.recentlyReported[mmdd] = [];
                                                                     }
@@ -15239,32 +15434,38 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                 }
                 if (this._SfUploader[0] != null) {
-                    this._SfDetailContainer.querySelector('.uploader-analysis-message').style.display = "none";
+                    if (eventDetailReportingContainer.querySelector('.uploader-analysis-message') != null) {
+                        eventDetailReportingContainer.querySelector('.uploader-analysis-message').style.display = "none";
+                    }
                     this._SfUploader[0].querySelector('#uploader').addEventListener('analysisInProgress', (_ev) => {
                         console.log('uploader analysisInProgress', _ev);
-                        this._SfDetailContainer.querySelector('.uploader-analysis-message').style.display = "block";
+                        if (eventDetailReportingContainer.querySelector('.uploader-analysis-message') != null) {
+                            eventDetailReportingContainer.querySelector('.uploader-analysis-message').style.display = "block";
+                        }
                     });
                     this._SfUploader[0].querySelector('#uploader').addEventListener('analysisCompleted', (_ev) => {
                         console.log('uploader analysisInProgress', _ev);
-                        if (this._SfDetailContainer.querySelector('.uploader-analysis-message') != null) {
-                            this._SfDetailContainer.querySelector('.uploader-analysis-message').style.display = "none";
+                        if (eventDetailReportingContainer.querySelector('.uploader-analysis-message') != null) {
+                            eventDetailReportingContainer.querySelector('.uploader-analysis-message').style.display = "none";
                         }
                     });
                     //console.log('documentType checking', documentType);
-                    if (documentType != null) {
-                        this._SfUploader[0].querySelector('#uploader').docType = documentType;
+                    if (event.documentType != null) {
+                        this._SfUploader[0].querySelector('#uploader').docType = event.documentType;
                     }
                     else {
                         this._SfUploader[0].querySelector('#uploader').docType = "";
                     }
                     this._SfUploader[0].querySelector('#uploader').prepopulatedInputArr = JSON.stringify([]);
                     console.log('uploader', this._SfUploader[0].querySelector('#uploader'));
+                    this._SfUploader[0].querySelector('#uploader').current = 0;
                     this._SfUploader[0].querySelector('#uploader').loadMode();
                     if (docs.length > 0) {
                         this._SfUploader[0].querySelector('#uploader').prepopulatedInputArr = JSON.stringify(docs);
+                        this._SfUploader[0].querySelector('#uploader').current = docs.length;
                         this._SfUploader[0].querySelector('#uploader').loadMode();
                     }
-                    if (this.myRole == this.TAB_APPROVER || approved) {
+                    if (this.myRole == this.TAB_APPROVER || event.approved) {
                         this._SfUploader[0].querySelector('#uploader').readOnly = true;
                         this._SfUploader[0].querySelector('#uploader').loadMode();
                     }
@@ -15275,8 +15476,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                     const dataPassthrough = {
                         projectId: this.projectId,
                         countryId: this.countryId,
-                        entityId: entityId,
-                        locationId: locationId,
+                        entityId: event.entityid,
+                        locationId: event.locationid,
                         mmddyyyy: mmddyyyy,
                         complianceId: event['id'],
                         path: "uploadextract"
@@ -15288,6 +15489,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                     this._SfUploader[0].querySelector('#uploader').callbackUrlHost = callbackUrlHost;
                     this._SfUploader[0].querySelector('#uploader').callbackUrlPath = callbackUrlPath;
                     this._SfUploader[0].querySelector('#uploader').loadMode();
+                    console.log('uploader prepopulate', this._SfUploader[0].querySelector('#uploader').prepopulatedInputArr, this._SfUploader[0].querySelector('#uploader').extract);
                 }
                 //console.log('approved 1', event["approved"], this.myRole, this.TAB_APPROVER);
                 if (this.myRole == this.TAB_APPROVER || this.myRole == this.TAB_VIEWER || this.myRole == this.TAB_AUDITOR || this.myRole == this.TAB_FUNCTION_HEAD) {
@@ -15295,50 +15497,34 @@ let SfIEvents = class SfIEvents extends LitElement {
                     if (event["approved"] != null) {
                         if (event["approved"] === true) {
                             //console.log('approved 2', event["approved"], this.myRole, this.TAB_APPROVER);
-                            if (this._SfDetailContainer.querySelector('#input-approve-yes') != null) {
-                                this._SfDetailContainer.querySelector('#input-approve-yes').checked = true;
+                            if (eventDetailReportingContainer.querySelector('#input-approve-yes') != null) {
+                                eventDetailReportingContainer.querySelector('#input-approve-yes').checked = true;
                             }
-                            if (this._SfDetailContainer.querySelector('#input-approve-no') != null) {
-                                this._SfDetailContainer.querySelector('#input-approve-no').checked = false;
+                            if (eventDetailReportingContainer.querySelector('#input-approve-no') != null) {
+                                eventDetailReportingContainer.querySelector('#input-approve-no').checked = false;
                             }
                         }
                         else {
-                            if (this._SfDetailContainer.querySelector('#input-approve-yes') != null) {
-                                this._SfDetailContainer.querySelector('#input-approve-yes').checked = false;
+                            if (eventDetailReportingContainer.querySelector('#input-approve-yes') != null) {
+                                eventDetailReportingContainer.querySelector('#input-approve-yes').checked = false;
                             }
-                            if (this._SfDetailContainer.querySelector('#input-approve-no') != null) {
-                                this._SfDetailContainer.querySelector('#input-approve-no').checked = true;
+                            if (eventDetailReportingContainer.querySelector('#input-approve-no') != null) {
+                                eventDetailReportingContainer.querySelector('#input-approve-no').checked = true;
                             }
                         }
                     }
                     else {
-                        if (this._SfDetailContainer.querySelector('#input-approve-yes') != null) {
-                            this._SfDetailContainer.querySelector('#input-approve-yes').checked = false;
+                        if (eventDetailReportingContainer.querySelector('#input-approve-yes') != null) {
+                            eventDetailReportingContainer.querySelector('#input-approve-yes').checked = false;
                         }
-                        if (this._SfDetailContainer.querySelector('#input-approve-no') != null) {
-                            this._SfDetailContainer.querySelector('#input-approve-no').checked = true;
+                        if (eventDetailReportingContainer.querySelector('#input-approve-no') != null) {
+                            eventDetailReportingContainer.querySelector('#input-approve-no').checked = true;
                         }
                     }
                 }
             }
-            this.fetchStatuteDefinitionDetails(statuteName);
-            console.log('customreporting', event['customreporting']);
-            if (event['customreporting'] != null) {
-                let reportingContainer = this._SfDetailContainer;
-                if (reportingContainer.querySelector('#report-format-container') != null) {
-                    reportingContainer.querySelector('#report-format-container').innerHTML = `<slot name="reporting"></slot>`;
-                    console.log('innerhtml', reportingContainer.querySelector('#report-format-container').innerHTML);
-                    this._SfReporting[0].querySelector('#reporting-format').name = event.obligationtitle;
-                    this._SfReporting[0].querySelector('#reporting-format').mode = "edit";
-                    this._SfReporting[0].querySelector('#reporting-format').configjson = event['customreporting'];
-                    // if(reportformatvalues != ""){
-                    //   (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting).prepopulateValJson = reportformatvalues
-                    // }
-                    this._SfReporting[0].querySelector('#reporting-format').loadMode();
-                }
-            }
-            else if (event['reportformat'] != null && event['reportformat'].length > 0) {
-                this.fetchReportFormat(this._SfDetailContainer, reportformatName, (_y = event['reportformatschema']) !== null && _y !== void 0 ? _y : "", (_z = event['reportformatvalues']) !== null && _z !== void 0 ? _z : "");
+            if (event['reportformat'] != null && event['reportformat'].length > 0) {
+                this.fetchReportFormat(eventDetailReportingContainer, reportformatName, (_l = event['reportformatschema']) !== null && _l !== void 0 ? _l : "", (_m = event['reportformatvalues']) !== null && _m !== void 0 ? _m : "");
             }
         };
         this.renderCalendar = () => {
@@ -24630,7 +24816,6 @@ let SfIEvents = class SfIEvents extends LitElement {
                     let listReportingContainer = nextEventsContainer.querySelector('#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j);
                     console.log('mmddyyyy', eventsData[role][mmdd][j], listReportingContainer, '#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j);
                     if (listReportingContainer.style.display == 'none' || listReportingContainer.style.display == '') {
-                        4;
                         this.renderListReporting(listReportingContainer, eventsData[role][mmdd][j], mmdd + '/' + yyyy, nextEventsContainer);
                     }
                     else {
@@ -26378,6 +26563,10 @@ SfIEvents.styles = css `
       margin-left: 10px;
     }
 
+    .ml-10-m-0 {
+      margin-left: 10px;
+    }
+
     .mt-20 {
       margin-top: 20px;
     }
@@ -26386,6 +26575,10 @@ SfIEvents.styles = css `
       margin-left: 20px;
     }
 
+    .ml-20-m-0 {
+      margin-left: 20px;
+    }
+
     .mr-20 {
       margin-right: 20px;
     }
@@ -26548,6 +26741,14 @@ SfIEvents.styles = css `
       .calendar-right-data {
         width: 100%;
       }
+      
+      .ml-10-m-0 {
+        margin-left: 0px;
+      }
+      
+      .ml-20-m-0 {
+        margin-left: 0px;
+      }
 
     }