| /trunk/src/org/tela_botanica/client/modeles/dao/ObservationAsynchroneDAO.java |
|---|
| 65,11 → 65,12 |
| +"&commentaire="+obs.getCommentaire() |
| +"&latitude="+URL.encodeComponent(""+obs.getLatitude()) |
| +"&longitude="+URL.encodeComponent(""+obs.getLongitude()) |
| +"&altitude="+URL.encodeComponent(""+obs.getAltitude()) |
| +"&abondance="+URL.encodeComponent(""+obs.getAbondance()) |
| +"&certitude="+URL.encodeComponent(""+obs.getCertitude()) |
| +"&phenologie="+URL.encodeComponent(""+obs.getPhenologie()) |
| +"&nom_referentiel="+URL.encodeComponent(""+obs.getReferentielTaxo()) |
| +"&"+Util.convertirMapEnChaineRequete(obs.getChampsEtendus(), "obs_etendue"); |
| +"&obs_etendue="+URL.encodeComponent(""+Util.convertirChampsEtendusEnChaineRequete(obs.getChampsEtendus())); |
| try { |
| rb.sendRequest(postData, new RequestCallback() { |
| 118,11 → 119,12 |
| +"&commentaire="+obs.getCommentaire() |
| +"&latitude="+URL.encodeComponent(""+obs.getLatitude()) |
| +"&longitude="+URL.encodeComponent(""+obs.getLongitude()) |
| +"&altitude="+URL.encodeComponent(""+obs.getAltitude()) |
| +"&abondance="+URL.encodeComponent(""+obs.getAbondance()) |
| +"&certitude="+URL.encodeComponent(""+obs.getCertitude()) |
| +"&phenologie="+URL.encodeComponent(""+obs.getPhenologie()) |
| +"&nom_referentiel="+URL.encodeComponent(""+obs.getReferentielTaxo()) |
| +"&"+Util.convertirMapEnChaineRequete(obs.getChampsEtendus(), "obs_etendue"); |
| +"&obs_etendue="+URL.encodeComponent(""+Util.convertirChampsEtendusEnChaineRequete(obs.getChampsEtendus())); |
| try { |
| rb.sendRequest(postData, new RequestCallback() { |
| /trunk/src/org/tela_botanica/client/modeles/dao/ListeObservationAsynchroneDAO.java |
|---|
| 180,6 → 180,10 |
| postData += "&longitude="+URL.encodeComponent(""+obs.getLongitude()); |
| } |
| if(obs.getAltitude() != null) { |
| postData += "&altitude="+URL.encodeComponent(""+obs.getAltitude()); |
| } |
| if(obs.getAbondance() != null) { |
| postData += "&abondance="+URL.encodeComponent(""+obs.getAbondance()); |
| } |
| /trunk/src/org/tela_botanica/client/modeles/objets/Observation.java |
|---|
| 35,7 → 35,7 |
| private String phenologie=null; |
| private String altitude=null; |
| private Map<String, String> champsEtendus=null; |
| private Map<String, ChampEtendu> champsEtendus=null; |
| public Observation() { |
| } |
| 110,6 → 110,7 |
| this.id = Util.getValeurJsonOuVide(observation,"id_observation"); |
| this.latitude = Util.getValeurJsonOuVide(observation,"latitude"); |
| this.longitude = Util.getValeurJsonOuVide(observation,"longitude"); |
| this.altitude = Util.getValeurJsonOuVide(observation,"altitude"); |
| this.motsCles = Util.getValeurJsonOuVide(observation,"mots_cles"); |
| this.abondance = Util.getValeurJsonOuVide(observation,"abondance"); |
| this.certitude = Util.getValeurJsonOuVide(observation,"certitude"); |
| 331,24 → 332,41 |
| } |
| public void setValeurChampEtendu(String cle, String valeur) { |
| champsEtendus.put(cle, valeur); |
| public void setValeurChampEtendu(String cle, String valeur, String label) { |
| ChampEtendu champ = new ChampEtendu(cle, label, valeur); |
| champsEtendus.put(cle, champ); |
| } |
| public ChampEtendu getChampEtendu(String cle) { |
| ChampEtendu champ = null; |
| if(champsEtendus.containsKey(cle)) { |
| champ = champsEtendus.get(cle); |
| } |
| return champ; |
| } |
| public String getLabelChampEtendu(String cle) { |
| String valeur = ""; |
| if(champsEtendus.containsKey(cle)) { |
| valeur = champsEtendus.get(cle).getLabel(); |
| } |
| return valeur; |
| } |
| public String getValeurChampEtendu(String cle) { |
| String valeur = ""; |
| if(champsEtendus.containsKey(cle)) { |
| valeur = champsEtendus.get(cle); |
| valeur = champsEtendus.get(cle).getValeur(); |
| } |
| return valeur; |
| } |
| public Map<String, String> getChampsEtendus() { |
| public Map<String, ChampEtendu> getChampsEtendus() { |
| return champsEtendus; |
| } |
| public void setChampsEtendus(Map<String, String> champsEtendus) { |
| public void setChampsEtendus(Map<String, ChampEtendu> champsEtendus) { |
| this.champsEtendus = champsEtendus; |
| } |
| } |
| /trunk/src/org/tela_botanica/client/modeles/objets/ChampEtendu.java |
|---|
| New file |
| 0,0 → 1,42 |
| package org.tela_botanica.client.modeles.objets; |
| public class ChampEtendu { |
| private String cle; |
| private String label; |
| private String valeur; |
| public ChampEtendu() { |
| } |
| public ChampEtendu(String cle, String label, String valeur) { |
| this.setCle(cle); |
| this.setLabel(label); |
| this.setValeur(valeur); |
| } |
| public String getCle() { |
| return cle; |
| } |
| public void setCle(String cle) { |
| this.cle = cle; |
| } |
| public String getLabel() { |
| return label; |
| } |
| public void setLabel(String label) { |
| this.label = label; |
| } |
| public String getValeur() { |
| return valeur; |
| } |
| public void setValeur(String valeur) { |
| this.valeur = valeur; |
| } |
| } |