From fdesbois@users.labs.libre-entreprise.org Mon Jun 15 01:50:55 2026
From: fdesbois@users.labs.libre-entreprise.org
To: wao-commits@list.forge.codelutin.com
Subject: [Suiviobsmer-commits] r211 - in
	trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui:	base pages
Date: Sun, 17 Jan 2010 14:58:46 +0100
Message-ID: <20100117135846.CE2EB1E8D05@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8078029794086420290=="

--===============8078029794086420290==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/Abstract=
FilteredPage.java
   trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contact=
s.java
   trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthes=
is.java
Log:
Resolve issue on observer list in Contact + suppress abstract methods getFilt=
erZone

Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/A=
bstractFilteredPage.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/Abstrac=
tFilteredPage.java	2010-01-17 13:45:39 UTC (rev 210)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/Abstrac=
tFilteredPage.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=3D"boatName" t:value=3D"filter.boatName" t:mixins=
=3D"Autocomplete"/>
- * - FacadeName uses the zoneUpdater mixins :
- *      <input t:type=3D"select" t:id=3D"facadeName" t:model=3D"facadeSelect=
Model" t:value=3D"filter.facadeName" t:mixins=3D"zoneUpdater" t:event=3D"chan=
ge" t:zone=3D"..." .../>
- *   The zone_id is the one of the zone returned by {@link #getFilterZone() }
  * - SampleRow select value is sampleRowId :
  *      <input t:type=3D"select" t:id=3D"sampleRow" t:model=3D"sampleRowSele=
ctModel" value=3D"sampleRowId" />
  * - Company select value is companyId :
  *      <input t:type=3D"select" t:id=3D"company" t:model=3D"companySelectMo=
del" value=3D"companyId" />
- * - Observer select value is observerId and have a zoneUpdater mixins :
- *      <input t:type=3D"select" t:id=3D"observer" t:model=3D"observerSelect=
Model" value=3D"observerId" t:mixins=3D"zoneUpdater" t:event=3D"change" t:zon=
e=3D"..." .../>
+ * - Observer select value is observerId :
+ *      <input t:type=3D"select" t:id=3D"observer" t:model=3D"observerSelect=
Model" value=3D"observerId" />
+ * - Select change, use JavaScript :
+ *      <script type=3D"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;
=20
+    @Persist
     private GenericSelectModel<Company> companySelectModel;
=20
     @Property
     private String companyId;
=20
+    @Persist
     private GenericSelectModel<User> observerSelectModel;
=20
     @Property
@@ -127,6 +130,9 @@
             getFilter().setCompany(user.getCompany());
         }
=20
+        observerSelectModel =3D null;
+        getObserverSelectModel();
+
         if (getFilter().getObserver() !=3D null) {
             observerId =3D getFilter().getObserver().getTopiaId();
         }
@@ -188,16 +194,13 @@
         if (observerSelectModel =3D=3D null) {
             List<User> observers =3D  new ArrayList<User>();
             if (getFilter().getCompany() !=3D null) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Company filter users : " + getFilter().getCom=
pany());
-                }
                 observers =3D getFilter().getCompany().getUser();
             } else if (user.getAdmin()) {
-                if (log.isDebugEnabled()) {
-                    log.debug("BUSINESS REQUEST [getObservers]");
+                if (log.isInfoEnabled()) {
+                    log.info("BUSINESS REQUEST [getObservers]");
                 }
                 observers =3D serviceUser.getObservers(getAvailableDataForFi=
ltersOnly());
-            }           =20
+            }
             observerSelectModel =3D new GenericSelectModel<User>(observers,U=
ser.class,
                     "fullName","topiaId",propertyAccess);
         }
@@ -208,10 +211,10 @@
=20
     protected abstract void resetFilter();
=20
-    protected abstract Zone getSampleRowFilterZone();
+//    protected abstract Zone getSampleRowFilterZone();
+//
+//    protected abstract Zone getObserverFilterZone();
=20
-    protected abstract Zone getObserverFilterZone();
-
     protected abstract boolean getAvailableDataForFiltersOnly();
=20
     public String[] onProvideCompletionsFromBoatName(String input) throws Su=
iviObsmerException {

Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/=
Contacts.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contac=
ts.java	2010-01-17 13:45:39 UTC (rev 210)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contac=
ts.java	2010-01-17 13:58:46 UTC (rev 211)
@@ -161,17 +161,17 @@
         contactFilter =3D null;
     }
=20
-    @Override
-    protected Zone getSampleRowFilterZone() {
-        return filtersZone;
-    }
+//    @Override
+//    protected Zone getSampleRowFilterZone() {
+//        return filtersZone;
+//    }
+//
+//    @Override
+//    protected Zone getObserverFilterZone() {
+//        return filtersZone;
+//    }
=20
     @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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthe=
sis.java	2010-01-17 13:45:39 UTC (rev 210)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthe=
sis.java	2010-01-17 13:58:46 UTC (rev 211)
@@ -116,17 +116,17 @@
         dataSamplingFilter =3D null;
     }
=20
-    @Override
-    protected Zone getSampleRowFilterZone() {
-        return sampleRowZone;
-    }
+//    @Override
+//    protected Zone getSampleRowFilterZone() {
+//        return sampleRowZone;
+//    }
+//
+//    @Override
+//    protected Zone getObserverFilterZone() {
+//        return observerZone;
+//    }
=20
     @Override
-    protected Zone getObserverFilterZone() {
-        return observerZone;
-    }
-
-    @Override
     protected boolean getAvailableDataForFiltersOnly() {
         return false;
     }


--===============8078029794086420290==--