Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix su order by data_cons accettazione

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-07-26 09:30:11 +02:00
parent 2441e2fd4d
commit 1fa8609cb0
7 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
View File

@ -38,8 +38,10 @@ public class UtilityExceptions {
String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex);
if(errorMessage == null) errorMessage = ex.getMessage(); 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(!BuildConfig.DEBUG) {
if(sendEmail) UtilityLogger.errorMe(ex); if(sendEmail) UtilityLogger.errorMe(ex);

2
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/MainListAccettazioneAdapter.java
View File

@ -73,7 +73,7 @@ public class MainListAccettazioneAdapter extends SectionedRecyclerViewAdapter<Ma
private List<OrdineAccettazioneInevasoDTO> orderItems(List<OrdineAccettazioneInevasoDTO> dataset) { private List<OrdineAccettazioneInevasoDTO> orderItems(List<OrdineAccettazioneInevasoDTO> dataset) {
return Stream.of(dataset) return Stream.of(dataset)
.distinctBy(OrdineAccettazioneInevasoDTO::getBarcode) .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(); .toList();
} }

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_ord_produzione/core/OrdineProduzioneListAdapter.java
View File

@ -81,7 +81,7 @@ public class OrdineProduzioneListAdapter extends SectionedRecyclerViewAdapter<Or
private List<OrdineAccettazioneInevasoDTO> orderItems(List<OrdineAccettazioneInevasoDTO> dataset) { private List<OrdineAccettazioneInevasoDTO> orderItems(List<OrdineAccettazioneInevasoDTO> dataset) {
return Stream.of(dataset) return Stream.of(dataset)
.distinctBy(OrdineAccettazioneInevasoDTO::getBarcode) .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(); .toList();
} }

27
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java
View File

@ -33,7 +33,7 @@ import it.integry.integrywmsnative.ui.fastscroll.SectionTitleProvider;
public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<UltimeConsegneMainListAdapter.SubheaderHolder, UltimeConsegneMainListAdapter.SingleItemViewHolder> implements SectionTitleProvider { public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<UltimeConsegneMainListAdapter.SubheaderHolder, UltimeConsegneMainListAdapter.SingleItemViewHolder> implements SectionTitleProvider {
private Context mContext; private Context mContext;
private ArrayList<ConsegnaClienteDTO> mDataset; private List<ConsegnaClienteDTO> mDataset;
private ArrayList<String> mSectionTitleItems; private ArrayList<String> mSectionTitleItems;
private OnItemClickListener onItemClickListener; private OnItemClickListener onItemClickListener;
@ -44,7 +44,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
@Override @Override
public String getSectionTitle(int position) { 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.mDataset = new ArrayList<>();
this.mSectionTitleItems = new ArrayList<>(); this.mSectionTitleItems = new ArrayList<>();
Stream.of(dataset) this.mDataset = Stream.of(dataset)
.map(x -> x.getRagSoc()) .sortBy(ConsegnaClienteDTO::getRagSoc)
.toList();
Stream.of(mDataset)
.map(ConsegnaClienteDTO::getRagSoc)
.distinct() .distinct()
.forEach(x -> { .forEach(x -> {
this.mSectionTitleItems.add(String.valueOf(x.charAt(0))); this.mSectionTitleItems.add(String.valueOf(x.charAt(0)));
Stream.of(dataset) long count = Stream.of(dataset)
.filter(y -> y.getRagSoc().equalsIgnoreCase(x)) .filter(y -> y.getRagSoc().equalsIgnoreCase(x))
.forEach(y -> { .count();
this.mSectionTitleItems.add(String.valueOf(x.charAt(0)));
});
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() smallIconBuilder = TextDrawable.builder()
.beginConfig() .beginConfig()
@ -203,6 +211,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
return this.mDataset.size(); return this.mDataset.size();
} }
public void setOnItemClickListener(OnItemClickListener onItemClickListener) { public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
this.onItemClickListener = onItemClickListener; this.onItemClickListener = onItemClickListener;
} }

31
app/src/main/java/it/integry/integrywmsnative/ui/fastscroll/FastScroller.java
View File

@ -187,24 +187,21 @@ public class FastScroller extends LinearLayout {
} }
private void initHandleMovement() { private void initHandleMovement() {
handle.setOnTouchListener(new OnTouchListener() { handle.setOnTouchListener((v, event) -> {
@Override requestDisallowInterceptTouchEvent(true);
public boolean onTouch(View v, MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) {
requestDisallowInterceptTouchEvent(true); if(titleProvider!=null && event.getAction() == MotionEvent.ACTION_DOWN) viewProvider.onHandleGrabbed();
if (event.getAction() == MotionEvent.ACTION_DOWN || event.getAction() == MotionEvent.ACTION_MOVE) { manuallyChangingPosition = true;
if(titleProvider!=null && event.getAction() == MotionEvent.ACTION_DOWN) viewProvider.onHandleGrabbed(); float relativePos = getRelativeTouchPosition(event);
manuallyChangingPosition = true; setScrollerPosition(relativePos);
float relativePos = getRelativeTouchPosition(event); setRecyclerViewPosition(relativePos);
setScrollerPosition(relativePos); return true;
setRecyclerViewPosition(relativePos); } else if (event.getAction() == MotionEvent.ACTION_UP) {
return true; manuallyChangingPosition = false;
} else if (event.getAction() == MotionEvent.ACTION_UP) { if(titleProvider!=null) viewProvider.onHandleReleased();
manuallyChangingPosition = false; return true;
if(titleProvider!=null) viewProvider.onHandleReleased();
return true;
}
return false;
} }
return false;
}); });
} }

4
app/src/main/res/values-it/strings.xml
View File

@ -226,8 +226,8 @@
<string name="general">Generale</string> <string name="general">Generale</string>
<string name="production">Produzione</string> <string name="production">Produzione</string>
<string name="prod_ordine_produzione_title_fragment">Picking produzione</string> <string name="prod_ordine_produzione_title_fragment">Accettazione da produzione</string>
<string name="prod_ordine_lavorazione_title_fragment">Picking lavorazione</string> <string name="prod_ordine_lavorazione_title_fragment">Picking per lavorazione</string>
<string name="prod_versamento_materiale_title_fragment">Versamento materiale</string> <string name="prod_versamento_materiale_title_fragment">Versamento materiale</string>
<string name="prod_recupero_materiale_title_fragment">Recupero materiale</string> <string name="prod_recupero_materiale_title_fragment">Recupero materiale</string>

5
app/src/main/res/values/strings.xml
View File

@ -209,6 +209,7 @@
<string name="wait_a_moment">Wait a moment</string> <string name="wait_a_moment">Wait a moment</string>
<string name="title_dynamic_vgalimenti">VGAlimenti customization</string> <string name="title_dynamic_vgalimenti">VGAlimenti customization</string>
<string name="title_dynamic__base">Base customization</string> <string name="title_dynamic__base">Base customization</string>
<string name="title_dynamic_ime">IME Customization</string>
<string name="check_in_printer">Check In printer</string> <string name="check_in_printer">Check In printer</string>
@ -239,10 +240,6 @@
<string name="select_a_recipient_message">Please, select a <b>recipient</b> before proceeding</string> <string name="select_a_recipient_message">Please, select a <b>recipient</b> before proceeding</string>
<string name="not_valid_customer_error">Invalid customer</string> <string name="not_valid_customer_error">Invalid customer</string>
<string name="not_valid_recipient_error">Invalid recipient</string> <string name="not_valid_recipient_error">Invalid recipient</string>
<string name="title_dynamic_ime">Module Title</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources> </resources>