From 97f0eb56d5ca6f9de919c97e840c5f81657458dd Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 4 Jul 2026 23:41:59 +0200 Subject: [PATCH] Polish driver leave request status labels --- app/build.gradle.kts | 4 ++-- .../java/pl/firmatpp/kierowca/ui/DriverApp.kt | 2 +- .../kierowca/ui/DriverLeaveRequestUiRules.kt | 15 ++++++++++++++- .../ui/DriverLeaveRequestUiRulesTest.kt | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c9b739a..249197f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,8 +33,8 @@ android { applicationId = "pl.firmatpp.kierowca" minSdk = 26 targetSdk = 35 - versionCode = 40 - versionName = "1.0.39" + versionCode = 41 + versionName = "1.0.40" setProperty("archivesBaseName", "pl.firmatpp.kierowca") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt b/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt index dc2c0b9..f181a77 100644 --- a/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt +++ b/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt @@ -961,7 +961,7 @@ private fun LeaveRequestDetailScreen( ) { Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { Text( - "${event.action}${event.toStatus?.let { " · ${DriverLeaveRequestUiRules.statusLabel(it)}" } ?: ""}", + "${DriverLeaveRequestUiRules.eventActionLabel(event.action)}${event.toStatus?.let { " · ${DriverLeaveRequestUiRules.statusLabel(it)}" } ?: ""}", color = TppColors.Ink, fontWeight = FontWeight.Bold, ) diff --git a/app/src/main/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRules.kt b/app/src/main/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRules.kt index a41c96f..eebc81b 100644 --- a/app/src/main/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRules.kt +++ b/app/src/main/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRules.kt @@ -19,7 +19,20 @@ object DriverLeaveRequestUiRules { "cancel_requested" -> "Anulowanie do decyzji" "cancelled" -> "Anulowany" "revoked" -> "Cofnięto decyzję" - else -> status + else -> "Nieznany status" + } + + fun eventActionLabel(action: String): String = + when (action) { + "submitted" -> "Wniosek złożony" + "approved" -> "Wniosek zatwierdzony" + "rejected" -> "Wniosek odrzucony" + "revoked" -> "Decyzja cofnięta" + "cancelled_by_driver" -> "Wniosek anulowany przez kierowcę" + "cancellation_requested" -> "Kierowca poprosił o anulowanie" + "cancellation_approved" -> "Anulowanie zatwierdzone" + "cancellation_rejected" -> "Anulowanie odrzucone" + else -> "Aktualizacja wniosku" } fun typeLabel(type: String): String = diff --git a/app/src/test/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRulesTest.kt b/app/src/test/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRulesTest.kt index 5f0fa22..36cd6f2 100644 --- a/app/src/test/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRulesTest.kt +++ b/app/src/test/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRulesTest.kt @@ -17,8 +17,25 @@ class DriverLeaveRequestUiRulesTest { @Test fun exposesPolishStatusLabels() { assertEquals("Oczekuje", DriverLeaveRequestUiRules.statusLabel("pending")) + assertEquals("Zatwierdzony", DriverLeaveRequestUiRules.statusLabel("approved")) + assertEquals("Odrzucony", DriverLeaveRequestUiRules.statusLabel("rejected")) assertEquals("Anulowanie do decyzji", DriverLeaveRequestUiRules.statusLabel("cancel_requested")) + assertEquals("Anulowany", DriverLeaveRequestUiRules.statusLabel("cancelled")) assertEquals("Cofnięto decyzję", DriverLeaveRequestUiRules.statusLabel("revoked")) + assertEquals("Nieznany status", DriverLeaveRequestUiRules.statusLabel("some_raw_status")) + } + + @Test + fun exposesPolishEventActionLabels() { + assertEquals("Wniosek złożony", DriverLeaveRequestUiRules.eventActionLabel("submitted")) + assertEquals("Wniosek zatwierdzony", DriverLeaveRequestUiRules.eventActionLabel("approved")) + assertEquals("Wniosek odrzucony", DriverLeaveRequestUiRules.eventActionLabel("rejected")) + assertEquals("Decyzja cofnięta", DriverLeaveRequestUiRules.eventActionLabel("revoked")) + assertEquals("Wniosek anulowany przez kierowcę", DriverLeaveRequestUiRules.eventActionLabel("cancelled_by_driver")) + assertEquals("Kierowca poprosił o anulowanie", DriverLeaveRequestUiRules.eventActionLabel("cancellation_requested")) + assertEquals("Anulowanie zatwierdzone", DriverLeaveRequestUiRules.eventActionLabel("cancellation_approved")) + assertEquals("Anulowanie odrzucone", DriverLeaveRequestUiRules.eventActionLabel("cancellation_rejected")) + assertEquals("Aktualizacja wniosku", DriverLeaveRequestUiRules.eventActionLabel("some_raw_action")) } @Test