From 24b9262d57b67b14dc8937465d28c7b7ff54d4ed Mon Sep 17 00:00:00 2001 From: Gius95 Date: Tue, 18 Dec 2018 19:15:59 +0100 Subject: [PATCH 1/2] Implementata stampante secondaria in Vendita. --- .../core/REST/consumers/PrinterRESTConsumer.java | 4 ---- .../viewmodel/RettificaGiacenzeViewModel.java | 4 ---- .../viewmodel/VenditaOrdineInevasoViewModel.java | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java index 8b498f50..346de1c3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/PrinterRESTConsumer.java @@ -3,16 +3,12 @@ package it.integry.integrywmsnative.core.REST.consumers; import android.util.Log; import java.util.List; -import java.util.stream.Stream; -import it.integry.integrywmsnative.core.REST.CommonRESTException; 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.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.core.utility.UtilityString; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; 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 e6ef1bf6..dc357629 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 @@ -362,7 +362,6 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked @Override public void onItemClick(MtbColr item, int position) { - mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED); MtbColr clickedItem = mtbColt.get().getMtbColr().get(position); @@ -371,12 +370,9 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mBinding.bottomSheetActionsSubtitle.setText(clickedItem.getCodMart()); mBinding.bottomSheetActionsEditBtn.setOnClickListener(v -> onItemEdit(item, position)); - mBinding.bottomSheetActionsDeleteBtn.setOnClickListener(v -> onItemDelete(item)); mBinding.bottomSheetActionsQuantity.setText(UtilityNumber.decimalToString(clickedItem.getQtaCol()) + " " + clickedItem.getMtbAart().getUntMis()); - - } public void openLU() { 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 006a5eb9..bbb23db0 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 @@ -690,7 +690,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO private void printCollo(ProgressDialog progress) { - PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), new ISimpleOperationCallback>() { + PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARY,new ISimpleOperationCallback>() { @Override public void onSuccess(List value) { From 258f0a76dab394923b70ef7aacff49aacff075aa Mon Sep 17 00:00:00 2001 From: Gius95 Date: Tue, 18 Dec 2018 19:16:51 +0100 Subject: [PATCH 2/2] -> v1.0.10 (13) --- .idea/caches/build_file_checksums.ser | Bin 728 -> 728 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 770b61dfea15a850d5d322985020d8fb32dec9ce..e54f083bd635b42cc8e18541f3fcdcc819476caf 100644 GIT binary patch delta 35 tcmV+;0NnrB1=t0UnFENc=#iYY5dJW5z<9|ugO6N;LP+7_{Ig*JcL72S5sv@> delta 35 tcmV+;0NnrB1=t0UnFD0_-jSTO5QZx``Yz$uljM;O+1_K)4zpnacL7A~5qbas diff --git a/app/build.gradle b/app/build.gradle index 38f1ad34..23e94df3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId "it.integry.integrywmsnative" minSdkVersion 21 targetSdkVersion 28 - versionCode 12 - versionName "1.0.9" + versionCode 13 + versionName "1.0.10" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }