From 806fc0ce17bbd72e354e28665f347f388dcd9b29 Mon Sep 17 00:00:00 2001
From: fheyming <fabio-andre.heyming@sva.de>
Date: Fri, 2 Jun 2023 10:30:02 +0200
Subject: [PATCH] Bugfix active orders crash
---
.../Recyclerviewadapter_Supplier_Orders.java | 7 +++++++
...lerviewadapter_deliverer_activeOrders.java | 21 +++++++------------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java
index 792f3ba..353c734 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java
@@ -45,6 +45,13 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
}
}
}
+ for(Customer c:MampfMobil.customers){
+ for(Bestellung b:c.bestellungen){
+ if(b.supplier==MampfMobil.currentSupplier){
+ if(!bestellungen.contains(b)){bestellungen.add(b);}
+ }
+ }
+ }
}
@NonNull
@Override
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java
index 77e7fd2..ec5f8ba 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_activeOrders.java
@@ -1,6 +1,7 @@
package com.example.mampfmobil.ui.Classes;
import android.content.Context;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -12,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.example.mampfmobil.R;
import com.example.mampfmobil.ui.MampfMobil;
+import com.example.mampfmobil.ui.deliverer.DelivererActiveOrdersFragment;
import com.example.mampfmobil.ui.deliverer.DelivererOpenOrdersFragment;
import java.util.Vector;
@@ -61,28 +63,21 @@ public class Recyclerviewadapter_deliverer_activeOrders extends RecyclerView.Ada
if (bestellungen.get(position).state.equals("In transportation")) {
+
+ Log.d("myTag", "This is my DELETE");
bestellungen.get(position).state = "delivered";
int adapterPosition = holder.getAdapterPosition();
if (adapterPosition != RecyclerView.NO_POSITION) {
removeItem(adapterPosition);
}
- DelivererOpenOrdersFragment.setVec();
+ DelivererActiveOrdersFragment.setVec();
notifyItemRangeChanged(position, getItemCount());
+ Log.d("myTag", "This is my DELETE22");
+ return;
}
if (bestellungen.get(position).state.equals("ready for transportation/deliverer found")) {
bestellungen.get(position).state = "In transportation";
- DelivererOpenOrdersFragment.setVec();
- notifyItemRangeChanged(position, getItemCount());
- return;
- }
- if (bestellungen.get(position).state.equals("ready for transportation")) {
- bestellungen.get(position).state = "ready for pickup/deliverer found";
- bestellungen.get(position).deliverer = MampfMobil.currentDeliverer;
- int adapterPosition = holder.getAdapterPosition();
- if (adapterPosition != RecyclerView.NO_POSITION) {
- removeItem(adapterPosition);
- }
- DelivererOpenOrdersFragment.setVec();
+ DelivererActiveOrdersFragment.setVec();
notifyItemRangeChanged(position, getItemCount());
return;
}
--
GitLab