Author: fdesbois Date: 2010-01-15 13:38:57 +0000 (Fri, 15 Jan 2010) New Revision: 205 Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml trunk/suiviobsmer-ui/src/main/webapp/css/main.css Log: - Use ${user.home} for default config - Add missing select class for Contact selected - Change saving image for chart (not saved on the hd) Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties =================================================================== --- trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-15 13:38:57 UTC (rev 205) @@ -6,9 +6,9 @@ hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:~/.local/suiviobsmer/h2data +hibernate.connection.url=jdbc:h2:file:~/.suiviobsmer/h2data -suiviobsmer.log.activityCalendar=log/activity.log +suiviobsmer.log.activityCalendar=${user.home}/.suiviobsmer/log/activity.log ## Config for sending Email suiviobsmer.email.host=smtp.free.fr Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-15 13:38:57 UTC (rev 205) @@ -16,11 +16,12 @@ package fr.ifremer.suiviobsmer.ui.components; -import java.io.File; -import java.io.FileInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; @@ -107,45 +108,8 @@ writer.end(); } - public StreamResponse onChart(final String title, - final int width, final int height) { -// DefaultKeyedValues values = new DefaultKeyedValues(); -// for (int i = 4; i < rest.length; i += 2) { -// values.addValue(rest[i].toString(), Double.valueOf(rest[i + 1] -// .toString())); -// } -// values.sortByValues(SortOrder.DESCENDING); -// PieDataset data = new DefaultPieDataset(values); -// -// // create the chart look according to the type -// PiePlot plot = null; -// switch (type) { -// case PIE: -// plot = new PiePlot(data); -// break; -// case PIE3D: -// plot = new PiePlot3D(data); -// break; -// case RING: -// plot = new RingPlot(data); -// break; -// default: -// plot = new PiePlot(data); -// break; -// } + public StreamResponse onChart(final String title, final int width, final int height) { - //plot.setForegroundAlpha(0.7f); -// plot.setCircular(true); -// plot.setLabelGenerator(new StandardPieSectionLabelGenerator("{0} {2}")); -// plot.setLegendLabelGenerator(new StandardPieSectionLabelGenerator( -// "{0} = {1}")); -// plot.setNoDataMessage("No Data"); -// -// final JFreeChart chart = new JFreeChart(plot); -// chart.setTitle(new TextTitle(title, new Font(Font.SANS_SERIF, -// Font.BOLD, 12))); -// chart.setBackgroundPaint(new Color(255, 255, 255)); - // return the image return new StreamResponse() { public String getContentType() { @@ -153,13 +117,14 @@ } public InputStream getStream() throws IOException { -// BufferedImage image = currentChart.createBufferedImage(width, height); -// ByteArrayOutputStream byteArray = new ByteArrayOutputStream(); -// ChartUtilities.writeBufferedImageAsPNG(byteArray, image); -// return new ByteArrayInputStream(byteArray.toByteArray()); - File res = new File("/tmp", "chart.png"); - ChartUtilities.saveChartAsPNG(res, currentChart, width, height); - return new FileInputStream(res); +// String alea = SuiviObsmerContext.createRandomString(8); +// String path = SuiviObsmerContext.getProperty(SuiviObsmerContext.PROP_PATH_CHARTS); +// File file = new File(path, "chart_" + alea + ".png"); +// file.getParentFile().mkdirs(); + + ByteArrayOutputStream output = new ByteArrayOutputStream(); + ChartUtilities.writeChartAsPNG(output, currentChart, width, height); + return new ByteArrayInputStream(output.toByteArray()); } public void prepareResponse(Response response) { Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-15 13:38:57 UTC (rev 205) @@ -327,7 +327,11 @@ } public String getRowClass() { - return BusinessUtils.getCSSColorClassForContact(contact, user.getAdmin()); + String result = BusinessUtils.getCSSColorClassForContact(contact, user.getAdmin()); + if (contact.getTopiaId().equals(contactSelectedId)) { + result = "selected"; + } + return result; } public DateFormat getDateFormat() { Modified: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml 2010-01-15 13:38:57 UTC (rev 205) @@ -68,16 +68,16 @@ <div id="so-footer"> <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/" title="Documentation de l'application"> WAO - </a> + </a> <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/" title="Modifications faites pour cette version"> ${version} - </a> - + </a> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> Obsmer - </a> - + </a> - <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3"> GPLv3 - </a> - Copyright 2009-2010 + </a> - Copyright 2009-2010 <!--<a href="http://www.codelutin.com" title="Code Lutin">--> DPMA, <!--</a>--> Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-15 13:38:57 UTC (rev 205) @@ -194,7 +194,7 @@ </p:dataInputDateCell> <p:commentCell> <t:if t:test="editionMode"> - <input t:type="textarea" t:id="comment" cols="15" rows="2" value="contact.comment" /> + <input t:type="textarea" t:id="comment" cols="1" rows="2" value="contact.comment" /> <p:else> ${contact.comment} </p:else> Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 13:38:57 UTC (rev 205) @@ -60,7 +60,7 @@ <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" /> <t:label t:for="facadeName" />: <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" - t:mixins="zoneUpdater" t:event="change" t:zone="so-contacts-filters"/> + t:mixins="zoneUpdater" t:event="change" t:zone="so-datasampling-filters"/> <t:label t:for="sectorName" />: <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" /> <t:label t:for="sampleRow" />: Modified: trunk/suiviobsmer-ui/src/main/webapp/css/main.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/main.css 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/webapp/css/main.css 2010-01-15 13:38:57 UTC (rev 205) @@ -148,8 +148,9 @@ div#so-footer a { color: #133852; + text-decoration: none; } div#so-footer a:hover { - text-decoration: none; + text-decoration: underline; } \ No newline at end of file