From 1fa8609cb069940c2da056675be2b322c6ec4655 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 26 Jul 2019 09:30:11 +0200 Subject: [PATCH] Fix su order by data_cons accettazione --- .../core/utility/UtilityExceptions.java | 4 ++- .../core/MainListAccettazioneAdapter.java | 2 +- .../core/OrdineProduzioneListAdapter.java | 2 +- .../UltimeConsegneMainListAdapter.java | 27 ++++++++++------ .../ui/fastscroll/FastScroller.java | 31 +++++++++---------- app/src/main/res/values-it/strings.xml | 4 +-- app/src/main/res/values/strings.xml | 5 +-- 7 files changed, 40 insertions(+), 35 deletions(-) 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 ec1cf692..cb3dcbce 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 @@ -38,8 +38,10 @@ public class UtilityExceptions { String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); if(errorMessage == null) errorMessage = ex.getMessage(); - DialogSimpleMessageHelper.makeErrorDialog(context, new SpannableString(errorMessage), null, null).show(); + if(context != null) { + DialogSimpleMessageHelper.makeErrorDialog(context, new SpannableString(errorMessage), null, null).show(); + } if(!BuildConfig.DEBUG) { if(sendEmail) UtilityLogger.errorMe(ex); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java index feb9acbe..af1d4c2d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java @@ -73,7 +73,7 @@ public class MainListAccettazioneAdapter extends SectionedRecyclerViewAdapter orderItems(List dataset) { return Stream.of(dataset) .distinctBy(OrdineAccettazioneInevasoDTO::getBarcode) - .sortBy(x -> x.getRagSocOrd() + "" + UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)) + .sortBy(x -> x.getRagSocOrd() + (x.getDataConsD() != null ? UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH) : "")) .toList(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneListAdapter.java index 4f5b7450..bd1336fb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneListAdapter.java @@ -81,7 +81,7 @@ public class OrdineProduzioneListAdapter extends SectionedRecyclerViewAdapter orderItems(List dataset) { return Stream.of(dataset) .distinctBy(OrdineAccettazioneInevasoDTO::getBarcode) - .sortBy(x -> x.getRagSocOrd() + "" + UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)) + .sortBy(x -> x.getRagSocOrd() + (x.getDataConsD() != null ? UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH) : "")) .toList(); } 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 b46b3285..3abcb32e 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 @@ -33,7 +33,7 @@ import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider; public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter implements SectionTitleProvider { private Context mContext; - private ArrayList mDataset; + private List mDataset; private ArrayList mSectionTitleItems; private OnItemClickListener onItemClickListener; @@ -44,7 +44,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter< @Override public String getSectionTitle(int position) { - return this.mSectionTitleItems.get(position); + return mSectionTitleItems.get(position); } @@ -83,21 +83,29 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter< this.mDataset = new ArrayList<>(); this.mSectionTitleItems = new ArrayList<>(); - Stream.of(dataset) - .map(x -> x.getRagSoc()) + this.mDataset = Stream.of(dataset) + .sortBy(ConsegnaClienteDTO::getRagSoc) + .toList(); + + + Stream.of(mDataset) + .map(ConsegnaClienteDTO::getRagSoc) .distinct() .forEach(x -> { this.mSectionTitleItems.add(String.valueOf(x.charAt(0))); - Stream.of(dataset) + long count = Stream.of(dataset) .filter(y -> y.getRagSoc().equalsIgnoreCase(x)) - .forEach(y -> { - this.mSectionTitleItems.add(String.valueOf(x.charAt(0))); - }); + .count(); + + + for(int i = 0; i < count; i++) this.mSectionTitleItems.add(String.valueOf(x.charAt(0))); }); + long count = Stream.of(dataset) + .filter(x -> UtilityString.isNullOrEmpty(x.getRagSoc())) + .count(); - this.mDataset = dataset; smallIconBuilder = TextDrawable.builder() .beginConfig() @@ -203,6 +211,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter< return this.mDataset.size(); } + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { this.onItemClickListener = onItemClickListener; } diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/FastScroller.java b/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/FastScroller.java index 1d772dbf..868617c4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/FastScroller.java +++ b/app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/FastScroller.java @@ -187,24 +187,21 @@ public class FastScroller extends LinearLayout { } private void initHandleMovement() { - handle.setOnTouchListener(new OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - requestDisallowInterceptTouchEvent(true); - if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) { - if(titleProvider!=null && event.getAction() == MotionEvent.ACTION_DOWN) viewProvider.onHandleGrabbed(); - manuallyChangingPosition = true; - float relativePos = getRelativeTouchPosition(event); - setScrollerPosition(relativePos); - setRecyclerViewPosition(relativePos); - return true; - } else if (event.getAction() == MotionEvent.ACTION_UP) { - manuallyChangingPosition = false; - if(titleProvider!=null) viewProvider.onHandleReleased(); - return true; - } - return false; + handle.setOnTouchListener((v, event) -> { + requestDisallowInterceptTouchEvent(true); + if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) { + if(titleProvider!=null && event.getAction() == MotionEvent.ACTION_DOWN) viewProvider.onHandleGrabbed(); + manuallyChangingPosition = true; + float relativePos = getRelativeTouchPosition(event); + setScrollerPosition(relativePos); + setRecyclerViewPosition(relativePos); + return true; + } else if (event.getAction() == MotionEvent.ACTION_UP) { + manuallyChangingPosition = false; + if(titleProvider!=null) viewProvider.onHandleReleased(); + return true; } + return false; }); } diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9efb468f..d9e61950 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -226,8 +226,8 @@ Generale Produzione - Picking produzione - Picking lavorazione + Accettazione da produzione + Picking per lavorazione Versamento materiale Recupero materiale diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e213b624..074d59a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -209,6 +209,7 @@ Wait a moment VGAlimenti customization Base customization + IME Customization Check In printer @@ -239,10 +240,6 @@ Please, select a recipient before proceeding Invalid customer Invalid recipient - Module Title - - - Hello blank fragment