Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1918 → Rev 1920

/trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java
73,10 → 73,6
private TabItem contenuOnglet = null;
private TabItem inventaireOnglet = null;
private TabItem commentaireOnglet = null;
private String tableauUniteRangementTpl;
private String ligneUniteRangementTpl;
private String tableauUniteBaseTpl;
private String ligneUniteBaseTpl;
 
private Sequenceur sequenceur;
149,10 → 145,6
initialiserLignePublicationLieeTpl();
initialiserContenuTpl();
initialiserDescriptionTpl();
initialiserTableauUniteRangementTpl();
initialiserLigneUniteRangementTpl();
initialiserTableauUniteBaseTpl();
initialiserLigneUniteBaseTpl();
initialiserInventaireTpl();
initialiserCommentaireTpl();
initialiserTableauCommentairesLieesTpl();
297,8 → 289,10
" <h2>{i18n_titre_description}</h2>"+
" <span class='{css_label}'>{i18n_type_botanique} :</span> {type_botanique}<br />"+
" <span class='{css_label}'>{i18n_nbre_echantillon} :</span> {nbre_echantillon}<br />"+
" <span class='{css_label}'>{i18n_etat_unite_rangement} :</span> {etat_unite_rangement}<br />"+
" {tableau_unite_rangement}<br />"+
" <span class='{css_label}'>{i18n_etat_unite_rangement} :</span> {etat_unite_rangement}<br />"+
" <span class='{css_label}'>{i18n_collection_cartons_herbiers} :</span> {nb_cartons_herbier}<br />"+
" <span class='{css_label}'>{i18n_nb_liasses} :</span> {nb_liasses}<br />"+
" <span class='{css_label}'>{i18n_autres_unites_rangement} : </span>{autres_unites_rangement}<br />"+
" <span class='{css_label}'>{i18n_nb_planches_herbier} :</span> {nb_planches_herbier}<br />"+
" <span class='{css_label}'>{i18n_nb_especes} :</span> {nb_especes}<br />"+
" </div>"+
332,73 → 326,6
"</div>";
}
private void initialiserTableauUniteRangementTpl() {
tableauUniteRangementTpl =
"<table>"+
" <thead>"+
" <tr>" +
" <th>{i18n_type}</th>" +
" <th>{i18n_nombre}</th>" +
" <th>{i18n_precision}</th>" +
" <th>{i18n_format}</th>" +
" </tr>"+
" </thead>"+
" <tbody>"+
" {lignes}"+
" </tbody>"+
"</table>";
}
private void initialiserLigneUniteRangementTpl() {
ligneUniteRangementTpl =
"<tr>"+
" <td>{type}</td>"+
" <td>{nombre}</td>"+
" <td>{precision}</td>"+
" <td>{format}</td>"+
"</tr>";
}
private void initialiserTableauUniteBaseTpl() {
tableauUniteBaseTpl =
"<table>"+
" <thead>"+
" <tr>" +
" <th colspan='4'>{i18n_unite_base}</th>" +
" <th colspan='2'>{i18n_part}</th>" +
" <th colspan='2'>{i18n_sp}</th>" +
" </tr>"+
" <tr>" +
" <th>{i18n_type}</th>" +
" <th>{i18n_nombre}</th>" +
" <th>{i18n_precision}</th>" +
" <th>{i18n_format}</th>" +
" <th>{i18n_nombre}</th>" +
" <th>{i18n_precision}</th>" +
" <th>{i18n_nombre}</th>" +
" <th>{i18n_precision}</th>" +
" </tr>"+
" </thead>"+
" <tbody>"+
" {lignes}"+
" </tbody>"+
"</table>";
}
private void initialiserLigneUniteBaseTpl() {
ligneUniteBaseTpl =
"<tr>"+
" <td>{type}</td>"+
" <td>{nombre}</td>"+
" <td>{precision}</td>"+
" <td>{format}</td>"+
" <td>{part_nombre}</td>"+
" <td>{part_precision}</td>"+
" <td>{sp_nombre}</td>"+
" <td>{sp_precision}</td>"+
"</tr>";
}
private void initialiserContenuTpl() {
contenuTpl =
"<div class='{css_corps}'>"+
791,9 → 718,29
CollectionBotanique collectionBotanique = collection.getBotanique();
String etatUniteRangement = construireTxtListeOntologie(collectionBotanique.getUniteRangementEtat());
String tableauUniteRangementHtml = construireTableauUniteRangement();
descriptionParams.set("i18n_collection_cartons_herbiers", i18nC.collectionCartonsHerbiers());
descriptionParams.set("i18n_nb_liasses", i18nC.collectionLiasses());
descriptionParams.set("i18n_autres_unites_rangement", i18nC.collectionAutreUnitesRangement());
String cartonsHerbiers = collectionBotanique.getNbCartonsHerbiers();
if(!collectionBotanique.getNbCartonsHerbiers().trim().isEmpty() &&
! collectionBotanique.getFormatCartonsHerbiers().trim().isEmpty()) {
cartonsHerbiers += " - "+i18nC.format()+": ";
}
cartonsHerbiers += collectionBotanique.getFormatCartonsHerbiers();
descriptionParams.set("nb_cartons_herbier", cartonsHerbiers);
String liasses = collectionBotanique.getNbLiasses();
if(!collectionBotanique.getNbLiasses().trim().isEmpty() &&
! collectionBotanique.getFormatLiasses().trim().isEmpty()) {
liasses += " - "+i18nC.format()+": ";
}
liasses += collectionBotanique.getFormatLiasses();
descriptionParams.set("nb_liasses", liasses);
 
descriptionParams.set("tableau_unite_rangement", tableauUniteRangementHtml);
descriptionParams.set("autres_unites_rangement", collectionBotanique.getAutresUnitesRangement().replaceAll("\r\n|\r|\n", ", "));
 
descriptionParams.set("etat_unite_rangement", etatUniteRangement);
descriptionParams.set("i18n_nb_planches_herbier", i18nC.collectionNbPlanchesHerbier());
840,44 → 787,6
afficherOnglet(descriptionTpl, descriptionParams, descriptionOnglet);
}
private String construireTableauUniteRangement() {
Params contenuParams = new Params();
contenuParams.set("i18n_type", i18nC.collectionUniteType());
contenuParams.set("i18n_nombre", i18nC.collectionUniteNbre());
contenuParams.set("i18n_precision", i18nC.collectionUnitePrecision());
contenuParams.set("i18n_format", i18nC.collectionUniteFormat());
CollectionBotanique collectionBotanique = collection.getBotanique();
HashMap<String,UniteRangement> unites = CollectionFormDescription.parserValeurUniteRangement(collectionBotanique.getUniteRangement());
String lignesUnite = "";
Iterator<String> it = unites.keySet().iterator();
while (it.hasNext()) {
String cle = it.next();
UniteRangement unite = unites.get(cle);
if (unite.getNombre() != 0) {
Params ligneParams = new Params();
if (unite.getTypeAutre()) {
ligneParams.set("type", unite.getType());
} else {
ligneParams.set("type", construireTxtListeOntologie(unite.getId()));
}
ligneParams.set("nombre", UtilNombre.formaterEnEntier(unite.getNombre()));
ligneParams.set("precision", unite.getPrecision());
ligneParams.set("format", unite.getFormat());
lignesUnite += Format.substitute(ligneUniteRangementTpl, ligneParams);
}
}
 
String cHtml = i18nC.nonRenseigne();
if (!UtilString.isEmpty(lignesUnite)) {
contenuParams.set("lignes", lignesUnite);
cHtml = Format.substitute(tableauUniteRangementTpl, contenuParams);
}
return cHtml;
}
private void afficherContenu() {
Params contenuParams = new Params();
contenuParams.set("i18n_titre_nature", i18nC.collectionNatureTitre());