X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FAssuranceForm.java;h=36e5247ca87191281c473d7f07b8c19653d08570;hb=0cfa27b249e544cd0e82e601c640e1c2f700299d;hp=3020390d28b9855b8a1fb8985661bf188414bb9e;hpb=3e9f3d6f2655dd7ff819a77fba2076da3c1f3717;p=gigi.git diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java index 3020390d..36e5247c 100644 --- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java +++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java @@ -1,7 +1,6 @@ package org.cacert.gigi.pages.wot; import java.io.PrintWriter; -import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; @@ -13,7 +12,7 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Name; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; -import org.cacert.gigi.output.Form; +import org.cacert.gigi.output.template.Form; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.Page; import org.cacert.gigi.util.Notary; @@ -31,11 +30,11 @@ public class AssuranceForm extends Form { templ = new Template(AssuranceForm.class.getResource("AssuranceForm.templ")); } - public AssuranceForm(HttpServletRequest hsr, int assuree) { + public AssuranceForm(HttpServletRequest hsr, User assuree) { super(hsr); - this.assuree = new User(assuree); + this.assuree = assuree; assureeName = this.assuree.getName(); - dob = this.assuree.getDob(); + dob = this.assuree.getDoB(); } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -48,13 +47,9 @@ public class AssuranceForm extends Form { res.putAll(vars); 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())); + res.put("maxpoints", assuree.getMaxAssurePoints()); + res.put("dob", sdf.format(assuree.getDoB())); + res.put("dobFmt2", sdf2.format(assuree.getDoB())); templ.output(out, l, res); } @@ -82,8 +77,6 @@ public class AssuranceForm extends Form { try { Notary.assure(Page.getUser(req), assuree, assureeName, dob, pointsI, req.getParameter("location"), req.getParameter("date")); return true; - } catch (SQLException e) { - e.printStackTrace(); } catch (GigiApiException e) { e.format(out, Page.getLanguage(req)); }