| /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java |
|---|
| 1,13 → 1,10 |
| package org.tela_botanica.client.modeles.collection; |
| import java.util.Iterator; |
| import java.util.LinkedList; |
| import java.util.List; |
| import java.util.Map; |
| import java.util.Set; |
| import org.tela_botanica.client.modeles.aDonnee; |
| import org.tela_botanica.client.util.Debug; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONObject; |
| 299,16 → 296,26 |
| } |
| // PERIODE CONSTITUTION |
| public String getPeriodeConstitution() { |
| return renvoyerValeurCorrecte("truk_periode_constitution"); |
| public String getPeriodeConstitutionDebut() { |
| return renvoyerValeurCorrecte("periode_constitution_debut"); |
| } |
| public void setPeriodeConstitution(String periodeConstitution) { |
| if (periodeConstitution.equals(new String(""))) |
| this.set("truk_periode_constitution", null); |
| public void setPeriodeConstitutionDebut(Integer periodeConstitution) { |
| if (periodeConstitution.equals(new Integer(""))) |
| this.set("periode_constitution_debut", null); |
| else |
| this.set("truk_periode_constitution", periodeConstitution); |
| this.set("periode_constitution_debut", periodeConstitution); |
| } |
| public String getPeriodeConstitutionFin() { |
| return renvoyerValeurCorrecte("periode_constitution_fin"); |
| } |
| public void setPeriodeConstitutionFin(Integer periodeConstitution) { |
| if (periodeConstitution.equals(new Integer(""))) |
| this.set("periode_constitution_fin", null); |
| else |
| this.set("periode_constitution_fin", periodeConstitution); |
| } |
| // COUVERTURE LIEU |
| public String getCouvertureLieu() { |
| return renvoyerValeurCorrecte("truk_couverture_lieu"); |
| /trunk/src/org/tela_botanica/client/i18n/Constantes.properties |
|---|
| 302,8 → 302,9 |
| specialiteCollectionDetail = Collection spécialisée |
| periodeConstitutionDetail = Période de constitution |
| dateDebutCollectionDetail = Date de DÉBUT de récolte |
| dateFinCollectionDetail = Date de FIN de récolte |
| periodeConstitutionDetailForm = Période de constitution (années début - fin) |
| dateDebutCollectionDetail = Année de DÉBUT de récolte |
| dateFinCollectionDetail = Année de FIN de récolte |
| etatClassementCollectionDetail = État du classement |
| annotationClassementCollectionDetail = Principe de classement |
| /trunk/src/org/tela_botanica/client/i18n/Constantes.java |
|---|
| 290,6 → 290,7 |
| String specialiteCollectionDetail(); |
| String periodeConstitutionDetail(); |
| String periodeConstitutionDetailForm(); |
| String dateDebutCollectionDetail(); |
| String dateFinCollectionDetail(); |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java |
|---|
| 7,7 → 7,6 |
| import org.tela_botanica.client.composants.ChampCaseACocher; |
| import org.tela_botanica.client.composants.ChampComboBoxListeValeurs; |
| import org.tela_botanica.client.composants.ChampSliderPourcentage; |
| import org.tela_botanica.client.composants.ConteneurMultiChamps; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.aDonnee; |
| import org.tela_botanica.client.modeles.collection.Collection; |
| 14,18 → 13,14 |
| import org.tela_botanica.client.modeles.collection.CollectionBotanique; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.Pattern; |
| import org.tela_botanica.client.util.UtilDate; |
| import org.tela_botanica.client.util.UtilString; |
| import org.tela_botanica.client.vues.Formulaire; |
| import org.tela_botanica.client.vues.FormulaireOnglet; |
| import com.extjs.gxt.ui.client.util.Margins; |
| import com.extjs.gxt.ui.client.widget.Text; |
| import com.extjs.gxt.ui.client.widget.form.DateField; |
| import com.extjs.gxt.ui.client.widget.form.FieldSet; |
| import com.extjs.gxt.ui.client.widget.form.TextArea; |
| import com.extjs.gxt.ui.client.widget.layout.FormData; |
| import com.extjs.gxt.ui.client.widget.layout.HBoxLayoutData; |
| public class CollectionFormContenu extends FormulaireOnglet implements Rafraichissable { |
| 37,10 → 32,6 |
| private ChampCaseACocher natureChp = null; |
| private TextArea specialiteChp = null; |
| private ChampComboBoxListeValeurs dateDebutCombo = null; |
| private ChampComboBoxListeValeurs dateFinCombo = null; |
| private DateField dateDebutChp = null; |
| private DateField dateFinChp = null; |
| private TextArea annotationClassementChp = null; |
| private ChampComboBoxListeValeurs etatClassementCombo = null; |
| private ChampComboBoxListeValeurs precisionDateCombo = null; |
| 63,7 → 54,6 |
| creerFieldsetNature(); |
| // TODO : réaliser un champ couverture géographique détaillé |
| creerFieldsetPeriode(); |
| creerFieldsetClassement(); |
| creerFieldsetEtiquette(); |
| creerFieldsetIntegration(); |
| 86,45 → 76,7 |
| add(natureFieldSet); |
| } |
| private void creerFieldsetPeriode() { |
| FieldSet periodeFieldSet = new FieldSet(); |
| periodeFieldSet.setHeadingHtml(i18nC.collectionConstitutionTitre()); |
| periodeFieldSet.setCollapsible(true); |
| periodeFieldSet.setLayout(Formulaire.creerFormLayout(largeurLabelDefaut, alignementLabelDefaut)); |
| ConteneurMultiChamps dateDebutConteneur = new ConteneurMultiChamps(i18nC.dateDebutCollection()); |
| dateDebutChp = new DateField(); |
| dateDebutChp.getPropertyEditor().setFormat(UtilDate.formatDateFr); |
| dateDebutChp.getPropertyEditor().setParseStrict(false); |
| dateDebutChp.setFormatValue(true); |
| dateDebutConteneur.ajouterChamp(dateDebutChp, new HBoxLayoutData(new Margins(0, 20, 0, 0))); |
| dateDebutCombo = new ChampComboBoxListeValeurs(null, "dateDebut"); |
| dateDebutCombo.setTrie("id_valeur"); |
| dateDebutConteneur.ajouterChamp(dateDebutCombo); |
| periodeFieldSet.add(dateDebutConteneur); |
| ConteneurMultiChamps dateFinConteneur = new ConteneurMultiChamps(i18nC.dateFinCollection()); |
| dateFinChp = new DateField(); |
| dateFinChp.getPropertyEditor().setFormat(UtilDate.formatDateFr); |
| dateFinChp.getPropertyEditor().setParseStrict(false); |
| dateFinChp.setFormatValue(true); |
| dateFinConteneur.ajouterChamp(dateFinChp, new HBoxLayoutData(new Margins(0, 20, 0, 0))); |
| dateFinCombo = new ChampComboBoxListeValeurs(null, "dateFin"); |
| dateFinCombo.setTrie("id_valeur"); |
| dateFinConteneur.ajouterChamp(dateFinCombo); |
| periodeFieldSet.add(dateFinConteneur); |
| Text infoDate = new Text(i18nC.dateApproximativeInfo()); |
| periodeFieldSet.add(infoDate); |
| add(periodeFieldSet); |
| } |
| private void creerFieldsetClassement() { |
| FieldSet classementFieldSet = new FieldSet(); |
| 276,11 → 228,6 |
| natureChp.peupler(collectionBotanique.getNature()); |
| specialiteChp.setValue(collectionBotanique.getSpecialite()); |
| dateDebutChp.setValue(UtilString.formaterEnDate(collectionBotanique.getRecolteDateDebut())); |
| dateDebutCombo.peupler(collectionBotanique.getRecolteDateDebutType()); |
| dateFinChp.setValue(UtilString.formaterEnDate(collectionBotanique.getRecolteDateFin())); |
| dateFinCombo.peupler(collectionBotanique.getRecolteDateFinType()); |
| etatClassementCombo.peupler(collectionBotanique.getClassementEtat()); |
| annotationClassementChp.setValue(collectionBotanique.getClassementAnnotation()); |
| 300,11 → 247,6 |
| collectionBotaniqueCollectee.setNature(natureChp.getValeur()); |
| collectionBotaniqueCollectee.setSpecialite(specialiteChp.getValue()); |
| collectionBotaniqueCollectee.setRecolteDateDebut(UtilDate.formaterEnString(dateDebutChp.getValue())); |
| collectionBotaniqueCollectee.setRecolteDateDebutType(dateDebutCombo.getValeur()); |
| collectionBotaniqueCollectee.setRecolteDateFin(UtilDate.formaterEnString(dateFinChp.getValue())); |
| collectionBotaniqueCollectee.setRecolteDateFinType(dateFinCombo.getValeur()); |
| collectionBotaniqueCollectee.setClassementEtat(etatClassementCombo.getValeur()); |
| collectionBotaniqueCollectee.setClassementAnnotation(annotationClassementChp.getValue()); |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java |
|---|
| 8,6 → 8,7 |
| import org.tela_botanica.client.composants.ChampComboBoxListeValeurs; |
| import org.tela_botanica.client.composants.ChampComboBoxRechercheTempsReelPaginable; |
| import org.tela_botanica.client.composants.ChampMultiValeurs; |
| import org.tela_botanica.client.composants.ChampNombre; |
| import org.tela_botanica.client.composants.ConteneurMultiChamps; |
| import org.tela_botanica.client.composants.pagination.ProxyCollections; |
| import org.tela_botanica.client.composants.pagination.ProxyStructures; |
| 17,6 → 18,7 |
| import org.tela_botanica.client.modeles.structure.Structure; |
| import org.tela_botanica.client.synchronisation.Sequenceur; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.UtilDate; |
| import org.tela_botanica.client.util.UtilString; |
| import org.tela_botanica.client.vues.Formulaire; |
| import org.tela_botanica.client.vues.FormulaireOnglet; |
| 25,7 → 27,9 |
| import com.extjs.gxt.ui.client.data.ModelType; |
| import com.extjs.gxt.ui.client.event.Events; |
| import com.extjs.gxt.ui.client.util.Margins; |
| import com.extjs.gxt.ui.client.widget.Label; |
| import com.extjs.gxt.ui.client.widget.Text; |
| import com.extjs.gxt.ui.client.widget.form.DateField; |
| import com.extjs.gxt.ui.client.widget.form.Field; |
| import com.extjs.gxt.ui.client.widget.form.FieldSet; |
| import com.extjs.gxt.ui.client.widget.form.HiddenField; |
| 36,6 → 40,7 |
| import com.extjs.gxt.ui.client.widget.layout.FormData; |
| import com.extjs.gxt.ui.client.widget.layout.HBoxLayoutData; |
| import com.google.gwt.i18n.client.NumberFormat; |
| import com.google.gwt.user.client.ui.HorizontalPanel; |
| public class CollectionFormGeneral extends FormulaireOnglet implements Rafraichissable { |
| 48,7 → 53,8 |
| private ChampComboBoxRechercheTempsReelPaginable structuresCombo = null; |
| private ChampComboBoxRechercheTempsReelPaginable collectionsCombo = null; |
| private ChampCaseACocher periodeConstitutionChp = null; |
| private ChampNombre periodeConstitutionDebutChp = null; |
| private ChampNombre periodeConstitutionFinChp = null; |
| private ChampMultiValeurs lieuCouvertureChp = null; |
| private ChampComboBoxListeValeurs specimenTypeCombo = null; |
| 227,9 → 233,33 |
| couvertureFieldSet.collapse(); |
| couvertureFieldSet.setLayout(Formulaire.creerFormLayout(largeurLabelDefaut, alignementLabelDefaut)); |
| periodeConstitutionChp = new ChampCaseACocher(i18nC.periodeConstitution(), "siecleNaturaliste", false); |
| couvertureFieldSet.add(periodeConstitutionChp); |
| // à modifier |
| //periodeConstitutionChp = new ChampCaseACocher(i18nC.periodeConstitution(), "siecleNaturaliste", false); |
| //couvertureFieldSet.add(periodeConstitutionChp); |
| Label labelperiodeDebut = new Label(i18nC.periodeConstitutionDetailForm()); |
| labelperiodeDebut.setStyleName("labelChampNombreFormat"); |
| periodeConstitutionDebutChp = new ChampNombre(); |
| periodeConstitutionDebutChp.setStyleName("champNombreFormat"); |
| periodeConstitutionDebutChp.setWidth(55); |
| periodeConstitutionDebutChp.setEmptyText(i18nC.publicationDateParution()); |
| periodeConstitutionFinChp = new ChampNombre(); |
| periodeConstitutionFinChp.setStyleName("champNombreFormat"); |
| periodeConstitutionFinChp.setWidth(55); |
| periodeConstitutionFinChp.setEmptyText(i18nC.publicationDateParution()); |
| HorizontalPanel conteneurPeriode = new HorizontalPanel(); |
| conteneurPeriode.setBorderWidth(0); |
| conteneurPeriode.add(labelperiodeDebut); |
| conteneurPeriode.add(periodeConstitutionDebutChp); |
| conteneurPeriode.add(periodeConstitutionFinChp); |
| couvertureFieldSet.add(conteneurPeriode); |
| lieuCouvertureChp = new ChampMultiValeurs(i18nC.lieuCouvertureCollection()); |
| couvertureFieldSet.add(lieuCouvertureChp); |
| 236,6 → 266,8 |
| this.add(couvertureFieldSet); |
| } |
| private void creerFieldsetType() { |
| FieldSet typeFieldSet = new FieldSet(); |
| typeFieldSet.setHeadingHtml("Spécimens «types»"); |
| 284,7 → 316,12 |
| historiqueChp.setValue(collection.getHistorique()); |
| urlsChp.peupler(collection.getUrls()); |
| periodeConstitutionChp.peupler(collection.getPeriodeConstitution()); |
| if(!collection.getPeriodeConstitutionDebut().equals("0")) { |
| periodeConstitutionDebutChp.setValue((Integer.parseInt(collection.getPeriodeConstitutionDebut()))); |
| } |
| if(!collection.getPeriodeConstitutionFin().equals("0")) { |
| periodeConstitutionFinChp.setValue((Integer.parseInt(collection.getPeriodeConstitutionFin()))); |
| } |
| lieuCouvertureChp.peupler(collection.getCouvertureLieu()); |
| specimenTypeCombo.peupler(collection.getSpecimenType()); |
| 316,7 → 353,8 |
| collectionCollectee.setHistorique(historiqueChp.getValue()); |
| collectionCollectee.setUrls(urlsChp.getValeurs()); |
| collectionCollectee.setPeriodeConstitution(periodeConstitutionChp.getValeur()); |
| collectionCollectee.setPeriodeConstitutionDebut((Integer) periodeConstitutionDebutChp.getValue()); |
| collectionCollectee.setPeriodeConstitutionFin((Integer) periodeConstitutionFinChp.getValue()); |
| collectionCollectee.setCouvertureLieu(lieuCouvertureChp.getValeurs()); |
| collectionCollectee.setSpecimenType(specimenTypeCombo.getValeur()); |
| /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()); |