X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FAssurancesDisplay.java;h=86034158e64a55cb0fee246d9f4e967d331a47b2;hp=8f0e6cabb54085287700e059db012ec1729aec35;hb=3238dff5b3beca228359b370bc104f48d6247632;hpb=9a6015ecc14fd10aaad4f25a5646ce94334887ba

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 8f0e6cab..86034158 100644
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -18,9 +18,12 @@ public class AssurancesDisplay implements Outputable {
 
     public String assuranceArray;
 
-    public AssurancesDisplay(String assuranceArray, boolean assurer) {
+    private boolean support;
+
+    public AssurancesDisplay(String assuranceArray, boolean assurer, boolean support) {
         this.assuranceArray = assuranceArray;
         this.assurer = assurer;
+        this.support = support;
     }
 
     @Override
@@ -28,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() {
@@ -43,19 +48,23 @@ public class AssurancesDisplay implements Outputable {
                     return false;
                 } else {
                     Assurance assurance = assurances[i];
+                    vars.put("support", support);
                     vars.put("id", assurance.getId());
                     vars.put("method", assurance.getMethod());
                     Name to = assurance.getTo();
                     if (assurer) {
+                        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 {
+                        vars.put("linkId", assurance.getFrom().getId());
                         vars.put("verbVal", assurance.getFrom().getPreferredName());
                         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;
                 }