Changeset 497 for tapas/web/project

Timestamp:

04/27/12 17:39:33 (12 years ago)

Author:

vmipsl

Message:

tests

File:

• tapas/web/project/formTapas_script.jsp (modified) (8 diffs)

tapas/web/project/formTapas_script.jsp

@@ -8 +8 @@
         /** *********** CONTAINERS *********** **/
         this.containerForm = $( "#formulaire" );
-        //this.containerErrors = $( "#errors" );
         this.containerErrors = $( "#errForm" );
         this.containerCenter = $( "#containerCenter" );
         this.containerTabs = $( "#tab" );
 
+        /** *********** VARIABLES *********** **/
         this.jSonFileFormats = jsonFileFormats || null;
         this.jSonYesNos = jsonYesNos || null;
@@ -23 +23 @@
         this.numRequest = 1;
 
-
-        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 )} );
@@ -33 +30 @@
         this.createForm();
         this.tabActive = this.createTab();
+
+        this.containerErrors.hide();
     },
 
@@ -118 +117 @@
         if( !currentTime )
             currentTime = "00:00:00";
+        // TODO : voir si besoin de convertir format des heures
 //        $( "#" + inputDateId ).val( this.timeConverter.format( currentTime ) );
         $( "#" + inputDateId ).val( currentTime );
@@ -269 +269 @@
     onClickSubmit: function()
     {
-        // if( this.validFields() )
-        // {
-        if( confirm( tapasTexts["confirm"] ) )
-        {
-            this.containerErrors.hide();
-            this.requestCreateXML();
-        }
-        // }
+        if( this.validFields() )
+        {
+            if( confirm( tapasTexts["confirm"] ) )
+            {
+                this.containerErrors.hide();
+//                this.requestCreateXML();
+            }
+        }
     },
 
@@ -282 +282 @@
     onClickAdd: function()
     {
-        //if( this.validFields() )
-        if( true )
-        {
-            this.containerErrors.hide();
-            this.nbRequest++;
-
-            //tabs
-            $( ".tab_class" ).removeClass( "activated" );
-            this.tabActive = this.createTab();
-            this.numRequest = this.tabActive.numTab;
-
-            //formulaires
-            $( ".divAll" ).hide();
-            this.createForm();
-
-            this.updateButtons();
-        }
+        this.containerErrors.hide();
+        this.nbRequest++;
+
+        //tabs
+        $( ".tab_class" ).removeClass( "activated" );
+        this.tabActive = this.createTab();
+        this.numRequest = this.tabActive.numTab;
+
+        //formulaires
+        $( ".divAll" ).hide();
+        this.createForm();
+
+        this.updateButtons();
     },
 
@@ -304 +300 @@
     onClickDel: function()
     {
-        //if( this.validFields() )
-        if( true )
+        if( confirm( "pouet" ) )
         {
             var numCurrent = this.numRequest;
@@ -696 +691 @@
     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"] )
-                )
+        var testOk = isSup( this.selectObservatories.getValue(), 0 );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.observatory"] + " : " + tapasTexts["text.toselect"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isDiff( this.selectSpectralUnits.getValue(), -1 );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.spectralUnit"] + " : " + tapasTexts["text.toselect"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isValidRange( $( "#iminspectral_ranger" ).val(), $( "#imaxspectral_ranger" ).val(), this.selectSpectralUnits.getValue() );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.spectralRange"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isDeg( $( "#ide" ).val() );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.ide"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isValidNum( $( "#iza" ).val() );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.iza"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isBetween( $( "#iza" ).val(), 0, 90 );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.iza"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isValidNum( $( "#irp" ).val() );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.resolution"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isSup( $( "#irp" ).val(), 1 );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.resolution"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isValidNum( $( "#isr" ).val() );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.ratio"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
+
+        testOk = isSup( $( "#isr" ).val(), 1 );
+        if( !testOk )
+        {
+            this.containerErrors.html( tapasTexts["label.ratio"] + " : " + tapasTexts["text.badvalue"] );
+            this.containerErrors.show();
+            return false;
+        }
     },