Wydaj aplikację kierowcy 1.0.79 (132)

app/build.gradle.kts

@@ -34,8 +34,8 @@ android {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
         targetSdk = 36
-        versionCode = 127
+        versionCode = 132
-        versionName = "1.0.74"
+        versionName = "1.0.79"
         setProperty("archivesBaseName", "pl.firmatpp.kierowca")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -202,6 +202,9 @@ class DriverRepository(
         source: String,
         stage: String = "other",
         metadata: PhotoUploadMetadata = PhotoUploadMetadata(),
+        workflowVersion: String? = null,
+        workflowStepId: String? = null,
+        workflowDocumentId: String? = null,
     ): PhotoUploadResponse {
         val resolver = context.contentResolver
         val mimeType = resolver.getType(uri) ?: "image/jpeg"
@@ -222,6 +225,9 @@ class DriverRepository(
             contentSha256.toPlainTextBody(),
             sourceBody,
             stage.toPlainTextBody(),
+            workflowVersion?.toPlainTextBody(),
+            workflowStepId?.toPlainTextBody(),
+            workflowDocumentId?.toPlainTextBody(),
             metadataParts["takenAt"],
             metadataParts["latitude"],
             metadataParts["longitude"],
@@ -249,6 +255,9 @@ class DriverRepository(
             upload.contentSha256.toPlainTextBody(),
             upload.source.toPlainTextBody(),
             upload.stage.toPlainTextBody(),
+            upload.workflowVersion?.toPlainTextBody(),
+            upload.workflowStepId?.toPlainTextBody(),
+            upload.workflowDocumentId?.toPlainTextBody(),
             metadataParts["takenAt"],
             metadataParts["latitude"],
             metadataParts["longitude"],

app/src/main/java/pl/firmatpp/kierowca/data/api/MobileDriverApi.kt

@@ -216,6 +216,9 @@ interface MobileDriverApi {
         @Part("contentSha256") contentSha256: RequestBody,
         @Part("source") source: RequestBody,
         @Part("stage") stage: RequestBody?,
+        @Part("workflowVersion") workflowVersion: RequestBody?,
+        @Part("workflowStepId") workflowStepId: RequestBody?,
+        @Part("workflowDocumentId") workflowDocumentId: RequestBody?,
         @Part("takenAt") takenAt: RequestBody?,
         @Part("latitude") latitude: RequestBody?,
         @Part("longitude") longitude: RequestBody?,

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

@@ -78,6 +78,7 @@ data class DriverAppSettingsDto(
     val loadingWeightRequirement: String? = null,
     val unloadingPhotoRequirement: String? = null,
     val unloadingWeightRequirement: String? = null,
+    val routeWorkflow: DriverRouteWorkflowDto? = null,
     val dispatchSheetRemindersEnabled: Boolean? = null,
     val dispatchSheetOnFridays: Boolean? = null,
     val dispatchSheetOnLastWorkingDay: Boolean? = null,
@@ -85,9 +86,43 @@ data class DriverAppSettingsDto(
     val leaveRequests: LeaveRequestsConfigDto? = null,
 )
 
+data class DriverRouteWorkflowDto(
+    val version: String,
+    val customized: Boolean = false,
+    val loading: DriverRouteStageWorkflowDto,
+    val unloading: DriverRouteStageWorkflowDto,
+)
+
+data class DriverRouteStageWorkflowDto(
+    val steps: List<DriverRouteWorkflowStepDto> = emptyList(),
+)
+
+data class DriverRouteWorkflowStepDto(
+    val id: String,
+    val type: String,
+    val title: String,
+    val description: String = "",
+    val requirement: String = "required",
+    val documents: List<DriverRouteWorkflowDocumentDto> = emptyList(),
+)
+
+data class DriverRouteWorkflowDocumentDto(
+    val id: String,
+    val label: String,
+    val description: String = "",
+    val requirement: String = "required",
+)
+
 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(
@@ -252,6 +287,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(),
 )
@@ -508,6 +550,10 @@ data class RoutePhotoDto(
     val contentSha256: String? = null,
     val source: String,
     val stage: String = "other",
+    val workflowVersion: String? = null,
+    val workflowStepId: String? = null,
+    val workflowDocumentId: String? = null,
+    val originalName: String? = null,
     val mimeType: String?,
     val size: Long,
     val url: String,
@@ -538,6 +584,8 @@ data class StartRouteBody(
     val occurredAt: String,
     val photoClientRequestIds: List<String>,
     val loadingNotes: String? = null,
+    val workflowVersion: String? = null,
+    val completedStepIds: List<String> = emptyList(),
 )
 
 data class FinishRouteBody(
@@ -546,6 +594,8 @@ data class FinishRouteBody(
     val occurredAt: String,
     val photoClientRequestIds: List<String>,
     val unloadingNotes: String? = null,
+    val workflowVersion: String? = null,
+    val completedStepIds: List<String> = emptyList(),
 )
 
 data class RouteActionResponse(

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

@@ -21,7 +21,7 @@ import pl.firmatpp.kierowca.data.sync.DriverSyncStateEntity
         DriverRouteCacheEntity::class,
         DriverSyncStateEntity::class,
     ],
-    version = 7,
+    version = 8,
     exportSchema = false,
 )
 abstract class DriverDatabase : RoomDatabase() {
@@ -208,6 +208,16 @@ abstract class DriverDatabase : RoomDatabase() {
             }
         }
 
+        private val migration7To8 = object : Migration(7, 8) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE photo_uploads ADD COLUMN workflowVersion TEXT")
+                db.execSQL("ALTER TABLE photo_uploads ADD COLUMN workflowStepId TEXT")
+                db.execSQL("ALTER TABLE photo_uploads ADD COLUMN workflowDocumentId TEXT")
+                db.execSQL("ALTER TABLE route_actions ADD COLUMN workflowVersion TEXT")
+                db.execSQL("ALTER TABLE route_actions ADD COLUMN completedStepIdsJson TEXT NOT NULL DEFAULT '[]'")
+            }
+        }
+
         fun get(context: Context): DriverDatabase =
             instance ?: synchronized(this) {
                 instance ?: Room.databaseBuilder(
@@ -221,6 +231,7 @@ abstract class DriverDatabase : RoomDatabase() {
                     migration4To5,
                     migration5To6,
                     migration6To7,
+                    migration7To8,
                 ).build().also { instance = it }
             }
     }

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

@@ -17,6 +17,9 @@ data class PhotoUploadEntity(
     val localPath: String,
     val source: String,
     val stage: String = "other",
+    val workflowVersion: String? = null,
+    val workflowStepId: String? = null,
+    val workflowDocumentId: String? = null,
     val takenAt: String?,
     val latitude: Double?,
     val longitude: Double?,

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,12 +31,22 @@ 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",
+        workflowVersion: String? = null,
+        workflowStepId: String? = null,
+        workflowDocumentId: String? = null,
+    ): PhotoUploadEntity = withContext(Dispatchers.IO) {
         val clientRequestId = UUID.randomUUID().toString()
         val mimeType = context.contentResolver.getType(uri) ?: "image/jpeg"
         val extension = when (mimeType) {
             "image/png" -> "png"
             "image/webp" -> "webp"
+            "application/pdf" -> "pdf"
             else -> "jpg"
         }
         val uploadDir = File(context.filesDir, "photo-upload-outbox").apply { mkdirs() }
@@ -46,6 +58,9 @@ class PhotoUploadOutbox(
             localPath = localFile.absolutePath,
             source = source,
             stage = stage,
+            workflowVersion = workflowVersion,
+            workflowStepId = workflowStepId,
+            workflowDocumentId = workflowDocumentId,
             takenAt = metadata.takenAt,
             latitude = metadata.latitude,
             longitude = metadata.longitude,
@@ -58,7 +73,7 @@ class PhotoUploadOutbox(
         dao.upsert(upload)
         enqueueWorker(clientRequestId)
 
-        return upload
+        upload
     }
 
     suspend fun retry(clientRequestId: String) {

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

@@ -33,6 +33,8 @@ data class RouteActionEntity(
     val weight: Double?,
     val occurredAt: String,
     val photoClientRequestIdsJson: String,
+    val workflowVersion: String? = null,
+    val completedStepIdsJson: String = "[]",
     val status: String = RouteActionStatus.Pending,
     val attemptCount: Int = 0,
     val lastError: String? = null,

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

@@ -48,16 +48,20 @@ class RouteActionOutbox(
         loadingWeight: Double?,
         photoClientRequestIds: List<String>,
         notes: String? = null,
+        workflowVersion: String? = null,
+        completedStepIds: List<String> = emptyList(),
     ): RouteActionEntity =
-        enqueue(RouteActionType.Start, routeId, loadingWeight, photoClientRequestIds, notes)
+        enqueue(RouteActionType.Start, routeId, loadingWeight, photoClientRequestIds, notes, workflowVersion, completedStepIds)
 
     suspend fun enqueueFinish(
         routeId: String,
         unloadingWeight: Double?,
         photoClientRequestIds: List<String>,
         notes: String? = null,
+        workflowVersion: String? = null,
+        completedStepIds: List<String> = emptyList(),
     ): RouteActionEntity =
-        enqueue(RouteActionType.Finish, routeId, unloadingWeight, photoClientRequestIds, notes)
+        enqueue(RouteActionType.Finish, routeId, unloadingWeight, photoClientRequestIds, notes, workflowVersion, completedStepIds)
 
     private suspend fun enqueue(
         action: String,
@@ -65,6 +69,8 @@ class RouteActionOutbox(
         weight: Double?,
         photoClientRequestIds: List<String>,
         notes: String?,
+        workflowVersion: String?,
+        completedStepIds: List<String>,
     ): RouteActionEntity {
         dao.pruneConfirmed(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
         val entity = RouteActionEntity(
@@ -74,6 +80,8 @@ class RouteActionOutbox(
             weight = weight,
             occurredAt = Instant.now().toString(),
             photoClientRequestIdsJson = gson.toJson(photoClientRequestIds.distinct()),
+            workflowVersion = workflowVersion,
+            completedStepIdsJson = gson.toJson(completedStepIds.distinct()),
             notes = notes?.trim()?.takeIf { it.isNotEmpty() },
         )
 

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

@@ -181,6 +181,8 @@ class RouteActionWorker(
                     occurredAt = action.occurredAt,
                     photoClientRequestIds = photoClientRequestIds,
                     loadingNotes = action.notes,
+                    workflowVersion = action.workflowVersion,
+                    completedStepIds = completedStepIds(action),
                 ),
             )
             RouteActionType.Finish -> repository.finishRoute(
@@ -191,6 +193,8 @@ class RouteActionWorker(
                     occurredAt = action.occurredAt,
                     photoClientRequestIds = photoClientRequestIds,
                     unloadingNotes = action.notes,
+                    workflowVersion = action.workflowVersion,
+                    completedStepIds = completedStepIds(action),
                 ),
             )
             else -> error("Nieznana akcja kursu: ${action.action}")
@@ -204,6 +208,14 @@ class RouteActionWorker(
             .filter { it.isNotBlank() }
             .distinct()
 
+    private fun completedStepIds(action: RouteActionEntity): List<String> =
+        runCatching {
+            gson.fromJson(action.completedStepIdsJson, Array<String>::class.java)?.toList().orEmpty()
+        }.getOrDefault(emptyList())
+            .map { it.trim() }
+            .filter { it.isNotBlank() }
+            .distinct()
+
     companion object {
         const val KEY_CLIENT_ACTION_ID = "clientActionId"
 

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

@@ -106,6 +106,9 @@ 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" }

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

@@ -12,6 +12,8 @@ import java.time.temporal.ChronoUnit
 import java.util.Locale
 import kotlin.math.abs
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
+import pl.firmatpp.kierowca.data.model.DriverRouteWorkflowDto
+import pl.firmatpp.kierowca.data.model.DriverRouteWorkflowStepDto
 import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
 import pl.firmatpp.kierowca.data.model.TachographReminderDto
@@ -278,6 +280,75 @@ fun routeStageRequirementIsVisible(requirement: String): Boolean =
 fun routeStageRequirementIsRequired(requirement: String): Boolean =
     normalizeRouteStageRequirement(requirement) == RouteStageRequirement.Required
 
+object RouteWorkflowStepType {
+    const val Confirmation = "confirmation"
+    const val Weight = "weight"
+    const val Photos = "photos"
+}
+
+fun routeWorkflowSteps(workflow: DriverRouteWorkflowDto?, stage: String): List<DriverRouteWorkflowStepDto> =
+    when (stage) {
+        "loading" -> workflow?.loading?.steps
+        "unloading" -> workflow?.unloading?.steps
+        else -> null
+    }.orEmpty().filter { routeStageRequirementIsVisible(it.requirement) }
+
+fun routeWorkflowSubmitBlocker(
+    workflow: DriverRouteWorkflowDto?,
+    stage: String,
+    completedStepIds: Set<String>,
+    weightText: String,
+    serverPhotos: List<RoutePhotoDto>,
+    localUploads: List<PhotoUploadEntity>,
+): String? {
+    val steps = routeWorkflowSteps(workflow, stage)
+    if (steps.isEmpty()) return null
+    val normalizedWeight = parseRouteWeightTons(weightText)
+
+    for (step in steps) {
+        val required = routeStageRequirementIsRequired(step.requirement)
+        when (step.type) {
+            RouteWorkflowStepType.Confirmation -> if (required && step.id !in completedStepIds) {
+                return "Potwierdź krok: ${step.title}."
+            }
+            RouteWorkflowStepType.Weight -> when {
+                required && weightText.isBlank() -> return "Uzupełnij krok: ${step.title}."
+                weightText.isNotBlank() && normalizedWeight == null -> return "Podaj poprawny tonaż."
+                weightText.isNotBlank() && normalizedWeight != null && normalizedWeight <= 0.0 -> return "Tonaż musi być większy od zera."
+                weightText.isNotBlank() && normalizedWeight != null && normalizedWeight > routeWeightMaxTons -> return "Tonaż nie może przekraczać 999,999 t."
+            }
+            RouteWorkflowStepType.Photos -> if (
+                required &&
+                serverPhotos.none { it.workflowDocumentId.isNullOrBlank() } &&
+                localUploads.none {
+                    it.workflowDocumentId.isNullOrBlank() &&
+                        it.status != PhotoUploadStatus.Cancelled.storageValue &&
+                        it.status != PhotoUploadStatus.FailedPermanent.storageValue
+                }
+            ) {
+                return "Dodaj zdjęcie dla kroku: ${step.title}."
+            }
+        }
+
+        for (document in step.documents.filter { routeStageRequirementIsRequired(it.requirement) }) {
+            val serverPresent = serverPhotos.any {
+                it.workflowStepId == step.id && it.workflowDocumentId == document.id
+            }
+            val localPresent = localUploads.any {
+                it.workflowStepId == step.id &&
+                    it.workflowDocumentId == document.id &&
+                    it.status != PhotoUploadStatus.Cancelled.storageValue &&
+                    it.status != PhotoUploadStatus.FailedPermanent.storageValue
+            }
+            if (!serverPresent && !localPresent) {
+                return "Dodaj dokument „${document.label}” w kroku „${step.title}”."
+            }
+        }
+    }
+
+    return null
+}
+
 fun normalizeRouteStageNotes(value: String): String = value.take(routeStageNotesMaxLength)
 
 fun parseRouteWeightTons(weightText: String): Double? {

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

@@ -39,6 +39,7 @@ import pl.firmatpp.kierowca.data.model.DriverLeaveForecastDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
 import pl.firmatpp.kierowca.data.model.DriverLeaveSummaryDto
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
+import pl.firmatpp.kierowca.data.model.DriverRouteWorkflowDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
 import pl.firmatpp.kierowca.data.model.TachographReminderDto
 import pl.firmatpp.kierowca.data.model.driverLifecycleStatus
@@ -72,6 +73,16 @@ enum class DriverScreen { Initializing, Phone, Otp, Routes, Profile, Diagnostics
 
 enum class ServerConnectionState { Unknown, Reachable, Degraded }
 
+data class PreparingPhotoUpload(
+    val id: String,
+    val routeId: String,
+    val uri: Uri,
+    val stage: String,
+    val workflowStepId: String?,
+    val workflowDocumentId: String?,
+    val createdAtEpochMillis: Long = System.currentTimeMillis(),
+)
+
 data class DriverUiState(
     val screen: DriverScreen = DriverScreen.Initializing,
     val loading: Boolean = true,
@@ -98,6 +109,7 @@ data class DriverUiState(
     val loadingWeightRequirement: String = RouteStageRequirement.Required,
     val unloadingPhotoRequirement: String = RouteStageRequirement.Required,
     val unloadingWeightRequirement: String = RouteStageRequirement.Required,
+    val routeWorkflow: DriverRouteWorkflowDto? = null,
     val notifyNewRoutes: Boolean = false,
     val routeProgressNotificationEnabled: Boolean = true,
     val notificationPermissionDenied: Boolean = false,
@@ -105,9 +117,11 @@ data class DriverUiState(
     val selectedPhoto: RoutePhotoDto? = null,
     val routeStageWeightText: String = "",
     val routeStageNotesText: String = "",
+    val routeStageCompletedStepIds: Set<String> = emptySet(),
     val routeActions: List<RouteActionEntity> = emptyList(),
     val visibleRouteActions: List<RouteActionEntity> = emptyList(),
     val photoUploads: List<PhotoUploadEntity> = emptyList(),
+    val preparingPhotoUploads: List<PreparingPhotoUpload> = emptyList(),
     val queuedPhotoUploads: List<PhotoUploadEntity> = emptyList(),
     val dispatchSheetReminder: DispatchSheetReminderDto? = null,
     val tachographReminder: TachographReminderDto? = null,
@@ -613,6 +627,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         loadingWeightRequirement = normalizeRouteStageRequirement(settings?.loadingWeightRequirement),
                         unloadingPhotoRequirement = normalizeRouteStageRequirement(settings?.unloadingPhotoRequirement),
                         unloadingWeightRequirement = normalizeRouteStageRequirement(settings?.unloadingWeightRequirement),
+                        routeWorkflow = settings?.routeWorkflow,
                         leaveRequestsConfig = settings?.leaveRequests?.let { config ->
                             LeaveRequestsConfig(enabled = config.enabled, types = config.types)
                         },
@@ -1478,19 +1493,60 @@ 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",
+        workflowStepId: String? = null,
+        workflowDocumentId: String? = null,
+    ): 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 {
+        val preparation = PreparingPhotoUpload(
-            _state.update { it.copy(error = null) }
+            id = UUID.randomUUID().toString(),
-            runCatching { photoUploadOutbox.enqueue(route.id, uri, source, metadata, stage) }
+            routeId = route.id,
-                .onFailure { throwable ->
+            uri = uri,
-                    _state.update { it.withApiError(throwable) }
+            stage = stage,
+            workflowStepId = workflowStepId,
+            workflowDocumentId = workflowDocumentId,
+        )
+        _state.update {
+            it.copy(
+                preparingPhotoUploads = it.preparingPhotoUploads + preparation,
+                error = null,
+            )
+        }
+        return viewModelScope.launch {
+            try {
+                runCatching {
+                    photoUploadOutbox.enqueue(
+                        routeId = route.id,
+                        uri = uri,
+                        source = source,
+                        metadata = metadata,
+                        stage = stage,
+                        workflowVersion = snapshot.routeWorkflow?.version,
+                        workflowStepId = workflowStepId,
+                        workflowDocumentId = workflowDocumentId,
+                    )
                 }
+                    .onFailure { throwable ->
+                        _state.update { it.withApiError(throwable) }
+                    }
+            } finally {
+                _state.update {
+                    it.copy(
+                        preparingPhotoUploads = it.preparingPhotoUploads.filterNot { item ->
+                            item.id == preparation.id
+                        },
+                    )
+                }
+            }
         }
     }
 
@@ -1505,7 +1561,9 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             _state.update { it.copy(error = "Załadunek nie jest dostępny poza zaplanowanym zakresem kursu.") }
             return
         }
-        val targetScreen = if (
+        val targetScreen = if (snapshot.routeWorkflow != null) {
+            DriverScreen.StartRoute
+        } else if (
             !routeStageRequirementIsVisible(snapshot.loadingPhotoRequirement) &&
             routeStageRequirementIsVisible(snapshot.loadingWeightRequirement)
         ) DriverScreen.LoadingWeight else DriverScreen.StartRoute
@@ -1514,6 +1572,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                 screen = targetScreen,
                 routeStageWeightText = "",
                 routeStageNotesText = route.loadingNotes.orEmpty(),
+                routeStageCompletedStepIds = emptySet(),
                 feedback = null,
                 error = null,
             )
@@ -1559,6 +1618,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                 screen = DriverScreen.FinishRoute,
                 routeStageWeightText = route.unloadingWeight?.toString().orEmpty(),
                 routeStageNotesText = route.unloadingNotes.orEmpty(),
+                routeStageCompletedStepIds = emptySet(),
                 feedback = null,
                 error = null,
             )
@@ -1574,6 +1634,18 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         _state.update { it.copy(routeStageNotesText = normalizeRouteStageNotes(value)) }
     }
 
+    fun toggleRouteStageStep(stepId: String, completed: Boolean) {
+        _state.update {
+            it.copy(
+                routeStageCompletedStepIds = if (completed) {
+                    it.routeStageCompletedStepIds + stepId
+                } else {
+                    it.routeStageCompletedStepIds - stepId
+                },
+            )
+        }
+    }
+
     fun correctFailedRouteAction() {
         val snapshot = _state.value
         val action = (snapshot.visibleRouteActions + snapshot.routeActions)
@@ -1672,7 +1744,16 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         val stageUploads = routeStageUsableUploads(
             snapshot.photoUploads.filter { normalizedRoutePhotoStage(it.stage) == stage },
         )
-        val submitBlocker = if (stage == "loading") {
+        val submitBlocker = if (snapshot.routeWorkflow != null) {
+            routeWorkflowSubmitBlocker(
+                workflow = snapshot.routeWorkflow,
+                stage = stage,
+                completedStepIds = snapshot.routeStageCompletedStepIds,
+                weightText = snapshot.routeStageWeightText,
+                serverPhotos = stagePhotos,
+                localUploads = stageUploads,
+            )
+        } else if (stage == "loading") {
             loadingWeightSubmitBlocker(
                 weightText = snapshot.routeStageWeightText,
                 serverPhotoCount = stagePhotos.size,
@@ -1695,7 +1776,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             return
         }
 
-        val photoClientRequestIds = if (routeStageRequirementIsVisible(photoRequirement)) {
+        val photoClientRequestIds = if (snapshot.routeWorkflow != null || routeStageRequirementIsVisible(photoRequirement)) {
             (stagePhotos.mapNotNull { it.clientRequestId } + stageUploads.map { it.clientRequestId })
             .map { it.trim() }
             .filter { it.isNotBlank() }
@@ -1714,7 +1795,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             runCatching {
                 val updatedRoute = when (stage) {
                     "loading" -> {
-                        routeActionOutbox.enqueueStart(route.id, weight, photoClientRequestIds, notes)
+                        routeActionOutbox.enqueueStart(
+                            route.id,
+                            weight,
+                            photoClientRequestIds,
+                            notes,
+                            snapshot.routeWorkflow?.version,
+                            snapshot.routeStageCompletedStepIds.toList(),
+                        )
                         route.copy(
                             status = "W TRAKCIE",
                             driverStatus = "W TRAKCIE",
@@ -1725,7 +1813,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         )
                     }
                     "unloading" -> {
-                        routeActionOutbox.enqueueFinish(route.id, weight, photoClientRequestIds, notes)
+                        routeActionOutbox.enqueueFinish(
+                            route.id,
+                            weight,
+                            photoClientRequestIds,
+                            notes,
+                            snapshot.routeWorkflow?.version,
+                            snapshot.routeStageCompletedStepIds.toList(),
+                        )
                         route.copy(
                             status = "ZAKOŃCZONA",
                             driverStatus = "ZAKOŃCZONA",
@@ -1746,6 +1841,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                         routes = it.routes.map { item -> if (item.id == route.id) updatedRoute else item },
                         routeStageWeightText = "",
                         routeStageNotesText = "",
+                        routeStageCompletedStepIds = emptySet(),
                         feedback = if (stage == "loading") {
                             if (snapshot.isOnline) "Potwierdzam załadunek z serwerem." else "Załadunek zapisano w telefonie. Wyślemy go po odzyskaniu internetu."
                         } else {
@@ -1955,7 +2051,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                 DriverScreen.Detail -> {
                     photoUploadsJob?.cancel()
                     routeActionsJob?.cancel()
-                    it.copy(screen = DriverScreen.Routes, selectedRoute = null, routeActions = emptyList(), photoUploads = emptyList(), feedback = null)
+                    it.copy(
+                        screen = DriverScreen.Routes,
+                        selectedRoute = null,
+                        routeActions = emptyList(),
+                        photoUploads = emptyList(),
+                        preparingPhotoUploads = emptyList(),
+                        feedback = null,
+                    )
                 }
                 DriverScreen.Profile -> it.copy(screen = DriverScreen.Routes)
                 DriverScreen.Diagnostics -> it.copy(screen = DriverScreen.Profile)

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",
@@ -49,6 +50,7 @@ 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)

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

@@ -124,6 +124,13 @@ class DriverLeaveRequestUiRulesTest {
         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

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

@@ -6,6 +6,10 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
+import pl.firmatpp.kierowca.data.model.DriverRouteStageWorkflowDto
+import pl.firmatpp.kierowca.data.model.DriverRouteWorkflowDocumentDto
+import pl.firmatpp.kierowca.data.model.DriverRouteWorkflowDto
+import pl.firmatpp.kierowca.data.model.DriverRouteWorkflowStepDto
 import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
 import pl.firmatpp.kierowca.data.model.TachographReminderDto
@@ -18,6 +22,52 @@ import pl.firmatpp.kierowca.data.upload.RouteActionType
 class DriverUiRulesTest {
     private val today = LocalDate.parse("2026-06-30")
 
+    @Test
+    fun customWorkflowBlocksUntilConfirmationAndRequiredDocumentArePresent() {
+        val workflow = DriverRouteWorkflowDto(
+            version = "workflow-v1",
+            customized = true,
+            loading = DriverRouteStageWorkflowDto(
+                steps = listOf(
+                    DriverRouteWorkflowStepDto(
+                        id = "secure-load",
+                        type = RouteWorkflowStepType.Confirmation,
+                        title = "Sprawdź zabezpieczenie ładunku",
+                        requirement = RouteStageRequirement.Required,
+                        documents = listOf(
+                            DriverRouteWorkflowDocumentDto(
+                                id = "cmr",
+                                label = "List przewozowy CMR",
+                                requirement = RouteStageRequirement.Required,
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+            unloading = DriverRouteStageWorkflowDto(),
+        )
+
+        assertEquals(
+            "Potwierdź krok: Sprawdź zabezpieczenie ładunku.",
+            routeWorkflowSubmitBlocker(workflow, "loading", emptySet(), "", emptyList(), emptyList()),
+        )
+        assertEquals(
+            "Dodaj dokument „List przewozowy CMR” w kroku „Sprawdź zabezpieczenie ładunku”.",
+            routeWorkflowSubmitBlocker(workflow, "loading", setOf("secure-load"), "", emptyList(), emptyList()),
+        )
+        assertEquals(
+            null,
+            routeWorkflowSubmitBlocker(
+                workflow,
+                "loading",
+                setOf("secure-load"),
+                "",
+                listOf(photo("cmr-photo", "loading").copy(workflowStepId = "secure-load", workflowDocumentId = "cmr")),
+                emptyList(),
+            ),
+        )
+    }
+
     @Test
     fun disabledRouteLocationNeverStartsTracking() {
         assertFalse(shouldTrackRouteLocation(RouteLocationMode.Disabled, optionalLocationEnabled = true, hasLocationPermission = true))