diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 662989fb..58830068 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -226,14 +226,7 @@ public class MainActivity extends AppCompatActivity private void init(){ - if(BarcodeManager.getCurrentBarcodeInterface() != null) { -// DialogSimpleMessageHelper.makeInfoDialog(this, -// "Lettore barcode", -// new SpannableString("Trovato adattatore " + BarcodeManager.getCurrentBarcodeInterface().getAdapterName() + " installato nel sistema"), -// null, null).show(); - } - //Preload done in splashPage - onDBLoaded(); + initSessionData(); ServerStatusChecker.getIstance().addCallback(value -> { if(value && (!mIsOnline || firstCheckExecution)){ @@ -242,7 +235,6 @@ public class MainActivity extends AppCompatActivity mIsOnline = true; firstCheckExecution = false; - onDBLoaded(); }, ex -> { //mNoConnectionLayout.expand(true); if(!mIsOnline) mIsOnline = false; @@ -257,14 +249,18 @@ public class MainActivity extends AppCompatActivity } - private void onDBLoaded() { + private void initSessionData() { LinearLayout headerLayout = (LinearLayout) mBinding.navView.getHeaderView(0); - ((TextView) headerLayout.findViewById(R.id.drawer_username)).setText(SettingsManager.i().user.fullname); - ((TextView) headerLayout.findViewById(R.id.drawer_deposito)).setText(SettingsManager.i().userSession.depo.getCodMdep() + " - " + SettingsManager.i().userSession.depo.getDescrizione()); + TextView textViewUsername = headerLayout.findViewById(R.id.drawer_username); + textViewUsername.setText(SettingsManager.i().user.fullname); + + TextView textViewDeposito = headerLayout.findViewById(R.id.drawer_deposito); + textViewDeposito.setText(String.format("%s - %s", SettingsManager.i().userSession.depo.getCodMdep(), SettingsManager.i().userSession.depo.getDescrizione())); if(SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) { - ((ImageView) headerLayout.findViewById(R.id.drawer_logoAzienda)).setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo()); + ImageView imageViewLogoAzienda = headerLayout.findViewById(R.id.drawer_logoAzienda); + imageViewLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo()); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java index bd71320c..9321c9db 100644 --- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java @@ -63,7 +63,12 @@ public class SplashActivity extends AppCompatActivity { try { PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0); String version = pInfo.versionName; - appVersionTextView.setText("v" + version); + + String debugText = ""; + + if(BuildConfig.DEBUG) debugText += "\n[DEBUG VERSION]"; + + appVersionTextView.setText("v" + version + debugText); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java index 25af3c1a..e78dc715 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java @@ -1,9 +1,11 @@ package it.integry.integrywmsnative.core.REST.consumers; import com.annimon.stream.Stream; +import com.google.gson.Gson; import com.google.gson.JsonObject; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.List; @@ -178,7 +180,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{ } - public static void distribuisciCollo(MtbColt mtbColtToDistribute, DistribuzioneColloDTO.CriterioDistribuzione criterioDistribuzione, Runnable onComplete, RunnableArgs onFailed) { + public static void distribuisciCollo(MtbColt mtbColtToDistribute, DistribuzioneColloDTO.CriterioDistribuzione criterioDistribuzione, RunnableArgs> onComplete, RunnableArgs onFailed) { DistribuzioneColloDTO distribuzioneColloDTO = new DistribuzioneColloDTO() .setCriterioDistribuzione(criterioDistribuzione) @@ -192,7 +194,24 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{ .enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - analyzeAnswer(response, "DistribuzioneCollo", obj -> onComplete.run(), onFailed); + analyzeAnswerList(response, "DistribuzioneCollo", obj -> { + + Gson gson = new Gson(); + List jsons = response.body().getEntityList(); + + List newList = new ArrayList<>(); + + if(jsons != null) { + for (int i = 0; i < jsons.size(); i ++){ + JsonObject jsonTmp = jsons.get(i); + + newList.add(gson.fromJson(jsonTmp, MtbColt.class)); + } + } + + + onComplete.run(newList); + }, onFailed); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/_BaseRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/_BaseRESTConsumer.java index b1f2761f..3fbe4344 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/_BaseRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/_BaseRESTConsumer.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.REST.consumers; import android.util.Log; +import java.util.List; + import it.integry.integrywmsnative.core.REST.model.EsitoType; import it.integry.integrywmsnative.core.REST.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.expansion.RunnableArgs; @@ -17,7 +19,14 @@ public class _BaseRESTConsumer { if(response.body().getEsito() == EsitoType.OK) { if(!UtilityString.isNullOrEmpty(response.body().getErrorMessage())){ callback.onFailed(new Exception(response.body().getErrorMessage())); - } else callback.onSuccess(response.body().getDto()); + } else { + + T dataObj = response.body().getDto() != null ? + response.body().getDto() : + response.body().getEntity(); + + callback.onSuccess(dataObj); + } } else { Log.e(logTitle, response.body().getErrorMessage()); callback.onFailed(new Exception(response.body().getErrorMessage())); @@ -46,4 +55,45 @@ public class _BaseRESTConsumer { }); } + + public static void analyzeAnswerList(Response> response, String logTitle, final ISimpleOperationCallback> callback){ + if(response.isSuccessful()) { + if(response.body() != null) { + if(response.body().getEsito() == EsitoType.OK) { + if(!UtilityString.isNullOrEmpty(response.body().getErrorMessage())){ + callback.onFailed(new Exception(response.body().getErrorMessage())); + } else { + + List dataObj = response.body().getEntityList(); + + callback.onSuccess(dataObj); + } + } else { + Log.e(logTitle, response.body().getErrorMessage()); + callback.onFailed(new Exception(response.body().getErrorMessage())); + } + } else { + Log.e(logTitle, response.message()); + callback.onFailed(new Exception(response.message())); + } + } else { + Log.e(logTitle, "Status " + response.code() + ": " + response.message()); + callback.onFailed(new Exception("Status " + response.code() + ": " + response.message())); + } + } + + public static void analyzeAnswerList(Response> response, String logTitle, RunnableArgs> onComplete, RunnableArgs onFailed){ + analyzeAnswerList(response, logTitle, new ISimpleOperationCallback>() { + @Override + public void onSuccess(List value) { + onComplete.run(value); + } + + @Override + public void onFailed(Exception ex) { + onFailed.run(ex); + } + }); + } + } 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 3fdd5a8a..e60fed84 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 @@ -12,6 +12,11 @@ public class SettingsModel { return user != null; } + public void createUserSession() { + this.user = new User(); + this.userSession = new UserSession(); + } + public static class Server { public String codAzienda; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java index 68e0a7b4..6806a004 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java @@ -7,9 +7,14 @@ import java.util.Locale; public class UtilityNumber { + public static String decimalToString(Float bigDecimal){ + if(bigDecimal == null) return "0"; + return decimalToString(bigDecimal, 3); + } + public static String decimalToString(BigDecimal bigDecimal){ if(bigDecimal == null) return "0"; - return decimalToString(bigDecimal, 2); + return decimalToString(bigDecimal, 3); } public static String decimalToString(BigDecimal bigDecimal, int decimal){ diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java index 56b2395d..18136fc5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java @@ -89,8 +89,8 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl private void init(){ mArticoliInColloBottomSheetViewModel.setOnCloseColloCallbackListener(this); - mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback(() -> this.refreshOrderBy(false)); - mArticoliInColloBottomSheetViewModel.setOnItemEditedCallback(() -> this.refreshOrderBy(false)); + mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback((deletedItem) -> this.refreshOrderBy(false)); + mArticoliInColloBottomSheetViewModel.setOnItemEditedCallback((originalItem, editedItem) -> this.refreshOrderBy(false)); groupedOrdini = new ArrayList<>(); for (OrdineAccettazioneDTO ordine : mOrders){ 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 9c63348a..4afbe27c 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 @@ -117,6 +117,8 @@ public class LoginViewModel { public void onSuccess(final LoginDTO loginDTO) { SettingsManager.iDB().setAvailableProfiles(loginDTO.availableProfiles); + + SettingsManager.i().createUserSession(); SettingsManager.i().user.fullname = loginDTO.full_name; 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 7b358468..6768e4bf 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 @@ -228,6 +228,7 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { //Cerco tramite etichetta ean 128 (che può indicarmi una UL) this.executeEtichettaEan128(data, progressDialog); } else { + progressDialog.dismiss(); BarcodeManager.enable(); } 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 e4f5e192..acbe9f66 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 @@ -78,11 +78,17 @@ public class RettificaGiacenzeHelper { public void searchArtInt(String codMartOrBarcodeOrDescr, RunnableArgs> onComplete, RunnableArgs onFailed) { String sql = "SELECT DISTINCT mtb_aart.* " + - "FROM mtb_aart, mvw_barcode " + - "WHERE (case when len(mvw_barcode.cod_barre) > 13 " + - "then mvw_barcode.cod_barre " + - "else Replicate('0', 13 - len(mvw_barcode.cod_barre))+ mvw_barcode.cod_barre end LIKE '%' + case when len('" + codMartOrBarcodeOrDescr + "') > 13 then '" + codMartOrBarcodeOrDescr + "' else Replicate('0', 13 - len('" + codMartOrBarcodeOrDescr + "')) + '" + codMartOrBarcodeOrDescr + "'" + - "end OR mtb_aart.cod_mart = '" + codMartOrBarcodeOrDescr + "' OR mtb_aart.descrizione_estesa LIKE '%" + codMartOrBarcodeOrDescr + "%') AND mtb_aart.cod_mart = mvw_barcode.cod_mart"; + "FROM mtb_aart " + + "LEFT OUTER JOIN mvw_barcode on mtb_aart.cod_mart = mvw_barcode.cod_mart " + + "WHERE CASE" + + " WHEN LEN(mvw_barcode.cod_barre) > 13 THEN mvw_barcode.cod_barre " + + " ELSE Replicate('0', 13 - len(mvw_barcode.cod_barre))+ mvw_barcode.cod_barre " + + "END LIKE '%' + CASE " + + " WHEN LEN('" + codMartOrBarcodeOrDescr + "') > 13 THEN '" + codMartOrBarcodeOrDescr + "' " + + " ELSE Replicate('0', 13 - len('" + codMartOrBarcodeOrDescr + "')) + '" + codMartOrBarcodeOrDescr + "'" + + " END " + + "OR mtb_aart.cod_mart = '" + codMartOrBarcodeOrDescr + "' " + + "OR mtb_aart.descrizione_estesa LIKE '%" + codMartOrBarcodeOrDescr + "%'"; Type typeOfObjectsList = new TypeToken>() {}.getType(); SystemRESTConsumer.processSql(sql, typeOfObjectsList, new ISimpleOperationCallback>() { 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 9e26aee9..9638c762 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 @@ -91,8 +91,16 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO private void init(){ mArticoliInColloBottomSheetViewModel.setOnCloseColloCallbackListener(this); - mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback(() -> this.refreshOrderBy(false)); - mArticoliInColloBottomSheetViewModel.setOnItemEditedCallback(() -> this.refreshOrderBy(false)); + + mArticoliInColloBottomSheetViewModel.setOnItemDeletedCallback((deletedItem) -> { + this.onRowItemDeleted(deletedItem); + this.refreshOrderBy(false); + }); + + mArticoliInColloBottomSheetViewModel.setOnItemEditedCallback((originalItem, editedItem) -> { + this.onRowItemEdited(originalItem, editedItem); + this.refreshOrderBy(false); + }); mHelper = new VenditaOrdineInevasoHelper(mActivity); @@ -203,6 +211,37 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } } + + private void onRowItemEdited(MtbColr originalItem, MtbColr editedItem) { + + for(int i = 0; i < mPickingList.size(); i++) { + + int foundIndex = mPickingList.get(i).getWithdrawRows().indexOf(originalItem); + + if(foundIndex >= 0){ + mPickingList.get(i).getWithdrawRows().set(foundIndex, editedItem); + + break; + } + + } + } + + private void onRowItemDeleted(MtbColr deletedItem) { + + for(int i = 0; i < mPickingList.size(); i++) { + + int foundIndex = mPickingList.get(i).getWithdrawRows().indexOf(deletedItem); + + if(foundIndex >= 0){ + mPickingList.get(i).getWithdrawRows().remove(foundIndex); + + break; + } + + } + } + public void refreshOrderBy(boolean forceHiddenCheck){ try { @@ -656,7 +695,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO progress.show(); if(thereIsAnyRowInUL()) { - updateDataFine(progress, () -> distribuisciCollo(progress, () -> printCollo(progress))); + updateDataFine(progress, () -> distribuisciCollo(progress, (generatedMtbColts) -> printCollo(progress))); } else { deleteCollo(progress); } @@ -685,17 +724,16 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO } - private void distribuisciCollo(ProgressDialog progress, Runnable onComplete) { + private void distribuisciCollo(ProgressDialog progress, RunnableArgs> onComplete) { MtbColt cloneMtbColt = (MtbColt) mArticoliInColloBottomSheetViewModel.mtbColt.get().clone(); - ColliMagazzinoRESTConsumer.distribuisciCollo(cloneMtbColt, DistribuzioneColloDTO.CriterioDistribuzione.UPDATE, onComplete, + ColliMagazzinoRESTConsumer.distribuisciCollo(cloneMtbColt, DistribuzioneColloDTO.CriterioDistribuzione.SPLIT_ORDINE, onComplete, ex -> UtilityExceptions.defaultException(mActivity, ex, progress)); } private void printCollo(ProgressDialog progress) { - PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARY,new ISimpleOperationCallback>() { @Override public void onSuccess(List 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 c8a46db5..d60d31e5 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 @@ -24,6 +24,7 @@ import it.integry.integrywmsnative.BR; import it.integry.integrywmsnative.R; 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; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.utility.UtilityExceptions; @@ -48,8 +49,8 @@ public class ArticoliInColloBottomSheetViewModel { private BottomSheetBehavior mBottomSheetBehavior; - private Runnable mOnItemDeletedCallback; - private Runnable mOnItemEditedCallback; + private RunnableArgs mOnItemDeletedCallback; + private RunnableArgss mOnItemEditedCallback; public ArticoliInColloBottomSheetViewModel(AppCompatActivity context, final FragmentArticoliInColloBottomSheetBinding bindings){ @@ -86,11 +87,11 @@ public class ArticoliInColloBottomSheetViewModel { initBottomSheetActions(); } - public void setOnItemEditedCallback(Runnable onItemEditedCallback) { + public void setOnItemEditedCallback(RunnableArgss onItemEditedCallback) { this.mOnItemEditedCallback = onItemEditedCallback; } - public void setOnItemDeletedCallback(Runnable onItemDeletedCallback) { + public void setOnItemDeletedCallback(RunnableArgs onItemDeletedCallback) { this.mOnItemDeletedCallback = onItemDeletedCallback; } @@ -156,6 +157,9 @@ public class ArticoliInColloBottomSheetViewModel { MtbColr itemToEdit = mtbColt.get().getMtbColr().get(position); + MtbColr originalItem = (MtbColr) itemToEdit.clone(); + + mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED); DialogInputQuantity.DTO dto = new DialogInputQuantity.DTO() @@ -180,7 +184,7 @@ public class ArticoliInColloBottomSheetViewModel { progress.dismiss(); mtbColt.get().getMtbColr().set(position, itemToEdit); - if(mOnItemEditedCallback != null) mOnItemEditedCallback.run(); + if(mOnItemEditedCallback != null) mOnItemEditedCallback.run(originalItem, itemToEdit); }, ex -> UtilityExceptions.defaultException(mContext, ex, progress)); @@ -205,7 +209,7 @@ public class ArticoliInColloBottomSheetViewModel { progress.dismiss(); mtbColt.get().getMtbColr().remove(position); - if(this.mOnItemDeletedCallback != null) this.mOnItemDeletedCallback.run(); + if(this.mOnItemDeletedCallback != null) this.mOnItemDeletedCallback.run(itemToDelete); }, ex -> UtilityExceptions.defaultException(mContext, ex, progress)); }, null).show(); diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 670fa5fe..071e1444 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -64,6 +64,7 @@ android:id="@+id/app_version_textview" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:gravity="center_horizontal" tools:text="v 1.0.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_input_quantity_articolo.xml b/app/src/main/res/layout/dialog_input_quantity_articolo.xml index 158cdae9..d49c7438 100644 --- a/app/src/main/res/layout/dialog_input_quantity_articolo.xml +++ b/app/src/main/res/layout/dialog_input_quantity_articolo.xml @@ -23,6 +23,7 @@ + @@ -114,15 +115,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="@{viewmodel.qtaOrd == null ? View.GONE : View.VISIBLE}" - android:text="@string/ordered" - android:textSize="16sp" - tools:text="Ordinati" /> + android:text="@string/ordered_abbr" + android:textSize="16sp" /> + android:visibility="@{quantityViewModel.qtaEvasa.get() == 0 ? View.GONE : View.VISIBLE}" /> + android:text="@string/to_dispatch_abbr" + android:textSize="16sp" /> + android:text="@string/available_abbr" + android:textSize="16sp" /> - - - + + + + + + + + + + + + + + + + - diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b810c791..af5fbf02 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -24,7 +24,7 @@ OK Annulla Resetta - Evasi + Evasi Questi permessi sono necessari al funzionamento dell\'app @@ -97,9 +97,9 @@ Qtà - Ordinati - Da evadere - Disponibile + Ord + Da ev + Disp Lotto %s]]> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d73875e..f4102b16 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,7 +31,7 @@ OK Abort Reset - Dispatched + Dspch No description Description Stock @@ -96,9 +96,9 @@ Qty - Ordered - To dispatch - Available + Ord + To disp + Avbl Batch lot Level