From: Felix Dörre <felix@dogcraft.de>
Date: Sun, 15 Nov 2015 22:47:06 +0000 (+0100)
Subject: upd: show ping execution date.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=ad86421f667d8f7ea22a4c01d1287c33847f3a63

upd: show ping execution date.
---

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index b76add29..5c279d34 100644
--- a/src/org/cacert/gigi/dbObjects/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -206,7 +206,7 @@ public class Domain implements IdCachable, Verifyable {
     }
 
     public DomainPingExecution[] getPings() throws GigiApiException {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepareScrollable("SELECT `state`, `type`, `info`, `result`, `configId` FROM `domainPinglog` INNER JOIN `pingconfig` ON `pingconfig`.`id`=`domainPinglog`.`configId` WHERE `pingconfig`.`domainid`=? ORDER BY `when` DESC;");
+        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepareScrollable("SELECT `state`, `type`, `info`, `result`, `configId`, `when` FROM `domainPinglog` INNER JOIN `pingconfig` ON `pingconfig`.`id`=`domainPinglog`.`configId` WHERE `pingconfig`.`domainid`=? ORDER BY `when` DESC;");
         ps.setInt(1, id);
         GigiResultSet rs = ps.executeQuery();
         rs.last();
diff --git a/src/org/cacert/gigi/dbObjects/DomainPingExecution.java b/src/org/cacert/gigi/dbObjects/DomainPingExecution.java
index 9a59c103..85122854 100644
--- a/src/org/cacert/gigi/dbObjects/DomainPingExecution.java
+++ b/src/org/cacert/gigi/dbObjects/DomainPingExecution.java
@@ -1,5 +1,8 @@
 package org.cacert.gigi.dbObjects;
 
+import java.sql.Timestamp;
+import java.util.Date;
+
 import org.cacert.gigi.database.GigiResultSet;
 
 public class DomainPingExecution {
@@ -14,12 +17,15 @@ public class DomainPingExecution {
 
     private DomainPingConfiguration config;
 
+    private Timestamp date;
+
     public DomainPingExecution(GigiResultSet rs) {
         state = rs.getString(1);
         type = rs.getString(2);
         info = rs.getString(3);
         result = rs.getString(4);
         config = DomainPingConfiguration.getById(rs.getInt(5));
+        date = rs.getTimestamp(6);
     }
 
     public String getState() {
@@ -42,4 +48,8 @@ public class DomainPingExecution {
         return config;
     }
 
+    public Date getDate() {
+        return date;
+    }
+
 }
diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java
index da94098a..01d5bbd3 100644
--- a/src/org/cacert/gigi/output/template/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -9,6 +9,7 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.Map;
@@ -16,7 +17,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.util.HTMLEncoder;
 
 public class Template implements Outputable {
@@ -190,7 +190,8 @@ public class Template implements Outputable {
         if (s instanceof Outputable) {
             ((Outputable) s).output(out, l, vars);
         } else if (s instanceof Date) {
-            out.print(DateSelector.getDateFormat().format(s));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            out.print(sdf.format(s));
         } else {
             out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString())));
         }
diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
index 556051b4..482b5950 100644
--- a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.java
@@ -67,6 +67,7 @@ public class DomainPinglogForm extends Form {
                 vars.put("state", pings[counter].getState());
                 vars.put("type", pings[counter].getType());
                 vars.put("config", pings[counter].getInfo());
+                vars.put("date", pings[counter].getDate());
                 String ping3 = pings[counter].getResult();
                 if (ping3 == null) {
                     vars.put("result", "");
diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ
index 854f0d14..291376b5 100644
--- a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ
@@ -4,6 +4,7 @@
 <th><?=_State?></th>
 <th><?=_Config?></th>
 <th><?=_Result?></th>
+<th><?=_Execution Date?></th>
 <th><?=_Reping?></th></tr>
 <? foreach($pings) { ?>
 <tr>
@@ -11,6 +12,7 @@
 <td><?=$state?></td>
 <td><?=$config?></td>
 <td><?=$result?></td>
+<td><?=$date?></td>
 <td><button name='configId' value="<?=$configId?>"><?=_Re-execute?></button></td>
 </tr>
 <?}?>