Changeset 779 for tapas/web/project/formTapas_script.jsp

Timestamp:

04/01/14 16:56:38 (10 years ago)

Author:

rboipsl

Message:

Dernière version rboipsl

File:

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

tapas/web/project/formTapas_script.jsp

@@ -1 @@
-
+<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>
 <script type="text/javascript">
 
@@ -22 +22 @@
         this.select_io3eList = new Object();
         this.select_ico2eList = new Object();
+        this.select_ich4eList = new Object();
+        this.select_in2oeList = new Object();
         this.select_irextinctionList = new Object();
         this.select_ibervCList = new Object();
@@ -188 +190 @@
         if (event.length > 0) input.bind( event, [this, champ], this.angleChoice );
 
-        td1.html( texte );
+
         td1.attr( {class:"containerLabel"} );
 
@@ -204 +206 @@
 
         if (info && (inputId.match(re1) || inputId.match(re2))) {
-            var mt="-4px";
-            var ml="";
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-252px";
-                else ml="-244px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-227px";
-                else ml="-223px";
-            }
 
             var img = $( document.createElement( "img" ) );
@@ -226 +217 @@
             a.append(img);
             div.append(a);
-            div.attr( "style","margin-left:"+ml+";margin-top:"+mt);
-
+
+
+            td1.append( a );
+            td1.append( texte );
             tr.append( div );
 
-            /*td2.attr( {colspan:3} );
-            tr.append( td2 );
-            tr.append( div );*/
         }
         else if (info) {
@@ -242 +232 @@
             img.bind("click",[inputId,450,100,this],this.onClickInfos);
             a.append(img);
-            td3.append(a);
+            td1.append(a);
+            td1.append( texte );
 
         }
@@ -280 +271 @@
         input2.attr( {id: inputId2,class:"containerText",size:11} );
 
-        td1.html( texte1 );
+
         td3.html( texte2 );
         td5.html( textesup );
@@ -290 +281 @@
         img.bind("click",["spectral_range",450,100,this],this.onClickInfos);
         a.append(img);
-        td5.append(a);
+        td1.append(a);
+         td1.append( texte1 );
 
         //img.onclick(this.onClickInfos("spectral_range",1200,440));
@@ -318 +310 @@
         var td1 = $( document.createElement( "td" ) );
         var td2 = $( document.createElement( "td" ) );
+        var td3 = $( document.createElement( "td" ) );
         var input = $( document.createElement( "input" ) );
-        var champ="", ml="", mt="-4px";
+        var champ="";
 
         var div = $( document.createElement( "div" ) );
 
+
         input.attr( {id: inputId} );
 
-        td1.html( texte );
-        td1.attr( {class:"containerLabel"} );
-        tr.append( td1 );
-
-
-                 // alert(inputId);
+        // alert(inputId);
         if( 'format' == type ) {
             this.displaySelect( td2, inputId, index, this.jSonFileFormats, this.selectFileFormatsList, false, null );
             info = true;
             champ = "iformat_";
-            ml="-2px";
-            mt="-4px";
-        }
-
+
+        }
         else
         if( 'yesno' == type )
@@ -350 +337 @@
             else if( (/^(ico2e_[1-9]+)$/.test( inputId )  ) )
                 this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_ico2eList, false, "yesNos" );
+            else if( (/^(ich4e_[1-9]+)$/.test( inputId )  ) )
+                this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_ich4eList, false, "yesNos" );
+            else if( (/^(in2oe_[1-9]+)$/.test( inputId )  ) )
+                this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_in2oeList, false, "yesNos" );
             else if( (/^(irextinction_[1-9]+)$/.test( inputId )  ) ) {
 
@@ -355 +346 @@
                 info = true;
                 champ=inputId;
-                if (this.language == "en") ml="-11px";
-                else ml="-13px";
-
             }
             else if( (/^(ibervC_[1-9]+)$/.test( inputId )  ) ) {
@@ -363 +351 @@
                 info = true;
                 champ=inputId;
-                if (this.language == "en") ml="-11px";
-                else ml="-13px";
             }
         }
         else if( 'observatories' == type ) {
-            this.displaySelect( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" );
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-162px";
-                else ml="-116px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-123px";
-                else ml="-84px";
-            }
+
+            this.displaySelect1( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" );
+            //this.displaySelect( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" );
 
             champ="iobservatory_";
@@ -386 +365 @@
 
             champ = "ispectral_choice_";
-
-           if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-162px";
-                else ml="-116px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-123px";
-                else ml="-84px";
-            }
-
         }
         else if( 'ilsf' == type ) {
@@ -401 +370 @@
             info = true;
             champ = "ifunction_";
-            if (this.language == "en") ml="-192px";
-            else ml="-172px";
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-192px";
-                else ml="-172px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-149px";
-                else ml="-134px";
-            }
-
         }
         else if( 'climatoReference' == type ) {
@@ -418 +375 @@
             info = true;
             champ = "icr_";
-
-            if (this.browser == "Firefox") {
-                if (this.language == "en") ml="-170px";
-                else ml="-162px";
-            }
-            else if (this.browser == "Chrome") {
-                if (this.language == "en") ml="-127px";
-                else ml="-124px";
-            }
-
-        }
-
+        }
+
+        td1.attr( {class:"containerLabel"} );
+        tr.append( td1 );
 
 
@@ -442 +391 @@
             a.append(img);
             div.append(a);
-            div.attr( "style","margin-left:"+ml+";margin-top:"+mt);
-
-            td2.attr( {colspan:3} );
+
+
+            td2.attr( {colspan:5} );
+            td1.append( a );
+            td1.append( texte );
+
             tr.append( td2 );
-            tr.append( div );
+
         }
         else {
+            td1.append( texte );
             td2.attr( {colspan:3} );
             tr.append( td2 );
@@ -760 +713 @@
                     //$( "#tab_request" + i ).html( "toto");
                     $( "#tab_request" + i ).attr( {name:z} );
-                    $( "#tab_request" + i ).attr( {id:"tab_request" + z} );       this.angleChoice
+                    $( "#tab_request" + i ).attr( {id:"tab_request" + z} );       //this.angleChoice
                     $( "#tabObservation_" + i ).attr( {id:"tabObservation_" + z} );
 //                    $( "#select_iobservatory_" + i ).attr( {id:"select_iobservatory_" + z} );
@@ -801 +754 @@
                     this.select_ico2eList[i] = null;
 
+                    this.select_ich4eList[z] = this.select_ich4eList[i];
+                    this.select_ich4eList[i] = null;
+
+                    this.select_in2oeList[z] = this.select_in2oeList[i];
+                    this.select_in2oeList[i] = null;
+
                     this.select_ibervCList[z] = this.select_ibervCList[i];
                     this.select_ibervCList[i] = null;
@@ -895 +854 @@
     },
 
+    createAutoCompleteMenuForRegions: function()
+    {
+
+        $( "#select_iobservatory_"+this.nbRequest ).autocomplete( {
+            source: this.listObs,
+            appendTo: "#regionContent"+this.nbRequest,
+            minLength: 0,
+            autoFocus: true,
+            autoSelect: true,
+            select: jQuery.proxy( function( event, ui )
+            {
+                this.regionLabel = ui.item.value;
+            }, this )
+        } ).focus( function( event )
+        {
+            $( this ).autocomplete( "search", "" );
+        } );
+
+        //$( "#regionTags" ).focus();
+    },
+
+
+// OTHERS ********************************************************
+    // General method to display select
+    displaySelect1: function( container, id, index, jsonList, selectList, nullValueIsNeeded, contentManage )
+    {
+        //alert("ok");
+        var iselect = $( document.createElement( "select" ) );
+        var option = document.createElement("option");
+
+        var paramSelect = new Object();
+        paramSelect.id = "select_" + id;
+        paramSelect.parent = container;
+
+        var observatoryArray=new Array();
+        this.listObs=new Array();
+
+
+        //var bob =$('<div id="region" class="containerField"><div class="containerTitle"><div class="containerTitleText">Region</div><div class="containerTitleClose"><img src="img/close.png"></div></div><div class="containerRegion"><input id="regionTags" size="23"/></div><div id="regionContent"></div></div> ');
+        var bob =$('<div class="containerField"><input id="select_'+id+'" size="42"/></div><div id="regionContent'+this.nbRequest+'" class="regionContent"></div> ');
+
+        //alert('<div class=containerField><input id=select_'+id+' size=23/></div><div id=regionContent></div> ');
+
+        //var select = new Select( paramSelect );
+        //iselect.options.add("1","1");
+        //if( nullValueIsNeeded )                          Select1
+
+        var option = new Option();
+        option.text = "-- " + tapasTexts["text.select"] + " --";
+        option.value = "-1";
+        iselect.append( option );
+
+        jQuery.each( jsonList, jQuery.proxy( function ( i, jsonElement )
+        {
+                //ajouter fonction
+
+                /*var option = new Option();
+                option.text = jsonElement.name;
+                option.value = jsonElement.id;*/
+                //observatoryArray.push(jsonElement.name);
+                this.listObs.push(jsonElement.name);
+                //console.log(option.value+"-"+option.text);
+                //iselect.append(option);
+
+
+        }, this ) );
+        //iselect.selectFirst( false );
+        /*selectList[index] = select;*/
+        //container.append(iselect);
+        container.append(bob);
+        selectList[index]="select_"+id;
+
+    },
+
+
     showErrors: function( result )
     {
@@ -967 +1001 @@
         this.createTrList( tapasTexts["label.eo2"], "io2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
         this.createTrList( tapasTexts["label.eco2"], "ico2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.ech4"], "ich4e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
+        this.createTrList( tapasTexts["label.en2o"], "in2oe_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
         this.createTrList( tapasTexts["label.berv"], "ibervC_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' );
 
@@ -993 +1029 @@
         this.createTr( tapasTexts["label.iza"], "iza_" + this.nbRequest, tabObservation, "[0,90] &deg;","keypress","za","2",true );
 
+        this.createAutoCompleteMenuForRegions();
 
         this.initRequestFields();
@@ -1036 +1073 @@
             preference.co2Extinction.secondValue = this.select_ico2eList[i].getValue();
 
+            preference.ch4Extinction = new Object();
+            preference.ch4Extinction.firstValue = this.select_ich4eList[i].getValuesInString();
+            preference.ch4Extinction.secondValue = this.select_ich4eList[i].getValue();
+
+            preference.n2oExtinction = new Object();
+            preference.n2oExtinction.firstValue = this.select_in2oeList[i].getValuesInString();
+            preference.n2oExtinction.secondValue = this.select_in2oeList[i].getValue();
+
             preference.bervCorrection = new Object();
             preference.bervCorrection.firstValue = this.select_ibervCList[i].getValuesInString();
@@ -1043 +1088 @@
             // OBSERVATION
             var observatory = new Object();
-            observatory.id = this.selectObservatoriesList[i].getValue();
+            //observatory.id = "European Southern Obs R La Serena Cerro La Silla";//this.selectObservatoriesList[i].getValue();
+            //observatory.id = this.selectObservatoriesList[i].getValue();
+            //observatory.id = 2;
+            observatory.name = $("#select_iobservatory_"+i).val();
 
             // Los
@@ -1124 +1172 @@
             var testOk2=false;
             var testOk3=false;
-            var testOk = isSup( this.selectObservatoriesList[i].getValue(), 0 );
-            if( !testOk )
+            //var testOk = isSup( this.selectObservatoriesList[i].getValue(), 0 );
+            var testOk = isEmpty($( "#select_iobservatory_" + i ).val()) || this.listObs.indexOf($( "#select_iobservatory_" + i ).val())<0;
+            //alert(testOk);
+            if( testOk )
             {
                 this.divE.html( chaine + tapasTexts["label.observatory"] + " : " + tapasTexts["text.toselect"] );
@@ -1305 +1355 @@
             this.select_io2eList[indice].select(this.select_io2eList[indice-1].getValue(),false);
             this.select_ico2eList[indice].select(this.select_ico2eList[indice-1].getValue(),false);
+            this.select_ich4eList[indice].select(this.select_ich4eList[indice-1].getValue(),false);
+            this.select_in2oeList[indice].select(this.select_in2oeList[indice-1].getValue(),false);
             this.select_ibervCList[indice].select(this.select_ibervCList[indice-1].getValue(),false);