Author: bleny Date: 2011-04-18 14:34:52 +0000 (Mon, 18 Apr 2011) New Revision: 1212 Log: add landingDate for ObsDeb in Contact Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-04-18 12:25:38 UTC (rev 1211) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-04-18 14:34:52 UTC (rev 1212) @@ -858,4 +858,9 @@ queries.add(sql); } + + @Override + protected void addObsDebToContacts_3_0(List<String> queries) { + queries.add("ALTER TABLE Contact ADD landingDate TIMESTAMP WITHOUT TIME ZONE;"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-04-18 12:25:38 UTC (rev 1211) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-04-18 14:34:52 UTC (rev 1212) @@ -139,6 +139,8 @@ protected abstract void addAdminRolesToAdmin_3_0(TopiaContextImplementor tx, List<String> queries) throws TopiaException; + protected abstract void addObsDebToContacts_3_0(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -497,6 +499,8 @@ addAdminRolesToAdmin_3_0(tx, queries); + addObsDebToContacts_3_0(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-04-18 12:25:38 UTC (rev 1211) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-04-18 14:34:52 UTC (rev 1212) @@ -73,7 +73,7 @@ context.loadConfiguration(configuration); context.setI18nBundle("wao-business"); - + // Set currentDate to 23/10/2009 Calendar calendar = new GregorianCalendar(2009, 9, 23); context.setCurrentDate(calendar.getTime()); 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 2011-04-18 12:25:38 UTC (rev 1211) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-04-18 14:34:52 UTC (rev 1212) @@ -653,6 +653,11 @@ return companySelectModel; } + public List<Company> getCompanies() throws WaoException { + List<Company> companies = serviceUser.getCompanies(true); + return companies; + } + public boolean isCreateMode() throws WaoException { return StringUtils.isEmpty(getSampleRow().getTopiaId()); } @@ -836,7 +841,7 @@ } if (!edited && !periodChanged) { - if (user.isAdmin()) { // in obsDeb, coordinator may not change company + if (user.isAdmin() && ! user.isObsDeb()) { // in obsDeb, coordinator may not change company // No company change possible when sampleRow has real tide time if (!getSampleRow().hasSampleMonthRealTideTime()) { // Save company Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-18 12:25:38 UTC (rev 1211) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-18 14:34:52 UTC (rev 1212) @@ -69,18 +69,17 @@ t:labelPropertyName="fullName" t:values="possibleValuesForFilter.observersAsList" t:selectedValue="filter.observer"/>  - <!--select t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /--> + <label for="state">${message:wao.ui.field.Contact.contactState} :</label> + <select t:type="select" + t:id="state" + value="filter.state" + t:model="contactStateSelectModel"/>  </div> <t:if test="user.obsDeb"> filtres pour obsdeb <p:else> <!-- fields for ObsMer and ObsVente --> - <label for="state">${message:wao.ui.field.Contact.contactState} :</label> - <select t:type="select" - t:id="state" - value="filter.state" - t:model="contactStateSelectModel"/>  <label>${message:wao.ui.entity.Boat} </label> <label t:for="boatImmatriculation">${message:wao.ui.field.Boat.immatriculation} :</label> <input t:type="textfield" Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-18 12:25:38 UTC (rev 1211) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-18 14:34:52 UTC (rev 1212) @@ -126,6 +126,12 @@ <label>${message:wao.ui.field.Contact.contactState}</label> ${getLabelForEnum(contact.contactState)} </div> + <t:if test="connectedUser.obsDeb"> + <div> + <label>${message:wao.ui.field.Contact.landingDate}</label> + <t:output value="contact.landingDate" format="dateTimeFormat" /> + </div> + </t:if> <div> <label>${message:wao.ui.field.Contact.beginDate}</label> <t:output value="contact.observationBeginDate" format="dateTimeFormat" /> @@ -217,6 +223,12 @@ t:validate="required" t:model="contactStateSelectModel" /> </div> + <t:if test="connectedUser.obsDeb"> + <div> + <label for="landingDate">${message:wao.ui.field.Contact.landingDate}</label> + <input t:id="landingDate" value="contact.landingDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> + </div> + </t:if> <div> <label for="beginDate">${message:wao.ui.field.Contact.beginDate}</label> <input t:id="beginDate" value="contact.observationBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-04-18 12:25:38 UTC (rev 1211) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-04-18 14:34:52 UTC (rev 1212) @@ -45,6 +45,16 @@ <t:block t:id="obsDebBlock"> <fieldset class="t-beaneditor"> <legend>${message:wao.ui.misc.information}</legend> + <t:if test="user.admin"> + <div class="t-beaneditor-row"> + <label for="company2">${message:wao.ui.field.SampleRow.company}</label> + <t:topiaEntitySelector t:id="company2" + t:clazzName="Company" + t:labelPropertyName="name" + t:values="companies" + t:selectedValue="sampleRow.company" /> + </div> + </t:if> <div class="t-beaneditor-row"> <label for="day">${message:wao.ui.field.SampleRow.day}</label> <input t:type="datefield" t:id="day" class="date" value="sampleRow.day" />