Wydaj aplikację kierowcy 1.0.77 (130)

app/build.gradle.kts

@@ -34,8 +34,8 @@ android {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
         targetSdk = 36
-        versionCode = 126
+        versionCode = 130
-        versionName = "1.0.73"
+        versionName = "1.0.77"
         setProperty("archivesBaseName", "pl.firmatpp.kierowca")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/pl/firmatpp/kierowca/data/DriverRepository.kt

@@ -84,10 +84,11 @@ class DriverRepository(
         type: String,
         requestMode: String,
         requestedQuantity: Int?,
+        details: Map<String, String>,
     ): DriverLeaveForecastDto =
         api.leaveForecast(
             authHeader(requireToken()),
-            LeaveForecastBody(type, dateFrom, dateTo, requestMode, requestedQuantity),
+            LeaveForecastBody(type, dateFrom, dateTo, requestMode, requestedQuantity, details),
         ).data
 
     suspend fun leaveCalendar(from: String, to: String): List<DriverLeaveCalendarEntryDto> =

app/src/main/java/pl/firmatpp/kierowca/data/model/DriverModels.kt

@@ -88,6 +88,13 @@ data class DriverAppSettingsDto(
 data class LeaveRequestsConfigDto(
     val enabled: Boolean = false,
     val types: List<String> = listOf("URLOP"),
+    val usagePoolCodes: List<String> = listOf(
+        "ANNUAL",
+        "ANNUAL_DISABILITY",
+        "FORCE_MAJEURE",
+        "CHILD_CARE_14",
+        "CARE_LEAVE",
+    ),
 )
 
 data class DispatchSheetReminderDto(
@@ -236,6 +243,10 @@ data class LeaveRequestTypeDto(
     val description: String? = null,
     val decisionMode: String? = null,
     val payrollMode: String? = null,
+    val financialTreatmentLabel: String? = null,
+    val affectsAnnualLeaveBalance: Boolean = false,
+    val annualEntitlementImpact: String? = null,
+    val requiresHrVerification: List<String> = emptyList(),
     val legalBasis: String? = null,
 )
 
@@ -248,6 +259,13 @@ data class DriverLeaveSummaryDto(
     val dailyNormMinutes: Int = 480,
     val balanceConfigured: Boolean = false,
     val overdueQuantity: Int = 0,
+    val visibleUsagePoolCodes: List<String> = listOf(
+        "ANNUAL",
+        "ANNUAL_DISABILITY",
+        "FORCE_MAJEURE",
+        "CHILD_CARE_14",
+        "CARE_LEAVE",
+    ),
     val availableTypes: List<LeaveRequestTypeDto> = emptyList(),
     val reminders: List<DriverLeaveReminderDto> = emptyList(),
 )
@@ -279,6 +297,7 @@ data class LeaveForecastBody(
     val dateTo: String,
     val requestMode: String,
     val requestedQuantity: Int? = null,
+    val details: Map<String, String> = emptyMap(),
 )
 
 data class LeaveForecastResponse(
@@ -287,6 +306,11 @@ data class LeaveForecastResponse(
 
 data class DriverLeaveForecastDto(
     val ruleCode: String,
+    val payrollMode: String? = null,
+    val financialTreatmentLabel: String? = null,
+    val affectsAnnualLeaveBalance: Boolean = false,
+    val annualEntitlementImpact: String? = null,
+    val requiresHrVerification: List<String> = emptyList(),
     val quantityUnit: String,
     val days: List<DriverLeaveForecastDayDto> = emptyList(),
     val workingDaysCount: Int = 0,
@@ -329,6 +353,7 @@ data class DriverLeaveRequestDto(
     val typeLabel: String? = null,
     val requestMode: String = "days",
     val requestedQuantity: Int? = null,
+    val quantityUnit: String? = null,
     val rule: DriverLeaveRuleSnapshotDto? = null,
     val details: Map<String, String> = emptyMap(),
     val note: String? = null,
@@ -344,6 +369,13 @@ data class DriverLeaveRequestDto(
     val allocations: List<DriverLeaveAllocationDto> = emptyList(),
     val balanceConfigurationRequired: Boolean = false,
     val missingDocumentTypes: List<String> = emptyList(),
+    val payrollMode: String? = null,
+    val payrollItemTypes: List<String> = emptyList(),
+    val financialTreatmentLabel: String? = null,
+    val affectsAnnualLeaveBalance: Boolean = false,
+    val annualEntitlementImpact: String? = null,
+    val requiresLegalVerification: Boolean = false,
+    val legalVerificationChecks: List<String> = emptyList(),
 )
 
 data class DriverLeaveRuleSnapshotDto(
@@ -363,6 +395,10 @@ data class DriverLeaveRuleRequirementsDto(
     val requiredDocuments: List<String> = emptyList(),
     val fieldOptions: Map<String, Map<String, String>> = emptyMap(),
     val description: String? = null,
+    val financialTreatmentLabel: String? = null,
+    val affectsAnnualLeaveBalance: Boolean = false,
+    val annualEntitlementImpact: String? = null,
+    val requiresHrVerification: List<String> = emptyList(),
 )
 
 data class DriverLeaveAllocationDto(

app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadOutbox.kt

@@ -13,7 +13,9 @@ import java.io.File
 import java.security.MessageDigest
 import java.util.UUID
 import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
 import pl.firmatpp.kierowca.data.PhotoUploadMetadata
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
@@ -29,7 +31,13 @@ class PhotoUploadOutbox(
     fun observeQueuedUploads(): Flow<List<PhotoUploadEntity>> =
         dao.observeQueuedUploads()
 
-    suspend fun enqueue(routeId: String, uri: Uri, source: String, metadata: PhotoUploadMetadata, stage: String = "other"): PhotoUploadEntity {
+    suspend fun enqueue(
+        routeId: String,
+        uri: Uri,
+        source: String,
+        metadata: PhotoUploadMetadata,
+        stage: String = "other",
+    ): PhotoUploadEntity = withContext(Dispatchers.IO) {
         val clientRequestId = UUID.randomUUID().toString()
         val mimeType = context.contentResolver.getType(uri) ?: "image/jpeg"
         val extension = when (mimeType) {
@@ -58,7 +66,7 @@ class PhotoUploadOutbox(
         dao.upsert(upload)
         enqueueWorker(clientRequestId)
 
-        return upload
+        upload
     }
 
     suspend fun retry(clientRequestId: String) {

app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt

@@ -190,6 +190,11 @@ private enum class RouteLocationPermissionPurpose {
     RestoreRequiredTracking,
 }
 
+private enum class RouteStageCameraMode {
+    Single,
+    Multiple,
+}
+
 @Composable
 fun DriverApp(
     viewModel: DriverViewModel,
@@ -464,6 +469,9 @@ fun DriverApp(
                 locationPermissionGranted = locationPermissionGranted,
                 onBack = viewModel::back,
                 onPhoto = viewModel::openPhoto,
+                onDeletePhoto = viewModel::deletePhoto,
+                onDeleteUpload = viewModel::deletePhotoUpload,
+                onRetryUpload = viewModel::retryPhotoUpload,
                 onRefresh = viewModel::refreshSelectedRoute,
                 onStartRoute = openStartRoute,
                 onFinishRoute = viewModel::openFinishRoute,
@@ -483,8 +491,9 @@ fun DriverApp(
                 onBack = viewModel::back,
                 onWeightChange = viewModel::updateRouteStageWeight,
                 onNotesChange = viewModel::updateRouteStageNotes,
-                onUpload = { uri, source, metadata -> viewModel.uploadPhoto(uri, source, metadata, "loading") },
+                onUpload = { uri, source, metadata -> viewModel.uploadPhoto(uri, source, metadata, "loading")?.join() },
                 onPhoto = viewModel::openPhoto,
+                onDeletePhoto = viewModel::deletePhoto,
                 onDeleteUpload = viewModel::deletePhotoUpload,
                 onRetryUpload = viewModel::retryPhotoUpload,
                 onSubmit = if (routeStageRequirementIsVisible(state.loadingWeightRequirement)) viewModel::openLoadingWeight else viewModel::submitStartRoute,
@@ -504,6 +513,7 @@ fun DriverApp(
                 onNotesChange = viewModel::updateRouteStageNotes,
                 onUpload = { _, _, _ -> },
                 onPhoto = viewModel::openPhoto,
+                onDeletePhoto = viewModel::deletePhoto,
                 onDeleteUpload = viewModel::deletePhotoUpload,
                 onRetryUpload = viewModel::retryPhotoUpload,
                 onSubmit = viewModel::submitStartRoute,
@@ -521,8 +531,9 @@ fun DriverApp(
                 onBack = viewModel::back,
                 onWeightChange = viewModel::updateRouteStageWeight,
                 onNotesChange = viewModel::updateRouteStageNotes,
-                onUpload = { uri, source, metadata -> viewModel.uploadPhoto(uri, source, metadata, "unloading") },
+                onUpload = { uri, source, metadata -> viewModel.uploadPhoto(uri, source, metadata, "unloading")?.join() },
                 onPhoto = viewModel::openPhoto,
+                onDeletePhoto = viewModel::deletePhoto,
                 onDeleteUpload = viewModel::deletePhotoUpload,
                 onRetryUpload = viewModel::retryPhotoUpload,
                 onSubmit = viewModel::submitFinishRoute,
@@ -1523,7 +1534,11 @@ private fun LeaveRequestsScreen(
                     item { EmptyState("Nie masz jeszcze żadnych wniosków") }
                 } else {
                     items(state.leaveRequests, key = { it.id }) { request ->
-                        LeaveRequestCard(request, onClick = { onOpen(request.id) })
+                        LeaveRequestCard(
+                            request = request,
+                            dailyNormMinutes = state.leaveSummary?.dailyNormMinutes ?: 480,
+                            onClick = { onOpen(request.id) },
+                        )
                     }
                 }
             }
@@ -1543,6 +1558,12 @@ private fun LeaveBalanceOverview(state: DriverUiState) {
     val summary = state.leaveSummary
     val totals = DriverLeaveRequestUiRules.annualTotals(summary)
     val norm = summary?.dailyNormMinutes ?: 480
+    val showAnnualUsage = DriverLeaveRequestUiRules.isUsageVisible(summary, "ANNUAL")
+    val otherPools = DriverLeaveRequestUiRules.otherEntitlementPools(summary)
+
+    if (summary != null && !showAnnualUsage && otherPools.isEmpty()) {
+        return
+    }
 
     Card(
         colors = CardDefaults.cardColors(containerColor = TppTheme.colors.card),
@@ -1551,8 +1572,14 @@ private fun LeaveBalanceOverview(state: DriverUiState) {
         modifier = Modifier.fillMaxWidth(),
     ) {
         Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(14.dp)) {
-            Text("Twój urlop wypoczynkowy", color = TppTheme.colors.ink, fontWeight = FontWeight.Bold, fontSize = 20.sp)
+            Text(
+                if (showAnnualUsage) "Twój urlop wypoczynkowy" else "Twoje limity nieobecności",
+                color = TppTheme.colors.ink,
+                fontWeight = FontWeight.Bold,
+                fontSize = 20.sp,
+            )
 
+            if (showAnnualUsage) {
                 when {
                     summary == null -> {
                         Text("Pobieramy aktualne saldo…", color = TppTheme.colors.muted)
@@ -1635,6 +1662,58 @@ private fun LeaveBalanceOverview(state: DriverUiState) {
                     }
                 }
             }
+
+            if (otherPools.isNotEmpty()) {
+                if (showAnnualUsage) {
+                    HorizontalDivider(color = TppTheme.colors.outline)
+                    Text(
+                        "Pozostałe dostępne limity",
+                        color = TppTheme.colors.ink,
+                        fontWeight = FontWeight.Bold,
+                        fontSize = 17.sp,
+                    )
+                }
+                Text(
+                    "Te limity są rozliczane osobno i nie zmniejszają zwykłego urlopu wypoczynkowego.",
+                    color = TppTheme.colors.muted,
+                    fontSize = 13.sp,
+                )
+                otherPools.forEach { pool ->
+                    Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                            Text(
+                                "${DriverLeaveRequestUiRules.poolLabel(pool.poolCode)} · ${pool.year}",
+                                color = TppTheme.colors.muted,
+                                modifier = Modifier.weight(1f),
+                            )
+                            Text(
+                                DriverLeaveRequestUiRules.formatQuantity(pool.availableQuantity, pool.unit, norm),
+                                color = TppTheme.colors.ink,
+                                fontWeight = FontWeight.Bold,
+                                textAlign = TextAlign.End,
+                            )
+                        }
+                        if (pool.usedQuantity > 0 || pool.reservedQuantity > 0) {
+                            Text(
+                                buildString {
+                                    if (pool.usedQuantity > 0) {
+                                        append("Wykorzystano ")
+                                        append(DriverLeaveRequestUiRules.formatQuantity(pool.usedQuantity, pool.unit, norm))
+                                    }
+                                    if (pool.reservedQuantity > 0) {
+                                        if (isNotEmpty()) append(" · ")
+                                        append("W przyszłych wnioskach ")
+                                        append(DriverLeaveRequestUiRules.formatQuantity(pool.reservedQuantity, pool.unit, norm))
+                                    }
+                                },
+                                color = TppTheme.colors.muted,
+                                fontSize = 12.sp,
+                            )
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -1653,7 +1732,11 @@ private fun LeaveBalanceStat(title: String, value: String, modifier: Modifier =
 }
 
 @Composable
-private fun LeaveRequestCard(request: DriverLeaveRequestDto, onClick: () -> Unit) {
+private fun LeaveRequestCard(
+    request: DriverLeaveRequestDto,
+    dailyNormMinutes: Int,
+    onClick: () -> Unit,
+) {
     Card(
         colors = CardDefaults.cardColors(containerColor = TppTheme.colors.card),
         border = BorderStroke(1.dp, TppTheme.colors.outline),
@@ -1670,6 +1753,27 @@ private fun LeaveRequestCard(request: DriverLeaveRequestDto, onClick: () -> Unit
                         fontSize = 17.sp,
                     )
                     Text(leaveDateRange(request.dateFrom, request.dateTo), color = TppTheme.colors.muted, fontSize = 14.sp)
+                    request.requestedQuantity?.let { quantity ->
+                        Text(
+                            DriverLeaveRequestUiRules.formatQuantity(
+                                quantity,
+                                DriverLeaveRequestUiRules.requestQuantityUnit(request),
+                                dailyNormMinutes,
+                            ),
+                            color = TppTheme.colors.ink,
+                            fontSize = 13.sp,
+                            fontWeight = FontWeight.SemiBold,
+                        )
+                    }
+                    Text(
+                        if (request.affectsAnnualLeaveBalance) {
+                            "Pomniejsza pulę urlopu wypoczynkowego"
+                        } else {
+                            "Nie pomniejsza puli urlopu wypoczynkowego"
+                        },
+                        color = if (request.affectsAnnualLeaveBalance) TppTheme.colors.forest else TppTheme.colors.muted,
+                        fontSize = 12.sp,
+                    )
                     if (!request.note.isNullOrBlank()) {
                         Text(request.note, color = TppTheme.colors.muted, maxLines = 2, overflow = TextOverflow.Ellipsis)
                     }
@@ -1732,20 +1836,36 @@ private fun LeaveRequestDetailScreen(
                         }
                         DetailLine("Wybrany termin", leaveDateRange(request.dateFrom, request.dateTo))
                         request.requestedQuantity?.let { quantity ->
-                            val unit = when {
-                                request.requestMode == "hours" -> "minutes"
-                                request.rule?.unit == "calendar_days" -> "days"
-                                else -> "minutes"
-                            }
                             DetailLine(
                                 "Czas nieobecności",
                                 DriverLeaveRequestUiRules.formatQuantity(
                                     quantity,
-                                    unit,
+                                    DriverLeaveRequestUiRules.requestQuantityUnit(request),
                                     state.leaveSummary?.dailyNormMinutes ?: 480,
                                 ),
                             )
                         }
+                        DetailLine(
+                            "Wpływ na urlop wypoczynkowy",
+                            if (request.affectsAnnualLeaveBalance) {
+                                "Pomniejsza odpowiednią pulę urlopu"
+                            } else {
+                                "Nie pomniejsza puli urlopu wypoczynkowego"
+                            },
+                        )
+                        if (!request.financialTreatmentLabel.isNullOrBlank()) {
+                            DetailLine("Sposób rozliczenia", request.financialTreatmentLabel)
+                        }
+                        DriverLeaveRequestUiRules.annualEntitlementImpact(request.annualEntitlementImpact)?.let {
+                            Text(it, color = Color(0xFF7A5A00), fontSize = 13.sp)
+                        }
+                        if (request.requiresLegalVerification) {
+                            Text(
+                                "Kadry sprawdzą wymagane warunki i dokumenty przed ostatecznym rozliczeniem.",
+                                color = Color(0xFF7A5A00),
+                                fontSize = 13.sp,
+                            )
+                        }
                         DetailLine("Wysłano", request.submittedAt?.let(::shortDateTime) ?: "-")
                         if (request.decidedAt != null) {
                             DetailLine("Decyzję zapisano", shortDateTime(request.decidedAt))
@@ -1783,6 +1903,32 @@ private fun LeaveRequestDetailScreen(
                     }
                 }
             }
+            val submittedDetails = request.details
+                .filterValues { it.isNotBlank() }
+                .toList()
+            if (submittedDetails.isNotEmpty()) {
+                item {
+                    Text("Podane informacje", color = TppTheme.colors.ink, fontWeight = FontWeight.Bold, fontSize = 18.sp)
+                }
+                item {
+                    Card(
+                        colors = CardDefaults.cardColors(containerColor = TppTheme.colors.card),
+                        border = BorderStroke(1.dp, TppTheme.colors.outline),
+                        shape = MaterialTheme.shapes.medium,
+                    ) {
+                        Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                            submittedDetails.forEach { (field, rawValue) ->
+                                val displayedValue = request.rule?.rule
+                                    ?.fieldOptions
+                                    ?.get(field)
+                                    ?.get(rawValue)
+                                    ?: rawValue
+                                DetailLine(DriverLeaveRequestUiRules.fieldLabel(field), displayedValue)
+                            }
+                        }
+                    }
+                }
+            }
             val requiredDocuments = request.rule?.rule?.requiredDocuments.orEmpty()
             if (requiredDocuments.isNotEmpty()) {
                 item {
@@ -1836,7 +1982,7 @@ private fun LeaveRequestDetailScreen(
             }
             if (request.allocations.isNotEmpty()) {
                 item {
-                    Text("Jak rozliczono urlop", color = TppTheme.colors.ink, fontWeight = FontWeight.Bold, fontSize = 18.sp)
+                    Text("Jak rozliczono nieobecność", color = TppTheme.colors.ink, fontWeight = FontWeight.Bold, fontSize = 18.sp)
                 }
                 item {
                     Card(
@@ -1845,22 +1991,31 @@ private fun LeaveRequestDetailScreen(
                         shape = MaterialTheme.shapes.medium,
                     ) {
                         Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                            request.allocations.groupBy { it.sourceYear }.forEach { (year, allocations) ->
+                            request.allocations
+                                .groupBy { it.sourceYear to it.status }
+                                .forEach { (source, allocations) ->
+                                    Column(verticalArrangement = Arrangement.spacedBy(3.dp)) {
                                         Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
                                             Text(
-                                        if (year != null) "Z puli $year" else "Rozliczenie",
+                                                source.first?.let { "Z puli $it" } ?: "Czas nieobecności",
                                                 color = TppTheme.colors.muted,
                                             )
                                             Text(
                                                 DriverLeaveRequestUiRules.formatQuantity(
                                                     allocations.sumOf { it.quantity },
-                                            if (request.rule?.unit == "calendar_days") "days" else "minutes",
+                                                    DriverLeaveRequestUiRules.requestQuantityUnit(request),
                                                     state.leaveSummary?.dailyNormMinutes ?: 480,
                                                 ),
                                                 color = TppTheme.colors.ink,
                                                 fontWeight = FontWeight.Bold,
                                             )
                                         }
+                                        Text(
+                                            DriverLeaveRequestUiRules.allocationStatusLabel(source.second),
+                                            color = TppTheme.colors.muted,
+                                            fontSize = 12.sp,
+                                        )
+                                    }
                                 }
                             }
                         }
@@ -2328,7 +2483,7 @@ private fun AddLeaveRequestScreen(
                 Column(verticalArrangement = Arrangement.spacedBy(5.dp)) {
                     Text("Złóż wniosek krok po kroku", color = TppTheme.colors.ink, fontWeight = FontWeight.Bold, fontSize = 23.sp)
                     Text(
-                        "Wybierz rodzaj, termin i sprawdź podsumowanie. Aplikacja policzy urlop za Ciebie.",
+                        "Wybierz rodzaj i termin. Aplikacja policzy dni lub godziny oraz pokaże wpływ na saldo.",
                         color = TppTheme.colors.muted,
                     )
                 }
@@ -2341,7 +2496,15 @@ private fun AddLeaveRequestScreen(
                             color = Color(0xFFB91C1C),
                         )
                     } else {
-                        availableTypes.forEach { type ->
+                        availableTypes.groupBy { it.category }.forEach { (category, types) ->
+                            Text(
+                                DriverLeaveRequestUiRules.categoryLabel(category),
+                                color = TppTheme.colors.muted,
+                                fontWeight = FontWeight.Bold,
+                                fontSize = 13.sp,
+                                modifier = Modifier.padding(top = 4.dp),
+                            )
+                            types.forEach { type ->
                                 val active = type.value == state.leaveRequestType
                                 Card(
                                     colors = CardDefaults.cardColors(
@@ -2368,6 +2531,25 @@ private fun AddLeaveRequestScreen(
                                         if (!type.description.isNullOrBlank()) {
                                             Text(type.description, color = TppTheme.colors.muted, fontSize = 13.sp)
                                         }
+                                        Text(
+                                            if (type.affectsAnnualLeaveBalance) {
+                                                "Pomniejsza odpowiednią pulę urlopu wypoczynkowego."
+                                            } else {
+                                                "Nie pomniejsza puli urlopu wypoczynkowego."
+                                            },
+                                            color = if (type.affectsAnnualLeaveBalance) TppTheme.colors.forest else TppTheme.colors.muted,
+                                            fontSize = 12.sp,
+                                            fontWeight = FontWeight.SemiBold,
+                                        )
+                                        DriverLeaveRequestUiRules.annualEntitlementImpact(type.annualEntitlementImpact)?.let {
+                                            Text(
+                                                it,
+                                                color = Color(0xFF7A5A00),
+                                                fontSize = 12.sp,
+                                                fontWeight = FontWeight.SemiBold,
+                                            )
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -2375,7 +2557,7 @@ private fun AddLeaveRequestScreen(
                 }
             }
             item {
-                GuidedStepCard(number = "2", title = "Kiedy potrzebujesz wolnego?") {
+                GuidedStepCard(number = "2", title = "Kiedy ma trwać nieobecność?") {
                     Card(
                         colors = CardDefaults.cardColors(containerColor = Color.White),
                         border = BorderStroke(
@@ -2470,7 +2652,7 @@ private fun AddLeaveRequestScreen(
                                         if (active) Icon(Icons.Outlined.CheckCircle, contentDescription = "Wybrano")
                                     }
                                 }
-                            } else if (field.endsWith("Date")) {
+                            } else if (field.endsWith("Date") || field.endsWith("At")) {
                                 Card(
                                     colors = CardDefaults.cardColors(containerColor = Color.White),
                                     border = BorderStroke(1.dp, TppTheme.colors.outline),
@@ -2501,6 +2683,13 @@ private fun AddLeaveRequestScreen(
                                     supportingText = DriverLeaveRequestUiRules.fieldHint(field)?.let { hint ->
                                         { Text(hint) }
                                     },
+                                    keyboardOptions = KeyboardOptions(
+                                        keyboardType = if (field in setOf("eligibleHospitalDays", "partNumber")) {
+                                            KeyboardType.Number
+                                        } else {
+                                            KeyboardType.Text
+                                        },
+                                    ),
                                     modifier = Modifier.fillMaxWidth(),
                                     shape = MaterialTheme.shapes.medium,
                                 )
@@ -2536,6 +2725,28 @@ private fun AddLeaveRequestScreen(
                             color = TppTheme.colors.muted,
                             fontSize = 13.sp,
                         )
+                        if (!selectedType.financialTreatmentLabel.isNullOrBlank()) {
+                            Text(
+                                "Rozliczenie: ${selectedType.financialTreatmentLabel}",
+                                color = TppTheme.colors.ink,
+                                fontSize = 13.sp,
+                                fontWeight = FontWeight.SemiBold,
+                            )
+                        }
+                        DriverLeaveRequestUiRules.annualEntitlementImpact(selectedType.annualEntitlementImpact)?.let {
+                            Text(
+                                it,
+                                color = Color(0xFF7A5A00),
+                                fontSize = 13.sp,
+                            )
+                        }
+                        if (selectedType.requiresHrVerification.isNotEmpty()) {
+                            Text(
+                                "Kadry sprawdzą indywidualne warunki i dokumenty przed zatwierdzeniem. Nie musisz samodzielnie obliczać limitu ani kwoty.",
+                                color = Color(0xFF7A5A00),
+                                fontSize = 13.sp,
+                            )
+                        }
                     }
                 }
             }
@@ -2585,6 +2796,16 @@ private fun AddLeaveRequestScreen(
                             )
                         }",
                     )
+                    Text(
+                        if (state.leaveForecast.affectsAnnualLeaveBalance) {
+                            "Ten wniosek pomniejszy odpowiednią pulę urlopu wypoczynkowego."
+                        } else {
+                            "Ten wniosek nie pomniejszy puli urlopu wypoczynkowego."
+                        },
+                    )
+                    if (!state.leaveForecast.financialTreatmentLabel.isNullOrBlank()) {
+                        Text("Sposób rozliczenia: ${state.leaveForecast.financialTreatmentLabel}")
+                    }
                     Text("Po wysłaniu zobaczysz status oraz dalsze wymagane kroki.")
                 }
             },
@@ -2659,13 +2880,17 @@ private fun LeaveForecastCard(state: DriverUiState, forecast: pl.firmatpp.kierow
     ) {
         Column(Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
             Text(
-                if (success) "Wniosek jest gotowy do wysłania" else "Za mało urlopu do wykorzystania",
+                if (success) "Dane są gotowe do wysłania" else "Za mało dostępnego limitu",
                 color = if (success) TppTheme.colors.forest else Color(0xFFB91C1C),
                 fontWeight = FontWeight.Bold,
                 fontSize = 18.sp,
             )
             DetailLine(
-                "Ten wniosek wykorzysta",
+                if (forecast.affectsAnnualLeaveBalance) {
+                    "Pomniejszy pulę urlopu o"
+                } else {
+                    "Czas tej nieobecności"
+                },
                 DriverLeaveRequestUiRules.formatQuantity(
                     forecast.requestedQuantity,
                     forecast.quantityUnit,
@@ -2675,6 +2900,35 @@ private fun LeaveForecastCard(state: DriverUiState, forecast: pl.firmatpp.kierow
             if (forecast.workingDaysCount > 0) {
                 DetailLine("Dni pracy w wybranym terminie", DriverLeaveRequestUiRules.dayCountLabel(forecast.workingDaysCount))
             }
+            if (!forecast.affectsAnnualLeaveBalance) {
+                Text(
+                    "Ta nieobecność nie zmniejszy liczby dni urlopu wypoczynkowego.",
+                    color = TppTheme.colors.muted,
+                    fontSize = 13.sp,
+                )
+            }
+            if (!forecast.financialTreatmentLabel.isNullOrBlank()) {
+                Text(
+                    "Rozliczenie: ${forecast.financialTreatmentLabel}",
+                    color = TppTheme.colors.ink,
+                    fontSize = 13.sp,
+                    fontWeight = FontWeight.SemiBold,
+                )
+            }
+            DriverLeaveRequestUiRules.annualEntitlementImpact(forecast.annualEntitlementImpact)?.let {
+                Text(
+                    it,
+                    color = Color(0xFF7A5A00),
+                    fontSize = 13.sp,
+                )
+            }
+            if (forecast.requiresHrVerification.isNotEmpty()) {
+                Text(
+                    "Przed zatwierdzeniem kadry potwierdzą ustawowe warunki tego uprawnienia.",
+                    color = Color(0xFF7A5A00),
+                    fontSize = 13.sp,
+                )
+            }
             if (!forecast.balanceConfigured) {
                 Text(
                     "Saldo nie jest jeszcze potwierdzone. Wniosek zostanie zapisany, ale nie będzie mógł zostać zaakceptowany przed konfiguracją przez kadry.",
@@ -4173,8 +4427,9 @@ private fun RouteStageScreen(
     onBack: () -> Unit,
     onWeightChange: (String) -> Unit,
     onNotesChange: (String) -> Unit,
-    onUpload: (Uri, String, PhotoUploadMetadata) -> Unit,
+    onUpload: suspend (Uri, String, PhotoUploadMetadata) -> Unit,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
     onDeleteUpload: (PhotoUploadEntity) -> Unit,
     onRetryUpload: (PhotoUploadEntity) -> Unit,
     onSubmit: () -> Unit,
@@ -4182,6 +4437,9 @@ private fun RouteStageScreen(
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
     var cameraUri by remember { mutableStateOf<Uri?>(null) }
+    var pendingCameraMode by remember { mutableStateOf<RouteStageCameraMode?>(null) }
+    var showMultiplePhotoCamera by remember(stage) { mutableStateOf(false) }
+    var multiplePhotoLocationMetadata by remember(stage) { mutableStateOf(PhotoUploadMetadata()) }
     var showPreciseLocationPermissionDialog by remember { mutableStateOf(false) }
     var voiceDictationActive by remember(stage) { mutableStateOf(false) }
     val route = state.displaySelectedRoute
@@ -4235,7 +4493,15 @@ private fun RouteStageScreen(
         }
         cameraUri = null
     }
+    val openMultiplePhotoCamera = {
+        multiplePhotoLocationMetadata = PhotoUploadMetadata()
+        showMultiplePhotoCamera = true
+        coroutineScope.launch {
+            multiplePhotoLocationMetadata = cameraPhotoMetadata(context).copy(takenAt = null)
+        }
+    }
     val cameraPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { grants ->
+        val requestedMode = pendingCameraMode
         val pendingUri = cameraUri
         val cameraGranted = grants[Manifest.permission.CAMERA] == true || hasPermission(context, Manifest.permission.CAMERA)
         val fineLocationGranted = grants[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
@@ -4243,12 +4509,47 @@ private fun RouteStageScreen(
         if (!canLaunchCameraWithLocationPolicy(state.requirePreciseLocationForPhotos, fineLocationGranted)) {
             showPreciseLocationPermissionDialog = true
             cameraUri = null
+            pendingCameraMode = null
             return@rememberLauncherForActivityResult
         }
-        if (cameraGranted && pendingUri != null) cameraLauncher.launch(pendingUri)
+        if (cameraGranted) {
+            when (requestedMode) {
+                RouteStageCameraMode.Single -> {
+                    if (pendingUri != null) cameraLauncher.launch(pendingUri)
+                }
+                RouteStageCameraMode.Multiple -> {
+                    openMultiplePhotoCamera()
+                }
+                null -> Unit
+            }
+        } else {
+            cameraUri = null
+        }
+        pendingCameraMode = null
     }
     val pickerLauncher = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
-        if (uri != null) onUpload(uri, "gallery", PhotoUploadMetadata())
+        if (uri != null) {
+            coroutineScope.launch {
+                onUpload(uri, "gallery", PhotoUploadMetadata())
+            }
+        }
+    }
+
+    if (showMultiplePhotoCamera) {
+        MultiplePhotoCameraScreen(
+            stage = stage,
+            onPhotoCaptured = { uri ->
+                onUpload(
+                    uri,
+                    "camera",
+                    multiplePhotoLocationMetadata.copy(takenAt = Instant.now().toString()),
+                )
+            },
+            onClose = {
+                showMultiplePhotoCamera = false
+            },
+        )
+        return
     }
 
     BoxWithConstraints(Modifier.fillMaxSize()) {
@@ -4330,19 +4631,37 @@ private fun RouteStageScreen(
                 if (showPhotoActions) {
                     item {
                         Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                            CargoActionButton("Zrób nowe zdjęcie", Icons.Outlined.CameraAlt, TppTheme.colors.forest) {
+                            RouteStageCameraActions(
+                                onSinglePhoto = {
                                     val newUri = createCameraUri(context)
                                     cameraUri = newUri
+                                    pendingCameraMode = RouteStageCameraMode.Single
                                     val missingPermissions = cameraCapturePermissions(
                                         context = context,
                                         requirePreciseLocation = state.requirePreciseLocationForPhotos,
                                     )
                                     if (missingPermissions.isEmpty()) {
+                                        pendingCameraMode = null
                                         cameraLauncher.launch(newUri)
                                     } else {
                                         cameraPermissionLauncher.launch(missingPermissions)
                                     }
+                                },
+                                onMultiplePhotos = {
+                                    cameraUri = null
+                                    pendingCameraMode = RouteStageCameraMode.Multiple
+                                    val missingPermissions = cameraCapturePermissions(
+                                        context = context,
+                                        requirePreciseLocation = state.requirePreciseLocationForPhotos,
+                                    )
+                                    if (missingPermissions.isEmpty()) {
+                                        pendingCameraMode = null
+                                        openMultiplePhotoCamera()
+                                    } else {
+                                        cameraPermissionLauncher.launch(missingPermissions)
                                     }
+                                },
+                            )
                             if (state.allowGalleryUploads) {
                                 CargoActionButton("Dodaj zdjęcie z galerii", Icons.Outlined.AddPhotoAlternate, TppTheme.colors.containerGreen) {
                                     pickerLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
@@ -4359,7 +4678,7 @@ private fun RouteStageScreen(
                             deletingPhotoIds = state.deletingPhotoIds,
                             imageAuthHeader = state.imageAuthHeader,
                             onPhoto = onPhoto,
-                            onDeletePhoto = {},
+                            onDeletePhoto = onDeletePhoto,
                             onDeleteUpload = onDeleteUpload,
                             onRetryUpload = onRetryUpload,
                         )
@@ -4566,6 +4885,9 @@ private fun DetailScreen(
     locationPermissionGranted: Boolean,
     onBack: () -> Unit,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
+    onDeleteUpload: (PhotoUploadEntity) -> Unit,
+    onRetryUpload: (PhotoUploadEntity) -> Unit,
     onRefresh: () -> Unit,
     onStartRoute: () -> Unit,
     onFinishRoute: () -> Unit,
@@ -4624,6 +4946,9 @@ private fun DetailScreen(
                             loadingWeightPending = projection.loadingWeightPending,
                             unloadingWeightPending = projection.unloadingWeightPending,
                             onPhoto = onPhoto,
+                            onDeletePhoto = onDeletePhoto,
+                            onDeleteUpload = onDeleteUpload,
+                            onRetryUpload = onRetryUpload,
                         )
                     }
                     item { ErrorText(state.error) }
@@ -5092,6 +5417,9 @@ private fun CargoDocumentationSection(
     loadingWeightPending: Boolean,
     unloadingWeightPending: Boolean,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
+    onDeleteUpload: (PhotoUploadEntity) -> Unit,
+    onRetryUpload: (PhotoUploadEntity) -> Unit,
 ) {
     val loadingPhotos = routePhotosForStage(route.photos, "loading")
     val unloadingPhotos = routePhotosForStage(route.photos, "unloading")
@@ -5116,6 +5444,9 @@ private fun CargoDocumentationSection(
             imageAuthHeader = imageAuthHeader,
             weightPending = loadingWeightPending,
             onPhoto = onPhoto,
+            onDeletePhoto = onDeletePhoto,
+            onDeleteUpload = onDeleteUpload,
+            onRetryUpload = onRetryUpload,
         )
         RouteStageDocumentationBlock(
             title = "Rozładunek",
@@ -5127,6 +5458,9 @@ private fun CargoDocumentationSection(
             imageAuthHeader = imageAuthHeader,
             weightPending = unloadingWeightPending,
             onPhoto = onPhoto,
+            onDeletePhoto = onDeletePhoto,
+            onDeleteUpload = onDeleteUpload,
+            onRetryUpload = onRetryUpload,
         )
         if (otherPhotos.isNotEmpty() || otherUploads.isNotEmpty()) {
             RouteStageDocumentationBlock(
@@ -5139,6 +5473,9 @@ private fun CargoDocumentationSection(
                 imageAuthHeader = imageAuthHeader,
                 weightPending = false,
                 onPhoto = onPhoto,
+                onDeletePhoto = onDeletePhoto,
+                onDeleteUpload = onDeleteUpload,
+                onRetryUpload = onRetryUpload,
             )
         }
     }
@@ -5155,6 +5492,9 @@ private fun RouteStageDocumentationBlock(
     imageAuthHeader: String?,
     weightPending: Boolean = false,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
+    onDeleteUpload: (PhotoUploadEntity) -> Unit,
+    onRetryUpload: (PhotoUploadEntity) -> Unit,
 ) {
     val count = visiblePhotoAttachmentCount(photos.size, uploads.size)
     Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
@@ -5237,10 +5577,9 @@ private fun RouteStageDocumentationBlock(
                 deletingPhotoIds = deletingPhotoIds,
                 imageAuthHeader = imageAuthHeader,
                 onPhoto = onPhoto,
-                onDeletePhoto = {},
+                onDeletePhoto = onDeletePhoto,
-                onDeleteUpload = {},
+                onDeleteUpload = onDeleteUpload,
-                onRetryUpload = {},
+                onRetryUpload = onRetryUpload,
-                readOnly = true,
             )
         }
     }
@@ -5249,6 +5588,107 @@ private fun RouteStageDocumentationBlock(
 private fun formatRouteWeight(weight: Double): String =
     if (weight % 1.0 == 0.0) "${weight.toInt()} t" else String.format(Locale("pl", "PL"), "%.3f t", weight)
 
+@Composable
+private fun RouteStageCameraActions(
+    onSinglePhoto: () -> Unit,
+    onMultiplePhotos: () -> Unit,
+) {
+    BoxWithConstraints(Modifier.fillMaxWidth()) {
+        if (maxWidth >= 300.dp) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+            ) {
+                RouteStageCameraActionButton(
+                    label = "Jedno zdjęcie",
+                    icon = Icons.Outlined.CameraAlt,
+                    color = TppTheme.colors.forest,
+                    compact = true,
+                    modifier = Modifier.weight(1f),
+                    onClick = onSinglePhoto,
+                )
+                RouteStageCameraActionButton(
+                    label = "Wiele zdjęć",
+                    icon = Icons.Outlined.CameraAlt,
+                    color = TppTheme.colors.forest,
+                    compact = true,
+                    modifier = Modifier.weight(1f),
+                    onClick = onMultiplePhotos,
+                )
+            }
+        } else {
+            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+                RouteStageCameraActionButton(
+                    label = "Jedno zdjęcie",
+                    icon = Icons.Outlined.CameraAlt,
+                    color = TppTheme.colors.forest,
+                    compact = false,
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onSinglePhoto,
+                )
+                RouteStageCameraActionButton(
+                    label = "Wiele zdjęć",
+                    icon = Icons.Outlined.CameraAlt,
+                    color = TppTheme.colors.forest,
+                    compact = false,
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onMultiplePhotos,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun RouteStageCameraActionButton(
+    label: String,
+    icon: ImageVector,
+    color: Color,
+    compact: Boolean,
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier.height(if (compact) 76.dp else 64.dp),
+        colors = ButtonDefaults.buttonColors(containerColor = color),
+        contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp),
+        shape = MaterialTheme.shapes.medium,
+    ) {
+        if (compact) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(4.dp),
+            ) {
+                Icon(
+                    icon,
+                    contentDescription = null,
+                    tint = Color.White,
+                    modifier = Modifier.size(22.dp),
+                )
+                Text(
+                    text = label,
+                    color = Color.White,
+                    style = MaterialTheme.typography.labelLarge,
+                    fontWeight = FontWeight.Bold,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = TextAlign.Center,
+                )
+            }
+        } else {
+            Icon(icon, contentDescription = null, tint = Color.White)
+            Spacer(Modifier.width(10.dp))
+            Text(
+                text = label,
+                color = Color.White,
+                style = MaterialTheme.typography.titleMedium,
+                fontWeight = FontWeight.Bold,
+            )
+        }
+    }
+}
+
 @Composable
 private fun CargoActionButton(label: String, icon: ImageVector, color: Color, onClick: () -> Unit) {
     Button(

app/src/main/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRules.kt

@@ -47,6 +47,7 @@ object DriverLeaveRequestUiRules {
             "cancellation_rejected" -> "Anulowanie odrzucone"
             "period_amended" -> "Zmieniono termin wniosku"
             "interrupted" -> "Nieobecność została przerwana"
+            "annual_leave_interrupted" -> "Przywrócono urlop wypoczynkowy"
             else -> "Aktualizacja wniosku"
         }
 
@@ -77,6 +78,8 @@ object DriverLeaveRequestUiRules {
             "AUTHORITY_SUMMONS" -> "Wezwanie urzędowe"
             "RESCUE_DUTIES" -> "Obowiązki ratownicze"
             "MILITARY_DUTIES" -> "Obowiązki wojskowe"
+            "ORGAN_DONOR_EXAMS" -> "Badania dawcy"
+            "CARE_SICKNESS" -> "Opieka nad chorym dzieckiem lub członkiem rodziny"
             else -> type
         }
 
@@ -103,6 +106,63 @@ object DriverLeaveRequestUiRules {
             .filter { it.poolCode == "ANNUAL" && it.status == "active" }
             .sortedByDescending { it.year }
 
+    fun isUsageVisible(summary: DriverLeaveSummaryDto?, poolCode: String): Boolean =
+        summary?.visibleUsagePoolCodes?.contains(poolCode) ?: true
+
+    fun otherEntitlementPools(summary: DriverLeaveSummaryDto?): List<DriverLeavePoolDto> =
+        summary?.pools.orEmpty()
+            .filter { it.poolCode != "ANNUAL" && it.status == "active" }
+            .sortedWith(compareBy<DriverLeavePoolDto>({ poolLabel(it.poolCode) }, { -it.year }))
+
+    fun poolLabel(poolCode: String): String =
+        when (poolCode) {
+            "ANNUAL" -> "Urlop wypoczynkowy"
+            "ANNUAL_DISABILITY" -> "Dodatkowy urlop wypoczynkowy"
+            "FORCE_MAJEURE" -> "Siła wyższa"
+            "CHILD_CARE_14" -> "Opieka nad dzieckiem do 14 lat"
+            "CARE_LEAVE" -> "Urlop opiekuńczy"
+            else -> typeLabel(poolCode)
+        }
+
+    fun requestQuantityUnit(request: DriverLeaveRequestDto): String {
+        request.quantityUnit?.takeIf { it == "days" || it == "minutes" }?.let { return it }
+        if (request.requestMode == "hours") return "minutes"
+        if (request.rule?.unit == "calendar_days") return "days"
+
+        val poolCode = request.rule?.poolCode
+        return if (
+            request.requestMode == "days" &&
+            poolCode != null &&
+            poolCode !in setOf("ANNUAL", "ANNUAL_DISABILITY")
+        ) {
+            "days"
+        } else {
+            "minutes"
+        }
+    }
+
+    fun allocationStatusLabel(status: String): String =
+        when (status) {
+            "reserved" -> "Uwzględniono w przyszłej nieobecności"
+            "used" -> "Wykorzystano"
+            "released" -> "Przywrócono do wykorzystania"
+            else -> "Rozliczono"
+        }
+
+    fun categoryLabel(category: String?): String =
+        when (category) {
+            "annual" -> "Urlop wypoczynkowy"
+            "statutory_short" -> "Krótkie uprawnienia ustawowe"
+            "family" -> "Rodzina i opieka"
+            "parental" -> "Rodzicielstwo"
+            "health" -> "Zdrowie i rehabilitacja"
+            "training" -> "Nauka i szkolenia"
+            "statutory_exemption" -> "Pozostałe zwolnienia ustawowe"
+            "unpaid" -> "Nieobecności bezpłatne"
+            "operational" -> "Pozostałe nieobecności"
+            else -> "Inne rodzaje nieobecności"
+        }
+
     fun formatQuantity(quantity: Int, unit: String, dailyNormMinutes: Int = 480): String {
         if (unit == "days") return dayCountLabel(quantity)
 
@@ -149,6 +209,15 @@ object DriverLeaveRequestUiRules {
             else -> "Wniosek zostanie przekazany do osoby, która podejmie decyzję."
         }
 
+    fun annualEntitlementImpact(impact: String?): String? =
+        when (impact) {
+            "proportional_after_one_month" ->
+                "Nie pomniejszy puli od razu, ale okres trwający co najmniej miesiąc może zmniejszyć roczny wymiar urlopu po powrocie do pracy."
+            "proportional_on_return_if_started_before_year" ->
+                "Po powrocie z urlopu rozpoczętego w poprzednim roku wymiar urlopu wypoczynkowego zostanie naliczony proporcjonalnie."
+            else -> null
+        }
+
     fun fieldLabel(field: String): String =
         when (field) {
             "childBirthDate" -> "Data urodzenia dziecka"
@@ -165,6 +234,16 @@ object DriverLeaveRequestUiRules {
             "examType" -> "Rodzaj egzaminu lub nauki"
             "educationProgramKey" -> "Nazwa szkoły lub programu"
             "classification" -> "Czego dotyczy nieobecność"
+            "urgentFamilyReason" -> "Jaka pilna sprawa rodzinna wymaga Twojej obecności?"
+            "childrenPlacedCount" -> "Liczba dzieci przyjętych na wychowanie"
+            "placementType" -> "Sposób przyjęcia dziecka na wychowanie"
+            "hospitalizationGroup" -> "Która sytuacja hospitalizacji dotyczy dziecka?"
+            "eligibleHospitalDays" -> "Liczba dni hospitalizacji potwierdzona przez szpital"
+            "maternityLeaveEndsAt" -> "Data zakończenia urlopu macierzyńskiego"
+            "parentalEntitlementVariant" -> "Wymiar urlopu rodzicielskiego"
+            "childcareEntitlementVariant" -> "Rodzaj urlopu wychowawczego"
+            "careRecipientType" -> "Kogo dotyczy opieka?"
+            "careEntitlementEventKey" -> "Opis okresu opieki"
             else -> "Dodatkowa informacja"
         }
 
@@ -176,6 +255,9 @@ object DriverLeaveRequestUiRules {
             "childIdentityKey" -> "Wystarczy imię i rok urodzenia"
             "educationProgramKey" -> "Np. Technikum Transportowe w Poznaniu"
             "classification" -> "Krótko opisz powód, aby kadry mogły go prawidłowo zakwalifikować"
+            "urgentFamilyReason" -> "Krótko opisz chorobę lub wypadek oraz dlaczego Twoja natychmiastowa obecność jest konieczna."
+            "eligibleHospitalDays" -> "Wpisz liczbę z zaświadczenia, np. 12"
+            "careEntitlementEventKey" -> "Wpisz prosty opis pozwalający kadrom połączyć części tego samego uprawnienia."
             else -> null
         }
 
@@ -196,6 +278,9 @@ object DriverLeaveRequestUiRules {
             "rescue_service_confirmation" -> "Potwierdzenie służby ratowniczej"
             "military_document" -> "Dokument wojskowy"
             "external_sickness_confirmation" -> "Potwierdzenie niezdolności do pracy"
+            "other_parent_declaration" -> "Oświadczenie drugiego rodzica"
+            "organ_donor_confirmation" -> "Potwierdzenie badań lub zabiegu dawcy"
+            "external_care_confirmation" -> "Potwierdzenie opieki lub e-ZLA"
             else -> "Wymagany dokument"
         }
 

app/src/main/java/pl/firmatpp/kierowca/ui/DriverViewModel.kt

@@ -1259,6 +1259,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     type = snapshot.leaveRequestType,
                     requestMode = snapshot.leaveRequestMode,
                     requestedQuantity = requestedMinutes,
+                    details = snapshot.leaveRequestDetails,
                 )
             }.onSuccess { forecast ->
                 _state.update { it.copy(leaveForecast = forecast, error = null) }
@@ -1477,14 +1478,19 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         }
     }
 
-    fun uploadPhoto(uri: Uri, source: String, metadata: PhotoUploadMetadata = PhotoUploadMetadata(), stage: String = "other") {
+    fun uploadPhoto(
+        uri: Uri,
+        source: String,
+        metadata: PhotoUploadMetadata = PhotoUploadMetadata(),
+        stage: String = "other",
+    ): Job? {
         val snapshot = _state.value
-        val route = snapshot.selectedRoute ?: return
+        val route = snapshot.selectedRoute ?: return null
         if (!routeIsActiveToday(route, snapshot.selectedDate)) {
             _state.update { it.copy(error = "Zdjęcia możesz dodać tylko w zaplanowanym zakresie kursu.") }
-            return
+            return null
         }
-        viewModelScope.launch {
+        return viewModelScope.launch {
             _state.update { it.copy(error = null) }
             runCatching { photoUploadOutbox.enqueue(route.id, uri, source, metadata, stage) }
                 .onFailure { throwable ->

app/src/main/java/pl/firmatpp/kierowca/ui/MultiplePhotoCameraScreen.kt

@@ -0,0 +1,287 @@
+package pl.firmatpp.kierowca.ui
+
+import android.content.Context
+import android.net.Uri
+import androidx.activity.compose.BackHandler
+import androidx.camera.core.ImageCapture
+import androidx.camera.core.ImageCaptureException
+import androidx.camera.view.CameraController
+import androidx.camera.view.LifecycleCameraController
+import androidx.camera.view.PreviewView
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.outlined.CameraAlt
+import androidx.compose.material.icons.outlined.CheckCircle
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import java.io.File
+import kotlinx.coroutines.launch
+import pl.firmatpp.kierowca.ui.theme.TppTheme
+
+@Composable
+internal fun MultiplePhotoCameraScreen(
+    stage: String,
+    onPhotoCaptured: suspend (Uri) -> Unit,
+    onClose: () -> Unit,
+) {
+    val context = LocalContext.current
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val coroutineScope = rememberCoroutineScope()
+    val currentOnPhotoCaptured by rememberUpdatedState(onPhotoCaptured)
+    val cameraController = remember(context) {
+        LifecycleCameraController(context).apply {
+            setEnabledUseCases(CameraController.IMAGE_CAPTURE)
+            imageCaptureMode = ImageCapture.CAPTURE_MODE_MINIMIZE_LATENCY
+        }
+    }
+    var capturedCount by remember { mutableIntStateOf(0) }
+    var pendingUploads by remember { mutableIntStateOf(0) }
+    var isCapturing by remember { mutableStateOf(false) }
+    var cameraUnavailable by remember { mutableStateOf(false) }
+    var cameraError by remember { mutableStateOf<String?>(null) }
+
+    DisposableEffect(cameraController, lifecycleOwner) {
+        runCatching {
+            cameraController.bindToLifecycle(lifecycleOwner)
+        }.onFailure {
+            cameraUnavailable = true
+            cameraError = "Nie udało się uruchomić aparatu."
+        }
+
+        onDispose {
+            cameraController.unbind()
+        }
+    }
+
+    BackHandler {
+        if (!isCapturing && pendingUploads == 0) onClose()
+    }
+
+    Box(
+        Modifier
+            .fillMaxSize()
+            .background(Color.Black),
+    ) {
+        AndroidView(
+            factory = { previewContext ->
+                PreviewView(previewContext).apply {
+                    controller = cameraController
+                    implementationMode = PreviewView.ImplementationMode.COMPATIBLE
+                    scaleType = PreviewView.ScaleType.FILL_CENTER
+                }
+            },
+            modifier = Modifier.fillMaxSize(),
+        )
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.TopCenter)
+                .background(Color.Black.copy(alpha = 0.62f))
+                .statusBarsPadding()
+                .padding(horizontal = 8.dp, vertical = 10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconButton(
+                onClick = onClose,
+                enabled = !isCapturing && pendingUploads == 0,
+            ) {
+                Icon(
+                    Icons.AutoMirrored.Outlined.ArrowBack,
+                    contentDescription = "Wróć",
+                    tint = Color.White,
+                )
+            }
+            Column {
+                Text(
+                    text = if (stage == "loading") "Zdjęcia załadunku" else "Zdjęcia rozładunku",
+                    color = Color.White,
+                    style = MaterialTheme.typography.titleMedium,
+                )
+                Text(
+                    text = if (pendingUploads > 0) {
+                        "Wykonano: $capturedCount · zapisuję: $pendingUploads"
+                    } else {
+                        "Wykonano: $capturedCount"
+                    },
+                    color = Color.White.copy(alpha = 0.78f),
+                    style = MaterialTheme.typography.bodyMedium,
+                )
+            }
+        }
+
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.BottomCenter)
+                .background(Color.Black.copy(alpha = 0.68f))
+                .navigationBarsPadding()
+                .padding(horizontal = 20.dp, vertical = 16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            cameraError?.let { message ->
+                Text(
+                    text = message,
+                    color = Color.White,
+                    style = MaterialTheme.typography.bodyMedium,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(Color(0xFF8C1D18), RoundedCornerShape(6.dp))
+                        .padding(10.dp),
+                )
+            }
+
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(72.dp),
+            ) {
+                Button(
+                    onClick = {
+                        if (isCapturing || cameraUnavailable) return@Button
+
+                        val photoFile = createMultipleCameraFile(context)
+                        val outputOptions = ImageCapture.OutputFileOptions.Builder(photoFile).build()
+                        isCapturing = true
+                        cameraController.takePicture(
+                            outputOptions,
+                            ContextCompat.getMainExecutor(context),
+                            object : ImageCapture.OnImageSavedCallback {
+                                override fun onImageSaved(outputFileResults: ImageCapture.OutputFileResults) {
+                                    isCapturing = false
+                                    cameraError = null
+                                    capturedCount += 1
+                                    pendingUploads += 1
+                                    coroutineScope.launch {
+                                        try {
+                                            currentOnPhotoCaptured(cameraFileUri(context, photoFile))
+                                        } finally {
+                                            pendingUploads = (pendingUploads - 1).coerceAtLeast(0)
+                                        }
+                                    }
+                                }
+
+                                override fun onError(exception: ImageCaptureException) {
+                                    isCapturing = false
+                                    photoFile.delete()
+                                    cameraError = "Nie udało się zapisać zdjęcia. Spróbuj ponownie."
+                                }
+                            },
+                        )
+                    },
+                    enabled = !isCapturing && !cameraUnavailable,
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .size(72.dp),
+                    shape = CircleShape,
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = Color.White,
+                        disabledContainerColor = Color.White.copy(alpha = 0.55f),
+                    ),
+                    contentPadding = ButtonDefaults.ContentPadding,
+                ) {
+                    if (isCapturing) {
+                        CircularProgressIndicator(
+                            modifier = Modifier.size(28.dp),
+                            color = TppTheme.colors.forest,
+                            strokeWidth = 3.dp,
+                        )
+                    } else {
+                        Icon(
+                            Icons.Outlined.CameraAlt,
+                            contentDescription = "Zrób zdjęcie",
+                            tint = TppTheme.colors.forest,
+                            modifier = Modifier.size(32.dp),
+                        )
+                    }
+                }
+                Button(
+                    onClick = onClose,
+                    enabled = !isCapturing && pendingUploads == 0,
+                    modifier = Modifier
+                        .align(Alignment.CenterEnd)
+                        .width(104.dp)
+                        .height(52.dp),
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = TppTheme.colors.forest,
+                    ),
+                    shape = RoundedCornerShape(6.dp),
+                    contentPadding = PaddingValues(horizontal = 8.dp, vertical = 6.dp),
+                ) {
+                    if (pendingUploads > 0) {
+                        CircularProgressIndicator(
+                            modifier = Modifier.size(16.dp),
+                            color = Color.White,
+                            strokeWidth = 2.dp,
+                        )
+                    } else {
+                        Icon(
+                            Icons.Outlined.CheckCircle,
+                            contentDescription = null,
+                            tint = Color.White,
+                            modifier = Modifier.size(18.dp),
+                        )
+                    }
+                    Text(
+                        text = if (pendingUploads > 0) "Zapisuję" else "Gotowe",
+                        color = Color.White,
+                        style = MaterialTheme.typography.labelMedium,
+                        maxLines = 1,
+                        softWrap = false,
+                        overflow = TextOverflow.Clip,
+                        modifier = Modifier.padding(start = 4.dp),
+                    )
+                }
+            }
+        }
+    }
+}
+
+private fun createMultipleCameraFile(context: Context): File {
+    val directory = File(context.cacheDir, "camera").apply { mkdirs() }
+    return File.createTempFile("ladunek-", ".jpg", directory)
+}
+
+private fun cameraFileUri(context: Context, file: File): Uri =
+    FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)

app/src/test/java/pl/firmatpp/kierowca/data/DriverLeaveApiContractTest.kt

@@ -19,6 +19,7 @@ class DriverLeaveApiContractTest {
                 "dailyNormMinutes": 480,
                 "balanceConfigured": true,
                 "overdueQuantity": 480,
+                "visibleUsagePoolCodes": ["ANNUAL", "CHILD_CARE_14"],
                 "pools": [{
                   "id": 7,
                   "poolCode": "ANNUAL",
@@ -38,7 +39,9 @@ class DriverLeaveApiContractTest {
                   "requiredFields": [],
                   "requiredDocuments": [],
                   "fieldOptions": {},
-                  "description": "Urlop rozliczany według grafiku."
+                  "description": "Urlop rozliczany według grafiku.",
+                  "financialTreatmentLabel": "Płatny według danych przekazanych przez kadry i płace.",
+                  "affectsAnnualLeaveBalance": true
                 }]
               }
             }
@@ -47,10 +50,12 @@ class DriverLeaveApiContractTest {
         )
 
         assertEquals(480, response.data.dailyNormMinutes)
+        assertEquals(listOf("ANNUAL", "CHILD_CARE_14"), response.data.visibleUsagePoolCodes)
         assertEquals(7680, response.data.pools.single().availableQuantity)
         assertEquals("URLOP", response.data.availableTypes.single().value)
         assertEquals("ANNUAL", response.data.availableTypes.single().code)
         assertTrue("hours" in response.data.availableTypes.single().requestModes)
+        assertTrue(response.data.availableTypes.single().affectsAnnualLeaveBalance)
     }
 
     @Test
@@ -64,11 +69,14 @@ class DriverLeaveApiContractTest {
               "type": "WOLNE",
               "ruleCode": "CHILD_CARE_14",
               "requestMode": "days",
-              "requestedQuantity": 480,
+              "requestedQuantity": 1,
+              "quantityUnit": "days",
               "details": {
                 "childrenBornCount": 1,
                 "childBirthDate": "2020-05-12"
               },
+              "financialTreatmentLabel": "Płatne według zasad ustawowych.",
+              "affectsAnnualLeaveBalance": false,
               "status": "pending",
               "missingDocumentTypes": ["parent_declaration"]
             }
@@ -78,6 +86,9 @@ class DriverLeaveApiContractTest {
 
         assertEquals("1", request.details["childrenBornCount"])
         assertEquals("2020-05-12", request.details["childBirthDate"])
+        assertEquals("days", request.quantityUnit)
+        assertEquals(false, request.affectsAnnualLeaveBalance)
+        assertEquals("Płatne według zasad ustawowych.", request.financialTreatmentLabel)
         assertEquals(listOf("parent_declaration"), request.missingDocumentTypes)
     }
 }

app/src/test/java/pl/firmatpp/kierowca/ui/DriverLeaveRequestUiRulesTest.kt

@@ -8,6 +8,8 @@ import org.junit.Test
 import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarDriverDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto
 import pl.firmatpp.kierowca.data.model.DriverLeavePoolDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
+import pl.firmatpp.kierowca.data.model.DriverLeaveRuleSnapshotDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveSummaryDto
 
 class DriverLeaveRequestUiRulesTest {
@@ -59,9 +61,78 @@ class DriverLeaveRequestUiRulesTest {
         assertEquals("Kierowca poprosił o anulowanie", DriverLeaveRequestUiRules.eventActionLabel("cancellation_requested"))
         assertEquals("Anulowanie zatwierdzone", DriverLeaveRequestUiRules.eventActionLabel("cancellation_approved"))
         assertEquals("Anulowanie odrzucone", DriverLeaveRequestUiRules.eventActionLabel("cancellation_rejected"))
+        assertEquals("Przywrócono urlop wypoczynkowy", DriverLeaveRequestUiRules.eventActionLabel("annual_leave_interrupted"))
         assertEquals("Aktualizacja wniosku", DriverLeaveRequestUiRules.eventActionLabel("some_raw_action"))
     }
 
+    @Test
+    fun formatsStatutoryDayLimitsAsDaysInsteadOfMinutes() {
+        val dayBasedRequest = DriverLeaveRequestDto(
+            id = "child-care",
+            dateFrom = "2026-08-03",
+            dateTo = "2026-08-03",
+            type = "CHILD_CARE_14",
+            requestMode = "days",
+            requestedQuantity = 1,
+            quantityUnit = "days",
+            status = "pending",
+        )
+        val legacyDayBasedRequest = dayBasedRequest.copy(
+            id = "force-majeure",
+            type = "FORCE_MAJEURE",
+            quantityUnit = null,
+            rule = DriverLeaveRuleSnapshotDto(
+                unit = "work_schedule",
+                poolCode = "FORCE_MAJEURE",
+            ),
+        )
+
+        assertEquals("days", DriverLeaveRequestUiRules.requestQuantityUnit(dayBasedRequest))
+        assertEquals("1 dzień", DriverLeaveRequestUiRules.formatQuantity(1, "days"))
+        assertEquals("days", DriverLeaveRequestUiRules.requestQuantityUnit(legacyDayBasedRequest))
+    }
+
+    @Test
+    fun exposesOtherStatutoryBalancesSeparatelyFromAnnualLeave() {
+        val summary = DriverLeaveSummaryDto(
+            pools = listOf(
+                annualPool(year = 2026, available = 4_800, reserved = 0, used = 0, granted = 4_800),
+                DriverLeavePoolDto(
+                    id = 31,
+                    poolCode = "CHILD_CARE_14",
+                    year = 2026,
+                    unit = "days",
+                    availableQuantity = 1,
+                    usedQuantity = 1,
+                    grantedQuantity = 2,
+                    status = "active",
+                ),
+                DriverLeavePoolDto(
+                    id = 32,
+                    poolCode = "CARE_LEAVE",
+                    year = 2026,
+                    unit = "days",
+                    availableQuantity = 5,
+                    grantedQuantity = 5,
+                    status = "active",
+                ),
+            ),
+        )
+
+        val pools = DriverLeaveRequestUiRules.otherEntitlementPools(summary)
+
+        assertEquals(listOf("CHILD_CARE_14", "CARE_LEAVE"), pools.map { it.poolCode })
+        assertEquals("Urlop opiekuńczy", DriverLeaveRequestUiRules.poolLabel("CARE_LEAVE"))
+        assertEquals("Rodzina i opieka", DriverLeaveRequestUiRules.categoryLabel("family"))
+        assertTrue(DriverLeaveRequestUiRules.isUsageVisible(summary, "ANNUAL"))
+        assertFalse(
+            DriverLeaveRequestUiRules.isUsageVisible(
+                summary.copy(visibleUsagePoolCodes = emptyList()),
+                "ANNUAL",
+            ),
+        )
+    }
+
     @Test
     fun driverCanCancelPendingAndFutureApprovedRequests() {
         val tomorrow = LocalDate.now().plusDays(1).toString()