Author: bleny Date: 2010-12-13 17:41:26 +0000 (Mon, 13 Dec 2010) New Revision: 833 Log: starting form for update multiple observers Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 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/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-13 09:21:48 UTC (rev 832) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-13 17:41:26 UTC (rev 833) @@ -136,8 +136,14 @@ // Default order filter.setOrderBy(TopiaEntity.TOPIA_CREATE_DATE + " desc"); + + TopiaQuery query = builder.applyContactFilter(filter); - TopiaQuery query = builder.applyContactFilter(filter). + if (log.isDebugEnabled()) { + log.debug("query to get contacts without load is " + query); + } + + query. // addLoad(contactProperty.observerProperty().company(), // contactProperty.sampleRowProperty().sampleMonth()); // TODO-fdesbois-2010-06-18 : manage aliases in addLoad @@ -146,8 +152,18 @@ // TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.PROFESSION, Profession.DCF5CODE) ); + if (log.isDebugEnabled()) { + log.debug("query to get contacts with load is " + query); + } + Map<String, Contact> results = dao.findAllMappedByQuery(query); + // force load + for (Contact contact : results.values()) { + contact.getMainObserver(); + contact.sizeSecondaryObservers(); + } + return results; } 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-12-13 09:21:48 UTC (rev 832) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-12-13 17:41:26 UTC (rev 833) @@ -25,10 +25,11 @@ # ContactForm labels facadeName-label: Facade sectorName-label: Secteur -observer-label: Observateur +observer-label: Observateur r\u00e9f\u00e9rant contactsCsvFile-label: Fichier des contacts fromDate-label: Depuis le reliabilityFilter-label: Qualit\u00e9 +mainObserver-label: Observateur r\u00e9f\u00e9rant # Grid labels createdBy-label: Observateur Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-12-13 09:21:48 UTC (rev 832) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-12-13 17:41:26 UTC (rev 833) @@ -193,9 +193,9 @@ <div t:type="grid" t:source="contacts" t:row="contact" class="t-data-grid ${gridClass}" t:model="contactModel" t:rowClass="prop:rowClass" t:rowsPerPage="20"> <p:createdByCell> + ${contact.mainObserver.fullName} <t:if t:test="editionMode"> - <input t:type="select" t:model="userSelectModel" t:validate="required" t:value="contactUserId"/> - <p:else>${contact.mainObserver.fullName}</p:else> + <a t:type="actionlink" t:id="showObserversForm" t:zone="observersFormZone" context="${contact.topiaId}" class="display-form" title="Modifier les observateurs associés à ce contact">...</a> </t:if> </p:createdByCell> <p:sampleRowCell> @@ -385,5 +385,38 @@ </p> </form> </div> - +<t:zone t:id="observersFormZone" t:visible="observersFormZoneVisible"> + <t:if test="contactEdited"> <!-- only if contact != null : prevent NPE at peage loading --> + Modification des observateurs associés à ce contact : + <form t:type="form" t:id="observersForm" action="tapestry"> + <p> + <t:errors /> + </p> + <p> + <t:label t:for="mainObserver" />: + <input t:type="select" t:id="mainObserver" t:model="observerSelectModel" t:validate="required" t:value="contactUserId"/> + </p> + <p> + <t:label t:for="secondaryObserver" />: + <input t:type="select" t:id="secondaryObserver" t:model="observerSelectModel" t:value="selectedSecondaryObserverId" t:mixins="ck/onEvent" t:event="change" /> + <a t:type="actionlink" t:id="addSecondaryObserver" title="Ajouter un observateur" t:zone="observersFormZone"> + <img src="${asset:context:img/add-16px.png}" /> + </a>  + <ul> + <li t:type="loop" t:source="secondaryObservers" t:value="observer" t:index="secondaryObserverIndex" t:volatile="true"> + ${observer.fullName} + <a t:type="actionlink" t:id="removeSecondaryObserver" t:context="secondaryObserverIndex" title="Supprimer cet observateur" t:zone="observersFormZone"> + <img src="${asset:context:img/remove-22px.png}" /> + </a> + </li> + </ul> + </p> + <p> </p> + <p class="aright"> + <input t:type="submit" t:id="cancelEditObservers" class="ico22px undo22px" value="Undo" title="Annuler les modifications" /> + <input t:type="submit" t:id="saveObservers" class="ico22px save22px" value="Save" title="Enregistrer les observateurs" /> + </p> + </form> + </t:if> +</t:zone> </t:layout>