sf-i-events 1.0.963 → 1.0.965

package/package.json

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

package/sf-i-events.js

@@ -2663,7 +2663,7 @@ let SfIEvents = class SfIEvents extends LitElement {
         <sf-i-elastic-text exportparts="highlight,highlight-count" 
           class="stream-event-title${!isBulk ? ' button-event-title' : ''}" 
           id="stream-event-title-${mmddSanitized}-${itemNumber}-${moduleType}-${(isReportedLocation) ? 'reportedlocations' : ''}" 
-          text="${event.obligationtitle}" 
+          text="${event.obligationtitle.replace(/\\n/g, '')}" 
           minLength="${event.concise == null ? '100' : '60'}">
         </sf-i-elastic-text>
         ${showLocationRisk ? `
@@ -3411,7 +3411,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                 this.maxRiskResidual = tempMaxRiskResidualLocal;
             }
             let showFinRisk = false;
-            if (this.selectedFeatures.indexOf('contracts') < 0 && this.selectedFeatures.indexOf('notices') && this.selectedFeatures.indexOf('licenses') < 0 && this.selectedFeatures.indexOf('rcmresources') < 0 && this.finRiskCurrency != "") {
+            if (this.selectedFeatures.indexOf('contracts') < 0 && this.selectedFeatures.indexOf('notices') && this.selectedFeatures.indexOf('licenses') < 0 && this.selectedFeatures.indexOf('rcmresources') < 0 && this.finRiskCurrency != "" && (this.minRiskResidual > 0 || this.minRiskMitigated > 0 || this.maxRiskResidual > 0 || this.maxRiskMitigated > 0)) {
                 showFinRisk = true;
             }
             //console.log('final risk severities', this.riskSeverityData);
@@ -3723,40 +3723,38 @@ 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 flex-wrap">';
+                        html += '<div class="d-flex justify-start align-center flex-wrap max-width-100">';
                         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-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+                        html += '<div class="d-flex flex-col flex-grow max-width-100">';
+                        html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
                         html += '<label part="input-label">Entity</label>';
                         html += '<select id="input-reporter-entity-0" part="input" disabled></select>';
                         html += '</div>';
-                        html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+                        html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
                         html += '<label part="input-label">Location</label>';
                         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 += '<div class="d-flex justify-start align-end flex-wrap max-width-100">';
+                                html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col ml-20-m-0 hide max-width-100">';
                                 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 += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
                                 html += '<label part="input-label">Location</label>';
-                                html += '<select id="input-reporter-location-' + indexLocation + '" class="input-reporter-location" part="input"></select>';
+                                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>'
+                                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>';
+                        html += '</div>';
                     }
                     html += '<div>';
                     html += '<label part="input-label">Approve?*</label><br />';
@@ -3804,16 +3802,18 @@ 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-end flex-wrap">';
-                        html += '<div class="d-flex flex-col flex-grow">';
+                        html += '<div class="d-flex justify-start align-start flex-wrap">';
+                        html += '<div class="d-flex flex-col flex-grow max-width-100">';
                         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"/>';
                         html += '</div>';
-                        html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+                        html += '<div class="d-flex flex-col max-width-100">';
+                        html += '<div class="d-flex justify-start align-end flex-wrap max-width-100">';
+                        html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col ml-20-m-0 hide max-width-100">';
                         html += '<label part="input-label">Entity</label>';
                         html += '<select id="input-reporter-entity-0" part="input"></select>';
                         html += '</div>';
-                        html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+                        html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
                         html += '<label part="input-label">Location</label>';
                         html += '<select id="input-reporter-location-0"  class="input-reporter-location" part="input"></select>';
                         html += '</div>';
@@ -3821,15 +3821,12 @@ let SfIEvents = class SfIEvents extends LitElement {
                         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 += '<div class="d-flex justify-start align-end flex-wrap max-width-100">';
+                                html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col ml-20-m-0 hide max-width-100">';
                                 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 += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
                                 html += '<label part="input-label">Location</label>';
                                 html += '<select id="input-reporter-location-' + indexLocation + '"  class="input-reporter-location" part="input"></select>';
                                 html += '</div>';
@@ -3837,6 +3834,8 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 indexLocation++;
                             }
                         }
+                        html += '</div>';
+                        html += '</div>';
                         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 />';
@@ -3849,7 +3848,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         else if (uploadGuidance != 0) {
                             html += '<div part="upload-guidance-content">';
                             html += '<div part="detail-head" class="mb-5"><strong>Upload Guidance</strong></div>';
-                            html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
+                            html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
                             html += '</div>';
                         }
                         html += '<div part="uploader-analysis-message" class="uploader-analysis-message mt-20">The analysis is running in the background. You can proceed further.</div>';
@@ -4133,7 +4132,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                         }
                         event.percentage = inputReportingPercentage.value;
                         event.reportedlocations = JSON.stringify(this.reportedLocationsVals);
-                        if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+                        if (this.reportedLocationsVals.length == 0) {
                             event.percentage = "100";
                         }
                         console.log('rendering list reporting', event.percentage, event.reportedlocations);
@@ -4148,6 +4147,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     let selectReportingEntity = listReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc);
                     let selectReportingLocation = listReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc);
                     selectReportingEntity.innerHTML = '';
+                    let defaultOption = new Option("Select Location", "", true, true);
+                    defaultOption.disabled = true;
+                    selectReportingEntity.add(defaultOption);
                     for (let country of Object.keys(projectUserMap)) {
                         if (country == "roles") {
                             continue;
@@ -4160,6 +4162,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                     selectReportingEntity.addEventListener('change', (e) => {
                         selectReportingLocation.innerHTML = '';
+                        let defaultOption = new Option("Select Location", "", true, true);
+                        defaultOption.disabled = true;
+                        selectReportingLocation.add(defaultOption);
                         for (let country of Object.keys(projectUserMap)) {
                             if (country == "roles") {
                                 continue;
@@ -4179,23 +4184,29 @@ let SfIEvents = class SfIEvents extends LitElement {
                         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;
-                        }
+                        let defaultOption = new Option("Select Location", "", true, true);
+                        defaultOption.disabled = true;
+                        selectReportingLocation.add(defaultOption);
+                        // 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;
+                        // }
                     }
                     selectReportingLocation.addEventListener('change', (e) => {
+                        if (selectReportingEntity.value == "") {
+                            return;
+                        }
                         let index = parseInt(e.target.id.split('-')[3]);
                         this.reportedLocationsVals[index] = e.target.value;
                     });
@@ -10821,19 +10832,34 @@ let SfIEvents = class SfIEvents extends LitElement {
             for (var k = 0; k < cols.length; k++) {
                 if (!this.EXCLUDE_COLS_FROM_REGS.includes(cols[k].toLowerCase())) {
                     if (cols[k].toLowerCase() == "attachment") {
-                        html += '<div class="m-20">';
-                        html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>';
-                        for (let attachmentStr of data[k]) {
-                            let attachment = {};
-                            if (typeof attachmentStr === "object") {
-                                attachment = attachmentStr;
+                        console.log('attachments', data[k]);
+                        if (typeof data[k] === "string") {
+                            let attachmentArr = JSON.parse(data[k].toString());
+                            if (attachmentArr.length > 0) {
+                                html += '<div class="m-20">';
+                                html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>';
+                                for (let attachment of attachmentArr) {
+                                    html += `<sf-i-uploader class="event-attachment" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" prepopulatedInputArr="${JSON.stringify([{ "key": attachment.key, "ext": attachment.ext }]).replace(/"/g, '&quot;')}" extract="no" mode="view" maximize="yes" hidepreview="yes" displaydetail="yes"></sf-i-uploader>`;
+                                }
+                                html += '</div>';
                             }
-                            else {
-                                attachment = JSON.parse(attachmentStr + "");
+                        }
+                        else {
+                            html += '<div class="m-20">';
+                            html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>';
+                            for (let attachmentStr of data[k]) {
+                                let attachment = {};
+                                if (typeof attachmentStr === "object") {
+                                    attachment = attachmentStr;
+                                }
+                                else {
+                                    attachment = JSON.parse(attachmentStr.toString());
+                                }
+                                html += `<sf-i-uploader class="event-attachment" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" prepopulatedInputArr="${JSON.stringify([{ "key": attachment.key, "ext": attachment.ext }]).replace(/"/g, '&quot;')}" extract="no" mode="view" maximize="yes" hidepreview="yes" displaydetail="yes"></sf-i-uploader>`;
                             }
-                            html += `<sf-i-uploader class="event-attachment" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" prepopulatedInputArr="${JSON.stringify([{ "key": attachment.key, "ext": attachment.ext }]).replace(/"/g, '&quot;')}" extract="no" mode="view" maximize="yes" hidepreview="yes" displaydetail="yes"></sf-i-uploader>`;
+                            html += '</div>';
                         }
-                        html += '</div>';
+                        // html += '</div>';
                     }
                     else {
                         html += '<div class="m-20">';
@@ -14220,12 +14246,13 @@ let SfIEvents = class SfIEvents extends LitElement {
             html += '<div part="detail-summary">';
             html += ('<div part="detail-summary-title" class="pl-20 pr-20"><h1>' + event['obligationtitle'] + '</h1></div>');
             let obligationArr = event['obligation'].split('More information:');
-            html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\n/g, '<br />') + '</h3></div>');
+            console.log('detailsObligation', obligationArr[0].replace(/\\n/g, '<br />'));
+            html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\\n/g, '<br />') + '</h3></div>');
             if (obligationArr.length > 1) {
                 let tempObligationArr = obligationArr.slice(1);
-                html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+                html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
             }
-            html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+            html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
             html += '</div>';
             html += '<br />';
             html += '<div class="accordian-section section-basic pl-20 pr-20" part="accordian-section">';
@@ -14331,7 +14358,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     html += this.getEventTexts(complianceFields[i], JSON.parse(event[complianceFields[i]]), event) + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
                                 }
                                 else {
-                                    html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>' + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
+                                    html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>' + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
                                 }
                                 html += '</div>';
                             }
@@ -14371,7 +14398,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                     html += this.getEventTexts(complianceFields[i], JSON.parse(event[complianceFields[i]]), event);
                                 }
                                 else {
-                                    html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
+                                    html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
                                 }
                                 html += '</div>';
                             }
@@ -14406,7 +14433,7 @@ let SfIEvents = class SfIEvents extends LitElement {
                                 }
                                 else {
                                     //console.log('grcfield', event[grcFields[i]]);
-                                    html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[grcFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
+                                    html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[grcFields[i]] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
                                 }
                             }
                             html += '</div>';
@@ -14908,10 +14935,10 @@ let SfIEvents = class SfIEvents extends LitElement {
                         }
                         event.percentage = inputReportingPercentage.value;
                         event.reportedlocations = JSON.stringify(this.reportedLocationsVals);
-                        if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+                        if (this.reportedLocationsVals.length == 0) {
                             event.percentage = "100";
                         }
-                        console.log('rendering list reporting', event.percentage, event.reportedlocations);
+                        console.log('rendering list reporting', this.reportedLocationsVals, 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();
@@ -14923,6 +14950,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     let selectReportingEntity = eventDetailReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc);
                     let selectReportingLocation = eventDetailReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc);
                     selectReportingEntity.innerHTML = '';
+                    let defaultOption = new Option("Select Entity", "", true, true);
+                    defaultOption.disabled = true;
+                    selectReportingEntity.add(defaultOption);
                     for (let country of Object.keys(projectUserMap)) {
                         if (country == "roles") {
                             continue;
@@ -14935,6 +14965,9 @@ let SfIEvents = class SfIEvents extends LitElement {
                     }
                     selectReportingEntity.addEventListener('change', (e) => {
                         selectReportingLocation.innerHTML = '';
+                        let defaultOption = new Option("Select Location", "", true, true);
+                        defaultOption.disabled = true;
+                        selectReportingLocation.add(defaultOption);
                         for (let country of Object.keys(projectUserMap)) {
                             if (country == "roles") {
                                 continue;
@@ -14954,27 +14987,33 @@ let SfIEvents = class SfIEvents extends LitElement {
                         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;
-                        }
+                        let defaultOption = new Option("Select Location", "", true, true);
+                        defaultOption.disabled = true;
+                        selectReportingLocation.add(defaultOption);
+                        // 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;
+                        // }
                     }
                     selectReportingLocation.addEventListener('change', (e) => {
+                        if (selectReportingEntity.value == "") {
+                            return;
+                        }
                         let index = parseInt(e.target.id.split('-')[3]);
                         this.reportedLocationsVals[index] = e.target.value;
                     });
-                    if (event.reportedlocations != null && event.reportedlocations.length > 0) {
+                    if (event.reportedlocations != null && event.reportedlocations.length > indexRepLoc) {
                         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)) {
@@ -27548,6 +27587,9 @@ SfIEvents.styles = css `
       position: relative;
     }
 
+    .max-width-100{
+      max-width: 100%
+    }
     @media (orientation: landscape) {
 
       .lb {

package/src/sf-i-events.ts

@@ -2779,6 +2779,9 @@ export class SfIEvents extends LitElement {
       position: relative;
     }
 
+    .max-width-100{
+      max-width: 100%
+    }
     @media (orientation: landscape) {
 
       .lb {
@@ -4915,7 +4918,7 @@ export class SfIEvents extends LitElement {
         <sf-i-elastic-text exportparts="highlight,highlight-count" 
           class="stream-event-title${!isBulk ? ' button-event-title' : ''}" 
           id="stream-event-title-${mmddSanitized}-${itemNumber}-${moduleType}-${(isReportedLocation) ? 'reportedlocations' : ''}" 
-          text="${event.obligationtitle}" 
+          text="${event.obligationtitle.replace(/\\n/g, '')}" 
           minLength="${event.concise == null ? '100' : '60'}">
         </sf-i-elastic-text>
         ${showLocationRisk ? `
@@ -4956,8 +4959,8 @@ export class SfIEvents extends LitElement {
         
       </div>
     `;
-        //   ${this.finRiskCurrency == event['localcurrency'] ? `<div part="event-min" class="ml-10 d-flex align-center">${event['minlocal'] ?? ""}</div>` : `<div part="event-min" class="ml-10 d-flex align-center">${event['minglobal'] ?? ""}</div>`}
-        // ${this.finRiskCurrency == event['localcurrency'] ? `<div part="event-min" class="ml-10 d-flex align-center">${((event['maxlocal'] < event['minlocal']) ? event['minlocal'] : event['maxlocal']) ?? ""}</div>` : `<div part="event-min" class="ml-10 d-flex align-center">${((event['maxglobal'] < event['minglobal']) ? event['minglobal'] : event['maxglobal']) ?? ""}</div>`}
+    //   ${this.finRiskCurrency == event['localcurrency'] ? `<div part="event-min" class="ml-10 d-flex align-center">${event['minlocal'] ?? ""}</div>` : `<div part="event-min" class="ml-10 d-flex align-center">${event['minglobal'] ?? ""}</div>`}
+    // ${this.finRiskCurrency == event['localcurrency'] ? `<div part="event-min" class="ml-10 d-flex align-center">${((event['maxlocal'] < event['minlocal']) ? event['minlocal'] : event['maxlocal']) ?? ""}</div>` : `<div part="event-min" class="ml-10 d-flex align-center">${((event['maxglobal'] < event['minglobal']) ? event['minglobal'] : event['maxglobal']) ?? ""}</div>`}
     if (event.concise == null && remarks.length > 0) {
       html += '<div part="stream-events-event-subtitle" class="stream-events-event-subtitle">' + remarks + ', occurred on ' + occurrenceDate + '</div>';
     }
@@ -5728,7 +5731,7 @@ export class SfIEvents extends LitElement {
     }
 
     let showFinRisk = false
-    if (this.selectedFeatures.indexOf('contracts') < 0 && this.selectedFeatures.indexOf('notices') && this.selectedFeatures.indexOf('licenses') < 0 && this.selectedFeatures.indexOf('rcmresources') < 0 && this.finRiskCurrency != "") {
+    if (this.selectedFeatures.indexOf('contracts') < 0 && this.selectedFeatures.indexOf('notices') && this.selectedFeatures.indexOf('licenses') < 0 && this.selectedFeatures.indexOf('rcmresources') < 0 && this.finRiskCurrency != "" && (this.minRiskResidual > 0 || this.minRiskMitigated > 0 || this.maxRiskResidual > 0 || this.maxRiskMitigated > 0)) {
       showFinRisk = true
     }
     //console.log('final risk severities', this.riskSeverityData);
@@ -6089,40 +6092,38 @@ export 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 flex-wrap">';
+          html += '<div class="d-flex justify-start align-center flex-wrap max-width-100">';
           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-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+          html += '<div class="d-flex flex-col flex-grow max-width-100">';
+          html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
           html += '<label part="input-label">Entity</label>';
           html += '<select id="input-reporter-entity-0" part="input" disabled></select>';
           html += '</div>'
-          html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+          html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
           html += '<label part="input-label">Location</label>';
           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 += '<div class="d-flex justify-start align-end flex-wrap max-width-100">';
+              html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col ml-20-m-0 hide max-width-100">';
               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 += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
               html += '<label part="input-label">Location</label>';
-              html += '<select id="input-reporter-location-' + indexLocation + '" class="input-reporter-location" part="input"></select>';
+              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>'
+              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>'
+          html += '</div>'
 
         }
         html += '<div>'
@@ -6183,16 +6184,18 @@ export 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-end flex-wrap">';
-          html += '<div class="d-flex flex-col flex-grow">';
+          html += '<div class="d-flex justify-start align-start flex-wrap">';
+          html += '<div class="d-flex flex-col flex-grow max-width-100">';
           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"/>';
           html += '</div>'
-          html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+          html += '<div class="d-flex flex-col max-width-100">';
+          html += '<div class="d-flex justify-start align-end flex-wrap max-width-100">';
+          html += '<div id="reporting-entity-container-0" class="reporting-entity-container d-flex flex-col ml-20-m-0 hide max-width-100">';
           html += '<label part="input-label">Entity</label>';
           html += '<select id="input-reporter-entity-0" part="input"></select>';
           html += '</div>'
-          html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide">';
+          html += '<div id="reporting-location-container-0" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
           html += '<label part="input-label">Location</label>';
           html += '<select id="input-reporter-location-0"  class="input-reporter-location" part="input"></select>';
           html += '</div>'
@@ -6200,15 +6203,12 @@ export class SfIEvents extends LitElement {
           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 += '<div class="d-flex justify-start align-end flex-wrap max-width-100">';
+              html += '<div id="reporting-entity-container-' + indexLocation + '" class="reporting-entity-container d-flex flex-col ml-20-m-0 hide max-width-100">';
               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 += '<div id="reporting-location-container-' + indexLocation + '" class="reporting-location-container d-flex flex-col flex-grow ml-20-m-0 hide max-width-100">';
               html += '<label part="input-label">Location</label>';
               html += '<select id="input-reporter-location-' + indexLocation + '"  class="input-reporter-location" part="input"></select>';
               html += '</div>'
@@ -6216,8 +6216,11 @@ export class SfIEvents extends LitElement {
               indexLocation++
             }
           }
+          html += '</div>'
+          html += '</div>'
           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) {
@@ -6230,7 +6233,7 @@ export class SfIEvents extends LitElement {
           } else if (uploadGuidance != 0) {
             html += '<div part="upload-guidance-content">'
             html += '<div part="detail-head" class="mb-5"><strong>Upload Guidance</strong></div>'
-            html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
+            html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
             html += '</div>'
           }
           html += '<div part="uploader-analysis-message" class="uploader-analysis-message mt-20">The analysis is running in the background. You can proceed further.</div>'
@@ -6520,7 +6523,7 @@ export class SfIEvents extends LitElement {
           }
           event.percentage = inputReportingPercentage.value;
           event.reportedlocations = JSON.stringify(this.reportedLocationsVals)
-          if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+          if (this.reportedLocationsVals.length == 0) {
             event.percentage = "100";
           }
           console.log('rendering list reporting', event.percentage, event.reportedlocations)
@@ -6536,6 +6539,9 @@ export class SfIEvents extends LitElement {
         let selectReportingEntity = listReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc) as HTMLSelectElement;
         let selectReportingLocation = listReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc) as HTMLSelectElement;
         selectReportingEntity.innerHTML = '';
+        let defaultOption = new Option("Select Location", "", true, true)
+        defaultOption.disabled = true
+        selectReportingEntity.add(defaultOption)
         for (let country of Object.keys(projectUserMap)) {
           if (country == "roles") {
             continue;
@@ -6548,6 +6554,9 @@ export class SfIEvents extends LitElement {
         }
         selectReportingEntity.addEventListener('change', (e: any) => {
           selectReportingLocation.innerHTML = ''
+          let defaultOption = new Option("Select Location", "", true, true)
+          defaultOption.disabled = true
+          selectReportingLocation.add(defaultOption)
           for (let country of Object.keys(projectUserMap)) {
             if (country == "roles") {
               continue;
@@ -6567,23 +6576,29 @@ export class SfIEvents extends LitElement {
           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;
-          }
+          let defaultOption = new Option("Select Location", "", true, true)
+          defaultOption.disabled = true
+          selectReportingLocation.add(defaultOption)
+          // 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;
+          // }
         }
         selectReportingLocation.addEventListener('change', (e: any) => {
+          if(selectReportingEntity.value == ""){
+            return;
+          }
           let index = parseInt(e.target.id.split('-')[3])
           this.reportedLocationsVals[index] = e.target.value
         })
@@ -14313,18 +14328,34 @@ export class SfIEvents extends LitElement {
       if (!this.EXCLUDE_COLS_FROM_REGS.includes(cols[k].toLowerCase())) {
 
         if (cols[k].toLowerCase() == "attachment") {
-          html += '<div class="m-20">';
-          html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>'
-          for (let attachmentStr of data[k]) {
-            let attachment: any = {};
-            if (typeof attachmentStr === "object") {
-              attachment = attachmentStr;
-            } else {
-              attachment = JSON.parse(attachmentStr + "");
+
+          console.log('attachments', data[k]);
+          if (typeof data[k] === "string") {
+            let attachmentArr = JSON.parse(data[k].toString());
+            if (attachmentArr.length > 0) {
+              html += '<div class="m-20">';
+              html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>'
+              for (let attachment of attachmentArr) {
+
+                html += `<sf-i-uploader class="event-attachment" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" prepopulatedInputArr="${JSON.stringify([{ "key": attachment.key, "ext": attachment.ext }]).replace(/"/g, '&quot;')}" extract="no" mode="view" maximize="yes" hidepreview="yes" displaydetail="yes"></sf-i-uploader>`
+              }
+              html += '</div>';
             }
-            html += `<sf-i-uploader class="event-attachment" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" prepopulatedInputArr="${JSON.stringify([{ "key": attachment.key, "ext": attachment.ext }]).replace(/"/g, '&quot;')}" extract="no" mode="view" maximize="yes" hidepreview="yes" displaydetail="yes"></sf-i-uploader>`
+          } else {
+            html += '<div class="m-20">';
+            html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>'
+            for (let attachmentStr of data[k]) {
+              let attachment: any = {};
+              if (typeof attachmentStr === "object") {
+                attachment = attachmentStr;
+              } else {
+                attachment = JSON.parse(attachmentStr.toString());
+              }
+              html += `<sf-i-uploader class="event-attachment" max="10" apiid="1peg5170d3" allowedextensions="[&quot;jpg&quot;,&quot;png&quot;,&quot;pdf&quot;,&quot;xls&quot;,&quot;xlsx&quot;,&quot;doc&quot;,&quot;docx&quot;]" prepopulatedInputArr="${JSON.stringify([{ "key": attachment.key, "ext": attachment.ext }]).replace(/"/g, '&quot;')}" extract="no" mode="view" maximize="yes" hidepreview="yes" displaydetail="yes"></sf-i-uploader>`
+            }
+            html += '</div>';
           }
-          html += '</div>';
+          // html += '</div>';
         } else {
           html += '<div class="m-20">';
           html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>'
@@ -16801,7 +16832,7 @@ export class SfIEvents extends LitElement {
               let reportformatschema: string = "";
               if (listEvent.customreporting != null) {
                 let reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting-1') as SfIReporting
-                if(reportingReporting == null){
+                if (reportingReporting == null) {
                   reportingReporting = (this._SfDetailContainer as HTMLDivElement).querySelector('#reporting-reporting-0') as SfIReporting
                 }
                 console.log('reportformatvalues', JSON.stringify(reportingReporting.selectedValues()))
@@ -18170,12 +18201,13 @@ export class SfIEvents extends LitElement {
     html += '<div part="detail-summary">';
     html += ('<div part="detail-summary-title" class="pl-20 pr-20"><h1>' + event['obligationtitle'] + '</h1></div>');
     let obligationArr = event['obligation'].split('More information:');
-    html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\n/g, '<br />') + '</h3></div>');
+    console.log('detailsObligation', obligationArr[0].replace(/\\n/g, '<br />'))
+    html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\\n/g, '<br />') + '</h3></div>');
     if (obligationArr.length > 1) {
       let tempObligationArr = obligationArr.slice(1);
-      html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+      html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
     }
-    html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+    html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
     html += '</div>';
 
     html += '<br />';
@@ -18307,7 +18339,7 @@ export class SfIEvents extends LitElement {
               if ((event[complianceFields[i]] + "").indexOf("[") >= 0) {
                 html += this.getEventTexts(complianceFields[i], JSON.parse(event[complianceFields[i]]), event) + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
               } else {
-                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>' + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
+                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>' + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
               }
               html += '</div>';
 
@@ -18346,7 +18378,7 @@ export class SfIEvents extends LitElement {
               if ((event[complianceFields[i]] + "").indexOf("[") >= 0) {
                 html += this.getEventTexts(complianceFields[i], JSON.parse(event[complianceFields[i]]), event);
               } else {
-                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
+                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
               }
               html += '</div>';
 
@@ -18389,7 +18421,7 @@ export class SfIEvents extends LitElement {
                 html += this.getEventTexts(grcFields[i], JSON.parse(event[grcFields[i]]), event);
               } else {
                 //console.log('grcfield', event[grcFields[i]]);
-                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[grcFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
+                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[grcFields[i]] + "").replace(/"/g, "").replace(/\\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
               }
             }
 
@@ -18964,10 +18996,10 @@ export class SfIEvents extends LitElement {
           }
           event.percentage = inputReportingPercentage.value;
           event.reportedlocations = JSON.stringify(this.reportedLocationsVals)
-          if (this.reportedLocationsVals.length == 0 || (this.reportedLocationsVals.length == 1 && this.reportedLocationsVals[0] == "")) {
+          if (this.reportedLocationsVals.length == 0) {
             event.percentage = "100";
           }
-          console.log('rendering list reporting', event.percentage, event.reportedlocations)
+          console.log('rendering list reporting', this.reportedLocationsVals, event.percentage, event.reportedlocations)
           event.reportercomments = (eventDetailReportingContainer.querySelector('#input-reporter-comments') as HTMLInputElement).value;
           event.dateofcompletion = (eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value.length > 0 ? (new Date((eventDetailReportingContainer.querySelector('#input-reporter-doc') as HTMLInputElement).value).getTime() + "") : "";
           event.documents = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
@@ -18980,6 +19012,9 @@ export class SfIEvents extends LitElement {
         let selectReportingEntity = eventDetailReportingContainer.querySelector('#input-reporter-entity-' + indexRepLoc) as HTMLSelectElement;
         let selectReportingLocation = eventDetailReportingContainer.querySelector('#input-reporter-location-' + indexRepLoc) as HTMLSelectElement;
         selectReportingEntity.innerHTML = '';
+        let defaultOption = new Option("Select Entity", "", true, true)
+        defaultOption.disabled = true
+        selectReportingEntity.add(defaultOption)
         for (let country of Object.keys(projectUserMap)) {
           if (country == "roles") {
             continue;
@@ -18992,6 +19027,9 @@ export class SfIEvents extends LitElement {
         }
         selectReportingEntity.addEventListener('change', (e: any) => {
           selectReportingLocation.innerHTML = ''
+          let defaultOption = new Option("Select Location", "", true, true)
+          defaultOption.disabled = true
+          selectReportingLocation.add(defaultOption)
           for (let country of Object.keys(projectUserMap)) {
             if (country == "roles") {
               continue;
@@ -19012,27 +19050,33 @@ export class SfIEvents extends LitElement {
         })
 
         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;
-          }
+          let defaultOption = new Option("Select Location", "", true, true)
+          defaultOption.disabled = true
+          selectReportingLocation.add(defaultOption)
+          // 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;
+          // }
         }
         selectReportingLocation.addEventListener('change', (e: any) => {
+          if(selectReportingEntity.value == ""){
+            return;
+          }
           let index = parseInt(e.target.id.split('-')[3])
           this.reportedLocationsVals[index] = e.target.value
         })
-        if (event.reportedlocations != null && event.reportedlocations.length > 0) {
+        if (event.reportedlocations != null && event.reportedlocations.length > indexRepLoc) {
           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)) {