December 2010 - Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r875 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/pages webapp webapp/css
by bleny＠users.labs.libre-entreprise.org 31 Dec '10

31 Dec '10

Author: bleny Date: 2010-12-31 17:15:04 +0000 (Fri, 31 Dec 2010) New Revision: 875 Log: fix CSS for ContactForm Added: trunk/wao-ui/src/main/webapp/css/contactForm.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties trunk/wao-ui/src/main/webapp/ContactForm.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-31 15:52:58 UTC (rev 874) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-31 17:15:04 UTC (rev 875) @@ -51,7 +51,7 @@ * */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}, readOnlyAllowed = false) - at Import(stylesheet = "context:css/common.css", library = "context:js/contactForm.js") + at Import(stylesheet = {"context:css/common.css", "context:css/contactForm.css"}, library = "context:js/contactForm.js") public class ContactForm { @Inject Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2010-12-31 15:52:58 UTC (rev 874) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2010-12-31 17:15:04 UTC (rev 875) @@ -1,6 +1,7 @@ # form labels mainObserver-label: Observateur r\u00e9f\u00e9rant secondaryObserver-label: Observateur +nbObservants-label: Nombre d'observateurs contactState-label: \u00c9tat du contact beginDate-label: D\u00e9but d'observation endDate-label: Fin d'observation Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-31 15:52:58 UTC (rev 874) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-31 17:15:04 UTC (rev 875) @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:layout t:pageTitle="Modification d'un contact" t:contentId="so-contact-form" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <h1 class="acenter"> + <h1 class="acenter mtop30"> Modification d'un contact </h1> @@ -14,55 +14,52 @@ <input t:type="hidden" t:id="hiddenSendEmail" t:value="sendEmail" /> - <fieldset class="user-form clearfix"> + <fieldset> <legend>Informations</legend> - <div class="t-beaneditor"> - <div class="fright" style="border-left: solid 1px; padding-left: 10px;"> - <strong> - Navire<br /> - ${contact.boat.name} - </strong> - <ul style="list-style-type: none;"> - <li>Immatriculation : ${contact.boat.immatriculation}</li> - <li>Quartier : ${contact.boat.districtCode}</li> - <li>Longueur : ${contact.boat.boatLength} m</li> - <li>Année de contruction : ${contact.boat.buildYear}</li> - </ul> - </div> - <div class="t-beaneditor-row"> - <strong>Ligne du plan d'échantillonage</strong> - <br /> - <ul style="list-style-type: none;"> - <li>Code : ${contact.sampleRow.code}</li> - <li>Métier : ${contact.sampleRow.professionDescription}</li> - <li>Programme : ${contact.sampleRow.programName} (du - <t:output value="contact.sampleRow.periodBegin" format="monthYearFormat" /> - au - <t:output value="contact.sampleRow.periodEnd" format="monthYearFormat" />) - </li> - </ul> - </div> - <div class="t-beaneditor-row"> - Date de création du contact : <t:output value="contact.topiaCreateDate" format="dateFormat" /> - </div> + <div class="fright" style="border-left: solid 1px; padding-left: 10px;"> + <strong> + Navire<br /> + ${contact.boat.name} + </strong> + <ul style="list-style-type: none;"> + <li>Immatriculation : ${contact.boat.immatriculation}</li> + <li>Quartier : ${contact.boat.districtCode}</li> + <li>Longueur : ${contact.boat.boatLength} m</li> + <li>Année de contruction : ${contact.boat.buildYear}</li> + </ul> </div> + <p> + <strong>Ligne du plan d'échantillonage</strong> + <br /> + <ul style="list-style-type: none;"> + <li>Code : ${contact.sampleRow.code}</li> + <li>Métier : ${contact.sampleRow.professionDescription}</li> + <li>Programme : ${contact.sampleRow.programName} (du + <t:output value="contact.sampleRow.periodBegin" format="monthYearFormat" /> + au + <t:output value="contact.sampleRow.periodEnd" format="monthYearFormat" />) + </li> + </ul> + </p> + <p> + Date de création du contact : <t:output value="contact.topiaCreateDate" format="dateFormat" /> + </p> + <div style="clear: right;"></div> </fieldset> - <fieldset class="user-form clearfix"> + <fieldset> <legend>Observateurs</legend> - <div class="t-beaneditor"> - <t:delegate to="viewOrEditObservers" /> - </div> + <t:delegate to="viewOrEditObservers" /> </fieldset> <t:block id="viewObservers"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="mainObserver" /> <t:if test="contact.mainObserver"> ${contact.mainObserver.fullName} </t:if> </div> - <div class="t-beaneditor-row" style="position: relative; left: 250px;"> + <div> <ul> <li t:type="loop" t:source="secondaryObservers" t:value="observer"> ${observer.fullName} @@ -72,19 +69,19 @@ </t:block> <t:block id="editObservers"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="mainObserver" /> <input t:type="select" t:id="mainObserver" t:model="observerSelectModel" t:validate="required" t:value="mainObserverId" /> </div> <t:zone t:id="observersFormZone" t:visible="true" t:update="show"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="secondaryObserver" /> - <input t:type="select" t:id="secondaryObserver" t:model="observerSelectModel" t:value="selectedSecondaryObserverId" t:mixins="ck/onEvent" t:event="change" /> - <a t:type="actionlink" t:id="addSecondaryObserver" title="Ajouter un observateur" t:zone="observersFormZone"> - <img src="${asset:context:img/add-16px.png}" /> - </a>  - <div class="t-beaneditor-row" style="position: relative; left: 250px;"> - <ul> + <div> + <input t:type="select" t:id="secondaryObserver" t:model="observerSelectModel" t:value="selectedSecondaryObserverId" t:mixins="ck/onEvent" t:event="change" /> + <a t:type="actionlink" t:id="addSecondaryObserver" title="Ajouter un observateur" t:zone="observersFormZone"> + <img src="${asset:context:img/add-16px.png}" /> + </a>  + <ul style="position: relative; left: 50%; margin-left: 25px;"> <li t:type="loop" t:source="secondaryObservers" t:value="observer" t:index="secondaryObserverIndex" t:volatile="true"> ${observer.fullName} <a t:type="actionlink" t:id="removeSecondaryObserver" t:context="secondaryObserverIndex" title="Supprimer cet observateur" t:zone="observersFormZone"> @@ -97,59 +94,59 @@ </t:zone> </t:block> - <fieldset class="user-form clearfix"> + <fieldset> <legend>Compte-rendu de l'observation</legend> - <div class="t-beaneditor"> - <t:delegate to="viewOrEditObservationReport" /> - </div> + <t:delegate to="viewOrEditObservationReport" /> </fieldset> <t:block id="viewObservationReport"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="contactState" /> ${contact.contactState.label} </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="nbObservants" /> ${contact.nbObservants} </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="beginDate" /> <t:output value="contact.observationBeginDate" format="dateTimeFormat" /> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="endDate" /> <t:output value="contact.observationEndDate" format="dateTimeFormat" /> </div> - <div class="t-beaneditor-row"> + <div> <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />  <t:label t:for="mammalsObservation" /> <t:booleanImage t:value="contact.mammalsObservation" /> </div> - <div class="t-beaneditor-row"> + <div> <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" />  <t:label t:for="mammalsCapture" /> <t:booleanImage t:value="contact.mammalsCapture" /> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="inputDate" /> <t:output value="contact.dataInputDate" format="dateFormat" /> </div> <t:if test="showObsVente()"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="actualSamplingStrategy" /> ${contact.samplingStrategy} </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="completeSampling" /> ${contact.completeSampling} </div> </t:if> - <div class="t-beaneditor-row"> + <div> <t:label t:for="observerComment" /> <t:if t:test="contact.comment"> - ${contact.comment} + <div class="value">  + ${contact.comment} + </div> <p:else> <em>aucun commentaire</em> </p:else> @@ -157,10 +154,12 @@ </div> <t:unless test="connectedUser.observer"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="coordinatorComment" /> <t:if t:test="contact.commentCoordinator"> - ${contact.commentCoordinator} + <div class="value"> + ${contact.commentCoordinator} + </div> <p:else> <em>aucun commentaire</em> </p:else> @@ -170,53 +169,53 @@ </t:block> <t:block id="editObservationReport"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="contactState" /> <input t:type="select" t:id="contactState" t:value="contact.contactState" t:validate="required"/> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="nbObservants" /> <input t:type="textfield" t:id="nbObservants" t:value="contact.nbObservants" t:validate="required" size="2" /> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="beginDate" /> <input t:id="beginDate" value="contact.observationBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="endDate" /> <input t:id="endDate" value="contact.observationEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> </div> - <div class="t-beaneditor-row"> + <div> <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />  <t:label t:for="mammalsObservation" /> <input t:type="checkbox" t:id="mammalsObservation" value="contact.mammalsObservation"/> </div> - <div class="t-beaneditor-row"> + <div> <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" />  <t:label t:for="mammalsCapture" /> <input t:type="checkbox" t:id="mammalsCapture" value="contact.mammalsCapture" /> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="observerComment" /> <input t:type="textarea" t:id="observerComment" value="contact.comment" /> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="inputDate" /> <input t:type="datefield" t:id="inputDate" class="date" value="contact.dataInputDate" /> </div> <t:if test="showObsVente()"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="actualSamplingStrategy" /> <input t:type="select" t:id="actualSamplingStrategy" t:value="contact.samplingStrategy" t:validate="required" /> </div> - <div class="t-beaneditor-row"> + <div> <t:label t:for="completeSampling" /> <input t:type="checkbox" t:id="completeSampling" value="contact.completeSampling" /> </div> </t:if> <t:unless test="connectedUser.observer"> - <div class="t-beaneditor-row"> + <div> <t:label t:for="coordinatorComment" /> <input t:type="textarea" t:id="coordinatorComment" value="contact.commentCoordinator" /> </div> @@ -224,34 +223,32 @@ </t:block> <t:unless test="connectedUser.observer"> - <fieldset class="user-form clearfix"> + <fieldset> <legend>Évaluation programme</legend> - <div class="t-beaneditor"> - <t:if test="showDataReliability()"> - <div class="t-beaneditor-row"> - <t:label t:for="dataReliability" /> - <t:if t:test="canEditDataReliability()"> - <input t:type="select" t:id="dataReliability" value="contact.dataReliability" /> - <p:else> - ${contact.dataReliability.label} - </p:else> - </t:if> - </div> - </t:if> - <div class="t-beaneditor-row"> - <t:label t:for="adminComment" /> - <t:if t:test="connectedUser.admin"> - <input t:type="textarea" t:id="adminComment" value="contact.commentAdmin" /> + <t:if test="showDataReliability()"> + <div> + <t:label t:for="dataReliability" /> + <t:if t:test="canEditDataReliability()"> + <input t:type="select" t:id="dataReliability" value="contact.dataReliability" /> <p:else> - <t:if t:test="contact.commentAdmin"> - ${contact.commentAdmin} - <p:else> - <em>aucun commentaire</em> - </p:else> - </t:if> + ${contact.dataReliability.label} </p:else> </t:if> </div> + </t:if> + <div> + <t:label t:for="adminComment" /> + <t:if t:test="connectedUser.admin"> + <input t:type="textarea" t:id="adminComment" value="contact.commentAdmin" /> + <p:else> + <t:if t:test="contact.commentAdmin"> + ${contact.commentAdmin} + <p:else> + <em>aucun commentaire</em> + </p:else> + </t:if> + </p:else> + </t:if> </div> </fieldset> </t:unless> Added: trunk/wao-ui/src/main/webapp/css/contactForm.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contactForm.css (rev 0) +++ trunk/wao-ui/src/main/webapp/css/contactForm.css 2010-12-31 17:15:04 UTC (rev 875) @@ -0,0 +1,38 @@ +fieldset { + border: solid 1px black; + padding: 10px; + margin: 10px; + margin-left: auto; + margin-right: auto; + width: 80%; +} + +legend { + padding: 0px 10px; +} + +label { + display: block; + float: left; + width: inherit; + width: 50%; + text-align: right; + padding-right: 10px; + margin-right: 10px; + margin-bottom: 10px; +} + +fieldset > div { + clear: both; + margin-top: 10px; +} + +textarea { + width: 25em; + height: 7em; +} + +.value { /* make no line return under the label */ + width: 45%; + float: left; +} \ No newline at end of file

1 0

[Suiviobsmer-commits] r874 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 31 Dec '10

31 Dec '10

Author: bleny Date: 2010-12-31 15:52:58 +0000 (Fri, 31 Dec 2010) New Revision: 874 Log: remove deprecated tapestry annot. usage Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-12-31 15:52:58 UTC (rev 874) @@ -36,7 +36,7 @@ import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -55,7 +55,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) - at IncludeStylesheet("context:css/boats.css") + at Import(stylesheet = "context:css/boats.css") public class BoatActivityCalendar { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-12-31 15:52:58 UTC (rev 874) @@ -57,7 +57,7 @@ import org.apache.tapestry5.Link; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.StreamResponse; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.InjectPage; import org.apache.tapestry5.annotations.Persist; @@ -86,7 +86,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) - at IncludeStylesheet("context:css/boats.css") + at Import(stylesheet = "context:css/boats.css") public class Boats extends AbstractFilteredPage { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-12-31 15:52:58 UTC (rev 874) @@ -20,14 +20,22 @@ */ package fr.ifremer.wao.ui.pages; -import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactFilterImpl; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.bean.WaoFilter; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.tapestry5.Link; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-12-31 15:52:58 UTC (rev 874) @@ -35,7 +35,11 @@ import fr.ifremer.wao.ui.services.ServiceAuthentication; import org.apache.tapestry5.Link; import org.apache.tapestry5.PersistenceConstants; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.Import; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; @@ -54,7 +58,7 @@ * @author fdesbois * $Id$ */ - at IncludeJavaScriptLibrary("context:js/wao.js") + at Import(library = "context:js/wao.js") public class Connexion { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-31 15:52:58 UTC (rev 874) @@ -23,8 +23,7 @@ import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.Environmental; -import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; @@ -52,8 +51,7 @@ * */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}, readOnlyAllowed = false) - at IncludeStylesheet("context:css/common.css") - at IncludeJavaScriptLibrary("context:js/contactForm.js") + at Import(stylesheet = "context:css/common.css", library = "context:js/contactForm.js") public class ContactForm { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-31 15:52:58 UTC (rev 874) @@ -54,7 +54,13 @@ import org.apache.tapestry5.Field; import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.StreamResponse; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.Environmental; +import org.apache.tapestry5.annotations.Import; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-12-31 15:52:58 UTC (rev 874) @@ -32,8 +32,7 @@ import org.apache.tapestry5.Asset2; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.RenderSupport; -import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Path; import org.apache.tapestry5.annotations.Persist; @@ -55,8 +54,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/news.css") - at IncludeJavaScriptLibrary("context:js/news.js") + at Import(stylesheet = "context:css/news.css", library = "context:js/news.js") public class Index { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-12-31 15:52:58 UTC (rev 874) @@ -25,7 +25,7 @@ import fr.ifremer.wao.entity.IndicatorLog; import fr.ifremer.wao.service.ServiceSynthesis; import fr.ifremer.wao.ui.data.RequiresAuthentication; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.ioc.annotations.Inject; @@ -40,7 +40,7 @@ * @author bleny */ @RequiresAuthentication(allowedPrograms = {ObsProgram.OBSMER}, allowedRoles = {UserRole.ADMIN}, readOnlyAllowed = true) - at IncludeStylesheet("context:css/common.css") + at Import(stylesheet = "context:css/common.css") public class IndicatorsHistory { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-12-31 15:52:58 UTC (rev 874) @@ -26,7 +26,12 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.SamplingStrategy; +import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; @@ -53,7 +58,12 @@ import org.apache.tapestry5.Field; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.Import; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.internal.OptionModelImpl; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-12-31 15:52:58 UTC (rev 874) @@ -35,7 +35,7 @@ import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; @@ -55,7 +55,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/sampling.css") + at Import(stylesheet = "context:css/sampling.css") public class SampleRowHistoric { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-31 15:52:58 UTC (rev 874) @@ -26,7 +26,11 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.FacadeRow; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleMonth; @@ -40,7 +44,7 @@ import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.StreamResponse; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; @@ -72,7 +76,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/sampling.css") + at Import(stylesheet = "context:css/sampling.css") public class SamplingPlan extends AbstractFilteredPage { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-31 15:52:58 UTC (rev 874) @@ -54,7 +54,7 @@ import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Environmental; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; @@ -85,7 +85,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication(allowedPrograms = {ObsProgram.OBSMER}, allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) - at IncludeStylesheet("context:css/synthesis.css") + at Import(stylesheet = "context:css/synthesis.css") public class Synthesis extends AbstractFilteredPage { @Environmental Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java 2010-12-31 15:52:58 UTC (rev 874) @@ -33,7 +33,7 @@ import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -48,7 +48,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/userProfile.css") + at Import(stylesheet = "context:css/userProfile.css") public class UserProfileForm { @Inject

1 0

[Suiviobsmer-commits] r873 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/io/csv wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org 31 Dec '10

31 Dec '10

Author: bleny Date: 2010-12-31 15:14:08 +0000 (Fri, 31 Dec 2010) New Revision: 873 Log: fix UI menu ; make synthesis ObsMer only ; add ObsProgram fields in contact import/export Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/css/main.css Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2010-12-31 15:14:08 UTC (rev 873) @@ -26,6 +26,6 @@ return samplingStrategy; } } - return null; + throw new IllegalArgumentException("ordinal " + samplingStrategyOrdinal); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-12-31 15:14:08 UTC (rev 873) @@ -168,6 +168,21 @@ return result; } + public static Boolean readBoolean(CsvReader reader, IOHeader header) throws IOException { + String str = read(reader, header); + Boolean result; + if (StringUtils.isBlank(str) || "?".equals(str)) { + result = null; + } else if ("Y".equals(str)) { + result = true; + } else if ("N".equals(str)) { + result = false; + } else { + result = Boolean.parseBoolean(str); + } + return result; + } + /** * Read an int value in CsvReader from {@code header} column. * Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-31 15:14:08 UTC (rev 873) @@ -352,7 +352,9 @@ /** Contact program validation **/ CONT_PROGRAM_VALID(32), /** Data reliability **/ - CONT_DATA_RELIABILITY(33); + CONT_DATA_RELIABILITY(33), + CONT_SAMPLING_STRATEGY(34), + CONT_COMPLETE_SAMPLING(35); private int contactHeader; @@ -411,6 +413,18 @@ public static String formatMammals(boolean mammals) { return mammals ? "X" : ""; } + + public static String formatBoolean(Boolean bool) { + String result; + if (bool == null) { + result = "?"; + } else if (bool) { + result = "Y"; + } else { + result = "N"; + } + return result; + } } public enum ACTIVITY_CALENDAR implements IOHeader { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-31 15:14:08 UTC (rev 873) @@ -40,6 +40,7 @@ import fr.ifremer.wao.bean.ContactStatus; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; import fr.ifremer.wao.bean.DataReliability; +import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; @@ -66,6 +67,7 @@ import fr.ifremer.wao.io.csv.WaoCsvHeader.FISHING_ZONE; import fr.ifremer.wao.io.csv.WaoCsvHeader.SAMPLING; import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; import org.nuiton.topia.TopiaContext; @@ -469,6 +471,16 @@ export.record(CONTACT.CONT_DATA_RELIABILITY, String.valueOf(contact.getDataReliabilityOrdinal())); + if (contact.getSamplingStrategy() != null) { + export.record(CONTACT.CONT_SAMPLING_STRATEGY, + contact.getSamplingStrategy().name()); + } + + if (contact.getCompleteSampling() != null) { + export.record(CONTACT.CONT_COMPLETE_SAMPLING, + CONTACT.formatBoolean(contact.getCompleteSampling())); + } + // Observer part WaoUser mainObserver = contact.getMainObserver(); @@ -751,6 +763,14 @@ contact.setDataReliabilityOrdinal( ImportHelper.readInt(reader, CONTACT.CONT_DATA_RELIABILITY)); + + String samplingStrategyName = ImportHelper.read(reader, CONTACT.CONT_SAMPLING_STRATEGY); + if (StringUtils.isNotBlank(samplingStrategyName)) { + contact.setSamplingStrategy(SamplingStrategy.valueOf(samplingStrategyName)); + } + + contact.setCompleteSampling(ImportHelper.readBoolean(reader, CONTACT.CONT_COMPLETE_SAMPLING)); + } /** Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-31 15:14:08 UTC (rev 873) @@ -28,6 +28,7 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; +import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatDAO; import fr.ifremer.wao.entity.Company; @@ -574,6 +575,10 @@ thenReturn(comment); when(reader.get(CONTACT.CONT_DATA_RELIABILITY.name())). thenReturn("0"); + when(reader.get(CONTACT.CONT_SAMPLING_STRATEGY.name())). + thenReturn(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES.name()); + when(reader.get(CONTACT.CONT_COMPLETE_SAMPLING.name())). + thenReturn("Y"); when(creator.getCompany()).thenReturn(company); when(creator.isAdmin()).thenReturn(false); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-12-31 15:14:08 UTC (rev 873) @@ -43,6 +43,7 @@ import org.apache.tapestry5.services.Request; import org.slf4j.Logger; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; @@ -142,12 +143,19 @@ public Map getMenuItems() { if (menuItems == null) { - Class[] pagesInMenu = new Class[] { SamplingPlan.class, Boats.class, - Contacts.class, Synthesis.class, Administration.class}; + Map<String, Class> pagesInMenu = new LinkedHashMap<String, Class>(); + pagesInMenu.put("Plan d'échantillonnage", SamplingPlan.class); + pagesInMenu.put("Navires", Boats.class); + pagesInMenu.put("Contacts", Contacts.class); + pagesInMenu.put("Synthèse", Synthesis.class); + pagesInMenu.put("Administration", Administration.class); menuItems = new LinkedHashMap<String, String>(); - for (Class page : pagesInMenu) { + for (Map.Entry<String, Class> menuEntry : pagesInMenu.entrySet()) { + String linkName = menuEntry.getKey(); + Class page = menuEntry.getValue(); + if (serviceAuthentication.isAllowed(page)) { - menuItems.put(page.getSimpleName(), _(page.getName())); + menuItems.put(page.getSimpleName(), linkName); } } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-31 15:14:08 UTC (rev 873) @@ -256,6 +256,7 @@ if (!user.isAdmin()) { dataSamplingFilter.setCompany(user.getCompany()); } + dataSamplingFilter.setObsProgram(user.getProfile().getObsProgram()); } return dataSamplingFilter; } Modified: trunk/wao-ui/src/main/webapp/css/main.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/main.css 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-ui/src/main/webapp/css/main.css 2010-12-31 15:14:08 UTC (rev 873) @@ -138,7 +138,6 @@ } #so-menu { - width: 800px; margin-top: 7px; margin-left: auto; margin-right: auto;

1 0

[Suiviobsmer-commits] r872 - in trunk/wao-business/src: main/java/fr/ifremer/wao/io/csv main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao/service test/resources/import
by bleny＠users.labs.libre-entreprise.org 30 Dec '10

30 Dec '10

Author: bleny Date: 2010-12-30 16:38:52 +0000 (Thu, 30 Dec 2010) New Revision: 872 Log: enable import/export for obsvente sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-30 16:06:30 UTC (rev 871) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-30 16:38:52 UTC (rev 872) @@ -66,7 +66,7 @@ * used will be the same returned by datePattern * * @param date the date to be formatted - * @return + * @return the formatted date */ String format(Date date); } @@ -197,7 +197,8 @@ /** SampleRow average tide time **/ PLAN_DUREE_MOY(15, "Durée moyenne d'une marée (jours)"), /** SampleRow comment **/ - PLAN_COMMENT(17, "Commentaire"); + PLAN_COMMENT(17, "Commentaire"), + PLAN_STRATEGIE(18, "Stratégie d'échantillonage"); private int contactHeader; @@ -396,7 +397,7 @@ } public static String formatValidation(Boolean validation) { - String valid = ""; + String valid; if (validation == null) { valid = "N"; } else if (BooleanUtils.isTrue(validation)) { @@ -448,7 +449,7 @@ /** ActivityZone zoneId **/ TSECT_COD, /** ActivityZone zoneLibelle **/ - SECT_LIB; + SECT_LIB } public static String getHeaderForContactCsv(int index) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-12-30 16:06:30 UTC (rev 871) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-12-30 16:38:52 UTC (rev 872) @@ -35,11 +35,7 @@ import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.FacadeRow; -import fr.ifremer.wao.bean.FacadeRowImpl; -import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.bean.*; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; @@ -852,6 +848,7 @@ export.record(SAMPLING.PLAN_NB_OBSERV, numberFormat.format(row.getNbObservants())); export.record(SAMPLING.PLAN_DUREE_MOY, numberFormat.format(row.getAverageTideTime())); export.record(SAMPLING.PLAN_COMMENT, String.valueOf(row.getComment())); + export.record(SAMPLING.PLAN_STRATEGIE, row.getSamplingStrategy().name()); export.recordMonths(row); @@ -1072,9 +1069,14 @@ String comment = ImportHelper.read(reader, SAMPLING.PLAN_COMMENT); PeriodDates period = ImportHelper.readPeriod(reader, SAMPLING.PROGRAMME_DEBUT, SAMPLING.PROGRAMME_FIN); - String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); - codeDCF5 = codeDCF5.trim(); + + String samplingStrategyName = ImportHelper.read(reader, SAMPLING.PLAN_STRATEGIE); + if (StringUtils.isNotBlank(samplingStrategyName)) { + SamplingStrategy samplingStrategy = SamplingStrategy.valueOf(samplingStrategyName); + sampleRow.setSamplingStrategy(samplingStrategy); + } + sampleRow.setFishingZonesInfos(fishingZoneInfos); sampleRow.setNbObservants(nbObservants); sampleRow.setAverageTideTime(averageTideTime); @@ -1083,6 +1085,8 @@ sampleRow.setPeriodEnd(period.getThruDate()); sampleRow.setComment(comment); + String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); + codeDCF5 = codeDCF5.trim(); // a trick, nullSampleRow is just intantiated to user the parsing // of the codes in the CSV. This trick is needed cause if we use // sampleRow to do the parsing, parsed objects will be linked to @@ -1100,8 +1104,10 @@ sampleRow.addAllDCF5Code(parsed); // sampleRow.setDCF5Code(parsed); works fine too - // 16 fixed columns : 13 before months and 3 after - int nbFixedColumns = 16; + + + // 16 fixed columns : 13 before months and 4 after + int nbFixedColumns = 17; // Months begin at 14th column int firstMonthColumnId = 13; int nbTotalColumns = reader.getColumnCount(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-12-30 16:06:30 UTC (rev 871) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-12-30 16:38:52 UTC (rev 872) @@ -31,6 +31,7 @@ import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; @@ -613,6 +614,8 @@ Collection<DCF5Code> dcf5codes = row1.getDCF5Code(); assertEquals(1, dcf5codes.size()); + assertEquals(row1.getSamplingStrategy(), SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); + transaction.closeContext(); } Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-12-30 16:06:30 UTC (rev 871) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-12-30 16:38:52 UTC (rev 872) @@ -1,14 +1,14 @@ -"PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT" -"2010_1",TARTANPION,"IId / I",,"DRB_ALG",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire" -"2010_2",,"IId",,"DRH_CAT et DRH_CRU",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1, -"2010_03",,"IId / IV",,"FAR",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1, -"2009_1",,"IId / IV",,"GTR_DEF et GNS_DEF","110-119",,,"Fileyage à poissons tubes","poissons plats","PPP2010",12/2009,10/2010,0,1,1,1,2,1,1,1,1,1,2,,,,,,1,1, -"2009_2",,"IId",,"GTR_DEF et GNS_DEF","9888-99",,,"Fileyage à sirènes ","nymphes","PPP2010",12/2009,10/2010,1,1,1,2,3,4,4,4,4,3,3,,,,,,1,1, -"2009_3",TARTANPION,"IV",,"GTR_MOL et GNS_FIN",,,,"Fileyages à baleines à bosse","chameaux","PPP2010",12/2009,10/2010,2,2,2,2,2,2,2,2,2,2,4,,,,,,1,1, -"2009_4",,"IId",,"PTB_ALG",">=190",">18",,"Chalutage de fond machiavélique","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, -"2009_5",,"IId",,"PTB_ALG","70-1100",">1140",,"Plongeur de fond sous-marin","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, -"2009_6",BIS,"I / IV",,"OT_DEF","70-1100",">1140",,"Leon","poissons plats","PPP2010",12/2009,10/2010,0,1,0,1,0,1,2,2,2,2,1,,,,,,3,2, -"2010_4",TARTANPION,"IId / IV",,"OT_DEF et PTB_ALG et DRH",,,,"Chalutage de fond","gadidés, poissons plats, divers","BLOB",01/2010,12/2010,,3,0,0,3,0,0,3,0,0,3,0,0,,,,3,1, -"2010_5",,,,"DRB",,,,"Kamoulox","merlu, poissons cerises, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, -"2010_10",,"I / IV",,"DRB","70-1100",,,"Kamoulox","merlu, poissons pommes, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, -"2010_11",,"I / IV",,"DRB_CSJ","70-1100",,,"Troubidou","merlu, poissons cerises","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, +"PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT","PLAN_STRATEGIE" +"2010_1",TARTANPION,"IId / I",,"DRB_ALG",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire",SIMULTANEOUS_ALL_SPECIES +"2010_2",,"IId",,"DRH_CAT et DRH_CRU",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1,, +"2010_03",,"IId / IV",,"FAR",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1,, +"2009_1",,"IId / IV",,"GTR_DEF et GNS_DEF","110-119",,,"Fileyage à poissons tubes","poissons plats","PPP2010",12/2009,10/2010,0,1,1,1,2,1,1,1,1,1,2,,,,,,1,1,, +"2009_2",,"IId",,"GTR_DEF et GNS_DEF","9888-99",,,"Fileyage à sirènes ","nymphes","PPP2010",12/2009,10/2010,1,1,1,2,3,4,4,4,4,3,3,,,,,,1,1,, +"2009_3",TARTANPION,"IV",,"GTR_MOL et GNS_FIN",,,,"Fileyages à baleines à bosse","chameaux","PPP2010",12/2009,10/2010,2,2,2,2,2,2,2,2,2,2,4,,,,,,1,1,, +"2009_4",,"IId",,"PTB_ALG",">=190",">18",,"Chalutage de fond machiavélique","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2,, +"2009_5",,"IId",,"PTB_ALG","70-1100",">1140",,"Plongeur de fond sous-marin","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2,, +"2009_6",BIS,"I / IV",,"OT_DEF","70-1100",">1140",,"Leon","poissons plats","PPP2010",12/2009,10/2010,0,1,0,1,0,1,2,2,2,2,1,,,,,,3,2,, +"2010_4",TARTANPION,"IId / IV",,"OT_DEF et PTB_ALG et DRH",,,,"Chalutage de fond","gadidés, poissons plats, divers","BLOB",01/2010,12/2010,,3,0,0,3,0,0,3,0,0,3,0,0,,,,3,1,, +"2010_5",,,,"DRB",,,,"Kamoulox","merlu, poissons cerises, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,, +"2010_10",,"I / IV",,"DRB","70-1100",,,"Kamoulox","merlu, poissons pommes, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,, +"2010_11",,"I / IV",,"DRB_CSJ","70-1100",,,"Troubidou","merlu, poissons cerises","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,,

1 0

[Suiviobsmer-commits] r871 - trunk
by bleny＠users.labs.libre-entreprise.org 30 Dec '10

30 Dec '10

Author: bleny Date: 2010-12-30 16:06:30 +0000 (Thu, 30 Dec 2010) New Revision: 871 Log: update topia version to 2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 09:26:25 UTC (rev 870) +++ trunk/pom.xml 2010-12-30 16:06:30 UTC (rev 871) @@ -331,7 +331,7 @@ <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> - <topiaVersion>2.5-SNAPSHOT</topiaVersion> + <topiaVersion>2.5</topiaVersion> <eugeneVersion>2.3</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion>

1 0

[Suiviobsmer-commits] r870 - trunk
by bleny＠users.labs.libre-entreprise.org 30 Dec '10

30 Dec '10

Author: bleny Date: 2010-12-30 09:26:25 +0000 (Thu, 30 Dec 2010) New Revision: 870 Log: fix pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 09:24:17 UTC (rev 869) +++ trunk/pom.xml 2010-12-30 09:26:25 UTC (rev 870) @@ -349,7 +349,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url>

1 0

[Suiviobsmer-commits] r869 - trunk
by bleny＠users.labs.libre-entreprise.org 30 Dec '10

30 Dec '10

Author: bleny Date: 2010-12-30 09:24:17 +0000 (Thu, 30 Dec 2010) New Revision: 869 Log: fix scm url in pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 09:19:46 UTC (rev 868) +++ trunk/pom.xml 2010-12-30 09:24:17 UTC (rev 869) @@ -349,7 +349,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url>

1 0

[Suiviobsmer-commits] r868 - in trunk: wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 30 Dec '10

30 Dec '10

Author: bleny Date: 2010-12-30 09:19:46 +0000 (Thu, 30 Dec 2010) New Revision: 868 Log: add ObsVente fields in contact form Modified: trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/webapp/ContactForm.tml Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-29 19:41:49 UTC (rev 867) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-30 09:19:46 UTC (rev 868) @@ -294,7 +294,11 @@ return result; } + public boolean showObsVente() { + return connectedUser.getProfile().getObsProgram() == ObsProgram.OBSVENTE; + } + /************************ ADMIN FIELDS ************************************/ Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-29 19:41:49 UTC (rev 867) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-30 09:19:46 UTC (rev 868) @@ -135,6 +135,16 @@ <t:label t:for="inputDate" /> <t:output value="contact.dataInputDate" format="dateFormat" /> </div> + <t:if test="showObsVente()"> + <div class="t-beaneditor-row"> + <t:label t:for="actualSamplingStrategy" /> + ${contact.samplingStrategy} + </div> + <div class="t-beaneditor-row"> + <t:label t:for="completeSampling" /> + ${contact.completeSampling} + </div> + </t:if> <div class="t-beaneditor-row"> <t:label t:for="observerComment" /> @@ -194,8 +204,17 @@ <t:label t:for="inputDate" /> <input t:type="datefield" t:id="inputDate" class="date" value="contact.dataInputDate" /> </div> + <t:if test="showObsVente()"> + <div class="t-beaneditor-row"> + <t:label t:for="actualSamplingStrategy" /> + <input t:type="select" t:id="actualSamplingStrategy" t:value="contact.samplingStrategy" t:validate="required" /> + </div> + <div class="t-beaneditor-row"> + <t:label t:for="completeSampling" /> + <input t:type="checkbox" t:id="completeSampling" value="contact.completeSampling" /> + </div> + </t:if> - <t:unless test="connectedUser.observer"> <div class="t-beaneditor-row"> <t:label t:for="coordinatorComment" />

1 0

[Suiviobsmer-commits] r867 - trunk
by tchemit＠users.labs.libre-entreprise.org 29 Dec '10

29 Dec '10

Author: tchemit Date: 2010-12-29 19:41:49 +0000 (Wed, 29 Dec 2010) New Revision: 867 Log: use last stable of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-29 17:54:17 UTC (rev 866) +++ trunk/pom.xml 2010-12-29 19:41:49 UTC (rev 867) @@ -329,7 +329,7 @@  <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> <topiaVersion>2.5-SNAPSHOT</topiaVersion> <eugeneVersion>2.3</eugeneVersion>

1 0

[Suiviobsmer-commits] r866 - in trunk: . wao-business
by tchemit＠users.labs.libre-entreprise.org 29 Dec '10

29 Dec '10

Author: tchemit Date: 2010-12-29 17:54:17 +0000 (Wed, 29 Dec 2010) New Revision: 866 Log: use stable version of eugene + make build works with the new Binder Api Modified: trunk/pom.xml trunk/wao-business/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-29 16:27:19 UTC (rev 865) +++ trunk/pom.xml 2010-12-29 17:54:17 UTC (rev 866) @@ -332,7 +332,7 @@ <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> <topiaVersion>2.5-SNAPSHOT</topiaVersion> - <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.3</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-12-29 16:27:19 UTC (rev 865) +++ trunk/wao-business/pom.xml 2010-12-29 17:54:17 UTC (rev 866) @@ -195,6 +195,21 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> <plugin> <groupId>org.nuiton.i18n</groupId>

1 0