From bknr@bknr.net Sat Oct 14 09:23:46 2006
From: bknr@bknr.net
To: bknr-cvs@common-lisp.net
Subject: [bknr-cvs] r1994 - branches/xml-class-rework/projects/bos/statistics
Date: Sat, 14 Oct 2006 09:23:46 -0400
Message-ID: <20061014132346.0931F33003@common-lisp.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2842819316430114942=="

--===============2842819316430114942==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: hhubner
Date: 2006-10-14 09:23:45 -0400 (Sat, 14 Oct 2006)
New Revision: 1994

Added:
   branches/xml-class-rework/projects/bos/statistics/all-contracts.lxsl
Modified:
   branches/xml-class-rework/projects/bos/statistics/
   branches/xml-class-rework/projects/bos/statistics/Makefile
   branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart.xsl
Log:
Add total sqm sales graphics



Property changes on: branches/xml-class-rework/projects/bos/statistics
___________________________________________________________________
Name: svn:ignore
   - contracts-by-week.xsl
contracts-by-week.xml
*.svg

   + all-contracts.xsl
contracts-by-week.xsl
contracts-by-week.xml
*.svg


Modified: branches/xml-class-rework/projects/bos/statistics/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/xml-class-rework/projects/bos/statistics/Makefile	2006-10-14 11:=
25:47 UTC (rev 1993)
+++ branches/xml-class-rework/projects/bos/statistics/Makefile	2006-10-14 13:=
23:45 UTC (rev 1994)
@@ -1,16 +1,19 @@
=20
 BASE_URL	=3D http://192.168.254.132:8080/reports-xml
-YEAR		=3D 2005
+YEAR		=3D=20
 LOGIN		=3D
 OUTPUT_DIR	=3D ../payment-website/images/statistics
=20
-GRAPHICS	=3D contracts-by-week.svg
+YEARLY_GRAPHICS	=3D contracts-by-week.svg
+TOTAL_GRAPHICS	=3D all-contracts.svg
=20
 all:
-	$(MAKE) graphics YEAR=3D2005
-	$(MAKE) graphics YEAR=3D2006
+	$(MAKE) yearly-graphics YEAR=3D2005
+	$(MAKE) yearly-graphics YEAR=3D2006
+	$(MAKE) total-graphics
=20
-graphics: $(GRAPHICS)
+yearly-graphics: $(YEARLY_GRAPHICS)
+total-graphics: $(TOTAL_GRAPHICS)
=20
 .SUFFIXES: .lxsl .xsl .svg
=20
@@ -19,5 +22,5 @@
=20
 .xsl.svg:
 	xsltproc -o $*.xml $*.xsl '$(BASE_URL)/$*/$(YEAR)$(LOGIN)'
-	xsltproc -o $(OUTPUT_DIR)/$*-$(YEAR).svg buildSVGLineChart.xsl $*.xml
+	xsltproc -o $(OUTPUT_DIR)/$*$(YEAR).svg buildSVGLineChart.xsl $*.xml
 	rm $*.xml
\ No newline at end of file

Added: branches/xml-class-rework/projects/bos/statistics/all-contracts.lxsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/xml-class-rework/projects/bos/statistics/all-contracts.lxsl	2006=
-10-14 11:25:47 UTC (rev 1993)
+++ branches/xml-class-rework/projects/bos/statistics/all-contracts.lxsl	2006=
-10-14 13:23:45 UTC (rev 1994)
@@ -0,0 +1,75 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<xsl:stylesheet version=3D"1.0" xmlns:xsl=3D"http://www.w3.org/1999/XSL/Tran=
sform" xmlns:loop=3D"http://informatik.hu-berlin.de/loop">
+ <xsl:output method=3D"xml"/>
+
+ <xsl:template match=3D"/response">
+  <xsl:variable name=3D"total_sqms_sold">
+   <xsl:value-of select=3D"sum(contract/@sqm-count)"/>
+  </xsl:variable>
+  <graphData>
+   <sets>
+    <set title=3D"Contracts" marker-type=3D"none" color=3D"#00ff00">
+     <xsl:for-each select=3D"contract">
+      <measure>
+       <xvalue><xsl:value-of select=3D"@universal-time"/></xvalue>
+       <yvalue><xsl:value-of select=3D"@sqm-count + sum(preceding-sibling::*=
/@sqm-count)"/></yvalue>
+      </measure>
+     </xsl:for-each>
+    </set>
+   </sets>
+   <minx><xsl:value-of select=3D"/response/contract[1]/@universal-time"/></m=
inx>
+   <maxx><xsl:value-of select=3D"/response/contract[last()]/@universal-time"=
/></maxx>
+   <miny>0</miny>
+   <maxy><xsl:value-of select=3D"$total_sqms_sold"/></maxy>
+   <title>Total square meters sold</title>
+   <xvalues>
+    <xsl:for-each select=3D"/response/contract">
+     <xsl:choose>
+
+      <xsl:when test=3D"(substring(preceding-sibling::*[1]/@date-time, 5, 2)=
 !=3D substring(@date-time, 5, 2)) and (substring(@date-time, 5, 2) =3D '01')=
">
+       <xvalue>
+        <value><xsl:value-of select=3D"@universal-time"/></value>
+        <label>Q1/<xsl:value-of select=3D"substring(@date-time, 1, 4)"/></la=
bel>
+        <gridline>true</gridline>
+       </xvalue>
+      </xsl:when>
+
+      <xsl:when test=3D"(substring(preceding-sibling::*[1]/@date-time, 5, 2)=
 !=3D substring(@date-time, 5, 2)) and (substring(@date-time, 5, 2) =3D '04')=
">
+       <xvalue>
+        <value><xsl:value-of select=3D"@universal-time"/></value>
+        <label>Q2/<xsl:value-of select=3D"substring(@date-time, 1, 4)"/></la=
bel>
+        <gridline>true</gridline>
+       </xvalue>
+      </xsl:when>
+
+      <xsl:when test=3D"(substring(preceding-sibling::*[1]/@date-time, 5, 2)=
 !=3D substring(@date-time, 5, 2)) and (substring(@date-time, 5, 2) =3D '07')=
">
+       <xvalue>
+        <value><xsl:value-of select=3D"@universal-time"/></value>
+        <label>Q3/<xsl:value-of select=3D"substring(@date-time, 1, 4)"/></la=
bel>
+        <gridline>true</gridline>
+       </xvalue>
+      </xsl:when>
+
+      <xsl:when test=3D"(substring(preceding-sibling::*[1]/@date-time, 5, 2)=
 !=3D substring(@date-time, 5, 2)) and (substring(@date-time, 5, 2) =3D '10')=
">
+       <xvalue>
+        <value><xsl:value-of select=3D"@universal-time"/></value>
+        <label>Q4/<xsl:value-of select=3D"substring(@date-time, 1, 4)"/></la=
bel>
+        <gridline>true</gridline>
+       </xvalue>
+      </xsl:when>
+
+     </xsl:choose>
+    </xsl:for-each>
+   </xvalues>
+   <yvalues>
+    <loop:for name=3D"i" from=3D"10000" to=3D"$total_sqms_sold" step=3D"1000=
0">
+     <yvalue>
+      <value><xsl:value-of select=3D"$i"/></value>
+      <label><xsl:value-of select=3D"$i"/></label>
+      <gridline>true</gridline>
+     </yvalue>
+    </loop:for>
+   </yvalues>
+  </graphData>
+ </xsl:template>
+</xsl:stylesheet>

Modified: branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart=
.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart.xsl	2=
006-10-14 11:25:47 UTC (rev 1993)
+++ branches/xml-class-rework/projects/bos/statistics/buildSVGLineChart.xsl	2=
006-10-14 13:23:45 UTC (rev 1994)
@@ -38,6 +38,8 @@
           <rect width=3D"7" height=3D"22">
           </rect>
         </g>
+	<g id=3D"none" transform=3D"scale(1)">
+	</g>
         <script type=3D"text/javascript">
           <![CDATA[
           /* this code was largely reused from the excellent website SVG - L=
earning by Coding (http://svglbc.datenverdrahten.de/) */


--===============2842819316430114942==--