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" />