Mercurial > dive4elements > river
changeset 2707:d6e32ae72da6
Deliver description on events instead of names in fixing overview.
flys-artifacts/trunk@4425 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Wed, 16 May 2012 13:02:40 +0000 |
| parents | d8444fcb4e44 |
| children | 282db12a5bdf |
| 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, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed May 16 12:39:13 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed May 16 13:02:40 2012 +0000 @@ -1,3 +1,12 @@ +2012-05-15 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java: + Replaced event name by its description, which combines the + description of the fixing (= WST file description) and the name + of the column. + + * contrib/fixoverview2html.xsl: Adjusted. + 2012-05-16 Ingo Weinzierl <ingo@intevation.de> * doc/conf/artifacts/minfo.xml: Added a chart output and relevant facets to
--- a/flys-artifacts/contrib/fixoverview2html.xsl Wed May 16 12:39:13 2012 +0000 +++ b/flys-artifacts/contrib/fixoverview2html.xsl Wed May 16 13:02:40 2012 +0000 @@ -98,7 +98,7 @@ <xsl:apply-templates mode="sectors"/> </td> <td align="center"> - <xsl:attribute name="title"><xsl:value-of select="@name"/></xsl:attribute> + <xsl:attribute name="title"><xsl:value-of select="@description"/></xsl:attribute> <xsl:value-of select="@date"/> </td> </tr>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Wed May 16 12:39:13 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Wed May 16 13:02:40 2012 +0000 @@ -419,6 +419,10 @@ return name; } + public String getDescription() { + return Fixing.this.description + "/" + name; + } + public List<SectorRange> getSectors() { return sectors; } @@ -894,8 +898,8 @@ if (!sectors.isEmpty()) { Element eE = document.createElement("event"); - eE.setAttribute("name", - String.valueOf(column.getFixing().description)); + eE.setAttribute("description", + String.valueOf(column.getDescription())); eE.setAttribute("cid", String.valueOf(column.columnId)); eE.setAttribute("date", df.format(column.startTime));