| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r11-934 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r11-934 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r11-934 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r11-934 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java |
|---|
| 33,13 → 33,7 |
| public void selectionner(final boolean paginationProgressive, final String structureId, final String roleId, final String recherche, final int start, final int nbElements, final Integer seqId) { |
| Debug.log("selectionner structure a personne"); |
| /*Debug.log("paginationProgressive="+paginationProgressive); |
| Debug.log("structureId="+structureId); |
| Debug.log("roleId="+roleId); |
| Debug.log("recherche="+recherche); |
| Debug.log("nbElements="+nbElements); |
| Debug.log("seqId="+seqId);*/ |
| String[] parametres = {structureId, roleId}; |
| HashMap<String, String> restrictions = new HashMap<String, String>(); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r11-934 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java |
|---|
| 214,6 → 214,7 |
| return fondationDate; |
| } |
| /* |
| public String getAnneeOuDateFondation() { |
| String valeurDateFondation = get("date_fondation"); |
| if (!UtilString.isEmpty(valeurDateFondation) && valeurDateFondation.endsWith("00-00")) { |
| 222,8 → 223,55 |
| valeurDateFondation = ""; |
| } |
| return valeurDateFondation; |
| }*/ |
| public String getAnneeOuDateFondation() { |
| String valeurDateFondation = get("date_fondation"); |
| return getDateSouple(valeurDateFondation); |
| } |
| public String getDateSouple(String date) { |
| String valeurDate = date; |
| String jour = ""; |
| String mois = ""; |
| String annee = ""; |
| // pas de date dans la BD |
| if (UtilString.isEmpty(valeurDate) || valeurDate.equals("0000-00-00")) { |
| valeurDate = ""; |
| // YYYY |
| } else if (valeurDate.endsWith("00-00")) { |
| valeurDate = valeurDate.substring(0, 4); |
| if (valeurDate.matches("\\d{4}")) { |
| jour = ""; |
| mois = ""; |
| annee = valeurDate.substring(0,4); |
| valeurDate = annee; |
| } |
| // YYYY-MM |
| } else if (valeurDate.endsWith("-00")) { |
| valeurDate = valeurDate.substring(0, 7); |
| if (valeurDate.matches("\\d{4}-\\d{2}")) { |
| jour = ""; |
| mois = valeurDate.substring(5,7); |
| annee = valeurDate.substring(0,4); |
| valeurDate = mois+"/"+annee; |
| } |
| } |
| // YYYY-MM-DD |
| else if (valeurDate.matches("\\d{4}-\\d{2}-\\d{2}")) { |
| Date objetDate = DateTimeFormat.getFormat("yyyy-MM-dd").parse(valeurDate); |
| DateTimeFormat fmt = DateTimeFormat.getFormat("dd/MM/yyyy"); |
| valeurDate = fmt.format(objetDate); |
| } |
| return valeurDate; |
| } |
| public void setDateFondation(Date dateFondation) { |
| if (dateFondation != null) { |
| this.set("date_fondation", DateTimeFormat.getFormat("yyyy-MM-dd").format(dateFondation)); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java:r11-934 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/Structure.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r11-934 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1417-1511 |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r11-934 |