Changeset 490 for tapas/web/src
- Timestamp:
- 04/26/12 15:42:13 (12 years ago)
- Location:
- tapas/web/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
tapas/web/src/com/ether/Controller.java
r480 r490 16 16 import java.io.IOException; 17 17 import java.util.ArrayList; 18 import java.util.Date; 18 19 import java.util.List; 19 20 import java.util.Properties; … … 37 38 * @throws WebException 38 39 */ 39 @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = true, defaultView = VIEW_INDEX)40 @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = false, defaultView = VIEW_INDEX) 40 41 public JSONObject viewForm() 41 42 throws WebException 42 43 { 43 try44 { 45 final List<Observatory> allObservatories = getTapasService().getAllObservatories();44 /*try 45 { */ 46 //final List<Observatory> allObservatories = getTapasService().getAllObservatories(); 46 47 47 48 final JSONObject jsonObject = new JSONObject(); 48 49 jsonObject.put( "jSonFileFormats", getJSONFileFormat() ); 49 50 jsonObject.put( "jSonYesNos", getJSONYesNo() ); 50 jsonObject.put( "jSonObservatories", allObservatories );51 //jsonObject.put( "jSonObservatories", allObservatories ); 51 52 jsonObject.put( "jSonSpectralUnits", getJSONSpectralUnit() ); 52 53 jsonObject.put( "jSonInstrumentalFunctions", getJSONInstrumentalFunction() ); 53 54 jsonObject.put( "jSonClimatoReferences", getJSONClimatoReference() ); 54 55 return jsonObject; 55 }56 catch( ServiceException e )56 //} 57 /*catch( ServiceException e ) 57 58 { 58 59 throw new WebException( WebException.WebCode.ERROR_NO_OBSERVATORY_FOUND, e ); 59 } 60 } */ 60 61 61 62 } … … 73 74 * @throws WebException 74 75 */ 75 @ControllerMethod(jsonResult = true, userMandatory = true, defaultView = VIEW_INDEX) 76 public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) // TODO rajouter parametre USER 76 //@ControllerMethod(jsonResult = true, userMandatory = true, defaultView = VIEW_INDEX) 77 @ControllerMethod(jsonResult = true, userMandatory = false, defaultView = VIEW_INDEX) 78 //public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas, @NotNull final User user ) 79 public JSONObject createUserRequest( @ParamName("jsonTapas") @Mandatory @UseJSON final Tapas javaTapas ) 77 80 throws WebException 78 81 { 82 83 /***********/ 84 final User user= new User(); 85 user.setId( 12 ); 86 user.setLastName( "tamere" ); 87 user.setEmail( "rbopipsl@ipsl.jussieu.fr" ); 88 user.setCreationDate( new Date() ); 89 user.setPassword( "pif" ); 90 /******/ 91 79 92 if( null == javaTapas ) 80 93 throw new WebException( WebException.WebCode.ERROR_JSON_TAPAS_IS_NULL, "Serialization error : jsonTapas is null", WebException.getExceptionThrowable() ); … … 115 128 try 116 129 { 117 getTapasService().execAppelQSub( user, prop );130 getTapasService().execAppelQSub( "popo", user, prop ); 118 131 } 119 132 catch( ServiceException e ) -
tapas/web/src/messages_en.properties
r489 r490 30 30 text.NONE=None 31 31 text.badvalue=bad value 32 text.toselect=must be selected 32 33 34 label.delButton=CANCEL 33 35 34 36 … … 55 57 error.ERROR_JSON_TAPAS_IS_NULL=Error to create the form 56 58 57 label.submitButton=RUN 59 label.submitButton=EXECUTE 60 label.addButton=ADD REQUEST 58 61 label.confirm=ARE YOU SURE YOU WANT TO SEND THIS REQUEST ? 62 label.requete=Request 59 63 60 64 label.spectralUnit.NM_STANDARD=Standard Wavelength (nm) -
tapas/web/src/messages_fr.properties
r489 r490 27 27 label.preferences=Préférences 28 28 29 label.delButton=ANNULER 30 29 31 text.validnum=doit être numérique 30 32 text.select=Sélectionnez 31 33 text.badvalue=mauvaise valeur 32 34 text.NONE=Aucune 35 text.toselect=à sélectionner 33 36 34 37 … … 41 44 42 45 title.home=Accueil 43 title.form=Formulaire req ête46 title.form=Formulaire requête 44 47 title.legals=Mentions légales 45 48 … … 58 61 59 62 label.submitButton=EXECUTER 63 label.addButton=ENREGISTRER 64 label.requete=Requete 60 65 61 66 label.spectralUnit.NM_STANDARD=Standard Wavelength (nm)
Note: See TracChangeset
for help on using the changeset viewer.