Compare commits

...
13 Commits
15 changed files with 2651 additions and 119 deletions
+1
View File
@@ -1,4 +1,5 @@
.gradle/ .gradle/
.kotlin/
build/ build/
local.properties local.properties
app/google-services.json app/google-services.json
+2 -2
View File
@@ -34,8 +34,8 @@ android {
applicationId = "pl.firmatpp.kierowca" applicationId = "pl.firmatpp.kierowca"
minSdk = 26 minSdk = 26
targetSdk = 36 targetSdk = 36
versionCode = 122 versionCode = 128
versionName = "1.0.69" versionName = "1.0.75"
setProperty("archivesBaseName", "pl.firmatpp.kierowca") setProperty("archivesBaseName", "pl.firmatpp.kierowca")
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -2,6 +2,7 @@ package pl.firmatpp.kierowca.data
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.provider.OpenableColumns
import java.io.File import java.io.File
import java.security.MessageDigest import java.security.MessageDigest
import java.util.UUID import java.util.UUID
@@ -12,6 +13,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
import pl.firmatpp.kierowca.data.api.ApiFactory import pl.firmatpp.kierowca.data.api.ApiFactory
import pl.firmatpp.kierowca.data.api.MobileDriverApi import pl.firmatpp.kierowca.data.api.MobileDriverApi
import pl.firmatpp.kierowca.data.model.BootstrapResponse import pl.firmatpp.kierowca.data.model.BootstrapResponse
import pl.firmatpp.kierowca.data.model.AcknowledgeTachographReminderBody
import pl.firmatpp.kierowca.data.model.BroadcastAuthBody import pl.firmatpp.kierowca.data.model.BroadcastAuthBody
import pl.firmatpp.kierowca.data.model.BroadcastAuthResponse import pl.firmatpp.kierowca.data.model.BroadcastAuthResponse
import pl.firmatpp.kierowca.data.model.CancelLeaveRequestBody import pl.firmatpp.kierowca.data.model.CancelLeaveRequestBody
@@ -19,8 +21,12 @@ import pl.firmatpp.kierowca.data.model.DispatchSheetUploadResponse
import pl.firmatpp.kierowca.data.model.CreateLeaveRequestBody import pl.firmatpp.kierowca.data.model.CreateLeaveRequestBody
import pl.firmatpp.kierowca.data.model.DriverDto import pl.firmatpp.kierowca.data.model.DriverDto
import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto
import pl.firmatpp.kierowca.data.model.DriverLeaveDocumentDto
import pl.firmatpp.kierowca.data.model.DriverLeaveForecastDto
import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
import pl.firmatpp.kierowca.data.model.DriverLeaveSummaryDto
import pl.firmatpp.kierowca.data.model.FinishRouteBody import pl.firmatpp.kierowca.data.model.FinishRouteBody
import pl.firmatpp.kierowca.data.model.LeaveForecastBody
import pl.firmatpp.kierowca.data.model.NotificationPreferencesBody import pl.firmatpp.kierowca.data.model.NotificationPreferencesBody
import pl.firmatpp.kierowca.data.model.NotificationPreferencesDto import pl.firmatpp.kierowca.data.model.NotificationPreferencesDto
import pl.firmatpp.kierowca.data.model.OtpResponse import pl.firmatpp.kierowca.data.model.OtpResponse
@@ -33,6 +39,7 @@ import pl.firmatpp.kierowca.data.model.RoutePointsResponse
import pl.firmatpp.kierowca.data.model.RouteResponse import pl.firmatpp.kierowca.data.model.RouteResponse
import pl.firmatpp.kierowca.data.model.StartRouteBody import pl.firmatpp.kierowca.data.model.StartRouteBody
import pl.firmatpp.kierowca.data.model.SyncStateResponse import pl.firmatpp.kierowca.data.model.SyncStateResponse
import pl.firmatpp.kierowca.data.model.TachographReminderDto
import pl.firmatpp.kierowca.data.model.VerifyOtpBody import pl.firmatpp.kierowca.data.model.VerifyOtpBody
import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadEntity import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadEntity
import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity
@@ -56,24 +63,105 @@ class DriverRepository(
suspend fun bootstrap(date: String? = null): BootstrapResponse = suspend fun bootstrap(date: String? = null): BootstrapResponse =
api.bootstrap(authHeader(requireToken()), date) api.bootstrap(authHeader(requireToken()), date)
suspend fun acknowledgeTachographReminder(taskIds: List<String>): TachographReminderDto =
api.acknowledgeTachographReminder(
authHeader(requireToken()),
AcknowledgeTachographReminderBody(taskIds),
).tachographReminder
suspend fun route(routeId: String): RouteResponse = suspend fun route(routeId: String): RouteResponse =
api.route(authHeader(requireToken()), routeId) api.route(authHeader(requireToken()), routeId)
suspend fun leaveRequests(): List<DriverLeaveRequestDto> = suspend fun leaveRequests(): List<DriverLeaveRequestDto> =
api.leaveRequests(authHeader(requireToken())).data api.leaveRequests(authHeader(requireToken())).data
suspend fun leaveSummary(): DriverLeaveSummaryDto =
api.leaveSummary(authHeader(requireToken())).data
suspend fun leaveForecast(
dateFrom: String,
dateTo: String,
type: String,
requestMode: String,
requestedQuantity: Int?,
details: Map<String, String>,
): DriverLeaveForecastDto =
api.leaveForecast(
authHeader(requireToken()),
LeaveForecastBody(type, dateFrom, dateTo, requestMode, requestedQuantity, details),
).data
suspend fun leaveCalendar(from: String, to: String): List<DriverLeaveCalendarEntryDto> = suspend fun leaveCalendar(from: String, to: String): List<DriverLeaveCalendarEntryDto> =
api.leaveCalendar(authHeader(requireToken()), from, to).data api.leaveCalendar(authHeader(requireToken()), from, to).data
suspend fun leaveRequest(id: String): DriverLeaveRequestDto = suspend fun leaveRequest(id: String): DriverLeaveRequestDto =
api.leaveRequest(authHeader(requireToken()), id).data api.leaveRequest(authHeader(requireToken()), id).data
suspend fun createLeaveRequest(dateFrom: String, dateTo: String, type: String, note: String?): DriverLeaveRequestDto = suspend fun createLeaveRequest(
api.createLeaveRequest(authHeader(requireToken()), CreateLeaveRequestBody(dateFrom, dateTo, type, note)).data dateFrom: String,
dateTo: String,
type: String,
requestMode: String,
requestedQuantity: Int?,
details: Map<String, String>,
idempotencyKey: String,
note: String?,
): DriverLeaveRequestDto =
api.createLeaveRequest(
authHeader(requireToken()),
CreateLeaveRequestBody(
dateFrom = dateFrom,
dateTo = dateTo,
type = type,
requestMode = requestMode,
requestedQuantity = requestedQuantity,
details = details,
idempotencyKey = idempotencyKey,
note = note,
),
).data
suspend fun cancelLeaveRequest(id: String, expectedVersion: Long, comment: String? = null): DriverLeaveRequestDto = suspend fun cancelLeaveRequest(id: String, expectedVersion: Long, comment: String? = null): DriverLeaveRequestDto =
api.cancelLeaveRequest(authHeader(requireToken()), id, CancelLeaveRequestBody(comment, expectedVersion)).data api.cancelLeaveRequest(authHeader(requireToken()), id, CancelLeaveRequestBody(comment, expectedVersion)).data
suspend fun leaveDocuments(id: String): List<DriverLeaveDocumentDto> =
api.leaveDocuments(authHeader(requireToken()), id).data
suspend fun uploadLeaveDocument(id: String, documentType: String, uri: Uri): DriverLeaveDocumentDto {
val resolver = context.contentResolver
val mimeType = resolver.getType(uri) ?: "application/octet-stream"
val fileMetadata = resolver.query(
uri,
arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE),
null,
null,
null,
)?.use { cursor ->
if (!cursor.moveToFirst()) {
null
} else {
cursor.getString(0) to cursor.getLong(1)
}
}
if ((fileMetadata?.second ?: 0L) > 20L * 1024L * 1024L) {
error("Dokument jest za duży. Maksymalny rozmiar pliku to 20 MB.")
}
val bytes = resolver.openInputStream(uri)?.use { it.readBytes() }
?: error("Nie można odczytać wybranego dokumentu.")
val originalName = fileMetadata?.first
?.takeIf { it.isNotBlank() }
?: "dokument"
val body = bytes.toRequestBody(mimeType.toMediaTypeOrNull())
val file = MultipartBody.Part.createFormData("file", originalName, body)
return api.uploadLeaveDocument(
authHeader(requireToken()),
id,
file,
documentType.toPlainTextBody(),
).data
}
suspend fun completeRoute(routeId: String) = suspend fun completeRoute(routeId: String) =
api.completeRoute(authHeader(requireToken()), routeId) api.completeRoute(authHeader(requireToken()), routeId)
@@ -3,6 +3,8 @@ package pl.firmatpp.kierowca.data.api
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody import okhttp3.RequestBody
import pl.firmatpp.kierowca.data.model.BootstrapResponse import pl.firmatpp.kierowca.data.model.BootstrapResponse
import pl.firmatpp.kierowca.data.model.AcknowledgeTachographReminderBody
import pl.firmatpp.kierowca.data.model.AcknowledgeTachographReminderResponse
import pl.firmatpp.kierowca.data.model.BroadcastAuthBody import pl.firmatpp.kierowca.data.model.BroadcastAuthBody
import pl.firmatpp.kierowca.data.model.BroadcastAuthResponse import pl.firmatpp.kierowca.data.model.BroadcastAuthResponse
import pl.firmatpp.kierowca.data.model.CancelLeaveRequestBody import pl.firmatpp.kierowca.data.model.CancelLeaveRequestBody
@@ -11,9 +13,14 @@ import pl.firmatpp.kierowca.data.model.CreateLeaveRequestBody
import pl.firmatpp.kierowca.data.model.DispatchSheetUploadResponse import pl.firmatpp.kierowca.data.model.DispatchSheetUploadResponse
import pl.firmatpp.kierowca.data.model.FinishRouteBody import pl.firmatpp.kierowca.data.model.FinishRouteBody
import pl.firmatpp.kierowca.data.model.LeaveCalendarResponse import pl.firmatpp.kierowca.data.model.LeaveCalendarResponse
import pl.firmatpp.kierowca.data.model.LeaveDocumentListResponse
import pl.firmatpp.kierowca.data.model.LeaveDocumentResponse
import pl.firmatpp.kierowca.data.model.LeaveForecastBody
import pl.firmatpp.kierowca.data.model.LeaveForecastResponse
import pl.firmatpp.kierowca.data.model.LeaveRequestListResponse import pl.firmatpp.kierowca.data.model.LeaveRequestListResponse
import pl.firmatpp.kierowca.data.model.LeaveRequestResponse import pl.firmatpp.kierowca.data.model.LeaveRequestResponse
import pl.firmatpp.kierowca.data.model.LeaveRequestTypesResponse import pl.firmatpp.kierowca.data.model.LeaveRequestTypesResponse
import pl.firmatpp.kierowca.data.model.LeaveSummaryResponse
import pl.firmatpp.kierowca.data.model.OtpResponse import pl.firmatpp.kierowca.data.model.OtpResponse
import pl.firmatpp.kierowca.data.model.NotificationPreferencesBody import pl.firmatpp.kierowca.data.model.NotificationPreferencesBody
import pl.firmatpp.kierowca.data.model.NotificationPreferencesDto import pl.firmatpp.kierowca.data.model.NotificationPreferencesDto
@@ -67,11 +74,28 @@ interface MobileDriverApi {
@Query("date") date: String?, @Query("date") date: String?,
): BootstrapResponse ): BootstrapResponse
@POST("mobile/driver/tachograph-reminder/acknowledge")
suspend fun acknowledgeTachographReminder(
@Header("Authorization") authorization: String,
@Body body: AcknowledgeTachographReminderBody,
): AcknowledgeTachographReminderResponse
@GET("mobile/driver/leave-request-types") @GET("mobile/driver/leave-request-types")
suspend fun leaveRequestTypes( suspend fun leaveRequestTypes(
@Header("Authorization") authorization: String, @Header("Authorization") authorization: String,
): LeaveRequestTypesResponse ): LeaveRequestTypesResponse
@GET("mobile/driver/leave-summary")
suspend fun leaveSummary(
@Header("Authorization") authorization: String,
): LeaveSummaryResponse
@POST("mobile/driver/leave-forecast")
suspend fun leaveForecast(
@Header("Authorization") authorization: String,
@Body body: LeaveForecastBody,
): LeaveForecastResponse
@GET("mobile/driver/leave-requests") @GET("mobile/driver/leave-requests")
suspend fun leaveRequests( suspend fun leaveRequests(
@Header("Authorization") authorization: String, @Header("Authorization") authorization: String,
@@ -96,6 +120,21 @@ interface MobileDriverApi {
@Path("id") id: String, @Path("id") id: String,
): LeaveRequestResponse ): LeaveRequestResponse
@GET("mobile/driver/leave-requests/{id}/documents")
suspend fun leaveDocuments(
@Header("Authorization") authorization: String,
@Path("id") id: String,
): LeaveDocumentListResponse
@Multipart
@POST("mobile/driver/leave-requests/{id}/documents")
suspend fun uploadLeaveDocument(
@Header("Authorization") authorization: String,
@Path("id") id: String,
@Part file: MultipartBody.Part,
@Part("documentType") documentType: RequestBody,
): LeaveDocumentResponse
@POST("mobile/driver/leave-requests/{id}/cancel") @POST("mobile/driver/leave-requests/{id}/cancel")
suspend fun cancelLeaveRequest( suspend fun cancelLeaveRequest(
@Header("Authorization") authorization: String, @Header("Authorization") authorization: String,
@@ -47,6 +47,7 @@ data class BootstrapResponse(
val routes: RoutesBucketDto, val routes: RoutesBucketDto,
val driverAppSettings: DriverAppSettingsDto?, val driverAppSettings: DriverAppSettingsDto?,
val dispatchSheetReminder: DispatchSheetReminderDto? = null, val dispatchSheetReminder: DispatchSheetReminderDto? = null,
val tachographReminder: TachographReminderDto? = null,
val notificationPreferences: NotificationPreferencesDto? = null, val notificationPreferences: NotificationPreferencesDto? = null,
val realtime: RealtimeConfigDto? = null, val realtime: RealtimeConfigDto? = null,
val syncState: SyncStateResponse? = null, val syncState: SyncStateResponse? = null,
@@ -80,12 +81,20 @@ data class DriverAppSettingsDto(
val dispatchSheetRemindersEnabled: Boolean? = null, val dispatchSheetRemindersEnabled: Boolean? = null,
val dispatchSheetOnFridays: Boolean? = null, val dispatchSheetOnFridays: Boolean? = null,
val dispatchSheetOnLastWorkingDay: Boolean? = null, val dispatchSheetOnLastWorkingDay: Boolean? = null,
val tachographRemindersEnabled: Boolean? = null,
val leaveRequests: LeaveRequestsConfigDto? = null, val leaveRequests: LeaveRequestsConfigDto? = null,
) )
data class LeaveRequestsConfigDto( data class LeaveRequestsConfigDto(
val enabled: Boolean = false, val enabled: Boolean = false,
val types: List<String> = listOf("URLOP"), val types: List<String> = listOf("URLOP"),
val usagePoolCodes: List<String> = listOf(
"ANNUAL",
"ANNUAL_DISABILITY",
"FORCE_MAJEURE",
"CHILD_CARE_14",
"CARE_LEAVE",
),
) )
data class DispatchSheetReminderDto( data class DispatchSheetReminderDto(
@@ -99,6 +108,30 @@ data class DispatchSheetReminderDto(
val canUpload: Boolean = false, val canUpload: Boolean = false,
) )
data class TachographReminderDto(
val enabled: Boolean = false,
val visible: Boolean = false,
val title: String? = null,
val message: String? = null,
val confirmationLabel: String? = null,
val tasks: List<TachographReminderTaskDto>? = null,
)
data class TachographReminderTaskDto(
val id: String,
val type: String,
val label: String,
)
data class AcknowledgeTachographReminderBody(
val taskIds: List<String>,
)
data class AcknowledgeTachographReminderResponse(
val ok: Boolean,
val tachographReminder: TachographReminderDto,
)
data class DispatchSheetPhotoDto( data class DispatchSheetPhotoDto(
val id: String, val id: String,
val driverId: String, val driverId: String,
@@ -197,13 +230,111 @@ data class LeaveRequestTypesResponse(
data class LeaveRequestTypeDto( data class LeaveRequestTypeDto(
val value: String, val value: String,
val code: String? = null,
val ruleCode: String? = null,
val label: String, val label: String,
val category: String? = null,
val unit: String? = null,
val poolCode: String? = null,
val requestModes: List<String> = listOf("days"),
val requiredFields: List<String> = emptyList(),
val requiredDocuments: List<String> = emptyList(),
val fieldOptions: Map<String, Map<String, String>> = emptyMap(),
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,
)
data class LeaveSummaryResponse(
val data: DriverLeaveSummaryDto,
)
data class DriverLeaveSummaryDto(
val pools: List<DriverLeavePoolDto> = emptyList(),
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(),
)
data class DriverLeavePoolDto(
val id: Int,
val poolCode: String,
val year: Int,
val unit: String,
val calculatedQuantity: Int = 0,
val confirmedQuantity: Int? = null,
val availableQuantity: Int = 0,
val reservedQuantity: Int = 0,
val usedQuantity: Int = 0,
val grantedQuantity: Int = 0,
val overdue: Boolean = false,
val status: String,
)
data class DriverLeaveReminderDto(
val code: String,
val message: String,
val poolId: Int? = null,
)
data class LeaveForecastBody(
val type: String,
val dateFrom: String,
val dateTo: String,
val requestMode: String,
val requestedQuantity: Int? = null,
val details: Map<String, String> = emptyMap(),
)
data class LeaveForecastResponse(
val data: DriverLeaveForecastDto,
)
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,
val requestedQuantity: Int = 0,
val availableQuantity: Int = 0,
val balanceConfigured: Boolean = false,
val sufficientBalance: Boolean = true,
val pools: List<DriverLeavePoolDto> = emptyList(),
)
data class DriverLeaveForecastDayDto(
val date: String,
val quantity: Int,
val source: String? = null,
) )
data class CreateLeaveRequestBody( data class CreateLeaveRequestBody(
val dateFrom: String, val dateFrom: String,
val dateTo: String, val dateTo: String,
val type: String, val type: String,
val requestMode: String = "days",
val requestedQuantity: Int? = null,
val details: Map<String, String> = emptyMap(),
val idempotencyKey: String? = null,
val note: String?, val note: String?,
) )
@@ -218,7 +349,13 @@ data class DriverLeaveRequestDto(
val dateFrom: String?, val dateFrom: String?,
val dateTo: String?, val dateTo: String?,
val type: String, val type: String,
val ruleCode: String? = null,
val typeLabel: String? = null, 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, val note: String? = null,
val status: String, val status: String,
val version: Long = 1, val version: Long = 1,
@@ -229,6 +366,65 @@ data class DriverLeaveRequestDto(
val decidedAt: String? = null, val decidedAt: String? = null,
val decisionComment: String? = null, val decisionComment: String? = null,
val events: List<DriverLeaveRequestEventDto> = emptyList(), val events: List<DriverLeaveRequestEventDto> = emptyList(),
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(
val code: String? = null,
val label: String? = null,
val unit: String? = null,
val decisionMode: String? = null,
val payrollMode: String? = null,
val poolCode: String? = null,
val rule: DriverLeaveRuleRequirementsDto? = null,
val legalBasis: String? = null,
)
data class DriverLeaveRuleRequirementsDto(
val requestModes: List<String> = listOf("days"),
val requiredFields: List<String> = emptyList(),
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(
val id: Int,
val date: String?,
val quantity: Int,
val status: String,
val poolId: Int? = null,
val sourceYear: Int? = null,
)
data class LeaveDocumentListResponse(
val data: List<DriverLeaveDocumentDto> = emptyList(),
)
data class LeaveDocumentResponse(
val data: DriverLeaveDocumentDto,
)
data class DriverLeaveDocumentDto(
val id: Int,
val documentType: String,
val originalName: String,
val mimeType: String? = null,
val sizeBytes: Long = 0,
val uploadedAt: String? = null,
) )
data class DriverLeaveCalendarEntryDto( data class DriverLeaveCalendarEntryDto(
@@ -5,6 +5,7 @@ import com.google.gson.Gson
import java.io.IOException import java.io.IOException
import java.time.LocalDate import java.time.LocalDate
import pl.firmatpp.kierowca.data.DriverRepository import pl.firmatpp.kierowca.data.DriverRepository
import pl.firmatpp.kierowca.data.rethrowIfCancellation
import pl.firmatpp.kierowca.data.model.BootstrapResponse import pl.firmatpp.kierowca.data.model.BootstrapResponse
import pl.firmatpp.kierowca.data.model.DriverRouteDto import pl.firmatpp.kierowca.data.model.DriverRouteDto
import pl.firmatpp.kierowca.data.model.RouteResponse import pl.firmatpp.kierowca.data.model.RouteResponse
@@ -38,6 +39,7 @@ class DriverSyncRepository(
saveSyncStates(response.syncState) saveSyncStates(response.syncState)
CachedValue(response, stale = false, syncedAtEpochMillis = System.currentTimeMillis()) CachedValue(response, stale = false, syncedAtEpochMillis = System.currentTimeMillis())
}.getOrElse { throwable -> }.getOrElse { throwable ->
throwable.rethrowIfCancellation()
cachedBootstrap(requestedDate, throwable) cachedBootstrap(requestedDate, throwable)
} }
} }
@@ -58,6 +60,7 @@ class DriverSyncRepository(
saveSyncStates(response.syncState) saveSyncStates(response.syncState)
CachedValue(response, stale = false, syncedAtEpochMillis = System.currentTimeMillis()) CachedValue(response, stale = false, syncedAtEpochMillis = System.currentTimeMillis())
}.getOrElse { throwable -> }.getOrElse { throwable ->
throwable.rethrowIfCancellation()
cachedRoute(routeId, throwable) cachedRoute(routeId, throwable)
} }
File diff suppressed because it is too large Load Diff
@@ -2,24 +2,36 @@ package pl.firmatpp.kierowca.ui
import java.time.LocalDate import java.time.LocalDate
import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto 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.DriverLeaveSummaryDto
import pl.firmatpp.kierowca.data.model.LeaveRequestTypeDto
data class LeaveRequestsConfig( data class LeaveRequestsConfig(
val enabled: Boolean = false, val enabled: Boolean = false,
val types: List<String> = listOf("URLOP"), val types: List<String> = listOf("URLOP"),
) )
data class AnnualLeaveTotals(
val availableMinutes: Int,
val reservedMinutes: Int,
val usedMinutes: Int,
val grantedMinutes: Int,
val overdueMinutes: Int,
)
object DriverLeaveRequestUiRules { object DriverLeaveRequestUiRules {
fun isFeatureVisible(config: LeaveRequestsConfig?): Boolean = fun isFeatureVisible(config: LeaveRequestsConfig?): Boolean =
config?.enabled == true && config.types.isNotEmpty() config?.enabled == true && config.types.isNotEmpty()
fun statusLabel(status: String): String = fun statusLabel(status: String): String =
when (status) { when (status) {
"pending" -> "Oczekuje" "pending" -> "Czeka na decyzję"
"approved" -> "Zatwierdzony" "approved" -> "Zaakceptowany"
"rejected" -> "Odrzucony" "rejected" -> "Odrzucony"
"cancel_requested" -> "Anulowanie do decyzji" "cancel_requested" -> "Czeka na anulowanie"
"cancelled" -> "Anulowany" "cancelled" -> "Anulowany"
"revoked" -> "Cofnięto decyzję" "revoked" -> "Akceptacja cofnięta"
else -> "Nieznany status" else -> "Nieznany status"
} }
@@ -33,19 +45,245 @@ object DriverLeaveRequestUiRules {
"cancellation_requested" -> "Kierowca poprosił o anulowanie" "cancellation_requested" -> "Kierowca poprosił o anulowanie"
"cancellation_approved" -> "Anulowanie zatwierdzone" "cancellation_approved" -> "Anulowanie zatwierdzone"
"cancellation_rejected" -> "Anulowanie odrzucone" "cancellation_rejected" -> "Anulowanie odrzucone"
"period_amended" -> "Zmieniono termin wniosku"
"interrupted" -> "Nieobecność została przerwana"
"annual_leave_interrupted" -> "Przywrócono urlop wypoczynkowy"
else -> "Aktualizacja wniosku" else -> "Aktualizacja wniosku"
} }
fun typeLabel(type: String): String = fun typeLabel(type: String): String =
when (type) { when (type) {
"URLOP" -> "Urlop" "URLOP", "ANNUAL" -> "Urlop wypoczynkowy"
"CHOROBOWE" -> "Chorobowe" "ANNUAL_ON_DEMAND" -> "Urlop na żądanie"
"SZKOLENIE" -> "Szkolenie" "ANNUAL_DISABILITY" -> "Dodatkowy urlop"
"CHOROBOWE", "SICKNESS" -> "Niezdolność do pracy"
"SZKOLENIE", "TRAINING" -> "Urlop szkoleniowy"
"WOLNE" -> "Dzień wolny" "WOLNE" -> "Dzień wolny"
"INNE" -> "Inne" "INNE", "OTHER_OPERATIONAL" -> "Inna nieobecność"
"FORCE_MAJEURE" -> "Siła wyższa"
"CHILD_CARE_14" -> "Opieka nad dzieckiem do 14 lat"
"CARE_LEAVE" -> "Urlop opiekuńczy"
"MATERNITY" -> "Urlop macierzyński"
"MATERNITY_EQUIVALENT" -> "Urlop na warunkach macierzyńskiego"
"MATERNITY_SUPPLEMENTARY" -> "Uzupełniający urlop macierzyński"
"PARENTAL" -> "Urlop rodzicielski"
"PATERNITY" -> "Urlop ojcowski"
"CHILDCARE_UNPAID" -> "Urlop wychowawczy"
"OCCASIONAL" -> "Zwolnienie okolicznościowe"
"REHABILITATION" -> "Turnus rehabilitacyjny"
"UNPAID" -> "Urlop bezpłatny"
"PREGNANCY_EXAMS" -> "Badania w ciąży"
"OCCUPATIONAL_EXAMS" -> "Badania pracownicze"
"BLOOD_DONATION" -> "Zwolnienie krwiodawcy"
"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 else -> type
} }
fun requestType(request: DriverLeaveRequestDto): String =
request.typeLabel?.takeIf { it.isNotBlank() }
?: request.rule?.label?.takeIf { it.isNotBlank() }
?: typeLabel(request.ruleCode ?: request.type)
fun annualTotals(summary: DriverLeaveSummaryDto?): AnnualLeaveTotals {
val annualPools = summary?.pools.orEmpty().filter {
it.poolCode == "ANNUAL" && it.unit == "minutes" && it.status == "active"
}
return AnnualLeaveTotals(
availableMinutes = annualPools.sumOf { it.availableQuantity },
reservedMinutes = annualPools.sumOf { it.reservedQuantity },
usedMinutes = annualPools.sumOf { it.usedQuantity },
grantedMinutes = annualPools.sumOf { it.grantedQuantity },
overdueMinutes = annualPools.filter { it.year < LocalDate.now().year }.sumOf { it.availableQuantity },
)
}
fun annualPools(summary: DriverLeaveSummaryDto?): List<DriverLeavePoolDto> =
summary?.pools.orEmpty()
.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)
val safeNorm = dailyNormMinutes.coerceAtLeast(1)
val fullDays = quantity / safeNorm
val remainingMinutes = quantity % safeNorm
val hours = quantity / 60
val minutes = quantity % 60
val dayPart = when {
fullDays == 0 && remainingMinutes == 0 -> "0 dni"
remainingMinutes == 0 -> dayCountLabel(fullDays)
fullDays == 0 -> "mniej niż 1 dzień"
else -> "${dayCountLabel(fullDays)} + ${formatHours(remainingMinutes)}"
}
return "$dayPart · ${hours} godz.${if (minutes > 0) " ${minutes} min" else ""}"
}
fun formatHours(minutes: Int): String {
val hours = minutes / 60
val remainder = minutes % 60
return when {
hours == 0 -> "$remainder min"
remainder == 0 -> "$hours godz."
else -> "$hours godz. $remainder min"
}
}
fun dayCountLabel(days: Int): String {
val suffix = when {
days == 1 -> "dzień"
days % 10 in 2..4 && days % 100 !in 12..14 -> "dni"
else -> "dni"
}
return "$days $suffix"
}
fun modeLabel(mode: String): String = if (mode == "hours") "Kilka godzin" else "Całe dni"
fun decisionExplanation(type: LeaveRequestTypeDto): String =
when (type.decisionMode) {
"mandatory_registration" -> "Po spełnieniu wymaganych warunków wniosek jest rejestrowany zgodnie z przepisami."
"external_event" -> "Nieobecność wymaga potwierdzenia odpowiednim dokumentem."
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"
"settlementMode" -> "Sposób wykorzystania w tym roku"
"careRecipientName" -> "Imię i nazwisko osoby wymagającej opieki"
"careRecipientRelationship" -> "Kim jest dla Ciebie ta osoba"
"careReason" -> "Dlaczego potrzebna jest opieka"
"careRecipientAddress" -> "Adres osoby wymagającej opieki"
"childrenBornCount" -> "Liczba dzieci urodzonych przy jednym porodzie"
"entitlementEventKey" -> "Opis zdarzenia"
"partNumber" -> "Która to część urlopu"
"childIdentityKey" -> "Imię dziecka"
"occasionType" -> "Rodzaj zdarzenia rodzinnego"
"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"
}
fun fieldHint(field: String): String? =
when (field) {
"childBirthDate" -> "Wpisz datę w formacie RRRR-MM-DD, np. 2020-05-12"
"entitlementEventKey" -> "Np. poród z 15.06.2026"
"partNumber" -> "Np. 1"
"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
}
fun documentLabel(type: String): String =
when (type) {
"disability_certificate" -> "Orzeczenie o niepełnosprawności"
"parent_declaration" -> "Oświadczenie rodzica"
"birth_document", "birth_or_adoption_document" -> "Dokument potwierdzający urodzenie lub przysposobienie"
"adoption_or_care_document" -> "Dokument przysposobienia lub przyjęcia na wychowanie"
"hospitalization_certificate" -> "Zaświadczenie o hospitalizacji"
"parental_leave_declaration", "childcare_leave_declaration" -> "Oświadczenie dotyczące urlopu rodzicielskiego"
"event_document" -> "Dokument potwierdzający zdarzenie"
"training_confirmation" -> "Potwierdzenie nauki lub egzaminu"
"rehabilitation_referral" -> "Skierowanie na turnus rehabilitacyjny"
"medical_referral", "medical_referral_or_confirmation" -> "Skierowanie lub potwierdzenie badania"
"blood_donation_certificate" -> "Zaświadczenie o oddaniu krwi"
"authority_summons" -> "Wezwanie urzędowe"
"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"
}
fun canCancel(status: String, dateFrom: String, today: LocalDate = LocalDate.now()): Boolean { fun canCancel(status: String, dateFrom: String, today: LocalDate = LocalDate.now()): Boolean {
if (status == "pending") return true if (status == "pending") return true
if (status != "approved") return false if (status != "approved") return false
@@ -14,6 +14,8 @@ import kotlin.math.abs
import pl.firmatpp.kierowca.data.model.DriverRouteDto import pl.firmatpp.kierowca.data.model.DriverRouteDto
import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
import pl.firmatpp.kierowca.data.model.RoutePhotoDto import pl.firmatpp.kierowca.data.model.RoutePhotoDto
import pl.firmatpp.kierowca.data.model.TachographReminderDto
import pl.firmatpp.kierowca.data.model.TachographReminderTaskDto
import pl.firmatpp.kierowca.data.model.driverLifecycleStatus import pl.firmatpp.kierowca.data.model.driverLifecycleStatus
import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity
import pl.firmatpp.kierowca.data.upload.PhotoUploadStatus import pl.firmatpp.kierowca.data.upload.PhotoUploadStatus
@@ -671,6 +673,16 @@ fun canLaunchCameraWithLocationPolicy(requirePreciseLocation: Boolean, hasFineLo
fun shouldShowDispatchSheetReminderCard(reminder: DispatchSheetReminderDto?): Boolean = fun shouldShowDispatchSheetReminderCard(reminder: DispatchSheetReminderDto?): Boolean =
reminder?.dueToday == true && reminder.status in setOf("missing", "uploaded") reminder?.dueToday == true && reminder.status in setOf("missing", "uploaded")
fun shouldShowTachographReminderCard(reminder: TachographReminderDto?): Boolean =
reminder?.enabled == true &&
reminder.visible &&
!reminder.title.isNullOrBlank() &&
!reminder.message.isNullOrBlank() &&
!reminder.tasks.isNullOrEmpty()
fun defaultTachographConfirmationSelection(tasks: List<TachographReminderTaskDto>): Set<String> =
if (tasks.size == 1) setOf(tasks.single().id) else emptySet()
fun dispatchSheetPrimaryActionLabel(reminder: DispatchSheetReminderDto?, hasQueuedUpload: Boolean): String = fun dispatchSheetPrimaryActionLabel(reminder: DispatchSheetReminderDto?, hasQueuedUpload: Boolean): String =
when { when {
hasQueuedUpload -> "Wysyłam zdjęcie..." hasQueuedUpload -> "Wysyłam zdjęcie..."
@@ -9,6 +9,8 @@ import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.google.firebase.messaging.FirebaseMessaging import com.google.firebase.messaging.FirebaseMessaging
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
@@ -18,11 +20,13 @@ import kotlinx.coroutines.sync.withLock
import java.time.LocalDate import java.time.LocalDate
import java.time.Instant import java.time.Instant
import java.io.IOException import java.io.IOException
import java.util.UUID
import pl.firmatpp.kierowca.data.AppPreferencesStore import pl.firmatpp.kierowca.data.AppPreferencesStore
import pl.firmatpp.kierowca.data.ApiErrorMapper import pl.firmatpp.kierowca.data.ApiErrorMapper
import pl.firmatpp.kierowca.data.ApiErrorKind import pl.firmatpp.kierowca.data.ApiErrorKind
import pl.firmatpp.kierowca.data.DriverRepository import pl.firmatpp.kierowca.data.DriverRepository
import pl.firmatpp.kierowca.data.PhotoUploadMetadata import pl.firmatpp.kierowca.data.PhotoUploadMetadata
import pl.firmatpp.kierowca.data.rethrowIfCancellation
import pl.firmatpp.kierowca.data.sync.DriverSyncRepository import pl.firmatpp.kierowca.data.sync.DriverSyncRepository
import pl.firmatpp.kierowca.data.sync.NetworkMonitor import pl.firmatpp.kierowca.data.sync.NetworkMonitor
import pl.firmatpp.kierowca.data.sync.StartupOfflineFallbackLoader import pl.firmatpp.kierowca.data.sync.StartupOfflineFallbackLoader
@@ -30,9 +34,13 @@ import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
import pl.firmatpp.kierowca.data.model.AppUpdateDto import pl.firmatpp.kierowca.data.model.AppUpdateDto
import pl.firmatpp.kierowca.data.model.DriverDto import pl.firmatpp.kierowca.data.model.DriverDto
import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto
import pl.firmatpp.kierowca.data.model.DriverLeaveDocumentDto
import pl.firmatpp.kierowca.data.model.DriverLeaveForecastDto
import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto 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.DriverRouteDto
import pl.firmatpp.kierowca.data.model.RoutePhotoDto import pl.firmatpp.kierowca.data.model.RoutePhotoDto
import pl.firmatpp.kierowca.data.model.TachographReminderDto
import pl.firmatpp.kierowca.data.model.driverLifecycleStatus import pl.firmatpp.kierowca.data.model.driverLifecycleStatus
import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadEntity import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadEntity
import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadOutbox import pl.firmatpp.kierowca.data.upload.DispatchSheetUploadOutbox
@@ -102,15 +110,26 @@ data class DriverUiState(
val photoUploads: List<PhotoUploadEntity> = emptyList(), val photoUploads: List<PhotoUploadEntity> = emptyList(),
val queuedPhotoUploads: List<PhotoUploadEntity> = emptyList(), val queuedPhotoUploads: List<PhotoUploadEntity> = emptyList(),
val dispatchSheetReminder: DispatchSheetReminderDto? = null, val dispatchSheetReminder: DispatchSheetReminderDto? = null,
val tachographReminder: TachographReminderDto? = null,
val tachographReminderSubmitting: Boolean = false,
val appUpdate: AppUpdateDto? = null, val appUpdate: AppUpdateDto? = null,
val dispatchSheetUploads: List<DispatchSheetUploadEntity> = emptyList(), val dispatchSheetUploads: List<DispatchSheetUploadEntity> = emptyList(),
val leaveRequestsConfig: LeaveRequestsConfig? = null, val leaveRequestsConfig: LeaveRequestsConfig? = null,
val leaveSummary: DriverLeaveSummaryDto? = null,
val leaveRequests: List<DriverLeaveRequestDto> = emptyList(), val leaveRequests: List<DriverLeaveRequestDto> = emptyList(),
val selectedLeaveRequest: DriverLeaveRequestDto? = null, val selectedLeaveRequest: DriverLeaveRequestDto? = null,
val leaveRequestDateFrom: String = LocalDate.now().toString(), val leaveRequestDateFrom: String = LocalDate.now().toString(),
val leaveRequestDateTo: String = LocalDate.now().toString(), val leaveRequestDateTo: String = LocalDate.now().toString(),
val leaveRequestType: String = "URLOP", val leaveRequestType: String = "URLOP",
val leaveRequestMode: String = "days",
val leaveRequestHoursText: String = "",
val leaveRequestDetails: Map<String, String> = emptyMap(),
val leaveRequestIdempotencyKey: String = "",
val leaveRequestNote: String = "", val leaveRequestNote: String = "",
val leaveForecast: DriverLeaveForecastDto? = null,
val leaveForecastLoading: Boolean = false,
val leaveDocuments: List<DriverLeaveDocumentDto> = emptyList(),
val leaveDocumentUploading: Boolean = false,
val leaveCalendarEntries: List<DriverLeaveCalendarEntryDto> = emptyList(), val leaveCalendarEntries: List<DriverLeaveCalendarEntryDto> = emptyList(),
val leaveCalendarLoading: Boolean = false, val leaveCalendarLoading: Boolean = false,
val leaveCalendarLoadedUntil: String? = null, val leaveCalendarLoadedUntil: String? = null,
@@ -199,6 +218,31 @@ internal fun DriverUiState.withLoadedLeaveRequests(
) )
} }
internal fun shouldStartRoutesLoad(
screen: DriverScreen,
navigateToRoutes: Boolean,
startupOfflineOnly: Boolean,
startupLoadInProgress: Boolean = false,
): Boolean =
(!startupLoadInProgress || navigateToRoutes || startupOfflineOnly) &&
(screen != DriverScreen.Initializing || navigateToRoutes || startupOfflineOnly)
internal fun screenAfterBootstrap(
currentScreen: DriverScreen,
navigateToRoutes: Boolean,
leaveRequestsEnabled: Boolean,
): DriverScreen = when {
currentScreen == DriverScreen.Initializing -> DriverScreen.Routes
!leaveRequestsEnabled && currentScreen in setOf(
DriverScreen.LeaveRequests,
DriverScreen.LeaveRequestDetail,
DriverScreen.LeaveCalendar,
DriverScreen.AddLeaveRequest,
) -> DriverScreen.Routes
navigateToRoutes -> DriverScreen.Routes
else -> currentScreen
}
class DriverViewModel(application: Application) : AndroidViewModel(application) { class DriverViewModel(application: Application) : AndroidViewModel(application) {
private val appPreferencesStore = AppPreferencesStore(application) private val appPreferencesStore = AppPreferencesStore(application)
private val repository = DriverRepository(application) private val repository = DriverRepository(application)
@@ -233,6 +277,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
private var routesRequestGeneration: Long = 0 private var routesRequestGeneration: Long = 0
private var routeDetailRequestGeneration: Long = 0 private var routeDetailRequestGeneration: Long = 0
private var routesLoadJob: Job? = null private var routesLoadJob: Job? = null
private var startupLoadInProgress: Boolean = false
val state: StateFlow<DriverUiState> = _state val state: StateFlow<DriverUiState> = _state
init { init {
@@ -470,6 +515,39 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
loadRoutes(date = date, showLoading = true, navigateToRoutes = true) loadRoutes(date = date, showLoading = true, navigateToRoutes = true)
} }
fun acknowledgeTachographReminder(taskIds: List<String>) {
val snapshot = _state.value
if (taskIds.isEmpty() || snapshot.tachographReminderSubmitting) return
if (!snapshot.isOnline) {
_state.update { it.copy(error = "Potwierdzenie odczytu wymaga połączenia z internetem.") }
return
}
viewModelScope.launch {
_state.update {
it.copy(
tachographReminderSubmitting = true,
error = null,
feedback = null,
)
}
runCatching { repository.acknowledgeTachographReminder(taskIds) }
.onSuccess { reminder ->
_state.update {
it.copy(
tachographReminder = reminder,
feedback = "Zapisano potwierdzenie odczytu.",
error = null,
)
}
}
.onFailure { throwable ->
_state.update { it.withApiError(throwable) }
}
_state.update { it.copy(tachographReminderSubmitting = false) }
}
}
fun dismissRouteDayLiveUpdate() { fun dismissRouteDayLiveUpdate() {
_state.update { it.copy(routeDayLiveUpdateMessage = null) } _state.update { it.copy(routeDayLiveUpdateMessage = null) }
} }
@@ -480,24 +558,35 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
navigateToRoutes: Boolean, navigateToRoutes: Boolean,
startupOfflineOnly: Boolean = false, startupOfflineOnly: Boolean = false,
) { ) {
val requestSnapshot = _state.value
if (!shouldStartRoutesLoad(
screen = requestSnapshot.screen,
navigateToRoutes = navigateToRoutes,
startupOfflineOnly = startupOfflineOnly,
startupLoadInProgress = startupLoadInProgress,
)
) {
return
}
val isStartup = requestSnapshot.screen == DriverScreen.Initializing
if (isStartup) startupLoadInProgress = true
val generation = ++routesRequestGeneration val generation = ++routesRequestGeneration
routesLoadJob?.cancel() routesLoadJob?.cancel()
routesLoadJob = viewModelScope.launch { val loadJob = viewModelScope.launch {
val isStartup = _state.value.screen == DriverScreen.Initializing
_state.update { it.copy(loading = showLoading, refreshing = !showLoading, feedback = null, error = null) } _state.update { it.copy(loading = showLoading, refreshing = !showLoading, feedback = null, error = null) }
runCatching { runCatching {
val cached = when { val cached = when {
startupOfflineOnly -> syncRepository.bootstrapFromCache(date) startupOfflineOnly -> syncRepository.bootstrapFromCache(date)
?: throw IOException("Brak zapisanych danych dla wybranego dnia.") ?: throw IOException("Brak zapisanych danych dla wybranego dnia.")
!_state.value.isOnline -> syncRepository.bootstrapFromCache(date)
?: throw IOException("Brak zapisanych danych dla wybranego dnia.")
isStartup -> { isStartup -> {
startupOfflineFallbackLoader.load( startupOfflineFallbackLoader.load(
onlineLoad = { syncRepository.bootstrap(date) }, onlineLoad = { syncRepository.bootstrap(date) },
offlineLoad = { syncRepository.bootstrapFromCache(date) }, offlineLoad = { syncRepository.bootstrapFromCache(date) },
) )
} }
!_state.value.isOnline -> syncRepository.bootstrapFromCache(date)
?: throw IOException("Brak zapisanych danych dla wybranego dnia.")
else -> syncRepository.bootstrap(date) else -> syncRepository.bootstrap(date)
} }
val response = cached.value val response = cached.value
@@ -509,6 +598,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
driver = response.session.driver, driver = response.session.driver,
routes = response.routes.today, routes = response.routes.today,
dispatchSheetReminder = response.dispatchSheetReminder, dispatchSheetReminder = response.dispatchSheetReminder,
tachographReminder = response.tachographReminder,
appUpdate = response.appUpdate ?: it.appUpdate, appUpdate = response.appUpdate ?: it.appUpdate,
selectedDate = settings?.selectedDate ?: date ?: it.selectedDate, selectedDate = settings?.selectedDate ?: date ?: it.selectedDate,
minRouteDate = settings?.minDate ?: it.minRouteDate, minRouteDate = settings?.minDate ?: it.minRouteDate,
@@ -526,10 +616,11 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
leaveRequestsConfig = settings?.leaveRequests?.let { config -> leaveRequestsConfig = settings?.leaveRequests?.let { config ->
LeaveRequestsConfig(enabled = config.enabled, types = config.types) LeaveRequestsConfig(enabled = config.enabled, types = config.types)
}, },
screen = if ( screen = screenAfterBootstrap(
settings?.leaveRequests?.enabled != true && currentScreen = it.screen,
it.screen in setOf(DriverScreen.LeaveRequests, DriverScreen.LeaveRequestDetail, DriverScreen.AddLeaveRequest) navigateToRoutes = navigateToRoutes,
) DriverScreen.Routes else if (navigateToRoutes) DriverScreen.Routes else it.screen, leaveRequestsEnabled = settings?.leaveRequests?.enabled == true,
),
notifyNewRoutes = response.notificationPreferences?.notifyNewRoutes ?: it.notifyNewRoutes, notifyNewRoutes = response.notificationPreferences?.notifyNewRoutes ?: it.notifyNewRoutes,
imageAuthHeader = repository.imageAuthHeader(), imageAuthHeader = repository.imageAuthHeader(),
isStale = cached.stale || !it.isOnline, isStale = cached.stale || !it.isOnline,
@@ -556,6 +647,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
reconcileTrackingService(response.routes.today, response.session.driver) reconcileTrackingService(response.routes.today, response.session.driver)
} }
}.onFailure { throwable -> }.onFailure { throwable ->
throwable.rethrowIfCancellation()
if (generation != routesRequestGeneration) return@onFailure if (generation != routesRequestGeneration) return@onFailure
reportHandledException("load_routes", throwable, mapOf("date" to date)) reportHandledException("load_routes", throwable, mapOf("date" to date))
if (ApiErrorMapper.map(throwable).kind == ApiErrorKind.Auth) { if (ApiErrorMapper.map(throwable).kind == ApiErrorKind.Auth) {
@@ -573,6 +665,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
it.copy(loading = false, refreshing = false) it.copy(loading = false, refreshing = false)
} }
} }
routesLoadJob = loadJob
if (isStartup) {
loadJob.invokeOnCompletion {
if (generation == routesRequestGeneration) {
startupLoadInProgress = false
}
}
}
} }
fun openRoute(routeId: String) = openRouteWithTarget(routeId, DriverScreen.Detail) fun openRoute(routeId: String) = openRouteWithTarget(routeId, DriverScreen.Detail)
@@ -661,6 +761,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
fun openProfile() { fun openProfile() {
_state.update { it.copy(screen = DriverScreen.Profile, error = null) } _state.update { it.copy(screen = DriverScreen.Profile, error = null) }
if (
DriverLeaveRequestUiRules.isFeatureVisible(_state.value.leaveRequestsConfig) &&
_state.value.isOnline
) {
viewModelScope.launch { loadLeaveOverview(showLoading = false, navigateToList = false) }
}
} }
fun openDiagnostics() { fun openDiagnostics() {
@@ -877,13 +983,34 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
} }
private suspend fun loadLeaveRequests(showLoading: Boolean, navigateToList: Boolean): Boolean { private suspend fun loadLeaveRequests(showLoading: Boolean, navigateToList: Boolean): Boolean {
return loadLeaveOverview(showLoading, navigateToList)
}
private suspend fun loadLeaveOverview(showLoading: Boolean, navigateToList: Boolean): Boolean {
_state.update { it.copy(loading = showLoading, refreshing = !showLoading, error = null, feedback = null) } _state.update { it.copy(loading = showLoading, refreshing = !showLoading, error = null, feedback = null) }
val result = runCatching { repository.leaveRequests() } val (requestsResult, summaryResult) = coroutineScope {
result.onSuccess { requests -> val requests = async { runCatching { repository.leaveRequests() } }
val summary = async { runCatching { repository.leaveSummary() } }
requests.await() to summary.await()
}
requestsResult.onSuccess { requests ->
_state.update { it.withLoadedLeaveRequests(requests, navigateToList) } _state.update { it.withLoadedLeaveRequests(requests, navigateToList) }
}.onFailure { throwable -> _state.update { it.withApiError(throwable) } } }.onFailure { throwable -> _state.update { it.withApiError(throwable) } }
summaryResult.onSuccess { summary ->
_state.update {
it.copy(
leaveSummary = summary,
leaveForecast = if (it.screen == DriverScreen.AddLeaveRequest) null else it.leaveForecast,
)
}
}.onFailure { throwable ->
if (requestsResult.isSuccess) {
val message = ApiErrorMapper.map(throwable).message
_state.update { it.copy(error = "Nie udało się odświeżyć salda urlopu. $message") }
}
}
_state.update { it.copy(loading = false, refreshing = false) } _state.update { it.copy(loading = false, refreshing = false) }
return result.isSuccess return requestsResult.isSuccess
} }
fun openLeaveRequest(id: String) { fun openLeaveRequest(id: String) {
@@ -901,9 +1028,23 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
} }
viewModelScope.launch { viewModelScope.launch {
_state.update { it.copy(loading = true, error = null, feedback = null) } _state.update { it.copy(loading = true, error = null, feedback = null) }
runCatching { repository.leaveRequest(id) } val (requestResult, documentsResult) = coroutineScope {
.onSuccess { request -> val leaveRequest = async { runCatching { repository.leaveRequest(id) } }
_state.update { it.copy(screen = DriverScreen.LeaveRequestDetail, selectedLeaveRequest = request, error = null) } val documents = async { runCatching { repository.leaveDocuments(id) } }
leaveRequest.await() to documents.await()
}
requestResult
.onSuccess { leaveRequest ->
_state.update {
it.copy(
screen = DriverScreen.LeaveRequestDetail,
selectedLeaveRequest = leaveRequest,
leaveDocuments = documentsResult.getOrDefault(emptyList()),
error = documentsResult.exceptionOrNull()?.let { error ->
"Nie udało się pobrać listy dokumentów. ${ApiErrorMapper.map(error).message}"
},
)
}
} }
.onFailure { throwable -> _state.update { it.withApiError(throwable) } } .onFailure { throwable -> _state.update { it.withApiError(throwable) } }
_state.update { it.copy(loading = false) } _state.update { it.copy(loading = false) }
@@ -917,14 +1058,44 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
_state.update { it.copy(error = "Złożenie wniosku urlopowego wymaga połączenia z internetem.") } _state.update { it.copy(error = "Złożenie wniosku urlopowego wymaga połączenia z internetem.") }
return return
} }
if (_state.value.leaveSummary?.availableTypes.isNullOrEmpty()) {
viewModelScope.launch {
_state.update { it.copy(loading = true, error = null) }
runCatching { repository.leaveSummary() }
.onSuccess { summary ->
_state.update { it.copy(leaveSummary = summary, loading = false) }
beginLeaveRequestDraft(config)
}
.onFailure { throwable ->
_state.update { it.withApiError(throwable).copy(loading = false) }
}
}
return
}
beginLeaveRequestDraft(config)
}
private fun beginLeaveRequestDraft(config: LeaveRequestsConfig?) {
val today = LocalDate.now().toString() val today = LocalDate.now().toString()
val defaultType = _state.value.leaveSummary?.availableTypes?.firstOrNull()
val type = defaultType?.value ?: config?.types?.firstOrNull() ?: "URLOP"
val mode = defaultType?.requestModes?.firstOrNull() ?: "days"
_state.update { _state.update {
it.copy( it.copy(
screen = DriverScreen.LeaveCalendar, screen = DriverScreen.AddLeaveRequest,
leaveRequestDateFrom = today, leaveRequestDateFrom = today,
leaveRequestDateTo = today, leaveRequestDateTo = today,
leaveRequestType = config?.types?.firstOrNull() ?: "URLOP", leaveRequestType = type,
leaveRequestMode = mode,
leaveRequestHoursText = "",
leaveRequestDetails = if ("settlementMode" in defaultType?.requiredFields.orEmpty()) {
mapOf("settlementMode" to mode)
} else {
emptyMap()
},
leaveRequestIdempotencyKey = UUID.randomUUID().toString(),
leaveRequestNote = "", leaveRequestNote = "",
leaveForecast = null,
leaveCalendarEntries = emptyList(), leaveCalendarEntries = emptyList(),
leaveCalendarLoadedUntil = null, leaveCalendarLoadedUntil = null,
leaveCalendarHasSelection = false, leaveCalendarHasSelection = false,
@@ -933,22 +1104,64 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
feedback = null, feedback = null,
) )
} }
loadMoreLeaveCalendarMonths(reset = true)
} }
fun updateLeaveRequestDraft(dateFrom: String? = null, dateTo: String? = null, type: String? = null, note: String? = null) { fun updateLeaveRequestType(type: String) {
val metadata = _state.value.leaveSummary?.availableTypes?.firstOrNull { it.value == type }
_state.update { _state.update {
val nextFrom = dateFrom ?: it.leaveRequestDateFrom
val nextTo = dateTo ?: it.leaveRequestDateTo
it.copy( it.copy(
leaveRequestDateFrom = nextFrom, leaveRequestType = type,
leaveRequestDateTo = if (nextTo < nextFrom) nextFrom else nextTo, leaveRequestMode = metadata?.requestModes?.firstOrNull() ?: "days",
leaveRequestType = type ?: it.leaveRequestType, leaveRequestHoursText = "",
leaveRequestNote = note ?: it.leaveRequestNote, leaveRequestDetails = if ("settlementMode" in metadata?.requiredFields.orEmpty()) {
mapOf("settlementMode" to (metadata?.requestModes?.firstOrNull() ?: "days"))
} else {
emptyMap()
},
leaveForecast = null,
error = null,
) )
} }
} }
fun updateLeaveRequestMode(mode: String) {
val metadata = selectedLeaveRequestType() ?: return
if (mode !in metadata.requestModes) return
_state.update {
it.copy(
leaveRequestMode = mode,
leaveRequestDateTo = if (mode == "hours") it.leaveRequestDateFrom else it.leaveRequestDateTo,
leaveRequestHoursText = if (mode == "hours") it.leaveRequestHoursText else "",
leaveRequestDetails = if ("settlementMode" in metadata.requiredFields) {
it.leaveRequestDetails + ("settlementMode" to mode)
} else {
it.leaveRequestDetails
},
leaveForecast = null,
error = null,
)
}
}
fun updateLeaveRequestHours(value: String) {
val normalized = value.filter { it.isDigit() || it == ',' || it == '.' }.take(5)
_state.update { it.copy(leaveRequestHoursText = normalized, leaveForecast = null, error = null) }
}
fun updateLeaveRequestDetail(field: String, value: String) {
_state.update {
it.copy(
leaveRequestDetails = it.leaveRequestDetails + (field to value),
leaveForecast = null,
error = null,
)
}
}
fun updateLeaveRequestNote(value: String) {
_state.update { it.copy(leaveRequestNote = value, error = null) }
}
fun selectLeaveCalendarDate(date: String) { fun selectLeaveCalendarDate(date: String) {
val selected = runCatching { LocalDate.parse(date) }.getOrNull() ?: return val selected = runCatching { LocalDate.parse(date) }.getOrNull() ?: return
if (selected.isBefore(LocalDate.now())) return if (selected.isBefore(LocalDate.now())) return
@@ -984,7 +1197,15 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
return return
} }
_state.update { it.copy(screen = DriverScreen.AddLeaveRequest, error = null, feedback = null) } _state.update {
it.copy(
screen = DriverScreen.AddLeaveRequest,
leaveRequestDateTo = if (it.leaveRequestMode == "hours") it.leaveRequestDateFrom else it.leaveRequestDateTo,
leaveForecast = null,
error = null,
feedback = null,
)
}
} }
fun reopenLeaveCalendarFromDraft() { fun reopenLeaveCalendarFromDraft() {
@@ -1002,6 +1223,53 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
} }
} }
fun refreshLeaveForecast() {
val snapshot = _state.value
if (!snapshot.isOnline || snapshot.leaveForecastLoading) return
if (!snapshot.leaveCalendarHasSelection) {
_state.update { it.copy(error = "Najpierw wybierz termin nieobecności.") }
return
}
val type = selectedLeaveRequestType()
if (type == null) {
_state.update { it.copy(error = "Wybierz rodzaj nieobecności.") }
return
}
val missingField = type.requiredFields
.filterNot { it == "settlementMode" }
.firstOrNull { snapshot.leaveRequestDetails[it].isNullOrBlank() }
if (missingField != null) {
_state.update {
it.copy(error = "Uzupełnij pole „${DriverLeaveRequestUiRules.fieldLabel(missingField)}”.")
}
return
}
val requestedMinutes = requestedLeaveMinutes(snapshot)
if (snapshot.leaveRequestMode == "hours" && requestedMinutes == null) {
_state.update { it.copy(error = "Wpisz liczbę godzin, o które chcesz wnioskować.") }
return
}
viewModelScope.launch {
_state.update { it.copy(leaveForecastLoading = true, leaveForecast = null, error = null) }
runCatching {
repository.leaveForecast(
dateFrom = snapshot.leaveRequestDateFrom,
dateTo = snapshot.leaveRequestDateTo,
type = snapshot.leaveRequestType,
requestMode = snapshot.leaveRequestMode,
requestedQuantity = requestedMinutes,
details = snapshot.leaveRequestDetails,
)
}.onSuccess { forecast ->
_state.update { it.copy(leaveForecast = forecast, error = null) }
}.onFailure { throwable ->
_state.update { it.withApiError(throwable) }
}
_state.update { it.copy(leaveForecastLoading = false) }
}
}
fun loadMoreLeaveCalendarMonths(reset: Boolean = false) { fun loadMoreLeaveCalendarMonths(reset: Boolean = false) {
val snapshot = _state.value val snapshot = _state.value
if (!DriverLeaveRequestUiRules.isFeatureVisible(snapshot.leaveRequestsConfig) || snapshot.leaveCalendarLoading) return if (!DriverLeaveRequestUiRules.isFeatureVisible(snapshot.leaveRequestsConfig) || snapshot.leaveCalendarLoading) return
@@ -1056,6 +1324,14 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
_state.update { it.copy(error = "Wysłanie wniosku wymaga połączenia z internetem.") } _state.update { it.copy(error = "Wysłanie wniosku wymaga połączenia z internetem.") }
return return
} }
if (snapshot.leaveForecast == null) {
_state.update { it.copy(error = "Najpierw wybierz „Sprawdź wniosek”, aby zobaczyć jego podsumowanie.") }
return
}
if (!snapshot.leaveForecast.sufficientBalance) {
_state.update { it.copy(error = "Nie możesz wysłać tego wniosku, ponieważ dostępne saldo jest za małe.") }
return
}
if (!leaveMutationMutex.tryLock()) return if (!leaveMutationMutex.tryLock()) return
if (snapshot.leaveRequestDateFrom < LocalDate.now().toString()) { if (snapshot.leaveRequestDateFrom < LocalDate.now().toString()) {
_state.update { it.copy(error = "Data od nie może być z przeszłości.") } _state.update { it.copy(error = "Data od nie może być z przeszłości.") }
@@ -1071,16 +1347,30 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
dateFrom = snapshot.leaveRequestDateFrom, dateFrom = snapshot.leaveRequestDateFrom,
dateTo = snapshot.leaveRequestDateTo, dateTo = snapshot.leaveRequestDateTo,
type = snapshot.leaveRequestType, type = snapshot.leaveRequestType,
requestMode = snapshot.leaveRequestMode,
requestedQuantity = requestedLeaveMinutes(snapshot),
details = snapshot.leaveRequestDetails,
idempotencyKey = snapshot.leaveRequestIdempotencyKey.ifBlank { UUID.randomUUID().toString() },
note = snapshot.leaveRequestNote.takeIf { it.isNotBlank() }, note = snapshot.leaveRequestNote.takeIf { it.isNotBlank() },
) )
}.onSuccess { created -> }.onSuccess { created ->
val requests = runCatching { repository.leaveRequests() }.getOrElse { listOf(created) } val (requests, summary) = coroutineScope {
val refreshedRequests = async { runCatching { repository.leaveRequests() }.getOrElse { listOf(created) } }
val refreshedSummary = async { runCatching { repository.leaveSummary() }.getOrNull() }
refreshedRequests.await() to refreshedSummary.await()
}
_state.update { _state.update {
it.copy( it.copy(
screen = DriverScreen.LeaveRequestDetail, screen = DriverScreen.LeaveRequestDetail,
selectedLeaveRequest = created, selectedLeaveRequest = created,
leaveDocuments = emptyList(),
leaveRequests = requests, leaveRequests = requests,
feedback = "Wniosek został wysłany do decyzji.", leaveSummary = summary ?: it.leaveSummary,
feedback = if (created.balanceConfigurationRequired) {
"Wniosek zapisano. Kadry muszą jeszcze potwierdzić saldo, zanim będzie można go zaakceptować."
} else {
"Gotowe. Wniosek został wysłany i odpowiednia część salda jest już zarezerwowana."
},
error = null, error = null,
) )
} }
@@ -1095,6 +1385,51 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
} }
} }
fun uploadSelectedLeaveDocument(documentType: String, uri: Uri) {
val request = _state.value.selectedLeaveRequest ?: return
if (!_state.value.isOnline || _state.value.leaveDocumentUploading) {
if (!_state.value.isOnline) {
_state.update { it.copy(error = "Dodanie dokumentu wymaga połączenia z internetem.") }
}
return
}
viewModelScope.launch {
_state.update { it.copy(leaveDocumentUploading = true, error = null, feedback = null) }
runCatching { repository.uploadLeaveDocument(request.id, documentType, uri) }
.onSuccess { document ->
_state.update {
val updatedRequest = it.selectedLeaveRequest?.copy(
missingDocumentTypes = it.selectedLeaveRequest.missingDocumentTypes - documentType,
)
it.copy(
selectedLeaveRequest = updatedRequest,
leaveRequests = it.leaveRequests.map { leaveRequest ->
if (leaveRequest.id == updatedRequest?.id) updatedRequest else leaveRequest
},
leaveDocuments = (it.leaveDocuments.filterNot { existing ->
existing.documentType == document.documentType
} + document).sortedBy { item -> item.documentType },
feedback = "Dokument został bezpiecznie dołączony do wniosku.",
error = null,
)
}
}
.onFailure { throwable -> _state.update { it.withApiError(throwable) } }
_state.update { it.copy(leaveDocumentUploading = false) }
}
}
private fun selectedLeaveRequestType() =
_state.value.leaveSummary?.availableTypes?.firstOrNull { it.value == _state.value.leaveRequestType }
private fun requestedLeaveMinutes(state: DriverUiState): Int? {
if (state.leaveRequestMode != "hours") return null
val hours = state.leaveRequestHoursText.replace(',', '.').toDoubleOrNull() ?: return null
val minutes = (hours * 60).toInt()
return minutes.takeIf { it > 0 }
}
fun cancelSelectedLeaveRequest() { fun cancelSelectedLeaveRequest() {
val request = _state.value.selectedLeaveRequest ?: return val request = _state.value.selectedLeaveRequest ?: return
if (!_state.value.isOnline) { if (!_state.value.isOnline) {
@@ -1109,10 +1444,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
try { try {
runCatching { repository.cancelLeaveRequest(request.id, request.version) } runCatching { repository.cancelLeaveRequest(request.id, request.version) }
.onSuccess { updated -> .onSuccess { updated ->
val refreshedSummary = runCatching { repository.leaveSummary() }.getOrNull()
_state.update { _state.update {
it.copy( it.copy(
selectedLeaveRequest = updated, selectedLeaveRequest = updated,
leaveRequests = it.leaveRequests.map { existing -> if (existing.id == updated.id) updated else existing }, leaveRequests = it.leaveRequests.map { existing -> if (existing.id == updated.id) updated else existing },
leaveSummary = refreshedSummary ?: it.leaveSummary,
feedback = if (updated.status == "cancel_requested") "Anulowanie wysłane do decyzji." else "Wniosek został anulowany.", feedback = if (updated.status == "cancel_requested") "Anulowanie wysłane do decyzji." else "Wniosek został anulowany.",
error = null, error = null,
) )
@@ -1610,7 +1947,10 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
) )
DriverScreen.LeaveRequests -> it.copy(screen = DriverScreen.Routes) DriverScreen.LeaveRequests -> it.copy(screen = DriverScreen.Routes)
DriverScreen.LeaveRequestDetail -> it.copy(screen = DriverScreen.LeaveRequests, selectedLeaveRequest = null, feedback = null) DriverScreen.LeaveRequestDetail -> it.copy(screen = DriverScreen.LeaveRequests, selectedLeaveRequest = null, feedback = null)
DriverScreen.LeaveCalendar -> it.copy(screen = DriverScreen.LeaveRequests, feedback = null) DriverScreen.LeaveCalendar -> it.copy(
screen = if (it.leaveRequestIdempotencyKey.isNotBlank()) DriverScreen.AddLeaveRequest else DriverScreen.LeaveRequests,
feedback = null,
)
DriverScreen.AddLeaveRequest -> it.copy(screen = DriverScreen.LeaveRequests, feedback = null) DriverScreen.AddLeaveRequest -> it.copy(screen = DriverScreen.LeaveRequests, feedback = null)
DriverScreen.Detail -> { DriverScreen.Detail -> {
photoUploadsJob?.cancel() photoUploadsJob?.cancel()
@@ -1773,7 +2113,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
} }
private suspend fun checkRemoteSyncState() { private suspend fun checkRemoteSyncState() {
if (!_state.value.isOnline) return val initialSnapshot = _state.value
if (
!initialSnapshot.isOnline ||
initialSnapshot.screen == DriverScreen.Initializing ||
initialSnapshot.driver == null
) return
syncCheckMutex.withLock { syncCheckMutex.withLock {
syncHintMutex.withLock { highestHintVersions.clear() } syncHintMutex.withLock { highestHintVersions.clear() }
val snapshot = _state.value val snapshot = _state.value
@@ -1820,6 +2165,8 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
} }
private suspend fun handleSyncHint(hint: DriverSyncHint) { private suspend fun handleSyncHint(hint: DriverSyncHint) {
val initialSnapshot = _state.value
if (initialSnapshot.screen == DriverScreen.Initializing || initialSnapshot.driver == null) return
syncHintMutex.withLock { syncHintMutex.withLock {
val hintKey = listOf(hint.scope, hint.date ?: "-", hint.routeId ?: "-").joinToString(":") val hintKey = listOf(hint.scope, hint.date ?: "-", hint.routeId ?: "-").joinToString(":")
val previousVersion = highestHintVersions[hintKey] val previousVersion = highestHintVersions[hintKey]
@@ -1856,7 +2203,13 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
if (pending == null || hint.version > pending.version) pendingLeaveHint = hint if (pending == null || hint.version > pending.version) pendingLeaveHint = hint
return return
} }
if (snapshot.screen == DriverScreen.LeaveRequests || snapshot.screen == DriverScreen.LeaveRequestDetail) { if (snapshot.screen in setOf(
DriverScreen.Profile,
DriverScreen.LeaveRequests,
DriverScreen.LeaveRequestDetail,
DriverScreen.AddLeaveRequest,
)
) {
if (loadLeaveRequests(showLoading = false, navigateToList = false)) { if (loadLeaveRequests(showLoading = false, navigateToList = false)) {
syncRepository.saveSyncScope(hint.asScope()) syncRepository.saveSyncScope(hint.asScope())
} }
@@ -0,0 +1,94 @@
package pl.firmatpp.kierowca.data
import com.google.gson.Gson
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
import pl.firmatpp.kierowca.data.model.DriverLeaveRequestDto
import pl.firmatpp.kierowca.data.model.LeaveSummaryResponse
class DriverLeaveApiContractTest {
private val gson = Gson()
@Test
fun parsesNewLeaveSummaryWithoutTechnicalFallbacks() {
val response = gson.fromJson(
"""
{
"data": {
"dailyNormMinutes": 480,
"balanceConfigured": true,
"overdueQuantity": 480,
"visibleUsagePoolCodes": ["ANNUAL", "CHILD_CARE_14"],
"pools": [{
"id": 7,
"poolCode": "ANNUAL",
"year": 2026,
"unit": "minutes",
"availableQuantity": 7680,
"reservedQuantity": 960,
"usedQuantity": 960,
"grantedQuantity": 9600,
"status": "active"
}],
"availableTypes": [{
"value": "URLOP",
"code": "ANNUAL",
"label": "Urlop wypoczynkowy",
"requestModes": ["days", "hours"],
"requiredFields": [],
"requiredDocuments": [],
"fieldOptions": {},
"description": "Urlop rozliczany według grafiku.",
"financialTreatmentLabel": "Płatny według danych przekazanych przez kadry i płace.",
"affectsAnnualLeaveBalance": true
}]
}
}
""".trimIndent(),
LeaveSummaryResponse::class.java,
)
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
fun parsesSensitiveOwnRequestDetailsAsFormValues() {
val request = gson.fromJson(
"""
{
"id": "12",
"dateFrom": "2026-08-03",
"dateTo": "2026-08-03",
"type": "WOLNE",
"ruleCode": "CHILD_CARE_14",
"requestMode": "days",
"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"]
}
""".trimIndent(),
DriverLeaveRequestDto::class.java,
)
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)
}
}
@@ -7,6 +7,10 @@ import org.junit.Assert.assertTrue
import org.junit.Test import org.junit.Test
import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarDriverDto import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarDriverDto
import pl.firmatpp.kierowca.data.model.DriverLeaveCalendarEntryDto 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 { class DriverLeaveRequestUiRulesTest {
@Test @Test
@@ -18,15 +22,35 @@ class DriverLeaveRequestUiRulesTest {
@Test @Test
fun exposesPolishStatusLabels() { fun exposesPolishStatusLabels() {
assertEquals("Oczekuje", DriverLeaveRequestUiRules.statusLabel("pending")) assertEquals("Czeka na decyzję", DriverLeaveRequestUiRules.statusLabel("pending"))
assertEquals("Zatwierdzony", DriverLeaveRequestUiRules.statusLabel("approved")) assertEquals("Zaakceptowany", DriverLeaveRequestUiRules.statusLabel("approved"))
assertEquals("Odrzucony", DriverLeaveRequestUiRules.statusLabel("rejected")) assertEquals("Odrzucony", DriverLeaveRequestUiRules.statusLabel("rejected"))
assertEquals("Anulowanie do decyzji", DriverLeaveRequestUiRules.statusLabel("cancel_requested")) assertEquals("Czeka na anulowanie", DriverLeaveRequestUiRules.statusLabel("cancel_requested"))
assertEquals("Anulowany", DriverLeaveRequestUiRules.statusLabel("cancelled")) assertEquals("Anulowany", DriverLeaveRequestUiRules.statusLabel("cancelled"))
assertEquals("Cofnięto decyzję", DriverLeaveRequestUiRules.statusLabel("revoked")) assertEquals("Akceptacja cofnięta", DriverLeaveRequestUiRules.statusLabel("revoked"))
assertEquals("Nieznany status", DriverLeaveRequestUiRules.statusLabel("some_raw_status")) assertEquals("Nieznany status", DriverLeaveRequestUiRules.statusLabel("some_raw_status"))
} }
@Test
fun explainsAnnualBalanceInDaysAndHours() {
val summary = DriverLeaveSummaryDto(
dailyNormMinutes = 480,
balanceConfigured = true,
pools = listOf(
annualPool(year = 2025, available = 480, reserved = 0, used = 480, granted = 960),
annualPool(year = 2026, available = 3_840, reserved = 960, used = 960, granted = 5_760),
),
)
val totals = DriverLeaveRequestUiRules.annualTotals(summary)
assertEquals(4_320, totals.availableMinutes)
assertEquals(960, totals.reservedMinutes)
assertEquals(1_440, totals.usedMinutes)
assertEquals("9 dni · 72 godz.", DriverLeaveRequestUiRules.formatQuantity(totals.availableMinutes, "minutes", 480))
assertEquals("2 dni + 2 godz. · 18 godz.", DriverLeaveRequestUiRules.formatQuantity(1_080, "minutes", 480))
}
@Test @Test
fun exposesPolishEventActionLabels() { fun exposesPolishEventActionLabels() {
assertEquals("Wniosek złożony", DriverLeaveRequestUiRules.eventActionLabel("submitted")) assertEquals("Wniosek złożony", DriverLeaveRequestUiRules.eventActionLabel("submitted"))
@@ -37,9 +61,78 @@ class DriverLeaveRequestUiRulesTest {
assertEquals("Kierowca poprosił o anulowanie", DriverLeaveRequestUiRules.eventActionLabel("cancellation_requested")) assertEquals("Kierowca poprosił o anulowanie", DriverLeaveRequestUiRules.eventActionLabel("cancellation_requested"))
assertEquals("Anulowanie zatwierdzone", DriverLeaveRequestUiRules.eventActionLabel("cancellation_approved")) assertEquals("Anulowanie zatwierdzone", DriverLeaveRequestUiRules.eventActionLabel("cancellation_approved"))
assertEquals("Anulowanie odrzucone", DriverLeaveRequestUiRules.eventActionLabel("cancellation_rejected")) 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")) 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 @Test
fun driverCanCancelPendingAndFutureApprovedRequests() { fun driverCanCancelPendingAndFutureApprovedRequests() {
val tomorrow = LocalDate.now().plusDays(1).toString() val tomorrow = LocalDate.now().plusDays(1).toString()
@@ -105,4 +198,23 @@ class DriverLeaveRequestUiRulesTest {
phoneNumber = "+48 600 700 800", phoneNumber = "+48 600 700 800",
), ),
) )
private fun annualPool(
year: Int,
available: Int,
reserved: Int,
used: Int,
granted: Int,
): DriverLeavePoolDto =
DriverLeavePoolDto(
id = year,
poolCode = "ANNUAL",
year = year,
unit = "minutes",
availableQuantity = available,
reservedQuantity = reserved,
usedQuantity = used,
grantedQuantity = granted,
status = "active",
)
} }
@@ -8,6 +8,8 @@ import org.junit.Test
import pl.firmatpp.kierowca.data.model.DriverRouteDto import pl.firmatpp.kierowca.data.model.DriverRouteDto
import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto import pl.firmatpp.kierowca.data.model.DispatchSheetReminderDto
import pl.firmatpp.kierowca.data.model.RoutePhotoDto import pl.firmatpp.kierowca.data.model.RoutePhotoDto
import pl.firmatpp.kierowca.data.model.TachographReminderDto
import pl.firmatpp.kierowca.data.model.TachographReminderTaskDto
import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity import pl.firmatpp.kierowca.data.upload.PhotoUploadEntity
import pl.firmatpp.kierowca.data.upload.RouteActionEntity import pl.firmatpp.kierowca.data.upload.RouteActionEntity
import pl.firmatpp.kierowca.data.upload.RouteActionStatus import pl.firmatpp.kierowca.data.upload.RouteActionStatus
@@ -410,6 +412,57 @@ class DriverUiRulesTest {
assertFalse(shouldShowDispatchSheetReminderCard(null)) assertFalse(shouldShowDispatchSheetReminderCard(null))
} }
@Test
fun showsTachographCardOnlyForCompleteReminderEnabledByBackend() {
assertTrue(
shouldShowTachographReminderCard(
TachographReminderDto(
enabled = true,
visible = true,
title = "Odczyt tachografu",
message = "Pamiętaj o odczycie.",
tasks = listOf(tachographTask()),
),
),
)
assertFalse(
shouldShowTachographReminderCard(
TachographReminderDto(
enabled = false,
visible = true,
title = "Odczyt tachografu",
message = "Pamiętaj o odczycie.",
tasks = listOf(tachographTask()),
),
),
)
assertFalse(
shouldShowTachographReminderCard(
TachographReminderDto(
enabled = true,
visible = false,
title = "Odczyt tachografu",
message = "Pamiętaj o odczycie.",
tasks = listOf(tachographTask()),
),
),
)
assertFalse(shouldShowTachographReminderCard(null))
}
@Test
fun preselectsOnlySingleTachographConfirmationTask() {
val driverCard = tachographTask()
val vehicle = TachographReminderTaskDto(
id = "vehicle:12:2026-07-31",
type = "vehicle_tachograph",
label = "Tachograf pojazdu",
)
assertEquals(setOf(driverCard.id), defaultTachographConfirmationSelection(listOf(driverCard)))
assertEquals(emptySet<String>(), defaultTachographConfirmationSelection(listOf(driverCard, vehicle)))
}
@Test @Test
fun explainsOfflineStateWithoutCachedSync() { fun explainsOfflineStateWithoutCachedSync() {
assertEquals( assertEquals(
@@ -817,4 +870,11 @@ class DriverUiRulesTest {
photo = null, photo = null,
canUpload = dueToday, canUpload = dueToday,
) )
private fun tachographTask(): TachographReminderTaskDto =
TachographReminderTaskDto(
id = "driver-card:1:2026-07-31",
type = "driver_card",
label = "Karta kierowcy",
)
} }
@@ -43,6 +43,55 @@ class DriverUiStateTest {
assertEquals(ServerConnectionState.Degraded, failed.serverConnectionState) assertEquals(ServerConnectionState.Degraded, failed.serverConnectionState)
} }
@Test
fun silentRefreshCannotReplaceActiveStartupLoad() {
assertFalse(
shouldStartRoutesLoad(
screen = DriverScreen.Initializing,
navigateToRoutes = false,
startupOfflineOnly = false,
),
)
assertFalse(
shouldStartRoutesLoad(
screen = DriverScreen.Routes,
navigateToRoutes = false,
startupOfflineOnly = false,
startupLoadInProgress = true,
),
)
}
@Test
fun startupAndManualOfflineLoadsRemainAvailable() {
assertTrue(
shouldStartRoutesLoad(
screen = DriverScreen.Initializing,
navigateToRoutes = true,
startupOfflineOnly = false,
),
)
assertTrue(
shouldStartRoutesLoad(
screen = DriverScreen.Initializing,
navigateToRoutes = false,
startupOfflineOnly = true,
),
)
}
@Test
fun successfulBootstrapAlwaysLeavesInitializingScreen() {
assertEquals(
DriverScreen.Routes,
screenAfterBootstrap(
currentScreen = DriverScreen.Initializing,
navigateToRoutes = false,
leaveRequestsEnabled = true,
),
)
}
@Test @Test
fun refreshingLeaveRequestsKeepsDetailScreenOpenAndUpdatesSelectedRequest() { fun refreshingLeaveRequestsKeepsDetailScreenOpenAndUpdatesSelectedRequest() {
val state = DriverUiState( val state = DriverUiState(
@@ -0,0 +1,43 @@
package pl.firmatpp.kierowca.ui
import java.time.LocalDate
import org.junit.Assert.assertEquals
import org.junit.Test
class RouteDatePickerBoundsTest {
@Test
fun usesTheSameMinAndMaxDatesAsTheRouteSelector() {
val bounds = routeDatePickerBounds(
selectedDate = "2026-07-24",
minDate = "2026-07-17",
maxDate = "2026-07-26",
)
assertEquals(LocalDate.parse("2026-07-24"), bounds.selectedDate)
assertEquals(LocalDate.parse("2026-07-17"), bounds.minDate)
assertEquals(LocalDate.parse("2026-07-26"), bounds.maxDate)
}
@Test
fun clampsSelectedDateToAllowedRange() {
val bounds = routeDatePickerBounds(
selectedDate = "2026-07-30",
minDate = "2026-07-17",
maxDate = "2026-07-26",
)
assertEquals(LocalDate.parse("2026-07-26"), bounds.selectedDate)
}
@Test
fun normalizesAccidentallyReversedServerBounds() {
val bounds = routeDatePickerBounds(
selectedDate = "2026-07-24",
minDate = "2026-07-26",
maxDate = "2026-07-17",
)
assertEquals(LocalDate.parse("2026-07-17"), bounds.minDate)
assertEquals(LocalDate.parse("2026-07-26"), bounds.maxDate)
}
}