From 90626b19919cf25bbf2d0d4db3f5c10e394f1bf6 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 6 Aug 2019 12:29:18 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Refresh=20del=20package=20REST=20perch?= =?UTF-8?q?=C3=A9=20GIT=20non=20rileva=20le=20modifiche=20nel=20nome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integrywmsnative/MainActivity.java | 2 +- .../core/context/MainContext.java | 2 +- .../core/rest/model/SlackMessageDTO.java | 4 - .../{rest => resta}/CommonRESTException.java | 2 +- .../core/{rest => resta}/HttpInterceptor.java | 2 +- .../core/{rest => resta}/RESTBuilder.java | 4 +- .../consumers/ArticoloRESTConsumer.java | 6 +- .../ArticoloRESTConsumerService.java | 4 +- .../consumers/BarcodeRESTConsumer.java | 8 +- .../consumers/BarcodeRESTConsumerService.java | 6 +- .../consumers/ColliMagazzinoRESTConsumer.java | 8 +- .../ColliMagazzinoRESTConsumerService.java | 6 +- .../consumers/DepositoRESTConsumer.java | 2 +- .../consumers/EntityRESTConsumer.java | 8 +- .../consumers/EntityRESTConsumerService.java | 4 +- .../consumers/GestSetupRESTConsumer.java | 8 +- .../GestSetupRESTConsumerService.java | 6 +- .../consumers/ISimpleOperationCallback.java | 2 +- .../consumers/PosizioniRESTConsumer.java | 6 +- .../PosizioniRESTConsumerService.java | 4 +- .../consumers/PrinterRESTConsumer.java | 6 +- .../consumers/PrinterRESTConsumerService.java | 4 +- .../consumers/SystemRESTConsumer.java | 12 +-- .../consumers/SystemRESTConsumerService.java | 10 +- .../consumers/_BaseRESTConsumer.java | 8 +- .../deserializer/DateDeserializer.java | 2 +- .../model/AvailableCodMdepsDTO.java | 2 +- .../model/DistribuzioneColloDTO.java | 2 +- .../model/DocumentoResoDTO.java | 2 +- .../{rest => resta}/model/Ean128Model.java | 2 +- .../{rest => resta}/model/Ean13PesoModel.java | 2 +- .../core/{rest => resta}/model/EsitoType.java | 2 +- .../{rest => resta}/model/GestSetupDTO.java | 2 +- .../{rest => resta}/model/MailRequestDTO.java | 2 +- .../model/NativeSqlRequestDTO.java | 2 +- .../model/ServiceRESTResponse.java | 2 +- .../core/resta/model/SlackMessageDTO.java | 4 + .../watcher/ServerStatusChecker.java | 2 +- .../core/settings/DBSettingsModel.java | 4 +- .../core/settings/SettingsManager.java | 10 +- .../core/settings/SettingsModel.java | 2 +- .../core/utility/UtilityExceptions.java | 2 +- .../core/utility/UtilityLogger.java | 2 +- .../MainAccettazioneFragment.java | 2 +- .../accettazione/core/AccettazioneHelper.java | 6 +- ...OrdiniAccettazioneRESTConsumerService.java | 2 +- .../AccettazioneOrdineInevasoActivity.java | 2 +- ...OrdineAccettazioneRowDispatchCallback.java | 2 +- ...ccettazioneInevasoRESTConsumerService.java | 4 +- ...oneOrdineAccettazioneInevasoViewModel.java | 16 +-- .../ContenutoBancaleActivity.java | 2 +- .../viewmodel/ContenutoBancaleViewModel.java | 4 +- .../lista_bancali/ListaBancaliActivity.java | 2 +- .../viewmodel/ListaBancaliViewModel.java | 2 +- .../gest/login/core/LoginHelper.java | 8 +- .../login/rest/LoginRESTConsumerService.java | 2 +- .../gest/login/viewmodel/LoginViewModel.java | 6 +- .../gest/main/MainFragment.java | 4 +- .../viewmodel/PickingLiberoViewModel.java | 12 +-- .../picking_resi/PickingResiActivity.java | 6 +- .../ProdOrdineLavorazioneElencoFragment.java | 2 +- .../core/ProdOrdineLavorazioneHelper.java | 10 +- .../ProdOrdineProduzioneElencoFragment.java | 2 +- .../core/OrdineProduzioneHelper.java | 6 +- .../core/ProdRecuperoMaterialeHelper.java | 4 +- .../ProdVersamentoMaterialViewModel.java | 2 +- .../core/RettificaGiacenzeHelper.java | 4 +- .../viewmodel/RettificaGiacenzeViewModel.java | 14 +-- .../settings/SettingsPreferenceFragment.java | 4 +- .../UltimeConsegneClienteRESTConsumer.java | 8 +- .../UltimeConsegneClienteViewModel.java | 2 +- .../UltimeConsegneMainListAdapter.java | 2 +- .../UltimeConsegneFornitoreFragment.java | 2 +- .../UltimeConsegneFornitoreListAdapter.java | 5 +- .../UltimeConsegneFornitoreRESTConsumer.java | 6 +- .../gest/vendita/MainVenditaFragment.java | 2 +- .../gest/vendita/core/VenditaHelper.java | 10 +- .../gest/vendita/dto/PickingObjectDTO.java | 2 +- .../OrdiniVenditaRESTConsumerService.java | 2 +- .../vendita/viewmodel/VenditaViewModel.java | 4 +- .../VenditaOrdineInevasoActivity.java | 2 +- .../VenditaOrdineInevasoViewModel.java | 53 ++++----- .../viewmodel/VersamentoMerceViewModel.java | 6 +- .../ArticoliInColloBottomSheetViewModel.java | 2 +- .../DialogAskCliente_Page1ViewModel.java | 4 +- .../DialogAskCliente_Page2ViewModel.java | 4 +- .../DialogAskPositionOfLU.java | 2 +- .../DialogChooseArtsFromListaArts.java | 6 +- .../input_quantity/DialogInputQuantity.java | 4 +- .../view/dialogs/scan_art/DialogScanArt.java | 8 +- .../DialogScanOrCreateLU.java | 6 +- ...ragment_articoli_in_collo_bottom_sheet.xml | 101 ++++++++++++------ ...ime_consegne_cliente__list_single_item.xml | 2 +- ...e_consegne_fornitore__list_single_item.xml | 2 +- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../extensions/OrdiniVendita.java | 2 +- .../extensions/OrdiniVendita.java | 2 +- .../extensions/OrdiniVendita.java | 4 +- 99 files changed, 304 insertions(+), 265 deletions(-) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/CommonRESTException.java (97%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/HttpInterceptor.java (96%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/RESTBuilder.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/ArticoloRESTConsumer.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/ArticoloRESTConsumerService.java (78%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/BarcodeRESTConsumer.java (82%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/BarcodeRESTConsumerService.java (55%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/ColliMagazzinoRESTConsumer.java (98%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/ColliMagazzinoRESTConsumerService.java (75%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/DepositoRESTConsumer.java (94%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/EntityRESTConsumer.java (96%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/EntityRESTConsumerService.java (79%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/GestSetupRESTConsumer.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/GestSetupRESTConsumerService.java (76%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/ISimpleOperationCallback.java (66%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/PosizioniRESTConsumer.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/PosizioniRESTConsumerService.java (73%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/PrinterRESTConsumer.java (96%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/PrinterRESTConsumerService.java (89%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/SystemRESTConsumer.java (94%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/SystemRESTConsumerService.java (67%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/consumers/_BaseRESTConsumer.java (93%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/deserializer/DateDeserializer.java (90%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/AvailableCodMdepsDTO.java (89%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/DistribuzioneColloDTO.java (97%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/DocumentoResoDTO.java (98%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/Ean128Model.java (99%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/Ean13PesoModel.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/EsitoType.java (91%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/GestSetupDTO.java (51%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/MailRequestDTO.java (97%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/NativeSqlRequestDTO.java (56%) rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/model/ServiceRESTResponse.java (94%) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java rename app/src/main/java/it/integry/integrywmsnative/core/{rest => resta}/watcher/ServerStatusChecker.java (96%) diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index fce98d84..19cb1fdf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -22,7 +22,7 @@ import android.view.View; import androidx.fragment.app.FragmentTransaction; -import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.resta.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java index 16ccf091..48aed97e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java @@ -7,7 +7,7 @@ import java.lang.reflect.Method; import androidx.appcompat.app.AppCompatActivity; -import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.resta.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java deleted file mode 100644 index 2efbf28e..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java +++ /dev/null @@ -1,4 +0,0 @@ -package it.integry.integrywmsnative.core.rest.model; - -public class SlackMessageDTO { -} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/CommonRESTException.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/CommonRESTException.java index 36c521a0..afef1b75 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/CommonRESTException.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest; +package it.integry.integrywmsnative.core.resta; import java.net.SocketException; import java.net.SocketTimeoutException; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/HttpInterceptor.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/HttpInterceptor.java index bebc2ee8..01e7c1db 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/HttpInterceptor.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest; +package it.integry.integrywmsnative.core.resta; import android.util.Base64; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/RESTBuilder.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/RESTBuilder.java index 4d34814d..c6128dbf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/RESTBuilder.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest; +package it.integry.integrywmsnative.core.resta; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -6,7 +6,7 @@ import com.google.gson.GsonBuilder; import java.sql.Date; import java.util.concurrent.TimeUnit; -import it.integry.integrywmsnative.core.rest.deserializer.DateDeserializer; +import it.integry.integrywmsnative.core.resta.deserializer.DateDeserializer; import it.integry.integrywmsnative.core.settings.SettingsManager; import okhttp3.OkHttpClient; import retrofit2.Retrofit; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumer.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumer.java index 111f53b8..0d9844bd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumer.java @@ -1,12 +1,12 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumerService.java similarity index 78% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumerService.java index adc6cefc..ac1ffb4b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumerService.java @@ -1,6 +1,6 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbAart; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumer.java similarity index 82% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumer.java index 0a4eeff4..7402bebf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumer.java @@ -1,8 +1,8 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumerService.java similarity index 55% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumerService.java index 7bf802d8..c64470a1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumerService.java @@ -1,7 +1,7 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumer.java similarity index 98% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumer.java index f4bb9320..39a9a226 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import android.app.ProgressDialog; import android.content.Context; @@ -15,9 +15,9 @@ import java.util.Iterator; import java.util.List; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; import it.integry.integrywmsnative.core.model.MtbAart; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumerService.java similarity index 75% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumerService.java index e5471436..0ce3f8fb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumerService.java @@ -1,9 +1,9 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import com.google.gson.JsonObject; -import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbColt; import retrofit2.Call; import retrofit2.http.Body; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/DepositoRESTConsumer.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/DepositoRESTConsumer.java index e1a8d5ee..ea4f8cf0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/DepositoRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumer.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumer.java index 4d58dc69..bd95d1a5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import android.util.Log; @@ -10,9 +10,9 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.EsitoType; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.EsitoType; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.EntityBase; import retrofit2.Call; import retrofit2.Callback; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumerService.java similarity index 79% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumerService.java index b0490457..396bae1b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumerService.java @@ -1,11 +1,11 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import com.google.gson.JsonObject; import java.util.List; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.POST; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumer.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumer.java index 2f5eb010..2b22b266 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumer.java @@ -1,10 +1,10 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import android.util.Log; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.GestSetupDTO; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.GestSetupDTO; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityLogger; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumerService.java similarity index 76% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumerService.java index 051b2c12..56dc1c2e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumerService.java @@ -1,7 +1,7 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; -import it.integry.integrywmsnative.core.rest.model.GestSetupDTO; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.GestSetupDTO; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ISimpleOperationCallback.java similarity index 66% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ISimpleOperationCallback.java index ba8a6b72..78755919 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ISimpleOperationCallback.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; public interface ISimpleOperationCallback { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumer.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumer.java index 875936ee..e9dedfe4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import com.google.gson.reflect.TypeToken; @@ -6,8 +6,8 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumerService.java similarity index 73% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumerService.java index f61efcc4..e68510ac 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumerService.java @@ -1,8 +1,8 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import java.util.List; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumer.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumer.java index 9d38a097..f7aa7b72 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumer.java @@ -1,11 +1,11 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import android.util.Log; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.exception.printer.PrinterNotFoundException; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumerService.java similarity index 89% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumerService.java index e9067533..fe1c08dd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumerService.java @@ -1,8 +1,8 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import java.util.List; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumer.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumer.java index bd75142f..e07f183c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import android.text.TextUtils; import android.util.Log; @@ -16,11 +16,11 @@ import java.util.List; import it.integry.integrywmsnative.BuildConfig; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.rest.model.MailRequestDTO; -import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.resta.model.MailRequestDTO; +import it.integry.integrywmsnative.core.resta.model.NativeSqlRequestDTO; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.Azienda; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumerService.java similarity index 67% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumerService.java index 5330f0d7..ab99a1dd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumerService.java @@ -1,11 +1,11 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import java.util.List; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.rest.model.MailRequestDTO; -import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.resta.model.MailRequestDTO; +import it.integry.integrywmsnative.core.resta.model.NativeSqlRequestDTO; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/_BaseRESTConsumer.java similarity index 93% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/_BaseRESTConsumer.java index ba413697..b16a405d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/_BaseRESTConsumer.java @@ -1,12 +1,12 @@ -package it.integry.integrywmsnative.core.rest.consumers; +package it.integry.integrywmsnative.core.resta.consumers; import android.util.Log; import java.util.List; -import it.integry.integrywmsnative.core.rest.CommonRESTException; -import it.integry.integrywmsnative.core.rest.model.EsitoType; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.CommonRESTException; +import it.integry.integrywmsnative.core.resta.model.EsitoType; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityString; import retrofit2.Response; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/deserializer/DateDeserializer.java similarity index 90% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/deserializer/DateDeserializer.java index 5b286de1..87a51bef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/deserializer/DateDeserializer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.deserializer; +package it.integry.integrywmsnative.core.resta.deserializer; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/AvailableCodMdepsDTO.java similarity index 89% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/AvailableCodMdepsDTO.java index e26407cd..db0d090b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/AvailableCodMdepsDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; public class AvailableCodMdepsDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DistribuzioneColloDTO.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/DistribuzioneColloDTO.java index 2166bc46..fddd9939 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DistribuzioneColloDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; public class DistribuzioneColloDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DocumentoResoDTO.java similarity index 98% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/DocumentoResoDTO.java index 4d92d720..a322ff57 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DocumentoResoDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; import java.util.Date; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean128Model.java similarity index 99% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean128Model.java index 6ada378c..c4c1a453 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean128Model.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; public class Ean128Model { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean13PesoModel.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean13PesoModel.java index 3263a3d7..389b63d1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean13PesoModel.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; public class Ean13PesoModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/EsitoType.java similarity index 91% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/EsitoType.java index d9244d8c..57ae773f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/EsitoType.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; /** * Created by GiuseppeS on 06/03/2018. diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/GestSetupDTO.java similarity index 51% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/GestSetupDTO.java index 1437a7d9..6be5e4c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/GestSetupDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; public class GestSetupDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/MailRequestDTO.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/MailRequestDTO.java index ed282c3b..4596e3dc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/MailRequestDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; public class MailRequestDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/NativeSqlRequestDTO.java similarity index 56% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/NativeSqlRequestDTO.java index 5684b5a9..0574c892 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/NativeSqlRequestDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; public class NativeSqlRequestDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/ServiceRESTResponse.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/model/ServiceRESTResponse.java index 0f06e9af..5163b3c7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/ServiceRESTResponse.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.model; +package it.integry.integrywmsnative.core.resta.model; import java.util.Date; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java new file mode 100644 index 00000000..93a877c5 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java @@ -0,0 +1,4 @@ +package it.integry.integrywmsnative.core.resta.model; + +public class SlackMessageDTO { +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/watcher/ServerStatusChecker.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java rename to app/src/main/java/it/integry/integrywmsnative/core/resta/watcher/ServerStatusChecker.java index e3996587..8516ec47 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/resta/watcher/ServerStatusChecker.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.rest.watcher; +package it.integry.integrywmsnative.core.resta.watcher; import android.os.Handler; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 5a64a1c4..3c5af45a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -2,8 +2,8 @@ package it.integry.integrywmsnative.core.settings; import java.util.List; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.resta.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.model.Azienda; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index 6f8e4ded..e879e673 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -8,11 +8,11 @@ import java.net.SocketTimeoutException; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.resta.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityFirebase; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java index bf520924..3d34ffe7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.core.settings; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; public class SettingsModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index de25868a..a6f5f477 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -8,7 +8,7 @@ import com.crashlytics.android.Crashlytics; import com.orhanobut.logger.Logger; import it.integry.integrywmsnative.BuildConfig; -import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.resta.CommonRESTException; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class UtilityExceptions { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index 7622df95..b2ec7b16 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -7,7 +7,7 @@ import java.io.StringWriter; import java.net.SocketTimeoutException; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index e018cc91..40c075f6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.resta.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.ISearcableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java index 860fe92e..516a1d01 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java @@ -9,9 +9,9 @@ import com.annimon.stream.Stream; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.EsitoType; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.EsitoType; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityLogger; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java index f15e4453..d60be857 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java @@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.accettazione.rest; import java.util.List; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java index 7824542e..dbf00ad9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java index 491ce7a0..32b9ccd6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; public interface IOnOrdineAccettazioneRowDispatchCallback { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java index 8f836e69..53a3c73a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityDate; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java index 6a035df9..77613a4b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java @@ -17,14 +17,14 @@ import java.util.Objects; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; -import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java index 2c75f894..1a02076a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java @@ -8,7 +8,7 @@ import android.content.Intent; import android.os.Bundle; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index 901c17f6..309bac35 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -10,8 +10,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.DepositoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.di.BindableString; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index b034afea..175716ad 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java index efe91b42..090b332b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java index 9156a0b0..42b02303 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java @@ -4,10 +4,10 @@ import android.content.Context; import android.util.Log; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.model.EsitoType; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.model.EsitoType; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginDTO; import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumerService; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java index 3b4a601e..f9847fe7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.gest.login.rest; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index 66389586..28e867cf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -13,9 +13,9 @@ import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.context.MainContext; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.di.BindableString; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index dc0321ab..bd4bbf8d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -19,8 +19,8 @@ import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 432b8f77..8b5e521b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -24,12 +24,12 @@ import androidx.databinding.ObservableList; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; -import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 8401c866..d99af77a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; @@ -41,7 +41,7 @@ import it.integry.integrywmsnative.databinding.ActivityPickingResiBinding; import it.integry.integrywmsnative.gest.picking_resi.dto.WithdrawableDtbDocr; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; import it.integry.integrywmsnative.gest.picking_resi.core.PickingResiListAdapter; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java index 27f70062..2103cdbc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.resta.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java index 5c44d1f2..ba1da6a7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java @@ -12,11 +12,11 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.EsitoType; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.EsitoType; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java index 8d468d06..a66d8553 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.resta.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java index 79f77cc6..5176823c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java @@ -8,9 +8,9 @@ import com.annimon.stream.Stream; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.model.EsitoType; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.model.EsitoType; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityLogger; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java index 45ed69c7..fa089c46 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java @@ -8,8 +8,8 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdUL; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java index 84a4e867..ec8e5de0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java @@ -8,7 +8,7 @@ import android.text.SpannableString; import androidx.databinding.ObservableField; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java index 361ac832..8e62de0d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java @@ -8,8 +8,8 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbAartWithFornitore; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index e2183288..5947ce6c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -24,13 +24,13 @@ import java.util.List; import java.util.Objects; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.CommonRESTException; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.CommonRESTException; +import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java index b76482ba..f20f3ca0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java @@ -16,8 +16,8 @@ import android.util.TypedValue; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.settings.SharedPrefKeys; import it.integry.integrywmsnative.core.utility.UtilityArray; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java index e01e8c4c..31bb77c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java @@ -7,16 +7,16 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbDocr; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.gest.picking_resi.dto.WithdrawableDtbDocr; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; public class UltimeConsegneClienteRESTConsumer { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index d1c168bb..e8bf7e5c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -16,7 +16,7 @@ import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteBinding; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; import it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; public class UltimeConsegneClienteViewModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java index a7a04440..2999cbfe 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java @@ -25,7 +25,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListHeaderBinding; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListSingleItemBinding; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider; public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java index ee718b15..91a13b23 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java index b062bcdc..a4278afc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java @@ -5,12 +5,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import androidx.core.content.ContextCompat; -import androidx.core.content.res.ResourcesCompat; import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.RecyclerView; -import com.amulyakhare.textdrawable.TextDrawable; import com.annimon.stream.Stream; import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter; @@ -19,7 +16,7 @@ import java.util.Calendar; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java index 71e6e993..d6d018ff 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java @@ -5,11 +5,11 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityDB; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; public class UltimeConsegneFornitoreRESTConsumer { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 893db7a1..a3279aaf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.resta.CommonRESTException; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index 83045003..fea2f086 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -12,11 +12,11 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.rest.RESTBuilder; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.EsitoType; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.RESTBuilder; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.EsitoType; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java index f10199f1..bbfb78a8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java @@ -7,7 +7,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java index 9d8593c1..786dd087 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java @@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.vendita.rest; import java.util.List; -import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java index 25b2a6de..ff26e7d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java @@ -11,8 +11,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbOrdt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java index d6c75f4f..b512982a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java @@ -10,7 +10,7 @@ import android.view.MenuItem; import java.util.ArrayList; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 6fb80e39..f469f35e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -20,14 +20,13 @@ import java.util.Objects; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; -import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; @@ -91,6 +90,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO private String defaultCodMdepOfUL = null; private List defaultFiltroOrdine = new ArrayList<>(); private String defaultCodAnagOfUL = null; + private String defaultRagSocOfUL = null; private String defaultRifOrdOfUL = null; private Integer defaultNumOrdOfUL = null; private Date defaultDataOrdOfUL = null; @@ -222,6 +222,19 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } + + //Definizione del codAnag + List foundRagSoc = Stream.of(mTestateOrdini) + .map(OrdineVenditaInevasoDTO::getRagSocOrd) +// .withoutNulls() + .distinctBy(x -> x) + .toList(); + + if(foundRagSoc != null && foundRagSoc.size() == 1){ + defaultRagSocOfUL = foundRagSoc.get(0); + } + + //Definizione del rifOrd List foundRifOrd = Stream.of(mTestateOrdini) .map(OrdineVenditaInevasoDTO::getRifOrd) @@ -837,9 +850,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO mtbColt.generaFiltroOrdineFromDTO(defaultFiltroOrdine); ProgressDialog finalProgress = progress; - ColliMagazzinoRESTConsumer.saveCollo(mtbColt, new ISimpleOperationCallback() { - @Override - public void onSuccess(MtbColt value) { + ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> { mtbColt .setNumCollo(value.getNumCollo()) @@ -857,13 +868,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO FBToast.successToast(mActivity, mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); if(onComplete != null) onComplete.run(); - } - - @Override - public void onFailed(Exception ex) { + }, ex ->{ UtilityExceptions.defaultException(mActivity, ex, finalProgress); - } - }); + }); } @@ -1320,9 +1327,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO cloneMtbColt.setMtbColr(new ObservableArrayList()); cloneMtbColt.getMtbColr().add(mtbColr); - ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, new ISimpleOperationCallback() { - @Override - public void onSuccess(MtbColt value) { + ColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, value -> { mtbColr .setDataCollo(value.getDataColloS()) @@ -1345,13 +1350,9 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO progress.dismiss(); if(closeUL) onColloClosed(null); - } - - @Override - public void onFailed(Exception ex) { + }, ex -> { UtilityExceptions.defaultException(mActivity, ex, progress); - } - }); + }); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index 1a74d122..db945f65 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -16,9 +16,9 @@ import java.util.Iterator; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java index dc3dc7df..725bbba2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java @@ -18,7 +18,7 @@ import android.widget.BaseAdapter; import java.lang.ref.WeakReference; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbColr; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java index 3d29a549..918e4bf7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.databinding.DialogAskClientePage1Binding; import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteClienteDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java index 3eaea8fb..c0445de6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.databinding.DialogAskClientePage2Binding; import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java index c589fad1..c35e921c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index 4a728981..3d3f3000 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 5c418283..e11c58d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -30,8 +30,8 @@ import java.util.Date; import java.util.GregorianCalendar; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java index e3c309a0..9d1e1fba 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java @@ -11,10 +11,10 @@ import android.view.LayoutInflater; import androidx.databinding.DataBindingUtil; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.Ean128Model; -import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index facf5564..fe1c9c17 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -14,9 +14,9 @@ import android.view.View; import com.annimon.stream.Stream; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml index 43efda1d..75ab4c3f 100644 --- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml @@ -54,7 +54,8 @@ android:paddingRight="16dp" android:elevation="0dp" android:textAllCaps="true" - android:textSize="16sp"/> + android:textSize="16sp" + style="@style/AppTheme.NewMaterial.Text"/> @@ -131,10 +132,11 @@ @@ -153,8 +155,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - app:layout_constraintGuide_percent="0.40" - app:layout_constraintGuide_begin="100dp" /> + app:layout_constraintGuide_percent="0.40" /> - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + tools:text="TextView" /> @@ -190,24 +192,25 @@ app:layout_constraintGuide_percent="0.40" /> - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + tools:text="TextView" /> @@ -223,24 +226,59 @@ app:layout_constraintGuide_percent="0.40" /> - + + + + + + + + + android:layout_marginStart="8dp" + android:text="@string/customer" + android:textColor="@android:color/black" + app:layout_constraintEnd_toStartOf="@+id/guideline4" + app:layout_constraintStart_toStartOf="parent" /> + + @@ -270,7 +308,7 @@ diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml index fdce7099..92d901a0 100644 --- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml +++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml @@ -5,7 +5,7 @@ + type="it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO" /> + type="it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO" /> Data Posizione Preparato da + Cliente Pezzo diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6e78878c..bae7232c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,6 +92,7 @@ Date Position Prepared by + Customer Picking not available Please scan an item barcode Extra item diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index 8525b193..b7936d0f 100644 --- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -4,7 +4,7 @@ import android.app.ProgressDialog; import java.util.List; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index fcff9ab1..c0cab9b6 100644 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -4,7 +4,7 @@ import android.app.ProgressDialog; import java.util.List; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java index dbd65cea..de569bbe 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java @@ -4,8 +4,8 @@ import android.app.ProgressDialog; import java.util.List; -import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.resta.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; From 694e8a0b52ee02a4655dc23a44fae7c54e2e58ff Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 6 Aug 2019 12:29:44 +0200 Subject: [PATCH 2/5] Ripristino del nome del package REST --- .../integry/integrywmsnative/MainActivity.java | 2 +- .../core/context/MainContext.java | 2 +- .../{resta => rest}/CommonRESTException.java | 2 +- .../core/{resta => rest}/HttpInterceptor.java | 2 +- .../core/{resta => rest}/RESTBuilder.java | 4 ++-- .../consumers/ArticoloRESTConsumer.java | 6 +++--- .../consumers/ArticoloRESTConsumerService.java | 4 ++-- .../consumers/BarcodeRESTConsumer.java | 8 ++++---- .../consumers/BarcodeRESTConsumerService.java | 6 +++--- .../consumers/ColliMagazzinoRESTConsumer.java | 8 ++++---- .../ColliMagazzinoRESTConsumerService.java | 6 +++--- .../consumers/DepositoRESTConsumer.java | 2 +- .../consumers/EntityRESTConsumer.java | 8 ++++---- .../consumers/EntityRESTConsumerService.java | 4 ++-- .../consumers/GestSetupRESTConsumer.java | 8 ++++---- .../consumers/GestSetupRESTConsumerService.java | 6 +++--- .../consumers/ISimpleOperationCallback.java | 2 +- .../consumers/PosizioniRESTConsumer.java | 6 +++--- .../consumers/PosizioniRESTConsumerService.java | 4 ++-- .../consumers/PrinterRESTConsumer.java | 6 +++--- .../consumers/PrinterRESTConsumerService.java | 4 ++-- .../consumers/SystemRESTConsumer.java | 12 ++++++------ .../consumers/SystemRESTConsumerService.java | 10 +++++----- .../consumers/_BaseRESTConsumer.java | 8 ++++---- .../deserializer/DateDeserializer.java | 2 +- .../model/AvailableCodMdepsDTO.java | 2 +- .../model/DistribuzioneColloDTO.java | 2 +- .../{resta => rest}/model/DocumentoResoDTO.java | 2 +- .../core/{resta => rest}/model/Ean128Model.java | 2 +- .../{resta => rest}/model/Ean13PesoModel.java | 2 +- .../core/{resta => rest}/model/EsitoType.java | 2 +- .../core/{resta => rest}/model/GestSetupDTO.java | 2 +- .../{resta => rest}/model/MailRequestDTO.java | 2 +- .../model/NativeSqlRequestDTO.java | 2 +- .../model/ServiceRESTResponse.java | 2 +- .../core/rest/model/SlackMessageDTO.java | 4 ++++ .../watcher/ServerStatusChecker.java | 2 +- .../core/resta/model/SlackMessageDTO.java | 4 ---- .../core/settings/DBSettingsModel.java | 4 ++-- .../core/settings/SettingsManager.java | 10 +++++----- .../core/settings/SettingsModel.java | 2 +- .../core/utility/UtilityExceptions.java | 2 +- .../core/utility/UtilityLogger.java | 2 +- .../accettazione/MainAccettazioneFragment.java | 2 +- .../accettazione/core/AccettazioneHelper.java | 6 +++--- .../OrdiniAccettazioneRESTConsumerService.java | 2 +- .../AccettazioneOrdineInevasoActivity.java | 2 +- ...IOnOrdineAccettazioneRowDispatchCallback.java | 2 +- ...neAccettazioneInevasoRESTConsumerService.java | 4 ++-- ...azioneOrdineAccettazioneInevasoViewModel.java | 16 ++++++++-------- .../ContenutoBancaleActivity.java | 2 +- .../viewmodel/ContenutoBancaleViewModel.java | 4 ++-- .../gest/lista_bancali/ListaBancaliActivity.java | 2 +- .../viewmodel/ListaBancaliViewModel.java | 2 +- .../gest/login/core/LoginHelper.java | 8 ++++---- .../login/rest/LoginRESTConsumerService.java | 2 +- .../gest/login/viewmodel/LoginViewModel.java | 6 +++--- .../integrywmsnative/gest/main/MainFragment.java | 4 ++-- .../viewmodel/PickingLiberoViewModel.java | 12 ++++++------ .../gest/picking_resi/PickingResiActivity.java | 6 +++--- .../ProdOrdineLavorazioneElencoFragment.java | 2 +- .../core/ProdOrdineLavorazioneHelper.java | 10 +++++----- .../ProdOrdineProduzioneElencoFragment.java | 2 +- .../core/OrdineProduzioneHelper.java | 6 +++--- .../core/ProdRecuperoMaterialeHelper.java | 4 ++-- .../ProdVersamentoMaterialViewModel.java | 2 +- .../core/RettificaGiacenzeHelper.java | 4 ++-- .../viewmodel/RettificaGiacenzeViewModel.java | 14 +++++++------- .../settings/SettingsPreferenceFragment.java | 4 ++-- .../rest/UltimeConsegneClienteRESTConsumer.java | 8 ++++---- .../UltimeConsegneClienteViewModel.java | 2 +- .../viewmodel/UltimeConsegneMainListAdapter.java | 2 +- .../UltimeConsegneFornitoreFragment.java | 2 +- .../core/UltimeConsegneFornitoreListAdapter.java | 2 +- .../UltimeConsegneFornitoreRESTConsumer.java | 6 +++--- .../gest/vendita/MainVenditaFragment.java | 2 +- .../gest/vendita/core/VenditaHelper.java | 10 +++++----- .../gest/vendita/dto/PickingObjectDTO.java | 2 +- .../rest/OrdiniVenditaRESTConsumerService.java | 2 +- .../gest/vendita/viewmodel/VenditaViewModel.java | 4 ++-- .../VenditaOrdineInevasoActivity.java | 2 +- .../viewmodel/VenditaOrdineInevasoViewModel.java | 14 +++++++------- .../viewmodel/VersamentoMerceViewModel.java | 6 +++--- .../ArticoliInColloBottomSheetViewModel.java | 2 +- .../DialogAskCliente_Page1ViewModel.java | 4 ++-- .../DialogAskCliente_Page2ViewModel.java | 4 ++-- .../DialogAskPositionOfLU.java | 2 +- .../DialogChooseArtsFromListaArts.java | 6 +++--- .../input_quantity/DialogInputQuantity.java | 4 ++-- .../view/dialogs/scan_art/DialogScanArt.java | 8 ++++---- .../scan_or_create_lu/DialogScanOrCreateLU.java | 6 +++--- ...ultime_consegne_cliente__list_single_item.xml | 2 +- ...time_consegne_fornitore__list_single_item.xml | 2 +- .../extensions/OrdiniVendita.java | 2 +- .../extensions/OrdiniVendita.java | 2 +- .../extensions/OrdiniVendita.java | 4 ++-- 96 files changed, 212 insertions(+), 212 deletions(-) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/CommonRESTException.java (97%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/HttpInterceptor.java (96%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/RESTBuilder.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/ArticoloRESTConsumer.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/ArticoloRESTConsumerService.java (78%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/BarcodeRESTConsumer.java (82%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/BarcodeRESTConsumerService.java (55%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/ColliMagazzinoRESTConsumer.java (98%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/ColliMagazzinoRESTConsumerService.java (75%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/DepositoRESTConsumer.java (94%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/EntityRESTConsumer.java (96%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/EntityRESTConsumerService.java (79%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/GestSetupRESTConsumer.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/GestSetupRESTConsumerService.java (76%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/ISimpleOperationCallback.java (66%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/PosizioniRESTConsumer.java (92%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/PosizioniRESTConsumerService.java (73%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/PrinterRESTConsumer.java (96%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/PrinterRESTConsumerService.java (89%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/SystemRESTConsumer.java (94%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/SystemRESTConsumerService.java (67%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/consumers/_BaseRESTConsumer.java (93%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/deserializer/DateDeserializer.java (90%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/AvailableCodMdepsDTO.java (89%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/DistribuzioneColloDTO.java (97%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/DocumentoResoDTO.java (98%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/Ean128Model.java (99%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/Ean13PesoModel.java (95%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/EsitoType.java (91%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/GestSetupDTO.java (51%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/MailRequestDTO.java (97%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/NativeSqlRequestDTO.java (56%) rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/model/ServiceRESTResponse.java (94%) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java rename app/src/main/java/it/integry/integrywmsnative/core/{resta => rest}/watcher/ServerStatusChecker.java (96%) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 19cb1fdf..fce98d84 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -22,7 +22,7 @@ import android.view.View; import androidx.fragment.app.FragmentTransaction; -import it.integry.integrywmsnative.core.resta.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java index 48aed97e..16ccf091 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java @@ -7,7 +7,7 @@ import java.lang.reflect.Method; import androidx.appcompat.app.AppCompatActivity; -import it.integry.integrywmsnative.core.resta.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/CommonRESTException.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/CommonRESTException.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java index afef1b75..36c521a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/CommonRESTException.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/CommonRESTException.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta; +package it.integry.integrywmsnative.core.rest; import java.net.SocketException; import java.net.SocketTimeoutException; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/HttpInterceptor.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java index 01e7c1db..bebc2ee8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/HttpInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta; +package it.integry.integrywmsnative.core.rest; import android.util.Base64; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/RESTBuilder.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/RESTBuilder.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java index c6128dbf..4d34814d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/RESTBuilder.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/RESTBuilder.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta; +package it.integry.integrywmsnative.core.rest; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -6,7 +6,7 @@ import com.google.gson.GsonBuilder; import java.sql.Date; import java.util.concurrent.TimeUnit; -import it.integry.integrywmsnative.core.resta.deserializer.DateDeserializer; +import it.integry.integrywmsnative.core.rest.deserializer.DateDeserializer; import it.integry.integrywmsnative.core.settings.SettingsManager; import okhttp3.OkHttpClient; import retrofit2.Retrofit; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java index 0d9844bd..111f53b8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java @@ -1,12 +1,12 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java similarity index 78% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java index ac1ffb4b..adc6cefc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ArticoloRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java @@ -1,6 +1,6 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbAart; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java similarity index 82% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java index 7402bebf..0a4eeff4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java @@ -1,8 +1,8 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java similarity index 55% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java index c64470a1..7bf802d8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/BarcodeRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumerService.java @@ -1,7 +1,7 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java similarity index 98% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index 39a9a226..f4bb9320 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.app.ProgressDialog; import android.content.Context; @@ -15,9 +15,9 @@ import java.util.Iterator; import java.util.List; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; import it.integry.integrywmsnative.core.model.MtbAart; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java similarity index 75% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java index 0ce3f8fb..e5471436 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ColliMagazzinoRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java @@ -1,9 +1,9 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.google.gson.JsonObject; -import it.integry.integrywmsnative.core.resta.model.DistribuzioneColloDTO; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbColt; import retrofit2.Call; import retrofit2.http.Body; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/DepositoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/DepositoRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java index ea4f8cf0..e1a8d5ee 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/DepositoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DepositoRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java index bd95d1a5..4d58dc69 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; @@ -10,9 +10,9 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.EsitoType; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.EntityBase; import retrofit2.Call; import retrofit2.Callback; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java similarity index 79% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java index 396bae1b..b0490457 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/EntityRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/EntityRESTConsumerService.java @@ -1,11 +1,11 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.google.gson.JsonObject; import java.util.List; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.POST; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java index 2b22b266..2f5eb010 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java @@ -1,10 +1,10 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.GestSetupDTO; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.GestSetupDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityLogger; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java similarity index 76% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java index 56dc1c2e..051b2c12 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/GestSetupRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumerService.java @@ -1,7 +1,7 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; -import it.integry.integrywmsnative.core.resta.model.GestSetupDTO; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.GestSetupDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ISimpleOperationCallback.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java similarity index 66% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ISimpleOperationCallback.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java index 78755919..ba8a6b72 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/ISimpleOperationCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ISimpleOperationCallback.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; public interface ISimpleOperationCallback { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java similarity index 92% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java index e9dedfe4..875936ee 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import com.google.gson.reflect.TypeToken; @@ -6,8 +6,8 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java similarity index 73% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java index e68510ac..f61efcc4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PosizioniRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PosizioniRESTConsumerService.java @@ -1,8 +1,8 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java index f7aa7b72..9d38a097 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java @@ -1,11 +1,11 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.exception.printer.PrinterNotFoundException; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java similarity index 89% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java index fe1c08dd..e9067533 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/PrinterRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumerService.java @@ -1,8 +1,8 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java index e07f183c..bd75142f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.text.TextUtils; import android.util.Log; @@ -16,11 +16,11 @@ import java.util.List; import it.integry.integrywmsnative.BuildConfig; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.resta.model.MailRequestDTO; -import it.integry.integrywmsnative.core.resta.model.NativeSqlRequestDTO; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.MailRequestDTO; +import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.Azienda; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java similarity index 67% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumerService.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java index ab99a1dd..5330f0d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/SystemRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumerService.java @@ -1,11 +1,11 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.resta.model.MailRequestDTO; -import it.integry.integrywmsnative.core.resta.model.NativeSqlRequestDTO; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.MailRequestDTO; +import it.integry.integrywmsnative.core.rest.model.NativeSqlRequestDTO; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.GET; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java similarity index 93% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/_BaseRESTConsumer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java index b16a405d..ba413697 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/consumers/_BaseRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/_BaseRESTConsumer.java @@ -1,12 +1,12 @@ -package it.integry.integrywmsnative.core.resta.consumers; +package it.integry.integrywmsnative.core.rest.consumers; import android.util.Log; import java.util.List; -import it.integry.integrywmsnative.core.resta.CommonRESTException; -import it.integry.integrywmsnative.core.resta.model.EsitoType; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityString; import retrofit2.Response; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/deserializer/DateDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java similarity index 90% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/deserializer/DateDeserializer.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java index 87a51bef..5b286de1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/deserializer/DateDeserializer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/DateDeserializer.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.deserializer; +package it.integry.integrywmsnative.core.rest.deserializer; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/AvailableCodMdepsDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java similarity index 89% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/AvailableCodMdepsDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java index db0d090b..e26407cd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/AvailableCodMdepsDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/AvailableCodMdepsDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; public class AvailableCodMdepsDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DistribuzioneColloDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/DistribuzioneColloDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java index fddd9939..2166bc46 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DistribuzioneColloDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DistribuzioneColloDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; public class DistribuzioneColloDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DocumentoResoDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java similarity index 98% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/DocumentoResoDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java index a322ff57..4d92d720 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/DocumentoResoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/DocumentoResoDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; import java.util.Date; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean128Model.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java similarity index 99% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean128Model.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java index c4c1a453..6ada378c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean128Model.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean128Model.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; public class Ean128Model { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean13PesoModel.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java similarity index 95% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean13PesoModel.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java index 389b63d1..3263a3d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/Ean13PesoModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/Ean13PesoModel.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; public class Ean13PesoModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/EsitoType.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java similarity index 91% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/EsitoType.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java index 57ae773f..d9244d8c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/EsitoType.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/EsitoType.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; /** * Created by GiuseppeS on 06/03/2018. diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/GestSetupDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java similarity index 51% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/GestSetupDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java index 6be5e4c1..1437a7d9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/GestSetupDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/GestSetupDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; public class GestSetupDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/MailRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java similarity index 97% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/MailRequestDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java index 4596e3dc..ed282c3b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/MailRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/MailRequestDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; public class MailRequestDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/NativeSqlRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java similarity index 56% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/NativeSqlRequestDTO.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java index 0574c892..5684b5a9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/NativeSqlRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/NativeSqlRequestDTO.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; public class NativeSqlRequestDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/ServiceRESTResponse.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java similarity index 94% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/model/ServiceRESTResponse.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java index 5163b3c7..0f06e9af 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/ServiceRESTResponse.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/ServiceRESTResponse.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.model; +package it.integry.integrywmsnative.core.rest.model; import java.util.Date; import java.util.List; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java new file mode 100644 index 00000000..2efbf28e --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/SlackMessageDTO.java @@ -0,0 +1,4 @@ +package it.integry.integrywmsnative.core.rest.model; + +public class SlackMessageDTO { +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/watcher/ServerStatusChecker.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java similarity index 96% rename from app/src/main/java/it/integry/integrywmsnative/core/resta/watcher/ServerStatusChecker.java rename to app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java index 8516ec47..e3996587 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/watcher/ServerStatusChecker.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/watcher/ServerStatusChecker.java @@ -1,4 +1,4 @@ -package it.integry.integrywmsnative.core.resta.watcher; +package it.integry.integrywmsnative.core.rest.watcher; import android.os.Handler; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java deleted file mode 100644 index 93a877c5..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/core/resta/model/SlackMessageDTO.java +++ /dev/null @@ -1,4 +0,0 @@ -package it.integry.integrywmsnative.core.resta.model; - -public class SlackMessageDTO { -} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 3c5af45a..5a64a1c4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -2,8 +2,8 @@ package it.integry.integrywmsnative.core.settings; import java.util.List; -import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; -import it.integry.integrywmsnative.core.resta.model.DistribuzioneColloDTO; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.model.Azienda; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index e879e673..6f8e4ded 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -8,11 +8,11 @@ import java.net.SocketTimeoutException; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.GestSetupRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityFirebase; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java index 3d34ffe7..bf520924 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsModel.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.core.settings; -import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; public class SettingsModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index a6f5f477..de25868a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -8,7 +8,7 @@ import com.crashlytics.android.Crashlytics; import com.orhanobut.logger.Logger; import it.integry.integrywmsnative.BuildConfig; -import it.integry.integrywmsnative.core.resta.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class UtilityExceptions { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index b2ec7b16..7622df95 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -7,7 +7,7 @@ import java.io.StringWriter; import java.net.SocketTimeoutException; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index 40c075f6..e018cc91 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.ISearcableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java index 516a1d01..860fe92e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java @@ -9,9 +9,9 @@ import com.annimon.stream.Stream; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.EsitoType; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityLogger; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java index d60be857..f15e4453 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java @@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.accettazione.rest; import java.util.List; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java index dbf00ad9..7824542e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/AccettazioneOrdineInevasoActivity.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java index 32b9ccd6..491ce7a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/IOnOrdineAccettazioneRowDispatchCallback.java @@ -1,6 +1,6 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; public interface IOnOrdineAccettazioneRowDispatchCallback { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java index 53a3c73a..8f836e69 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/rest/OrdineAccettazioneInevasoRESTConsumerService.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityDate; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java index 77613a4b..6a035df9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java @@ -17,14 +17,14 @@ import java.util.Objects; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.GestSetupRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; -import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.CommonModelConsts; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java index 1a02076a..2c75f894 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/ContenutoBancaleActivity.java @@ -8,7 +8,7 @@ import android.content.Intent; import android.os.Bundle; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.databinding.ActivityContenutoBancaleBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index 309bac35..901c17f6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -10,8 +10,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.DepositoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.di.BindableString; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index 175716ad..b034afea 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.databinding.ActivityListaBancaliBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java index 090b332b..efe91b42 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/viewmodel/ListaBancaliViewModel.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java index 42b02303..9156a0b0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/core/LoginHelper.java @@ -4,10 +4,10 @@ import android.content.Context; import android.util.Log; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.model.EsitoType; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginDTO; import it.integry.integrywmsnative.gest.login.rest.LoginRESTConsumerService; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java index f9847fe7..3b4a601e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/rest/LoginRESTConsumerService.java @@ -1,7 +1,7 @@ package it.integry.integrywmsnative.gest.login.rest; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index 28e867cf..66389586 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -13,9 +13,9 @@ import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.AvailableCodMdepsDTO; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.AvailableCodMdepsDTO; import it.integry.integrywmsnative.core.context.MainContext; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.di.BindableString; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index bd4bbf8d..dc0321ab 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -19,8 +19,8 @@ import java.util.List; import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.watcher.ServerStatusChecker; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 8b5e521b..432b8f77 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -24,12 +24,12 @@ import androidx.databinding.ObservableList; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; -import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index d99af77a..8401c866 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; @@ -41,7 +41,7 @@ import it.integry.integrywmsnative.databinding.ActivityPickingResiBinding; import it.integry.integrywmsnative.gest.picking_resi.dto.WithdrawableDtbDocr; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; import it.integry.integrywmsnative.gest.picking_resi.core.PickingResiListAdapter; -import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java index 2103cdbc..27f70062 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/ProdOrdineLavorazioneElencoFragment.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java index ba1da6a7..5c44d1f2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_lavorazione/core/ProdOrdineLavorazioneHelper.java @@ -12,11 +12,11 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.EsitoType; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java index a66d8553..8d468d06 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java index 5176823c..79f77cc6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneHelper.java @@ -8,9 +8,9 @@ import com.annimon.stream.Stream; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.model.EsitoType; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityLogger; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java index fa089c46..45ed69c7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java @@ -8,8 +8,8 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdUL; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java index ec8e5de0..84a4e867 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java @@ -8,7 +8,7 @@ import android.text.SpannableString; import androidx.databinding.ObservableField; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java index 8e62de0d..361ac832 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/RettificaGiacenzeHelper.java @@ -8,8 +8,8 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbAartWithFornitore; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index 5947ce6c..e2183288 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -24,13 +24,13 @@ import java.util.List; import java.util.Objects; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.CommonRESTException; -import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java index f20f3ca0..b76482ba 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java @@ -16,8 +16,8 @@ import android.util.TypedValue; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.settings.SharedPrefKeys; import it.integry.integrywmsnative.core.utility.UtilityArray; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java index 31bb77c1..e01e8c4c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/rest/UltimeConsegneClienteRESTConsumer.java @@ -7,16 +7,16 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbDocr; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.gest.picking_resi.dto.WithdrawableDtbDocr; -import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; public class UltimeConsegneClienteRESTConsumer { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java index e8bf7e5c..d1c168bb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java @@ -16,7 +16,7 @@ import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteBinding; import it.integry.integrywmsnative.gest.ultime_consegne_cliente.rest.UltimeConsegneClienteRESTConsumer; import it.integry.integrywmsnative.gest.picking_resi.PickingResiActivity; -import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; public class UltimeConsegneClienteViewModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java index 2999cbfe..a7a04440 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java @@ -25,7 +25,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListHeaderBinding; import it.integry.integrywmsnative.databinding.FragmentMainUltimeConsegneClienteListSingleItemBinding; -import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider; public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java index 91a13b23..ee718b15 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/UltimeConsegneFornitoreFragment.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.settings.SettingsManager; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java index a4278afc..7ac282dc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/core/UltimeConsegneFornitoreListAdapter.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java index d6d018ff..71e6e993 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_fornitore/rest/UltimeConsegneFornitoreRESTConsumer.java @@ -5,11 +5,11 @@ import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityDB; -import it.integry.integrywmsnative.core.resta.model.DocumentoResoDTO; +import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; public class UltimeConsegneFornitoreRESTConsumer { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index a3279aaf..893db7a1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.CommonRESTException; +import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index fea2f086..83045003 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -12,11 +12,11 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import it.integry.integrywmsnative.core.resta.RESTBuilder; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.EsitoType; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.EsitoType; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java index bbfb78a8..f10199f1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java @@ -7,7 +7,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java index 786dd087..9d8593c1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/OrdiniVenditaRESTConsumerService.java @@ -2,7 +2,7 @@ package it.integry.integrywmsnative.gest.vendita.rest; import java.util.List; -import it.integry.integrywmsnative.core.resta.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java index ff26e7d7..25b2a6de 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java @@ -11,8 +11,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.model.DtbOrdt; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java index b512982a..d6c75f4f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/VenditaOrdineInevasoActivity.java @@ -10,7 +10,7 @@ import android.view.MenuItem; import java.util.ArrayList; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.data_cache.DataCache; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index f469f35e..0c08c0f1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -20,13 +20,13 @@ import java.util.Objects; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; -import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.PrinterRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; -import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index db945f65..1a74d122 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -16,9 +16,9 @@ import java.util.Iterator; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java index 725bbba2..dc3dc7df 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java @@ -18,7 +18,7 @@ import android.widget.BaseAdapter; import java.lang.ref.WeakReference; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbColr; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java index 918e4bf7..3d29a549 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.databinding.DialogAskClientePage1Binding; import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteClienteDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java index c0445de6..3eaea8fb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ISimpleOperationCallback; -import it.integry.integrywmsnative.core.resta.consumers.SystemRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; +import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.databinding.DialogAskClientePage2Binding; import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java index c35e921c..c589fad1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index 3d3f3000..4a728981 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.di.BindableBoolean; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index e11c58d7..5c418283 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -30,8 +30,8 @@ import java.util.Date; import java.util.GregorianCalendar; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java index 9d1e1fba..e3c309a0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArt.java @@ -11,10 +11,10 @@ import android.view.LayoutInflater; import androidx.databinding.DataBindingUtil; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.ArticoloRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.model.Ean128Model; -import it.integry.integrywmsnative.core.resta.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index fe1c9c17..facf5564 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -14,9 +14,9 @@ import android.view.View; import com.annimon.stream.Stream; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.resta.consumers.BarcodeRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.ColliMagazzinoRESTConsumer; -import it.integry.integrywmsnative.core.resta.consumers.PosizioniRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.RunnableArgs; diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml index 92d901a0..fdce7099 100644 --- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml +++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml @@ -5,7 +5,7 @@ + type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" /> + type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" /> Date: Thu, 8 Aug 2019 16:35:17 +0200 Subject: [PATCH 3/5] Nuove implementazioni su RecuperoMateriale --- .../integrywmsnative/core/model/MtbColt.java | 14 +- .../ProdRecuperoMaterialeFragment.java | 2 - .../core/HistoryULsListAdapter.java | 9 +- .../core/ProdRecuperoMaterialeHelper.java | 41 +++++- .../dto/HistoryVersamentoProdUL.java | 13 ++ .../ProdRecuperoMaterialeViewModel.java | 135 ++++++++++++++++++ .../VenditaOrdineInevasoViewModel.java | 3 +- .../ArticoliInColloBottomSheetViewModel.java | 13 ++ ...ragment_articoli_in_collo_bottom_sheet.xml | 4 +- 9 files changed, 226 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index 9503f75c..da604c82 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -59,6 +59,7 @@ public class MtbColt extends EntityBase { public List mtbCols; private Boolean disablePrint; + private String ragSocCliente; public void generaFiltroOrdine() throws Exception { @@ -100,11 +101,13 @@ public class MtbColt extends EntityBase { setSerCollo("/"); } - public void initDefaultFields() { + public MtbColt initDefaultFields() { setCodMdep(SettingsManager.i().userSession.depo.getCodMdep()); setPreparatoDa(SettingsManager.i().user.fullname); setOraInizPrep(UtilityDate.getDateInstance()); setCodAnag(SettingsManager.iDB().getDefaultCodAnag()); + + return this; } @@ -470,6 +473,15 @@ public class MtbColt extends EntityBase { return this; } + public String getRagSocCliente() { + return ragSocCliente; + } + + public MtbColt setRagSocCliente(String ragSocCliente) { + this.ragSocCliente = ragSocCliente; + return this; + } + public void generaFiltroOrdineFromDTO(List filtroOrdineDtos) { String xmlPrefix = "{\"whereCond\": \""; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java index 606f094d..54b9bec3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java @@ -66,8 +66,6 @@ public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFr ((IPoppableActivity) getActivity()).pop(); }); -// mViewmodel.openLU(); - } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java index e67f4c05..b062b5cf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/HistoryULsListAdapter.java @@ -13,6 +13,7 @@ import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter; import java.util.List; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListHeaderBinding; import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListItemBinding; @@ -28,6 +29,8 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter mDataset; + private RunnableArgs mOnItemClicked; + static class SubheaderHolder extends RecyclerView.ViewHolder { ProdRecuperoMaterialeListHeaderBinding binding; @@ -57,6 +60,10 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter onItemClicked) { + this.mOnItemClicked = onItemClicked; + } + public void updateItems(List updatedDataset) { mDataset.clear(); mDataset.addAll(orderItems(updatedDataset)); @@ -112,7 +119,7 @@ public class HistoryULsListAdapter extends SectionedRecyclerViewAdapter { - + if(this.mOnItemClicked != null) this.mOnItemClicked.run(ul); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java index 45ed69c7..cce0db8a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java @@ -2,12 +2,15 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.core; import android.content.Context; +import com.annimon.stream.Stream; import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; +import it.integry.integrywmsnative.core.model.MtbAart; +import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback; import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; import it.integry.integrywmsnative.core.expansion.RunnableArgs; @@ -73,8 +76,42 @@ public class ProdRecuperoMaterialeHelper { Type typeOfObjectsList = new TypeToken>() {}.getType(); SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback>() { @Override - public void onSuccess(List value) { - onComplete.run(value); + public void onSuccess(List ulList) { + + if(ulList != null && ulList.size() > 0){ + List codMarts = Stream.of(ulList) + .map(HistoryVersamentoProdUL::getCodMart) + .withoutNulls() + .distinct() + .toList(); + + ArticoloRESTConsumer.getByCodMart(codMarts, arts -> { + + if(arts != null && arts.size() > 0) { + for (HistoryVersamentoProdUL value : ulList) { + + MtbAart foundMtbAart = null; + + List mtbAartStream = Stream.of(arts) + .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList(); + + if(mtbAartStream != null && mtbAartStream.size() > 0){ + foundMtbAart = mtbAartStream.get(0); + } + + value.setMtbAart(foundMtbAart); + } + + + onComplete.run(ulList); + } + + }, onFailed); + + } else { + onComplete.run(ulList); + } + } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdUL.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdUL.java index 2ed7327b..1f14606d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdUL.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/dto/HistoryVersamentoProdUL.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale.dto; import java.math.BigDecimal; +import it.integry.integrywmsnative.core.model.MtbAart; + public class HistoryVersamentoProdUL { @@ -22,6 +24,8 @@ public class HistoryVersamentoProdUL { private String descrizioneArt; private String untMis; + private MtbAart mtbAart; + public String getGestione() { return gestione; } @@ -165,4 +169,13 @@ public class HistoryVersamentoProdUL { this.untMis = untMis; return this; } + + public MtbAart getMtbAart() { + return mtbAart; + } + + public HistoryVersamentoProdUL setMtbAart(MtbAart mtbAart) { + this.mtbAart = mtbAart; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java index 0d514c21..367c516a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java @@ -6,18 +6,32 @@ import android.content.Context; import android.text.Html; import android.text.SpannableString; +import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableField; import androidx.recyclerview.widget.LinearLayoutManager; +import com.tfb.fbtoast.FBToast; + import java.math.BigDecimal; import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IPoppableActivity; +import it.integry.integrywmsnative.core.model.CommonModelConsts; +import it.integry.integrywmsnative.core.model.MtbAart; +import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; +import it.integry.integrywmsnative.core.report.ReportManager; +import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; +import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; +import it.integry.integrywmsnative.core.rest.model.Ean128Model; +import it.integry.integrywmsnative.core.settings.SettingsManager; +import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityPosizione; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; @@ -26,7 +40,10 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.HistoryULsL import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper; import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdUL; import it.integry.integrywmsnative.gest.prod_recupero_materiale.views.InputQuantityToReturnDialog; +import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; +import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU; public class ProdRecuperoMaterialeViewModel { @@ -125,9 +142,127 @@ public class ProdRecuperoMaterialeViewModel { private void initRecyclerView(List historyULs) { mAdapter = new HistoryULsListAdapter(mContext, historyULs); + mAdapter.setOnItemClicked(this::onListItemClicked); mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(mContext)); mBinding.prodRecuperoMaterialeMainList.setAdapter(mAdapter); } + private void onListItemClicked(HistoryVersamentoProdUL item) { + BigDecimal qtaDaEvadere = BigDecimal.ZERO; + + qtaDaEvadere = qtaDaEvadere.add(item.getQtaCol()); + + DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO() + .setBatchLot(item.getPartitaMag()) + .setMtbAart(item.getMtbAart()) + .setQtaDisponibile(qtaDaEvadere) + .setQtaTot(qtaDaEvadere) + .setCanPartitaMagBeChanged(false) + .setMaxQta(qtaDaEvadere); + + + DialogInputQuantity.makeBase(mContext, dto, false, (quantityDTO) -> { + onItemDispatched(item, quantityDTO); + }, () -> { + BarcodeManager.enable(); + }).show(); + } + + private void onItemDispatched(HistoryVersamentoProdUL item, QuantityDTO quantityDTO) { + + final ProgressDialog progress = UtilityProgress.createDefaultProgressDialog(mContext); + + final MtbColt mtbColt = new MtbColt() + .initDefaultFields() + .setGestione(GestioneEnum.LAVORAZIONE) + .setSegno(+1) + .setMtbColr(new ObservableArrayList<>()); + mtbColt + .setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + + final MtbColr mtbColr = new MtbColr() + .setCodMart(item.getCodMart()) + .setPartitaMag(UtilityString.empty2null(quantityDTO.batchLot.get())) + .setQtaCol(quantityDTO.qtaTot.getBigDecimal()) + .setQtaCnf(quantityDTO.qtaCnf.getBigDecimal()) + .setNumCnf(quantityDTO.numCnf.getBigDecimal()) + .setDescrizione(UtilityString.isNullOrEmpty(item.getMtbAart().getDescrizioneEstesa()) ? item.getMtbAart().getDescrizione() : item.getMtbAart().getDescrizioneEstesa()) + .setDatetimeRow(UtilityDate.getDateInstance()); + + + + mtbColr.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE); + mtbColt.getMtbColr().add(mtbColr); + + ColliMagazzinoRESTConsumer.saveCollo(mtbColt, value -> { + + FBToast.successToast(mContext, mContext.getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + + printCollo(progress, value, () -> { + mOnRecuperoCompleted.run(); + }); + + }, ex -> { + UtilityExceptions.defaultException(mContext, ex, progress); + }); + + } + + + private void printCollo(ProgressDialog progress, MtbColt mtbColtToPrint, Runnable onComplete) { + DialogAskShouldPrint.make(mContext, "Packing List", shouldPrint -> { + + if(shouldPrint) { + PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, printerList -> { + + if (printerList.size() > 0) { + try { + singlePrint(mtbColtToPrint, printerList.get(0), () -> { + onComplete.run(); + progress.dismiss(); + }, ex -> { + progress.dismiss(); + String errorMessage = ex.getMessage(); + DialogSimpleMessageHelper.makeErrorDialog( + mContext, + new SpannableString(errorMessage), + null, + null, + R.string.button_ignore_print, + onComplete).show(); + }); + + } catch (Exception ex) { + UtilityExceptions.defaultException(mContext, ex, progress); + onComplete.run(); + } + } else { + progress.dismiss(); + String errorMessage = "Nessuna stampante configurata"; + DialogSimpleMessageHelper.makeWarningDialog(mContext, new SpannableString(errorMessage), null, onComplete).show(); + } + }, ex -> { + UtilityExceptions.defaultException(mContext, ex, progress); + }); + } else { + onComplete.run(); + progress.dismiss(); + } + }).show(); + } + + + + private void singlePrint(MtbColt mtbColtToPrint, String printerName, Runnable onComplete, RunnableArgs onAbort) { + ReportManager.getRightReportNameByGestione(mtbColtToPrint.getGestioneEnum(), reportName -> { + + PrinterRESTConsumer.printCollo( + printerName, + mtbColtToPrint, + 1, + reportName, onComplete, onAbort); + + }, onAbort); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 0c08c0f1..e907dd02 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -859,7 +859,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO value .setDisablePrint(disablePrint) - .setMtbColr(new ObservableArrayList<>()); + .setMtbColr(new ObservableArrayList<>()) + .setRagSocCliente(defaultRagSocOfUL); setULToCurrentContext(value); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java index dc3dc7df..d0ce723f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java @@ -8,6 +8,11 @@ import androidx.databinding.ObservableField; import androidx.databinding.ObservableList; import androidx.annotation.NonNull; import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.google.android.material.shape.CornerFamily; +import com.google.android.material.shape.CornerTreatment; +import com.google.android.material.shape.MaterialShapeDrawable; +import com.google.android.material.shape.ShapeAppearanceModel; + import androidx.appcompat.app.AppCompatActivity; import android.text.SpannableString; import android.view.LayoutInflater; @@ -57,6 +62,14 @@ public class ArticoliInColloBottomSheetViewModel { mBindings.setViewModel(this); +// ShapeAppearanceModel shapeAppearanceModel = new ShapeAppearanceModel(); +// +// shapeAppearanceModel.setTopLeftCorner(CornerFamily.ROUNDED, 6); +// shapeAppearanceModel.setTopRightCorner(CornerFamily.ROUNDED, 6); +// +// MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(shapeAppearanceModel); +// mBindings.getRoot().setBackground(materialShapeDrawable); + mtbColt.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() { @Override public void onPropertyChanged(Observable sender, int propertyId) { diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml index 75ab4c3f..e8fdc40b 100644 --- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml @@ -169,6 +169,7 @@ app:layout_constraintStart_toStartOf="parent" /> Date: Fri, 30 Aug 2019 13:01:53 +0200 Subject: [PATCH 4/5] Fix vari --- .idea/caches/build_file_checksums.ser | Bin 964 -> 964 bytes .idea/codeStyles/Project.xml | 116 +++++++++ .idea/runConfigurations/app.xml | 2 +- .../integrywmsnative/MainActivity.java | 2 +- .../consumers/ColliMagazzinoRESTConsumer.java | 2 +- .../rest/consumers/EntityRESTConsumer.java | 7 +- .../rest/consumers/PrinterRESTConsumer.java | 6 + .../core/settings/SettingsManager.java | 2 - .../core/settings/SettingsModel.java | 1 + .../core/utility/UtilityDate.java | 10 +- ...oneOrdineAccettazioneInevasoViewModel.java | 49 +++- .../core/HistoryULsListAdapter.java | 2 - .../core/ProdRecuperoMaterialeHelper.java | 2 + .../dto/HistoryVersamentoProdUL.java | 10 + .../ProdRecuperoMaterialeViewModel.java | 119 ++++----- .../vendita/core/MainListVenditaAdapter.java | 15 +- app/src/main/res/layout/dialog_base.xml | 227 +++++++++--------- .../res/layout/vendita_main_list_model.xml | 27 ++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 20 files changed, 406 insertions(+), 199 deletions(-) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index efd9b6c58f9f545ef0f2b9e996197244842b8a5a..576447734c3bfd1ba16978d5704ba1f29e83b50c 100644 GIT binary patch delta 68 zcmV-K0K5Oh2gC=Em;}vHx}&k2ZUK`=0zn2KdSzmAVUtk;C6hG*5(E%oaB!1f0vD5` a0&)=6M26fqUMe9<-K*Rx0)BgwB?F&iDHz)T delta 57 zcmV-90LK5s2gC=Em;`1~-7vA7ZUK`^0zH!o0zm{2VQ_GhUji4CqXKdeHQI(~4hw61 P!i{@P^SW6;lO+S6RRt9e diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..681f41ae --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml index 52f57fad..2845a8ea 100644 --- a/.idea/runConfigurations/app.xml +++ b/.idea/runConfigurations/app.xml @@ -6,7 +6,7 @@ diff --git a/build.gradle b/build.gradle index bce98564..11d0df20 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.2.0' classpath 'com.google.firebase:perf-plugin:1.2.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7ae5a961..9d810b90 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 18 18:31:44 CEST 2019 +#Mon Aug 26 11:42:29 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From 6932d500e4f78fe0e10cf6e0059d31aaba1476ed Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 30 Aug 2019 13:03:18 +0200 Subject: [PATCH 5/5] -> v1.7.1(78) --- .idea/caches/build_file_checksums.ser | Bin 964 -> 964 bytes app/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 576447734c3bfd1ba16978d5704ba1f29e83b50c..5aa02ab06702efd34275ce5dbbc57db4aa87090a 100644 GIT binary patch delta 54 zcmV-60LlNv2gC=Em;~Z6YQC|YZUK`^0zH!o0zm{2VQ_GhUji2pxebWu`3XPoi;sV< M0|}vYv$Fyb0Xp3jZvX%Q delta 65 zcmV-H0KWgk2gC=Em;}vHx}&k2ZUK`=0zn2KdSzmAVUtk;C6hG*5(E%oaB!1f0v8ZN X-Wg}>O(g;qy}j?7_gO%*vjPzT8Z{To diff --git a/app/build.gradle b/app/build.gradle index be40911c..292907f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 77 - def appVersionName = '1.7.0' + def appVersionCode = 78 + def appVersionName = '1.7.1' signingConfigs { release {