diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java index 90f742b0c14a58c5d54239e346a161c48b487e52..4472dfa89d94209b337df5763dcef7b51aa4c001 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java +++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Bestellung.java @@ -3,6 +3,7 @@ package com.example.mampfmobil.ui.Classes; import android.content.Context; import com.example.mampfmobil.R; +import com.example.mampfmobil.ui.MampfMobil; import java.util.Vector; @@ -15,6 +16,7 @@ public class Bestellung { public String state; public Supplier supplier; + public Customer costumer; public Vector<BestellungsTeil> bestellungsTeile; public int id; @@ -24,6 +26,7 @@ public class Bestellung { this.supplier = supplier; state = context.getString(R.string.ordered) ; this.delivery = delivery; + this.costumer = MampfMobil.currentCustomer; id = idCounter; idCounter++; } 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 7778df8c5a6e25f0588bbd1c84c916d54ffdc874..a04daa2224bdde6af23bb91d0a6df5b964bb1c0e 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 @@ -97,12 +97,14 @@ public class Recyclerviewadapter_deliverer_activeOrders extends RecyclerView.Ada public static class MyViewHolder extends RecyclerView.ViewHolder { - TextView tvID, tvDelivery,tvState,tvTotalCost; + TextView tvID, tvDelivery,tvState,tvTotalCost,cusAddress,supAddress; RecyclerView recyclerViewOrders; Button readyButton; public MyViewHolder(@NonNull View itemView) { super(itemView); + cusAddress = itemView.findViewById(R.id.textView17); + supAddress = itemView.findViewById(R.id.textView14); tvID = itemView.findViewById(R.id.textViewID);; tvState = itemView.findViewById(R.id.textViewState); tvDelivery = itemView.findViewById(R.id.textViewDelivery); diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java index 99ac3378c4c83b71228ee8bb52562ebae5b3e002..bc1b793b2d4fd7ba7c8cfaf387058b33e6e93c13 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java +++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_closedOrders.java @@ -93,12 +93,14 @@ public class Recyclerviewadapter_deliverer_closedOrders extends RecyclerView.Ada public static class MyViewHolder extends RecyclerView.ViewHolder { - TextView tvID, tvDelivery,tvState,tvTotalCost; + TextView tvID, tvDelivery,tvState,tvTotalCost,supAddress,cusAddress; RecyclerView recyclerViewOrders; Button readyButton; public MyViewHolder(@NonNull View itemView) { super(itemView); + cusAddress = itemView.findViewById(R.id.textView17); + supAddress = itemView.findViewById(R.id.textView14); tvID = itemView.findViewById(R.id.textViewID);; tvState = itemView.findViewById(R.id.textViewState); tvDelivery = itemView.findViewById(R.id.textViewDelivery); diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java index 28d0f53512a453214ac773aa37a9536dc0e704d4..efe46359fa11ecb75e80f6f0c98f137b42b71fef 100644 --- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java +++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java @@ -41,6 +41,8 @@ public class Recyclerviewadapter_deliverer_orders extends RecyclerView.Adapter<R public void onBindViewHolder(@NonNull Recyclerviewadapter_deliverer_orders.MyViewHolder holder, int position) { holder.tvID.setText(String.valueOf("# " + bestellungen.get(position).id)); holder.tvState.setText(bestellungen.get(position).state); + holder.supAddress.setText(bestellungen.get(position).supplier.address); + holder.cusAddress.setText(bestellungen.get(position).costumer.adresse); if(bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))){ holder.readyButton.setText(context.getString(R.string.delivered)); @@ -106,13 +108,15 @@ public class Recyclerviewadapter_deliverer_orders extends RecyclerView.Adapter<R public static class MyViewHolder extends RecyclerView.ViewHolder { - TextView tvID, tvDelivery,tvState,tvTotalCost; + TextView tvID, tvDelivery,tvState,tvTotalCost,cusAddress,supAddress; RecyclerView recyclerViewOrders; Button readyButton; public MyViewHolder(@NonNull View itemView) { super(itemView); - tvID = itemView.findViewById(R.id.textViewID);; + tvID = itemView.findViewById(R.id.textViewID); + cusAddress = itemView.findViewById(R.id.textView17); + supAddress = itemView.findViewById(R.id.textView14); tvState = itemView.findViewById(R.id.textViewState); tvDelivery = itemView.findViewById(R.id.textViewDelivery); recyclerViewOrders =itemView.findViewById(R.id.recyclerViewOrders);