commit d47cc951c55e8ae7b2a8a1ffe7ba3ca49ffbac86
author Khai Do <zaro0508@gmail.com> Thu Sep 08 04:15:45 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 08 04:15:46 2016 +0000
tree 4f855f3ad2265b78c145519b3476861f27ba591b
parent dee73acf55c07521237c52f89f09b006bb8fdcd2
parent 4fe41caa1c826889f64c0fd21a0a44504c610cd1

Merge "Add a rerun field to verifications"

src/main/java/com/googlesource/gerrit/plugins/verifystatus/client/JobsScreen.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/client/JobsScreen.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/client/JobsScreen.java
index f3c7173..37aa615 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/client/JobsScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/client/JobsScreen.java
@@ -44,7 +44,7 @@
   JobsScreen(String changeNumber, String revisionNumber) {
     new RestApi("changes").id(changeNumber).view("revisions").id(revisionNumber)
         .view(Plugin.get().getPluginName(), "verifications")
-        .addParameter("sort", "REPORTER")
+        .addParameter("sort", "DATE")
         .get(new AsyncCallback<NativeMap<VerificationInfo>>() {
           @Override
           public void onSuccess(NativeMap<VerificationInfo> result) {

src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/GetVerifications.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/GetVerifications.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/GetVerifications.java
index adf0257..6e1e59c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/GetVerifications.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/GetVerifications.java
@@ -96,6 +96,16 @@
               .toComparison();
         }
       });
+    } else if (order.equals("DATE")) {
+      // sort the jobs list by Granted(Z-A)
+      Collections.sort(jobs, new Comparator<PatchSetVerification>() {
+        @Override
+        public int compare(PatchSetVerification a, PatchSetVerification b) {
+          return new CompareToBuilder()
+              .append(b.getGranted(),a.getGranted())
+              .toComparison();
+        }
+      });
     }
   }
 
@@ -149,6 +159,8 @@
           sortJobs(jobs, "REPORTER");
         } else if (sort.equals("NAME")) {
           sortJobs(jobs, "NAME");
+        } else if (sort.equals("DATE")) {
+          sortJobs(jobs, "DATE");
         }
       }