Author: bleny Date: 2010-12-22 11:15:22 +0000 (Wed, 22 Dec 2010) New Revision: 846 Log: don't show data reliability when not in ObsMer program Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 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-21 11:17:49 UTC (rev 845) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-22 11:15:22 UTC (rev 846) @@ -5,6 +5,7 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.DataReliability; +import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.SampleRow; @@ -284,6 +285,11 @@ /************************ ADMIN FIELDS ************************************/ + public boolean showDataReliability() { + // ObsMer is the single program where data reliability is evaluated + return getContact().getObsProgram() == ObsProgram.OBSMER; + } + public boolean canEditDataReliability() { boolean result = connectedUser.isAdmin() // coordinator can see the value && BooleanUtils.isTrue(getContact().getValidationCompany()) Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-21 11:17:49 UTC (rev 845) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-22 11:15:22 UTC (rev 846) @@ -202,16 +202,18 @@ <fieldset class="user-form clearfix"> <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="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> - <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" />