From 5576b4a1dbf174b108be12075dadec996d790cb1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sun, 24 Aug 2014 10:47:35 +0200
Subject: [PATCH] FIX: Smaller changes in the Assure-Form.

---
 src/org/cacert/gigi/Name.java                     | 5 +++++
 src/org/cacert/gigi/pages/wot/AssuranceForm.java  | 6 +++++-
 src/org/cacert/gigi/pages/wot/AssuranceForm.templ | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/org/cacert/gigi/Name.java b/src/org/cacert/gigi/Name.java
index f13f85bf..fda8160c 100644
--- a/src/org/cacert/gigi/Name.java
+++ b/src/org/cacert/gigi/Name.java
@@ -35,6 +35,11 @@ public class Name implements Outputable {
         out.println("</span>");
     }
 
+    @Override
+    public String toString() {
+        return fname + " " + lname;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if ( !(obj instanceof Name)) {
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 01c4ea0e..3368414a 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -34,17 +34,21 @@ public class AssuranceForm extends Form {
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
+    SimpleDateFormat sdf2 = new SimpleDateFormat("dd. MMM yyyy");
+
     @Override
     public void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         HashMap<String, Object> res = new HashMap<String, Object>();
         res.putAll(vars);
-        res.put("name", assuree.getName());
+        res.put("nameExplicit", assuree.getName());
+        res.put("name", assuree.getName().toString());
         try {
             res.put("maxpoints", assuree.getMaxAssurePoints());
         } catch (SQLException e) {
             e.printStackTrace();
         }
         res.put("dob", sdf.format(assuree.getDob()));
+        res.put("dobFmt2", sdf2.format(assuree.getDob()));
         templ.output(out, l, res);
     }
 
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 79ae81c6..580b1896 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -8,11 +8,11 @@
 
 	<tr>
 		<td><?=_Name?>: </td>
-		<td><span class="accountdetail"><?=$name?></span></td>
+		<td><span class="accountdetail"><?=$nameExplicit?></span></td>
 	</tr>
 	<tr>
 		<td><?=_Date of Birth?>: </td>
-		<td><span class="accountdetail dob"><?=$dob?></span></td>
+		<td><span class="accountdetail dob"><?=$dob?> (<?=$dobFmt2?>)</span></td>
 	</tr>
 	<tr>
 		<td><input type="checkbox" name="certify" value="1"></td>
-- 
2.39.2