Author: fdesbois Date: 2010-01-28 17:22:32 +0000 (Thu, 28 Jan 2010) New Revision: 291 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java trunk/suiviobsmer-ui/src/main/webapp/Boats.tml trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml Log: - Resolve problem on filters with facade and sector --> need subquery - Evol #2057 : fromDate on contactFilter + text on submits buttons (search and reset) - Ano #2056 : fromDate problem Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-27 17:27:43 UTC (rev 290) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-28 17:22:32 UTC (rev 291) @@ -139,7 +139,10 @@ // Add join for ElligibleBoat String elligibleBoatClassName = ElligibleBoat.class.getName(); query.addFrom(elligibleBoatClassName + " E").add("E." + ElligibleBoat.BOAT + " = " + main); - query = filter.prepareQueryForSampling(query, "E." + ElligibleBoat.SAMPLE_ROW); + //query = filter.prepareQueryForSampling(query, "E." + ElligibleBoat.SAMPLE_ROW); + TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct(); + subquery = filter.prepareQueryForSampling(subquery, "S"); + query.add("E." + ElligibleBoat.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams()); // Company if (filter.getCompany() != null) { Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-27 17:27:43 UTC (rev 290) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-28 17:22:32 UTC (rev 291) @@ -96,7 +96,9 @@ addParam("fromDate", period.getFromDate()).addParam("thruDate", period.getThruDate()). addGroup(periodDate).addOrder(periodDate); - query = filter.prepareQueryForSampling(query, "M." + SampleMonth.SAMPLE_ROW); + TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct(); + subquery = filter.prepareQueryForSampling(subquery, "S"); + query.add("M." + SampleMonth.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams()); if (log.isTraceEnabled()) { log.trace("Exec query : " + query); Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-27 17:27:43 UTC (rev 290) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-28 17:22:32 UTC (rev 291) @@ -47,7 +47,9 @@ import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; @@ -123,12 +125,12 @@ contacts = null; getContacts(); // } - String boatName = getFilter().getBoatName(); - boolean companyFiltered = getFilter().getCompany() != null && user.getAdmin(); +// String boatName = getFilter().getBoatName(); +// boolean companyFiltered = getFilter().getCompany() != null && user.getAdmin(); // Show filters only if no boatName is set - if ((getContactFilter().isFiltered() || companyFiltered) && StringUtils.isEmpty(boatName)) { - filtersVisible = true; - } +// if ((getContactFilter().isFiltered() || companyFiltered) && StringUtils.isEmpty(boatName)) { +// filtersVisible = true; +// } contactsForm.clearErrors(); } @@ -143,10 +145,10 @@ @InjectComponent private Zone importExportZone; - @Property +// @Property // @Persist(PersistenceConstants.FLASH) -// @Persist - private boolean filtersVisible; +//// @Persist +// private boolean filtersVisible; private boolean reset; @@ -155,6 +157,9 @@ public ContactFilter getContactFilter() throws SuiviObsmerException { if (contactFilter == null) { + if (log.isDebugEnabled()) { + log.debug("Init contactFilter"); + } contactFilter = new ContactFilterImpl(); // Initialized to 12 months before the current day Date fromDate = DateUtils.createDateAfterToday(0, -3, 0); @@ -163,6 +168,11 @@ return contactFilter; } + public boolean getFiltersVisible() { + boolean companyFiltered = contactFilter.getCompany() != null && user.getAdmin(); + return (contactFilter.isFiltered() || companyFiltered) && StringUtils.isEmpty(contactFilter.getBoatName()); /*&& !getDefaultFromDate().equals(contactFilter.getFromDate());*/ + } + @Override protected BoatFilter getFilter() throws SuiviObsmerException { return getContactFilter(); @@ -174,7 +184,7 @@ } Object onActionFromShowFilters() { - contactFilter = null; + //contactFilter = null; return filtersZone.getBody(); } @@ -194,6 +204,9 @@ if (reset) { contactFilter = null; } +// else { +// filtersVisible = true; +// } return this; } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2010-01-27 17:27:43 UTC (rev 290) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2010-01-28 17:22:32 UTC (rev 291) @@ -73,8 +73,8 @@ Contact.TIDE_END_DATE, Contact.NB_OBSERVANTS, "mammals", + Contact.COMMENT, Contact.DATA_INPUT_DATE, - Contact.COMMENT, "validation", "actions"); Modified: trunk/suiviobsmer-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Boats.tml 2010-01-27 17:27:43 UTC (rev 290) +++ trunk/suiviobsmer-ui/src/main/webapp/Boats.tml 2010-01-28 17:22:32 UTC (rev 291) @@ -92,8 +92,8 @@ <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" /> </div> <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" /> - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" /> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les navires correspondants aux filtres saisies" /> + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> </div> </div> </form> Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-27 17:27:43 UTC (rev 290) +++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-28 17:22:32 UTC (rev 291) @@ -8,7 +8,7 @@ <div> <t:label t:for="boatName" /><br /> <input t:type="textfield" class="width200" t:id="boatName" value="contactFilter.boatName" t:mixins="Autocomplete"/> - <input t:type="submit" class="ico search-32px" t:id="execSearchBoat" value="Search" /> + <input t:type="submit" class="ico search-32px" t:id="execSearchBoat" value="Search" title="Rechercher les contacts liés à ce navire" /> </div> </form> <a t:type="actionlink" t:id="showFilters" t:zone="so-contacts-filters"> @@ -101,8 +101,8 @@ </t:if> </div> <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" /> - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" /> + <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" /> </div> </div> </form> Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-27 17:27:43 UTC (rev 290) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-28 17:22:32 UTC (rev 291) @@ -79,8 +79,8 @@ <input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />--> </div> <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" /> - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" /> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Création du graphique en fonction des filtres saisies"/> + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> </div> </div> </form>