From 55690fc5ce0fd2ee208ed49f8816a2ee774092e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Tue, 14 Jun 2022 21:44:17 +0300
Subject: [PATCH] RED-4155: Add "who has approved the file" information to file
 status

---
 .../file-preview/file-preview-screen.component.html      | 9 +++++++--
 apps/red-ui/src/assets/i18n/de.json                      | 3 ++-
 apps/red-ui/src/assets/i18n/en.json                      | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html
index 86030ee0f..6bf725d9e 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.html
@@ -12,8 +12,13 @@
 
                 <ng-container *ngIf="permissionsService.isApprover(dossier) && !!file.lastReviewer">
                     <div class="vertical-line"></div>
-                    <div class="all-caps-label mr-16 ml-8" translate="file-preview.last-reviewer"></div>
-                    <redaction-initials-avatar [user]="file.lastReviewer" [withName]="true"></redaction-initials-avatar>
+                    <div class="all-caps-label mr-16 ml-8">
+                        {{ 'file-preview.last-assignee' | translate: { status: file.workflowStatus } }}
+                    </div>
+                    <redaction-initials-avatar
+                        [user]="file.isApproved ? file.lastApprover : file.lastReviewer"
+                        [withName]="true"
+                    ></redaction-initials-avatar>
                 </ng-container>
 
                 <div class="vertical-line"></div>
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index 09e61b815..c0d5d3988 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -631,6 +631,7 @@
     },
     "download": "",
     "error": {
+      "400": "",
       "entries-too-short": "Einige Einträge im Wörterbuch unterschreiten die Mindestlänge von 2 Zeichen. Diese sind rot markiert.",
       "generic": "Es ist ein Fehler aufgetreten ... Das Wörterbuch konnte nicht aktualisiert werden!"
     },
@@ -1305,7 +1306,7 @@
       "convert": "",
       "remove": ""
     },
-    "last-reviewer": "Zuletzt überprüft von:",
+    "last-assignee": "Zuletzt überprüft von:",
     "no-data": {
       "title": "Auf dieser Seite gibt es keine Anmerkungen."
     },
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 6be17fe89..1eb0b5d9d 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -631,9 +631,9 @@
     },
     "download": "Download current entries",
     "error": {
+      "400": "Cannot update dictionary because at least one of the newly added words where recognized as a general term that appear too often in texts.",
       "entries-too-short": "Some entries of the dictionary are below the minimum length of 2. These are highlighted with red!",
-      "generic": "Something went wrong... Dictionary update failed!",
-      "400": "Cannot update dictionary because at least one of the newly added words where recognized as a general term that appear too often in texts."
+      "generic": "Something went wrong... Dictionary update failed!"
     },
     "revert-changes": "Revert",
     "save-changes": "Save Changes",
@@ -1306,7 +1306,7 @@
       "convert": "Convert highlights",
       "remove": "Remove highlights"
     },
-    "last-reviewer": "Last Reviewed by:",
+    "last-assignee": "{status, select, APPROVED{Approved} UNDER_APPROVAL{Reviewed} other{Last reviewed}} by:",
     "no-data": {
       "title": "There have been no changes to this page."
     },