upd: show ping execution date.

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index b76add29db4aaf98d887fa877dab2d6d369ca278..5c279d34e94d86443018dabd04cdf465d6549ba8 100644 (file)
--- 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 {
     }
 
     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();
         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 9a59c1035340a5d0004ef0b9991539f8120a3142..8512285448e598eb4cf3feab9dbe262973f1e7b5 100644 (file)
--- 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;
 
 package org.cacert.gigi.dbObjects;
 

+import java.sql.Timestamp;
+import java.util.Date;
+

 import org.cacert.gigi.database.GigiResultSet;
 
 public class DomainPingExecution {
 import org.cacert.gigi.database.GigiResultSet;
 
 public class DomainPingExecution {


@@ -14,12 +17,15 @@ public class DomainPingExecution {
 
     private DomainPingConfiguration config;
 
 
     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));
     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() {
     }
 
     public String getState() {


@@ -42,4 +48,8 @@ public class DomainPingExecution {
         return config;
     }
 
         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 da94098afca208430009e59b0fcfa89c6dab1acf..01d5bbd3d48348cea55c840b03006d10e9aea495 100644 (file)
--- 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.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;
 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 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 {
 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) {
         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())));
         }
         } 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 556051b4d96060aa11c011386c1911dc03663e13..482b5950d2bb55ffe4a1a553747e0e1169d7e9d9 100644 (file)
--- 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("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", "");
                 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 854f0d1495d6dc0aa1135d4a04c829f48b59cf18..291376b5fdee809e6acf0dc98c1c8308ceb958a9 100644 (file)
--- 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><?=_State?></th>
 <th><?=_Config?></th>
 <th><?=_Result?></th>

+<th><?=_Execution Date?></th>

 <th><?=_Reping?></th></tr>
 <? foreach($pings) { ?>
 <tr>
 <th><?=_Reping?></th></tr>
 <? foreach($pings) { ?>
 <tr>


@@ -11,6 +12,7 @@
 <td><?=$state?></td>
 <td><?=$config?></td>
 <td><?=$result?></td>
 <td><?=$state?></td>
 <td><?=$config?></td>
 <td><?=$result?></td>

+<td><?=$date?></td>

 <td><button name='configId' value="<?=$configId?>"><?=_Re-execute?></button></td>
 </tr>
 <?}?>
 <td><button name='configId' value="<?=$configId?>"><?=_Re-execute?></button></td>
 </tr>
 <?}?>