Merge pull request #2263 from department-of-veterans-affairs/text-upd…

…ates LEAF-4199 - Text updates
department-of-veterans-affairs · Jan 23, 2024 · 52a8b28 · 52a8b28
2 parents d201013 + 40f10b8
commit 52a8b28
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/LEAF_Request_Portal/sources/FormWorkflow.php b/LEAF_Request_Portal/sources/FormWorkflow.php
@@ -206,8 +206,8 @@ private function includePersonDesignatedData(array $srcRecords, array $pdRecords
                     $approver = $dir->lookupEmpUID($dRecords[$v['recordID']]['data']);
 
                     if (empty($approver[0]['Fname']) && empty($approver[0]['Lname'])) {
-                        $srcRecords[$i]['description'] = $srcRecords[$i]['stepTitle'] . ' (' . $dRecords[$v['recordID']]['name'] . ')';
-                        $srcRecords[$i]['approverName'] = $dRecords[$v['recordID']]['name'];
+                        $srcRecords[$i]['description'] = $srcRecords[$i]['stepTitle'] . ' ( *NEEDS REASSIGNMENT* ' . $dRecords[$v['recordID']]['name'] . ')';
+                        $srcRecords[$i]['approverName'] = '*NEEDS REASSIGNMENT* ' . $dRecords[$v['recordID']]['name'];
                         $srcRecords[$i]['approverUID'] = 'indicatorID:' . $res[$i]['indicatorID_for_assigned_empUID'];
                     }
                     else {

diff --git a/LEAF_Request_Portal/templates/print_form.tpl b/LEAF_Request_Portal/templates/print_form.tpl
@@ -1,8 +1,8 @@
 <!--{if $deleted > 0}-->
-    <div style="font-size: 36px"><img src="dynicons/?img=emblem-unreadable.svg&amp;w=96" alt="Unreadable"
-            style="float: left" /> Notice: This request has been marked as deleted.<br />
+    <div style="font-size: 36px"><img src="dynicons/?img=emblem-unreadable.svg&amp;w=96" alt=""
+            style="float: left" /> Notice: This request has been marked as cancelled and will be permanently deleted.<br />
         <span class="buttonNorm" onclick="restoreRequest(<!--{$recordID|strip_tags}-->)"><img
-                src="dynicons/?img=user-trash-full.svg&amp;w=32" alt="un-delete" /> Un-delete request</span>
+                src="dynicons/?img=document-open.svg&amp;w=32" /> Restore request</span>
     </div><br style="clear: both" />
     <hr />
 <!--{/if}-->

diff --git a/LEAF_Request_Portal/templates/reports/LEAF_Inbox.tpl b/LEAF_Request_Portal/templates/reports/LEAF_Inbox.tpl
@@ -189,6 +189,11 @@
         },
     };
 
+    function scrubHTML(input) {
+        let t = new DOMParser().parseFromString(input, 'text/html');
+        return t.textContent;
+    }
+
     function interfaceReady() {
         document.querySelector('#viewport').style.visibility = 'visible';
         $('#progressContainer').slideUp();
@@ -268,7 +273,7 @@
                 let description = uDD.description;
                 if(roleID < 0 && uDD.approverUID != undefined) { // handle "smart requirements"
                     roleID = Sha1.hash(uDD.approverUID);
-                    description = uDD.approverName;
+                    description = scrubHTML(uDD.approverName);
                 }
 
                 let stepHash = `${description}:;ROLEID${roleID}`;