changeset 2632:7d163c2c6e6d

Improve XSL transformation for fixings overview output. flys-artifacts/trunk@4251 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 17 Apr 2012 13:55:50 +0000 (2012-04-17)
parents 87085ccea466
children 894186b4c1d0
files flys-artifacts/ChangeLog flys-artifacts/contrib/fixoverview2html.xsl flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java
diffstat 3 files changed, 26 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Apr 13 07:44:25 2012 +0000
+++ b/flys-artifacts/ChangeLog	Tue Apr 17 13:55:50 2012 +0000
@@ -1,3 +1,11 @@
+2012-04-17	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* contrib/fixoverview2html.xsl: Render optional check boxes.
+	  Use different font. TODO: Move to client,
+
+	* src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java:
+	  Ignore hours and seconds.
+
 2012-04-13  Raimund Renkert <raimund.renkert@intevation.de>
 
 	Issue 528, 637
--- a/flys-artifacts/contrib/fixoverview2html.xsl	Fri Apr 13 07:44:25 2012 +0000
+++ b/flys-artifacts/contrib/fixoverview2html.xsl	Tue Apr 17 13:55:50 2012 +0000
@@ -3,7 +3,12 @@
   version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:output method="xml" encoding="UTF-8"/>
+  <xsl:output method="xml" encoding="UTF-8"
+    doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+    doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" indent="yes"/>
+
+  <xsl:param name="project-uuid">de3f3307-3429-4ff9-8f43-3fb2fcf21b27</xsl:param>
+  <xsl:param name="render-checkboxes" select="true()"/>
 
   <xsl:template name="percent">
     <xsl:param name="sector"/>
@@ -84,6 +89,11 @@
 
   <xsl:template match="event">
     <tr>
+      <xsl:if test="$render-checkboxes">
+        <td>
+          <input type="checkbox" name="{$project-uuid}:{@cid}"/>
+        </td>
+      </xsl:if>
       <td>
         <xsl:apply-templates mode="sectors"/>
       </td>
@@ -95,10 +105,13 @@
   </xsl:template>
 
   <xsl:template match="events">
-    <table width="95%" border="1" cellspacing="0" cellpadding="0">
+    <table width="95%" border="1" cellspacing="0" cellpadding="0" style="font-size: 11pt;font-family:Arial;Verdana,sans-serif">
       <colgroup>
-        <col width="85%"/>
-        <col width="15%"/>
+        <xsl:if test="$render-checkboxes">
+            <col width="1em"/>
+        </xsl:if>
+        <col width="*"/>
+        <col width="11em"/>
       </colgroup>
       <xsl:apply-templates/>
     </table>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java	Fri Apr 13 07:44:25 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java	Tue Apr 17 13:55:50 2012 +0000
@@ -30,7 +30,7 @@
     public static final double EPSILON  = 1e-5;
     public static final double EPSILON2 = 1e-1;
 
-    public static final String DATE_FORMAT = "dd.MM.yyyy HH:mm";
+    public static final String DATE_FORMAT = "dd.MM.yyyy";
 
     public static final String SQL_RIVER_ID =
         "SELECT" +

http://dive4elements.wald.intevation.org