Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 139 → Rev 140

/trunk/src/org/tela_botanica/client/modeles/UtilisateurAsynchroneDAO.java
54,7 → 54,7
 
// Recherche identifiant utilisateur identifie
 
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET,carnetEnLigneModele.getConfig().getServiceBaseUrl() + "/User/") ;
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET,Configuration.getServiceBaseUrl() + "/User/") ;
try {
78,7 → 78,11
boolean identifie = ((JSONBoolean) jsonArray.get(1))
.booleanValue(); // Drapeau leve si utilisateur
// deja identifie
r.rafraichir(new Utilisateur(identifiant, identifie),true);
boolean isAdmin = ((JSONBoolean) jsonArray.get(2))
.booleanValue(); // Drapeau leve si utilisateur
// est admin
r.rafraichir(new Utilisateur(identifiant, identifie, isAdmin),true);
}
}
}) ;
94,7 → 98,7
 
public void deconnecterUtilisateur(final Rafraichissable r, String user) {
 
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, carnetEnLigneModele.getConfig().getServiceBaseUrl()+ "/User/" + user) ;
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, Configuration.getServiceBaseUrl()+ "/User/" + user) ;
try {
/trunk/src/org/tela_botanica/client/modeles/ImageAsynchroneDAO.java
93,8 → 93,8
postData += "&ci_id_image=" + id + "&ci_meta_mots_cles=" + motsCles;
 
// on envoie une requête asynchrone
RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, iModele
.getConfig().getServiceBaseUrl()
RequestBuilder rb = new RequestBuilder(RequestBuilder.POST,
Configuration.getServiceBaseUrl()
+ "/inventoryImage/" + iModele.getIdentifiant() + "/");
 
try {
/trunk/src/org/tela_botanica/client/modeles/ListeEntiteGeographiqueObservation.java
42,10 → 42,13
{
if(ent[i] != null && ent[i] instanceof EntiteGeographiqueObservation)
{
this.put(ent[i].getLocation()+ent[i].getLieuDit(),ent[i]);
this.put(ent[i].getIdLocation()+ent[i].getLieuDit(),ent[i]);
}
}
}
public void put(EntiteGeographiqueObservation value) {
this.put(value.getIdLocation()+value.getLieuDit(),value);
}
}
/trunk/src/org/tela_botanica/client/modeles/ListeEntiteGeographiqueObservationAsynchroneDAO.java
52,7 → 52,7
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, observationModele.getConfig().getServiceBaseUrl() + "/InventoryLocationList/" + utilisateur);
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, Configuration.getServiceBaseUrl() + "/InventoryLocationList/" + utilisateur);
try {
86,15 → 86,12
for (int i = 0; i < taillemax; i++) {
if ((entites = reponse.get(i).isArray()) != null) {
String entite = ((JSONString) entites.get(0)).stringValue();
String idEntite = ((JSONString) entites.get(1)).stringValue();
String idParent = ((JSONString) entites.get(2)).stringValue();
String localite = ((JSONString) entites.get(0)).stringValue();
String commune = ((JSONString) entites.get(1)).stringValue();
String lieuDit = ((JSONString) entites.get(2)).stringValue();
EntiteGeographiqueObservation ent = new EntiteGeographiqueObservation(entite, idEntite, idParent);
listeEntiteGeographiqueObservation.put(ent.getLocation() + ent.getLieuDit(), ent);
EntiteGeographiqueObservation ent = new EntiteGeographiqueObservation(localite, commune, lieuDit);
listeEntiteGeographiqueObservation.put(ent);
}
}
} else {
/trunk/src/org/tela_botanica/client/modeles/NomRetenuAsynchroneDao.java
New file
0,0 → 1,68
package org.tela_botanica.client.modeles;
 
import org.tela_botanica.client.Util;
import org.tela_botanica.client.interfaces.Rafraichissable;
import org.tela_botanica.client.observation.ObservationModele;
 
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.RequestException;
import com.google.gwt.http.client.Response;
import com.google.gwt.json.client.JSONArray;
import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONString;
import com.google.gwt.json.client.JSONValue;
import com.google.gwt.user.client.Window;
 
public class NomRetenuAsynchroneDao {
 
private ObservationModele oModele = null ;
public NomRetenuAsynchroneDao(ObservationModele observationModele) {
oModele = observationModele ;
}
 
public void obtenirNomRetenu(final Rafraichissable r, final String anum) {
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET,
Configuration.getServiceBaseUrl()
+ "/name/"+anum);
 
try {
rb.sendRequest(null, new RequestCallback() {
 
public void onError(Request request, Throwable exception) {
// TODO Auto-generated method stub
}
 
public void onResponseReceived(Request request,
Response response) {
JSONValue jsonValue = JSONParser.parse(response.getText());
JSONArray jsonArray;
 
if ((jsonArray = jsonValue.isArray()) != null) {
String aname = Util.toCelString(((JSONString) jsonArray.get(0)).toString());
// Nom
if (aname.compareTo("null")!=0) {
String[] numNom = {aname, anum } ;
r.rafraichir(numNom, false);
}
}
}
});
 
} catch (RequestException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
 
}
/trunk/src/org/tela_botanica/client/modeles/ImageUploaderAsynchroneDAO.java
44,7 → 44,7
private static void appelerUploadSimple() {
 
UploadDialog up = new UploadDialog("Upload simple de fichiers");
up.setUrl(iModele.getConfig().getServiceBaseUrl() + "/InventoryImage");
up.setUrl(Configuration.getServiceBaseUrl() + "/InventoryImage");
UrlParam id = new UrlParam("identifiant", iModele.getIdentifiant());
UrlParam[] params = { id };
up.setBaseParams(params);
84,7 → 84,7
 
final String applet = "<applet code=\"wjhk.jupload2.JUploadApplet\" archive=\"wjhk.jupload.jar\" alt=\"\" mayscript=\"\" height=\"350\" width=\"625\">";
final String paramPostTarget = "<param name=\"postURL\" value=\""
+ iModele.getConfig().getServiceBaseUrl()
+ Configuration.getServiceBaseUrl()
+ "/InventoryImage/\">";
final String paramUploadPolicy = "<param name=\"uploadPolicy\" value=\"PictureUploadPolicy\">";
final String paramMaxChunkSize = "<param name=\"maxChunkSize\" value=\"0\">";
/trunk/src/org/tela_botanica/client/modeles/Configuration.java
36,6 → 36,11
"imageBaseUrl");
aideBaseUrl = Dictionary.getDictionary("configuration").get(
"aideBaseUrl");
/*serviceBaseUrl = "http://localhost/jrest";
suiviBugUrl = "http://www.tela-botanica.org/suivi/index.php?do=newtask&project=2";
aideBaseUrl = "http://www.tela-botanica.org/wikini/eflore/wakka.php?wiki=AideCEL";
imageBaseUrl = "http://localhost/Documents/images_serveur/"; */
}
 
/**
/trunk/src/org/tela_botanica/client/modeles/MotsClesAsynchroneDAO.java
133,8 → 133,7
String postData = "";
postData += "&action=DELETE";
 
RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, iModele
.getConfig().getServiceBaseUrl()
RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, Configuration.getServiceBaseUrl()
+ "/InventoryKeyWordList/"
+ iModele.getIdentifiant()
+ "/"
/trunk/src/org/tela_botanica/client/modeles/Utilisateur.java
4,12 → 4,22
 
private String identifiant=null;
private String identite=null;
private boolean identifie=false;
private boolean isAdmin=false;
 
public Utilisateur(String identifiant, boolean identifie) {
this.identifiant=identifiant;
this.identifie=identifie;
this.identite=identifiant;
}
public Utilisateur(String identifiant, boolean identifie, boolean isAdmin) {
this.identifiant=identifiant;
this.identifie=identifie;
this.isAdmin=isAdmin;
this.identite=identifiant;
}
 
/**
25,9 → 35,24
* Retourne vrai si utilisateur identifie
* @return boolean
*/
public boolean isIdentifie() {
return identifie;
}
/**
* Retourne vrai si utilisateur est admin
* @return boolean
*/
public boolean isAdmin() {
return isAdmin;
}
public void setIdentite(String identite) {
this.identite = identite;
}
public String getIdentite() {
return identite;
}
}