From 8476fa45087f1d7060eda84c3741429427fc7f8b Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 22 Oct 2018 08:50:54 +0200 Subject: [PATCH] Piccole modifiche --- .idea/assetWizardSettings.xml | 48 ----------- .idea/caches/build_file_checksums.ser | Bin 608 -> 603 bytes .idea/compiler.xml | 22 ----- .idea/copyright/profiles_settings.xml | 3 - .idea/gradle.xml | 3 +- .idea/kotlinc.xml | 8 -- .idea/misc.xml | 15 ++-- .idea/vcs.xml | 2 +- .../MainAccettazioneFragment.java | 18 ++-- .../core/MainListAccettazioneAdapter.java | 20 ++--- .../dto/OrdineAccettazioneDTO.java | 77 +++++++++++++++++- 11 files changed, 104 insertions(+), 112 deletions(-) delete mode 100644 .idea/assetWizardSettings.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/kotlinc.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml deleted file mode 100644 index 35c0fd10..00000000 --- a/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 9e89a5ce1f3e9830658e3af80bbece41f5c9ad26..bbe04ee506a414e80fac1983b2b9e8d837f5ab0b 100644 GIT binary patch delta 54 zcmV-60LlO01lt6Vm;{mHLt~MgwGJmkI$TwAWpZ;|Om%B{lVkyU5ZSz6kYE&;(y_+U Mov#c!%#-c`a)taDivR!s delta 59 zcmV-B0L1^>1mFaam;{Y5f0mJ)wG%8uI$TwAWpZ;|M`?9)WpHq1Q)n{ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43ef..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ede2e358..25e0d4c9 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,9 +3,8 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7f..35eb1ddf 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index 696f41b7..3489b786 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -20,6 +20,7 @@ import android.view.ViewGroup; import android.widget.Toast; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import butterknife.BindView; @@ -248,7 +249,9 @@ public class MainAccettazioneFragment extends Fragment implements ICheckBoxCallb public void onLoadSuccess(final List ordini) { progress.dismiss(); - int artsCounter = ordini.size(); + + Arrays.stream(ordini). + int artsCounter = Coollection.from(ordini).where("qtaDaEvadere", Coollection.greaterThan(0)).all().size(); List ordersKeys = new ArrayList<>(); for(OrdineAccettazioneDTO ordine : ordini){ @@ -263,16 +266,13 @@ public class MainAccettazioneFragment extends Fragment implements ICheckBoxCallb + "

" + "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, artsCounter)), null, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialogInterface, int i) { + (dialogInterface, i) -> { - Intent myIntent = new Intent(getActivity(), AccettazioneOrdineInevasoActivity.class); - myIntent.putExtra("key", (ArrayList) ordini); //Optional parameters - getActivity().startActivity(myIntent); + Intent myIntent = new Intent(getActivity(), AccettazioneOrdineInevasoActivity.class); + myIntent.putExtra("key", (ArrayList) ordini); //Optional parameters + getActivity().startActivity(myIntent); - } - }).show(); + }).show(); } 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 2f65a361..4260bcc0 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 @@ -116,25 +116,19 @@ public class MainListAccettazioneAdapter extends RecyclerView.Adapter { + checkBox.toggle(); + ordine.checkBox = checkBox.isChecked(); + mCheckBoxCallback.onToggle(checkBox.isChecked()); }); TextView testataOrdTextView = groupModelView.findViewById(R.id.accettazione_main_list_group_item_container_testata_ord); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java index ee9e7ee3..6d7300e6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneDTO.java @@ -34,6 +34,8 @@ public class OrdineAccettazioneDTO implements Parcelable { public static class Riga implements Parcelable { public Float qtaOrd; public Float qtaRiservate; + public Float qtaEvasa; + public Float qtaDaEvadere; public int rigaOrd; public String codJcom; public String ragSocCom; @@ -52,8 +54,81 @@ public class OrdineAccettazioneDTO implements Parcelable { public String dataCons; + //public Float getQtaDaEvadere() { + // return this.qtaOrd - this.qtaRiservate; + //} + + + public Float getQtaOrd() { + return qtaOrd; + } + + public Float getQtaRiservate() { + return qtaRiservate; + } + + public Float getQtaEvasa() { + return qtaEvasa; + } + public Float getQtaDaEvadere() { - return this.qtaOrd - this.qtaRiservate; + return qtaDaEvadere; + } + + public int getRigaOrd() { + return rigaOrd; + } + + public String getCodJcom() { + return codJcom; + } + + public String getRagSocCom() { + return ragSocCom; + } + + public String getDescrizioneCommessa() { + return descrizioneCommessa; + } + + public MtbAart getMtbAart() { + return mtbAart; + } + + public PickingObjectDTO[] getColliAssociati() { + return colliAssociati; + } + + public boolean isHidden() { + return hidden; + } + + public String getPartitaMag() { + return partitaMag; + } + + public String getCodArtFor() { + return codArtFor; + } + + public String getDescrizioneEstesa() { + return descrizioneEstesa; + } + + public String getCodAlis() { + return codAlis; + } + + public int getNumOrd() { + return numOrd; + } + + public String getGestioneOrd() { + return gestioneOrd; + } + + public String getDataCons() { + return dataCons; } public Date getDataOrd() {