Changeset 419 for tapas/web/src/com/ether/Controller.java

Timestamp:

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

Author:

rboipsl

Message:

creation listes dans form
creation class Observatory

File:

• tapas/web/src/com/ether/Controller.java (modified) (3 diffs)

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 );