Changeset 444 for tapas/web

Timestamp:

04/02/12 15:14:31 (12 years ago)

Author:

rboipsl

Message:

creation form jsp

Location:

tapas/web

Files:

• project/formTapas.jsp (modified) (2 diffs)
• project/formTapas_script.jsp (modified) (14 diffs)
• resources/css/tapas.css (modified) (3 diffs)
• resources/images/logo_tapas.gif (added)
• resources/templates/templateBackoffice.jsp (modified) (1 diff)
• resources/templates/templateEther.jsp (modified) (1 diff)
• src/com/ether/Controller.java (modified) (4 diffs)
• src/messages_en.properties (modified) (2 diffs)
• src/messages_fr.properties (modified) (2 diffs)

tapas/web/project/formTapas.jsp

@@ -1 +1 @@
 <%@ page import="com.ether.WebException" %>
 <%@ page import="com.ether.SpectralUnit" %>
+<%@ page import="com.ether.InstrumentalFunction" %>
+<%@ page import="com.ether.ClimatoReference" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
@@ -41 +43 @@
             tapasTexts["<%=SpectralUnit.NM_VACUUM%>"] = "<spring:message code="label.spectralUnit.NM_VACUUM"/>";
             tapasTexts["<%=SpectralUnit.CM%>"] = "<spring:message code="label.spectralUnit.CM"/>";
+            tapasTexts["<%=InstrumentalFunction.NONE%>"] = "<spring:message code="label.instrumentalFunction.NONE"/>";
+            tapasTexts["<%=InstrumentalFunction.GAUSSIAN%>"] = "<spring:message code="label.instrumentalFunction.GAUSSIAN"/>";
+            tapasTexts["<%=ClimatoReference.TROPICAL%>"] = "<spring:message code="label.climatoReference.TROPICAL"/>";
+            tapasTexts["<%=ClimatoReference.MEDIUM_LATITUDE_SUMMER%>"] = "<spring:message code="label.climatoReference.MEDIUM_LATITUDE_SUMMER"/>";
+            tapasTexts["<%=ClimatoReference.MEDIUM_LATITUDE_WINTER%>"] = "<spring:message code="label.climatoReference.MEDIUM_LATITUDE_WINTER"/>";
+            tapasTexts["<%=ClimatoReference.SUBARCTIC_SUMMER%>"] = "<spring:message code="label.climatoReference.SUBARCTIC_SUMMER"/>";
+            tapasTexts["<%=ClimatoReference.SUBARCTIC_WINTER%>"] = "<spring:message code="label.climatoReference.SUBARCTIC_WINTER"/>";
+            tapasTexts["<%=ClimatoReference.US_STANDARD_1976%>"] = "<spring:message code="label.climatoReference.US_STANDARD_1976"/>";
 
-            var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonObservatories}, ${jSonSpectralUnits});
+            var interfaceTapas = new InterfaceTapas(${jSonFileFormats},${jSonYesNos},${jSonObservatories},${jSonSpectralUnits},${jSonInstrumentalFunctions},${jSonClimatoReferences});
         </script>
 

tapas/web/project/formTapas_script.jsp

@@ -2 +2 @@
 var InterfaceTapas = Class.create( {
 
-    initialize: function( jsonFileFormats, jsonYesNos, jsonObservatories, jSonSpectralUnits )
+    initialize: function( jsonFileFormats, jsonYesNos, jsonObservatories, jsonSpectralUnits, jsonInstrumentalFunctions, jsonClimatoReferences )
     {
         /** *********** CONTAINERS *********** **/
@@ -8 +8 @@
         this.containerErrors = $( "#errors" );
 
-        this.jsonFileFormats = jsonFileFormats || null;
-        this.jsonYesNos = jsonYesNos || null;
+        this.jSonFileFormats = jsonFileFormats || null;
+        this.jSonYesNos = jsonYesNos || null;
         this.jSonObservatories = jsonObservatories || null;
-        this.jSonSpectralUnits = jSonSpectralUnits || null;
+        this.jSonSpectralUnits = jsonSpectralUnits || null;
+        this.jSonInstrumentalFunctions = jsonInstrumentalFunctions || null;
+        this.jSonClimatoReferences = jsonClimatoReferences || null;
 
         this.containerErrors.hide();
 
+
         this.createForm();
 
@@ -20 +23 @@
 
 
-
     // CREATES ********************************************************
-    createCalendar: function( containerCalendar )
+    createCalendar: function( containerCalendar, texte )
     {
         // Create input for date text
         var inputDateId = "iobservation_date";
+        var tr = $( document.createElement( "tr" ) );
+        var td1 = $( document.createElement( "td" ) );
+        var td2 = $( document.createElement( "td" ) );
         var inputDate = $( document.createElement( "input" ) );
         inputDate.attr( {id:inputDateId, size:"17"} );
-        containerCalendar.append( inputDate );
+
+        td1.html( texte );
+        tr.append( td1 );
+        td2.append( inputDate );
+        tr.append( td2 );
+        containerCalendar.append( tr );
 
         // Calendar
@@ -50 +60 @@
         var input = $( document.createElement( "input" ) );
 
-
         input.attr( {id: inputId} );
+
         td1.html( texte );
         tr.append( td1 );
         td2.append( input );
+
         tr.append( td2 );
         container.append( tr );
+
+    },
+
+
+    createTr2Input: function( texte1, texte2, inputId1, inputId2, container )
+    {
+        var tr = $( document.createElement( "tr" ) );
+        var td1 = $( document.createElement( "td" ) );
+        var td2 = $( document.createElement( "td" ) );
+        var td3 = $( document.createElement( "td" ) );
+        var td4 = $( document.createElement( "td" ) );
+        var input1 = $( document.createElement( "input" ) );
+        var input2 = $( document.createElement( "input" ) );
+
+
+        input1.attr( {id: inputId1} );
+        input2.attr( {id: inputId2} );
+
+        td1.html( texte1 );
+        td3.html( texte2 );
+        td2.append(input1);
+        td3.append(input2);
+
+        tr.append(td1);
+        tr.append(td2);
+        tr.append(td3);
+        tr.append(td4);
+        container.append(tr);
     },
 
@@ -68 +107 @@
 
         input.attr( {id: inputId} );
+
         td1.html( texte );
         tr.append( td1 );
@@ -74 +114 @@
         else if( type == 'observatories' ) this.displayObservatories( td2 );
         else if( type == 'spectralUnit' ) this.displaySpectralUnits( td2 );
+        else if( type == 'ilsf' ) this.displayInstrumentalFunctions( td2 );
+        else if( type == 'climatoReference' ) this.displayClimatoReferences( td2 );
 
         tr.append( td2 );
@@ -80 +122 @@
 
 
-    createForm: function()
-    {
-
-        //Creation div / tab
-        var divPreference = $( document.createElement( "div" ) );
-        var tabPreference = $( document.createElement( "table" ) );
-
-        var divObservation = $( document.createElement( "div" ) );
-        var tabObservation = $( document.createElement( "table" ) );
-
-        this.createTrList( "File format", "iformat", tabPreference, 'format' );
-        this.createTr( "Rayleigh extinction", "irextinction", tabPreference );
-        this.createTrList( "H20 extinction", "ih2oe", tabPreference, 'yesno' );
-        this.createTrList( "O3 extinction", "io3e", tabPreference, 'yesno' );
-        this.createTrList( "O2 extinction", "io2e", tabPreference, 'yesno' );
-        this.createTrList( "CO2 extinction", "ico2e", tabPreference, 'yesno' );
-
-        this.createTrList( "Observatory", "iobservatory", tabObservation, 'observatories' );
-
-
-        this.createTr( "Right LOS ascension", "ira", tabObservation );
-        this.createTr( "LOS declension", "ide", tabObservation );
-        this.createTr( "Zenith angle", "iza", tabObservation );
-        this.createTrList( "Spectral unit", "ispectral_choice", tabObservation, 'spectralUnit' );
-        this.createTr( "Spectral range", "ispectral_ranger", tabObservation );
-
-
-        divPreference.append( tabPreference );
-        this.containerForm.append( divPreference );
-
-        divObservation.append( tabObservation );
-        this.containerForm.append( divObservation );
-
-        // Ajout du calendrier APRES la création du formulaire
-        this.createCalendar( tabObservation );
-
-        //jQuery.proxy permet d'envoyer le contexte this courant
-        var submitButton = new Button( {value:tapasTexts["label.submitButton"], parent:this.containerForm, id:"button_submit", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickSubmit, this )} );
-
-    },
 
 
@@ -161 +163 @@
         paramSelect.parent = container;
         this.selectFormats = new Select( paramSelect );
-        jQuery.each( this.jsonFileFormats, jQuery.proxy( function ( i, jsonFileFormat )
+        jQuery.each( this.jSonFileFormats, jQuery.proxy( function ( i, jsonFileFormat )
         {
             this.selectFormats.add( jsonFileFormat.value, jsonFileFormat.text );
@@ -175 +177 @@
         paramSelect.parent = container;
         this.selectYesNos = new Select( paramSelect );
-        jQuery.each( this.jsonYesNos, jQuery.proxy( function ( i, jsonYesNo )
+        jQuery.each( this.jSonYesNos, jQuery.proxy( function ( i, jsonYesNo )
         {
             this.selectYesNos.add( jsonYesNo.value, jsonYesNo.text );
@@ -210 +212 @@
         {
             this.selectSpectralUnits.add( jsonSpectralUnit.value, tapasTexts[jsonSpectralUnit.value] );
+            //this.selectSpectralUnits.add( jsonSpectralUnit.value, jsonSpectralUnit.value );
         }, this ) );
         this.selectSpectralUnits.selectFirst( true );
     },
+
+    displayInstrumentalFunctions: function( container )
+    {
+        var paramSelect = new Object();
+        paramSelect.id = "select_instrumental_function";
+        paramSelect.parent = container;
+        this.selectInstrumentalFunctions = new Select( paramSelect );
+        //ajouter select vide avec add
+        jQuery.each( this.jSonInstrumentalFunctions, jQuery.proxy( function ( i, jsonInstrumentalFunction )
+        {
+            this.selectInstrumentalFunctions.add( jsonInstrumentalFunction.value, tapasTexts[jsonInstrumentalFunction.value] );
+        }, this ) );
+        this.selectInstrumentalFunctions.selectFirst( true );
+    },
+
+
+    displayClimatoReferences: function( container )
+    {
+        var paramSelect = new Object();
+        paramSelect.id = "select_climato_reference";
+        paramSelect.parent = container;
+        this.selectClimatoReferences = new Select( paramSelect );
+        //ajouter select vide avec add
+        jQuery.each( this.jSonClimatoReferences, jQuery.proxy( function ( i, jsonClimatoReference )
+        {
+            this.selectClimatoReferences.add( jsonClimatoReference.value, jsonClimatoReference.value );
+        }, this ) );
+        this.selectClimatoReferences.selectFirst( true );
+    },
+
 
     showErrors: function( result )
@@ -220 +253 @@
     },
 
+
+
+    createForm: function()
+    {
+        //Creation div tab
+        var divPreference = $( document.createElement( "div" ) );
+        var tabPreference = $( document.createElement( "table" ) );
+
+        var divObservation = $( document.createElement( "div" ) );
+        var tabObservation = $( document.createElement( "table" ) );
+
+        var divAtmosphere = $( document.createElement( "div" ) );
+        var tabAtmosphere = $( document.createElement( "table" ) );
+
+
+        //this.tabInput = new Array(3);
+        this.createTrList( "File format", "iformat", tabPreference, 'format' );
+        this.createTrList( "Rayleigh extinction", "irextinction", tabPreference,'yesno' );
+        this.createTrList( "H20 extinction", "ih2oe", tabPreference, 'yesno' );
+        this.createTrList( "O3 extinction", "io3e", tabPreference, 'yesno' );
+        this.createTrList( "O2 extinction", "io2e", tabPreference, 'yesno' );
+        this.createTrList( "CO2 extinction", "ico2e", tabPreference, 'yesno' );
+
+        this.createTrList( "Observatory", "iobservatory", tabObservation, 'observatories' );
+
+        this.createTr( "Right LOS ascension", "ira", tabObservation );
+        this.createTr( "LOS declension", "ide", tabObservation );
+        this.createTr( "Zenith angle", "iza", tabObservation );
+
+        //unite
+        this.createTrList( "Spectral unit", "ispectral_choice", tabObservation, 'spectralUnit' );
+        this.createTr2Input( "Spectral range", " to ", "iminspectral_ranger", "imaxspectral_ranger", tabObservation );
+
+        //fonction instrumentale
+        this.createTrList( "Instrumental function", "ifunction", tabPreference, "ilsf" );
+
+        this.createTr( "Resolving power", "irp", tabObservation );
+        this.createTr( "Sampling ratio", "isr", tabObservation );
+
+        //reference climato
+        this.createTrList( "Climatologic reference", "icr", tabAtmosphere, "climatoReference" );
+
+        divPreference.append( tabPreference );
+        this.containerForm.append( divPreference );
+
+        divObservation.append( tabObservation );
+        this.containerForm.append( divObservation );
+
+        divAtmosphere.append( tabAtmosphere );
+        this.containerForm.append( divAtmosphere );
+
+        // Ajout du calendrier APRES la création du formulaire
+       this.createCalendar( tabObservation, "Date measurement");
+
+        //jQuery.proxy permet d'envoyer le contexte this courant
+        var submitButton = new Button( {value:tapasTexts["label.submitButton"], parent:this.containerForm, id:"button_submit", className: "red_button", classNameText:"red_button_text", onClick:jQuery.proxy( this.onClickSubmit, this )} );
+
+    },
+
+
+
     createTapasObject: function()
     {
@@ -227 +321 @@
         preference.format = new Object();
         //toutes les valeurs possibles
-        //preference.format.firstValue = $( "#select_formats" ).val();
         preference.format.firstValue = this.selectFormats.getValues();
+
         //la valeur selectionnee
         preference.format.secondValue = this.selectFormats.getValue();
 
-
-        var pair = new Object();
-        pair.firstValue = "YES,NO";
-        pair.secondValue = this.selectFormats.getValue();
-
-        preference.rayleighExtinction = new Object();
-
-        preference.h2oExtinction = pair;
-        preference.o3Extinction = pair;
-        preference.o2Extinction = pair;
-        preference.co2Extinction = pair;
+        preference.rayleighExtinction = new Object
+        preference.rayleighExtinction.firstValue="YES,NO";
+        preference.rayleighExtinction.secondValue=$( "#select_irextinction" ).val();
+
+
+        preference.h2oExtinction = new Object();
+        preference.h2oExtinction.firstValue="YES,NO";
+        preference.h2oExtinction.secondValue=$( "#select_ih2oe" ).val();
+
+
+        preference.o3Extinction = new Object();
+        preference.o3Extinction.firstValue="";
+        preference.o3Extinction.secondValue="";
+
+        preference.o2Extinction = new Object();
+        preference.o2Extinction.firstValue="";
+        preference.o2Extinction.secondValue="";
+
+        preference.co2Extinction = new Object();
+        preference.co2Extinction.firstValue="";
+        preference.co2Extinction.secondValue="";
+
 
         // OBSERVATION
-        // Observatory
         var observatory = new Object();
-        //observatory.name = this.selectFormats.name;
-
-        observatory.longitude = this.longitude.value;
-        observatory.latitude = this.latitude.value;
-        observatory.altitude = this.altitude.value;
+
+        observatory.name = "";
+
+
+        observatory.longitude = "";
+        observatory.latitude = "";
+        observatory.altitude = "";
 
 
         // Los
         var los = new Object();
-        los.raJ2000 = "04:32:43";
-        los.decJ2000 = "-43:12:10.22";
+
+
+        los.raJ2000 = "";
+        los.decJ2000 = "";
 
         los.zenithAngle = new Object();
         los.zenithAngle.min = "0";
         los.zenithAngle.max = "90";
-        los.zenithAngle.value = 60;
+        los.zenithAngle.value = "";
+
+
 
         // Instrument
@@ -268 +378 @@
 
         instrument.spectralChoice = new Object();
-        instrument.spectralChoice.firstValue = "Vacuum Wavelength (nm),Standard Wavelength (nm),Wavenumber (cm-1)";
-        instrument.spectralChoice.secondValue = "Standard Wavelength (nm)";
-        instrument.spectralRange = "1180 1200";
+        instrument.spectralChoice.firstValue = this.selectSpectralUnits.getValues();
+        instrument.spectralChoice.secondValue = this.selectSpectralUnits.getValue();
+
+        instrument.spectralRange = "";
+
         instrument.ilsfChoice = new Object();
-        instrument.ilsfChoice.firstValue = "-1,0,1";
-        instrument.ilsfChoice.secondValue = 0;
-        instrument.ilsfPath = "/home/ferron/tmp/tapas/ilsf.txt";
+        instrument.ilsfChoice.firstValue = "";
+        instrument.ilsfChoice.secondValue = "";
+
         instrument.resolvingPower = new Object();
-        instrument.resolvingPower.firstValue = "0";
-        instrument.resolvingPower.secondValue = 1000000;
+        instrument.resolvingPower.firstValue = "";
+        instrument.resolvingPower.secondValue = "";
+
         instrument.samplingRatio = new Object();
-        instrument.samplingRatio.firstValue = "0";
-        instrument.samplingRatio.secondValue = 3;
-
-        var observation = new Object();
-        observation.date = this.calendarConverter.parse( $( "#iobservation_date" ).val() ).getTime();
-        observation.observatory = observatory;
+        instrument.samplingRatio.firstValue = "";
+        instrument.samplingRatio.secondValue = "";
+
+
+       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 = "0,1,2,3,4,5,6";
-        atmosphere.reference.secondValue = 6;
-
-        atmosphere.arlettyFile = new Array();
-        atmosphere.arlettyFile[0] = "/home/ferron/tmp/tapas/Reims_070402.ARL.txt";
-        atmosphere.arlettyFile[1] = "/home/ferron/tmp/tapas/Reims_070402.ARL.txt22";
-
-        atmosphere.ecmwfFile = new Array();
-        atmosphere.ecmwfFile[0] = "/home/ferron/tmp/tapas/ecmwf12.txt";
+        atmosphere.reference.firstValue = this.selectClimatoReferences.getValues();
+        atmosphere.reference.secondValue = this.selectClimatoReferences.getValue();
 
 
@@ -314 +424 @@
         // TAPAS
         var tapas = new Object();
-        tapas.id = "Ether_TAPAS_0000001";
         tapas.requests = requests;
+
 
         return tapas;

tapas/web/resources/css/tapas.css

@@ -52 +52 @@
 
 .containerTitle {
-    font-size: 20px;
+    font-size: 16px;
     color: #581700;
     font-weight: bold;
     float: left;
     margin-top: 9px;
-    padding-left: 177px;
+    padding-left: 80px;
 }
 
@@ -138 +138 @@
     -webkit-border-radius: 0; /*#E8EFF3*//* #618EAC*/
     background: -moz-linear-gradient(white, #52251C);
-    background: -webkit-linear-gradient(white, #F6DC12);
+    background: -webkit-linear-gradient(white, #52251C);
     background: -ms-linear-gradient(white,#C03000 ) repeat scroll 0 0 transparent; /*For IE10*/
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#F6DC12'); /*For IE7-8-9*/
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#52251C'); /*For IE7-8-9*/
     min-height: 400px;
     text-align: justify;
@@ -151 +151 @@
 .containerBottom {
     background: -moz-linear-gradient(left center, white, #581700);
-    background: -webkit-linear-gradient(white, #F6DC12);
-    background: -ms-linear-gradient(white, #F6DC12) repeat scroll 0 0 transparent; /*For IE10*/
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#F6DC12'); /*For IE7-8-9*/
+    background: -webkit-linear-gradient(white, #52251C);
+    background: -ms-linear-gradient(white, #52251C) repeat scroll 0 0 transparent; /*For IE10*/
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#52251C'); /*For IE7-8-9*/
     color: #FFFFFF;
     height: 26px;

tapas/web/resources/templates/templateBackoffice.jsp

@@ -67 +67 @@
     <%-- ****************** LOGO ****************** --%>
     <div id="logo" class="containerLogo">
-        <a href="#"><img src="resources/images/logo_tapas.jpg" height="110px" width="110px"></a>
+        <a href="#"><img src="resources/images/logo_tapas.gif" height="110px" width="110px"></a>
     </div>
 

tapas/web/resources/templates/templateEther.jsp

@@ -61 +61 @@
     <%-- ****************** LOGO ****************** --%>
     <div id="logo" class="containerLogo">
-        <a href="#"><img src="resources/images/logo_tapas.jpg" height="110px" width="110px"></a>
+        <a href="#"><img src="resources/images/logo_tapas.gif" height="130px" width="130px"></a>
     </div>
 

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

@@ -47 +47 @@
             jsonObject.put( "jSonObservatories", allObservatories );
             jsonObject.put( "jSonSpectralUnits", getJSONSpectralUnit() );
+            jsonObject.put( "jSonInstrumentalFunctions", getJSONInstrumentalFunction() );
+            jsonObject.put( "jSonClimatoReferences", getJSONClimatoReference() );
             return jsonObject;
         }
@@ -72 +74 @@
             throws WebException
     {
+        String toto="lmml";
+
         if( null == javaTapas )
             throw new WebException( WebException.WebCode.ERROR_JSON_TAPAS_IS_NULL, "Serialization error : jsonTapas is null", WebException.getExceptionThrowable() );
@@ -77 +81 @@
         //TODO recuperer le USER via ControllerEther
 
-        //appel a createxml
+        // appel a createxml
         getTapasService().createXMLRequest( javaTapas ); // en 2ieme parametre
 
-        //appel a runtime
-        //mettre une methode dans tapas service pour appel au shell system
+        // appel a runtime
+        // mettre une methode dans tapas service pour appel au shell system
+        // avec detail du shell 1 (mkdir, appel du shell lancement du qsub)
 
 
@@ -137 +142 @@
     }
 
+
+    private List<JSONObject> getJSONInstrumentalFunction()
+    {
+        final InstrumentalFunction[] instrumentalFunctions = InstrumentalFunction.values();
+
+        final List<JSONObject> jsonInstrumentalFunctions = new ArrayList<JSONObject>( instrumentalFunctions.length );
+
+        for( final InstrumentalFunction instrumentalFunction : instrumentalFunctions )
+        {
+            final JSONObject jsonInstrumentalFunction = new JSONObject();
+            jsonInstrumentalFunction.put( "text", instrumentalFunction.name() );
+            jsonInstrumentalFunction.put( "value", instrumentalFunction.name() );
+            jsonInstrumentalFunctions.add( jsonInstrumentalFunction );
+        }
+        return jsonInstrumentalFunctions;
+    }
+
+
+    private List<JSONObject> getJSONClimatoReference()
+    {
+        final ClimatoReference[] climatoReferences = ClimatoReference.values();
+
+        final List<JSONObject> jsonClimatoReferences = new ArrayList<JSONObject>( climatoReferences.length );
+
+        for( final ClimatoReference climatoReference : climatoReferences )
+        {
+            final JSONObject jsonClimatoReference = new JSONObject();
+            jsonClimatoReference.put( "text", climatoReference.name() );
+            jsonClimatoReference.put( "value", climatoReference.name() );
+            jsonClimatoReferences.add( jsonClimatoReference );
+        }
+        return jsonClimatoReferences;
+    }
+
+
     private static final Log LOGGER = LogFactory.getLog( Controller.class );
 

tapas/web/src/messages_en.properties

@@ -5 +5 @@
 
 app.title=Tapas
-app.fulltitle=Full title de Tapas
+app.fulltitle=Transmissions Atmosphériques Personnalisées Pour l'AStronomie
 app.connexion=Connection
 app.administrator=Administrator
@@ -28 +28 @@
 label.spectralUnit.NM_VACUUM=Vacuum Wavelength (nm)
 label.spectralUnit.CM=Wavenumber (cm-1)
+
+label.instrumentalFunction.NONE=None
+label.instrumentalFunction.GAUSSIAN=Gaussian
+
+label.climatoReference.TROPICAL=Tropical
+label.climatoReference.MEDIUM_LATITUDE_SUMMER=Average latitude summer
+label.climatoReference.MEDIUM_LATITUDE_WINTER=Average latitude winter
+label.climatoReference.SUBARCTIC_SUMMER=Subarctic summer
+label.climatoReference.SUBARCTIC_WINTER=Subarctic winter
+label.climatoReference.US_STANDARD_1976=Standard US 1976
 
 ################################################################

tapas/web/src/messages_fr.properties

@@ -5 +5 @@
 
 app.title=Tapas
-app.fulltitle=Titre complet de Tapas
+app.fulltitle=Transmissions Atmosphériques Personnalisées Pour l'AStronomie
 app.connexion=Connexion
 app.administrator=Administrateur
@@ -23 +23 @@
 error.ERROR_JSON_TAPAS_IS_NULL=Erreur de création du formulaire Tapas
 
-label.submitButton=COURIR
+label.submitButton=EXECUTER
 
 label.spectralUnit.NM_STANDARD=Standard Wavelength (nm)
 label.spectralUnit.NM_VACUUM=Vacuum Wavelength (nm)
 label.spectralUnit.CM=Wavenumber (cm-1)
+
+label.instrumentalFunction.NONE=Aucune
+label.instrumentalFunction.GAUSSIAN=Gaussienne
+
+label.climatoReference.TROPICAL=Tropical
+label.climatoReference.MEDIUM_LATITUDE_SUMMER=Latitude moyenne été
+label.climatoReference.MEDIUM_LATITUDE_WINTER=Latitude moyenne hiver
+label.climatoReference.SUBARCTIC_SUMMER=Subarctique été
+label.climatoReference.SUBARCTIC_WINTER=Subarctique hiver
+label.climatoReference.US_STANDARD_1976=Standard US 1976
+
 
 ################################################################