| /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/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 |