Merge remote-tracking branch 'origin/master'

fxsth · Jul 9, 2020 · 57bf383 · 57bf383
2 parents 4240624 + 8c10e22
commit 57bf383
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/BoxBase/app/src/main/graphql/com/example/OutgoingSubscription.graphql b/BoxBase/app/src/main/graphql/com/example/OutgoingSubscription.graphql
@@ -14,5 +14,6 @@ subscription OutgoingSub($user: Int) {
       name
     }
     zugestellt
+    updated_at
   }
 }
diff --git a/BoxBase/app/src/main/java/com/example/boxbase/MainMenuActivity.java b/BoxBase/app/src/main/java/com/example/boxbase/MainMenuActivity.java
@@ -294,9 +294,11 @@ public void updateOutgoingDeliveryList(List<OutgoingSubSubscription.Pakete> pake
                     new outgoing_deliveries(
                             drawable,
                             paket.empfaenger().name(),
-                            delivery_status)
+                            delivery_status,
+                            paket.updated_at().toString())
             );
         }
+        outgoing_deliveriesList.sort(Comparator.comparing(outgoing_deliveries::getLast_updated).reversed());
         ListView outgoing_deliveries_ListView = findViewById(R.id.outgoing_deliveries_ListView);
         outgoing_deliveries_ListView.post(new Runnable() {
                                               @Override

diff --git a/BoxBase/app/src/main/java/com/example/boxbase/outgoing_deliveries.java b/BoxBase/app/src/main/java/com/example/boxbase/outgoing_deliveries.java
@@ -1,15 +1,21 @@
 package com.example.boxbase;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 public class outgoing_deliveries {
 
         int delivery_status_image;
+        LocalDateTime last_updated;
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSXXX");
 
         String delivery_receiver, delivery_status;
 
-    public outgoing_deliveries(int delivery_status_image, String delivery_receiver, String delivery_status) {
+    public outgoing_deliveries(int delivery_status_image, String delivery_receiver, String delivery_status, String last_updated) {
         this.delivery_status_image = delivery_status_image;
         this.delivery_receiver = delivery_receiver;
         this.delivery_status = delivery_status;
+        this.last_updated = LocalDateTime.parse(last_updated, this.formatter);
     }
 
     public int getDelivery_status_image() {
@@ -23,4 +29,8 @@ public String getDelivery_receiver() {
     public String getDelivery_status() {
         return delivery_status;
     }
+    public LocalDateTime getLast_updated() {
+        return last_updated;
+    }
+
 }