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

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index df9d80a6..86034158 100644
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -1,31 +1,43 @@
 package org.cacert.gigi.output;
 
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import org.cacert.gigi.Assurance;
+import org.cacert.gigi.dbObjects.Assurance;
+import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
+import org.cacert.gigi.output.template.Outputable;
 import org.cacert.gigi.output.template.Template;
 
 public class AssurancesDisplay implements Outputable {
 
-    private static Template template;
+    private static final Template template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
+
+    private boolean assurer;
 
     public String assuranceArray;
 
-    static {
-        template = new Template(new InputStreamReader(AssurancesDisplay.class.getResourceAsStream("AssurancesDisplay.templ")));
-    }
+    private boolean support;
 
-    public AssurancesDisplay(String assuranceArray) {
+    public AssurancesDisplay(String assuranceArray, boolean assurer, boolean support) {
         this.assuranceArray = assuranceArray;
+        this.assurer = assurer;
+        this.support = support;
     }
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         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() {
 
             private int i = 0;
@@ -36,13 +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());
-                    vars.put("from", assurance.getFrom().getName());
-                    vars.put("to", assurance.getTo().getName());
+                    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;
                 }