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

Finish v1.17.7(227)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2021-07-20 18:31:32 +02:00
commit 23bb284cff
14 changed files with 805 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 226 def appVersionCode = 227
def appVersionName = '1.17.6' def appVersionName = '1.17.7'
signingConfigs { signingConfigs {
release { release {

22
app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
View File

@ -150,6 +150,28 @@ public class Converters {
} }
} }
@BindingAdapter("binding")
public static void bindEditText(AutoCompleteTextView view, final ObservableField<String> observableString) {
Pair<ObservableField<String>, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
if (pair == null || pair.first != observableString) {
if (pair != null) {
view.removeTextChangedListener(pair.second);
}
TextWatcherAdapter watcher = new TextWatcherAdapter() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
observableString.set(s.toString());
}
};
view.setTag(R.id.bound_observable, new Pair<>(observableString, watcher));
view.addTextChangedListener(watcher);
}
String newValue = observableString.get();
if (!view.getText().toString().equals(newValue)) {
view.setText(newValue, false);
}
}
@BindingAdapter("binding") @BindingAdapter("binding")
public static void bindTextInputEditText(TextInputEditText view, final BindableString bindableString) { public static void bindTextInputEditText(TextInputEditText view, final BindableString bindableString) {
Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable); Pair<BindableString, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);

12
app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java
View File

@ -385,6 +385,18 @@ public class MtbColt extends EntityBase {
return dataVers; return dataVers;
} }
public Date getDataVersD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataVers());
}
public String getTimeVers() {
Date dataColloD = getDataVersD();
if(dataColloD != null){
return UtilityDate.formatDate(dataColloD, UtilityDate.COMMONS_DATE_FORMATS.TIME);
} else return null;
}
public MtbColt setDataVers(String dataVers) { public MtbColt setDataVers(String dataVers) {
this.dataVers = dataVers; this.dataVers = dataVers;

33
app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java
View File

@ -9,12 +9,15 @@ import android.view.ViewGroup;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.databinding.DataBindingUtil; import androidx.databinding.DataBindingUtil;
import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableArrayList;
import androidx.databinding.ObservableField;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import com.annimon.stream.Stream;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -22,6 +25,7 @@ import javax.inject.Inject;
import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.MainApplication;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.expansion.AtomicBigDecimal;
import it.integry.integrywmsnative.core.expansion.BaseFragment; import it.integry.integrywmsnative.core.expansion.BaseFragment;
import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.DtbOrdSteps; import it.integry.integrywmsnative.core.model.DtbOrdSteps;
@ -60,6 +64,12 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
private RunnableArgs<MtbColt> onMtbColtClicked; private RunnableArgs<MtbColt> onMtbColtClicked;
public ObservableField<BigDecimal> sumLUNumber = new ObservableField<>(BigDecimal.ZERO);
public ObservableField<BigDecimal> sumColliNumber = new ObservableField<>(BigDecimal.ZERO);
public ObservableField<BigDecimal> sumNetKG = new ObservableField<>(BigDecimal.ZERO);
public ObservableField<BigDecimal> sumGrossKG = new ObservableField<>(BigDecimal.ZERO);
public ProdRientroMerceOrderDetailFragment() { public ProdRientroMerceOrderDetailFragment() {
// Required empty public constructor // Required empty public constructor
} }
@ -124,6 +134,29 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
} }
private void refreshList(List<MtbColt> mtbColts) { private void refreshList(List<MtbColt> mtbColts) {
if(mtbColts != null) {
sumLUNumber.set(new BigDecimal(mtbColts.size()));
AtomicBigDecimal sumColli = new AtomicBigDecimal(BigDecimal.ZERO);
AtomicBigDecimal sumNet = new AtomicBigDecimal(BigDecimal.ZERO);
AtomicBigDecimal sumGross = new AtomicBigDecimal(BigDecimal.ZERO);
Stream.of(mtbColts)
.forEach(x -> Stream.of(x.getMtbColr()).forEach(y -> {
sumColli.getAndAdd(y.getNumCnf());
sumNet.getAndAdd(y.getPesoNettoKg());
sumGross.getAndAdd(y.getPesoLordoKg());
}));
sumColliNumber.set(sumColli.get());
sumGrossKG.set(sumGross.get());
sumNetKG.set(sumNet.get());
} else {
sumLUNumber.set(BigDecimal.ZERO);
sumColliNumber.set(BigDecimal.ZERO);
sumGrossKG.set(BigDecimal.ZERO);
sumNetKG.set(BigDecimal.ZERO);
}
mAdapter.updateDataset(mtbColts); mAdapter.updateDataset(mtbColts);
} }

6
app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java
View File

@ -46,7 +46,9 @@ public class ProdRientroMerceOrderDetailViewModel {
this.mProdRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> { this.mProdRientroMerceOrderDetailRESTConsumer.getMtbColtsOfOrder(currentOrder, mtbColts -> {
for (MtbColt mtbColt : mtbColts) { for (MtbColt mtbColt : mtbColts) {
mtbColt.getMtbColr().get(0).setDescrizione(currentOrder.getDescrizioneProd()); mtbColt.getMtbColr().get(0)
.setDescrizione(currentOrder.getDescrizioneProd())
.setUntMis(currentOrder.getUntOrd());
} }
this.mtbColtsOfOrder.postValue(mtbColts); this.mtbColtsOfOrder.postValue(mtbColts);
@ -66,7 +68,7 @@ public class ProdRientroMerceOrderDetailViewModel {
.setQtaCnf(pickedQuantityDTO.getPesoCollo()) .setQtaCnf(pickedQuantityDTO.getPesoCollo())
.setQtaCol(pickedQuantityDTO.getPesoNetto()) .setQtaCol(pickedQuantityDTO.getPesoNetto())
.setCodJcom(currentOrder.getCodJcom()) .setCodJcom(currentOrder.getCodJcom())
.setCodJfas(pickedQuantityDTO.getJtbFasi().getCodJfas()) .setCodJfas(pickedQuantityDTO.getJtbFasi() != null ? pickedQuantityDTO.getJtbFasi().getCodJfas() : null)
.setCodMart(currentOrder.getCodProd()) .setCodMart(currentOrder.getCodProd())
.setCodTcol(pickedQuantityDTO.getMtbTCol().getCodTcol()) .setCodTcol(pickedQuantityDTO.getMtbTCol().getCodTcol())
.setDataCollo(new Date()) .setDataCollo(new Date())

2
app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java
View File

@ -106,7 +106,7 @@ public class ProdRientroMerceOrderListFragment extends Fragment {
ComparatorCompat<OrdineLavorazioneDTO> comparator = ComparatorCompat ComparatorCompat<OrdineLavorazioneDTO> comparator = ComparatorCompat
.comparing(OrdineLavorazioneDTO::getCodJfas) .comparing(OrdineLavorazioneDTO::getCodJfas)
.thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataInizProd() != null ? ordineLavorazioneDTO.getDataInizProd() : "zzzzzzzz")) .thenComparing(ComparatorCompat.comparing(ordineLavorazioneDTO -> ordineLavorazioneDTO.getDataOrd() != null ? ordineLavorazioneDTO.getDataOrd() : "zzzzzzzz")).reversed()
.thenComparing(ComparatorCompat.comparing(OrdineLavorazioneDTO::getNumOrd)); .thenComparing(ComparatorCompat.comparing(OrdineLavorazioneDTO::getNumOrd));
if(dataList == null) return new ArrayList<>(); if(dataList == null) return new ArrayList<>();

4
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
View File

@ -9,6 +9,7 @@ import android.text.SpannableString;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -104,6 +105,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setStyle(DialogFragment.STYLE_NORMAL, R.style.AppTheme_NewMaterial_Dialog_FullscreenDialog); setStyle(DialogFragment.STYLE_NORMAL, R.style.AppTheme_NewMaterial_Dialog_FullscreenDialog);
} }
@ -131,6 +133,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
getDialog().setCanceledOnTouchOutside(false); getDialog().setCanceledOnTouchOutside(false);
getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
return mBindings.getRoot(); return mBindings.getRoot();
} }
@ -333,6 +336,7 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
this.mViewModel.getLineeProd().observe(getViewLifecycleOwner(), lineeProd -> { this.mViewModel.getLineeProd().observe(getViewLifecycleOwner(), lineeProd -> {
this.enabledLineeProd.set(lineeProd != null && lineeProd.size() > 0); this.enabledLineeProd.set(lineeProd != null && lineeProd.size() > 0);
this.mViewModel.setLineeProdRequired(lineeProd != null && lineeProd.size() > 0);
lineeProdArrayAdapter = new DialogInputLULineeProdAdapter(getActivity(), R.layout.array_adapter_single_item, lineeProd); lineeProdArrayAdapter = new DialogInputLULineeProdAdapter(getActivity(), R.layout.array_adapter_single_item, lineeProd);
mBindings.filledExposedDropdownCodJfas.setAdapter(lineeProdArrayAdapter); mBindings.filledExposedDropdownCodJfas.setAdapter(lineeProdArrayAdapter);

8
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
View File

@ -46,6 +46,7 @@ public class DialogInputLUProdViewModel {
private MtbTCol internalTipoPed; private MtbTCol internalTipoPed;
private JtbFasi internalLineaProd; private JtbFasi internalLineaProd;
private boolean isLineeProdRequired;
private Listener mListener; private Listener mListener;
@ -218,6 +219,11 @@ public class DialogInputLUProdViewModel {
return UtilityBigDecimal.multiply(this.internalNumCnf, this.internalPesoCollo.add(internalTaraCol)).add(taraPed); return UtilityBigDecimal.multiply(this.internalNumCnf, this.internalPesoCollo.add(internalTaraCol)).add(taraPed);
} }
public DialogInputLUProdViewModel setLineeProdRequired(boolean lineeProdRequired) {
isLineeProdRequired = lineeProdRequired;
return this;
}
public boolean validate() { public boolean validate() {
if (this.internalNumCnf == null || UtilityBigDecimal.equalsOrLowerThan(this.internalNumCnf, BigDecimal.ZERO)) { if (this.internalNumCnf == null || UtilityBigDecimal.equalsOrLowerThan(this.internalNumCnf, BigDecimal.ZERO)) {
this.mListener.onError(new InvalidNumCnfQuantityException()); this.mListener.onError(new InvalidNumCnfQuantityException());
@ -225,7 +231,7 @@ public class DialogInputLUProdViewModel {
} else if (this.internalPesoLordo == null || UtilityBigDecimal.equalsOrLowerThan(this.internalPesoLordo, BigDecimal.ZERO)) { } else if (this.internalPesoLordo == null || UtilityBigDecimal.equalsOrLowerThan(this.internalPesoLordo, BigDecimal.ZERO)) {
this.mListener.onError(new InvalidGrossWeightQuantityException()); this.mListener.onError(new InvalidGrossWeightQuantityException());
return false; return false;
} else if(this.internalLineaProd == null) { } else if(this.internalLineaProd == null && isLineeProdRequired) {
this.mListener.onError(new InvalidProductionLineException()); this.mListener.onError(new InvalidProductionLineException());
return false; return false;
} }

BIN
app/src/main/res/drawable/ic_pallet_96px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable/ic_weight_kg_96px.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

24
app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
View File

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<data> <data>
<import type="androidx.core.content.ContextCompat" /> <import type="androidx.core.content.ContextCompat" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" /> <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
@ -37,8 +38,8 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:background="@color/full_white"
android:background="@color/full_white"> android:orientation="vertical">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
@ -58,15 +59,18 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_gravity="end" android:layout_gravity="end"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@drawable/ic_erase_96"
android:backgroundTint="@android:color/transparent" android:backgroundTint="@android:color/transparent"
android:onClick="@{() -> view.resetValues()}" android:onClick="@{() -> view.resetValues()}"
android:scaleType="fitCenter"
android:src="@drawable/ic_erase_96"
android:tint="@android:color/white" /> android:tint="@android:color/white" />
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
@ -176,8 +180,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="@{view.enabledNumCnf}" android:enabled="@{view.enabledNumCnf}"
android:hint="@string/pcks_x_ped" android:hint="@string/pcks_x_ped"
android:imeOptions="actionDone"
android:inputType="number" android:inputType="number"
android:nextFocusForward="@id/input_peso_lordo_text"
app:binding="@{view.currentNumCnf}" /> app:binding="@{view.currentNumCnf}" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -195,13 +199,13 @@
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/input_qta_cnf_text" android:id="@+id/input_qta_cnf_text"
style="@style/TextInputEditText.OutlinePrimary" style="@style/TextInputEditText.OutlinePrimary"
android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="@{view.enabledQtaCnf}" android:enabled="@{view.enabledQtaCnf}"
android:hint="@string/kg_x_pck" android:hint="@string/kg_x_pck"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
app:binding="@{view.currentPesoCollo}" /> app:binding="@{view.currentPesoCollo}" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -219,12 +223,12 @@
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/input_qta_tot_text" android:id="@+id/input_qta_tot_text"
style="@style/TextInputEditText.OutlinePrimary" style="@style/TextInputEditText.OutlinePrimary"
android:textColor="@{ContextCompat.getColor(context, view.enabledQtaTot ? android.R.color.black : R.color.gray_400)}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="@{view.enabledQtaTot}" android:enabled="@{view.enabledQtaTot}"
android:hint="@string/net_weight" android:hint="@string/net_weight"
android:inputType="number" android:inputType="number"
android:textColor="@{ContextCompat.getColor(context, view.enabledQtaTot ? android.R.color.black : R.color.gray_400)}"
app:binding="@{view.currentPesoNetto}" /> app:binding="@{view.currentPesoNetto}" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -253,13 +257,13 @@
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/input_tara_ped_text" android:id="@+id/input_tara_ped_text"
style="@style/TextInputEditText.OutlinePrimary" style="@style/TextInputEditText.OutlinePrimary"
android:textColor="@{ContextCompat.getColor(context, view.enabledTaraPed ? android.R.color.black : R.color.gray_400)}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="@{view.enabledTaraPed}" android:enabled="@{view.enabledTaraPed}"
android:hint="@string/tare_lu" android:hint="@string/tare_lu"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="number" android:inputType="number"
android:textColor="@{ContextCompat.getColor(context, view.enabledTaraPed ? android.R.color.black : R.color.gray_400)}"
app:binding="@{view.currentTaraPed}" /> app:binding="@{view.currentTaraPed}" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -277,13 +281,13 @@
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/input_tara_col_text" android:id="@+id/input_tara_col_text"
style="@style/TextInputEditText.OutlinePrimary" style="@style/TextInputEditText.OutlinePrimary"
android:textColor="@{ContextCompat.getColor(context, view.enabledTaraCol ? android.R.color.black : R.color.gray_400)}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="@{view.enabledTaraCol}" android:enabled="@{view.enabledTaraCol}"
android:hint="@string/tare_pckg" android:hint="@string/tare_pckg"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:textColor="@{ContextCompat.getColor(context, view.enabledTaraCol ? android.R.color.black : R.color.gray_400)}"
app:binding="@{view.currentTaraCol}" /> app:binding="@{view.currentTaraCol}" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -356,6 +360,8 @@
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</ScrollView>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

2
app/src/main/res/layout/dialog_input_lu_prod.xml
View File

@ -165,8 +165,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/pcks_x_ped" android:hint="@string/pcks_x_ped"
android:enabled="@{view.enabledNumCnf}" android:enabled="@{view.enabledNumCnf}"
android:imeOptions="actionDone"
android:inputType="number" android:inputType="number"
android:nextFocusForward="@id/input_peso_lordo_text"
app:binding="@{view.currentNumCnf}" /> app:binding="@{view.currentNumCnf}" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>

283
app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
View File

@ -9,6 +9,7 @@
<import type="android.view.View" /> <import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityDate" /> <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="androidx.core.content.ContextCompat" /> <import type="androidx.core.content.ContextCompat" />
@ -183,13 +184,20 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/provenienza_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/totale_bancali_layout"
android:visibility="@{view.currentOrder.codAnag != null ? View.VISIBLE : View.GONE}"> android:visibility="@{view.currentOrder.codAnag != null ? View.VISIBLE : View.GONE}">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
@ -198,8 +206,9 @@
android:src="@drawable/ic_person_filled_24dp" android:src="@drawable/ic_person_filled_24dp"
android:tint="@color/gray_500" /> android:tint="@color/gray_500" />
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
@ -220,50 +229,119 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{view.currentOrder.ragSocAnag}" android:text="@{view.currentOrder.ragSocAnag + ` (` + view.currentOrder.codAnag + `)`}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}" android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}"
tools:text="FRUDIS S.R.L." /> android:ellipsize="end"
android:maxLines="1"
tools:text="FRUDIS S.R.L. (F0312)" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="("
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{view.currentOrder.codAnag}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
tools:text="F0312" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=")"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/totale_bancali_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_alignParentEnd="true"
android:orientation="horizontal" android:gravity="end"
android:visibility="@{view.currentOrder.descCommessa != null ? View.VISIBLE : View.GONE}"> android:orientation="horizontal">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="end"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Totale bancali"
android:textAllCaps="true"
android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
android:textStyle="bold" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(view.sumLUNumber, 0)}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
tools:text="0" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" UL"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" ("
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(view.sumColliNumber, 0)}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
tools:text="0" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" COL)"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:src="@drawable/ic_pallet_96px"
android:tint="@color/gray_500" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/cliente_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
@ -291,7 +369,7 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{view.currentOrder.descCommessa}" android:text="@{view.currentOrder.descCommessa != null ? view.currentOrder.descCommessa : `-`}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black" android:textColor="@android:color/black"
tools:text="GRUNDHOFER GBMH" /> tools:text="GRUNDHOFER GBMH" />
@ -305,7 +383,75 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_alignParentEnd="true"
android:layout_toEndOf="@id/cliente_layout"
android:gravity="end"
android:orientation="horizontal">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="end"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Totale netto"
android:textAllCaps="true"
android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
android:textStyle="bold" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(view.sumNetKG, 0)}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
tools:text="0" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" KG"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:src="@drawable/ic_weight_kg_96px"
android:tint="@color/gray_500" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/orari_produzione_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
@ -390,14 +536,69 @@
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_toEndOf="@id/orari_produzione_layout"
android:gravity="end"
android:orientation="horizontal">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="end"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Totale lordo"
android:textAllCaps="true"
android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
android:textStyle="bold" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(view.sumGrossKG, 0)}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
tools:text="0" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" KG"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:src="@drawable/ic_weight_kg_96px"
android:tint="@color/gray_500" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="0.5dp"-->
<!-- android:layout_marginTop="8dp"-->
<!-- android:layout_marginBottom="8dp"-->
<!-- android:alpha="0.3"-->
<!-- android:background="@android:color/black" />-->
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"

96
app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
View File

@ -4,9 +4,13 @@
<data> <data>
<import type="it.integry.integrywmsnative.core.model.MtbColt" /> <import type="it.integry.integrywmsnative.core.model.MtbColt" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" /> <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityDate" /> <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" /> <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<import type="android.view.View" /> <import type="android.view.View" />
<variable <variable
@ -15,45 +19,59 @@
</data> </data>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/ripple_effect"
android:clickable="true"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp">
android:clickable="true"
android:background="@drawable/ripple_effect">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" android:orientation="horizontal"
android:orientation="horizontal"> app:layout_constraintTop_toTopOf="parent">
<RelativeLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:orientation="vertical"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp"> android:paddingEnd="12dp">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge1_round_corner"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:text="@{mtbColt.numCollo.toString()}"
android:textColor="@android:color/white"
android:textStyle="bold"
tools:text="22222" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="@{mtbColt.numCollo.toString()}"
tools:text="22222"
android:background="@drawable/badge1_round_corner"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp" android:paddingRight="6dp"
android:textStyle="bold"/> android:paddingBottom="2dp"
android:text="@{mtbColt.mtbColr.get(0).numCnf.intValue() + ` col`}"
android:textStyle="bold"
tools:text="45 col" />
</RelativeLayout> </androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout <LinearLayout
@ -65,31 +83,49 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.LinearLayoutCompat
android:layout_toStartOf="@id/peso_lordo_collo"
android:layout_alignParentStart="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/black" android:orientation="horizontal">
android:textSize="16sp"
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/peso_lordo_collo"
android:text="@{mtbColt.getDataColloHumanLong()}" android:text="@{mtbColt.getDataColloHumanLong()}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium" android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textColor="@android:color/black"
android:textSize="16sp"
tools:text="28 ottobre 2018" /> tools:text="28 ottobre 2018" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toEndOf="@id/peso_lordo_collo"
android:layout_marginStart="4dp"
android:text="@{mtbColt.timeVers}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@android:color/black"
tools:text="28 ottobre 2018" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/peso_lordo_collo" android:id="@+id/peso_lordo_collo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@{UtilityNumber.decimalToString(mtbColt.pesoKg, 0) + ` KG`}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textColor="@android:color/black"
android:textStyle="bold"
android:background="@drawable/badge1_round_corner" android:background="@drawable/badge1_round_corner"
android:backgroundTint="@color/green_400" android:backgroundTint="@color/green_400"
android:paddingStart="6dp" android:paddingStart="6dp"
android:paddingEnd="6dp" android:paddingEnd="6dp"
android:text="@{UtilityNumber.decimalToString(mtbColt.pesoKg, 0) + ` KG`}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textColor="@android:color/black"
android:textStyle="bold"
tools:text="658 KG" /> tools:text="658 KG" />
@ -100,14 +136,14 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_toStartOf="@id/peso_netto_collo"
android:layout_alignParentStart="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{`Preparato da: ` + mtbColt.preparatoDa}" android:layout_alignParentStart="true"
android:layout_toStartOf="@id/peso_netto_collo"
android:text="@{`Linea: ` + mtbColt.codJfas}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColt.preparatoDa) ? View.INVISIBLE : View.VISIBLE}" android:visibility="@{UtilityString.isNullOrEmpty(mtbColt.codJfas) ? View.INVISIBLE : View.VISIBLE}"
tools:text="Preparato da: Utente" /> tools:text="Linea: L3" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/peso_netto_collo" android:id="@+id/peso_netto_collo"