Author: tchemit Date: 2014-04-09 12:25:28 +0200 (Wed, 09 Apr 2014) New Revision: 1872 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1872 Log: refs #4487 edit-contact (disable some form fields) Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-04-09 09:38:33 UTC (rev 1871) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-04-09 10:25:28 UTC (rev 1872) @@ -59,59 +59,61 @@ <s:textfield name="updateContactCommand.contact.boat.name" label="%{getText('wao.ui.field.Boat.name')}" - readonly="true"/> + disabled="true"/> <s:textfield name="updateContactCommand.contact.boat.immatriculation" value="%{'' + updateContactCommand.contact.boat.immatriculation}" label="%{getText('wao.ui.field.Boat.immatriculation')}" - readonly="true"/> + disabled="true"/> <s:textfield name="updateContactCommand.contact.boat.districtCode" label="%{getText('wao.ui.field.Boat.districtCode')}" - readonly="true"/> + disabled="true"/> <s:textfield name="updateContactCommand.contact.boat.boatLength" label="%{getText('wao.ui.field.Boat.boatLength')}" - readonly="true"/> + disabled="true"/> <s:textfield name="updateContactCommand.contact.boat.buildYear" value="%{'' + updateContactCommand.contact.boat.buildYear}" label="%{getText('wao.ui.field.Boat.buildYear')}" - readonly="true"/> + disabled="true"/> <hr/> <s:textfield name="updateContactCommand.contact.sampleRow.professionDescription" label="%{getText('wao.ui.field.SampleRow.profession')}" - readonly="true"/> + disabled="true"/> <s:textfield name="updateContactCommand.contact.sampleRow.programName" label="%{getText('wao.ui.field.SampleRow.programName')}" - readonly="true"/> + disabled="true"/> <s:textfield name="updateContactCommand.contact.sampleRow.periodBegin" label="%{getText('wao.ui.field.SampleRow.periodBegin')}" value="%{formatMonth(updateContactCommand.contact.sampleRow.periodBegin)}" cssClass="input-small" - readonly="true"/> + disabled="true"/> <s:textfield name="updateContactCommand.contact.sampleRow.periodEnd" label="%{getText('wao.ui.field.SampleRow.periodEnd')}" value="%{formatMonth(updateContactCommand.contact.sampleRow.periodEnd)}" cssClass="input-small" - readonly="true"/> + disabled="true"/> <hr/> <s:textfield name="updateContactCommand.contact.creationDate" label="%{getText('wao.ui.field.Contact.creationDate')}" value="%{formatDate(updateContactCommand.contact.creationDate)}" - readonly="true"/> + disabled="true"/> </fieldset> - <%--TODO Editable (cssClass edit-observers) if authenticatedWaoUser.isAuthorizedToEditContactObservers(updateContactCommand.contact)--%> <fieldset> <legend><s:text name="wao.ui.misc.observers"/></legend> + <s:set name="editObservers" + value="%{authenticatedWaoUser.isAuthorizedToEditContactObservers(updateContactCommand.contact)}"/> + <s:select name="updateContactCommand.contact.mainObserver" value="%{updateContactCommand.contact.mainObserver.topiaId}" label="%{getText('wao.ui.field.Contact.mainObserver')}" list="observers" emptyOption="true" - cssClass="edit-observers"/> + disabled="%{!#editObservers}"/> <s:if test="authenticatedWaoUser.isAuthorizedToDisplayContactSecondaryObservers(updateContactCommand.contact)"> <s:select name="updateContactCommand.contact.secondaryObservers" @@ -119,47 +121,49 @@ label="%{getText('wao.ui.field.Contact.secondaryObservers')}" list="observers" multiple="true" - cssClass="edit-observers"/> + disabled="%{!#editObservers}"/> </s:if> </fieldset> - <%--TODO Editable (cssClass edit-observationReport) if authenticatedWaoUser.authorizedToEditObservationReport(updateContactCommand.contactcontact)--%> <fieldset id="coordinatorFocus"> <legend><s:text name="wao.ui.misc.observationReport"/></legend> + <s:set name="editObservationReport" + value="%{authenticatedWaoUser.isAuthorizedToEditObservationReport(updateContactCommand.contact)}"/> + <s:textfield name="updateContactCommand.contact.observationBeginDate" label="%{getText('wao.ui.field.Contact.beginDate')}" value="%{formatDateTime(updateContactCommand.contact.observationBeginDate)}" placeholder="%{getDateTimePlaceholder()}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> <s:textfield name="updateContactCommand.contact.observationEndDate" label="%{getText('wao.ui.field.Contact.endDate')}" value="%{formatDateTime(updateContactCommand.contact.observationEndDate)}" placeholder="%{getDateTimePlaceholder()}" - cssClass="observationReport"/> + disabled="%{!#editObservationReport}"/> <s:select name="updateContactCommand.contact.contactState" label="%{getText('wao.ui.field.Contact.contactState')}" requiredLabel="true" list="contactStates" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> <s:select name="updateContactCommand.contact.contactStateMotif" value="%{updateContactCommand.contact.contactState.topiaId}" label="%{getText('wao.ui.field.Contact.contactStateMotif')}" list="contactStateMotives" emptyOption="true" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> <s:checkbox name="updateContactCommand.contact.mammalsObservation" label="%{getText('wao.ui.field.Contact.mammalsObservation')}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> <s:checkbox name="updateContactCommand.contact.mammalsCapture" label="%{getText('wao.ui.field.Contact.mammalsCapture')}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> <%--TODO onclick="updateMammalsInfoBox(this);" />--%> <%--<span style="color: red;">--%> @@ -168,36 +172,33 @@ <s:textarea name="updateContactCommand.contact.mammalsInfo" label="%{getText('wao.ui.field.Contact.mammalsInfo')}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> <s:textfield name="updateContactCommand.contact.dataInputDate" label="%{getText('wao.ui.field.Contact.dataInputDate')}" value="%{formatDate(updateContactCommand.contact.dataInputDate)}" placeholder="%{getDatePlaceholder()}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> - <%--TODO Editable for authenticatedWaoUser.coordinator--%> <s:select name="updateContactCommand.contact.observedDataControl" label="%{getText('wao.ui.field.Contact.observedDataControl')}" list="observedDataControls" emptyOption="true" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}"/> <s:textfield name="updateContactCommand.contact.restitution" label="%{getText('wao.ui.field.Contact.restitution')}" value="%{formatDate(updateContactCommand.contact.restitution)}" placeholder="%{getDatePlaceholder()}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport}"/> <s:textarea name="updateContactCommand.contact.comment" label="%{getText('wao.ui.field.Contact.comment')}" - readonly="%{!authenticatedWaoUser.coordinatorOrObserver}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinatorOrObserver}"/> <s:textarea name="updateContactCommand.contact.commentCoordinator" label="%{getText('wao.ui.field.Contact.commentCoordinator')}" - readonly="%{!authenticatedWaoUser.coordinator}" - cssClass="edit-observationReport"/> + disabled="%{!#editObservationReport || !authenticatedWaoUser.coordinator}"/> </fieldset> @@ -205,11 +206,11 @@ <legend><s:text name="wao.ui.form.programEvaluation"/></legend> <s:if test="authenticatedWaoUser.authorizedToDisplayContactDataReliability"> - <%--TODO Editable for authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)--%> <s:select name="updateContactCommand.contact.dataReliability" label="%{getText('wao.ui.field.Contact.dataReliability')}" list="dataReliabilities" - emptyOption="true"/> + emptyOption="true" + disabled="%{!authenticatedWaoUser.isAuthorizedToEditContactDataReliability(updateContactCommand.contact)}"/> </s:if> <s:textarea name="updateContactCommand.contact.commentAdmin"