[bknr-cvs] hans changed deployed/bos/projects/bos/

Tue Mar 23 12:57:15 UTC 2010

Revision: 4521
Author: hans
URL: http://bknr.net/trac/changeset/4521

Format tweaks in sponsor list.

U   deployed/bos/projects/bos/payment-website/static/contracts.xsl
U   deployed/bos/projects/bos/web/reports-xml-handler.lisp

Modified: deployed/bos/projects/bos/payment-website/static/contracts.xsl
===================================================================

--- deployed/bos/projects/bos/payment-website/static/contracts.xsl	2010-03-23 10:54:57 UTC (rev 4520)
+++ deployed/bos/projects/bos/payment-website/static/contracts.xsl	2010-03-23 12:57:15 UTC (rev 4521)
@@ -10,7 +10,7 @@
       <body>
         <table border="1">
           <thead>
-            <tr><th>Name</th><th>ID</th><th>Country</th><th>Coordinate (x/y)</th><th>qm</th></tr>
+            <tr><th>Name</th><th>ID</th><th>Country</th><th>Coordinate</th><th>qm</th></tr>
           </thead>
           <tbody>
             <xsl:apply-templates/>
@@ -23,10 +23,10 @@
   <xsl:template match="contract">
     <tr>
       <td><xsl:value-of select="@sponsor-name" /></td>
-      <td><xsl:value-of select="@sponsor-id" /></td>
-      <td><xsl:value-of select="@country" /></td>
-      <td><xsl:value-of select="@utm-x" />/<xsl:value-of select="@utm-y" /></td>
-      <td><xsl:value-of select="@sqm-count" /></td>
+      <td align="right"><xsl:value-of select="@sponsor-id" /></td>
+      <td align="right"><xsl:value-of select="@country" /></td>
+      <td align="right"><xsl:value-of select="@coords" /></td>
+      <td align="right"><xsl:value-of select="@sqm-count" /></td>
     </tr>
   </xsl:template>
 </xsl:stylesheet>

Modified: deployed/bos/projects/bos/web/reports-xml-handler.lisp
===================================================================
--- deployed/bos/projects/bos/web/reports-xml-handler.lisp	2010-03-23 10:54:57 UTC (rev 4520)
+++ deployed/bos/projects/bos/web/reports-xml-handler.lisp	2010-03-23 12:57:15 UTC (rev 4521)
@@ -53,9 +53,8 @@
         (attribute "country" (sponsor-country sponsor))
         (attribute "sqm-count" (length (contract-m2s contract)))
         (when include-coords
-          (let ((m2 (first (contract-m2s contract))))
-            (attribute "utm-x" (m2-x m2))
-            (attribute "utm-y" (m2-y m2))))))))
+          (destructuring-bind (lon lat) (m2-lon-lat (first (contract-m2s contract)))
+            (attribute "coords" (with-output-to-string (s) (geometry:format-lon-lat s lon lat)))))))))
 
 (defreport all-contracts ()
   (all-contracts/internal))



