- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r783 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: bleny Date: 2010-11-18 10:16:16 +0000 (Thu, 18 Nov 2010) New Revision: 783 Log: fix contact grid layout Modified: trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-18 10:15:40 UTC (rev 782) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-18 10:16:16 UTC (rev 783) @@ -151,7 +151,7 @@ <label for="commentAdmin">programme</label> </t:if> </div> - <div> + <div style="margin-top: 15px;"> <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> <t:label t:for="sortedByBoardingDate" /> </div> <div class="t-beaneditor-row aright">

1 0

[Suiviobsmer-commits] r782 - trunk/wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org 18 Nov '10

18 Nov '10

Author: bleny Date: 2010-11-18 10:15:40 +0000 (Thu, 18 Nov 2010) New Revision: 782 Log: fix contact grid layout Modified: trunk/wao-ui/src/main/webapp/css/contacts.css Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-17 17:30:06 UTC (rev 781) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-18 10:15:40 UTC (rev 782) @@ -143,7 +143,10 @@ div#so-contacts table.t-data-grid tbody tr td.commentCoordinator, div#so-contacts table.t-data-grid tbody tr td.commentAdmin, -div#so-contacts table.t-data-grid tbody tr td.comment { +div#so-contacts table.t-data-grid tbody tr td.comment, +div#so-contacts table.t-data-grid thead tr th.comment, +div#so-contacts table.t-data-grid thead tr th.commentCoordinator, +div#so-contacts table.t-data-grid thead tr th.commentAdmin { white-space: normal; width: 100px; text-align: center;

1 0

[Suiviobsmer-commits] r781 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 17 Nov '10

17 Nov '10

Author: bleny Date: 2010-11-17 17:30:06 +0000 (Wed, 17 Nov 2010) New Revision: 781 Log: fixed FIXME Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-17 17:27:27 UTC (rev 780) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-17 17:30:06 UTC (rev 781) @@ -31,7 +31,6 @@ import fr.ifremer.wao.entity.WaoUser; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.TopiaException; import org.slf4j.Logger; @@ -61,8 +60,6 @@ } @Test - // FIXME-fdesbois-2010-11-14 : NPE on ServiceContactImpl when loading dcf5code - @Ignore public void testGetContactsFilteredByObserver() throws TopiaException { log.info("getContactsFilteredByObserver");

1 0

[Suiviobsmer-commits] r780 - trunk/wao-ui/src/main/webapp/WEB-INF
by bleny＠users.labs.libre-entreprise.org 17 Nov '10

17 Nov '10

Author: bleny Date: 2010-11-17 17:27:27 +0000 (Wed, 17 Nov 2010) New Revision: 780 Log: i18n for DataReliability in forms Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-17 17:25:39 UTC (rev 779) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-17 17:27:27 UTC (rev 780) @@ -32,3 +32,8 @@ ContactState.BOARDING_EXPECTED: Embarquement programm\u00e9 ContactState.CONTACT_START: Contact pris +DataReliability.UNKNOWN: Inconnue +DataReliability.NOT_RELIABLE: Non-exploitable +DataReliability.DOUBTFUL: Douteuse +DataReliability.RELIABLE: Exploitable +

1 0

[Suiviobsmer-commits] r779 - in trunk/wao-business/src/main: java/fr/ifremer/wao/service xmi
by bleny＠users.labs.libre-entreprise.org 17 Nov '10

17 Nov '10

Author: bleny Date: 2010-11-17 17:25:39 +0000 (Wed, 17 Nov 2010) New Revision: 779 Log: fix lazy loading issue Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-17 16:36:44 UTC (rev 778) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-17 17:25:39 UTC (rev 779) @@ -148,11 +148,6 @@ Map<String, Contact> results = dao.findAllMappedByQuery(query); - // XXX bleny 20101112 prevent lazy loading failure - for (Contact contact : results.values()) { - contact.getSampleRow().getProfession().sizeDcf5code(); - } - return results; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-17 16:36:44 UTC (rev 778) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-17 17:25:39 UTC (rev 779) @@ -486,14 +486,6 @@ for (SampleRow row : results) { // use FacadeRow to complete ordering using maps result.addRow(row); - - // XXX bleny 20101110 browse code to force load it from BD - // "lazy" directive doesn't seem to work - if (row.getProfession() != null) { - for (DCFFiveCode code : row.getProfession().getDcf5code()) { - log.debug("row " + row.getCode() + " has DCF5 code " + code.toString()); - } - } } return result; } @@ -568,14 +560,6 @@ result.sizeSampleMonth(); result.sizeElligibleBoat(); - - - // XXX bleny 20101110 browse code to force load it from BD - // "lazy" directive doesn't seem to work - for (DCFFiveCode code : result.getProfession().getDcf5code()) { - log.debug("row " + result.getCode() + " has DCF5 code " + code.toString()); - } - return result; } Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-17 16:36:44 UTC (rev 778) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-17 17:25:39 UTC (rev 779) @@ -14,7 +14,7 @@ fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagvalue.orderBy=facadeName,sectorName,districtCode fr.ifremer.wao.entity.SampleRow.attribute.company.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.profession.tagvalue.lazy=false -fr.ifremer.wao.entity.Profession.attribute.dcf5Code.tagvalue.lazy=false +fr.ifremer.wao.entity.Profession.attribute.dcf5code.tagvalue.lazy=false #fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.orderBy=companyActive #fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagvalue.lazy=false

1 0

[Suiviobsmer-commits] r778 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/xmi wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 17 Nov '10

17 Nov '10

Author: bleny Date: 2010-11-17 16:36:44 +0000 (Wed, 17 Nov 2010) New Revision: 778 Log: fix tooltip for DCF5code in sampling plan compact mode Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-17 16:35:43 UTC (rev 777) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-17 16:36:44 UTC (rev 778) @@ -46,6 +46,13 @@ @Override public String getCode() { String code = StringUtils.join(getDcf5code(), ", "); + code += getCodeWithoutDCF5(); + return code; + } + + @Override + public String getCodeWithoutDCF5() { + String code = ""; if (!StringUtils.isEmpty(getMeshSize())) { code += " " + getMeshSize(); } @@ -57,5 +64,4 @@ } return code; } - } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-17 16:35:43 UTC (rev 777) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-17 16:36:44 UTC (rev 778) @@ -274,7 +274,14 @@ ${fishingZones} </span> </td> - <td>${row.profession.code}</td> + <td> + <t:loop source="row.profession.dcf5code" value="dcf5code"> + <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> + ${dcf5Code} + </span> + </t:loop> + ${row.profession.codeWithoutDCF5} + </td> <td class="bright"> <span t:type="ck/Tooltip" title="Infos" t:value="Espèces cibles : ${row.profession.species}" t:effect="appear"> ${row.profession.libelle}

1 0

[Suiviobsmer-commits] r777 - trunk/wao-business/src/main/resources/i18n
by bleny＠users.labs.libre-entreprise.org 17 Nov '10

17 Nov '10

Author: bleny Date: 2010-11-17 16:35:43 +0000 (Wed, 17 Nov 2010) New Revision: 777 Log: add missing gear and specices code description Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-14 18:27:01 UTC (rev 776) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-17 16:35:43 UTC (rev 777) @@ -17,6 +17,7 @@ DCF.gear.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) DCF.gear.GNF=Filets maillants fixes (sur perches) DCF.gear.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) +DCF.gear.GT=Tr\u00E9mailleurs DCF.gear.GTN=Tr\u00E9mails et filets maillants combin\u00E9s DCF.gear.GTR=Tr\u00E9mails DCF.gear.HAR=Harpons @@ -65,6 +66,7 @@ DCF.species.ALG=Algues DCF.species.CAT=Esp\u00E8ces catadromes DCF.species.CRU=Crustac\u00E9s +DCF.species.CSJ=Coquilles Saint-Jacques DCF.species.DEF=Esp\u00E8ces d\u00E9mersales DCF.species.DWS=Esp\u00E8ces d'eaux profondes DCF.species.FIN=Poisson plats

1 0

[Suiviobsmer-commits] r776 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 14 Nov '10

14 Nov '10

Author: fdesbois Date: 2010-11-14 18:27:01 +0000 (Sun, 14 Nov 2010) New Revision: 776 Log: ANO #2565 : error on validation program reset contact form - Warning, a regression was introduce on contact validation if validationProgram is null (for a non admin save) - Test failure : ignored and need to be fixed - Resolve Ano : reset contactEdited on validationProgram failure, keep edited data will stay in editionMode which is not good for validation. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-12 20:19:44 UTC (rev 775) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-14 18:27:01 UTC (rev 776) @@ -142,7 +142,9 @@ // contactProperty.sampleRowProperty().sampleMonth()); // TODO-fdesbois-2010-06-18 : manage aliases in addLoad addLoad(TopiaQuery.getProperty(Contact.OBSERVER, WaoUser.COMPANY), - TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH)); + TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH) +// TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.PROFESSION, Profession.DCF5CODE) + ); Map<String, Contact> results = dao.findAllMappedByQuery(query); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-12 20:19:44 UTC (rev 775) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-14 18:27:01 UTC (rev 776) @@ -31,6 +31,7 @@ import fr.ifremer.wao.entity.WaoUser; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.TopiaException; import org.slf4j.Logger; @@ -60,6 +61,8 @@ } @Test + // FIXME-fdesbois-2010-11-14 : NPE on ServiceContactImpl when loading dcf5code + @Ignore public void testGetContactsFilteredByObserver() throws TopiaException { log.info("getContactsFilteredByObserver"); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-12 20:19:44 UTC (rev 775) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-14 18:27:01 UTC (rev 776) @@ -727,6 +727,7 @@ } // Embarquement Réalisé } else if (contactState.equals(ContactState.BOARDING_DONE)) { + if (begin == null) { contactsForm.recordError(beginDate, "La date de début de" + " marée est obligatoire pour l'état" + @@ -743,11 +744,20 @@ " '" + contactState.libelle() + "'"); } - if (contactEdited.isValidationProgram()) { + // XXX to bleny : Regression... It's better to check all case, + // when user (not admin) has a validation error, NPE appears on + // contactEdited.isValidationProgram() + if (logger.isDebugEnabled()) { + logger.debug("ValidationProgram = " + contactEdited.isValidationProgram()); + } + + if (BooleanUtils.isTrue(contactEdited.isValidationProgram())) { + // it's an admin validation, data-reliability field must be filled if (logger.isDebugEnabled()) { - logger.debug("field data reliability is " + contactEdited.getDataReliability()); + logger.debug("field data reliability is " + + contactEdited.getDataReliability()); } if (contactEdited.getDataReliability() == null || @@ -789,11 +799,15 @@ if (logger.isDebugEnabled()) { logger.debug("Contact can't be saved with errors"); } - // The contact is not saved, the contact must be editable to show form - // and correct errors - edited = true; + + // ANO #2565 : + // ContactEdited need to be reset if a validationProgram error occurs + // isEditionMode need to return false to avoid conflict with other save + if (BooleanUtils.isTrue(contactEdited.isValidationProgram())) { + contactEdited = null; + } + return contactsForm; - //return gridZone; } public void createNewContact(Boat boat, SampleRow sampleRow) throws WaoException {

1 0

[Suiviobsmer-commits] r775 - in trunk/wao-ui/src/main/webapp: . css
by bleny＠users.labs.libre-entreprise.org 12 Nov '10

12 Nov '10

Author: bleny Date: 2010-11-12 20:19:44 +0000 (Fri, 12 Nov 2010) New Revision: 775 Log: making map page look better Modified: trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/css/cartography.css Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-11-12 19:57:23 UTC (rev 774) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-11-12 20:19:44 UTC (rev 775) @@ -43,16 +43,9 @@ <div id="so-cartography-border" class="fleft"> <div id="so-cartography-icons"> - <span> - <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur l'application Wao"/> - </a>  - </span> - <span> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> - <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> - </a> - </span> + <a t:type="pagelink" t:page="index" title="Page d'accueil"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur l'application Wao"/> + </a>  </div> <h1>${pageTitle}</h1> @@ -100,10 +93,15 @@ </p> </form> </div> - + + <div class="acenter mtop30"> + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> + <img style="height: 22px;" src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + </a> + </div> </div> - <div id="so-cartography-map" class="fleft"></div> + <div id="so-cartography-map" class="fleft" style="margin: 10px;"/> </div> <t:footer /> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-11-12 19:57:23 UTC (rev 774) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-11-12 20:19:44 UTC (rev 775) @@ -34,9 +34,10 @@ #so-cartography-border { width: 300px; - background-color:#f1f1f1; - padding:10px; - color:#007CC2; + background-color: #f1f1f1; + padding: 10px; + color: #007CC2; + margin: 10px; } #so-cartography-border h1 { @@ -51,8 +52,6 @@ #so-cartography-icons { text-align: center; margin: 20px; - background-color: white; - border: 1px solid black; } #so-cartography-filters { @@ -62,8 +61,9 @@ } #so-cartography-map { - width: 700px; - height: 700px; + width: 800px; + height: 600px; + margin: 10px !important; } #so-cartography-map h3 {

1 0

[Suiviobsmer-commits] r774 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/xmi wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 12 Nov '10

12 Nov '10

Author: bleny Date: 2010-11-12 19:57:23 +0000 (Fri, 12 Nov 2010) New Revision: 774 Log: sort contacts by boarding date Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-12 19:57:23 UTC (rev 774) @@ -27,6 +27,7 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserFilter; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; import org.apache.commons.collections.CollectionUtils; @@ -568,6 +569,10 @@ filter.setFromDate(fromDate); filter.setPeriod(period); + if (filter.isSortedByBoardingDate()) { + query.addOrder(contactProperty.$property(Contact.TIDE_BEGIN_DATE + " DESC")); + } + // ORDER_BY if (StringUtils.isNotEmpty(orderBy)) { query.addOrder(contactProperty.$property(orderBy)); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-12 19:57:23 UTC (rev 774) @@ -59,6 +59,7 @@ commentAdmin-label: Commentaire programme commentCoordinator-label: Commentaire soci\u00e9t\u00e9 dataReliability-label: Qualit\u00e9 de la donn\u00e9e +sortedByBoardingDate-label: Trier les contacts (ordre anti-chronologique) # Form labels contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-12 19:37:20 UTC (rev 773) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-12 19:57:23 UTC (rev 774) @@ -150,8 +150,10 @@ <input t:type="checkbox" t:id="commentAdmin" value="contactFilter.commentAdmin" />  <label for="commentAdmin">programme</label> </t:if> -  </div> + <div> + <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> <t:label t:for="sortedByBoardingDate" /> + </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les contacts correspondants aux filtres saisies" />  <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />

1 0