Subversion Repositories eFlore/Applications.coel

Rev

Rev 1922 | Rev 1938 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1922 Rev 1925
Line 177... Line 177...
177 
			"	</div>"+
 177 
			"	</div>"+
178 
			"	<hr class='{css_clear}'/>"+
 178 
			"	<hr class='{css_clear}'/>"+
179 
			"	<div class='{css_fieldset}'>"+
 179 
			"	<div class='{css_fieldset}'>"+
180 
			"		<h2>{i18n_couverture_collection_titre}</h2>"+
 180 
			"		<h2>{i18n_couverture_collection_titre}</h2>"+
181 
			"		<span class='{css_label}'>{i18n_couverture_geo} :</span> {couverture_geo}<br />"+
 181 
			"		<span class='{css_label}'>{i18n_couverture_geo} :</span> {couverture_geo}<br />"+
- 
 
 182 
			"		<span class='{css_label}'>{i18n_periode} :</span> {periode}<br />"+
- 
 
 183 
			"	</div>"+
182 
			"	</div>"+
 184 
			"	</div>"+
183 
			"	<div class='{css_fieldset}'>"+
 185 
			"	<div class='{css_fieldset}'>"+
184 
			"		<h2>{i18n_specimen_type_titre}</h2>"+
 186 
			"		<h2>{i18n_specimen_type_titre}</h2>"+
185 
			"		<span class='{css_label}'>{i18n_specimen_type_presence} :</span> {specimen_type_presence}<br />"+
 187 
			"		<span class='{css_label}'>{i18n_specimen_type_presence} :</span> {specimen_type_presence}<br />"+
186 
			"		<span class='{css_label}'>{i18n_specimen_type_nombre} :</span> {specimen_type_nombre}<br />"+
 188 
			"		<span class='{css_label}'>{i18n_specimen_type_nombre} :</span> {specimen_type_nombre}<br />"+
Line 331... Line 333...
331 
			"		<h2>{i18n_titre_nature}</h2>"+
 333 
			"		<h2>{i18n_titre_nature}</h2>"+
332 
			"		<span class='{css_label}'>{i18n_nature} :</span> {nature}<br />"+
 334 
			"		<span class='{css_label}'>{i18n_nature} :</span> {nature}<br />"+
333 
			"		<span class='{css_label}'>{i18n_specialite} :</span> {specialite}<br />"+
 335 
			"		<span class='{css_label}'>{i18n_specialite} :</span> {specialite}<br />"+
334 
			"	</div>"+
 336 
			"	</div>"+
335 
			"	<div class='{css_fieldset}'>"+
 337 
			"	<div class='{css_fieldset}'>"+
336 
			"		<h2>{i18n_titre_constitution}</h2>"+
 - 
 
337 
			"		<span class='{css_label}'>{i18n_periode} :</span> {periode}<br />"+
 - 
 
338 
			"		<span class='{css_label}'>{i18n_date_debut} :</span> {date_debut}<br />"+
 - 
 
339 
			"		<span class='{css_label}'>{i18n_date_fin} :</span> {date_fin}<br />"+
 - 
 
340 
			"	</div>"+
 - 
 
341 
			"	<hr class='{css_clear}'/>"+
 - 
 
342 
			"	<div class='{css_fieldset}'>"+
 - 
 
343 
			"		<h2>{i18n_titre_classement}</h2>"+
 - 
 
344 
			"		<span class='{css_label}'>{i18n_classement_etat} :</span> {classement_etat}<br />"+
 - 
 
345 
			"		<span class='{css_label}'>{i18n_classement} :</span> {classement}<br />"+
 - 
 
346 
			"	</div>"+
 - 
 
347 
			"	<div class='{css_fieldset}'>"+
 - 
 
348 
			"		<h2>{i18n_titre_etiquette}</h2>"+
 338 
			"		<h2>{i18n_titre_etiquette}</h2>"+
349 
			"		<span class='{css_label}'>{i18n_etiquette_renseignement} :</span> {etiquette_renseignement}<br />"+
 339 
			"		<span class='{css_label}'>{i18n_etiquette_renseignement} :</span> {etiquette_renseignement}<br />"+
350 
			"		<span class='{css_label}'>{i18n_precision_localite} :</span> {precision_localite}<br />"+
 340 
			"		<span class='{css_label}'>{i18n_precision_localite} :</span> {precision_localite}<br />"+
351 
			"		<span class='{css_label}'>{i18n_precision_date} :</span> {precision_date}<br />"+
 341 
			"		<span class='{css_label}'>{i18n_precision_date} :</span> {precision_date}<br />"+
352 
			"		<span class='{css_label}'>{i18n_etiquette_annotation} :</span> {etiquette_annotation}<br />"+
 342 
			"		<span class='{css_label}'>{i18n_etiquette_annotation} :</span> {etiquette_annotation}<br />"+
353 
			"	</div>"+
 343 
			"	</div>"+
354 
			"	<hr class='{css_clear}'/>"+
 344 
			"	<hr class='{css_clear}'/>"+
355 
			"	<div class='{css_fieldset}'>"+
 345 
			"	<div class='{css_fieldset}'>"+
- 
 
 346 
			"		<h2>{i18n_titre_classement}</h2>"+
- 
 
 347 
			"		<span class='{css_label}'>{i18n_classement_etat} :</span> {classement_etat}<br />"+
- 
 
 348 
			"		<span class='{css_label}'>{i18n_classement} :</span> {classement}<br />"+
- 
 
 349 
			"	</div>"+
- 
 
 350 
			"	<div class='{css_fieldset}'>"+
356 
			"		<h2>{i18n_titre_integree}</h2>"+
 351 
			"		<h2>{i18n_titre_integree}</h2>"+
357 
			"		<span class='{css_label}'>{i18n_collection_integration} :</span> {collection_integration}<br />"+
 352 
			"		<span class='{css_label}'>{i18n_collection_integration} :</span> {collection_integration}<br />"+
358 
			"		<span class='{css_label}'>{i18n_collection_integration_info} :</span> {collection_integration_info}<br />"+
 353 
			"		<span class='{css_label}'>{i18n_collection_integration_info} :</span> {collection_integration_info}<br />"+
359 
			"	</div>"+
 354 
			"	</div>"+
360 
			"</div>";
 355 
			"</div>";
Line 522... Line 517...
522 
		generalParams.set("i18n_historique", i18nC.historique());
 517 
		generalParams.set("i18n_historique", i18nC.historique());
523 
		generalParams.set("i18n_web", i18nC.siteWeb());
 518 
		generalParams.set("i18n_web", i18nC.siteWeb());
Line 524... Line 519...
524
519
525 
		generalParams.set("i18n_couverture_collection_titre", i18nC.collectionCouvertureTitre());
 520 
		generalParams.set("i18n_couverture_collection_titre", i18nC.collectionCouvertureTitre());
- 
 
 521 
		generalParams.set("i18n_couverture_geo", i18nC.couvertureGeo());
- 
 
 522 
		generalParams.set("i18n_periode", i18nC.periodeConstitutionDetail());
- 
 
 523 
		String periode = "";
- 
 
 524 
		if (!collection.getPeriodeConstitutionDebut().equals("0")) {
- 
 
 525 
			periode = collection.getPeriodeConstitutionDebut();
- 
 
 526 
		}
- 
 
 527 
		if (!collection.getPeriodeConstitutionFin().equals("0")) {
- 
 
 528 
			periode += " - "+collection.getPeriodeConstitutionFin();
- 
 
 529 
		}
Line 526... Line 530...
526 
		generalParams.set("i18n_couverture_geo", i18nC.couvertureGeo());
 530 
		generalParams.set("periode", periode);
527
531
528 
		generalParams.set("i18n_specimen_type_titre", i18nC.collectionSpecimenTypeTitre());
 532 
		generalParams.set("i18n_specimen_type_titre", i18nC.collectionSpecimenTypeTitre());
529 
		generalParams.set("i18n_specimen_type_presence", i18nC.specimenTypeCollectionDetail());
 533 
		generalParams.set("i18n_specimen_type_presence", i18nC.specimenTypeCollectionDetail());
Line 791... Line 795...
791 
		Params contenuParams = new Params();
 795 
		Params contenuParams = new Params();
792 
		contenuParams.set("i18n_titre_nature", i18nC.collectionNatureTitre());
 796 
		contenuParams.set("i18n_titre_nature", i18nC.collectionNatureTitre());
793 
		contenuParams.set("i18n_nature", i18nC.natureVegetaleContenuDetail());
 797 
		contenuParams.set("i18n_nature", i18nC.natureVegetaleContenuDetail());
794 
		contenuParams.set("i18n_specialite", i18nC.specialiteCollectionDetail());
 798 
		contenuParams.set("i18n_specialite", i18nC.specialiteCollectionDetail());
Line 795... Line -...
795
- 
 
796 
		contenuParams.set("i18n_titre_constitution", i18nC.collectionConstitutionTitre());
 - 
 
797 
		contenuParams.set("i18n_periode", i18nC.periodeConstitutionDetail());
 - 
 
798 
		contenuParams.set("i18n_date_debut", i18nC.dateDebutCollectionDetail());
 - 
 
Line 799... Line 799...
799 
		contenuParams.set("i18n_date_fin", i18nC.dateFinCollectionDetail());
 799
800
800
801 
		contenuParams.set("i18n_titre_classement", i18nC.collectionClassementTitre());
 801 
		contenuParams.set("i18n_titre_classement", i18nC.collectionClassementTitre());
Line 815... Line 815...
815 
		CollectionBotanique collectionBotanique = collection.getBotanique();
 815 
		CollectionBotanique collectionBotanique = collection.getBotanique();
816 
		String nature = construireTxtListeOntologie(collectionBotanique.getNature());
 816 
		String nature = construireTxtListeOntologie(collectionBotanique.getNature());
817 
		contenuParams.set("nature", nature);
 817 
		contenuParams.set("nature", nature);
818 
		contenuParams.set("specialite", collectionBotanique.getSpecialite());
 818 
		contenuParams.set("specialite", collectionBotanique.getSpecialite());
Line 819... Line -...
819
- 
 
820 
		String periode = construireTxtListeOntologie(collection.getPeriodeConstitution());
 - 
 
821 
		String dateDebut = collectionBotanique.getRecolteDateDebut();
 - 
 
822 
		String dateDebutPrecision = construireTxtListeOntologie(collectionBotanique.getRecolteDateDebutType());
 - 
 
823 
		String dateDebutRecolte = (UtilString.isEmpty(dateDebut)) ? "" : dateDebut+" ("+dateDebutPrecision+")";
 - 
 
824 
		String dateFin = collectionBotanique.getRecolteDateFin();
 - 
 
825 
		String dateFinPrecision = construireTxtListeOntologie(collectionBotanique.getRecolteDateFinType());
 - 
 
826 
		String dateFinRecolte = (UtilString.isEmpty(dateFin)) ? "" : dateFin+" ("+dateFinPrecision+")";
 - 
 
827 
		contenuParams.set("periode", periode);
 - 
 
828 
		contenuParams.set("date_debut", dateDebutRecolte);
 - 
 
829 
		contenuParams.set("date_fin", dateFinRecolte);
 - 
 
830
819
831 
		String classementEtat = construireTxtListeOntologie(collectionBotanique.getClassementEtat());
 820 
		String classementEtat = construireTxtListeOntologie(collectionBotanique.getClassementEtat());
832 
		contenuParams.set("classement_etat", classementEtat);
 821 
		contenuParams.set("classement_etat", classementEtat);
Line 833... Line 822...
833 
		contenuParams.set("classement", collectionBotanique.getClassementAnnotation());
 822 
		contenuParams.set("classement", collectionBotanique.getClassementAnnotation());