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

Finish v1_6_11(72)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-07-26 09:31:17 +02:00
commit 5994338077
10 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

4
app/build.gradle
View File

@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 71
def appVersionName = '1.6.10'
def appVersionCode = 72
def appVersionName = '1.6.11'
signingConfigs {
release {

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);
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);

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) {
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();
}

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) {
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();
}

29
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 {
private Context mContext;
private ArrayList<ConsegnaClienteDTO> mDataset;
private List<ConsegnaClienteDTO> mDataset;
private ArrayList<String> 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();
this.mDataset = dataset;
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();
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;
}

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

@ -187,9 +187,7 @@ public class FastScroller extends LinearLayout {
}
private void initHandleMovement() {
handle.setOnTouchListener(new OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
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();
@ -204,7 +202,6 @@ public class FastScroller extends LinearLayout {
return true;
}
return false;
}
});
}

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

@ -226,8 +226,8 @@
<string name="general">Generale</string>
<string name="production">Produzione</string>
<string name="prod_ordine_produzione_title_fragment">Picking produzione</string>
<string name="prod_ordine_lavorazione_title_fragment">Picking lavorazione</string>
<string name="prod_ordine_produzione_title_fragment">Accettazione da produzione</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_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="title_dynamic_vgalimenti">VGAlimenti 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>
@ -239,10 +240,6 @@
<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_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>

2
honeywellscannerlibrary/src/main/java/it/integry/honeywellscannerlibrary/HoneywellBarcodeTypeMapper.java
View File

@ -20,6 +20,8 @@ public class HoneywellBarcodeTypeMapper {
return BarcodeType.EAN13;
case "D":
return BarcodeType.EAN8;
case "I":
return BarcodeType.EAN128;
case "c":
return BarcodeType.UPCA;