Changeset 490 for tapas/web

Timestamp:

04/26/12 15:42:13 (12 years ago)

Author:

rboipsl

Message:

ajout onglets

Location:

tapas/web

Files:

• init.jsp (modified) (1 diff)
• project/formTapas.jsp (modified) (5 diffs)
• project/formTapas_script.jsp (modified) (21 diffs)
• resources/css/button.css (modified) (1 diff)
• resources/css/tapas.css (modified) (15 diffs)
• resources/js/classesForJQuery/LoginButton.js (modified) (1 diff)
• resources/js/classesForJQuery/Tab.js (copied) (copied from tapas/web/resources/js/classesForJQuery/Button.js) (5 diffs)
• resources/js/tools/controls.js (modified) (5 diffs)
• resources/templates/templateEther_script.jsp (modified) (1 diff)
• src/com/ether/Controller.java (modified) (4 diffs)
• src/messages_en.properties (modified) (2 diffs)
• src/messages_fr.properties (modified) (3 diffs)

tapas/web/init.jsp

@@ -20 +20 @@
             <div id="errors"><spring:message code="${errors}"/></div>
         </c:if>
-                            Home
+
+
+
     </tiles:put>
 

tapas/web/project/formTapas.jsp

@@ -23 +23 @@
         <ether:htmlJsp jspFile="formTapas_script"/>
         <ether:htmlJs jsFile="tools/controls"/>
+        <ether:htmlJs jsFile="classesForJQuery/Tab"/>
     </tiles:put>
 
@@ -35 +36 @@
     <tiles:put name="body" type="string">
 
+        <div class="containerTabs" id="tab"></div>
+
         <div class="containerForm" id="formulaire"></div>
 
-        <div id="errors"></div>
+        <div id="errForm" class="errorsForm"></div>
 
         <script type="text/javascript">
@@ -43 +46 @@
 
             tapasTexts["label.submitButton"] = '<spring:message code="label.submitButton"/>';
+            tapasTexts["label.addButton"] = '<spring:message code="label.addButton"/>';
+
             tapasTexts["<%=WebException.WebCode.ERROR_JSON_TAPAS_IS_NULL%>"] = "<spring:message code="error.ERROR_JSON_TAPAS_IS_NULL"/>";
             tapasTexts["<%=SpectralUnit.NM_STANDARD%>"] = "<spring:message code="label.spectralUnit.NM_STANDARD"/>";
@@ -83 +88 @@
             tapasTexts["label.eo3"]="<spring:message code="label.eo3"/>";
             tapasTexts["text.select"]="<spring:message code="text.select"/>";
+            tapasTexts["text.toselect"]="<spring:message code="text.toselect"/>";
 
 
@@ -90 +96 @@
             tapasTexts["text.badvalue"]="<spring:message code="text.badvalue"/>";
 
+            tapasTexts["label.requete"]="<spring:message code="label.requete"/>";
+
+            tapasTexts["label.delButton"]="<spring:message code="label.delButton"/>";
 
 
 
-            var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonObservatories},${jSonSpectralUnits},${jSonInstrumentalFunctions},${jSonClimatoReferences});
+
+
+
+            //var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonObservatories},${jSonSpectralUnits},${jSonInstrumentalFunctions},${jSonClimatoReferences});
+            var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonSpectralUnits},${jSonInstrumentalFunctions},${jSonClimatoReferences});
 
         </script>

tapas/web/project/formTapas_script.jsp

@@ -1 @@
-
 <script type="text/javascript">
 
 
-
 var InterfaceTapas = Class.create( {
 
-    initialize: function( jsonFileFormats, jsonYesNos, jsonObservatories, jsonSpectralUnits, jsonInstrumentalFunctions, jsonClimatoReferences )
+    //initialize: function( jsonFileFormats, jsonYesNos, jsonObservatories, jsonSpectralUnits, jsonInstrumentalFunctions, jsonClimatoReferences )
+    initialize: function( jsonFileFormats, jsonYesNos, jsonSpectralUnits, jsonInstrumentalFunctions, jsonClimatoReferences )
     {
         /** *********** CONTAINERS *********** **/
         this.containerForm = $( "#formulaire" );
-        this.containerErrors = $( "#errors" );
+        //this.containerErrors = $( "#errors" );
+        this.containerErrors = $( "#errForm" );
         this.containerCenter = $( "#containerCenter" );
+        this.containerTabs = $( "#tab" );
 
         this.jSonFileFormats = jsonFileFormats || null;
         this.jSonYesNos = jsonYesNos || null;
-        this.jSonObservatories = jsonObservatories || null;
+        //this.jSonObservatories = jsonObservatories || false;
+        this.jSonObservatories = false;
         this.jSonSpectralUnits = jsonSpectralUnits || null;
         this.jSonInstrumentalFunctions = jsonInstrumentalFunctions || null;
         this.jSonClimatoReferences = jsonClimatoReferences || null;
-
-        this.containerErrors.hide();
-
+        this.nbRequest = 1;
+        this.tabActive = false;
+
+
+        this.containerErrors.show();
+
+        var submitButton = new Button( {value:tapasTexts["label.submitButton"], parent:this.containerCenter, id:"button_submit", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickSubmit, this )} );
+        this.addRequestButton = new Button( {value:tapasTexts["label.addButton"], parent:this.containerCenter, id:"button_add", className: "positive", onClick:jQuery.proxy( this.onClickAdd, this )} );
+        this.delRequestButton = new Button( {value:tapasTexts["label.delButton"], parent:this.containerCenter, id:"button_del", className: "negative", onClick:jQuery.proxy( this.onClickDel, this )} );
+        this.delRequestButton.disable();
 
         this.createForm();
+        this.tabActive = this.createTab();
 
     },
@@ -29 +39 @@
 
     // CREATES ********************************************************
-    createCalendar: function( containerCalendar, texte )
+    createTab:function()
+    {
+
+        var ntab = new Tab( {value:tapasTexts["label.requete"] + " " + this.nbRequest, parent:this.containerTabs, numTab: this.nbRequest, id:"tab_request" + this.nbRequest, className: "tab_class", onClick:jQuery.proxy( this.onClickTab, this )} );
+        ntab.active();
+        return ntab;
+
+    },
+
+
+    createCalendar: function( containerCalendar, texte, inputDateId )
     {
         // Create input for date text
-        var inputDateId = "iobservation_date";
         var tr = $( document.createElement( "tr" ) );
         var td1 = $( document.createElement( "td" ) );
@@ -45 +64 @@
 
 
-         td2.attr({colspan:4});
+        td2.attr( {colspan:4} );
         td2.append( inputDate );
         tr.append( td2 );
@@ -60 +79 @@
 
         var currentDate = new Date();
-        $( "#iobservation_date" ).val( this.calendarConverter.format( currentDate ) );
+        $( "#" + inputDateId ).val( this.calendarConverter.format( currentDate ) );
+        $( "#" + inputDateId ).addClass( "calendar" );
+
     },
 
 
     // CREATES ********************************************************
-    createTime: function( containerCalendar, texte, input )
+    createTime: function( containerCalendar, texte, inputDateId )
     {
         // Create input for date text
-        var inputDateId = input;
         var tr = $( document.createElement( "tr" ) );
         var td1 = $( document.createElement( "td" ) );
@@ -81 +101 @@
 
 
-        td2.attr({colspan:3});
+        td2.attr( {colspan:3} );
         td2.append( inputDate );
         tr.append( td2 );
         containerCalendar.append( tr );
 
-        // Calendar
-        this.calendarFormat = "%H:%i:%s";
-        this.calendarConverter = new AnyTime.Converter( { format: this.calendarFormat } );
-
-        AnyTime.picker( inputDateId, { format: this.calendarFormat, firstDOW: 1,
+        // Time
+        this.timeFormat = "%H:%i:%s";
+        this.timeConverter = new AnyTime.Converter( { format: this.timeFormat } );
+
+
+        AnyTime.picker( inputDateId, { format: this.timeFormat, firstDOW: 1,
             labelTitle: "Select hour", labelHour: "Hour", labelMinute: "Minute", labelSecond: "Second"
         } );
 
-        $( "#"+inputDateId ).val( "00:00:00" );
-    },
+
+        $( "#" + inputDateId ).val( "00:00:00" );
+        $( "#" + inputDateId ).addClass( "time" );
+    },
+
 
     createTr: function( texte, inputId, container, textesup )
@@ -134 +158 @@
         return selectYesNos;
     },
+
 
 
@@ -154 +179 @@
         td3.html( texte2 );
         td5.html( textesup );
-        td1.attr({class:"containerLabel"});
-        td3.attr({class:"containerLabel3"});
-        td5.attr({class:"containerLabel2"});
+        td1.attr( {class:"containerLabel"} );
+        td3.attr( {class:"containerLabel3"} );
+        td5.attr( {class:"containerLabel2"} );
 
         td2.append( input1 );
@@ -171 +196 @@
 
 
+
     createTrList: function( texte, inputId, container, type )
     {
@@ -184 +210 @@
 
         tr.append( td1 );
-        if( type == 'format' ) this.displayFileFormats( td2 );
+        if( type == 'format' ) this.displayFileFormats( td2, inputId );
         else if( type == 'yesno' )
         {
-            if( inputId == "ih2oe" ) this.select_ih2oe = this.createSelectYesNo( td2, inputId );
-            else if( inputId == "io2e" ) this.select_io2e = this.createSelectYesNo( td2, inputId );
-            else if( inputId == "io3e" ) this.select_io3e = this.createSelectYesNo( td2, inputId );
-            else if( inputId == "ico2e" ) this.select_ico2e = this.createSelectYesNo( td2, inputId );
-            else if( inputId == "irextinction" ) this.select_irextinction = this.createSelectYesNo( td2, inputId );
+            if( (/^(ih2oe_[1-9]+)$/.test( inputId )  ) ) this.select_ih2oe = this.createSelectYesNo( td2, inputId );
+            else if( (/^(io2e_[1-9]+)$/.test( inputId )  ) ) this.select_io2e = this.createSelectYesNo( td2, inputId );
+            else if( (/^(io3e_[1-9]+)$/.test( inputId )  ) ) this.select_io3e = this.createSelectYesNo( td2, inputId );
+            else if( (/^(ico2e_[1-9]+)$/.test( inputId )  ) ) this.select_ico2e = this.createSelectYesNo( td2, inputId );
+            else if( (/^(irextinction_[1-9]+)$/.test( inputId )  ) ) this.select_irextinction = this.createSelectYesNo( td2, inputId );
         }
-        else if( type == 'observatories' ) this.displayObservatories( td2 );
-        else if( type == 'spectralUnit' ) {
-            this.displaySpectralUnits( td2 );
+        else if( type == 'observatories' ) this.displayObservatories( td2, inputId );
+        else if( type == 'spectralUnit' )
+        {
+            this.displaySpectralUnits( td2, inputId );
             //td2.attr({colspan:3});
         }
-        else if( type == 'ilsf' ) this.displayInstrumentalFunctions( td2 );
-        else if( type == 'climatoReference' ) {
-            this.displayClimatoReferences( td2 );
-
-
+        else if( type == 'ilsf' ) this.displayInstrumentalFunctions( td2, inputId );
+        else if( type == 'climatoReference' )
+        {
+            this.displayClimatoReferences( td2, inputId );
         }
 
-        td2.attr({colspan:3});
+        td2.attr( {colspan:3} );
         tr.append( td2 );
         container.append( tr );
     },
-
-
-
 
 
@@ -230 +253 @@
     },
 
+
     // HANDLES ******************************************************** = retours ajax
     handleCreateXML: function( result )
@@ -241 +265 @@
     onClickSubmit: function()
     {
-        if ( true && isDeg($( "#ide").val(),tapasTexts["label.ide"],tapasTexts["text.badvalue"] )) {
-
-            if ( confirm(tapasTexts["confirm"]) ) {
-                this.containerErrors.hide();
-                this.requestCreateXML();
+        // if( this.validFields() )
+        // {
+        if( confirm( tapasTexts["confirm"] ) )
+        {
+            this.containerErrors.hide();
+            this.requestCreateXML();
+        }
+        // }
+    },
+
+
+    onClickAdd: function()
+    {
+        //if( this.validFields() )
+        if( true )
+        {
+            this.containerErrors.hide();
+            this.nbRequest++;
+
+            //tabs
+            $( ".tab_class" ).removeClass( "activated" );
+            this.createTab();
+
+            //formulaires
+            $( ".divAll" ).hide();
+            this.createForm();
+
+            this.delRequestButton.enable();
+            if( this.nbRequest == 9) this.addRequestButton.disable();
+            else this.addRequestButton.enable();
+        }
+    },
+
+
+    onClickDel: function()
+    {
+        //if( this.validFields() )
+        if( true )
+        {
+            var numCurrent = this.tabActive.numTab;
+
+            //tabs
+            $( ".tab_class" ).removeClass( "activated" );
+            $( "#tab_request" + numCurrent ).remove();
+            //$( "#tab_request" + this.last ).addClass( "activated" );
+            $( "#tab_request1" ).addClass( "activated" );
+
+            //formulaires
+            $( ".divAll" ).hide();
+            $( "#all_" + numCurrent ).remove();
+
+
+            var i;
+            var z=1;
+
+            for (i=1 ; i<= this.nbRequest ; i++ ) {
+               if (i!=numCurrent) {
+                    //alert(document.getElementById("tab_request"+i).getAttribute("id"));
+                   $( "#tab_request"+i).html("Request "+z);
+                   document.getElementById("tab_request"+i).id="tab_request"+z;
+
+                   document.getElementById("select_iobservatory_"+i).id="select_iobservatory_"+z;
+                   document.getElementById("iobservation_date_"+i).id="iobservation_date_"+z;
+                   document.getElementById("select_ispectral_choice_"+i).id="select_ispectral_choice_"+z;
+                   document.getElementById("iminspectral_ranger_"+i).id="iminspectral_ranger_"+z;
+                   document.getElementById("imaxspectral_ranger_"+i).id="imaxspectral_ranger_"+z;
+                   document.getElementById("select_ifunction_"+i).id="select_ifunction_"+z;
+                   document.getElementById("select_icr_"+i).id="select_icr_"+z;
+                   document.getElementById("ira_"+i).id="ira_"+z;
+                   document.getElementById("ide_"+i).id="ide_"+z;
+                   document.getElementById("iza_"+i).id="iza_"+z;
+                   document.getElementById("irp_"+i).id="irp_"+z;
+                   document.getElementById("isr_"+i).id="isr_"+z;
+                   document.getElementById("select_iformat_"+i).id="select_iformat_"+z;
+                   document.getElementById("select_irextinction_"+i).id="select_irextinction_"+z;
+                   document.getElementById("select_ih2oe_"+i).id="select_ih2oe_"+z;
+                   document.getElementById("select_io2e_"+i).id="select_io2e_"+z;
+                   document.getElementById("select_io3e_"+i).id="select_io3e_"+z;
+                   document.getElementById("select_ico2e_"+i).id="select_ico2e_"+z;
+
+
+                   document.getElementById("all_"+i).id="all_"+z;
+
+
+
+                   z++;
+               }
             }
+
+            $( "#all_1" ).show();
+
+            this.delRequestButton.disable();
+            this.nbRequest--;
+
+            if( this.nbRequest <= 1 )
+                this.delRequestButton.disable();
+
+            if( this.nbRequest == 9) this.addRequestButton.disable();
+            else this.addRequestButton.enable();
+
         }
     },
 
 
+    onClickTab: function( tabClicked )
+    {
+        //tabs
+        this.tabActive = tabClicked;
+        $( ".tab_class" ).removeClass( "activated" );
+        this.tabActive.active();
+
+        //forms
+        $( ".divAll" ).hide();
+        $( "#all_" + this.tabActive.numTab ).show();
+
+        if( 1 == this.tabActive.numRequest ) this.delRequestButton.disable();
+        else this.delRequestButton.enable();
+    },
+
+
+
     // OTHERS ********************************************************
-    displayFileFormats: function( container )
+    displayFileFormats: function( container, id )
     {
         var paramSelect = new Object();
-        paramSelect.id = "select_formats";
+        paramSelect.id = "select_" + id;
         paramSelect.parent = container;
         this.selectFormats = new Select( paramSelect );
@@ -266 +401 @@
 
 
-    displayObservatories: function( container )
+    displayObservatories: function( container, id )
     {
         var paramSelect = new Object();
-        paramSelect.id = "select_observatory";
+        paramSelect.id = "select_" + id;
         paramSelect.parent = container;
         this.selectObservatories = new Select( paramSelect );
         //ajouter select vide avec add
-        this.selectObservatories.add( "-1", "-- "+tapasTexts["text.select"]+" --" );
+        this.selectObservatories.add( "-1", "-- " + tapasTexts["text.select"] + " --" );
         jQuery.each( this.jSonObservatories, jQuery.proxy( function ( i, jsonObservatory )
         {
@@ -282 +417 @@
 
 
-    displaySpectralUnits: function( container )
+    displaySpectralUnits: function( container, id )
     {
         var paramSelect = new Object();
-        paramSelect.id = "select_spectral_unit";
+        paramSelect.id = "select_" + id;
         paramSelect.parent = container;
         this.selectSpectralUnits = new Select( paramSelect );
         //ajouter select vide avec add
-        this.selectSpectralUnits.add( "-1", "-- "+tapasTexts["text.select"]+" --" );
+        this.selectSpectralUnits.add( "-1", "-- " + tapasTexts["text.select"] + " --" );
         jQuery.each( this.jSonSpectralUnits, jQuery.proxy( function ( i, jsonSpectralUnit )
         {
@@ -298 +433 @@
     },
 
-    displayInstrumentalFunctions: function( container )
+    displayInstrumentalFunctions: function( container, id )
     {
         var paramSelect = new Object();
-        paramSelect.id = "select_instrumental_function";
+        paramSelect.id = "select_" + id;
         paramSelect.parent = container;
         this.selectInstrumentalFunctions = new Select( paramSelect );
@@ -313 +448 @@
 
 
-    displayClimatoReferences: function( container )
+    displayClimatoReferences: function( container, id )
     {
         var paramSelect = new Object();
-        paramSelect.id = "select_climato_reference";
+        paramSelect.id = "select_" + id;
         paramSelect.parent = container;
         this.selectClimatoReferences = new Select( paramSelect );
@@ -330 +465 @@
     showErrors: function( result )
     {
-        this.containerErrors.show();
-        this.containerErrors.html( tapasTexts[result.responseText] );
+        //this.containerErrors.show();
+        // this.containerErrors.html( tapasTexts[result.responseText] );
     },
 
@@ -338 +473 @@
     createForm: function()
     {
-        //Creation div tab
+        this.divErreurs = $( document.createElement( "div" ) );
+        this.divErreurs.addClass( "errorsForm" );
+        this.divErreurs.hide();
+
+        var divAll = $( document.createElement( "div" ) );
+        divAll.attr( {id:"all_" + this.nbRequest, class:"divAll"} );
+
+
+        //Creation div
         var divPreference = $( document.createElement( "div" ) );
         var tabPreference = $( document.createElement( "table" ) );
-        tabPreference.attr({cellspacing:3});
+        tabPreference.attr( {cellspacing:3} );
 
         var divObservation = $( document.createElement( "div" ) );
         var tabObservation = $( document.createElement( "table" ) );
         //tabObservation.attr({border:1});
-        tabObservation.attr({cellspacing:3});
+        tabObservation.attr( {cellspacing:3} );
 
 
@@ -354 +497 @@
 
         var fieldSetObservation = $( document.createElement( "fieldset" ) );
-        fieldSetObservation.addClass("cfs1");
-        divObservation.append(fieldSetObservation);
+        fieldSetObservation.addClass( "cfs1" );
+        divObservation.append( fieldSetObservation );
 
         var legendObservation = $( document.createElement( "legend" ) );
-        legendObservation.html("Observation");
-        fieldSetObservation.append(legendObservation);
-        legendObservation.addClass("containerField");
+        legendObservation.html( "Observation" );
+        fieldSetObservation.append( legendObservation );
+        legendObservation.addClass( "containerField" );
 
         var fieldSetPreference = $( document.createElement( "fieldset" ) );
-        fieldSetPreference.addClass("cfs2");
-        divPreference.append(fieldSetPreference);
+        fieldSetPreference.addClass( "cfs2" );
+        divPreference.append( fieldSetPreference );
 
         var legendPreference = $( document.createElement( "legend" ) );
-        legendPreference.html(tapasTexts["label.preferences"]);
-        fieldSetPreference.append(legendPreference);
-        legendPreference.addClass("containerField");
-
-         fieldSetObservation.append( tabObservation );
-        divObservation.addClass("divObservation");
-        this.containerForm.append( divObservation );
+        legendPreference.html( tapasTexts["label.preferences"] );
+        fieldSetPreference.append( legendPreference );
+        legendPreference.addClass( "containerField" );
+
+        fieldSetObservation.append( tabObservation );
+        divObservation.addClass( "divObservation" );
+        divAll.append( divObservation );
+
 
         divAtmosphere.append( tabAtmosphere );
@@ -381 +525 @@
 
         fieldSetPreference.append( tabPreference );
-        divPreference.addClass("divPreference");
-        this.containerForm.append( divPreference );
+        divPreference.addClass( "divPreference" );
+        divAll.append( divPreference );
+
+        this.containerForm.append( divAll );
+        this.containerForm.append( this.divErreurs );
         //this.tabInput = new Array(3);
 
-        this.createTrList( tapasTexts["label.format"], "iformat", tabPreference, 'format' );
-        this.createTrList( tapasTexts["label.era"], "irextinction", tabPreference, 'yesno' );
-        this.createTrList( tapasTexts["label.eh2o"], "ih2oe", tabPreference, 'yesno' );
-        this.createTrList( tapasTexts["label.eo3"], "io3e", tabPreference, 'yesno' );
-        this.createTrList( tapasTexts["label.eo2"], "io2e", tabPreference, 'yesno' );
-        this.createTrList( tapasTexts["label.eco2"], "ico2e", tabPreference, 'yesno' );
-
-        this.createTrList( tapasTexts["label.observatory"], "iobservatory", tabObservation, 'observatories' );
-        this.createCalendar( tabObservation, tapasTexts["label.datemesure"] );
+        this.createTrList( tapasTexts["label.format"], "iformat_" + this.nbRequest, tabPreference, 'format' );
+        this.createTrList( tapasTexts["label.era"], "irextinction_" + this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.eh2o"], "ih2oe_" + this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.eo3"], "io3e_" + this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.eo2"], "io2e_" + this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.eco2"], "ico2e_" + this.nbRequest, tabPreference, 'yesno' );
+
+        this.createTrList( tapasTexts["label.observatory"], "iobservatory_" + this.nbRequest, tabObservation, 'observatories' );
+        this.createCalendar( tabObservation, tapasTexts["label.datemesure"], "iobservation_date_" + this.nbRequest );
 
         //unite
-        this.createTrList( tapasTexts["label.spectralUnit"], "ispectral_choice", tabObservation, 'spectralUnit' );
-        this.createTr2Input( tapasTexts["label.spectralRange"], tapasTexts["label.to"], "iminspectral_ranger", "imaxspectral_ranger", tabObservation, "[350,2500] nm" );
+        this.createTrList( tapasTexts["label.spectralUnit"], "ispectral_choice_" + this.nbRequest, tabObservation, 'spectralUnit' );
+        this.createTr2Input( tapasTexts["label.spectralRange"], tapasTexts["label.to"], "iminspectral_ranger_" + this.nbRequest, "imaxspectral_ranger_" + this.nbRequest, tabObservation, "[350,2500] nm" );
 
         //fonction instrumentale
-        this.createTrList( tapasTexts["label.ifunction"], "ifunction", tabObservation, "ilsf" );
+        this.createTrList( tapasTexts["label.ifunction"], "ifunction_" + this.nbRequest, tabObservation, "ilsf" );
         //reference climato
         //this.createTrList( tapasTexts["label.climato"], "icr", tabAtmosphere, "climatoReference" );
-        this.createTrList( tapasTexts["label.climato"], "icr", tabObservation, "climatoReference" );
+        this.createTrList( tapasTexts["label.climato"], "icr_" + this.nbRequest, tabObservation, "climatoReference" );
 
 
         //this.createTr( tapasTexts["label.ira"], "ira", tabObservation );
-        this.createTime( tabObservation, tapasTexts["label.ira"],"ira" );
-        this.createTr( tapasTexts["label.ide"],"ide", tabObservation,"hh:mm:ss.ms [-90,90] &deg;" );
-        this.createTr( tapasTexts["label.iza"], "iza", tabObservation, "[0,90] &deg;" );
-
-        this.createTr( tapasTexts["label.resolution"], "irp", tabObservation, "" );
-        this.createTr( tapasTexts["label.ratio"], "isr", tabObservation, "" );
+        this.createTime( tabObservation, tapasTexts["label.ira"], "ira_" + this.nbRequest );
+        this.createTr( tapasTexts["label.ide"], "ide_" + this.nbRequest, tabObservation, "hh:mm:ss.ms [-90,90] &deg;" );
+        this.createTr( tapasTexts["label.iza"], "iza_" + this.nbRequest, tabObservation, "[0,90] &deg;" );
+
+        this.createTr( tapasTexts["label.resolution"], "irp_" + this.nbRequest, tabObservation, "" );
+        this.createTr( tapasTexts["label.ratio"], "isr_" + this.nbRequest, tabObservation, "" );
+
 
         //jQuery.proxy permet d'envoyer le contexte this courant
-        var submitButton = new Button( {value:tapasTexts["label.submitButton"], parent:this.containerCenter, id:"button_submit", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickSubmit, this )} );
 
     },
@@ -423 +570 @@
     createTapasObject: function()
     {
-        // PREFERENCE
-        var preference = new Object();
-
-        preference.format = new Object();
-        //toutes les valeurs possibles
-        preference.format.firstValue = this.selectFormats.getValuesInString();
-
-        //la valeur selectionnee
-        preference.format.secondValue = this.selectFormats.getValue();
-
-        preference.rayleighExtinction = new Object();
-        preference.rayleighExtinction.firstValue = this.select_ih2oe.getValuesInString();
-        preference.rayleighExtinction.secondValue =this.select_irextinction.getValue();
-
-
-        preference.h2oExtinction = new Object();
-        preference.h2oExtinction.firstValue = this.select_ih2oe.getValuesInString();
-        preference.h2oExtinction.secondValue = this.select_ih2oe.getValue();
-
-
-        preference.o3Extinction = new Object();
-        preference.o3Extinction.firstValue = this.select_io3e.getValuesInString();
-        preference.o3Extinction.secondValue = this.select_io3e.getValue();
-
-        preference.o2Extinction = new Object();
-        preference.o2Extinction.firstValue = this.select_io2e.getValuesInString();
-        preference.o2Extinction.secondValue = this.select_io2e.getValue();
-
-        preference.co2Extinction = new Object();
-        preference.co2Extinction.firstValue = this.select_ico2e.getValuesInString();
-        preference.co2Extinction.secondValue = this.select_ico2e.getValue();
-
-
-        // OBSERVATION
-        var observatory = new Object();
-
-        observatory.id = this.selectObservatories.getValue();
-
-        // Los
-        var los = new Object();
-
-
-        los.raJ2000 = $( "#ira" ).val();
-        los.decJ2000 = $( "#ide" ).val();
-
-
-        los.zenithAngle = $( "#iza" ).val();
-
-
-        // Instrument
-        var instrument = new Object();
-
-        instrument.ilsfChoice = new Object();
-        instrument.ilsfChoice.firstValue = this.selectInstrumentalFunctions.getValuesInString();
-        instrument.ilsfChoice.secondValue = this.selectInstrumentalFunctions.getValue();
-
-        instrument.spectralChoice = new Object();
-        this.selectSpectralUnits.remove("-1");
-        instrument.spectralChoice.firstValue = this.selectSpectralUnits.getValuesInString();
-        instrument.spectralChoice.secondValue = this.selectSpectralUnits.getValue();
-
-        instrument.spectralRange = $( "#iminspectral_ranger" ).val()+' '+$( "#imaxspectral_ranger" ).val();
-
-
-        instrument.resolvingPower=new Object();
-        instrument.resolvingPower.secondValue=$( "#irp" ).val();
-
-        instrument.samplingRatio = new Object();
-        instrument.samplingRatio.secondValue = $( "#isr" ).val();
-
-        var observation = new Object();
-        observation.date = this.calendarConverter.parse( $( "#iobservation_date" ).val() );
-        observation.observatory = observatory;
-
-        observation.los = los;
-        observation.instrument = instrument;
-
-
-        // ATMOSPHERE
-        var atmosphere = new Object();
-
-        atmosphere.reference = new Object();
-        atmosphere.reference.firstValue = this.selectClimatoReferences.getValuesInString();
-        atmosphere.reference.secondValue = this.selectClimatoReferences.getValue();
-
-
-        // REQUEST
-        var request = new Object();
-        request.id = 1;
-        request.preference = preference;
-        request.observation = observation;
-        request.atmosphere = atmosphere;
 
         var requests = new Array();
-        requests[0] = request;
+
+        for( var i = 1; i <= this.nbRequest; i++ )
+        {
+            // PREFERENCE
+            var preference = new Object();
+
+            preference.format = new Object();
+            //toutes les valeurs possibles
+            preference.format.firstValue = this.selectFormats.getValuesInString();
+
+            //la valeur selectionnee
+            preference.format.secondValue = this.selectFormats.getValue();
+
+            preference.rayleighExtinction = new Object();
+            preference.rayleighExtinction.firstValue = this.select_ih2oe.getValuesInString();
+            preference.rayleighExtinction.secondValue = this.select_irextinction.getValue();
+
+
+            preference.h2oExtinction = new Object();
+            preference.h2oExtinction.firstValue = this.select_ih2oe.getValuesInString();
+            preference.h2oExtinction.secondValue = this.select_ih2oe.getValue();
+
+
+            preference.o3Extinction = new Object();
+            preference.o3Extinction.firstValue = this.select_io3e.getValuesInString();
+            preference.o3Extinction.secondValue = this.select_io3e.getValue();
+
+            preference.o2Extinction = new Object();
+            preference.o2Extinction.firstValue = this.select_io2e.getValuesInString();
+            preference.o2Extinction.secondValue = this.select_io2e.getValue();
+
+            preference.co2Extinction = new Object();
+            preference.co2Extinction.firstValue = this.select_ico2e.getValuesInString();
+            preference.co2Extinction.secondValue = this.select_ico2e.getValue();
+
+
+            // OBSERVATION
+            var observatory = new Object();
+
+            //observatory.id = this.selectObservatories.getValue();
+            observatory.id = "3";
+
+            // Los
+            var los = new Object();
+
+
+            los.raJ2000 = $( "#ira_" + i ).val();
+            los.decJ2000 = $( "#ide_" + i ).val();
+
+
+            los.zenithAngle = $( "#iza_" + i ).val();
+
+
+            // Instrument
+            var instrument = new Object();
+
+            instrument.ilsfChoice = new Object();
+            instrument.ilsfChoice.firstValue = this.selectInstrumentalFunctions.getValuesInString();
+            instrument.ilsfChoice.secondValue = this.selectInstrumentalFunctions.getValue();
+
+            instrument.spectralChoice = new Object();
+
+            this.selectSpectralUnits.remove( "-1" );
+            instrument.spectralChoice.firstValue = this.selectSpectralUnits.getValuesInString();
+            instrument.spectralChoice.secondValue = this.selectSpectralUnits.getValue();
+
+            instrument.spectralRange = $( "#iminspectral_ranger_" + i ).val() + ' ' + $( "#imaxspectral_ranger_" + i ).val();
+
+
+            instrument.resolvingPower = new Object();
+            instrument.resolvingPower.firstValue = "0";
+            instrument.resolvingPower.secondValue = $( "#irp_" + i ).val();
+
+            instrument.samplingRatio = new Object();
+            instrument.samplingRatio.firstValue = "0";
+            instrument.samplingRatio.secondValue = $( "#isr_" + i ).val();
+
+            var observation = new Object();
+            observation.date = this.calendarConverter.parse( $( "#iobservation_date_" + i ).val() );
+            observation.observatory = observatory;
+
+            observation.los = los;
+            observation.instrument = instrument;
+
+
+            // ATMOSPHERE
+            var atmosphere = new Object();
+
+            atmosphere.reference = new Object();
+            atmosphere.reference.firstValue = this.selectClimatoReferences.getValuesInString();
+            atmosphere.reference.secondValue = this.selectClimatoReferences.getValue();
+
+
+            // REQUEST
+            var request = new Object();
+            request.id = i;
+            request.preference = preference;
+            request.observation = observation;
+            request.atmosphere = atmosphere;
+
+            requests[i] = request;
+        }
 
         // TAPAS
@@ -525 +681 @@
 
         return tapas;
+    },
+
+    validFields: function()
+    {
+        return (
+                isSup( this.selectObservatories.getValue(), 0, tapasTexts["label.observatory"], tapasTexts["text.toselect"], this.containerErrors ) &&
+                        isDiff( this.selectSpectralUnits.getValue(), -1, tapasTexts["label.spectralUnit"], tapasTexts["text.toselect"] ) &&
+                        isValidRange( $( "#iminspectral_ranger" ).val(), $( "#imaxspectral_ranger" ).val(), this.selectSpectralUnits.getValue(), tapasTexts["label.spectralRange"], tapasTexts["text.badvalue"] ) &&
+                        isDeg( $( "#ide" ).val(), tapasTexts["label.ide"], tapasTexts["text.badvalue"] ) &&
+                        isValidNum( $( "#iza" ).val(), tapasTexts["label.iza"], tapasTexts["text.badvalue"] ) && isBetween( $( "#iza" ).val(), 0, 90, tapasTexts["label.iza"], tapasTexts["text.badvalue"] ) &&
+                        isValidNum( $( "#irp" ).val(), tapasTexts["label.resolution"], tapasTexts["text.badvalue"] ) && isSup( $( "#irp" ).val(), 1, tapasTexts["label.resolution"], tapasTexts["text.badvalue"] ) &&
+                        isValidNum( $( "#isr" ).val(), tapasTexts["label.ratio"], tapasTexts["text.badvalue"] ) && isSup( $( "#isr" ).val(), 1, tapasTexts["label.ratio"], tapasTexts["text.badvalue"] )
+                )
     }
 
+
     /*,
 
-    isEmpty: function(string){
-        return (string.trim()=='');
-    },
-
-
-    isMail: function(email){
-        return (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email));
-    },
-
-
-    isInt: function(number){
-        return (/^[0-9]+$/.test(number));
-    },
-
-
-    isFloat: function(number){
-        return (/^[0-9]+(\.[0-9]+)?$/.test(number));
-    },
-
-
-    isIP: function(ip){
-            return (/^(([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+))$/.test(ip));
-    },
-
-
-
-    isURL: function(string){
-        return (/^(((ht|f)tp(s?))\:\/\/)([0-9a-zA-Z\-]+\.)+[a-zA-Z]{2,6}(\:[0-9]+)?(\/\S*)?$/.test(string.toLowerCase()));
-    },
-
-    isValidNum: function(number) {
-        if (!this.isEmpty(number) && this.isFloat(number)) return true;
-        else return false;
-    }*/
+     isEmpty: function(string){
+     return (string.trim()=='');
+     },
+
+
+     isMail: function(email){
+     return (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email));
+     },
+
+
+     isInt: function(number){
+     return (/^[0-9]+$/.test(number));
+     },
+
+
+     isFloat: function(number){
+     return (/^[0-9]+(\.[0-9]+)?$/.test(number));
+     },
+
+
+     isIP: function(ip){
+     return (/^(([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+))$/.test(ip));
+     },
+
+
+
+     isURL: function(string){
+     return (/^(((ht|f)tp(s?))\:\/\/)([0-9a-zA-Z\-]+\.)+[a-zA-Z]{2,6}(\:[0-9]+)?(\/\S*)?$/.test(string.toLowerCase()));
+     },
+
+     isValidNum: function(number) {
+     if (!this.isEmpty(number) && this.isFloat(number)) return true;
+     else return false;
+     }*/
 
 

tapas/web/resources/css/button.css

@@ -140 +140 @@
 button.red_button {
     background-color: #574176;
-    height: 39px;
+    height: 40px;
     float: right;
     margin-right: 0;

tapas/web/resources/css/tapas.css

@@ -16 +16 @@
 /** ********************** CONTAINER ******************** **/
 /** ***************************************************** **/
- .cfs1 {
-    border:2px solid white ;
-    -moz-border-radius:8px;
-    -webkit-border-radius:8px;
-    border-radius:8px;
-     padding-right:40px;
-     padding-left:30px;
-     margin-left:20px;
-     padding-bottom:30px;
+button.positive, button.negative {
+
+    float:right;
+}
+
+.tab_class {
+    float: right;
+    background: #BFAFD6;
+    color: #574176;
+    margin-left: 11px;
+     margin-right: -10px;
+    padding: 4px;
+    -moz-border-radius: 4px 4px 0 0;
+    -webkit-border-radius: 4px 4px 0 0;
+    margin-top: 3px;
+    height:19px;
+    //-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    //-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    //box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+}
+
+.tab_class.activated {
+    background: #574176;
+    color: #BFAFD6;
+
+}
+
+
+.divAll {
+
+}
+
+
+.cfs1 {
+    border: 2px solid white;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
+    border-radius: 8px;
+    padding-right: 40px;
+    padding-left: 30px;
+    margin-left: -10px;
+    padding-bottom: 30px;
 }
 
 .cfs2 {
-     border:2px solid white ;
-    -moz-border-radius:8px;
-    -webkit-border-radius:8px;
-    border-radius:8px;
-    padding-right:40px;
-     padding-bottom:30px;
-    margin-right:50px;
-     margin-left:0px;
-    padding-left:30px
-}
-
+    border: 2px solid white;
+    -moz-border-radius: 8px;
+    -webkit-border-radius: 8px;
+    border-radius: 8px;
+    padding-right: 40px;
+    padding-bottom: 30px;
+    margin-right: 0px;
+    margin-left: -30px;
+    padding-left: 30px
+}
 
 .containerForm {
 
-    float:left;
-    width:1000px;
+    float: left;
+    width: 1000px;
+    height:400px;
+
+}
+
+.containerTabs {
+
+    float: right;
+    margin-top: -40px;
 
 }
 
 .divPreference {
-    margin-top:20px;
-    float:left;
+    margin-top: 20px;
+    float: left;
 }
 
 #button_submit {
-    margin-right:30px;
+    margin-right: 30px;
 
 }
 
 .divObservation {
-    margin-top:20px;
-    margin-left:30px;
-    margin-right:80px;
-    float:left;
+    margin-top: 20px;
+    margin-left: 30px;
+    margin-right: 80px;
+    float: left;
 }
 
@@ -93 +133 @@
     font-size: 12px;
     color: #574176;
-   // float: left;
-    //margin-top: 10px;
+/ / float : left;
+/ / margin-top : 10 px;
     padding-left: 0px;
-    //width:100px;
+/ / width : 100 px;
 
 }
@@ -104 +144 @@
     color: white;
     font-weight: bold;
-    //margin-bottom: 10px;
+/ / margin-bottom : 10 px;
     padding-left: 20px;
-    text-align:right;
+    text-align: right;
 }
 
@@ -113 +153 @@
     color: white;
     font-weight: bold;
-    //margin-bottom: 10px;
-    //padding-left: 20px;
-}
-
+/ / margin-bottom : 10 px;
+/ / padding-left : 20 px;
+}
 
 .containerLabel3 {
@@ -123 +162 @@
     font-weight: bold;
 
-    text-align:center;
-}
-
+    text-align: center;
+}
 
 .containerTapas {
@@ -186 +224 @@
     padding-left: 10px;
     font-size: 11px;
-    top:12px;
+    top: 12px;
 }
 
@@ -215 +253 @@
     float: left;
     position: relative;
-    width: 800px;
+    width: 150px;
     height: 26px;
     color: white;
@@ -221 +259 @@
     padding-left: 10px;
     padding-top: 4px;
-    top:19px;
-    text-decoration:underline;
+    top: 23px;
+    margin-right:600px;
+    text-decoration: underline;
 
 }
@@ -229 +268 @@
     color: white;
     font-weight: bold;
-    font-size:14px;
+    font-size: 14px;
 }
 
@@ -237 +276 @@
     background: -moz-linear-gradient(#574176, #bfafd6);
     background: -webkit-linear-gradient(#574176, #bfafd6);
-    background: -ms-linear-gradient(white,#C03000 ) repeat scroll 0 0 transparent; /*For IE10*/
+    background: -ms-linear-gradient(white, #C03000) repeat scroll 0 0 transparent; /*For IE10*/
     filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#574176'); /*For IE7-8-9*/
     min-height: 400px;
@@ -249 +288 @@
 .containerBottom {
     background: #574176;
-    background: -moz-linear-gradient(left center, white, #574176);
-    /*background: -webkit-linear-gradient(white, #574176);*/
+    background: -moz-linear-gradient(left center, white, #574176); /*background: -webkit-linear-gradient(white, #574176);*/
     background: -ms-linear-gradient(white, #574176) repeat scroll 0 0 transparent; /*For IE10*/
     filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#574176'); /*For IE7-8-9*/
@@ -275 +313 @@
 }
 
+.errorsForm {
+    background: white;
+    -moz-border-radius: 4px 4px 4px 4px;
+    -webkit-border-radius: 4px 4px 4px 4px;
+    border: 1px solid #574176;
+    color: red;
+    padding-bottom: 10px;
+    margin-left: 645px;
+    margin-right: 70px;
+    margin-top: 270px;
+    text-align: left;
+    font-weight: bold;
+}
+
 .containerErrors {
     display: none;
@@ -293 +345 @@
 /** ************************ OTHER ********************** **/
 /** ***************************************************** **/
+#button_submit {
+    height: 27px;
+}
+
 #tools .complexButton {
     float: right;
@@ -372 +428 @@
 /** ************ CALENDAR ************** **/
 /** ************************************ **/
-#iobservation_date {
+.calendar {
     background-image: url("../../resources/icons/calendrier-icone-16x16.png");
     background-position: right center;
@@ -378 +434 @@
 }
 
-
-#ira {
+.time {
     background-image: url("../../resources/icons/icone_heure.png");
-    background-position:bottom right;
+    background-position: bottom right;
     background-repeat: no-repeat;
 
-
-
-}
+}

tapas/web/resources/js/classesForJQuery/LoginButton.js

@@ -251 +251 @@
         if( this.anotherOnClickLogout )
             this.anotherOnClickLogout();
+
+        document.location.href = "project?methodName=home";
+
     },
 

tapas/web/resources/js/classesForJQuery/Tab.js

@@ -1 +1 @@
 //********************************************************
-// Class Button
-// Display a button
+// Class Tab
+// Display a tab
 //
 // use JQuery
@@ -12 +12 @@
 //********************************************************
 
-var Button = Class.create( {
+var Tab = Class.create( {
     initialize: function( param )
     {
         // Init
+        this.numTab=param.numTab? param.numTab : 1;
         this.id = param.id ? param.id : "";
         this.parent = param.parent ? param.parent : false;
@@ -21 +22 @@
         this.title = param.title ? param.title : false;
         this.className = param.className ? param.className : false;
-        this.classNameText = param.classNameText ? param.classNameText : false;
         this.callbackOnClick = param.onClick ? param.onClick : false;
-        this.callbackOnMouseOver = param.onMouseOver ? param.onMouseOver : false;
-        this.callbackOnMouseOut = param.onMouseOut ? param.onMouseOut : false;
         this.contextToSave = param.contextToSave ? param.contextToSave : false;
-        this.boolDisabled = false;
-        this.boolSelected = false;
-        this.boolDisplayed = false;
 
-        // Create button elements
-        this.divContainer = $( document.createElement( "button" ) );
+        // Create tab elements
+        this.divContainer = $( document.createElement( "div" ) );
         if( this.className )
             this.divContainer.addClass( this.className );
@@ -38 +33 @@
         else
             this.divContainer.attr( {id:this.id} );
+
+        this.divContainer.html( this.value );
+
         if( this.parent )
             this.parent.append( this.divContainer );
 
-        this.divText = $( document.createElement( "div" ) );
-        if( this.classNameText )
-            this.divText.addClass( this.classNameText );
-        this.divText.html( this.value );
-        this.divContainer.append( this.divText );
 
         // Define button events
         if( this.contextToSave )
-            this.divContainer.bind( 'click', [this, this.contextToSave], this.onClick );
+            this.divContainer.bind( 'click', [this, this.contextToSave], this.onClickEvent );
         else
-            this.divContainer.bind( 'click', this, this.onClick );
-        this.divContainer.bind( 'mouseover', this, this.onHover );
-        this.divContainer.bind( 'mouseout', this, this.onOut );
+            this.divContainer.bind( 'click', this, this.onClickEvent );
+
+
     },
 
     // Getter / Setter ********************************************************
-
     getContainer: function()
     {
         return this.divContainer;
-    },
-
-    isDisable : function()
-    {
-        return this.boolDisabled;
-    },
-
-    isSelected: function()
-    {
-        return this.boolSelected;
     },
 
@@ -85 +67 @@
 
     // Actions ********************************************************
-    disable : function()
+    active : function()
     {
-        this.boolDisabled = true;
-        this.divContainer.addClass( "disable" );
+        this.divContainer.addClass( "activated" );
     },
 
-    enable : function()
+    inactive : function()
     {
-        this.boolDisabled = false;
-        this.divContainer.removeClass( "disable" );
+        this.divContainer.removeClass( "activated" );
     },
 
-    select : function( value )
+    remove : function()
     {
-        this.boolSelected = value;
-        if( this.boolSelected )
-            this.divContainer.addClass( "selected" );
-        else
-            this.divContainer.removeClass( "selected" );
-    },
+        this.divContainer.remove();
 
-    show : function()
-    {
-        this.boolDisplayed = true;
-        this.divContainer.show();
-    },
-
-    hide : function()
-    {
-        this.boolDisplayed = false;
-        this.divContainer.hide();
     },
 
     // Events ********************************************************
-    onClick : function( event )
+    onClickEvent : function( event )
     {
-        var contextButton = event.data;
-        var isContextToPut = false;
-        if( jQuery.isArray( event.data ) )
-        {
-            isContextToPut = true;
-            contextButton = event.data[0];
-        }
+        var clickedTab = event.data;
+        if( (undefined == event.detail || 1 == event.detail) && clickedTab.callbackOnClick )
+            clickedTab.callbackOnClick( clickedTab );
+    }
 
-        if( !contextButton.isDisable() && (undefined == event.detail || 1 == event.detail) && contextButton.callbackOnClick )
-            if( isContextToPut )
-                contextButton.callbackOnClick( event.data[1] );
-            else
-                contextButton.callbackOnClick();
-    },
-
-    onHover : function( event )
-    {
-        var contextButton = event.data;
-        if( !contextButton.isDisable() && contextButton.callbackOnMouseOver )
-            contextButton.callbackOnMouseOver();
-    },
-
-    onOut: function( event )
-    {
-        var contextButton = event.data;
-        if( !contextButton.isDisable() && contextButton.callbackOnMouseOut )
-            contextButton.callbackOnMouseOut();
-    }
 } );

tapas/web/resources/js/tools/controls.js

@@ -2 +2 @@
  * Created by IntelliJ IDEA.
  * User: rboipsl
- * Date: 18/04/12
+ * Date: 18/04/12                                     *
  * Time: 11:26
  */
 
 function isEmpty(string){
+
     return (string.trim()=='');
 }
@@ -28 +29 @@
 
 function isFloat(number,champ,texte){
-    if (!(/^[0-9]+(\.[0-9]+)?$/.test(number))) {
+    //if (!(/^[0-9]+(\.[0-9]+)?$/.test(number))) {
+    if (!(/^([\+-])?([0-9])*(\.?[0-9]*)?$/.test(number))) {
         alert(champ+' : '+texte);
-        return true;
+        return false;
     }
     else {
-        return false;
+        return true;
     }
 }
@@ -44 +46 @@
 function isDeg(val,champ,texte){
     //return (/^(([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9]))$/.test(val));
-    if ( !(/^(([\+-])?[0-9]?[0-9]):([0-9]+[0-9]+):([0-9]+[0-9]+)(\.)*([0-9]*[0-9]*[0-9]*)*$/.test(val)) || isEmpty(val)){
+    if ( !(/^(([\+-])?[0-9]?[0-9]):([0-9]+[0-9]+):([0-9]+[0-9]+)(\.)?([0-9]*[0-9]*[0-9]*)*$/.test(val)) || isEmpty(val)){
         alert(champ+' : '+texte);
         return false;
@@ -68 +70 @@
 
 function isValidNum(number,champ,texte){
+    //alert(number);
     if (!isEmpty(number) && isFloat(number,champ,texte)) return true;
+    else {
+        alert(champ+' : '+texte);
+        this.dive
+        return false;
+    }
+}
+
+function isSup(number,limit,champ,texte,container) {
+
+    if (number >= limit) return true;
+    else {
+       container=champ+' : '+texte;
+        //container.html('ssss : ');
+        return false;
+    }
+}
+
+function isDiff(val,badvalue,champ,texte) {
+
+    if (val != badvalue) return true;
     else {
         alert(champ+' : '+texte);
@@ -74 +97 @@
     }
 }
+
+function isBetween(number,limitinf,limitsup,champ,texte) {
+
+    if (number >= limitinf && number <= limitsup) return true;
+    else {
+        alert(champ+' : '+texte);
+        return false;
+    }
+}
+
+
+function isValidRange(val1,val2,unit,champ,texte) {
+    if (unit == 'NM_VACUUM' || unit == 'NM_STANDARD') {
+        if (isFloat(val1,champ,texte) && isFloat(val2,champ,texte) && parseFloat(val1) >= 350 && parseFloat(val2) <= 2500 && parseFloat(val1) <= parseFloat(val2) ) return true;
+        else {
+            alert(champ+' : '+texte);
+            return false;
+        }
+    }
+}

tapas/web/resources/templates/templateEther_script.jsp

@@ -31 +31 @@
 
             var mailButton = new Button( {value:'<spring:message code="label.mail"/>', parent:this.containerTools, id:"button_mail", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickMail, this )} );
+            //var languageButton = new Button( {value:'<spring:message code="label.language.to.switch"/>', parent:this.containerTools, id:"button_language", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickLanguage, this )} );
             var languageButton = new Button( {value:'<spring:message code="label.language.to.switch"/>', parent:this.containerTools, id:"button_language", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickLanguage, this )} );
             //var homeButton = new Button( {value:'<spring:message code="label.home"/>', parent:this.containerTools, id:"button_home", className: "red_button", classNameText:"red_button_text", onClick:this.onClickHome} );

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

@@ -16 +16 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Properties;
@@ -37 +38 @@
      * @throws WebException
      */
-    @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = true, defaultView = VIEW_INDEX)
+    @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = false, defaultView = VIEW_INDEX)
     public JSONObject viewForm()
             throws WebException
     {
-        try
-        {
-            final List<Observatory> allObservatories = getTapasService().getAllObservatories();
+        /*try
+        { */
+            //final List<Observatory> allObservatories = getTapasService().getAllObservatories();
 
             final JSONObject jsonObject = new JSONObject();
             jsonObject.put( "jSonFileFormats", getJSONFileFormat() );
             jsonObject.put( "jSonYesNos", getJSONYesNo() );
-            jsonObject.put( "jSonObservatories", allObservatories );
+            //jsonObject.put( "jSonObservatories", allObservatories );
             jsonObject.put( "jSonSpectralUnits", getJSONSpectralUnit() );
             jsonObject.put( "jSonInstrumentalFunctions", getJSONInstrumentalFunction() );
             jsonObject.put( "jSonClimatoReferences", getJSONClimatoReference() );
             return jsonObject;
-        }
-        catch( ServiceException e )
+        //}
+        /*catch( ServiceException e )
         {
             throw new WebException( WebException.WebCode.ERROR_NO_OBSERVATORY_FOUND, e );
-        }
+        } */
 
     }
@@ -73 +74 @@
      * @throws WebException
      */
-    @ControllerMethod(jsonResult = true, userMandatory = true, defaultView = VIEW_INDEX)
-    public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) // TODO rajouter parametre USER
+    //@ControllerMethod(jsonResult = true, userMandatory = true, defaultView = VIEW_INDEX)
+    @ControllerMethod(jsonResult = true, userMandatory = false, defaultView = VIEW_INDEX)
+    //public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user )
+    public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas )
             throws WebException
     {
+
+        /***********/
+        final User user= new User();
+        user.setId( 12 );
+        user.setLastName( "tamere" );
+        user.setEmail( "rbopipsl@ipsl.jussieu.fr" );
+        user.setCreationDate( new Date() );
+        user.setPassword( "pif" );
+        /******/
+
         if( null == javaTapas )
             throw new WebException( WebException.WebCode.ERROR_JSON_TAPAS_IS_NULL, "Serialization error : jsonTapas is null", WebException.getExceptionThrowable() );
@@ -115 +128 @@
         try
         {
-            getTapasService().execAppelQSub( user, prop );
+            getTapasService().execAppelQSub( "popo", user, prop );
         }
         catch( ServiceException e )

tapas/web/src/messages_en.properties

@@ -30 +30 @@
 text.NONE=None
 text.badvalue=bad value
+text.toselect=must be selected
 
+label.delButton=CANCEL
 
 
@@ -55 +57 @@
 error.ERROR_JSON_TAPAS_IS_NULL=Error to create the form
 
-label.submitButton=RUN
+label.submitButton=EXECUTE
+label.addButton=ADD REQUEST
 label.confirm=ARE YOU SURE YOU WANT TO SEND THIS REQUEST ?
+label.requete=Request
 
 label.spectralUnit.NM_STANDARD=Standard Wavelength (nm)

tapas/web/src/messages_fr.properties

@@ -27 +27 @@
 label.preferences=Préférences
 
+label.delButton=ANNULER
+
 text.validnum=doit être numérique
 text.select=Sélectionnez
 text.badvalue=mauvaise valeur
 text.NONE=Aucune
+text.toselect=à sélectionner
 
 
@@ -41 +44 @@
 
 title.home=Accueil
-title.form=Formulaire reqête
+title.form=Formulaire requête
 title.legals=Mentions légales
 
@@ -58 +61 @@
 
 label.submitButton=EXECUTER
+label.addButton=ENREGISTRER
+label.requete=Requete
 
 label.spectralUnit.NM_STANDARD=Standard Wavelength (nm)