Author: bleny Date: 2011-01-05 20:26:39 +0000 (Wed, 05 Jan 2011) New Revision: 891 Log: allow observers to see all comments Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.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 2011-01-05 20:04:58 UTC (rev 890) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-01-05 20:26:39 UTC (rev 891) @@ -302,7 +302,8 @@ public boolean showDataReliability() { // ObsMer is the single program where data reliability is evaluated - return getContact().getObsProgram() == ObsProgram.OBSMER; + return getContact().getObsProgram() == ObsProgram.OBSMER && + (connectedUser.isAdmin() || connectedUser.isCoordinator()); } public boolean canEditDataReliability() { Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-05 20:04:58 UTC (rev 890) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-05 20:26:39 UTC (rev 891) @@ -74,8 +74,8 @@ wao.ui.field.Contact.dataReliability=Qualit\u00E9 des donn\u00E9es wao.ui.field.Contact.endDate=Fin d'observation wao.ui.field.Contact.mainObserver=Observateur r\u00E9f\u00E9rant -wao.ui.field.Contact.mammalsCapture=Capture de mammif\u00E8res -wao.ui.field.Contact.mammalsObservation=Observation de mammif\u00E8res +wao.ui.field.Contact.mammalsCapture=Capture accidentelle +wao.ui.field.Contact.mammalsObservation=Observation exceptionnelle wao.ui.field.Contact.nbObservants=Nombre d'observateurs wao.ui.field.Contact.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage wao.ui.field.Contact.secondaryObservers=Observateurs Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-05 20:04:58 UTC (rev 890) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-05 20:26:39 UTC (rev 891) @@ -226,47 +226,72 @@ </div> </t:if> - <t:unless test="connectedUser.observer"> - <div> - <label for="coordinatorComment">${message:wao.ui.field.Contact.commentCoordinator}</label> + <div> + <label for="comment">${message:wao.ui.field.Contact.comment}</label> + <t:if t:test="connectedUser.observer"> + <input t:type="textarea" t:id="comment" value="contact.comment" /> + <p:else> + <t:if t:test="contact.comment"> + <div class="value"> <!-- make no line return under the label --> + ${contact.comment} + </div> + <p:else> + <em>${message:wao.ui.misc.noComment}</em> + </p:else> + </t:if> + </p:else> + </t:if> + </div> + + <div> + <label for="coordinatorComment">${message:wao.ui.field.Contact.commentCoordinator}</label> + <t:if t:test="connectedUser.coordinator"> <input t:type="textarea" t:id="coordinatorComment" value="contact.commentCoordinator" /> - </div> - </t:unless> - </t:block> - - <t:unless test="connectedUser.observer"> - <t:if t:test="connectedUser.admin"> - <a name="focus" /> - </t:if> - <fieldset> - <legend>${message:wao.ui.form.programEvaluation}</legend> - <t:if test="showDataReliability()"> - <div> - <label for="dataReliability">${message:wao.ui.field.Contact.dataReliability}</label> - <t:if t:test="canEditDataReliability()"> - <input t:type="select" t:id="dataReliability" value="contact.dataReliability" /> + <p:else> + <t:if t:test="contact.commentCoordinator"> + <div class="value"> <!-- make no line return under the label --> + ${contact.commentCoordinator} + </div> <p:else> - ${getLabelForEnum(contact.dataReliability)} + <em>${message:wao.ui.misc.noComment}</em> </p:else> </t:if> - </div> + </p:else> </t:if> + </div> + </t:block> + + <t:if t:test="connectedUser.admin"> + <a name="focus" /> + </t:if> + <fieldset> + <legend>${message:wao.ui.form.programEvaluation}</legend> + <t:if test="showDataReliability()"> <div> - <label for="adminComment">${message:wao.ui.field.Contact.commentAdmin}</label> - <t:if t:test="connectedUser.admin"> - <input t:type="textarea" t:id="adminComment" value="contact.commentAdmin" /> + <label for="dataReliability">${message:wao.ui.field.Contact.dataReliability}</label> + <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>${message:wao.ui.misc.noComment}</em> - </p:else> - </t:if> + ${getLabelForEnum(contact.dataReliability)} </p:else> </t:if> </div> - </fieldset> - </t:unless> + </t:if> + <div> + <label for="adminComment">${message:wao.ui.field.Contact.commentAdmin}</label> + <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>${message:wao.ui.misc.noComment}</em> + </p:else> + </t:if> + </p:else> + </t:if> + </div> + </fieldset> <div class="fright"> <input t:type="submit" t:id="saveContact" class="ico save" value="${message:wao.ui.action.save}" title="${message:wao.ui.action.save}" />