Author: bleny Date: 2011-04-20 13:06:56 +0000 (Wed, 20 Apr 2011) New Revision: 1221 Log: fix contact form for ObsDeb Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Synthesis.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 2011-04-20 12:41:39 UTC (rev 1220) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-04-20 13:06:56 UTC (rev 1221) @@ -219,7 +219,7 @@ /************************ OBSERVATION REPORT ******************************/ @Component - private DateTimeField beginDate, endDate; + private DateTimeField beginDate, endDate, landingDate; @Inject private Block viewObservationReport; Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-20 12:41:39 UTC (rev 1220) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-04-20 13:06:56 UTC (rev 1221) @@ -56,12 +56,14 @@ <br /> <ul style="list-style-type: none;"> <li>${message:wao.ui.field.SampleRow.code} : ${contact.sampleRow.code}</li> - <li>${message:wao.ui.field.SampleRow.profession} : ${contact.sampleRow.professionDescription}</li> - <li>${message:wao.ui.field.SampleRow.programName} : ${contact.sampleRow.programName} (${message:wao.ui.form.period.from} - <t:output value="contact.sampleRow.periodBegin" format="monthYearFormat" /> - ${message:wao.ui.form.period.to} - <t:output value="contact.sampleRow.periodEnd" format="monthYearFormat" />) - </li> + <t:unless test="connectedUser.obsDeb"> + <li>${message:wao.ui.field.SampleRow.profession} : ${contact.sampleRow.professionDescription}</li> + <li>${message:wao.ui.field.SampleRow.programName} : ${contact.sampleRow.programName} (${message:wao.ui.form.period.from} + <t:output value="contact.sampleRow.periodBegin" format="monthYearFormat" /> + ${message:wao.ui.form.period.to} + <t:output value="contact.sampleRow.periodEnd" format="monthYearFormat" />) + </li> + </t:unless> </ul> </p> <p> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-20 12:41:39 UTC (rev 1220) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-04-20 13:06:56 UTC (rev 1221) @@ -30,78 +30,6 @@ <t:layout t:pageTitle="Synthèse et indicateurs" t:contentId="so-synthesis" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <!--fieldset> - <legend>${message:wao.ui.filters.filters}</legend> - <div t:type="zone" t:id="filtersZone" class="so-filters-form" id="so-datasampling-filters"> - <! - -<div t:type="zone" t:id="dataSamplingFiltersZone" t:update="show" id="so-datasampling-filters"> - -> - <form t:type="form" t:id="filtersForm" t:zone="so-datasampling-filters"> - <t:errors /> - <div class="t-beaneditor"> - <div class="filterRow"> - <label for="periodBegin">${message:wao.ui.form.periodFrom} :</label> - <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  - <label for="periodEnd">${message:wao.ui.form.period.to} :</label> - <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required"/> - </div> - <div> - <t:if t:test="user.admin"> - <label t:for="company">${message:wao.ui.entity.Company} :</label> - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  - <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/>  - </t:if> - <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label> - <select t:type="select" t:id="programName" t:model="programSelectModel" value="filter.programName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByProgram" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/> - </div> - <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> - <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label> - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/>  - <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label> - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="${message:wao.ui.filters.refresh}" - title="${message:wao.ui.filters.refresh}"/>  - <t:if test="user.obsVente"> - <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label> - <input t:type="select" t:model="terrestrialDistrictSelectModel" t:value="terrestrialDistrictId" /> - </t:if> - <label for="sampleRowId">${message:wao.ui.field.SampleRow.code} :</label> - <select t:type="select" t:id="sampleRowId" t:model="sampleRowSelectModel" t:value="sampleRowId" /> - <input t:type="submit" class="ico22px add" t:id="addSampleRowCode" value="Add" title="Ajouter un code de ligne"/>  - <input t:type="submit" class="ico22px remove" t:id="removeSampleRowCode" value="Remove" title="Retirer un code de ligne" />  - <ul> - <li style="display: inline;" t:type="loop" t:source="filter.sampleRows" t:value="row" t:volatile="true"> - ${row.code} - </li> - </ul> - - <! - -<t:label t:for="program" />: - <input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />- - > - </div> - <div> - <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label> - <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="fishingGearDCFId"/>  - <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label> - <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="targetSpeciesDCFId"/>  - </div> - <div class="filterRow"> - <input t:type="checkbox" t:id="estimatedTides" value="filter.estimatedTides" /> - <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label> - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="${message:wao.ui.action.filter}" title="${message:wao.ui.action.filter}" />  - <input t:type="submit" class="ico undo" t:id="reset" value="${message:wao.ui.action.resetFields}" title="${message:wao.ui.action.resetFields}" /> - </div> - </div> - </form> - <! - -</div> - -> - </div> - </fieldset--> - <t:samplingFilterComponent t:id="filterComponent" t:user="user"