Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1924 → Rev 1925

/trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java
179,7 → 179,9
" <div class='{css_fieldset}'>"+
" <h2>{i18n_couverture_collection_titre}</h2>"+
" <span class='{css_label}'>{i18n_couverture_geo} :</span> {couverture_geo}<br />"+
" <span class='{css_label}'>{i18n_periode} :</span> {periode}<br />"+
" </div>"+
" </div>"+
" <div class='{css_fieldset}'>"+
" <h2>{i18n_specimen_type_titre}</h2>"+
" <span class='{css_label}'>{i18n_specimen_type_presence} :</span> {specimen_type_presence}<br />"+
333,10 → 335,11
" <span class='{css_label}'>{i18n_specialite} :</span> {specialite}<br />"+
" </div>"+
" <div class='{css_fieldset}'>"+
" <h2>{i18n_titre_constitution}</h2>"+
" <span class='{css_label}'>{i18n_periode} :</span> {periode}<br />"+
" <span class='{css_label}'>{i18n_date_debut} :</span> {date_debut}<br />"+
" <span class='{css_label}'>{i18n_date_fin} :</span> {date_fin}<br />"+
" <h2>{i18n_titre_etiquette}</h2>"+
" <span class='{css_label}'>{i18n_etiquette_renseignement} :</span> {etiquette_renseignement}<br />"+
" <span class='{css_label}'>{i18n_precision_localite} :</span> {precision_localite}<br />"+
" <span class='{css_label}'>{i18n_precision_date} :</span> {precision_date}<br />"+
" <span class='{css_label}'>{i18n_etiquette_annotation} :</span> {etiquette_annotation}<br />"+
" </div>"+
" <hr class='{css_clear}'/>"+
" <div class='{css_fieldset}'>"+
345,14 → 348,6
" <span class='{css_label}'>{i18n_classement} :</span> {classement}<br />"+
" </div>"+
" <div class='{css_fieldset}'>"+
" <h2>{i18n_titre_etiquette}</h2>"+
" <span class='{css_label}'>{i18n_etiquette_renseignement} :</span> {etiquette_renseignement}<br />"+
" <span class='{css_label}'>{i18n_precision_localite} :</span> {precision_localite}<br />"+
" <span class='{css_label}'>{i18n_precision_date} :</span> {precision_date}<br />"+
" <span class='{css_label}'>{i18n_etiquette_annotation} :</span> {etiquette_annotation}<br />"+
" </div>"+
" <hr class='{css_clear}'/>"+
" <div class='{css_fieldset}'>"+
" <h2>{i18n_titre_integree}</h2>"+
" <span class='{css_label}'>{i18n_collection_integration} :</span> {collection_integration}<br />"+
" <span class='{css_label}'>{i18n_collection_integration_info} :</span> {collection_integration_info}<br />"+
524,6 → 519,15
generalParams.set("i18n_couverture_collection_titre", i18nC.collectionCouvertureTitre());
generalParams.set("i18n_couverture_geo", i18nC.couvertureGeo());
generalParams.set("i18n_periode", i18nC.periodeConstitutionDetail());
String periode = "";
if (!collection.getPeriodeConstitutionDebut().equals("0")) {
periode = collection.getPeriodeConstitutionDebut();
}
if (!collection.getPeriodeConstitutionFin().equals("0")) {
periode += " - "+collection.getPeriodeConstitutionFin();
}
generalParams.set("periode", periode);
generalParams.set("i18n_specimen_type_titre", i18nC.collectionSpecimenTypeTitre());
generalParams.set("i18n_specimen_type_presence", i18nC.specimenTypeCollectionDetail());
793,10 → 797,6
contenuParams.set("i18n_nature", i18nC.natureVegetaleContenuDetail());
contenuParams.set("i18n_specialite", i18nC.specialiteCollectionDetail());
contenuParams.set("i18n_titre_constitution", i18nC.collectionConstitutionTitre());
contenuParams.set("i18n_periode", i18nC.periodeConstitutionDetail());
contenuParams.set("i18n_date_debut", i18nC.dateDebutCollectionDetail());
contenuParams.set("i18n_date_fin", i18nC.dateFinCollectionDetail());
contenuParams.set("i18n_titre_classement", i18nC.collectionClassementTitre());
contenuParams.set("i18n_classement_etat", i18nC.etatClassementCollectionDetail());
817,17 → 817,6
contenuParams.set("nature", nature);
contenuParams.set("specialite", collectionBotanique.getSpecialite());
String periode = construireTxtListeOntologie(collection.getPeriodeConstitution());
String dateDebut = collectionBotanique.getRecolteDateDebut();
String dateDebutPrecision = construireTxtListeOntologie(collectionBotanique.getRecolteDateDebutType());
String dateDebutRecolte = (UtilString.isEmpty(dateDebut)) ? "" : dateDebut+" ("+dateDebutPrecision+")";
String dateFin = collectionBotanique.getRecolteDateFin();
String dateFinPrecision = construireTxtListeOntologie(collectionBotanique.getRecolteDateFinType());
String dateFinRecolte = (UtilString.isEmpty(dateFin)) ? "" : dateFin+" ("+dateFinPrecision+")";
contenuParams.set("periode", periode);
contenuParams.set("date_debut", dateDebutRecolte);
contenuParams.set("date_fin", dateFinRecolte);
String classementEtat = construireTxtListeOntologie(collectionBotanique.getClassementEtat());
contenuParams.set("classement_etat", classementEtat);
contenuParams.set("classement", collectionBotanique.getClassementAnnotation());