foundDataOrd = Stream.of(mTestateOrdini)
+ .map(OrdineVenditaInevasoDTO::getDataOrdD)
.withoutNulls()
.distinctBy(x -> x)
.toList();
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java b/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java
new file mode 100644
index 00000000..62cf64fd
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java
@@ -0,0 +1,293 @@
+package it.integry.integrywmsnative.ui;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.ViewDebug;
+
+import androidx.annotation.ArrayRes;
+import androidx.appcompat.widget.AppCompatCheckBox;
+
+import it.integry.integrywmsnative.R;
+
+public class CheckBoxThreeStates extends AppCompatCheckBox {
+
+
+ private boolean mBroadcasting;
+ private boolean mIndeterminate;
+
+ private OnCheckedChangeListener mOnCheckedChangeListener;
+
+
+ private static final int[] INDETERMINATE_STATE_SET = {
+// R.attr.state_indeterminate
+ };
+
+ private static final int[] DEFAULT_CYCLE = {
+ 1, 0, 1, 0
+ };
+
+ private int[] mCycle = DEFAULT_CYCLE;
+
+// public CheckBoxThreeStates(final Context context) {
+// this(context, null);
+// }
+
+// public CheckBoxThreeStates(final Context context, final AttributeSet attrs) {
+// this(context, attrs, R.attr.checkbox3Style);
+// }
+
+ public CheckBoxThreeStates(final Context context, final AttributeSet attrs, final int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+/*
+ final TypedArray a =
+ context.obtainStyledAttributes(attrs, R.styleable.CheckBox3, defStyleAttr, R.style.Widget_Checkbox3);
+
+ try {
+
+ if (a.hasValue(R.styleable.CheckBox3_checkbox3_checkableCycle)) {
+ int cycleRes = a.getResourceId(R.styleable.CheckBox3_checkbox3_checkableCycle, 0);
+ if (cycleRes != 0) {
+ setCycle(getResources().getIntArray(cycleRes));
+ }
+ }
+
+ if (a.hasValue(R.styleable.CheckBox3_android_fontFamily)) {
+ final String font = a.getString(R.styleable.CheckBox3_android_fontFamily);
+ setTypeface(TypefaceUtils.loadFromAsset(getResources().getAssets(), font));
+ }
+
+ final boolean indeterminate = a.getBoolean(R.styleable.CheckBox3_checkbox3_indeterminate, false);
+ final boolean checked = a.getBoolean(R.styleable.CheckBox3_android_checked, false);
+
+ mBroadcasting = true;
+
+ int index = getStateIndex(checked, indeterminate);
+ if (!isValidStateIndex(index)) {
+ index = getFirstValidStateIndex(index);
+ }
+ moveToState(index);
+
+ } finally {
+ a.recycle();
+ }
+ */
+ }
+
+ public void setCycle(@ArrayRes final int cycleRes) {
+ setCycle(getResources().getIntArray(cycleRes));
+ }
+
+ /**
+ * Change the cycle used to determine the next state of the checkbox when the user
+ * click the component, or when the {@link #toggle()} is called.
+ * The value passed is an array of 4 integer elements, representing the state of the checkbox.
+ * The value of each element can be 0 or 1, with 0 to disable the state and 1 to enable the state.
+ * The states are (in order):
+ *
+ * - Checked
+ * - Indeterminate (checked)
+ * - Unchecked
+ * - Indeterminate (unchecked)
+ *
+ * So if a cycle like this one is used:
+ * int[] cycle = new int[]{1,0,1,0}
+ * the checkbox will only cycle between checked and unchecked state.
+ * The default cycle is: {1,0,1,0}
+ *
+ *
The method throws an exception if the array is not valid. A valid array must match the following rules:
+ *
+ * - If not null, must have 4 elements
+ * - At least 2 elements must be not equal to 0
+ *
+ *
+ * @param cycle change the cycle
+ */
+ public void setCycle(final int[] cycle) {
+ validateCycle(cycle);
+ mCycle = cycle == null ? DEFAULT_CYCLE : cycle;
+ }
+
+ /**
+ * Move to the next state of the checkbox
+ */
+ @Override
+ public void toggle() {
+ if (null == mCycle) return;
+
+ final int currentIndex = getCurrentStateIndex();
+ moveToNextState(currentIndex);
+ }
+
+ @Override
+ public void setChecked(boolean checked) {
+ if (null == mCycle) return;
+
+ int index = getStateIndex(checked, isIndeterminate());
+ if (!isValidStateIndex(index)) {
+ return;
+ }
+
+ super.setChecked(checked);
+ }
+
+ /**
+ * Change the state of the checkbox
+ *
+ * @param checked
+ * @param indeterminate
+ */
+ public void setChecked(boolean checked, boolean indeterminate) {
+ if (null == mCycle) return;
+
+ if (isChecked() == checked) {
+ setIndeterminate(indeterminate);
+ } else {
+ mIndeterminate = indeterminate;
+ }
+ setChecked(checked);
+ }
+
+ @ViewDebug.ExportedProperty
+ public boolean isIndeterminate() {
+ return mIndeterminate;
+ }
+
+ public void setIndeterminate(boolean indeterminate) {
+ if (null == mCycle) return;
+
+ int index = getStateIndex(isChecked(), indeterminate);
+ if (!isValidStateIndex(index)) {
+ return;
+ }
+
+ setIndeterminateImpl(indeterminate, true);
+ }
+
+ private void moveToNextState(final int index) {
+ int nextIndex = getNextValidIndex(index);
+ boolean checked = nextIndex < 2;
+ mIndeterminate = nextIndex == 1 || nextIndex == 3;
+ setChecked(checked);
+ }
+
+ private void moveToState(final int nextIndex) {
+ if (!isValidStateIndex(nextIndex)) {
+ }
+ boolean checked = nextIndex < 2;
+ mIndeterminate = nextIndex == 1 || nextIndex == 3;
+ setChecked(checked);
+ }
+
+
+ private void validateCycle(final int[] cycle) {
+ if (null == cycle) {
+ return;
+ }
+ if (cycle.length != 4) {
+ throw new IllegalArgumentException("Invalid cycle length. Expected 4 an array or 4 int");
+ }
+
+ int total = 0;
+ for (final int i1 : cycle) {
+ if (i1 != 0) {
+ total++;
+ }
+ }
+ if (total < 2) {
+ throw new IllegalArgumentException("Invalid cycle. At least 2 elements must be positive");
+ }
+ }
+
+ private int getCurrentStateIndex() {
+ return getStateIndex(isChecked(), isIndeterminate());
+ }
+
+ private int getStateIndex(boolean checked, boolean indeterminate) {
+ int index = 0;
+ if (checked) {
+ index += indeterminate ? 1 : 0;
+ } else {
+ index = indeterminate ? 3 : 2;
+ }
+ return index;
+ }
+
+ private int getFirstValidStateIndex(int index) {
+ int i = index;
+ while (i >= 0) {
+ if (mCycle[i] != 0) return i;
+ i--;
+ }
+
+ i = index;
+ while (i < mCycle.length) {
+ if (mCycle[i] != 0) return i;
+ i++;
+ }
+
+ return -1;
+ }
+
+ private boolean isValidStateIndex(int index) {
+ return mCycle[index] != 0;
+ }
+
+ private int getNextValidIndex(int index) {
+ int nextIndex = index + 1 >= mCycle.length ? 0 : index + 1;
+ if (mCycle[nextIndex] != 0) {
+ return nextIndex;
+ }
+ return getNextValidIndex(nextIndex);
+ }
+
+ @Override
+ public void setOnCheckedChangeListener(final OnCheckedChangeListener listener) {
+ super.setOnCheckedChangeListener(listener);
+ mOnCheckedChangeListener = listener;
+ }
+
+ @Override
+ protected int[] onCreateDrawableState(int extraSpace) {
+ final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+ if (isIndeterminate()) {
+ mergeDrawableStates(drawableState, INDETERMINATE_STATE_SET);
+ }
+ return drawableState;
+ }
+
+ @Override
+ protected void drawableStateChanged() {
+ super.drawableStateChanged();
+ }
+
+ private void setIndeterminateImpl(boolean indeterminate, boolean notify) {
+ if (mIndeterminate != indeterminate) {
+ mIndeterminate = indeterminate;
+ refreshDrawableState();
+ if (notify) {
+ notifyStateListener();
+ }
+ }
+ }
+
+ private void notifyStateListener() {
+ if (mBroadcasting) {
+ return;
+ }
+
+ mBroadcasting = true;
+
+ if (mOnCheckedChangeListener != null) {
+ mOnCheckedChangeListener.onCheckedChanged(this, isChecked());
+ }
+ mBroadcasting = false;
+
+ }
+
+ @Override
+ public CharSequence getAccessibilityClassName() {
+ return CheckBoxThreeStates.class.getName();
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
index b288d59a..190a6064 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
@@ -5,6 +5,7 @@ import android.app.DatePickerDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.res.ColorStateList;
+
import androidx.databinding.DataBindingUtil;
import androidx.databinding.Observable;
@@ -40,6 +41,7 @@ import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.core.utility.UtilityNumber;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.DialogInputQuantityArticoloBinding;
@@ -371,6 +373,8 @@ public class DialogInputQuantity {
quantityDTO.expireDate = c.getTime();
}
+ refreshQtaDescriptionText();
+
}
@@ -502,6 +506,8 @@ public class DialogInputQuantity {
}
}
+
+// refreshQtaDescriptionText();
}
});
@@ -537,6 +543,7 @@ public class DialogInputQuantity {
}
}
+// refreshQtaDescriptionText();
}
});
@@ -567,6 +574,8 @@ public class DialogInputQuantity {
}
}
+
+// refreshQtaDescriptionText();
}
});
@@ -627,6 +636,42 @@ public class DialogInputQuantity {
}
+ private void refreshQtaDescriptionText() {
+
+ int numConf = (int) (currentQuantityDto.qtaDaEvadere.get() / currentQuantityDto.qtaCnf.get());
+ float qtaTot = currentQuantityDto.qtaDaEvadere.get().floatValue();
+
+ float mod = qtaTot % numConf;
+
+ String text = "";
+
+ if(numConf > 0) {
+ text += "" + numConf + " " + currentContext.getResources().getQuantityString(R.plurals.item_package, numConf).toUpperCase() + "";
+ }
+ if(numConf > 0 && mod > 0) {
+ text += " e ";
+ }
+ if(mod > 0) {
+
+ text += "" + UtilityNumber.decimalToString(mod) + " ";
+ if(mod == 1) {
+ text += currentContext.getResources().getQuantityString(R.plurals.pieces, (int) mod).toUpperCase();
+ } else {
+ text += currentContext.getString(R.string.piece).toUpperCase();
+ }
+
+ text += "";
+
+
+
+ }
+
+ currentBinding.qtaDescriptionText.setText(Html.fromHtml(text));
+
+ }
+
+
+
private void onConfirm(Context context, QuantityDTO quantityDTO, RunnableArgss dialogCallback, boolean closeUL){
if(currentDTO.mtbAart.isFlagTracciabilita() && (quantityDTO.batchLot == null || quantityDTO.batchLot.get().trim().length() == 0)){
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 ab6504e0..f6283472 100644
--- a/app/src/main/res/layout/dialog_input_quantity_articolo.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_articolo.xml
@@ -213,6 +213,15 @@
+
+
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index ff200a73..cb8f6806 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -429,51 +429,51 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
+
diff --git a/app/src/main/res/layout/vendita_main_list_group_model.xml b/app/src/main/res/layout/vendita_main_list_group_model.xml
index 677ad4ce..20fc1109 100644
--- a/app/src/main/res/layout/vendita_main_list_group_model.xml
+++ b/app/src/main/res/layout/vendita_main_list_group_model.xml
@@ -1,52 +1,91 @@
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+ android:paddingStart="2dp"
+ android:paddingEnd="4dp">
-
-
+ android:paddingStart="2dp"
+ android:paddingEnd="8dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
+ android:layout_toEndOf="@id/empty_view"
+ android:background="@color/full_white">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/vendita_main_list_model.xml b/app/src/main/res/layout/vendita_main_list_model.xml
index 8cd747b2..8934bb9b 100644
--- a/app/src/main/res/layout/vendita_main_list_model.xml
+++ b/app/src/main/res/layout/vendita_main_list_model.xml
@@ -1,3 +1,4 @@
+
-
+
+
+
+
+
+
+
+
+
+ android:paddingStart="12dp"
+ android:paddingTop="8dp"
+ android:paddingEnd="8dp"
+ android:paddingBottom="8dp">
-
+
-
\ No newline at end of file
+
+
+
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b6edd4b4..31a9a986 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -77,6 +77,14 @@
- %d ordine]]>
- %d ordini]]>
+
+ - @string/piece
+ - pezzi
+
+
+ - confezione
+ - confezioni
+
Chiudi UL
Articoli presenti
Ordini
@@ -85,6 +93,7 @@
Data
Posizione
Preparato da
+ Pezzo
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8d337f0c..d13bfbdb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -25,6 +25,7 @@
#E8F0FE
+ #C9D5F0
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f58d92bf..764bf300 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,6 +75,14 @@
- %d order selected]]>
- %d orders selected]]>
+
+ - @string/piece
+ - pieces
+
+
+ - package
+ - packages
+
Close LU
Submitted items
Orders
@@ -86,7 +94,7 @@
Picking not available
Please scan an item barcode
Extra item
-
+ Piece
between 3 and 30 alphanumeric characters
enter a valid username
diff --git a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
index 9e04adaa..ac61c630 100644
--- a/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
+++ b/dynamic__base/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
@@ -10,13 +10,13 @@ import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityToast;
import it.integry.integrywmsnative.core.class_router.interfaces.IOrdiniVendita;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
+import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
public class OrdiniVendita implements IOrdiniVendita {
@Override
- public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
+ public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
UtilityToast.showToast("Avviato metodo in BaseFeature");
ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(),
diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
index e0adf794..048472d1 100644
--- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
+++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
@@ -10,13 +10,13 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityToast;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
+import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
public class OrdiniVendita implements IOrdiniVendita {
@Override
- public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
+ public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
UtilityToast.showToast("Avviato metodo in BaseFeature");
ColliMagazzinoRESTConsumer.distribuisciCollo(mtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(),
diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
index 82cb0836..438ebcf9 100644
--- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
+++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/OrdiniVendita.java
@@ -11,14 +11,14 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
+import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
public class OrdiniVendita implements IOrdiniVendita {
@Override
- public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
+ public void distribuisciCollo(ProgressDialog progress, MtbColt mtbColt, List testateOrdini, RunnableArgs> onComplete, RunnableArgs onFailed) {
- String codMdepOrder = testateOrdini.get(0).ordini.get(0).getCodMdep();
+ String codMdepOrder = testateOrdini.get(0).getCodMdep();
//Se il deposito del collo รจ diverso dal deposito dell'utente allora sto "evadendo" la merce per una vendita presente
//su un altro deposito