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

[Suiviobsmer-commits] r213 - trunk/suiviobsmer-ui/src/main/webapp/img
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 15:37:09 +0000 (Sun, 17 Jan 2010) New Revision: 213 Added: trunk/suiviobsmer-ui/src/main/webapp/img/comment-22px.png Log: Try show a popup for comment... Not done yet... Added: trunk/suiviobsmer-ui/src/main/webapp/img/comment-22px.png =================================================================== (Binary files differ) Property changes on: trunk/suiviobsmer-ui/src/main/webapp/img/comment-22px.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[Suiviobsmer-commits] r212 - in trunk/suiviobsmer-ui/src/main: java/fr/ifremer/suiviobsmer/ui/mixins java/fr/ifremer/suiviobsmer/ui/pages webapp webapp/css webapp/js
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 15:36:58 +0000 (Sun, 17 Jan 2010) New Revision: 212 Added: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js Log: Try show a popup for comment... Not done yet... Added: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java (rev 0) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java 2010-01-17 15:36:58 UTC (rev 212) @@ -0,0 +1,89 @@ + +package fr.ifremer.suiviobsmer.ui.mixins; + +/** + * PopupPageLink + * + * Created: 17 janv. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +import org.apache.tapestry5.BindingConstants; + +import org.apache.tapestry5.ClientElement; + +import org.apache.tapestry5.ComponentResources; + +import org.apache.tapestry5.Link; + +import org.apache.tapestry5.RenderSupport; + +import org.apache.tapestry5.annotations.Environmental; + +import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; + +import org.apache.tapestry5.annotations.InjectContainer; + +import org.apache.tapestry5.annotations.Parameter; + +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.PageRenderLinkSource; + + at IncludeJavaScriptLibrary("context:js/dialog.js") + +public class PopupPageLink { + + @Inject + + private ComponentResources resources; + + @Environmental + + private RenderSupport renderSupport; + + @InjectContainer + + private ClientElement container; + + @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL) + + private String page; + + + + @Parameter(defaultPrefix = BindingConstants.LITERAL, value="800") + + private String width; + + + + @Parameter(defaultPrefix = BindingConstants.LITERAL, value="600") + + private String height; + + @Parameter + + private Object[] context; + + @Inject + private PageRenderLinkSource pageRender; + + void afterRender() { + Link link = null; + if (context != null) { + link = pageRender.createPageRenderLinkWithContext(page, context); + } else { + link = pageRender.createPageRenderLink(page); + } +// Link link = null; +// pageRender.createPageLink(page, true, context); + + renderSupport.addScript("new PopupPageLink('%s', '%s', %s, %s);", container.getClientId(), link, width, height); + + } + +} \ No newline at end of file Property changes on: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/PopupPageLink.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" 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-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-17 15:36:58 UTC (rev 212) @@ -449,6 +449,15 @@ contactEdited = true; } +// @Log +// void onSelectedFromSaveComment(String contactId) throws SuiviObsmerException { +// contact = getContacts().get(contactId); +// if (log.isInfoEnabled()) { +// log.info("Comment : " + contact.getComment()); +// } +// contactEdited = true; +// } + /**************************** CONTACT SAVE ********************************/ @Persist("flash") Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-17 15:36:58 UTC (rev 212) @@ -199,7 +199,27 @@ </p:dataInputDateCell> <p:commentCell> <t:if t:test="editionMode"> - <input t:type="textarea" t:id="comment" cols="1" rows="2" value="contact.comment" /> +  + + <input t:type="textarea" t:id="comment" cols="10" rows="1" value="contact.comment" /> + + <p:else> ${contact.comment} </p:else> @@ -248,8 +268,12 @@ </form> </t:zone> <script type="text/javascript"> - Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); - Event.observe('company', 'change', function() { $('filtersForm').submit(); } ); -</script> + Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); +</script> +<t:if t:test="user.admin"> + <script type="text/javascript"> + Event.observe('company', 'change', function() { $('filtersForm').submit(); } ); + </script> + </t:if> </t:layout> Modified: trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2010-01-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2010-01-17 15:36:58 UTC (rev 212) @@ -103,7 +103,7 @@ div#so-contacts table.t-data-grid thead tr th.dataInputDate, div#so-contacts table.t-data-grid thead tr th.tideEndDate, div#so-contacts table.t-data-grid thead tr th.tideBeginDate { - /*width: 120px;*/ + width: 90px; white-space: normal; text-align: center; } @@ -119,10 +119,12 @@ width: 100px; } + div#so-contacts table.t-data-grid thead tr th.actions { width: 90px; } + div#so-contacts table.t-data-grid tbody tr td { white-space: nowrap; } Modified: trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js 2010-01-17 13:58:46 UTC (rev 211) +++ trunk/suiviobsmer-ui/src/main/webapp/js/dialog.js 2010-01-17 15:36:58 UTC (rev 212) @@ -18,3 +18,51 @@ } } }); + +//var BlockPopup = Class.create({ +// initialize: function(linkElement, title, width, height, blockElement) { +// this.window = new Window({ +// className: 'alphacube', +// title: title, +// hideEffect:Element.hide, +// showEffect:Element.show, +// width: width, +// height: height +// }); +// +// this.block = $(blockElement).innerHTML; +// $(linkElement).observe('click',this.openWindow.bindAsEventListener(this)); +// }, +// openWindow: function(e) { +// this.window.getContent().update(this.block); +// this.window.showCenter(true); +// } +//}); +// +//var PopupPageLink = Class.create({ +// +// initialize: function(id, link, width, height) { +// +// this.element = $(id); +// +// this.link = link; +// +// this.width = width; +// +// this.height = height; +// +// Event.observe(this.element, 'click', this.onclick.bindAsEventListener(this)); +// +// }, +// +// onclick: function() { +// +// var name = 'dialogWindow'; +// +// var win = window.open(this.link,name,'width=' + this.width + ',height=' + this.height + ',resizable=yes,scrollbars=yes,menubar=no,screenX=0,screenY=0,left=0,top=0' ); +// +// win.focus(); +// +// } +// +//});

1 0

[Suiviobsmer-commits] r211 - in trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui: base pages
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 13:58:46 +0000 (Sun, 17 Jan 2010) New Revision: 211 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java Log: Resolve issue on observer list in Contact + suppress abstract methods getFilterZone Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-17 13:45:39 UTC (rev 210) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-17 13:58:46 UTC (rev 211) @@ -12,7 +12,6 @@ import fr.ifremer.suiviobsmer.services.ServiceUser; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Log; @@ -39,15 +38,17 @@ * <pre> * - BoatName uses an Autocomplete mixins : * <t:textfield t:id="boatName" t:value="filter.boatName" t:mixins="Autocomplete"/> - * - FacadeName uses the zoneUpdater mixins : - * <input t:type="select" t:id="facadeName" t:model="facadeSelectModel" t:value="filter.facadeName" t:mixins="zoneUpdater" t:event="change" t:zone="..." .../> - * The zone_id is the one of the zone returned by {@link #getFilterZone() } * - SampleRow select value is sampleRowId : * <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> * - Company select value is companyId : * <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> - * - Observer select value is observerId and have a zoneUpdater mixins : - * <input t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" t:mixins="zoneUpdater" t:event="change" t:zone="..." .../> + * - Observer select value is observerId : + * <input t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /> + * - Select change, use JavaScript : + * <script type="text/javascript"> + * Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); + * Event.observe('company', 'change', function() { $('filtersForm').submit(); } ); + * </script> * </pre> * * @author fdesbois @@ -91,11 +92,13 @@ @Persist private SelectModel sectorSelectModel; + @Persist private GenericSelectModel<Company> companySelectModel; @Property private String companyId; + @Persist private GenericSelectModel<User> observerSelectModel; @Property @@ -127,6 +130,9 @@ getFilter().setCompany(user.getCompany()); } + observerSelectModel = null; + getObserverSelectModel(); + if (getFilter().getObserver() != null) { observerId = getFilter().getObserver().getTopiaId(); } @@ -188,16 +194,13 @@ if (observerSelectModel == null) { List<User> observers = new ArrayList<User>(); if (getFilter().getCompany() != null) { - if (log.isDebugEnabled()) { - log.debug("Company filter users : " + getFilter().getCompany()); - } observers = getFilter().getCompany().getUser(); } else if (user.getAdmin()) { - if (log.isDebugEnabled()) { - log.debug("BUSINESS REQUEST [getObservers]"); + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [getObservers]"); } observers = serviceUser.getObservers(getAvailableDataForFiltersOnly()); - } + } observerSelectModel = new GenericSelectModel<User>(observers,User.class, "fullName","topiaId",propertyAccess); } @@ -208,10 +211,10 @@ protected abstract void resetFilter(); - protected abstract Zone getSampleRowFilterZone(); +// protected abstract Zone getSampleRowFilterZone(); +// +// protected abstract Zone getObserverFilterZone(); - protected abstract Zone getObserverFilterZone(); - protected abstract boolean getAvailableDataForFiltersOnly(); public String[] onProvideCompletionsFromBoatName(String input) throws SuiviObsmerException { 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-17 13:45:39 UTC (rev 210) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-17 13:58:46 UTC (rev 211) @@ -161,17 +161,17 @@ contactFilter = null; } - @Override - protected Zone getSampleRowFilterZone() { - return filtersZone; - } +// @Override +// protected Zone getSampleRowFilterZone() { +// return filtersZone; +// } +// +// @Override +// protected Zone getObserverFilterZone() { +// return filtersZone; +// } @Override - protected Zone getObserverFilterZone() { - return filtersZone; - } - - @Override protected boolean getAvailableDataForFiltersOnly() { return true; } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-17 13:45:39 UTC (rev 210) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-17 13:58:46 UTC (rev 211) @@ -116,17 +116,17 @@ dataSamplingFilter = null; } - @Override - protected Zone getSampleRowFilterZone() { - return sampleRowZone; - } +// @Override +// protected Zone getSampleRowFilterZone() { +// return sampleRowZone; +// } +// +// @Override +// protected Zone getObserverFilterZone() { +// return observerZone; +// } @Override - protected Zone getObserverFilterZone() { - return observerZone; - } - - @Override protected boolean getAvailableDataForFiltersOnly() { return false; }

1 0

[Suiviobsmer-commits] r210 - trunk/src/site/rst
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 13:45:39 +0000 (Sun, 17 Jan 2010) New Revision: 210 Modified: trunk/src/site/rst/business-rules.rst Log: Add constraint for company when SampleRow has real tide time Modified: trunk/src/site/rst/business-rules.rst =================================================================== --- trunk/src/site/rst/business-rules.rst 2010-01-17 13:42:06 UTC (rev 209) +++ trunk/src/site/rst/business-rules.rst 2010-01-17 13:45:39 UTC (rev 210) @@ -24,7 +24,7 @@ - Modification (si des embarquements réels ont été effectuées sur la ligne) : - * Modification impossible pour les champs : profession, zones de pêche, programme + * Modification impossible pour les champs : profession, zones de pêche, programme, société * Impossible d'avoir des données d'une marée inférieurs aux données réels * Impossible de supprimer un mois avec des données réels * (obligatoire) Commentaire de modification

1 0

[Suiviobsmer-commits] r209 - in trunk/suiviobsmer-ui/src/main: java/fr/ifremer/suiviobsmer/ui/pages webapp
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 13:42:06 +0000 (Sun, 17 Jan 2010) New Revision: 209 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml Log: - No company change possible for SampleRow with real tide time Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-17 13:26:09 UTC (rev 208) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-17 13:42:06 UTC (rev 209) @@ -624,9 +624,12 @@ programId = null; } - // Save company - Company company = getCompanySelectModel().findObject(companyId); - getSampleRow().setCompany(company); + // No company change possible when sampleRow has real tide time + if (!getSampleRow().hasSampleMonthRealTideTime()) { + // Save company + Company company = getCompanySelectModel().findObject(companyId); + getSampleRow().setCompany(company); + } // Save sampleMonths Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java 2010-01-17 13:26:09 UTC (rev 208) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java 2010-01-17 13:42:06 UTC (rev 209) @@ -76,7 +76,13 @@ } public String getContent() { - return sampleRowLog.getLogText().replaceAll("\\n", "<br />"); + String content = sampleRowLog.getLogText(); + if (content == null) { + content = "Aucun changement enregistré."; + } else { + content = content.replaceAll("\\n", "<br />"); + } + return content; } } Modified: trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml 2010-01-17 13:26:09 UTC (rev 208) +++ trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml 2010-01-17 13:42:06 UTC (rev 209) @@ -146,7 +146,12 @@ </p:code> <p:company> <t:label t:for="company" /> - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> + ${sampleRow.company.name} + <p:else> + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> + </p:else> + </t:if> </p:company> <p:boats> <t:label t:for="boats" />

1 0

[Suiviobsmer-commits] r208 - in trunk: . suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/xmi suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/webapp suiviobsmer-ui/src/main/webapp/css
by fdesbois＠users.labs.libre-entreprise.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 13:26:09 +0000 (Sun, 17 Jan 2010) New Revision: 208 Modified: trunk/pom.xml trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Contacts.properties trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css Log: - Simplify Synthesis for DataSampling (maybe only usage of SamplingFilter needed) - Use form.submit js for onChange on some select (facade, company) - Add observer in AbstractFilteredPage - Use last mavenpom and nuiton-utils release version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/pom.xml 2010-01-17 13:26:09 UTC (rev 208) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer</groupId> @@ -213,7 +213,7 @@ <labs.id>154</labs.id>  - <nuitonutils.version>1.1.3-SNAPSHOT</nuitonutils.version> + <nuitonutils.version>1.1.3</nuitonutils.version> <topia.version>2.3.0-beta-4-SNAPSHOT</topia.version> <eugene.version>2.0.0-beta-3-SNAPSHOT</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> 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-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-17 13:26:09 UTC (rev 208) @@ -78,25 +78,21 @@ query = filter.prepareQueryForSampling(query, "M"); - // FIXME company from sampleRow and not from contact, but user from contact - // Refactor MODEL : suppress link between user and contact + add field observer in contact - // In filter : sampleRow.company filtered and contact.observer +// if (filter.isBoatFiltered() || filter.getObserver() != null) { +// // Check boat on finished contact (validate + Boarding_Done) and same month/year as SampleMonth +// query.addFrom(Contact.class.getName() + " C").add("C IN elements(M.sampleRow.contact)"). +// add("C.state", ContactState.BOARDING_DONE.toString()). +// add("C.validationCompany", Boolean.TRUE). +// add("C.validationProgram IS NULL OR C.validationProgram = :booleanTrue"). +// addParam("booleanTrue", Boolean.TRUE). +// add("month(C.tideBeginDate) = month(M.periodDate)"). +// add("year(C.tideBeginDate) = year(M.periodDate)"); +// query = filter.prepareQueryForBoat(query, "C"); +// if (filter.getObserver() != null) { +// query.add("C." + Contact.USER, filter.getObserver()); +// } +// } - if (filter.isBoatFiltered() || filter.getObserver() != null) { - // Check boat on finished contact (validate + Boarding_Done) and same month/year as SampleMonth - query.addFrom(Contact.class.getName() + " C").add("C IN elements(M.sampleRow.contact)"). - add("C.state", ContactState.BOARDING_DONE.toString()). - add("C.validationCompany", Boolean.TRUE). - add("C.validationProgram IS NULL OR C.validationProgram = :booleanTrue"). - addParam("booleanTrue", Boolean.TRUE). - add("month(C.tideBeginDate) = month(M.periodDate)"). - add("year(C.tideBeginDate) = year(M.periodDate)"); - query = filter.prepareQueryForBoat(query, "C"); - if (filter.getObserver() != null) { - query.add("C." + Contact.USER, filter.getObserver()); - } - } - if (filter.getCompany() != null) { query.add("M." + SampleMonth.SAMPLE_ROW + "." + SampleRow.COMPANY, filter.getCompany()); } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-01-17 13:26:09 UTC (rev 208) @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.TopiaQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -230,11 +231,34 @@ transaction.closeContext(); } catch (Exception eee) { - SuiviObsmerContext.serviceException(transaction, "Impossible de créer ou de mettre à jour l'utilisateur", eee); + SuiviObsmerContext.serviceException(transaction, "Impossible de récupérer la liste des sociétés", eee); } return results; } + @Override + public List<User> getObservers(boolean activeOnly) throws SuiviObsmerException { + TopiaContext transaction = null; + List<User> results = new ArrayList<User>(); + try { + transaction = rootContext.beginTransaction(); + UserDAO dao = SuiviObsmerModelDAOHelper.getUserDAO(transaction); + TopiaQuery<User> query = dao.createQuery().add(User.ADMIN, Boolean.FALSE); + if (activeOnly) { + query.add(User.ACTIVE, Boolean.TRUE); + } + + results = query.executeToEntityList(); + + transaction.closeContext(); + } catch (Exception eee) { + SuiviObsmerContext.serviceException(transaction, "Impossible de récupérer la liste des observateurs", eee); + } + return results; + } + + + } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-17 13:26:09 UTC (rev 208) @@ -3,11 +3,13 @@ import fr.ifremer.suiviobsmer.SuiviObsmerException; import fr.ifremer.suiviobsmer.bean.BoatFilter; +import fr.ifremer.suiviobsmer.entity.Company; import fr.ifremer.suiviobsmer.entity.SampleRow; import fr.ifremer.suiviobsmer.entity.User; import fr.ifremer.suiviobsmer.services.ServiceBoat; import fr.ifremer.suiviobsmer.services.ServiceReferential; import fr.ifremer.suiviobsmer.services.ServiceSampling; +import fr.ifremer.suiviobsmer.services.ServiceUser; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; @@ -42,6 +44,10 @@ * The zone_id is the one of the zone returned by {@link #getFilterZone() } * - SampleRow select value is sampleRowId : * <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> + * - Company select value is companyId : + * <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> + * - Observer select value is observerId and have a zoneUpdater mixins : + * <input t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" t:mixins="zoneUpdater" t:event="change" t:zone="..." .../> * </pre> * * @author fdesbois @@ -70,6 +76,9 @@ @Inject private ServiceBoat serviceBoat; + @Inject + private ServiceUser serviceUser; + @Persist private GenericSelectModel<SampleRow> sampleRowSelectModel; @@ -82,11 +91,18 @@ @Persist private SelectModel sectorSelectModel; -// public enum FIELD { -// FACADE, SECTOR, SAMPLE_ROW, PROGRAM; -// } + private GenericSelectModel<Company> companySelectModel; + @Property + private String companyId; + + private GenericSelectModel<User> observerSelectModel; + + @Property + private String observerId; + protected void initFilter() throws SuiviObsmerException { + facadeSelectModel = null; getFacadeSelectModel(); sectorSelectModel = null; @@ -97,6 +113,23 @@ if (getFilter().getSampleRow() != null) { sampleRowId = getFilter().getSampleRow().getTopiaId(); } + + if (user.getAdmin()) { + companySelectModel = null; + getCompanySelectModel(); + if (getFilter().getCompany() != null) { + companyId = getFilter().getCompany().getTopiaId(); + } + } else { + if (log.isDebugEnabled()) { + log.debug("Company filtered : " + user.getCompany()); + } + getFilter().setCompany(user.getCompany()); + } + + if (getFilter().getObserver() != null) { + observerId = getFilter().getObserver().getTopiaId(); + } } public SelectModel getFacadeSelectModel() throws SuiviObsmerException { @@ -132,47 +165,102 @@ if (log.isInfoEnabled()) { log.info("BUSINESS REQUEST [getSampleRowsForUser]"); } - List<SampleRow> sampleRows = serviceSampling.getSampleRowsForUser(user, getFinishedSampleRowsOnly()); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsForUser(user, getAvailableDataForFiltersOnly()); sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, "code", "topiaId", propertyAccess); } return sampleRowSelectModel; } - public String[] onProvideCompletionsFromBoatName(String input) throws SuiviObsmerException { - if (log.isInfoEnabled()) { - log.info("BUSINESS REQUEST [getBoatNamesStartWith]"); + public GenericSelectModel<Company> getCompanySelectModel() throws SuiviObsmerException { + if (companySelectModel == null) { + if (log.isDebugEnabled()) { + log.debug("BUSINESS REQUEST [getCompanies]"); + } + List<Company> companies = serviceUser.getCompanies(getAvailableDataForFiltersOnly()); + companySelectModel = new GenericSelectModel<Company>(companies,Company.class, + "name","topiaId",propertyAccess); } - List<String> results = serviceBoat.getBoatNamesStartWith(input); - return results.toArray(new String[0]); + return companySelectModel; } + public GenericSelectModel<User> getObserverSelectModel() throws SuiviObsmerException { + if (observerSelectModel == null) { + List<User> observers = new ArrayList<User>(); + if (getFilter().getCompany() != null) { + if (log.isDebugEnabled()) { + log.debug("Company filter users : " + getFilter().getCompany()); + } + observers = getFilter().getCompany().getUser(); + } else if (user.getAdmin()) { + if (log.isDebugEnabled()) { + log.debug("BUSINESS REQUEST [getObservers]"); + } + observers = serviceUser.getObservers(getAvailableDataForFiltersOnly()); + } + observerSelectModel = new GenericSelectModel<User>(observers,User.class, + "fullName","topiaId",propertyAccess); + } + return observerSelectModel; + } + protected abstract BoatFilter getFilter() throws SuiviObsmerException; protected abstract void resetFilter(); - protected abstract Zone getFilterZone(); + protected abstract Zone getSampleRowFilterZone(); - protected abstract boolean getFinishedSampleRowsOnly(); + protected abstract Zone getObserverFilterZone(); - @Log - public Object onChangeFromFacadeName(String value) throws SuiviObsmerException { - if (!StringUtils.isEmpty(value.trim())) { - // Reset filter to avoid strange behavior (cause of no form submit) - resetFilter();// = null; - // set facadeName selected in filter - getFilter().setFacadeName(value); - // Reset sectors to use facadeName selected - sectorSelectModel = null; - return getFilterZone().getBody(); + protected abstract boolean getAvailableDataForFiltersOnly(); + + public String[] onProvideCompletionsFromBoatName(String input) throws SuiviObsmerException { + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [getBoatNamesStartWith]"); } - return null; + List<String> results = serviceBoat.getBoatNamesStartWith(input); + return results.toArray(new String[0]); } +// @Log +// public Object onChangeFromFacadeName(String value) throws SuiviObsmerException { +// if (!StringUtils.isEmpty(value.trim())) { +// // Reset filter to avoid strange behavior (cause of no form submit) +// resetFilter();// = null; +// // set facadeName selected in filter +// getFilter().setFacadeName(value); +// // Reset sectors to use facadeName selected +// sectorSelectModel = null; +// return getSampleRowFilterZone().getBody(); +// } +// return null; +// } +// +// @Log +// public Object onChangeFromCompany(String value) throws SuiviObsmerException { +// if (!StringUtils.isEmpty(value.trim())) { +// // Reset filter to avoid strange behavior (cause of no form submit) +// resetFilter(); +// // set company selected in filter +// getFilter().setCompany(getCompanySelectModel().findObject(companyId)); +// // Reset observers to use company selected +// observerSelectModel = null; +// return getObserverFilterZone().getBody(); +// } +// return null; +// } + @Log public void onSuccess() throws SuiviObsmerException { SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); getFilter().setSampleRow(row); + if (user.getAdmin()) { + Company company = getCompanySelectModel().findObject(companyId); + getFilter().setCompany(company); + } + + User observer = getObserverSelectModel().findObject(observerId); + getFilter().setObserver(observer); } } 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-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-17 13:26:09 UTC (rev 208) @@ -144,9 +144,9 @@ public ContactFilter getContactFilter() throws SuiviObsmerException { if (contactFilter == null) { contactFilter = new ContactFilterImpl(); - if (!user.getAdmin()) { - contactFilter.setCompany(user.getCompany()); - } +// if (!user.getAdmin()) { +// contactFilter.setCompany(user.getCompany()); +// } } return contactFilter; } @@ -162,12 +162,17 @@ } @Override - protected Zone getFilterZone() { + protected Zone getSampleRowFilterZone() { return filtersZone; } @Override - protected boolean getFinishedSampleRowsOnly() { + protected Zone getObserverFilterZone() { + return filtersZone; + } + + @Override + protected boolean getAvailableDataForFiltersOnly() { return true; } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-17 13:26:09 UTC (rev 208) @@ -85,8 +85,11 @@ private BoatFilter dataSamplingFilter; @InjectComponent - private Zone dataSamplingFiltersZone; + private Zone sampleRowZone; + @InjectComponent + private Zone observerZone; + @Persist private ChartType dataSamplingChartType; @@ -114,12 +117,17 @@ } @Override - protected Zone getFilterZone() { - return dataSamplingFiltersZone; + protected Zone getSampleRowFilterZone() { + return sampleRowZone; } @Override - protected boolean getFinishedSampleRowsOnly() { + protected Zone getObserverFilterZone() { + return observerZone; + } + + @Override + protected boolean getAvailableDataForFiltersOnly() { return false; } Modified: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Contacts.properties =================================================================== --- trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Contacts.properties 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Contacts.properties 2010-01-17 13:26:09 UTC (rev 208) @@ -1,6 +1,7 @@ # ContactForm labels facadeName-label: Facade sectorName-label: Secteur +observer-label: Observateur contactsCsvFile-label: Fichier des contacts # Grid labels Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-17 13:26:09 UTC (rev 208) @@ -33,8 +33,7 @@ <t:label t:for="boatDistrictCode" />: <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="contactFilter.boatDistrictCode" />  <t:label t:for="facadeName" />: - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="contactFilter.facadeName" - t:mixins="zoneUpdater" t:event="change" t:zone="so-contacts-filters"/>  + <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="contactFilter.facadeName" />  <t:label t:for="sectorName" />: <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="contactFilter.sectorName" />  <t:label t:for="sampleRow" />: @@ -50,6 +49,12 @@ </t:label> </div><p> </p> <div> + <t:if t:test="user.admin"> + <t:label t:for="company" />: + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  + </t:if> + <t:label t:for="observer" />: + <input t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" />  <label>Validation société: </label> <input t:type="checkbox" t:id="companyAccepted" value="contactFilter.companyAccepted" /> <t:label t:for="companyAccepted"> @@ -242,5 +247,9 @@ </div> </form> </t:zone> +<script type="text/javascript"> + Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); + Event.observe('company', 'change', function() { $('filtersForm').submit(); } ); +</script> </t:layout> Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-17 13:26:09 UTC (rev 208) @@ -47,7 +47,7 @@ <fieldset> <legend>Filtres</legend> <div class="so-filters-form"> - <div t:type="zone" t:id="dataSamplingFiltersZone" t:update="show" id="so-datasampling-filters"> +  <form t:type="form" t:id="filtersForm"> <t:errors /> <div class="t-beaneditor"> @@ -58,10 +58,10 @@ <t:label t:for="periodEnd" />: <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" /> </div> - <div class="filterRow"> + <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> <t:label t:for="facadeName" />: <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" - t:mixins="zoneUpdater" t:event="change" t:zone="so-datasampling-filters"/>  + />  <t:label t:for="sectorName" />: <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  <t:label t:for="sampleRow" />: @@ -69,7 +69,7 @@  </div> - <div class="filterRow"> + + <t:if t:test="user.admin"> + <div t:type="zone" t:id="observerZone" t:update="show"> +  + <t:label t:for="company" />: - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> - </t:if>--> + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/> + </div> + </t:if> <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" /> </div> </div> </form> - </div> +  </div> </fieldset> <p class="so-chart-types"> @@ -110,4 +109,7 @@ </p> <t:chart t:width="550" t:height="350" t:chart="dataSamplingChart" /> </div> +<script type="text/javascript"> + Event.observe('facadeName', 'change', function() { $('filtersForm').submit(); } ); +</script> </t:layout> Modified: trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css 2010-01-15 15:14:48 UTC (rev 207) +++ trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css 2010-01-17 13:26:09 UTC (rev 208) @@ -68,7 +68,7 @@ padding-left: 20px; } -div#so-datasampling-filters div.filterRow { +div#so-datasampling div.so-filters-form div.filterRow { margin-bottom: 5px; margin-top: 5px; }

1 0

[Suiviobsmer-commits] r207 - in trunk: suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/xmi suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/webapp suiviobsmer-ui/src/main/webapp/css suiviobsmer-ui/src/main/webapp/img
by fdesbois＠users.labs.libre-entreprise.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 15:14:48 +0000 (Fri, 15 Jan 2010) New Revision: 207 Added: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties trunk/suiviobsmer-ui/src/main/webapp/img/chart-area.png trunk/suiviobsmer-ui/src/main/webapp/img/chart-bar.png trunk/suiviobsmer-ui/src/main/webapp/img/chart-line.png Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css Log: - Add boolean to filter by finished row only or not in getSampleRowsByUser - Improve Synthesis dataSampling style Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-15 15:14:48 UTC (rev 207) @@ -333,7 +333,7 @@ } @Override - public List<SampleRow> getSampleRowsForUser(User user) throws SuiviObsmerException { + public List<SampleRow> getSampleRowsForUser(User user, boolean finished) throws SuiviObsmerException { TopiaContext transaction = null; List<SampleRow> results = new ArrayList<SampleRow>(); try { @@ -341,12 +341,16 @@ // TODO-FD20090106 add filters for facadeName and sectorName (in argument) for Boats and Contacts use - Date current = SuiviObsmerContext.getCurrentDate(); - SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); - // Only rows which are not finished will be kept - TopiaQuery<SampleRow> query = dao.createQuery().add(SampleRow.PERIOD_END, Op.GE, current); + + TopiaQuery<SampleRow> query = dao.createQuery(); + if (finished) { + // Only rows which are not finished will be kept + Date current = SuiviObsmerContext.getCurrentDate(); + query.add(SampleRow.PERIOD_END, Op.GE, current); + } + if (!user.getAdmin()) { query.add(SampleRow.COMPANY, user.getCompany()); } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-01-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-01-15 15:14:48 UTC (rev 207) @@ -336,13 +336,13 @@ /** EXEC METHOD **/ User admin = new UserImpl(); admin.setAdmin(true); - List<SampleRow> results = service.getSampleRowsForUser(admin); + List<SampleRow> results = service.getSampleRowsForUser(admin, true); // total in file : 11, 1 refused, 1 finished assertEquals(9, results.size()); User user = new UserImpl(); user.setCompany(company); - results = service.getSampleRowsForUser(user); + results = service.getSampleRowsForUser(user, true); assertEquals(1, results.size()); } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-15 15:14:48 UTC (rev 207) @@ -82,6 +82,9 @@ @Persist private SelectModel sectorSelectModel; +// public enum FIELD { +// FACADE, SECTOR, SAMPLE_ROW, PROGRAM; +// } protected void initFilter() throws SuiviObsmerException { facadeSelectModel = null; @@ -129,7 +132,7 @@ if (log.isInfoEnabled()) { log.info("BUSINESS REQUEST [getSampleRowsForUser]"); } - List<SampleRow> sampleRows = serviceSampling.getSampleRowsForUser(user); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsForUser(user, getFinishedSampleRowsOnly()); sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, "code", "topiaId", propertyAccess); } @@ -150,6 +153,8 @@ protected abstract Zone getFilterZone(); + protected abstract boolean getFinishedSampleRowsOnly(); + @Log public Object onChangeFromFacadeName(String value) throws SuiviObsmerException { if (!StringUtils.isEmpty(value.trim())) { Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2010-01-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2010-01-15 15:14:48 UTC (rev 207) @@ -323,7 +323,7 @@ options.add(new OptionModelImpl(code,code)); } sampleRowSelectModel = new SelectModelImpl(null, options);*/ - List<SampleRow> sampleRows = serviceSampling.getSampleRowsForUser(user); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsForUser(user, true); sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, "code", "code", propertyAccess); } 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-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-15 15:14:48 UTC (rev 207) @@ -166,6 +166,11 @@ return filtersZone; } + @Override + protected boolean getFinishedSampleRowsOnly() { + return true; + } + void onSuccessFromSearchBoat() { } Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-15 15:14:48 UTC (rev 207) @@ -118,6 +118,11 @@ return dataSamplingFiltersZone; } + @Override + protected boolean getFinishedSampleRowsOnly() { + return false; + } + public JFreeChart getDataSamplingChart() throws SuiviObsmerException { if (log.isInfoEnabled()) { log.info("BUSINESS REQUEST [getDataSampling]"); Added: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties =================================================================== --- trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties (rev 0) +++ trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties 2010-01-15 15:14:48 UTC (rev 207) @@ -0,0 +1,8 @@ +periodBegin-label: D\u00E9but +periodEnd-label: Fin +boatName-label: Nom +boatImmatriculation-label: N\u00B0 +boatDistrictCode-label: Quartier +facadeName-label: Fa\u00E7ade +sectorName-label: Zone +sampleRow-label: Code ligne \ No newline at end of file Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 15:14:48 UTC (rev 207) @@ -43,21 +43,22 @@ sed rutrum libero. </p> </div>--> - <div class="acenter"> + <div class="acenter" id="so-datasampling"> <fieldset> - <legend>Recherche avancée</legend> + <legend>Filtres</legend> <div class="so-filters-form"> <div t:type="zone" t:id="dataSamplingFiltersZone" t:update="show" id="so-datasampling-filters"> <form t:type="form" t:id="filtersForm"> <t:errors /> <div class="t-beaneditor"> - <div> - <t:label t:for="boatName" />: - <input t:type="textfield" t:id="boatName" t:value="filter.boatName" t:mixins="Autocomplete" />  - <t:label t:for="boatImmatriculation" />: - <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="filter.boatImmatriculation" />  - <t:label t:for="boatDistrictCode" />: - <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" />  + <div class="filterRow"> + <label>Période: </label> + <t:label t:for="periodBegin" />: + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" />  + <t:label t:for="periodEnd" />: + <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" /> + </div> + <div class="filterRow"> <t:label t:for="facadeName" />: <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" t:mixins="zoneUpdater" t:event="change" t:zone="so-datasampling-filters"/>  @@ -65,6 +66,18 @@ <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  <t:label t:for="sampleRow" />: <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> +  + </div> + <div class="filterRow"> + <label>Navire: </label> + <t:label t:for="boatName" />: + <input t:type="textfield" t:id="boatName" t:value="filter.boatName" t:mixins="Autocomplete" />  + <t:label t:for="boatImmatriculation" />: + <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="filter.boatImmatriculation" />  + <t:label t:for="boatDistrictCode" />: + <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" /> + </div>  - </div><p> </p> + </t:if>--> <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" /> @@ -85,10 +97,16 @@ </div> </div> </fieldset> - <p> - <a t:type="actionlink" t:id="setDataSamplingChartBarType">BAR</a>  - <a t:type="actionlink" t:id="setDataSamplingChartAreaType">AREA</a>  - <a t:type="actionlink" t:id="setDataSamplingChartLineType">LINE</a>  + <p class="so-chart-types"> + <a t:type="actionlink" t:id="setDataSamplingChartBarType"> + <img src="${asset:context:}/img/chart-bar.png" alt="Diagramme en bâtons" title="Diagramme en bâtons" /> + </a>  + <a t:type="actionlink" t:id="setDataSamplingChartAreaType"> + <img src="${asset:context:}/img/chart-area.png" alt="Diagramme avec zones" title="Diagramme avec zones" /> + </a>  + <a t:type="actionlink" t:id="setDataSamplingChartLineType"> + <img src="${asset:context:}/img/chart-line.png" alt="Diagramme linéaire (courbe)" title="Diagramme linéaire (courbe)" /> + </a> </p> <t:chart t:width="550" t:height="350" t:chart="dataSamplingChart" /> </div> Modified: trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css 2010-01-15 14:11:47 UTC (rev 206) +++ trunk/suiviobsmer-ui/src/main/webapp/css/synthesis.css 2010-01-15 15:14:48 UTC (rev 207) @@ -13,7 +13,7 @@ margin-top: 20px; } -div#so-synthesis-indicators { +/*div#so-synthesis-indicators { width: 80%; margin-left: 17%; margin-right: auto; @@ -57,5 +57,28 @@ margin-top: 10px; text-align: justify; text-indent: 30px; +}*/ + +div#so-datasampling fieldset { + width: 60%; + margin-left: auto; + margin-right: auto; + text-align: left; + padding: 10px; + padding-left: 20px; } +div#so-datasampling-filters div.filterRow { + margin-bottom: 5px; + margin-top: 5px; +} + +div#so-datasampling p.so-chart-types { + margin-top: 5px; + margin-bottom: 5px; +} + +div#so-datasampling p.so-chart-types a img { + border: 1px solid #133852; +} + Added: trunk/suiviobsmer-ui/src/main/webapp/img/chart-area.png =================================================================== (Binary files differ) Property changes on: trunk/suiviobsmer-ui/src/main/webapp/img/chart-area.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/suiviobsmer-ui/src/main/webapp/img/chart-bar.png =================================================================== (Binary files differ) Property changes on: trunk/suiviobsmer-ui/src/main/webapp/img/chart-bar.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/suiviobsmer-ui/src/main/webapp/img/chart-line.png =================================================================== (Binary files differ) Property changes on: trunk/suiviobsmer-ui/src/main/webapp/img/chart-line.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[Suiviobsmer-commits] r206 - in trunk: suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/xmi suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data
by fdesbois＠users.labs.libre-entreprise.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 14:11:47 +0000 (Fri, 15 Jan 2010) New Revision: 206 Removed: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java Log: Refactor UserImplFilter, different use between ContactFiltered and Synthesis dataSampling usage Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-01-15 13:38:57 UTC (rev 205) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-01-15 14:11:47 UTC (rev 206) @@ -2,6 +2,7 @@ package fr.ifremer.suiviobsmer.bean; import fr.ifremer.suiviobsmer.entity.Contact; +import fr.ifremer.suiviobsmer.entity.User; import java.util.ArrayList; import java.util.List; import org.nuiton.topia.framework.TopiaQuery; @@ -21,12 +22,18 @@ @Override public TopiaQuery prepareQueryForContact(TopiaQuery query) { - query = prepareQueryForUser(query, query.getMainAlias()); + + String contact = query.getMainAlias(); + + if (getObserver() != null) { + query.add(contact + "." + Contact.USER, getObserver()); + } else if (getCompany() != null) { + query.add(contact + "." + Contact.USER + "." + User.COMPANY, getCompany()); + } + query = prepareQueryForSampling(query, query.getMainAlias()); query = prepareQueryForBoat(query, query.getMainAlias()); - String contact = query.getMainAlias(); - if (getMammalsObservation() && getMammalsCapture()) { query.add(contact + ".mammalsObservation = :mammals OR " + contact + ".mammalsCapture = :mammals"). addParam("mammals", Boolean.TRUE); Deleted: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java 2010-01-15 13:38:57 UTC (rev 205) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java 2010-01-15 14:11:47 UTC (rev 206) @@ -1,39 +0,0 @@ - -package fr.ifremer.suiviobsmer.bean; - -import fr.ifremer.suiviobsmer.entity.Contact; -import org.nuiton.topia.framework.TopiaQuery; - -/** - * UserFilterImpl - * - * Created: 14 janv. 2010 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class UserFilterImpl extends UserFilter { - - - @Override - public TopiaQuery prepareQueryForUser(TopiaQuery query, String main) { - - String user = main + ".user"; - - if (getObserver() != null) { - query.add(user, getObserver()); - } else if (getCompany() != null) { - query.add(user + ".company", getCompany()); - } - - return query; - } - - @Override - public boolean isUserFiltered() { - return getObserver() != null || 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-15 13:38:57 UTC (rev 205) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-15 14:11:47 UTC (rev 206) @@ -9,6 +9,7 @@ import fr.ifremer.suiviobsmer.entity.Contact; import fr.ifremer.suiviobsmer.entity.SampleMonth; import fr.ifremer.suiviobsmer.entity.SampleMonthDAO; +import fr.ifremer.suiviobsmer.entity.SampleRow; import fr.ifremer.suiviobsmer.services.ServiceSynthesis; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -81,7 +82,7 @@ // Refactor MODEL : suppress link between user and contact + add field observer in contact // In filter : sampleRow.company filtered and contact.observer - if (filter.isBoatFiltered() || filter.isUserFiltered()) { + if (filter.isBoatFiltered() || filter.getObserver() != null) { // Check boat on finished contact (validate + Boarding_Done) and same month/year as SampleMonth query.addFrom(Contact.class.getName() + " C").add("C IN elements(M.sampleRow.contact)"). add("C.state", ContactState.BOARDING_DONE.toString()). @@ -91,9 +92,15 @@ add("month(C.tideBeginDate) = month(M.periodDate)"). add("year(C.tideBeginDate) = year(M.periodDate)"); query = filter.prepareQueryForBoat(query, "C"); - query = filter.prepareQueryForUser(query, "C"); + if (filter.getObserver() != null) { + query.add("C." + Contact.USER, filter.getObserver()); + } } + if (filter.getCompany() != null) { + query.add("M." + SampleMonth.SAMPLE_ROW + "." + SampleRow.COMPANY, filter.getCompany()); + } + if (log.isTraceEnabled()) { log.trace("Exec query : " + query); } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-01-15 13:38:57 UTC (rev 205) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-01-15 14:11:47 UTC (rev 206) @@ -7,6 +7,7 @@ import java.util.Map; import java.util.SortedMap; import org.jfree.chart.JFreeChart; +import org.jfree.chart.axis.AxisSpace; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; @@ -19,6 +20,7 @@ import org.jfree.chart.renderer.category.BarRenderer; import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.data.category.DefaultCategoryDataset; +import org.jfree.ui.RectangleInsets; /** * ChartUtils @@ -80,7 +82,12 @@ renderer.setBaseItemLabelsVisible(Boolean.TRUE); CategoryPlot plot = new CategoryPlot(dataset, categoryAxis, valueAxis, renderer); +// AxisSpace space = new AxisSpace(); +// space.setLeft(0); +// space.setRight(0); +// plot.setFixedRangeAxisSpace(space); plot.setOrientation(PlotOrientation.VERTICAL); + plot.setAxisOffset(RectangleInsets.ZERO_INSETS); return new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT, plot, true); } }

1 0

[Suiviobsmer-commits] r205 - in trunk: suiviobsmer-business/src/main/filters suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components suiviobsmer-ui/src/main/webapp suiviobsmer-ui/src/main/webapp/css
by fdesbois＠users.labs.libre-entreprise.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 13:38:57 +0000 (Fri, 15 Jan 2010) New Revision: 205 Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml trunk/suiviobsmer-ui/src/main/webapp/css/main.css Log: - Use ${user.home} for default config - Add missing select class for Contact selected - Change saving image for chart (not saved on the hd) Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties =================================================================== --- trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-15 13:38:57 UTC (rev 205) @@ -6,9 +6,9 @@ hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:~/.local/suiviobsmer/h2data +hibernate.connection.url=jdbc:h2:file:~/.suiviobsmer/h2data -suiviobsmer.log.activityCalendar=log/activity.log +suiviobsmer.log.activityCalendar=${user.home}/.suiviobsmer/log/activity.log ## Config for sending Email suiviobsmer.email.host=smtp.free.fr Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-15 13:38:57 UTC (rev 205) @@ -16,11 +16,12 @@ package fr.ifremer.suiviobsmer.ui.components; -import java.io.File; -import java.io.FileInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; @@ -107,45 +108,8 @@ writer.end(); } - public StreamResponse onChart(final String title, - final int width, final int height) { -// DefaultKeyedValues values = new DefaultKeyedValues(); -// for (int i = 4; i < rest.length; i += 2) { -// values.addValue(rest[i].toString(), Double.valueOf(rest[i + 1] -// .toString())); -// } -// values.sortByValues(SortOrder.DESCENDING); -// PieDataset data = new DefaultPieDataset(values); -// -// // create the chart look according to the type -// PiePlot plot = null; -// switch (type) { -// case PIE: -// plot = new PiePlot(data); -// break; -// case PIE3D: -// plot = new PiePlot3D(data); -// break; -// case RING: -// plot = new RingPlot(data); -// break; -// default: -// plot = new PiePlot(data); -// break; -// } + public StreamResponse onChart(final String title, final int width, final int height) { - //plot.setForegroundAlpha(0.7f); -// plot.setCircular(true); -// plot.setLabelGenerator(new StandardPieSectionLabelGenerator("{0} {2}")); -// plot.setLegendLabelGenerator(new StandardPieSectionLabelGenerator( -// "{0} = {1}")); -// plot.setNoDataMessage("No Data"); -// -// final JFreeChart chart = new JFreeChart(plot); -// chart.setTitle(new TextTitle(title, new Font(Font.SANS_SERIF, -// Font.BOLD, 12))); -// chart.setBackgroundPaint(new Color(255, 255, 255)); - // return the image return new StreamResponse() { public String getContentType() { @@ -153,13 +117,14 @@ } public InputStream getStream() throws IOException { -// BufferedImage image = currentChart.createBufferedImage(width, height); -// ByteArrayOutputStream byteArray = new ByteArrayOutputStream(); -// ChartUtilities.writeBufferedImageAsPNG(byteArray, image); -// return new ByteArrayInputStream(byteArray.toByteArray()); - File res = new File("/tmp", "chart.png"); - ChartUtilities.saveChartAsPNG(res, currentChart, width, height); - return new FileInputStream(res); +// String alea = SuiviObsmerContext.createRandomString(8); +// String path = SuiviObsmerContext.getProperty(SuiviObsmerContext.PROP_PATH_CHARTS); +// File file = new File(path, "chart_" + alea + ".png"); +// file.getParentFile().mkdirs(); + + ByteArrayOutputStream output = new ByteArrayOutputStream(); + ChartUtilities.writeChartAsPNG(output, currentChart, width, height); + return new ByteArrayInputStream(output.toByteArray()); } public void prepareResponse(Response response) { 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-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-15 13:38:57 UTC (rev 205) @@ -327,7 +327,11 @@ } public String getRowClass() { - return BusinessUtils.getCSSColorClassForContact(contact, user.getAdmin()); + String result = BusinessUtils.getCSSColorClassForContact(contact, user.getAdmin()); + if (contact.getTopiaId().equals(contactSelectedId)) { + result = "selected"; + } + return result; } public DateFormat getDateFormat() { Modified: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/components/Layout.tml 2010-01-15 13:38:57 UTC (rev 205) @@ -68,16 +68,16 @@ <div id="so-footer"> <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/" title="Documentation de l'application"> WAO - </a>  + </a> <a href="http://suiviobsmer.labs.libre-entreprise.org/suiviobsmer/" title="Modifications faites pour cette version"> ${version} - </a>  - + </a> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> Obsmer - </a>  - + </a> - <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3"> GPLv3 - </a>  - Copyright 2009-2010 + </a> - Copyright 2009-2010  DPMA,  Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-15 13:38:57 UTC (rev 205) @@ -194,7 +194,7 @@ </p:dataInputDateCell> <p:commentCell> <t:if t:test="editionMode"> - <input t:type="textarea" t:id="comment" cols="15" rows="2" value="contact.comment" /> + <input t:type="textarea" t:id="comment" cols="1" rows="2" value="contact.comment" /> <p:else> ${contact.comment} </p:else> Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 13:38:57 UTC (rev 205) @@ -60,7 +60,7 @@ <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" />  <t:label t:for="facadeName" />: <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" - t:mixins="zoneUpdater" t:event="change" t:zone="so-contacts-filters"/>  + t:mixins="zoneUpdater" t:event="change" t:zone="so-datasampling-filters"/>  <t:label t:for="sectorName" />: <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  <t:label t:for="sampleRow" />: Modified: trunk/suiviobsmer-ui/src/main/webapp/css/main.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/main.css 2010-01-15 00:50:04 UTC (rev 204) +++ trunk/suiviobsmer-ui/src/main/webapp/css/main.css 2010-01-15 13:38:57 UTC (rev 205) @@ -148,8 +148,9 @@ div#so-footer a { color: #133852; + text-decoration: none; } div#so-footer a:hover { - text-decoration: none; + text-decoration: underline; } \ No newline at end of file

1 0

[Suiviobsmer-commits] r204 - in trunk: suiviobsmer-business/src/main/filters suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/xmi suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/webapp
by fdesbois＠users.labs.libre-entreprise.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 00:50:04 +0000 (Fri, 15 Jan 2010) New Revision: 204 Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.properties trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml Log: - Suppress loading properties : put lazy=false in properties model file - Replace onPrepareForSubmit by onSuccess for AbstractFilteredPage - Add contact constraint on filtering DataSampling (for link with boat) Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties =================================================================== --- trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-15 00:50:04 UTC (rev 204) @@ -16,4 +16,4 @@ suiviobsmer.email.from=admin at suiviobsmer.org ## Version -suiviobsmer.version=${project.version} +suiviobsmer.version=0.1.0 \ No newline at end of file Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/UserFilterImpl.java 2010-01-15 00:50:04 UTC (rev 204) @@ -31,4 +31,9 @@ return query; } + + @Override + public boolean isUserFiltered() { + return getObserver() != null || getCompany() != null; + } } Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-15 00:50:04 UTC (rev 204) @@ -159,7 +159,7 @@ // } // query.add("C." + Contact.VALIDATION_COMPANY, companyValidValues, filter.getCompanyUndefined()); - query.addLoad("user.company", "sampleRow.profession", "sampleRow.company"); + query.addLoad("user.company"); if (log.isDebugEnabled()) { log.debug("Query : " + query); Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-15 00:50:04 UTC (rev 204) @@ -298,7 +298,7 @@ String zoneOrder = "F.facadeName, F.sectorName, F.districtCode"; query.addOrder(zoneOrder).addOrder("S.code").addSelect(zoneOrder); // Load data - query.addLoad(SampleRow.PROFESSION, SampleRow.COMPANY); + //query.addLoad(SampleRow.PROFESSION, SampleRow.COMPANY); if (log.isDebugEnabled()) { log.debug("Query : " + query); @@ -351,7 +351,7 @@ query.add(SampleRow.COMPANY, user.getCompany()); } - results = query.addLoad(SampleRow.PROFESSION).executeToEntityList(); + results = query.executeToEntityList(); transaction.closeContext(); } catch (Exception eee) { @@ -370,8 +370,7 @@ SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction); - result = dao.createQuery().add(TopiaEntity.TOPIA_ID, sampleRowId). - addLoad(SampleRow.PROFESSION, SampleRow.COMPANY).executeToEntity(); + result = dao.findByTopiaId(sampleRowId); transaction.closeContext(); } catch (Exception eee) { 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-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-15 00:50:04 UTC (rev 204) @@ -5,8 +5,8 @@ import fr.ifremer.suiviobsmer.SuiviObsmerException; import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper; import fr.ifremer.suiviobsmer.bean.BoatFilter; +import fr.ifremer.suiviobsmer.bean.ContactState; import fr.ifremer.suiviobsmer.entity.Contact; -import fr.ifremer.suiviobsmer.entity.ElligibleBoat; import fr.ifremer.suiviobsmer.entity.SampleMonth; import fr.ifremer.suiviobsmer.entity.SampleMonthDAO; import fr.ifremer.suiviobsmer.services.ServiceSynthesis; @@ -19,7 +19,6 @@ import java.util.TreeMap; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.framework.TopiaQuery.Op; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +52,7 @@ transaction = rootContext.beginTransaction(); PeriodDates period = filter.getPeriod(); - if (period.getFromDate() == null || period.getThruDate() == null) { + if (period == null || period.getFromDate() == null || period.getThruDate() == null) { return results; } @@ -72,17 +71,27 @@ TopiaQuery<SampleMonth> query = dao.createQuery("M"). setSelect("M.periodDate, SUM(M.realTidesValue), SUM(M.expectedTidesValue)"). //addFrom(SampleRow.class.getName() + " M").add("M IN elements(S)"). - add("M.periodDate", Op.GE, period.getFromDate()). - add("M.periodDate", Op.LE, period.getThruDate()). + add("M.periodDate BETWEEN :fromDate AND :thruDate"). + addParam("fromDate", period.getFromDate()).addParam("thruDate", period.getThruDate()). addGroup("M.periodDate").addOrder("M.periodDate"); - - query = filter.prepareQueryForUser(query, "M.sampleRow"); + query = filter.prepareQueryForSampling(query, "M"); - if (filter.isBoatFiltered()) { - // ElligibleBoat is sufficient ? no need to check contacts (more difficult query) ? - query.addFrom(ElligibleBoat.class.getName() + " E").add("E IN elements(M.sampleRow)"); - query = filter.prepareQueryForBoat(query, "E"); + // FIXME company from sampleRow and not from contact, but user from contact + // Refactor MODEL : suppress link between user and contact + add field observer in contact + // In filter : sampleRow.company filtered and contact.observer + + if (filter.isBoatFiltered() || filter.isUserFiltered()) { + // Check boat on finished contact (validate + Boarding_Done) and same month/year as SampleMonth + query.addFrom(Contact.class.getName() + " C").add("C IN elements(M.sampleRow.contact)"). + add("C.state", ContactState.BOARDING_DONE.toString()). + add("C.validationCompany", Boolean.TRUE). + add("C.validationProgram IS NULL OR C.validationProgram = :booleanTrue"). + addParam("booleanTrue", Boolean.TRUE). + add("month(C.tideBeginDate) = month(M.periodDate)"). + add("year(C.tideBeginDate) = year(M.periodDate)"); + query = filter.prepareQueryForBoat(query, "C"); + query = filter.prepareQueryForUser(query, "C"); } if (log.isTraceEnabled()) { Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.properties =================================================================== --- trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.properties 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.properties 2010-01-15 00:50:04 UTC (rev 204) @@ -7,6 +7,7 @@ fr.ifremer.suiviobsmer.entity.SampleRow.attribute.fishingZone.tagvalue.lazy=false fr.ifremer.suiviobsmer.entity.SampleRow.attribute.fishingZone.tagvalue.orderBy=facadeName,sectorName,districtCode fr.ifremer.suiviobsmer.entity.SampleRow.attribute.profession.tagvalue.lazy=false +fr.ifremer.suiviobsmer.entity.SampleRow.attribute.company.tagvalue.lazy=false #fr.ifremer.suiviobsmer.entity.SampleRow.attribute.pogram.tagvalue.lazy=false fr.ifremer.suiviobsmer.entity.SampleRow.attribute.elligibleBoat.tagvalue.lazy=false fr.ifremer.suiviobsmer.entity.SampleRow.attribute.elligibleBoat.tagvalue.orderBy=companyActive Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-15 00:50:04 UTC (rev 204) @@ -90,6 +90,10 @@ getSectorSelectModel(); sampleRowSelectModel = null; getSampleRowSelectModel(); + + if (getFilter().getSampleRow() != null) { + sampleRowId = getFilter().getSampleRow().getTopiaId(); + } } public SelectModel getFacadeSelectModel() throws SuiviObsmerException { @@ -161,7 +165,7 @@ } @Log - public void onPrepareForSubmit() throws SuiviObsmerException { + public void onSuccess() throws SuiviObsmerException { SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); getFilter().setSampleRow(row); } 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-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-15 00:50:04 UTC (rev 204) @@ -135,21 +135,6 @@ @InjectComponent private Zone importExportZone; -// @Persist -// private GenericSelectModel<SampleRow> sampleRowSelectModel; -// -// @Property -// private String sampleRowId; -// -// @Inject -// private ServiceReferential serviceReferential; -// -// @Persist -// private SelectModel facadeSelectModel; -// -// @Persist -// private SelectModel sectorSelectModel; - @Property @Persist("flash") private boolean filtersVisible; @@ -170,7 +155,7 @@ protected BoatFilter getFilter() throws SuiviObsmerException { return getContactFilter(); } - + @Override protected void resetFilter() { contactFilter = null; @@ -181,54 +166,6 @@ return filtersZone; } -// public SelectModel getFacadeSelectModel() throws SuiviObsmerException { -// if (facadeSelectModel == null) { -// if (log.isInfoEnabled()) { -// log.info("BUSINESS REQUEST [getFacades]"); -// } -// List<OptionModel> options = new ArrayList<OptionModel>(); -// for (String facadeName : serviceReferential.getFacades()) { -// options.add(new OptionModelImpl(facadeName,facadeName)); -// } -// facadeSelectModel = new SelectModelImpl(null, options); -// } -// return facadeSelectModel; -// } - -// public SelectModel getSectorSelectModel() throws SuiviObsmerException { -// if (sectorSelectModel == null) { -// if (log.isInfoEnabled()) { -// log.info("BUSINESS REQUEST [getSectors]"); -// } -// List<OptionModel> options = new ArrayList<OptionModel>(); -// for (String sectorName : serviceReferential.getSectors(getContactFilter().getFacadeName())) { -// options.add(new OptionModelImpl(sectorName,sectorName)); -// } -// sectorSelectModel = new SelectModelImpl(null, options); -// } -// return sectorSelectModel; -// } -// -// public GenericSelectModel<SampleRow> getSampleRowSelectModel() throws SuiviObsmerException { -// if (sampleRowSelectModel == null) { -// if (log.isInfoEnabled()) { -// log.info("BUSINESS REQUEST [getSampleRowsForUser]"); -// } -// List<SampleRow> sampleRows = serviceSampling.getSampleRowsForUser(user); -// sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, -// "code", "topiaId", propertyAccess); -// } -// return sampleRowSelectModel; -// } - -// String[] onProvideCompletionsFromBoatName(String input) throws SuiviObsmerException { -// if (log.isInfoEnabled()) { -// log.info("BUSINESS REQUEST [getBoatNamesStartWith]"); -// } -// List<String> results = serviceBoat.getBoatNamesStartWith(input); -// return results.toArray(new String[0]); -// } - void onSuccessFromSearchBoat() { } @@ -242,25 +179,12 @@ return importExportZone.getBody(); } -// @Log -// public Object onChangeFromFacadeName(String value) throws SuiviObsmerException { -// if (!StringUtils.isEmpty(value.trim())) { -// // Reset contactFilter to avoid strange behavior (cause of no form submit) -// contactFilter = null; -// // set facadeName selected in contactFilter -// getContactFilter().setFacadeName(value); -// // Reset sectors to use facadeName selected -// sectorSelectModel = null; -// return filtersZone.getBody(); -// } -// return null; -// } - void onSelectedFromReset() { reset = true; } - void onSuccessFromFiltersForm() { + @Log + void onSuccessFromFiltersForm() throws SuiviObsmerException { if (reset) { contactFilter = null; } else { Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-15 00:50:04 UTC (rev 204) @@ -93,7 +93,7 @@ private boolean reset; @Override - protected BoatFilter getFilter() throws SuiviObsmerException { + public BoatFilter getFilter() throws SuiviObsmerException { if (dataSamplingFilter == null) { dataSamplingFilter = new BoatFilterImpl(); if (!user.getAdmin()) { Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-14 22:59:54 UTC (rev 203) +++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-15 00:50:04 UTC (rev 204) @@ -53,7 +53,7 @@ <div class="t-beaneditor"> <div> <t:label t:for="boatName" />: - <input t:type="textfield" t:id="boatName" class="width50" t:value="filter.boatName" t:mixins="Autocomplete" />  + <input t:type="textfield" t:id="boatName" t:value="filter.boatName" t:mixins="Autocomplete" />  <t:label t:for="boatImmatriculation" />: <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="filter.boatImmatriculation" />  <t:label t:for="boatDistrictCode" />:

1 0