Aggiunto diacod in Contenuto UL

This commit is contained in:
Giuseppe Scorrano 2019-01-23 19:58:14 +01:00
parent 174f7ebbdc
commit 0baee207ee
3 changed files with 19 additions and 6 deletions

View File

@ -47,7 +47,7 @@ public class PickingObjectDTO implements Parcelable {
private Boolean tempHidden = null;
private PickData tempPickData = null;
private List<MtbColr> withdrawRows = new ArrayList<>();
private ArrayList<MtbColr> withdrawRows = new ArrayList<>();
protected PickingObjectDTO(Parcel in) {
if (in.readByte() == 0) {
@ -423,11 +423,12 @@ public class PickingObjectDTO implements Parcelable {
return this;
}
public List<MtbColr> getWithdrawRows() {
public ArrayList<MtbColr> getWithdrawRows() {
if(withdrawRows == null) withdrawRows = new ArrayList<>();
return withdrawRows;
}
public PickingObjectDTO setWithdrawRows(List<MtbColr> withdrawRows) {
public PickingObjectDTO setWithdrawRows(ArrayList<MtbColr> withdrawRows) {
this.withdrawRows = withdrawRows;
return this;
}

View File

@ -45,9 +45,9 @@ public class VenditaOrdineInevasoActivity extends AppCompatActivity {
FragmentArticoliInColloBottomSheetBinding bindings = this.bindings.bottomSheetInclude;
mArticoliInColloBottomSheetViewModel = new ArticoliInColloBottomSheetViewModel(this, bindings);
List<PickingObjectDTO> pickingList = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList"));
List<OrdineVenditaGroupedInevasoDTO> testateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini"));
List<MtbColt> colliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati"));
ArrayList<PickingObjectDTO> pickingList = DataCache.retrieveItem(getIntent().getStringExtra("keyPickingList"));
ArrayList<OrdineVenditaGroupedInevasoDTO> testateOrdini = DataCache.retrieveItem(getIntent().getStringExtra("keyTestateOrdini"));
ArrayList<MtbColt> colliRegistrati = DataCache.retrieveItem(getIntent().getStringExtra("keyColliRegistrati"));
mVenditaOrdineInevasoViewModel = new VenditaOrdineInevasoViewModel(
this, mArticoliInColloBottomSheetViewModel, pickingList, testateOrdini, colliRegistrati);

View File

@ -37,6 +37,18 @@
tools:text="COD MART" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:text='@{!UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod) ? mtbColr.mtbAart.diacod : ""}'
android:textColor="@color/red_600"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
tools:text="DIACOD HERE"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"