Changeset 530 for ether_megapoli/trunk/web

Timestamp:

07/03/12 17:02:35 (12 years ago)

Author:

vmipsl

Message:

Simulations
Process ncdump
Sérialisation jaxb

Location:

ether_megapoli/trunk/web

Files:

• WEB-INF/megapoli.properties (modified) (1 diff)
• backoffice/simulation-script.jsp (modified) (5 diffs)
• backoffice/simulation.jsp (modified) (2 diffs)
• resources/css/backoffice.css (modified) (1 diff)
• resources/css/megapoli.css (modified) (1 diff)
• src/ApplicationResources_en.properties (modified) (1 diff)
• src/com/ether/ControllerBackoffice.java (modified) (5 diffs)
• src/com/ether/WebException.java (modified) (1 diff)
• visualization/visu_simulation-script.jsp (copied) (copied from ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp)
• visualization/visu_simulation.jsp (modified) (2 diffs)

ether_megapoli/trunk/web/WEB-INF/megapoli.properties

@@ -40 +40 @@
 
 # ParamÚtres pour la simulation
-directory.simulation=/home_local/Simulations
+directory.simulation=/home_local/PROJETS/MEGAPOLI/Simulations

ether_megapoli/trunk/web/backoffice/simulation-script.jsp

@@ -3 +3 @@
 var interfaceBODataInsertion = Class.create( {
 
-    initialize: function( pathSimulationFiles )
+    initialize: function( simulationFiles, simulationDirectories )
     {
         // Values
-        this.files = pathSimulationFiles || null;
+        this.files = simulationFiles || null;
+        this.directories = simulationDirectories || null;
 
         // Containers
@@ -41 +42 @@
 
         // Bind buttons
-//        $( "#insert" ).bind( 'click', this, jQuery.proxy( this.onClickInsert, this ) );
+        $( "#ncdumpButton" ).bind( 'click', this, jQuery.proxy( this.onClickLaunchNcDump, this ) );
 //        $( "#cleanLocalisationAndFlagButton" ).bind( 'click', this, jQuery.proxy( this.onClickCleanLocalisationAndFlag, this ) );
     },
@@ -58 +59 @@
     },
 
+    requestLaunchNcDump: function()
+    {
+        $.ajax( {
+            url: "backoffice?methodName=launchNCDumpInSimulationDirectory",
+            success:jQuery.proxy( this.handleLaunchNcDump, this ),
+            error: jQuery.proxy( this.showErrors, [this] )
+        } );
+    },
+
+    requestInsertHeader: function( directoryName )
+    {
+        $.ajax( {
+            url: "backoffice?methodName=insertHeader&directoryName=" + directoryName,
+            success:jQuery.proxy( this.handleInsertHeader, this ),
+            error: jQuery.proxy( this.showErrors, [this] )
+        } );
+    },
 
     // HANDLES ********************************************************
@@ -67 +85 @@
     },
 
+    handleLaunchNcDump: function( result )
+    {
+        this.files = jQuery.parseJSON( result ).simulationFiles;
+        this.directories = jQuery.parseJSON( result ).simulationDirectories;
+        this.displayFiles();
+    },
+
+    handleInsertHeader: function( result )
+    {
+//        this.files = jQuery.parseJSON( result ).simulationFiles;
+//        this.directories = jQuery.parseJSON( result ).simulationDirectories;
+//        this.displayFiles();
+    },
+
     // DISPLAYS ********************************************************
     displayFiles: function()
     {
+        this.containerFileList_left.empty();
+        this.containerFileList_right.empty();
         var number = this.files.length;
+        jQuery.each( this.directories, jQuery.proxy( function( i, directory )
+        {
+            var divDirectory = $( document.createElement( "div" ) );
+            var divDirectoryName = $( document.createElement( "div" ) );
+            divDirectoryName.attr( {style:"float:left"} );
+            divDirectoryName.html( "- " + directory + "  " );
+            divDirectory.append( divDirectoryName );
+
+            var button = $( document.createElement( "button" ) );
+            button.addClass( "small negative" );
+            button.html( interfaceTexts["bo.simulation.save.header"] );
+            button.bind( 'click', [this, directory], jQuery.proxy( this.onClickInsertHeader, this ) );
+            divDirectory.append( button );
+
+            this.containerFileList_left.append( divDirectory );
+        }, this ) );
+
         jQuery.each( this.files, jQuery.proxy( function( i, file )
         {
-            if( (number / 2) > i )
-                this.containerFileList_left.append( "&nbsp;&nbsp;-&nbsp;" + file + "<BR/>" );
-            else
-                this.containerFileList_right.append( "&nbsp;&nbsp;-&nbsp;" + file + "<BR/>" );
+            this.containerFileList_right.append( "&nbsp;&nbsp;-&nbsp;" + file + "<BR/>" );
         }, this ) );
-
     },
 
@@ -193 +240 @@
     },
 
-    onClickRemove: function( dataset )
-    {
-        this.dataset = dataset;
-
-        this.containerErrors.hide();
-        this.hideRemove();
-        this.hideMove();
-        this.hideInsert();
-
-        this.displayFilesMove();
-
-        $( "#categoryNameInsert" ).val( this.dataset.categoryName );
-        $( "#datasetNameInsert" ).val( this.dataset.name );
-
-        if( window.confirm( interfaceTexts["bo.dataset.remove.confirm"] + " " + dataset.name + " ?" ) )
-            this.requestRemoveDataset();
-    },
-
-    onClickMove: function()
-    {
-        this.containerErrors.hide();
-        this.containerResultRemove.addClass( "disable" );
-        this.hideMove();
-        this.hideInsert();
-        this.requestFilesMove();
-    },
-
-    onClickInsert: function()
-    {
-        this.containerErrors.hide();
-        this.containerResultMove.addClass( "disable" );
-        this.hideInsert();
-
-        if( "" != $( "#categoryNameInsert" ).val() && "" != $( "#datasetNameInsert" ).val() && "" != $( "#versionInsert" ).val() )
-            this.requestDatasetInsert();
-        else
-            this.showErrors( interfaceTexts["bo.dataset.fields"] );
-    },
-
-    onClickCleanLocalisationAndFlag: function()
-    {
-        if( window.confirm( interfaceTexts["bo.cleanTables.confirm"] ) )
-            this.requestCleanLocalisationAndFlag();
+    onClickLaunchNcDump: function()
+    {
+        this.requestLaunchNcDump();
+    },
+
+    onClickInsertHeader: function( parameters )
+    {
+        var context = parameters.data[0];
+        var directoryName = parameters.data[1];
+        this.requestInsertHeader( directoryName );
     },
 

ether_megapoli/trunk/web/backoffice/simulation.jsp

@@ -35 +35 @@
             <div id="fileList_left" style="float:left"></div>
             <div id="fileList_right" style="float:right"></div>
+
+            <div class="containerButtons">
+                <button id="ncdumpButton" class="small positive" style="float:right"><bean:message key="bo.simulation.launchNcDump"/></button>
+            </div>
         </div>
 
@@ -106 +110 @@
         <script type="text/javascript">
             var interfaceTexts = $A( "" );
+            interfaceTexts["bo.simulation.save.header"] = '<bean:message key="bo.simulation.save.header"/>';
 
-            new interfaceBODataInsertion( ${pathSimulationFiles} );
+            new interfaceBODataInsertion( ${simulationFiles}, ${simulationDirectories} );
         </script>
 

ether_megapoli/trunk/web/resources/css/backoffice.css

@@ -86 +86 @@
     margin-right: 11px;
 }
+
+#fileList_left, #fileList_right {
+    margin: 0 40px;
+}

ether_megapoli/trunk/web/resources/css/megapoli.css

@@ -244 +244 @@
     width: 950px;
     margin-bottom: 10px;
+}
+
+.containerButtons {
+    float: right;
+    width: 800px;
+    margin-top: 12px;
 }
 

ether_megapoli/trunk/web/src/ApplicationResources_en.properties

@@ -658 +658 @@
 bo.simulation.database=Simulations in database
 bo.simulation.list=List of simulations
+bo.simulation.launchNcDump=Launch ncdump
+bo.simulation.save.header=Save header in database

ether_megapoli/trunk/web/src/com/ether/ControllerBackoffice.java

@@ -86 +86 @@
         final JSONObject jsonObject = new JSONObject();
         final String pathSimulation = getProperty( "directory.simulation" );
-        final File directory = new File( pathSimulation );
+
+        final List<String> files = EtherHelper.getOnlyFileNames( pathSimulation, ".nc" );
+        final List<String> directories = EtherHelper.getOnlyDirectorieNames( pathSimulation );
         jsonObject.put( "pathSimulation", pathSimulation );
-        jsonObject.put( "pathSimulationFiles", directory.list() );
+        jsonObject.put( "simulationFiles", files );
+        jsonObject.put( "simulationDirectories", directories );
         return jsonObject;
     }
@@ -94 +97 @@
     /** *********************************************************** **/
     /** *********************** CALLS ***************************** **/
+    /** *********************************************************** **/
+
+    /** *********************************************************** **/
+    /** *********************** USERS ***************************** **/
     /** *********************************************************** **/
     /**
@@ -293 +300 @@
     }
 
+    /** *********************************************************** **/
+    /** *********************** MCO ******************************* **/
+    /** *********************************************************** **/
     /**
      * This method sorts the MCO's requests
@@ -441 +451 @@
 
 
+    /** *********************************************************** **/
+    /** *********************** DATASETS ************************** **/
+    /** *********************************************************** **/
     /**
      * This method sorts the datasets
@@ -568 +581 @@
 //    }
 
+    /** *********************************************************** **/
+    /** *********************** SIMULATIONS *********************** **/
+    /** *********************************************************** **/
+    /**
+     * @return
+     * @throws WebException
+     */
+    @ControllerMethod(jsonResult = true)
+    public JSONObject launchNCDumpInSimulationDirectory()
+            throws WebException
+    {
+        final JSONObject jsonObject = new JSONObject();
+        try
+        {
+            final String pathSimulation = getProperty( "directory.simulation" );
+            getEtherService().launchNCDumpInSimulationDirectory( pathSimulation );
+
+            final List<String> files = EtherHelper.getOnlyFileNames( pathSimulation, ".nc" );
+            final List<String> directories = EtherHelper.getOnlyDirectorieNames( pathSimulation );
+            jsonObject.put( "simulationFiles", files );
+            jsonObject.put( "simulationDirectories", directories );
+        }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_PROCESS_SIMULATION_NCDUMP, e );
+        }
+        return jsonObject;
+    }
+
+    @ControllerMethod(jsonResult = true)
+    public JSONObject insertHeader( @NotNull @ParamName(ParameterConstants.PARAMETER_DIRECTORY_NAME) final String directoryName )
+            throws WebException
+    {
+        final JSONObject jsonObject = new JSONObject();
+        try
+        {
+            final String pathSimulation = getProperty( "directory.simulation" );
+            getEtherService().insertHeader( pathSimulation, directoryName );
+        }
+        catch( ServiceException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_INSERT_HEADER, e );
+        }
+        return jsonObject;
+    }
+
+    /** *********************************************************** **/
+    /** ************************ PRIVATES ************************* **/
+    /** *********************************************************** **/
     /**
      * This method create and send an email to the user to inform of the administrator decision

ether_megapoli/trunk/web/src/com/ether/WebException.java

@@ -59 +59 @@
         DOWNLOAD_DIRECTORY_DOESNOT_EXISTS,
         ERROR_NO_CLEAN_LOCALISATION_AND_FLAG,
-        ERROR_TO_READ_FILE_PROPERTIES
+        ERROR_TO_READ_FILE_PROPERTIES,
+        ERROR_PROCESS_SIMULATION_NCDUMP,
+        ERROR_INSERT_HEADER
     }
 

ether_megapoli/trunk/web/visualization/visu_simulation.jsp

@@ -10 +10 @@
 
     <tiles:put name="insertCss" type="string">
-        <ether:htmlCss cssFile="blueprint-css/blueprint/src/grid"/>
-        <ether:htmlCss cssFile="visu_parameter_by_pf"/>
         <ether:htmlCss cssFile="select"/>
         <ether:htmlCss cssFile="calendar/anytime"/>
@@ -20 +18 @@
         <ether:htmlJs jsFile="classesForJQuery/etherClasses"/>
         <ether:htmlJs jsFile="classesForJQuery/megapoliClasses"/>
-        <ether:htmlJsp jspFile="visu_parameter_by_pf-script"/>
-        <ether:htmlJs jsFile="classesForJQuery/Select"/>
+        <ether:htmlJsp jspFile="visu_simulation-script"/>
         <ether:htmlJs jsFile="classesForJQuery/Loading"/>
         <ether:htmlJs jsFile="calendar/anytime"/>