17,7 → 17,8 |
private String location=null; |
private String location_id=null; |
private String date=null; |
private String milieu=null; |
private String lieudit=null; |
private String station=null; |
private String comment=null; |
private String ordre=null; |
|
43,7 → 44,7 |
|
// Alimentation contenu depuis saisie |
|
public void setContent(String name,String nomenclaturalNumber, String location, String location_id, String date, String milieu, String comment,String ordre) { |
public void setContent(String name,String nomenclaturalNumber, String location, String location_id, String date, String lieudit, String station, String comment,String ordre) { |
|
|
this.name=name; |
59,8 → 60,11 |
} |
|
this.location_id=location_id; |
if (location.compareTo("")==0) this.location_id=""; |
if (location_id==null) this.location_id=""; |
this.date=date; |
this.milieu=milieu; |
this.lieudit=lieudit; |
this.station=station; |
this.comment=comment; |
this.ordre=ordre; |
|
115,7 → 119,7 |
.stringValue(), |
Util.toCelString(((JSONString) jsonArray.get(3)) |
.toString()), |
location,location_id,date,milieu,comment); |
location,location_id,date,lieudit,station,comment); |
} |
} |
|
123,7 → 127,7 |
} |
// Saisie libre |
else { |
addElement(name, " ", " ", " ", " ", " ",location,location_id,date,milieu,comment); |
addElement(name, " ", " ", " ", " ", " ",location,location_id,date,lieudit,station,comment); |
} |
|
} |
153,7 → 157,7 |
*/ |
|
private void addElement(String nom_sel, String num_nom_sel, String nom_ret, |
String num_nom_ret, String num_taxon, String famille,final String loc, String id_location,String dat, String milieu, String comment) { |
String num_nom_ret, String num_taxon, String famille,final String loc, String id_location,String dat, String lieu, String sta, String comment) { |
|
|
HTTPRequest.asyncPost(serviceBaseUrl + "/Inventory/", "identifiant=" |
160,12 → 164,12 |
+ mediator.getUser() + "&nom_sel=" + URL.encodeComponent(nom_sel) + "&num_nom_sel=" + num_nom_sel |
+ "&nom_ret=" + URL.encodeComponent(nom_ret) + "&num_nom_ret=" + num_nom_ret |
+ "&num_taxon=" + num_taxon + "&famille=" + URL.encodeComponent(famille) + "&location=" + URL.encodeComponent(loc) + "&id_location=" + id_location + "&date_observation=" + dat |
+ "&station="+ URL.encodeComponent(milieu) + "&commentaire="+ URL.encodeComponent(comment), |
+ "&lieudit="+ URL.encodeComponent(lieu) + "&station="+ URL.encodeComponent(sta) + "&commentaire="+ URL.encodeComponent(comment), |
|
new ResponseTextHandler() { |
|
public void onCompletion(String str) { |
mediator.onInventoryUpdated(location); |
mediator.onInventoryUpdated(location_id,location,"all"); |
} |
}); |
} |
206,7 → 210,7 |
.stringValue(), |
Util.toCelString(((JSONString) jsonArray.get(3)) |
.toString()), |
location,location_id,date,milieu,comment); |
location,location_id,date,lieudit,station,comment); |
} |
} |
|
214,7 → 218,7 |
} |
// Modification d'un nom ne faisant pas parti du referentiel (saisie libre) |
else { |
updateElement(ordre,name, " ", " ", " ", " ", " ",location,location_id,date,milieu,comment); |
updateElement(ordre,name, " ", " ", " ", " ", " ",location,location_id,date,lieudit,station,comment); |
} |
|
} |
247,7 → 251,7 |
*/ |
|
private void updateElement(String ordre, String nom_sel, String num_nom_sel, String nom_ret, |
String num_nom_ret, String num_taxon, String famille,final String loc, String id_location,String dat, String milieu, String comment) { |
String num_nom_ret, String num_taxon, String famille,final String loc, String id_location,String dat, String lieu, String sta, String comment) { |
|
|
HTTPRequest.asyncPost(serviceBaseUrl + "/Inventory/" + mediator.getUser() + "/" +ordre + "/", |
254,12 → 258,12 |
"&nom_sel=" + URL.encodeComponent(nom_sel) + "&num_nom_sel=" + num_nom_sel |
+ "&nom_ret=" + URL.encodeComponent(nom_ret) + "&num_nom_ret=" + num_nom_ret |
+ "&num_taxon=" + num_taxon + "&famille=" + URL.encodeComponent(famille) + "&location=" + URL.encodeComponent(loc) + "&id_location=" + id_location + "&date_observation=" + dat |
+ "&station="+ URL.encodeComponent(milieu) + "&commentaire="+ URL.encodeComponent(comment), |
+ "&lieudit="+ URL.encodeComponent(lieu) + "&station="+ URL.encodeComponent(sta) + "&commentaire="+ URL.encodeComponent(comment), |
|
new ResponseTextHandler() { |
|
public void onCompletion(String str) { |
mediator.onInventoryUpdated(location); |
mediator.onInventoryUpdated(location_id,location,"all"); |
} |
}); |
} |