From 2b112b51e6775423f27259869220306ff4cda4a0 Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 1 Jun 2023 14:42:20 +0200 Subject: [PATCH] refs #5509 upload entry photo endpoint --- .../java/es/verdnatura/domain/SalixService.kt | 16 +++++++++++++- .../PackagingViewModel/SupplierViewModel.kt | 6 ++++++ .../packaging/fragment/SupplierFragment.kt | 21 +++++++++++++++++++ .../pasillero/fragment/PasilleroViewModel.kt | 4 ++-- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index 90aaf5af..c8538606 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -9,11 +9,11 @@ import es.verdnatura.presentation.view.feature.collection.listSaleSalix import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.ShelvingLogSalix import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO import es.verdnatura.presentation.view.feature.login.model.SalixGrupo -import es.verdnatura.presentation.view.feature.login.model.SalixMessageVO import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix import es.verdnatura.presentation.view.feature.packaging.model.Supplier import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake +import okhttp3.MultipartBody import retrofit2.Call import retrofit2.http.* @@ -59,6 +59,20 @@ interface SalixService { ): Call + @Multipart + @POST("Entries/{id}/uploadFile") + fun uploadEntryPhoto( + @Path("id") id: Number, + @Query("warehouseId") warehouseId: Number, + @Query("companyId") companyId: Number, + @Query("dmsTypeId") dmsTypeId: Number, + @Query("reference") reference: String, + @Query("description") description: String, + @Query("hasFile") hasFile: Boolean, + @Part file: MultipartBody.Part, + ): + Call + @POST("tickets/{idTicket}/transferSales") //-->saleMove en Silex fun transferSalesSalix( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt index 6ffb91af..a8c17202 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt @@ -9,6 +9,7 @@ import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.view.feature.packaging.model.* +import okhttp3.MultipartBody import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -134,4 +135,9 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) { } }) } + + fun entry_uploadPhotoSalix(id: Number, warehouseId: Number, companyId: Number, dmsTypeId: Number, reference: String, description: String, hasFile: Boolean, file: MultipartBody.Part) { + salix.uploadEntryPhoto(id, warehouseId, companyId, dmsTypeId, reference, description, hasFile, file) + .enqueue(object : SilexCallback(context){}) + } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt index 254d4b5b..95a1fd0c 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt @@ -14,6 +14,10 @@ import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix import es.verdnatura.presentation.view.feature.packaging.model.Supplier import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat +import okhttp3.MediaType +import okhttp3.MultipartBody +import okhttp3.RequestBody +import java.io.File @Suppress("UNUSED_ANONYMOUS_PARAMETER") @@ -46,6 +50,23 @@ class SupplierFragment( viewModel.getSuppliers( ) + /*val file = File(data.getSign()) + val filePart = MultipartBody.Part.createFormData( + "file", + file.getName(), + RequestBody.create(MediaType.parse("image/png"), file) + ) + viewModel.entry_uploadPhotoSalix( + 1, + 1, + 442, + 21, + "1", + "Example description", + false, + file = filePart + )*/ + super.onCreate(savedInstanceState) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt index 68d703ec..ed4beb09 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt @@ -512,7 +512,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) { )*/ //#tarea4021 - /* _pasillerositem.add( + _pasillerositem.add( PasillerosItemVO( 6, R.drawable.ic_packaging, @@ -520,7 +520,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) { R.string.titlePackaging, contextApp.getString(R.string.titlePackagingDescrip) ) - )*/ + ) val working_in_test=false if (working_in_test){