This is an automated email from the git hooks/post-receive script. New commit to branch feature/2264 in repository wao. See http://git.codelutin.com/wao.git commit 068d1a2dc4068527ec7571f9c0bf819785d19fc4 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Dec 26 10:13:42 2014 +0100 Tableau des contacts pour scléro et forme du formulaire (pas encore de validation adéquat) --- .../wao/entity/Contact-conversion.properties | 5 +- .../main/resources/i18n/wao-web_en_GB.properties | 9 +- .../main/resources/i18n/wao-web_fr_FR.properties | 9 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 155 +++++++++++++++------ .../webapp/WEB-INF/content/edit-contact-input.jsp | 3 +- 5 files changed, 132 insertions(+), 49 deletions(-) diff --git a/wao-web/src/main/resources/fr/ifremer/wao/entity/Contact-conversion.properties b/wao-web/src/main/resources/fr/ifremer/wao/entity/Contact-conversion.properties index 8898264..c3177ab 100644 --- a/wao-web/src/main/resources/fr/ifremer/wao/entity/Contact-conversion.properties +++ b/wao-web/src/main/resources/fr/ifremer/wao/entity/Contact-conversion.properties @@ -22,4 +22,7 @@ observationBeginDate=fr.ifremer.wao.web.converter.DateTimeConverter observationEndDate=fr.ifremer.wao.web.converter.DateTimeConverter creationDate=fr.ifremer.wao.web.converter.DateConverter dataInputDate=fr.ifremer.wao.web.converter.DateConverter -restitution=fr.ifremer.wao.web.converter.DateConverter \ No newline at end of file +restitution=fr.ifremer.wao.web.converter.DateConverter +sampleSubmission=fr.ifremer.wao.web.converter.DateConverter +sampleReception=fr.ifremer.wao.web.converter.DateConverter +sampleTreatment=fr.ifremer.wao.web.converter.DateConverter diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index 18dfe5d..5e9770e 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -228,11 +228,12 @@ wao.ui.field.Contact.observationTimeInDays=Observation time in days wao.ui.field.Contact.observationType=Observation type wao.ui.field.Contact.observedDataControl=Observed Data control wao.ui.field.Contact.restitution=Restitution -wao.ui.field.Contact.sampleReception= +wao.ui.field.Contact.sampleReception=Sample reception wao.ui.field.Contact.sampleRow=Sample row -wao.ui.field.Contact.sampleSize= -wao.ui.field.Contact.sampleSubmission= -wao.ui.field.Contact.sampleTreatment= +wao.ui.field.Contact.sampleSize=Sample size +wao.ui.field.Contact.sampleSize.unit=individuals +wao.ui.field.Contact.sampleSubmission=Sample submission +wao.ui.field.Contact.sampleTreatment=Sample treatment wao.ui.field.Contact.samplingStrategy=Sampling strategy followed wao.ui.field.Contact.secondaryObservers=Secondary observers wao.ui.field.Contact.terrestrialLocation=Observation's place diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index f917979..28c8e87 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -229,11 +229,12 @@ wao.ui.field.Contact.observationTimeInDays=Jours d'observation wao.ui.field.Contact.observationType=Type d'observation wao.ui.field.Contact.observedDataControl=Contrôle des données observées wao.ui.field.Contact.restitution=Transmission de la restitution -wao.ui.field.Contact.sampleReception= +wao.ui.field.Contact.sampleReception=Réception de l'échantillon wao.ui.field.Contact.sampleRow=Ligne du plan -wao.ui.field.Contact.sampleSize= -wao.ui.field.Contact.sampleSubmission= -wao.ui.field.Contact.sampleTreatment= +wao.ui.field.Contact.sampleSize=Taille de l'échantillon +wao.ui.field.Contact.sampleSize.unit=individus +wao.ui.field.Contact.sampleSubmission=Envoi de l'échantillon +wao.ui.field.Contact.sampleTreatment=Traitement de l'échantillon wao.ui.field.Contact.samplingStrategy=Stratégie d'échantillonnage suivie wao.ui.field.Contact.secondaryObservers=Observateurs secondaires wao.ui.field.Contact.terrestrialLocation=Lieu d'observation diff --git a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp index 0181289..b3df83d 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp @@ -348,12 +348,21 @@ <thead> <tr> <th><s:text name="wao.ui.field.Contact.creationDate"/></th> - <th><s:text name="wao.ui.contacts.boatName"/></th> + <s:if test="obsMer || obsVente"> + <th><s:text name="wao.ui.contacts.boatName"/></th> + </s:if> <th><s:text name="wao.ui.field.Contact.sampleRow"/></th> <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.programName"/></th> - <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.professionCode"/></th> - <th class="only-in-full-view"><s:text name="wao.ui.contacts.Profession.libelle"/></th> - <th class="only-in-full-view"><s:text name="wao.ui.contacts.Profession.species"/></th> + <s:if test="obsMer || obsVente"> + <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.professionCode"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.contacts.Profession.libelle"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.contacts.Profession.species"/></th> + </s:if> + <s:if test="sclerochronology"> + <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.individualMeasurementStrategy"/></th> + <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.species"/></th> + </s:if> <th class="only-in-full-view"><s:text name="wao.ui.contacts.FishingZone.facadeName"/></th> <th class="only-in-full-view"><s:text name="wao.ui.contacts.FishingZone.sectorName"/></th> <th class="only-in-full-view"><s:text name="wao.ui.contacts.division"/></th> @@ -361,15 +370,35 @@ <th><s:text name="wao.ui.field.Contact.terrestrialLocation"/></th> <th><s:text name="wao.ui.field.SampleRow.samplingStrategy"/></th> </s:if> - <th class="only-in-full-view"><s:text name="wao.ui.field.SampleRow.company"/></th> + <th class="only-in-full-view"> + <s:if test="obsMer || obsVente"> + <s:text name="wao.ui.field.SampleRow.company"/> + </s:if> + <s:else> + <s:text name="wao.ui.field.SampleRow.organisation"/> + </s:else> + </th> <th><s:text name="wao.ui.contacts.observers"/></th> - <th><s:text name="wao.ui.field.Contact.contactState"/> (<s:text name="wao.ui.field.Contact.contactStateMotif"/>)</th> + <th> + <s:text name="wao.ui.field.Contact.contactState"/> + <s:if test="obsMer"> + (<s:text name="wao.ui.field.Contact.contactStateMotif"/>) + </s:if> + </th> <th class="date-time"><s:text name="wao.ui.field.Contact.beginDate"/></th> <th class="date-time"><s:text name="wao.ui.field.Contact.endDate"/></th> <s:if test="obsMer"> <th><s:text name="wao.ui.field.Contact.observationTimeInDays"/></th> </s:if> - <th class="date"><s:text name="wao.ui.field.Contact.dataInputDate"/></th> + <s:if test="obsMer || obsVente"> + <th class="date"><s:text name="wao.ui.field.Contact.dataInputDate"/></th> + </s:if> + <s:if test="sclerochronology"> + <th><s:text name="wao.ui.field.Contact.sampleSize"/></th> + <th class="date"><s:text name="wao.ui.field.Contact.sampleSubmission"/></th> + <th class="date"><s:text name="wao.ui.field.Contact.sampleReception"/></th> + <th class="date"><s:text name="wao.ui.field.Contact.sampleTreatment"/></th> + </s:if> <s:if test="obsMer"> <th><s:text name="wao.ui.field.Contact.observedDataControl"/></th> <th class="date"><s:text name="wao.ui.field.Contact.restitution"/></th> @@ -399,23 +428,32 @@ <td> <s:property value="creationDate"/> </td> - <td> - <s:set name="boatTooltip"> - <s:text name="wao.ui.boats.registrationCode"/> <s:property value="boat.registrationCode" escapeHtml="false"/> - <s:text name="wao.ui.boats.boatLength"/> <s:property value="boat.boatLength" escapeHtml="false"/> cm - <s:text name="wao.ui.boats.buildYear"/> <s:property value="%{'' + boat.buildYear}" escapeHtml="false"/> - <s:text name="wao.ui.boats.district"/> <s:property value="boat.district.districtName" escapeHtml="false"/> (<s:property value="boat.district.districtCode" escapeHtml="false"/>) - </s:set> - <span data-original-title="<s:property value="#boatTooltip"/>" data-toggle="tooltip" data-placement="right"> - <s:property value="boat.name"/> - </span> - </td> + <s:if test="obsMer || obsVente"> + <td> + <s:set name="boatTooltip"> + <s:text name="wao.ui.boats.registrationCode"/> <s:property value="boat.registrationCode" escapeHtml="false"/> + <s:text name="wao.ui.boats.boatLength"/> <s:property value="boat.boatLength" escapeHtml="false"/> cm + <s:text name="wao.ui.boats.buildYear"/> <s:property value="%{'' + boat.buildYear}" escapeHtml="false"/> + <s:text name="wao.ui.boats.district"/> <s:property value="boat.district.districtName" escapeHtml="false"/> (<s:property value="boat.district.districtCode" escapeHtml="false"/>) + </s:set> + <span data-original-title="<s:property value="#boatTooltip"/>" data-toggle="tooltip" data-placement="right"> + <s:property value="boat.name"/> + </span> + </td> + </s:if> <td class="only-in-compact-view"> <s:set name="sampleRowTooltip"> <s:text name="wao.ui.field.SampleRow.programName"/> <s:property value="sampleRow.programName" escapeHtml="false"/> - <s:text name="wao.ui.field.SampleRow.professionCode"/> <s:property value="sampleRow.professionDescription" escapeHtml="false"/> - <s:text name="wao.ui.contacts.Profession.libelle"/> <s:property value="sampleRow.profession.libelle" escapeHtml="false"/> - <s:text name="wao.ui.contacts.Profession.species"/> <s:property value="sampleRow.profession.species" escapeHtml="false"/> + <s:if test="obsMer || obsVente"> + <s:text name="wao.ui.field.SampleRow.professionCode"/> <s:property value="sampleRow.professionDescription" escapeHtml="false"/> + <s:text name="wao.ui.contacts.Profession.libelle"/> <s:property value="sampleRow.profession.libelle" escapeHtml="false"/> + <s:text name="wao.ui.contacts.Profession.species"/> <s:property value="sampleRow.profession.species" escapeHtml="false"/> + </s:if> + <s:if test="sclerochronology"> + <s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/> <s:property value="getText(sampleRow.sclerochronologySamplingContext)" escapeHtml="false"/> + <s:text name="wao.ui.field.SampleRow.individualMeasurementStrategy"/> <s:property value="getText(sampleRow.individualMeasurementStrategy)" escapeHtml="false"/> + <s:text name="wao.ui.field.SampleRow.species"/> <s:property value="sampleRow.species.vernacularName" escapeHtml="false"/> + </s:if> <s:text name="wao.ui.contacts.FishingZone.facadeName"/> <s:property value="sampleRow.facade" escapeHtml="false"/> <s:text name="wao.ui.contacts.FishingZone.sectorName"/> <s:property value="sampleRow.sectors" escapeHtml="false"/> <s:text name="wao.ui.contacts.division"/> <s:property value="%{getDivision(sampleRow)}" escapeHtml="false"/> @@ -430,18 +468,33 @@ <td class="only-in-full-view"> <s:property value="sampleRow.programName"/> </td> - <td class="only-in-full-view"> - <s:iterator value="getDcf5CodesAndDescriptions(sampleRow)"> - <abbr title="<s:property value="value"/>"><s:property value="key"/></abbr> - </s:iterator> - <s:property value="sampleRow.professionDescriptionWithoutDcf5" /> - </td> - <td class="only-in-full-view"> - <s:property value="sampleRow.profession.libelle"/> - </td> - <td class="only-in-full-view"> - <s:property value="sampleRow.profession.species"/> - </td> + <s:if test="obsMer || obsVente"> + <td class="only-in-full-view"> + <s:iterator value="getDcf5CodesAndDescriptions(sampleRow)"> + <abbr title="<s:property value="value"/>"><s:property value="key"/></abbr> + </s:iterator> + <s:property value="sampleRow.professionDescriptionWithoutDcf5" /> + </td> + <td class="only-in-full-view"> + <s:property value="sampleRow.profession.libelle"/> + </td> + <td class="only-in-full-view"> + <s:property value="sampleRow.profession.species"/> + </td> + </s:if> + <s:if test="sclerochronology"> + <td class="only-in-full-view"> + <span data-original-title="<s:property value="#sampleRow.sclerochronologySamplingContextInfo"/>" data-toggle="tooltip" data-placement="right"> + <s:property value="getText(sampleRow.sclerochronologySamplingContext)"/> + </span> + </td> + <td class="only-in-full-view"> + <s:property value="getText(sampleRow.individualMeasurementStrategy)"/> + </td> + <td class="only-in-full-view"> + <s:property value="sampleRow.species.vernacularName"/> + </td> + </s:if> <td class="only-in-full-view"> <s:property value="sampleRow.facade"/> </td> @@ -462,7 +515,7 @@ </td> </s:if> <td class="only-in-full-view"> - <s:property value="sampleRow.company.name"/> + <s:property value="sampleRow.organisation.fullName"/> </td> <td> <ul> @@ -494,11 +547,35 @@ </s:if> </td> </s:if> - <td class="date"> - <s:if test="dataInputDate != null"> - <s:property value="dataInputDate"/> - </s:if> - </td> + <s:if test="obsMer || obsVente"> + <td class="date"> + <s:if test="dataInputDate != null"> + <s:property value="dataInputDate"/> + </s:if> + </td> + </s:if> + <s:if test="sclerochronology"> + <td> + <s:if test="sampleSize != null"> + <s:property value="sampleSize"/> + </s:if> + </td> + <td class="date"> + <s:if test="sampleSubmission != null"> + <s:property value="sampleSubmission"/> + </s:if> + </td> + <td class="date"> + <s:if test="sampleReception != null"> + <s:property value="sampleReception"/> + </s:if> + </td> + <td class="date"> + <s:if test="sampleTreatment != null"> + <s:property value="sampleTreatment"/> + </s:if> + </td> + </s:if> <s:if test="obsMer"> <td> <s:if test="observedDataControl != null"> diff --git a/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp b/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp index 1598c2f..c4d603c 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp @@ -347,7 +347,8 @@ label="%{getText('wao.ui.field.Contact.sampleSize')}" type="number" disabled="%{!#editObservationReport}" - cssClass="input-small" /> + cssClass="input-small" + inputAppend="%{getText('wao.ui.field.Contact.sampleSize.unit')}"/> <s:textfield name="updateContactCommand.contact.sampleSubmission" label="%{getText('wao.ui.field.Contact.sampleSubmission')}" -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.