From 774890a633662c9debfea385673718464489eec4 Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Thu, 23 Apr 2026 16:54:35 +0200
Subject: [PATCH 01/10] fix: correct typos and update labels for consistency in
 AdminDashboard page

---
 frontend/src/pages/AdminDashboard.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/AdminDashboard.jsx b/frontend/src/pages/AdminDashboard.jsx
index f42f6f0..d0ce14e 100644
--- a/frontend/src/pages/AdminDashboard.jsx
+++ b/frontend/src/pages/AdminDashboard.jsx
@@ -172,7 +172,7 @@ const AdminDashboard = ({ userName, initialTab = 'USERS' }) => {
                         <div className="flex items-center gap-4">
                             <div className="bg-red-50 p-3 rounded-2xl text-red-600"><ShieldAlert size={24} /></div>
                             <div>
-                                <p className="text-[10px] font-black text-slate-400 uppercase tracking-widest">Admininstratörer</p>
+                                <p className="text-[10px] font-black text-slate-400 uppercase tracking-widest">Administratörer</p>
                                 <p className="text-3xl font-black text-slate-900">{stats.admins}</p>
                             </div>
                         </div>
@@ -208,7 +208,7 @@ const AdminDashboard = ({ userName, initialTab = 'USERS' }) => {
                                     activeTab === 'LOGS' ? 'bg-white text-slate-900 shadow-sm' : 'text-slate-400'
                                 }`}
                             >
-                                Audit Log
+                                Aktivitetslogg
                             </button>
                         </div>
 

From f034c94f0e352ad7ca44f22b5166c5439dac96d7 Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Thu, 23 Apr 2026 16:54:42 +0200
Subject: [PATCH 02/10] fix: replace action text formatting with getActionLabel
 for consistency in AuditLogView

---
 frontend/src/components/admin/AuditLogView.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/admin/AuditLogView.jsx b/frontend/src/components/admin/AuditLogView.jsx
index df47c71..f59ade5 100644
--- a/frontend/src/components/admin/AuditLogView.jsx
+++ b/frontend/src/components/admin/AuditLogView.jsx
@@ -8,6 +8,7 @@ import {
     User as UserIcon,
     AlertCircle
 } from 'lucide-react';
+import { getActionLabel } from '../../utils/statusHelper';
 
 const AuditLogView = ({ logs = [], loading }) => {
 
@@ -52,7 +53,7 @@ const AuditLogView = ({ logs = [], loading }) => {
                         <div className="flex-1 pb-8">
                             <div className="flex justify-between items-start mb-1">
                                 <h4 className="font-black text-slate-900 italic tracking-tight uppercase text-sm">
-                                    {log.action.replace('_', ' ')}
+                                    {getActionLabel(log.action)}
                                 </h4>
                                 <span className="text-[10px] font-bold text-slate-400 uppercase tracking-widest">
                                     {date}

From 5cf346a99837ac9e61cb86a6ae84d96bfdf0f822 Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Thu, 23 Apr 2026 16:54:48 +0200
Subject: [PATCH 03/10] fix: use ACTIVE_STATUS_KEYS for dynamic status dropdown
 options in CaseDetail

---
 frontend/src/pages/CaseDetail.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/CaseDetail.jsx b/frontend/src/pages/CaseDetail.jsx
index 339f8c3..889fdc7 100644
--- a/frontend/src/pages/CaseDetail.jsx
+++ b/frontend/src/pages/CaseDetail.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { commentService, activityService, attachmentService, medicalRecordService } from '../services/api';
-import { STATUS_MAP } from '../utils/statusHelper';
+import { STATUS_MAP, ACTIVE_STATUS_KEYS } from '../utils/statusHelper';
 import { Stethoscope, Lock, FileText, CheckCircle, Upload, Trash2, ExternalLink } from 'lucide-react';
 
 const CaseDetail = ({ caseData, onBack, onGoToPet, currentUserId, userRole }) => {
@@ -206,9 +206,9 @@ const CaseDetail = ({ caseData, onBack, onGoToPet, currentUserId, userRole }) =>
                                     onChange={(e) => handleStatusChange(e.target.value)}
                                     className="bg-slate-800 border border-slate-700 text-sm font-bold rounded-xl px-4 py-2 outline-none focus:ring-2 focus:ring-vet-accent transition-all cursor-pointer"
                                 >
-                                    <option value="OPEN">Öppen</option>
-                                    <option value="IN_PROGRESS">Under behandling</option>
-                                    <option value="AWAITING_INFO">Väntar på svar</option>
+                                    {ACTIVE_STATUS_KEYS.map((key) => (
+                                        <option key={key} value={key}>{STATUS_MAP[key].label}</option>
+                                    ))}
                                 </select>
                             </div>
                             <button

From ea6058285e9a2a41347386f5efefb1d301201b49 Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Thu, 23 Apr 2026 16:55:00 +0200
Subject: [PATCH 04/10] fix: add localized display labels to RecordStatus for
 activity logs

---
 .../example/vet1177/entities/RecordStatus.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/example/vet1177/entities/RecordStatus.java b/src/main/java/org/example/vet1177/entities/RecordStatus.java
index 14e879c..6ec6e65 100644
--- a/src/main/java/org/example/vet1177/entities/RecordStatus.java
+++ b/src/main/java/org/example/vet1177/entities/RecordStatus.java
@@ -1,7 +1,23 @@
 package org.example.vet1177.entities;
 
 public enum RecordStatus {
-    OPEN, IN_PROGRESS, AWAITING_INFO, CLOSED;
+    OPEN("Öppen"),
+    IN_PROGRESS("Under behandling"),
+    AWAITING_INFO("Väntar på svar"),
+    CLOSED("Avslutad");
+
+    private final String displayLabel;
+
+    RecordStatus(String displayLabel) {
+        this.displayLabel = displayLabel;
+    }
+
+    // Svensk visningstext. Används i serverskrivna aktivitetsloggar så att
+    // loggraderna i activity_log lagras på samma språk som övriga beskrivningar.
+    // Frontend har motsvarande STATUS_MAP i statusHelper.js.
+    public String displayLabel() {
+        return displayLabel;
+    }
 
     public boolean isFinal() {
         return this == CLOSED;

From 49ab8c9b6454e307ef61993ba9997a213a97bef1 Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Thu, 23 Apr 2026 16:55:07 +0200
Subject: [PATCH 05/10] fix: add comprehensive status and action label mappings
 for consistent UI translations

---
 frontend/src/utils/statusHelper.js | 36 +++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/frontend/src/utils/statusHelper.js b/frontend/src/utils/statusHelper.js
index 1bdfcf8..2cefc93 100644
--- a/frontend/src/utils/statusHelper.js
+++ b/frontend/src/utils/statusHelper.js
@@ -1,7 +1,33 @@
 // src/utils/statusHelper.js
+//
+// Gemensam mappning från backend-enum till svenska visningstexter.
+// Används överallt där status eller aktivitetsloggar visas i UI:t så att
+// texterna förblir konsekventa. Motsvarighet finns i backend
+// (RecordStatus.displayLabel()) för loggrader som skrivs till databasen.
+
 export const STATUS_MAP = {
-    'OPEN': { label: 'Inskickat', color: 'bg-blue-50 text-blue-700 border-blue-100' },
-    'IN_PROGRESS': { label: 'Under behandling', color: 'bg-yellow-50 text-yellow-700 border-yellow-100' },
-    'AWAITING_INFO': { label: 'Väntar på svar', color: 'bg-purple-50 text-purple-700 border-purple-100' },
-    'CLOSED': { label: 'Avslutat', color: 'bg-slate-50 text-slate-500 border-slate-100' }
-};
\ No newline at end of file
+    'OPEN':          { label: 'Öppen',            color: 'bg-blue-50 text-blue-700 border-blue-100' },
+    'IN_PROGRESS':   { label: 'Under behandling', color: 'bg-yellow-50 text-yellow-700 border-yellow-100' },
+    'AWAITING_INFO': { label: 'Väntar på svar',   color: 'bg-purple-50 text-purple-700 border-purple-100' },
+    'CLOSED':        { label: 'Avslutad',         color: 'bg-slate-50 text-slate-500 border-slate-100' }
+};
+
+// Statusar som VET kan välja i dropdown. CLOSED utesluts — stängning sker
+// via "Slutför & Stäng"-modalen för att tvinga fram en slutnotering.
+export const ACTIVE_STATUS_KEYS = ['OPEN', 'IN_PROGRESS', 'AWAITING_INFO'];
+
+// Svensk label för en status, med fallback till raw-värdet om enum-värdet
+// inte känns igen (t.ex. nytt värde tillagt i backend men inte här).
+export const getStatusLabel = (status) => STATUS_MAP[status]?.label ?? status;
+
+// Mappning för ActivityType-enum → svensk rubrik.
+// Används av AuditLogView i admin-vyn där log.action visas direkt.
+export const ACTION_LABELS = {
+    'CASE_CREATED':   'Ärende skapat',
+    'STATUS_CHANGED': 'Status ändrad',
+    'COMMENT_ADDED':  'Kommentar tillagd',
+    'ASSIGNED':       'Veterinär tilldelad',
+    'UPDATED':        'Ärende uppdaterat'
+};
+
+export const getActionLabel = (action) => ACTION_LABELS[action] ?? action;

From 25e027bbd782aec9102a2511ab0c1a8b8cc2251d Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Thu, 23 Apr 2026 16:55:14 +0200
Subject: [PATCH 06/10] fix: use localized display labels for status in
 activity logs to match UI texts

---
 .../org/example/vet1177/services/MedicalRecordService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/example/vet1177/services/MedicalRecordService.java b/src/main/java/org/example/vet1177/services/MedicalRecordService.java
index ab85dfa..4dc6678 100644
--- a/src/main/java/org/example/vet1177/services/MedicalRecordService.java
+++ b/src/main/java/org/example/vet1177/services/MedicalRecordService.java
@@ -219,10 +219,10 @@ public MedicalRecord updateStatus(UUID recordId, RecordStatus newStatus, User up
 
         MedicalRecord updated = medicalRecordRepository.save(record);
 
-        // LOGGING
+        // LOGGING — använd svensk label så loggen matchar UI-texterna.
         activityLogService.log(
                 ActivityType.STATUS_CHANGED,
-                "Status ändrad till: " + newStatus,
+                "Status ändrad till: " + newStatus.displayLabel(),
                 updatedBy,
                 updated
         );

From a8eab5872799373294f387f259c4ef953b931606 Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Thu, 23 Apr 2026 16:55:41 +0200
Subject: [PATCH 07/10] test: update MedicalRecordServiceTest to use localized
 display labels for status

Closes #239
Closes #249
---
 .../org/example/vet1177/services/MedicalRecordServiceTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/example/vet1177/services/MedicalRecordServiceTest.java b/src/test/java/org/example/vet1177/services/MedicalRecordServiceTest.java
index 6646900..e2b8981 100644
--- a/src/test/java/org/example/vet1177/services/MedicalRecordServiceTest.java
+++ b/src/test/java/org/example/vet1177/services/MedicalRecordServiceTest.java
@@ -360,7 +360,7 @@ void updateStatus_shouldLogActivity() {
 
         verify(activityLogService).log(
                 eq(ActivityType.STATUS_CHANGED),
-                contains("AWAITING_INFO"),
+                contains(RecordStatus.AWAITING_INFO.displayLabel()),
                 eq(currentUser),
                 eq(record));
     }

From 921f1b1ad2e6a367a8b2f6b4a598b5139847d7db Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Fri, 24 Apr 2026 19:50:05 +0200
Subject: [PATCH 08/10] fix: add release case functionality for assigned vets
 in CaseDetail

---
 frontend/src/pages/CaseDetail.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/pages/CaseDetail.jsx b/frontend/src/pages/CaseDetail.jsx
index 4c8647b..8491e7b 100644
--- a/frontend/src/pages/CaseDetail.jsx
+++ b/frontend/src/pages/CaseDetail.jsx
@@ -1,8 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { commentService, activityService, attachmentService, medicalRecordService } from '../services/api';
 import { STATUS_MAP, ACTIVE_STATUS_KEYS } from '../utils/statusHelper';
-import { Stethoscope, Lock, FileText, CheckCircle, Upload, Trash2, ExternalLink } from 'lucide-react';
-import { STATUS_MAP } from '../utils/statusHelper';
 import { Stethoscope, Lock, FileText, CheckCircle, Upload, Trash2, ExternalLink, UserMinus } from 'lucide-react';
 
 const CaseDetail = ({ caseData, onBack, onGoToPet, currentUserId, userRole, onDirtyChange }) => {

From c658302fd21c296d932ee919f8e7b86b9914643e Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Fri, 24 Apr 2026 19:50:15 +0200
Subject: [PATCH 09/10] fix: add localized display label for unassigned case
 status in statusHelper

---
 frontend/src/utils/statusHelper.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/utils/statusHelper.js b/frontend/src/utils/statusHelper.js
index 2cefc93..a179333 100644
--- a/frontend/src/utils/statusHelper.js
+++ b/frontend/src/utils/statusHelper.js
@@ -27,6 +27,7 @@ export const ACTION_LABELS = {
     'STATUS_CHANGED': 'Status ändrad',
     'COMMENT_ADDED':  'Kommentar tillagd',
     'ASSIGNED':       'Veterinär tilldelad',
+    'UNASSIGNED':     'Ärende släppt',
     'UPDATED':        'Ärende uppdaterat'
 };
 

From fcfc848af5e078ab15b4ff568b57e8a8912a47f7 Mon Sep 17 00:00:00 2001
From: Annika Holmqvist <annika.holmqvist94@gmail.com>
Date: Fri, 24 Apr 2026 20:09:15 +0200
Subject: [PATCH 10/10] fix: update AuditLogView to use localized action labels
 and remove redundant content

---
 frontend/src/components/admin/AuditLogView.jsx | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/frontend/src/components/admin/AuditLogView.jsx b/frontend/src/components/admin/AuditLogView.jsx
index 846a459..13031bb 100644
--- a/frontend/src/components/admin/AuditLogView.jsx
+++ b/frontend/src/components/admin/AuditLogView.jsx
@@ -70,17 +70,6 @@ const AuditLogView = ({ logs = [], loading }) => {
         });
     }, [logs, searchTerm, actionFilter, roleFilter, clinicFilter, dateFilter]);
 
-                        {/* Content */}
-                        <div className="flex-1 pb-8">
-                            <div className="flex justify-between items-start mb-1">
-                                <h4 className="font-black text-slate-900 italic tracking-tight uppercase text-sm">
-                                    {getActionLabel(log.action)}
-                                </h4>
-                                <span className="text-[10px] font-bold text-slate-400 uppercase tracking-widest">
-                                    {date}
-                                </span>
-                            </div>
-                            <p className="text-slate-600 text-sm font-medium mb-2">{log.description}</p>
     if (loading) return <div className="p-20 text-center italic text-slate-400">Laddar administrativ historik...</div>;
 
     return (
@@ -161,7 +150,7 @@ const AuditLogView = ({ logs = [], loading }) => {
                                         <div className="flex justify-between items-start mb-1">
                                             <div className="flex items-center gap-3">
                                                 <h4 className="font-black text-slate-900 italic tracking-tight uppercase text-sm">
-                                                    {log.action.replace('_', ' ')}
+                                                    {getActionLabel(log.action)}
                                                 </h4>
                                                 <span className={`text-[9px] font-black px-2 py-0.5 rounded-md border ${
                                                     log.performedByRole?.includes('VET') ? 'bg-blue-50 text-blue-600 border-blue-100' :