Changeset 419

Timestamp:

03/19/12 17:06:58 (12 years ago)

Author:

rboipsl

Message:

creation listes dans form
creation class Observatory

Location:

tapas

Files:

• Tapas.iml (modified) (2 diffs)
• domain/Domain.iml (modified) (1 diff)
• domain/interface/com/ether/FileFormat.java (copied) (copied from tapas/domain/interface/com/ether/user/UserRole.java) (1 diff)
• domain/interface/com/ether/YesNo.java (added)
• domain/interface/com/ether/tapas (moved) (moved from tapas/service/interface/com/ether/tapas)
• domain/interface/com/ether/tapas/Observatory.java (modified) (2 diffs)
• persistence/implementation/com/ether/dao/Observatory.hbm.xml (moved) (moved from tapas/persistence/implementation/com/ether/dao/Plateform.hbm.xml) (2 diffs)
• persistence/implementation/com/ether/dao/ObservatoryDAOImpl.java (moved) (moved from tapas/persistence/implementation/com/ether/dao/PlateformDAOImpl.java) (2 diffs)
• persistence/implementation/dao-context.xml (modified) (1 diff)
• persistence/interface/com/ether/dao/ObservatoryDAO.java (added)
• persistence/interface/com/ether/dao/PlateformDAO.java (deleted)
• service/implementation/com/ether/TapasServiceImpl.java (modified) (2 diffs)
• service/interface/com/ether/ServiceException.java (modified) (1 diff)
• service/interface/com/ether/TapasService.java (modified) (2 diffs)
• web/project/formTapas.jsp (modified) (2 diffs)
• web/project/formTapas_script.jsp (modified) (3 diffs)
• web/src/com/ether/Controller.java (modified) (3 diffs)
• web/src/com/ether/WebException.java (modified) (1 diff)

tapas/Tapas.iml

@@ -19 +19 @@
           <root url="file://$MODULE_DIR$/web" relative="/" />
         </webroots>
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/work" />
+        </sourceRoots>
       </configuration>
     </facet>
@@ -24 +27 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/work" isTestSource="false" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

tapas/domain/Domain.iml

@@ -11 +11 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="lib_common" level="project" />
+    <orderEntry type="module" module-name="Common" />
   </component>
 </module>

tapas/domain/interface/com/ether/FileFormat.java

@@ -1 @@
-package com.ether.user;
+package com.ether;
 
 /**
- * User: vmipsl
- * Date: 12 march 2012
+ * User: rboipsl
+ * Date: 16 march 2012
  */
-public enum UserRole
+public enum FileFormat
 {
-    USER,
-    ADMINISTRATOR,
+    ASCII,
+    FITS,
+    NETCDF
 }

tapas/domain/interface/com/ether/tapas/Observatory.java

@@ -4 +4 @@
 
 /**
- * @author vmipsl
- * @date 08 march 2012
+ * @author rboipsl
+ * @date 19 march 2012
  */
 public class Observatory
 {
+    @NotNull
+    public String getId()
+    {
+        return _id;
+    }
+
+    public void setId( @NotNull final String id )
+    {
+        _id = id;
+    }
+
     @NotNull
     public String getName()
@@ -54 +65 @@
 
     @NotNull
+    private String _id;
+    @NotNull
     private String _name;
     @NotNull

tapas/persistence/implementation/com/ether/dao/Observatory.hbm.xml

@@ -4 +4 @@
 <hibernate-mapping default-cascade="save-update" auto-import="false">
 
-        <class name="com.ether.Plateform" table="plateforme">
+        <class name="com.ether.tapas.Observatory" table="observatory">
 
                 <id name="id">
-                        <column name="plateforme_id" />
+                        <column name="observatory_id" />
                         <generator class="increment" />
 
@@ -16 +16 @@
 
                 <property name="name">
-                        <column name="plateforme_nom"/>
+                        <column name="observatory_name"/>
                 </property>
+
+        <property name="latitude">
+            <column name="observatory_latitude"/>
+        </property>
+
+        <property name="longitude">
+             <column name="observatory_longitude"/>
+        </property>
+
+        <property name="altitude">
+              <column name="observatory_altitude"/>
+        </property>
 
         </class>

tapas/persistence/implementation/com/ether/dao/ObservatoryDAOImpl.java

@@ -3 +3 @@
 import com.ether.PersistenceException;
 import com.ether.Plateform;
+import com.ether.tapas.Observatory;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Restrictions;
@@ -15 +16 @@
  * Example for a DAO
  */
-public class PlateformDAOImpl
-        extends DomainAccessObjectImpl<Plateform, Integer>
-        implements PlateformDAO
+public class ObservatoryDAOImpl
+        extends DomainAccessObjectImpl<Observatory, Integer>
+        implements ObservatoryDAO
 {
-    protected PlateformDAOImpl()
+    protected ObservatoryDAOImpl()
     {
-        super( Plateform.class );
+        super( Observatory.class );
     }
 
-    @Nullable
-    public Plateform getPlateformById( @NotNull final Integer plateformId )
+//    @Nullable
+//    public Observatory getPlateformById( @NotNull final Integer plateformId )
+//            throws PersistenceException
+//    {
+//        final DetachedCriteria criteria = DetachedCriteria.forClass( Plateform.class )
+//                .add( Restrictions.idEq( plateformId ) );
+//
+//        return selectByCriteria( Plateform.class, criteria );
+//    }
+
+
+    @NotNull
+    public List<Observatory> getAllObservatories()
             throws PersistenceException
     {
-        final DetachedCriteria criteria = DetachedCriteria.forClass( Plateform.class )
-                .add( Restrictions.idEq( plateformId ) );
-
-        return selectByCriteria( Plateform.class, criteria );
-    }
-
-    @NotNull
-    public List<Plateform> getAllPlateforms()
-            throws PersistenceException
-    {
-        final DetachedCriteria criteria = DetachedCriteria.forClass( Plateform.class );
-        return selectAllByCriteria( Plateform.class, criteria );
+        final DetachedCriteria criteria = DetachedCriteria.forClass( Observatory.class );
+        return selectAllByCriteria( Observatory.class, criteria );
     }
 }

tapas/persistence/implementation/dao-context.xml

@@ -4 +4 @@
 <!-- Application context DAO layer -->
 <beans>
-    <bean id="refPlateformDAO" class="com.ether.dao.PlateformDAOImpl">
+    <bean id="refPlateformDAO" class="com.ether.dao.ObservatoryDAOImpl">
         <property name="sessionFactory">
             <ref bean="sessionFactory"/>

tapas/service/implementation/com/ether/TapasServiceImpl.java

@@ -1 +1 @@
 package com.ether;
 
-import com.ether.dao.PlateformDAO;
+import com.ether.dao.ObservatoryDAO;
+import com.ether.tapas.Observatory;
 import com.ether.tapas.Request;
 import com.ether.tapas.Tapas;
@@ -84 +85 @@
     }
 
-    // TODO : supprimer cette méthode --> EXEMPLE
+    // list tous observatoires
     @Nullable
     @Transactional(readOnly = true)
-    public List<Plateform> getAllPlateforms()
+    public List<Observatory> getAllObservatories()
             throws ServiceException
     {
         try
         {
-            return _plateformDAO.getAllPlateforms();
+            return _observatoryDAO.getAllObservatories();
         }
         catch( PersistenceException e )
         {
-            throw new ServiceException( ServiceException.ServiceCode.PLATEFORM_NOT_FOUND, e );
+            throw new ServiceException( ServiceException.ServiceCode.OBSERVATORY_NOT_FOUND, e );
         }
     }
 
-    // TODO : supprimer cette méthode --> EXEMPLE
-    @Nullable
-    @Transactional(readOnly = true)
-    public Plateform getPlateformById( @Nullable final Integer plateformId )
-            throws ServiceException
+
+    @Required
+    public void setObservatoryDAO( final ObservatoryDAO observatoryDAO )
     {
-        if( null == plateformId )
-            return null;
-        try
-        {
-            return _plateformDAO.getPlateformById( plateformId );
-        }
-        catch( PersistenceException e )
-        {
-            throw new ServiceException( ServiceException.ServiceCode.PLATEFORM_NOT_FOUND, e );
-        }
-    }
-
-    // TODO : supprimer cette méthode --> EXEMPLE
-    @Required
-    public void setPlateformDAO( final PlateformDAO plateformDAO )
-    {
-        _plateformDAO = plateformDAO;
+        _observatoryDAO = observatoryDAO;
     }
 
     private static final Log LOGGER = LogFactory.getLog( TapasServiceImpl.class );
 
-    // TODO : supprimer ces DAO --> EXEMPLES
-    private PlateformDAO _plateformDAO;
+    private ObservatoryDAO _observatoryDAO;
 }

tapas/service/interface/com/ether/ServiceException.java

@@ -21 +21 @@
     {
 
-        PERSISTENCE, 
-        PLATEFORM_NOT_FOUND,
+        PERSISTENCE,
+        OBSERVATORY_NOT_FOUND,
         USER_NOT_FOUND,
     }

tapas/service/interface/com/ether/TapasService.java

@@ -1 +1 @@
 package com.ether;
 
+import com.ether.tapas.Observatory;
 import com.ether.tapas.Tapas;
 import org.jdom.Document;
@@ -18 +19 @@
 
     public void createXMLFile( final String fichier, final Document document );
+
+    public List<Observatory> getAllObservatories() throws ServiceException;
 }

tapas/web/project/formTapas.jsp

@@ -7 +7 @@
 <tiles:insert page="/resources/templates/templateEther.jsp" flush="true">
 
-    <tiles:put name="insertCss" type="string"/>
+    <tiles:put name="insertCss" type="string">
+        <ether:htmlCss cssFile="select"/>
+    </tiles:put>
     <tiles:put name="insertJsOrJsp" type="string">
         <ether:htmlJs jsFile="library/jquery.json-2.3"/>
+        <ether:htmlJs jsFile="classesForJQuery/Select"/>
         <ether:htmlJsp jspFile="formTapas_script"/>
     </tiles:put>
@@ -33 +36 @@
             tapasTexts["<%=WebException.WebCode.ERROR_JSON_TAPAS_IS_NULL%>"] = "<spring:message code="error.ERROR_JSON_TAPAS_IS_NULL"/>";
 
-            var interfaceTapas = new InterfaceTapas();
+            var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos});
         </script>
 

tapas/web/project/formTapas_script.jsp

@@ -2 +2 @@
     var InterfaceTapas = Class.create( {
 
-        initialize: function()
+        initialize: function(jsonFileFormats,jsonYesNos)
         {
             /** *********** CONTAINERS *********** **/
@@ -8 +8 @@
             this.containerErrors = $( "#errors" );
 
+            this.jsonFileFormats = jsonFileFormats || null;
+            this.jsonYesNos = jsonYesNos || null;
+
             this.containerErrors.hide();
+
             this.createForm();
         },
 
+
+
         // CREATES ********************************************************
+        createTr: function(texte, inputId, container)
+        {
+            var tr=$( document.createElement("tr") );
+            var td1=$( document.createElement("td") );
+            var td2=$( document.createElement("td") );
+            var input=$( document.createElement("input") );
+
+
+            input.attr({id: inputId});
+            td1.html(texte);
+            tr.append(td1);
+            td2.append(input);
+            tr.append(td2);
+            container.append(tr);
+        },
+
+
+        createTrList: function(texte, inputId, container, type)
+                {
+                    var tr=$( document.createElement("tr") );
+                    var td1=$( document.createElement("td") );
+                    var td2=$( document.createElement("td") );
+                    var input=$( document.createElement("input") );
+
+
+                    input.attr({id: inputId});
+                    td1.html(texte);
+                    tr.append(td1);
+                    if (type == 'format') this.displayFileFormats(td2);
+                    else if (type == 'yesno') this.displayYesNo(td2);
+
+                    tr.append(td2);
+                    container.append(tr);
+                },
+
+
         createForm: function()
         {
-            // Create button elements
-            this.input1 = $( document.createElement( "input" ) );
-            var input2 = $( document.createElement( "input" ) );
-
-            this.input1.attr( {id:"1"} );
-            this.containerForm.append( this.input1 );
-
-            input2.attr( {id:"2"} );
-            this.containerForm.append( input2 );
-
+
+            //Creation div
+            var divPreference=$( document.createElement("div") );
+            var tabPreference=$( document.createElement("table") );
+
+            this.createTrList("File format", "p1", tabPreference, 'format');
+            this.createTr("Rayleigh extinction", "p2", tabPreference);
+            this.createTrList("H20 extinction", "p3", tabPreference, 'yesno');
+            this.createTrList("O3 extinction", "p4", tabPreference, 'yesno');
+            this.createTrList("O2 extinction", "p5", tabPreference, 'yesno');
+            this.createTrList("CO2 extinction", "p6", tabPreference, 'yesno');
+
+            divPreference.append( tabPreference );
+            this.containerForm.append( divPreference );
+
+            //jQuery.proxy permet d'envoyer le contexte this courant
             var submitButton = new Button( {value:tapasTexts["label.submitButton"], parent:this.containerForm, id:"button_submit", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickSubmit, this )} );
 
         },
+
+
 
         // REQUESTS ********************************************************
@@ -59 +109 @@
         },
 
+
         // OTHERS ********************************************************
+        displayFileFormats: function(container)
+        {
+            var paramSelect = new Object();
+            paramSelect.id = "select_formats";
+            paramSelect.parent = container;
+            this.selectFormats = new Select( paramSelect );
+            jQuery.each( this.jsonFileFormats, jQuery.proxy( function ( i, jsonFileFormat )
+            {
+                this.selectFormats.add( jsonFileFormat.value, jsonFileFormat.text );
+            }, this ) );
+            this.selectFormats.selectFirst( false );
+        },
+
+
+        displayYesNo: function(container,name)
+        {
+            var paramSelect = new Object();
+            paramSelect.id = "select_"+name;
+            paramSelect.parent = container;
+            this.selectYesNos = new Select( paramSelect );
+            jQuery.each( this.jsonYesNos, jQuery.proxy( function ( i, jsonYesNo )
+            {
+                this.selectYesNos.add( jsonYesNo.value, jsonYesNo.text );
+            }, this ) );
+            this.selectYesNos.selectFirst( false );
+        },
+
+
         showErrors: function( result )
         {

tapas/web/src/com/ether/Controller.java

@@ -5 +5 @@
 import com.ether.annotation.ParamName;
 import com.ether.annotation.UseJSON;
+import com.ether.tapas.Observatory;
 import com.ether.tapas.Tapas;
+import com.ether.user.UserRole;
 import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
@@ -25 +29 @@
     /** *********************************************************** **/
     @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = true, defaultView = VIEW_INDEX)
-    public Map<String, Object> viewForm()
+    public JSONObject viewForm()
             throws WebException
     {
-        return new HashMap<String, Object>();
+
+        try
+        {
+            final List<Observatory> allObservatories = getTapasService().getAllObservatories();
+
+            final JSONObject jsonObject = new JSONObject();
+            jsonObject.put( "jSonFileFormats", getJSONFileFormat() );
+            jsonObject.put( "jSonYesNos", getJSONYesNo() );
+            jsonObject.put( "jSonObservatories", allObservatories );
+            return jsonObject;
+        }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_NO_OBSERVATORY_FOUND, e );
+        }
+
     }
+
+
+
+
 
     /** *********************************************************** **/
@@ -49 +72 @@
     }
 
+    private List<JSONObject> getJSONFileFormat()
+    {
+        final FileFormat[] fileFormats = FileFormat.values();
+
+        final List<JSONObject> jsonFileFormats = new ArrayList<JSONObject>( fileFormats.length );
+
+        for( final FileFormat fileFormat : fileFormats )
+        {
+            final JSONObject jsonFileFormat = new JSONObject();
+            jsonFileFormat .put( "text", fileFormat.name() );
+            jsonFileFormat .put( "value", fileFormat.name() );
+            jsonFileFormats.add( jsonFileFormat  );
+        }
+        return jsonFileFormats;
+    }
+
+    private List<JSONObject> getJSONYesNo()
+    {
+        final YesNo[] yesNos = YesNo.values();
+
+        final List<JSONObject> jsonYesNos = new ArrayList<JSONObject>( yesNos.length );
+
+        for( final YesNo yesNo : yesNos )
+        {
+            final JSONObject jsonYesNo = new JSONObject();
+            jsonYesNo .put( "text", yesNo.name() );
+            jsonYesNo .put( "value", yesNo.name() );
+            jsonYesNos.add( jsonYesNo );
+        }
+        return jsonYesNos;
+    }
+
     private static final Log LOGGER = LogFactory.getLog( Controller.class );
 

tapas/web/src/com/ether/WebException.java

@@ -44 +44 @@
         USER_ALREADY_EXISTS,
         ERROR_ENCRYPT_PASSWORD,
-        ERROR_EMAIL_CANNOT_BE_SEND
+        ERROR_EMAIL_CANNOT_BE_SEND,
+        ERROR_NO_OBSERVATORY_FOUND
     }