upd: replace preferred name by user id in points issued table

[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 df9d80a67db05dc9b8f3a5316efa5e0a61e80240..595872ac3ac778f98c8760beac6887a14b5c62b7 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -1,31 +1,37 @@
 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.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"));
 
-    public String assuranceArray;
+    private boolean assurer;
 
-    static {
-        template = new Template(new InputStreamReader(AssurancesDisplay.class.getResourceAsStream("AssurancesDisplay.templ")));
-    }
+    public String assuranceArray;
 
-    public AssurancesDisplay(String assuranceArray) {
+    public AssurancesDisplay(String assuranceArray, boolean assurer) {
         this.assuranceArray = assuranceArray;
+        this.assurer = assurer;
     }
 
     @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)"));
+        } else {
+            vars.put("verb", l.getTranslation("From"));
+            vars.put("myName", "yes");
+        }
+
         IterableDataset assuranceGroup = new IterableDataset() {
 
             private int i = 0;
@@ -38,8 +44,13 @@ public class AssurancesDisplay implements Outputable {
                     Assurance assurance = assurances[i];
                     vars.put("id", assurance.getId());
                     vars.put("method", assurance.getMethod());
-                    vars.put("from", assurance.getFrom().getName());
-                    vars.put("to", assurance.getTo().getName());
+                    if (assurer) {
+                        vars.put("verbVal", assurance.getTo().getOwner().getId());
+                        vars.put("myName", assurance.getTo());
+                    } else {
+                        vars.put("verbVal", assurance.getFrom().getPreferredName());
+                        vars.put("myName", assurance.getTo());
+                    }
                     vars.put("date", assurance.getDate());
                     vars.put("location", assurance.getLocation());
                     vars.put("points", assurance.getPoints());