From 31df67ef33b4196adb6911f801c2d57e23abc1ef Mon Sep 17 00:00:00 2001
From: Alex <78383757+Lextical@users.noreply.github.com>
Date: Tue, 7 Apr 2026 17:31:43 -0600
Subject: [PATCH] fixed purchase order for android on new backend

---
 .../adapters/PurchaseOrderAdapter.java        | 12 ++++++----
 .../petstoremobile/dtos/PurchaseOrderDTO.java | 10 ++++++++
 .../listfragments/ProductFragment.java        |  2 +-
 .../PurchaseOrderDetailFragment.java          | 24 ++++++++++++-------
 .../layout/fragment_purchase_order_detail.xml | 16 +++++++++++++
 .../main/res/layout/item_purchase_order.xml   | 11 +++++++++
 6 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/android/app/src/main/java/com/example/petstoremobile/adapters/PurchaseOrderAdapter.java b/android/app/src/main/java/com/example/petstoremobile/adapters/PurchaseOrderAdapter.java
index 57061ef1..a31a3d0a 100644
--- a/android/app/src/main/java/com/example/petstoremobile/adapters/PurchaseOrderAdapter.java
+++ b/android/app/src/main/java/com/example/petstoremobile/adapters/PurchaseOrderAdapter.java
@@ -46,19 +46,23 @@ public class PurchaseOrderAdapter extends RecyclerView.Adapter<PurchaseOrderAdap
 
         binding.tvPOId.setText("PO #" + (po.getPurchaseOrderId() != null ? po.getPurchaseOrderId() : ""));
         binding.tvPOSupplier.setText("Supplier: " + (po.getSupplierName() != null ? po.getSupplierName() : ""));
+        binding.tvPOStore.setText("Store: " + (po.getStoreName() != null ? po.getStoreName() : ""));
         binding.tvPODate.setText("Date: " + (po.getOrderDate() != null ? po.getOrderDate() : ""));
 
         String status = po.getStatus() != null ? po.getStatus() : "";
         binding.tvPOStatus.setText(status);
 
-        switch (status) {
-            case "Completed":
+        switch (status.toUpperCase()) {
+            case "RECEIVED":
                 binding.tvPOStatus.setBackgroundColor(Color.parseColor("#4CAF50"));
                 break;
-            case "Pending":
+            case "PLACED":
+                binding.tvPOStatus.setBackgroundColor(Color.parseColor("#2196F3"));
+                break;
+            case "PENDING":
                 binding.tvPOStatus.setBackgroundColor(Color.parseColor("#FF9800"));
                 break;
-            case "Cancelled":
+            case "CANCELLED":
                 binding.tvPOStatus.setBackgroundColor(Color.parseColor("#F44336"));
                 break;
             default:
diff --git a/android/app/src/main/java/com/example/petstoremobile/dtos/PurchaseOrderDTO.java b/android/app/src/main/java/com/example/petstoremobile/dtos/PurchaseOrderDTO.java
index d7a392ea..813633c9 100644
--- a/android/app/src/main/java/com/example/petstoremobile/dtos/PurchaseOrderDTO.java
+++ b/android/app/src/main/java/com/example/petstoremobile/dtos/PurchaseOrderDTO.java
@@ -4,6 +4,8 @@ public class PurchaseOrderDTO {
     private Long purchaseOrderId;
     private Long supId;
     private String supplierName;
+    private Long storeId;
+    private String storeName;
     private String orderDate;
     private String status;
     private String createdAt;
@@ -21,6 +23,14 @@ public class PurchaseOrderDTO {
         return supplierName;
     }
 
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
     public String getOrderDate() {
         return orderDate;
     }
diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/ProductFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/ProductFragment.java
index 0eea959f..d68a218c 100644
--- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/ProductFragment.java
+++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/ProductFragment.java
@@ -173,7 +173,7 @@ public class ProductFragment extends Fragment implements ProductAdapter.OnProduc
         Bundle args = new Bundle();
         if (position != -1) {
             ProductDTO product = productList.get(position);
-            args.putLong("productId", product.getProdId());
+            args.putLong("prodId", product.getProdId());
         }
         NavHostFragment.findNavController(this).navigate(R.id.nav_product_detail, args);
     }
diff --git a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PurchaseOrderDetailFragment.java b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PurchaseOrderDetailFragment.java
index 4a30e4cd..eb69bd16 100644
--- a/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PurchaseOrderDetailFragment.java
+++ b/android/app/src/main/java/com/example/petstoremobile/fragments/listfragments/detailfragments/PurchaseOrderDetailFragment.java
@@ -73,19 +73,27 @@ public class PurchaseOrderDetailFragment extends Fragment {
                 PurchaseOrderDTO po = resource.data;
                 binding.tvPODetailId.setText("PO #" + po.getPurchaseOrderId());
                 binding.tvPODetailSupplier.setText(po.getSupplierName());
+                binding.tvPODetailStore.setText(po.getStoreName() != null ? po.getStoreName() : "N/A");
                 binding.tvPODetailDate.setText(po.getOrderDate());
 
                 String status = po.getStatus() != null ? po.getStatus() : "";
                 binding.tvPODetailStatus.setText(status);
-                switch (status) {
-                    case "Completed":
-                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#4CAF50")); break;
-                    case "Pending":
-                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#FF9800")); break;
-                    case "Cancelled":
-                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#F44336")); break;
+                switch (status.toUpperCase()) {
+                    case "RECEIVED":
+                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#4CAF50"));
+                        break;
+                    case "PLACED":
+                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#2196F3"));
+                        break;
+                    case "PENDING":
+                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#FF9800"));
+                        break;
+                    case "CANCELLED":
+                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#F44336"));
+                        break;
                     default:
-                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#9E9E9E")); break;
+                        binding.tvPODetailStatus.setTextColor(Color.parseColor("#9E9E9E"));
+                        break;
                 }
             } else if (resource.status == Resource.Status.ERROR) {
                 Toast.makeText(getContext(), "Failed to load order: " + resource.message, Toast.LENGTH_SHORT).show();
diff --git a/android/app/src/main/res/layout/fragment_purchase_order_detail.xml b/android/app/src/main/res/layout/fragment_purchase_order_detail.xml
index 7cd5dff0..d55c5f89 100644
--- a/android/app/src/main/res/layout/fragment_purchase_order_detail.xml
+++ b/android/app/src/main/res/layout/fragment_purchase_order_detail.xml
@@ -70,6 +70,22 @@
                     android:textStyle="bold"
                     android:layout_marginBottom="16dp"/>
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Store"
+                    android:textColor="@color/text_light"
+                    android:textSize="12sp"/>
+
+                <TextView
+                    android:id="@+id/tvPODetailStore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_dark"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:layout_marginBottom="16dp"/>
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/android/app/src/main/res/layout/item_purchase_order.xml b/android/app/src/main/res/layout/item_purchase_order.xml
index 7e9f868f..ce1d30f2 100644
--- a/android/app/src/main/res/layout/item_purchase_order.xml
+++ b/android/app/src/main/res/layout/item_purchase_order.xml
@@ -53,6 +53,17 @@
         android:textColor="#888888"
         android:textSize="14sp" />
 
+    <TextView
+        android:id="@+id/tvPOStore"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="Store Name"
+        android:textColor="#888888"
+        android:textSize="14sp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"