joerg 2003/09/29 13:35:14
Modified: src/blocks/poi/samples/content simple-date-test.xml
Log:
bugfix for date sample: after we fixed the formula handling (missing
ValueType instead of = as first char) the sample was not adapted
I hope this is a valid commit during code freeze ...
Revision Changes Path
1.2 +27 -27
cocoon-2.1/src/blocks/poi/samples/content/simple-date-test.xml
Index: simple-date-test.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/poi/samples/content/simple-date-test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple-date-test.xml 17 May 2003 11:57:53 -0000 1.1
+++ simple-date-test.xml 29 Sep 2003 20:35:14 -0000 1.2
@@ -52,56 +52,56 @@
</gmr:Styles>
<gmr:Cols DefaultSizePts="48">
<gmr:ColInfo No="0" Unit="150" MarginA="1" MarginB="2"/>
- <gmr:ColInfo No="1" Unit="150" MarginA="1" MarginB="2"/>
- <gmr:ColInfo No="2" Unit="150" MarginA="1" MarginB="2"/>
+ <gmr:ColInfo No="1" Unit="200" MarginA="1" MarginB="2"/>
+ <gmr:ColInfo No="2" Unit="200" MarginA="1" MarginB="2"/>
</gmr:Cols>
<gmr:Rows DefaultSizePts="12.8"/>
<gmr:Cells>
<gmr:Cell Col="0" Row="0" ValueType="60">current serial
number:</gmr:Cell>
- <gmr:Cell Col="1" Row="0" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="0">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="1" ValueType="60">today's serial
number:</gmr:Cell>
- <gmr:Cell Col="1" Row="1" ValueType="40">=today()</gmr:Cell>
+ <gmr:Cell Col="1" Row="1">=today()</gmr:Cell>
<gmr:Cell Col="0" Row="2" ValueType="60">current time
serial:</gmr:Cell>
- <gmr:Cell Col="1" Row="2" ValueType="40">=now()-today()</gmr:Cell>
+ <gmr:Cell Col="1" Row="2">=now()-today()</gmr:Cell>
<gmr:Cell Col="0" Row="4" ValueType="60">date formats:</gmr:Cell>
<gmr:Cell Col="1" Row="4" ValueType="60">formatted serial number
'37777,7':</gmr:Cell>
- <gmr:Cell Col="2" Row="4" ValueType="60">formatted current serial
number:</gmr:Cell>
+ <gmr:Cell Col="2" Row="4" ValueType="60">formatted current serial
number, i.e. 'now()':</gmr:Cell>
<gmr:Cell Col="0" Row="5" ValueType="60">m/d/yy</gmr:Cell>
- <gmr:Cell Col="1" Row="5" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="5" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="5">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="5">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="6" ValueType="60">d-mmm-yy</gmr:Cell>
- <gmr:Cell Col="1" Row="6" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="6" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="6">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="6">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="7" ValueType="60">d-mmm</gmr:Cell>
- <gmr:Cell Col="1" Row="7" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="7" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="7">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="7">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="8" ValueType="60">mmm-yy</gmr:Cell>
- <gmr:Cell Col="1" Row="8" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="8" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="8">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="8">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="9" ValueType="60">h:mm AM/PM</gmr:Cell>
- <gmr:Cell Col="1" Row="9" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="9" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="9">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="9">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="10" ValueType="60">h:mm:ss AM/PM</gmr:Cell>
- <gmr:Cell Col="1" Row="10" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="10" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="10">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="10">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="11" ValueType="60">h:mm</gmr:Cell>
- <gmr:Cell Col="1" Row="11" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="11" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="11">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="11">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="12" ValueType="60">h:mm:ss</gmr:Cell>
- <gmr:Cell Col="1" Row="12" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="12" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="12">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="12">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="13" ValueType="60">m/d/yy h:mm</gmr:Cell>
- <gmr:Cell Col="1" Row="13" ValueType="40">37777,7</gmr:Cell>
- <gmr:Cell Col="2" Row="13" ValueType="40">=now()</gmr:Cell>
+ <gmr:Cell Col="1" Row="13">37777,7</gmr:Cell>
+ <gmr:Cell Col="2" Row="13">=now()</gmr:Cell>
<gmr:Cell Col="0" Row="15" ValueType="60">We can also calculate with
dates:</gmr:Cell>
<gmr:Cell Col="0" Row="16" ValueType="60">today plus one
week:</gmr:Cell>
- <gmr:Cell Col="1" Row="16" ValueType="40">=date(year(now()),
month(now()), day(now()) + 7)</gmr:Cell>
+ <gmr:Cell Col="1" Row="16">=date(year(now()), month(now()),
day(now()) + 7)</gmr:Cell>
<gmr:Cell Col="0" Row="17" ValueType="60">today plus three
months:</gmr:Cell>
- <gmr:Cell Col="1" Row="17" ValueType="40">=date(year(now()),
month(now()) + 3, day(now()))</gmr:Cell>
+ <gmr:Cell Col="1" Row="17">=date(year(now()), month(now()) + 3,
day(now()))</gmr:Cell>
<gmr:Cell Col="0" Row="18" ValueType="60">today minus 2
years:</gmr:Cell>
- <gmr:Cell Col="1" Row="18" ValueType="40">=date(year(now()) - 2,
month(now()), day(now()))</gmr:Cell>
+ <gmr:Cell Col="1" Row="18">=date(year(now()) - 2, month(now()),
day(now()))</gmr:Cell>
</gmr:Cells>
</gmr:Sheet>
</gmr:Sheets>
