| 218,14 → 218,51 |
|---|
| return dateNaiss; |
| } |
| |
| 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 String getAnneeOuDateNaiss() { |
| String valeurDateNaissance = get("naissance_date"); |
| if (!UtilString.isEmpty(valeurDateNaissance) && valeurDateNaissance.endsWith("00-00")) { |
| valeurDateNaissance = valeurDateNaissance.substring(0, 4); |
| } else if (UtilString.isEmpty(valeurDateNaissance) && valeurDateNaissance.equals("0000-00-00")) { |
| valeurDateNaissance = ""; |
| } |
| return valeurDateNaissance; |
| String valeurDateNaissance = get("naissance_date"); |
| return getDateSouple(valeurDateNaissance); |
| } |
| |
| public void setNaissanceDate(Date naissanceDate) { |
| 259,13 → 296,8 |
|---|
| } |
| |
| public String getAnneeOuDateDeces() { |
| String valeurDateDeces = get("deces_date"); |
| if (!UtilString.isEmpty(valeurDateDeces) && valeurDateDeces.endsWith("00-00")) { |
| valeurDateDeces = valeurDateDeces.substring(0, 4); |
| } else if (UtilString.isEmpty(valeurDateDeces) && valeurDateDeces.equals("0000-00-00")) { |
| valeurDateDeces = ""; |
| } |
| return valeurDateDeces; |
| String valeurDateDeces = get("deces_date"); |
| return getDateSouple(valeurDateDeces); |
| } |
| |
| public void setDeces(String deces) { |