Highlight expired nucleus bonus verifications in points overview

[gigi.git] / src / org / cacert / gigi / output / AssurancesDisplay.java

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index f6d5362a62a4d0223f8a5a2122187616b5d20154..86034158e64a55cb0fee246d9f4e967d331a47b2 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -31,9 +31,11 @@ public class AssurancesDisplay implements Outputable {
         final Assurance[] assurances = (Assurance[]) vars.get(assuranceArray);
         if (assurer) {
             vars.put("verb", l.getTranslation("To (User Id)"));
+            vars.put("info", "");
         } else {
             vars.put("verb", l.getTranslation("From"));
             vars.put("myName", "yes");
+            vars.put("info", l.getTranslation("Coloured rows show expired nucleus bonus verifications which are not counted to the total of verification points."));
         }
 
         IterableDataset assuranceGroup = new IterableDataset() {
@@ -51,7 +53,7 @@ public class AssurancesDisplay implements Outputable {
                     vars.put("method", assurance.getMethod());
                     Name to = assurance.getTo();
                     if (assurer) {
-                        vars.put("linkId", assurance.getTo().getOwner().getId());
+                        vars.put("linkId", to == null ? "" : to.getOwner().getId());
                         vars.put("verbVal", to == null ? l.getTranslation("applicant's name removed") : to.getOwner().getId());
                         vars.put("myName", to == null ? l.getTranslation("applicant's name removed") : to);
                     } else {
@@ -60,8 +62,9 @@ public class AssurancesDisplay implements Outputable {
                         vars.put("myName", to == null ? l.getTranslation("own name removed") : to);
                     }
                     vars.put("date", assurance.getDate());
-                    vars.put("location", assurance.getLocation());
+                    vars.put("location", assurance.getLocation() + " (" + (assurance.getCountry() == null ? l.getTranslation("not given") : assurance.getCountry().getName()) + ")");
                     vars.put("points", assurance.getPoints());
+                    vars.put("expired", assurance.isExpired());
                     i++;
                     return true;
                 }