/trunk/src/org/tela_botanica/client/modeles/InterneValeurListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/InterneValeurListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/Information.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/Information.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/publication/Publication.java |
---|
2,6 → 2,7 |
import org.tela_botanica.client.modeles.aDonnee; |
import org.tela_botanica.client.modeles.structure.Structure; |
import org.tela_botanica.client.util.UtilString; |
import com.google.gwt.json.client.JSONObject; |
80,7 → 81,7 |
return renvoyerValeurCorrecte("titre"); |
} |
public void setTitre(String titre) { |
this.set("titre", titre); |
this.set("titre", UtilString.ucFirst(titre)); |
} |
public String getNomEditeur() { |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/publication/Publication.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java |
---|
35,6 → 35,7 |
String[] parametres = {projetId, publicationId, nomComplet}; |
HashMap<String, String> restrictions = new HashMap<String, String>(); |
restrictions.put("orderby", "cpu_titre"); |
restrictions.put("start", String.valueOf(pageCourante*nbElements)); |
if (nbElements != -1) { |
restrictions.put("limit", String.valueOf(nbElements)); |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java |
---|
100,6 → 100,7 |
String[] parametres = {utilisateur.getLogin(), utilisateur.getMotDePasse()}; |
final JsonRestRequestBuilder rb = UtilDAO.construireRequete(SERVICE_NOM, parametres); |
rb.envoyerRequete(null, new JsonRestRequestCallback() { |
@Override |
public void surReponse(JSONValue responseValue) { |
114,11 → 115,11 |
} |
if (reponse.size() > 0) { |
// Identifiant de l'utilisateur ou identifiant de session si non identifié |
utilisateur.setId(((JSONString) reponse.get(1)).stringValue()); |
// Drapeau levé si l'utilisateur est déjà identifié |
GWT.log(reponse.toString(), null); |
utilisateur.setIdentification(((JSONBoolean) reponse.get(2)).booleanValue()); |
// Plus de deux valeurs, l'utilisateur est identifié nous récupérons des données supplémentaires |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/Valeur.java |
---|
1,6 → 1,7 |
package org.tela_botanica.client.modeles; |
import java.util.Iterator; |
import java.util.Map; |
import java.util.Set; |
import org.tela_botanica.client.util.Debug; |
48,13 → 49,20 |
} |
public Valeur(ModelData model) |
{ |
this.set("id_valeur", model.get("cmlv_id_valeur")); |
this.set("nom", model.get("cmlv_nom")); |
this.set("abreviation", model.get("cmlv_abreviation")); |
this.set("description", model.get("cmlv_description")); |
{ |
Map<String, Object> a = model.getProperties(); |
Set<String> cles = a.keySet(); |
Iterator<String> it = cles.iterator(); |
while (it.hasNext()) { |
String cle = it.next(); |
if (a.get(cle) != null) { |
String cleObjet = cle.replaceFirst("^"+getPrefixe()+"_", ""); |
this.set(cleObjet, a.get(cle)); |
} |
} |
} |
@Override |
protected String getPrefixe() { |
return PREFIXE; |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/Valeur.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/ValeurListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/ValeurListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/Aide.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/Aide.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/Menu.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/Menu.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/MenuApplicationId.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/MenuApplicationId.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/personne/Personne.java |
---|
2,13 → 2,16 |
import java.util.Date; |
import java.util.Iterator; |
import java.util.Map; |
import java.util.Set; |
import org.tela_botanica.client.Mediateur; |
import org.tela_botanica.client.modeles.aDonnee; |
import org.tela_botanica.client.modeles.publication.PublicationAPersonneListe; |
import org.tela_botanica.client.util.Debug; |
import org.tela_botanica.client.util.UtilString; |
import com.extjs.gxt.ui.client.data.ModelData; |
import com.google.gwt.core.client.GWT; |
import com.google.gwt.i18n.client.DateTimeFormat; |
import com.google.gwt.json.client.JSONObject; |
29,6 → 32,21 |
public Personne() { |
} |
public Personne(ModelData model) |
{ |
Map<String, Object> a = model.getProperties(); |
Set<String> cles = a.keySet(); |
Iterator<String> it = cles.iterator(); |
while (it.hasNext()) { |
String cle = it.next(); |
if (a.get(cle) != null) { |
String cleObjet = cle.replaceFirst("^"+getPrefixe()+"_", ""); |
this.set(cleObjet, a.get(cle)); |
} |
} |
} |
public Personne(JSONObject personne) { |
initialiserModele(personne); |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/personne/Personne.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/personne/PersonneListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/personne/PersonneListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/aDonnee.java |
---|
13,6 → 13,7 |
import org.tela_botanica.client.util.Debug; |
import org.tela_botanica.client.util.UtilArray; |
import org.tela_botanica.client.util.UtilString; |
import com.extjs.gxt.ui.client.core.FastMap; |
import com.extjs.gxt.ui.client.data.BaseModelData; |
124,7 → 125,7 |
protected void ajouterChaineDenormaliseAvecType(String champ, String type, Object valeur) { |
if (valeur instanceof String) { |
String chaineExistante = renvoyerValeurCorrecte(champ); |
if (chaineExistante.equals("")) { |
if (UtilString.isEmpty(chaineExistante)) { |
this.set(champ, type+SEPARATEUR_TYPE_VALEUR+valeur); |
} else { |
// Si la valeur à ajouter n'est pas déjà présente, nous l'ajoutons |
137,7 → 138,7 |
protected void supprimerTypeDansChaineDenormalise(String champ, String type) { |
String chaineExistante = renvoyerValeurCorrecte(champ); |
if (!chaineExistante.equals("")) { |
if (!UtilString.isEmpty(chaineExistante)) { |
if (chaineExistante.matches("(?:^|.*"+SEPARATEUR_VALEURS+")"+type+SEPARATEUR_TYPE_VALEUR+".*")) { |
chaineExistante = chaineExistante.replaceFirst("(^|.*"+SEPARATEUR_VALEURS+")"+type+SEPARATEUR_TYPE_VALEUR+".*?("+SEPARATEUR_VALEURS+".*|$)", "$1$2"); |
chaineExistante = chaineExistante.replaceAll("(.*)"+SEPARATEUR_VALEURS+SEPARATEUR_VALEURS+"(.*)", "$1"+SEPARATEUR_VALEURS+"$2"); |
166,7 → 167,7 |
protected void ajouterChaineDenormalise(String champ, Object valeur) { |
if (valeur instanceof String) { |
String chaineExistante = renvoyerValeurCorrecte(champ); |
if (chaineExistante.equals("")) { |
if (UtilString.isEmpty(chaineExistante)) { |
this.set(champ, valeur); |
} else { |
// Si la valeur à ajouter n'est pas déjà présente, nous l'ajoutons |
185,7 → 186,7 |
* @param valeur la valeur à ajouter |
*/ |
protected void setChaineDenormaliseUnique(String champ, String type, String valeur) { |
if (valeur == null || valeur.equals("")) { |
if (valeur == null || UtilString.isEmpty(valeur)) { |
this.set(champ, ""); |
} else if (valeur instanceof String) { |
if (((String) valeur).matches("^[0-9]+$")) { |
204,7 → 205,7 |
protected String getChaineDenormaliseUnique(String champ) { |
String valeur = renvoyerValeurCorrecte(champ); |
if (!valeur.equals("")) { |
if (!UtilString.isEmpty(valeur)) { |
valeur = valeur.replaceFirst("^"+TYPE_AUTRE+SEPARATEUR_TYPE_VALEUR, ""); |
} |
213,7 → 214,7 |
protected String getInfoDenormaliseParType(String chaineExistante, String type) { |
String sortie = ""; |
if (!chaineExistante.equals("")) { |
if (!UtilString.isEmpty(chaineExistante)) { |
String[] valeurs = chaineExistante.split(SEPARATEUR_VALEURS); |
for (int i = 0; i < valeurs.length; i++) { |
if (valeurs[i].startsWith(type+SEPARATEUR_TYPE_VALEUR)) { |
286,7 → 287,7 |
} else if (valeur instanceof String) { |
String chaineExistante = renvoyerValeurCorrecte(champ); |
if (chaineExistante.equals("")) { |
if (UtilString.isEmpty(chaineExistante)) { |
this.set(champ, type+SEPARATEUR_TYPE_VALEUR+valeur); |
} else { |
String[] valeurs = chaineExistante.split(SEPARATEUR_VALEURS); |
309,7 → 310,7 |
protected String getInfoDenormaliseParPosition(String chaineExistante, int position) { |
String sortie = ""; |
if (!chaineExistante.equals("")) { |
if (!UtilString.isEmpty(chaineExistante)) { |
String[] valeurs = chaineExistante.split(SEPARATEUR_VALEURS); |
if (valeurs.length >= position) { |
for (int i = 0; i < valeurs.length; i++) { |
342,7 → 343,7 |
supprimerChaineDenormaliseParPosition(champ, position); |
} else if (valeur instanceof String) { |
String chaineExistante = renvoyerValeurCorrecte(champ); |
if (chaineExistante.equals("")) { |
if (UtilString.isEmpty(chaineExistante)) { |
this.set(champ, valeur); |
} else { |
String[] valeurs = chaineExistante.split(SEPARATEUR_VALEURS); |
361,7 → 362,7 |
protected void supprimerChaineDenormaliseParPosition(String champ, int position) { |
String chaineExistante = renvoyerValeurCorrecte(champ); |
if (!chaineExistante.equals("")) { |
if (!UtilString.isEmpty(chaineExistante)) { |
String[] valeurs = chaineExistante.split(SEPARATEUR_VALEURS); |
HashMap<String,String> valeursModifiees = new HashMap<String,String>(); |
if (valeurs.length >= position) { |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/aDonnee.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/Utilisateur.java |
---|
159,7 → 159,7 |
public void setIdentification(Boolean bool) { |
set("identifie", bool); |
} |
public boolean avoirLicenceAcceptee() { |
if (getLicence().equals("1")) { |
return true; |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/Utilisateur.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/aDonneeListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/aDonneeListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/Collection.java |
---|
1,7 → 1,10 |
package org.tela_botanica.client.modeles.collection; |
import java.util.Iterator; |
import java.util.LinkedList; |
import java.util.List; |
import java.util.Map; |
import java.util.Set; |
import org.tela_botanica.client.modeles.aDonnee; |
import org.tela_botanica.client.util.Debug; |
20,16 → 23,24 |
private CollectionACommentaireListe commentairesLiees = null; |
public static String[] champsObligatoires = {"cc_id_collection","cc_ce_type"}; |
public Collection(){ |
public Collection() { |
} |
public Collection(ModelData model) |
{ |
this.set("id_collection", model.get("cc_id_collection")); |
this.set("nom", model.get("cc_nom")); |
Map<String, Object> a = model.getProperties(); |
Set<String> cles = a.keySet(); |
Iterator<String> it = cles.iterator(); |
while (it.hasNext()) { |
String cle = it.next(); |
if (a.get(cle) != null) { |
String cleObjet = cle.replaceFirst("^"+getPrefixe()+"_", ""); |
this.set(cleObjet, a.get(cle)); |
} |
} |
} |
public Collection(JSONObject collection){ |
initialiserModele(collection); |
} |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/Collection.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/Structure.java |
---|
2,6 → 2,7 |
import java.util.Date; |
import java.util.Iterator; |
import java.util.Map; |
import java.util.Set; |
import org.tela_botanica.client.modeles.aDonnee; |
34,8 → 35,17 |
public Structure(ModelData model) |
{ |
this.set("id_structure", model.get("cs_id_structure")); |
this.set("nom", model.get("cs_nom")); |
Map<String, Object> a = model.getProperties(); |
Set<String> cles = a.keySet(); |
Iterator<String> it = cles.iterator(); |
while (it.hasNext()) { |
String cle = it.next(); |
if (a.get(cle) != null) { |
String cleObjet = cle.replaceFirst("^"+getPrefixe()+"_", ""); |
this.set(cleObjet, a.get(cle)); |
} |
} |
} |
public Structure(JSONObject institution) { |
149,6 → 159,13 |
this.set("ce_truk_type_public", typePublic); |
} |
public String getAbreviationProjet() { |
return renvoyerValeurCorrecte("_abreviationprojet_"); |
} |
public void setAbreviationProjet(String abreviation) { |
this.set("_abreviationprojet_", abreviation); |
} |
public String getAdresse() { |
return (String) renvoyerValeurCorrecte("adresse_01"); |
} |
235,7 → 252,6 |
public String getRegion() { |
return getChaineDenormaliseUnique("ce_truk_region"); |
} |
public void setRegion(String region) { |
this.set("ce_truk_region", region); |
} |
311,7 → 327,7 |
String cle = it.next(); |
urlsDenormalise += cle+"##"+urls.get(cle)+";;"; |
} |
urlsDenormalise.replaceFirst(";;$", ""); |
urlsDenormalise = urlsDenormalise.replaceFirst(";;$", ""); |
return urlsDenormalise; |
} |
public void setUrl(String urlsDenormalise) { |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/Structure.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java |
---|
215,7 → 215,8 |
if (structureId != null) { |
postDonnees += "&cs_id_structure=" + URL.encodeComponent(structureId); |
} |
postDonnees += "&cpr_abreviation=" + URL.encodeComponent(((ProjetListe) Registry.get(RegistreId.PROJETS)).get(str.getIdProjet()).getAbreviation()); |
postDonnees += "&cpr_abreviation=" + URL.encodeComponent(str.getAbreviationProjet()); |
postDonnees += "&cs_ce_projet=" + URL.encodeComponent(str.getIdProjet()) + |
"&cs_ce_mere=" + URL.encodeComponent(str.getIdMere()) + |
"&cs_guid=" + URL.encodeComponent(str.getGuid()) + |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java |
---|
1,6 → 1,7 |
package org.tela_botanica.client.modeles.structure; |
import java.util.Iterator; |
import java.util.Map; |
import java.util.Set; |
import org.tela_botanica.client.modeles.aDonnee; |
84,6 → 85,42 |
} |
} |
public StructureAPersonne(Personne personne, String fonction, String roleId, String codeEtat) { |
Map<String, Object> a = personne.getProperties(); |
Set<String> cles = a.keySet(); |
Iterator<String> it = cles.iterator(); |
while (it.hasNext()) { |
String cle = it.next(); |
String cleObjet = cle.replaceFirst("^"+Personne.PREFIXE+"_", ""); |
String valeur = (String)a.get(cle); |
if (a.get(cle) != null) { |
if (cle.equals("truk_telephone")) { |
set("telephone", a.get(cle)); |
set("tel_fix", getInfoDenormaliseParType(valeur, Personne.TELEPHONE_FIXE)); |
set("tel_fax", getInfoDenormaliseParType(valeur, Personne.TELEPHONE_FAX)); |
} else if (cleObjet.equals("truk_courriel")) { |
set("courriel", getInfoDenormaliseParPosition(valeur, 1)); |
} else if (cleObjet.equals("ce_truk_specialite")) { |
set("specialite", getInfoDenormaliseParPosition(valeur, 1)); |
} else { |
this.set(cleObjet, a.get(cle)); |
} |
} |
} |
setFonction(fonction); |
setIdRole(roleId); |
// Définition des valeurs par défaut de variables obligatoires vis à vis de l'utilisation de l'objet |
set("contact", false); |
set("fonction", fonction); |
set("statut", ""); |
set("travail", 0); |
set("etat", codeEtat); |
} |
/** |
* Constructeur avec la fonction à passer en paramètre |
* |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java |
---|
174,7 → 174,7 |
Reponse reponse = new Reponse(ontologieCache.get(cleParentPourCache), seqId); |
vueARafraichir.rafraichir(reponse); |
} else { |
System.out.println("<-- ValeurListeAsyncDao > Liste en cache, retour à "+vueARafraichir.getClass().toString()); |
if (Mediateur.DEBUG) System.out.println("<-- ValeurListeAsyncDao > Liste en cache, retour à "+vueARafraichir.getClass().toString()); |
vueARafraichir.rafraichir(ontologieCache.get(cleParentPourCache)); |
} |
} |
282,12 → 282,12 |
/** On retourne la liste à la vue **/ |
if (ontologieCache.get(id) != null) { |
if (vueARafraichir instanceof Sequenceur) { |
System.out.println("<-- ValeurListeAsyncDao > Liste en cache, retour au sequenceur"); |
if (Mediateur.DEBUG) System.out.println("<-- ValeurListeAsyncDao > Liste en cache, retour au sequenceur"); |
vueARafraichir = (Sequenceur) vueARafraichir; |
Reponse reponse = new Reponse(ontologieCache.get(id), seqId); |
vueARafraichir.rafraichir(reponse); |
} else { |
System.out.println("<-- ValeurListeAsyncDao > Liste en cache, retour à "+vueARafraichir.getClass().toString()); |
if (Mediateur.DEBUG) System.out.println("<-- ValeurListeAsyncDao > Liste en cache, retour à "+vueARafraichir.getClass().toString()); |
vueARafraichir.rafraichir(ontologieCache.get(id)); |
} |
} |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/projet/Projet.java |
---|
1,5 → 1,9 |
package org.tela_botanica.client.modeles.projet; |
import java.util.Iterator; |
import java.util.Map; |
import java.util.Set; |
import org.tela_botanica.client.modeles.aDonnee; |
import com.extjs.gxt.ui.client.data.ModelData; |
20,8 → 24,17 |
public Projet(ModelData model) |
{ |
this.set("id_projet", model.get("cpr_id_projet")); |
this.set("nom", model.get("cpr_nom")); |
Map<String, Object> a = model.getProperties(); |
Set<String> cles = a.keySet(); |
Iterator<String> it = cles.iterator(); |
while (it.hasNext()) { |
String cle = it.next(); |
if (a.get(cle) != null) { |
String cleObjet = cle.replaceFirst("^"+getPrefixe()+"_", ""); |
this.set(cleObjet, a.get(cle)); |
} |
} |
} |
@Override |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/projet/Projet.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/projet/ProjetListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/projet/ProjetListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/projet/ProjetAsyncDao.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/projet/ProjetAsyncDao.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/projet/ProjetVersion.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/projet/ProjetVersion.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/InterneValeur.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/InterneValeur.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java |
---|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java:r1136-1368 |
/trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java |
---|
38,7 → 38,7 |
restrictions.put("limit", String.valueOf(nbElements)); |
} |
restrictions.put("orderby", "ccac_id_collection DESC"); |
restrictions.put("orderby", "cc_nom ASC"); |
final JsonRestRequestBuilder rb = UtilDAO.construireRequete(SERVICE_NOM, parametres, restrictions); |
rb.envoyerRequete(null, new JsonRestRequestCallback() { |
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java:r1136-1368 |