From 623354541881b6e2926f42db2094f306cf1578f5 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Fri, 14 Feb 2025 12:15:06 +0100 Subject: [PATCH] feat: refs #7920 shelvingFkMerge --- .../main/java/es/verdnatura/dataStore/DataStoreLocal.kt | 8 ++++++-- .../view/feature/packaging/model/EntrySalix.kt | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt b/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt index 1077b911..fb709efe 100644 --- a/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt +++ b/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt @@ -17,7 +17,9 @@ import es.verdnatura.domain.ConstAndValues.BASEURLLILIUM import es.verdnatura.domain.ConstAndValues.BASEURLSALIX import es.verdnatura.domain.ConstAndValues.BASE_URL_LILIUM import es.verdnatura.domain.ConstAndValues.BASE_URL_SALIX +import es.verdnatura.domain.ConstAndValues.COMPANYFK import es.verdnatura.domain.ConstAndValues.ENTRYID +import es.verdnatura.domain.ConstAndValues.ENTRYNUMBERIMAGES import es.verdnatura.domain.ConstAndValues.ENTRYOBSERVATIONORIGINAL import es.verdnatura.domain.ConstAndValues.ENTRYOBSERVATIONS import es.verdnatura.domain.ConstAndValues.ITEMPACKING @@ -261,11 +263,13 @@ class DataStoreLocal(var mobileApplication: MobileApplication) { } suspend fun deleteEntryPackaging() { - mobileApplication.dataStoreApp.editDataStoreKey(ENTRYID, "") - mobileApplication.dataStoreApp.editDataStoreKey(SUPPLIERID, "") + mobileApplication.dataStoreApp.editDataStoreKey(ENTRYID, -1) + mobileApplication.dataStoreApp.editDataStoreKey(SUPPLIERID, -1) mobileApplication.dataStoreApp.editDataStoreKey(SUPPLIERNAME, "") mobileApplication.dataStoreApp.editDataStoreKey(ENTRYOBSERVATIONORIGINAL, "") mobileApplication.dataStoreApp.editDataStoreKey(ENTRYOBSERVATIONS, "") + mobileApplication.dataStoreApp.editDataStoreKey(ENTRYNUMBERIMAGES, 0) + mobileApplication.dataStoreApp.editDataStoreKey(COMPANYFK, -1) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt index 242db252..86cef731 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt @@ -9,7 +9,7 @@ data class EntrySalix( var created: String? = null, var supplierFk: Number? = null, var travelFk: Number? = null, - var companyFk: Number? = null, + var companyFk: Number, var observation: String? = null, var travel: TravelSalix? = null, var isError: Boolean = false, @@ -29,7 +29,8 @@ fun List.toDateFormat(): ArrayList { entries.add( EntrySalix( dated = convertToDateString(it.dated), - created = convertToDateString(it.created) + created = convertToDateString(it.created), + companyFk = it.companyFk ) ) @@ -46,3 +47,7 @@ data class NotificationQueue( val authorFk: Int, val params: String ) + +data class DmsType( + val id: Int +)