Author: bleny Date: 2014-03-12 16:27:04 +0100 (Wed, 12 Mar 2014) New Revision: 1720 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1720 Log: refs #4483 disable some field when necessary Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-12 13:54:25 UTC (rev 1719) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-12 15:27:04 UTC (rev 1720) @@ -172,4 +172,9 @@ public void setDcf5Codes(String dcf5Codes) { this.dcf5Codes = dcf5Codes; } + + public boolean isObservationAlreadyStarted() { + return sampleRow.hasSampleMonthRealTideTime(); + } + } Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-12 13:54:25 UTC (rev 1719) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-12 15:27:04 UTC (rev 1720) @@ -213,7 +213,7 @@ wao.ui.form.SampleRow.missingBeginDate=Begin date missing to generate line code wao.ui.form.SampleRow.others=Others data of the sample row wao.ui.form.SampleRow.program=Associated program and observation effort by months -wao.ui.form.SampleRow.warn.hasSampleMonthRealTideTime=The sample row is already associated with contacts: you won't be able to change some values +wao.ui.form.SampleRow.warn.observationAlreadyStarted=The sample row is already associated with contacts\: you won't be able to change some values wao.ui.form.WaoUser.credentials=Credentials wao.ui.form.WaoUser.identity=Identity wao.ui.form.WaoUser.preferences=Preferences Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-12 13:54:25 UTC (rev 1719) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-12 15:27:04 UTC (rev 1720) @@ -213,7 +213,7 @@ wao.ui.form.SampleRow.missingBeginDate=Date de début manquante pour générer le code de la ligne \! wao.ui.form.SampleRow.others=Autres données de la ligne d'échantillonnage wao.ui.form.SampleRow.program=Programme de rattachement et effort d'observation par mois -wao.ui.form.SampleRow.warn.hasSampleMonthRealTideTime=Cette ligne du plan est déjà associée à des contacts. Par conséquent, certaines informations ne sont plus modifiables. +wao.ui.form.SampleRow.warn.observationAlreadyStarted=Cette ligne du plan est déjà associée à des contacts. Par conséquent, certaines informations ne sont plus modifiables. wao.ui.form.WaoUser.credentials=Informations d'authentification wao.ui.form.WaoUser.identity=Identité wao.ui.form.WaoUser.preferences=Préférences Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-03-12 13:54:25 UTC (rev 1719) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-03-12 15:27:04 UTC (rev 1720) @@ -23,9 +23,9 @@ </s:else> </h1> - <s:if test="updateSampleRowCommand.sampleRow.hasSampleMonthRealTideTime()"> + <s:if test="updateSampleRowCommand.observationAlreadyStarted"> <div class="alert"> - <s:text name="wao.ui.form.SampleRow.warn.hasSampleMonthRealTideTime" /> + <s:text name="wao.ui.form.SampleRow.warn.observationAlreadyStarted" /> </div> </s:if> @@ -37,13 +37,38 @@ <legend><s:text name="wao.ui.field.SampleRow.profession" /></legend> - <s:textfield name="updateSampleRowCommand.sampleRow.profession.libelle" label="%{getText('wao.ui.field.SampleRow.libelle')}" /> - <s:textfield name="updateSampleRowCommand.sampleRow.profession.size" label="%{getText('wao.ui.field.SampleRow.size')}" inputAppend="m" cssClass="input-small" /> - <s:textfield name="updateSampleRowCommand.sampleRow.profession.meshSize" label="%{getText('wao.ui.field.SampleRow.meshSize')}" inputAppend="mm" cssClass="input-small" /> - <s:textfield name="updateSampleRowCommand.sampleRow.profession.species" label="%{getText('wao.ui.field.SampleRow.species')}" /> - <s:textfield name="updateSampleRowCommand.sampleRow.profession.other" label="%{getText('wao.ui.field.SampleRow.other')}" /> - <s:textfield name="updateSampleRowCommand.dcf5Codes" label="%{getText('wao.ui.field.SampleRow.dcf5Codes')}" cssClass="input-xxlarge" /> + <s:textfield name="updateSampleRowCommand.sampleRow.profession.libelle" + label="%{getText('wao.ui.field.SampleRow.libelle')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + cssClass="input-xxlarge" /> + <s:textfield name="updateSampleRowCommand.sampleRow.profession.size" + label="%{getText('wao.ui.field.SampleRow.size')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + inputAppend="m" + cssClass="input-small" /> + + <s:textfield name="updateSampleRowCommand.sampleRow.profession.meshSize" + label="%{getText('wao.ui.field.SampleRow.meshSize')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + inputAppend="mm" + cssClass="input-small" /> + + <s:textfield name="updateSampleRowCommand.sampleRow.profession.species" + label="%{getText('wao.ui.field.SampleRow.species')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + cssClass="input-xxlarge" /> + + <s:textfield name="updateSampleRowCommand.sampleRow.profession.other" + label="%{getText('wao.ui.field.SampleRow.other')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + cssClass="input-xxlarge" /> + + <s:textfield name="updateSampleRowCommand.dcf5Codes" + label="%{getText('wao.ui.field.SampleRow.dcf5Codes')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + cssClass="input-xxlarge" /> + </fieldset> <fieldset> @@ -52,6 +77,7 @@ <s:select name="updateSampleRowCommand.fishingZoneIds" label="%{getText('wao.ui.field.SampleRow.fishingZones')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" list="updateSampleRowCommand.allFishingZones" listValue="%{value.code}" multiple="true" @@ -66,7 +92,9 @@ <legend><s:text name="wao.ui.form.SampleRow.program" /></legend> - <s:textfield name="updateSampleRowCommand.sampleRow.programName" label="%{getText('wao.ui.field.SampleRow.programName')}" /> + <s:textfield name="updateSampleRowCommand.sampleRow.programName" + label="%{getText('wao.ui.field.SampleRow.programName')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" /> <s:textfield name="updateSampleRowCommand.sampleRow.periodBegin" label="%{getText('wao.ui.field.SampleRow.periodBegin')}" cssClass="input-small" /> <s:textfield name="updateSampleRowCommand.sampleRow.periodEnd" label="%{getText('wao.ui.field.SampleRow.periodEnd')}" cssClass="input-small" /> @@ -83,11 +111,15 @@ <legend><s:text name="wao.ui.form.SampleRow.others" /></legend> <s:if test="updateSampleRowCommand.creation"> - <s:textfield name="updateSampleRowCommand.code" label="%{getText('wao.ui.field.SampleRow.code')}" cssClass="input-small"/> + <s:textfield name="updateSampleRowCommand.code" + label="%{getText('wao.ui.field.SampleRow.code')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" + cssClass="input-small" /> </s:if> <s:select name="updateSampleRowCommand.companyId" label="%{getText('wao.ui.field.SampleRow.company')}" + disabled="updateSampleRowCommand.observationAlreadyStarted" list="updateSampleRowCommand.allCompanies" listValue="%{value.name}" cssClass="input-xxlarge"