| 1,10 → 1,18 |
|---|
| package org.tela_botanica.client.vues.collection; |
| |
| import java.util.ArrayList; |
| import java.util.HashMap; |
| import java.util.List; |
| |
| import org.tela_botanica.client.ComposantClass; |
| import org.tela_botanica.client.Mediateur; |
| import org.tela_botanica.client.composants.ChampComboBoxRechercheTempsReelPaginable; |
| import org.tela_botanica.client.composants.GrillePaginable; |
| import org.tela_botanica.client.composants.InfoLogger; |
| import org.tela_botanica.client.composants.pagination.ProxyCollectionAPersonne; |
| import org.tela_botanica.client.composants.pagination.ProxyCollectionAPublication; |
| import org.tela_botanica.client.composants.pagination.ProxyProjets; |
| import org.tela_botanica.client.composants.pagination.ProxyPublications; |
| import org.tela_botanica.client.images.Images; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.Information; |
| 23,6 → 31,8 |
|---|
| |
| import com.extjs.gxt.ui.client.Style.Scroll; |
| import com.extjs.gxt.ui.client.core.XTemplate; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.extjs.gxt.ui.client.data.ModelType; |
| import com.extjs.gxt.ui.client.event.BaseEvent; |
| import com.extjs.gxt.ui.client.event.ButtonEvent; |
| import com.extjs.gxt.ui.client.event.ComponentEvent; |
| 39,7 → 49,9 |
|---|
| import com.extjs.gxt.ui.client.widget.button.Button; |
| import com.extjs.gxt.ui.client.widget.button.ButtonBar; |
| import com.extjs.gxt.ui.client.widget.form.ComboBox; |
| import com.extjs.gxt.ui.client.widget.form.Field; |
| import com.extjs.gxt.ui.client.widget.form.FormPanel; |
| import com.extjs.gxt.ui.client.widget.form.Validator; |
| import com.extjs.gxt.ui.client.widget.form.ComboBox.TriggerAction; |
| import com.extjs.gxt.ui.client.widget.grid.ColumnConfig; |
| import com.extjs.gxt.ui.client.widget.grid.ColumnData; |
| 48,6 → 60,7 |
|---|
| import com.extjs.gxt.ui.client.widget.grid.Grid; |
| import com.extjs.gxt.ui.client.widget.grid.GridCellRenderer; |
| import com.extjs.gxt.ui.client.widget.grid.GridSelectionModel; |
| import com.extjs.gxt.ui.client.widget.grid.HeaderGroupConfig; |
| import com.extjs.gxt.ui.client.widget.grid.RowExpander; |
| import com.extjs.gxt.ui.client.widget.grid.RowNumberer; |
| import com.extjs.gxt.ui.client.widget.layout.FitLayout; |
| 64,11 → 77,11 |
|---|
| |
| private ContentPanel panneauPrincipal = null; |
| private ToolBar barreOutils = null; |
| private EditorGrid<CollectionAPublication> grille; |
| private GrillePaginable<ModelData> grille; |
| |
| private CollectionAPublicationListe publicationsAjoutees = null; |
| private CollectionAPublicationListe publicationsSupprimees = null; |
| private ComboBox<Publication> publicationsSaisiesComboBox = null; |
| private ChampComboBoxRechercheTempsReelPaginable publicationsSaisiesComboBox = null; |
| private Button publicationsBoutonSupprimer = null; |
| private Button publicationsBoutonModifier = null; |
| |
| 80,6 → 93,9 |
|---|
| setId(ID); |
| setText(Mediateur.i18nC.collectionPublication()); |
| setStyleAttribute("padding", "0"); |
| |
| initialiser(); |
| |
| panneauPrincipal = creerPanneauContenantGrille(); |
| setLayout(new FitLayout()); |
| barreOutils = creerBarreOutilsGrille(); |
| 88,9 → 104,7 |
|---|
| panneauPrincipal.setLayout(new FitLayout()); |
| panneauPrincipal.add(grille); |
| |
| add(panneauPrincipal); |
| |
| initialiser(); |
| add(panneauPrincipal); |
| } |
| |
| private void initialiser() { |
| 99,9 → 113,6 |
|---|
| publicationsAjoutees = new CollectionAPublicationListe(); |
| publicationsSupprimees = new CollectionAPublicationListe(); |
| |
| // Actualisation de l'état des boutons de la barre d'outils |
| actualiserEtatBoutonsBarreOutils(); |
| |
| collection = ((CollectionForm) formulaire).collection; |
| } |
| |
| 162,8 → 173,7 |
|---|
| bouton.setIcon(Images.ICONES.vcardModifier()); |
| bouton.addSelectionListener(new SelectionListener<ButtonEvent>() { |
| public void componentSelected(ButtonEvent ce) { |
| CollectionAPublication publicationSaisieSelectionnee = grille.getSelectionModel().getSelectedItem(); |
| |
| ModelData publicationSaisieSelectionnee = grille.getGrille().getSelectionModel().getSelectedItem(); |
| if (publicationSaisieSelectionnee == null) { |
| InfoLogger.display(i18nC.informationTitreGenerique(), i18nC.selectionnerPublication()); |
| } else { |
| 178,7 → 188,7 |
|---|
| private FenetreForm creerFenetreModaleAvecFormulairePublication(String mode) { |
| String publicationId = null; |
| if (mode.equals(Formulaire.MODE_MODIFIER)) { |
| CollectionAPublication publicationSaisiSelectionne = grille.getSelectionModel().getSelectedItem(); |
| CollectionAPublication publicationSaisiSelectionne = new CollectionAPublication(grille.getGrille().getSelectionModel().getSelectedItem(), false); |
| publicationId = publicationSaisiSelectionne.getIdPublication(); |
| } |
| |
| 232,7 → 242,7 |
|---|
| bouton.setIcon(Images.ICONES.vcardSupprimer()); |
| bouton.addSelectionListener(new SelectionListener<ButtonEvent>() { |
| public void componentSelected(ButtonEvent ce) { |
| CollectionAPublication publicationSaisieSelectionnee = grille.getSelectionModel().getSelectedItem(); |
| CollectionAPublication publicationSaisieSelectionnee = new CollectionAPublication(grille.getGrille().getSelectionModel().getSelectedItem(), false); |
| if (publicationSaisieSelectionnee == null) { |
| InfoLogger.display(i18nC.informationTitreGenerique(), i18nC.selectionnerPublication()); |
| } else { |
| 249,7 → 259,7 |
|---|
| bouton.addSelectionListener(new SelectionListener<ButtonEvent>() { |
| public void componentSelected(ButtonEvent ce) { |
| actualiserGrille(); |
| } |
| } |
| }); |
| return bouton; |
| } |
| 263,35 → 273,60 |
|---|
| } |
| } |
| |
| private ComboBox<Publication> creerComboBoxPublicationsSaisis() { |
| ListStore<Publication> publicationsSaisiesStore = new ListStore<Publication>(); |
| private ChampComboBoxRechercheTempsReelPaginable creerComboBoxPublicationsSaisis() { |
| |
| ComboBox<Publication> comboBox = new ComboBox<Publication>(); |
| comboBox.setWidth(400); |
| comboBox.setEmptyText(i18nC.chercherPublicationSaisi()); |
| comboBox.setTriggerAction(TriggerAction.ALL); |
| comboBox.setEditable(true); |
| comboBox.setDisplayField("fmt_nom_complet"); |
| comboBox.setStore(publicationsSaisiesStore); |
| comboBox.addKeyListener(new KeyListener() { |
| public void componentKeyUp(ComponentEvent ce) { |
| if (publicationsSaisiesComboBox.getRawValue() != null && publicationsSaisiesComboBox.getRawValue().length() > 0) { |
| if (!ce.isNavKeyPress()) { |
| obtenirPublicationsSaisies(publicationsSaisiesComboBox.getRawValue()); |
| } |
| ModelType modelTypePublications = new ModelType(); |
| modelTypePublications.setRoot("publications"); |
| modelTypePublications.setTotalName("nbElements"); |
| modelTypePublications.addField("ccapu_id_collection"); |
| modelTypePublications.addField("ccapu_id_publication"); |
| modelTypePublications.addField("cc_nom"); |
| modelTypePublications.addField("cc_id_collection"); |
| modelTypePublications.addField("cpu_id_publication"); |
| modelTypePublications.addField("cpu_fmt_nom_complet"); |
| modelTypePublications.addField("cpu_titre"); |
| modelTypePublications.addField("cpu_nom"); |
| modelTypePublications.addField("cpu_fmt_auteur"); |
| modelTypePublications.addField("cpu_indication_nvt"); |
| modelTypePublications.addField("cpu_truk_pages"); |
| modelTypePublications.addField("cpu_fascicule"); |
| modelTypePublications.addField("cpu_date_parution"); |
| modelTypePublications.addField("cpu_ce_truk_editeur"); |
| modelTypePublications.addField("cpu_ce_projet"); |
| |
| String displayNamePublications = "cpu_fmt_nom_complet"; |
| ProxyPublications<ModelData> proxyPublications= new ProxyPublications<ModelData>(null); |
| |
| final ChampComboBoxRechercheTempsReelPaginable publicationsCombo = new ChampComboBoxRechercheTempsReelPaginable(proxyPublications, modelTypePublications, displayNamePublications); |
| publicationsCombo.getCombo().setTabIndex(tabIndex++); |
| publicationsCombo.getCombo().setForceSelection(true); |
| |
| publicationsCombo.getCombo().setValidator(new Validator() { |
| public String validate(Field<?> field, String value) { |
| String retour = null; |
| if (field.getRawValue().equals("")) { |
| field.setValue(null); |
| } else if (publicationsCombo.getStore().findModel("cpu_fmt_nom_complet", field.getRawValue()) == null) { |
| String contenuBrut = field.getRawValue(); |
| field.setValue(null); |
| field.setRawValue(contenuBrut); |
| retour = "Veuillez sélectionner une valeur ou laisser le champ vide"; |
| } |
| return retour; |
| } |
| }); |
| comboBox.addListener(Events.Select, new Listener<BaseEvent>() { |
| |
| publicationsCombo.getCombo().addListener(Events.Select, new Listener<BaseEvent>() { |
| public void handleEvent(BaseEvent be) { |
| if (publicationsSaisiesComboBox.getValue() instanceof Publication) { |
| Publication publicationSaisieSelectionne = publicationsSaisiesComboBox.getValue(); |
| if (publicationsSaisiesComboBox.getValeur() instanceof ModelData) { |
| Publication publicationSaisieSelectionne = new Publication(publicationsSaisiesComboBox.getValeur(), false); |
| ajouterDansGrille(publicationSaisieSelectionne); |
| publicationsSaisiesComboBox.setValue(null); |
| publicationsSaisiesComboBox.getCombo().setValue(null); |
| } |
| } |
| }); |
| return comboBox; |
| |
| return publicationsCombo; |
| } |
| |
| private void ajouterDansGrille(Publication publication) { |
| 299,10 → 334,11 |
|---|
| } |
| |
| private void ajouterDansGrille(Publication publication, int index) { |
| if (publication != null) { |
| CollectionAPublication publicationLiee = new CollectionAPublication(); |
| if (publication != null) { |
| CollectionAPublication publicationLiee = new CollectionAPublication(false); |
| publicationLiee.setPublication(publication); |
| publicationLiee.setIdPublication(publication.getId()); |
| |
| // Gestion de l'id de la collection |
| if (mode.equals(Formulaire.MODE_MODIFIER)) { |
| publicationLiee.setIdCollection(collection.getId()); |
| 309,11 → 345,10 |
|---|
| } |
| publicationLiee.set("_etat_", aDonnee.ETAT_AJOUTE); |
| |
| // Ajout à la grille |
| grille.stopEditing(); |
| grille.getStore().insert(publicationLiee, 0); |
| grille.startEditing(index, 0); |
| grille.getSelectionModel().select(index, false); |
| grille.getGrille().stopEditing(); |
| grille.getGrille().getStore().insert(publicationLiee, 0); |
| grille.getGrille().startEditing(index, 0); |
| grille.getGrille().getSelectionModel().select(index, false); |
| } |
| } |
| |
| 330,67 → 365,94 |
|---|
| grille.getStore().remove(publicationLiee); |
| } |
| } |
| |
| private GrillePaginable<ModelData> creerGrille() { |
| |
| GrillePaginable<ModelData> grillePublications = null; |
| |
| // ModelType |
| ModelType modelTypeCollectionAPublication = new ModelType(); |
| modelTypeCollectionAPublication.setRoot("collectionsAPublication"); |
| modelTypeCollectionAPublication.setTotalName("nbElements"); |
| modelTypeCollectionAPublication.addField("ccapu_id_collection"); |
| modelTypeCollectionAPublication.addField("ccapu_id_publication"); |
| modelTypeCollectionAPublication.addField("ccapu_mark_licence"); |
| modelTypeCollectionAPublication.addField("cpu_id_publication"); |
| modelTypeCollectionAPublication.addField("cpu_fmt_auteur"); |
| modelTypeCollectionAPublication.addField("cpu_titre"); |
| modelTypeCollectionAPublication.addField("cpu_collection"); |
| modelTypeCollectionAPublication.addField("cpu_ce_truk_editeur"); |
| modelTypeCollectionAPublication.addField("cpu_date_parution"); |
| modelTypeCollectionAPublication.addField("cpu_fascicule"); |
| modelTypeCollectionAPublication.addField("cpu_truk_pages"); |
| modelTypeCollectionAPublication.addField("cpu_indication_nvt"); |
| |
| // Proxy |
| ProxyCollectionAPublication<ModelData> proxyCollectionAPublication = new ProxyCollectionAPublication<ModelData>(null, collection.getId()); |
| |
| private EditorGrid<CollectionAPublication> creerGrille() { |
| ListStore<CollectionAPublication> storeGrille = new ListStore<CollectionAPublication>(); |
| storeGrille.addListener(Store.Add, new Listener<StoreEvent<CollectionAPublication>>() { |
| public void handleEvent(StoreEvent<CollectionAPublication> ce) { |
| actualiserEtatBoutonsBarreOutils(); |
| } |
| }); |
| storeGrille.addListener(Store.Remove, new Listener<StoreEvent<CollectionAPublication>>() { |
| public void handleEvent(StoreEvent<CollectionAPublication> ce) { |
| actualiserEtatBoutonsBarreOutils(); |
| } |
| }); |
| |
| // Colonnes |
| List<ColumnConfig> colonnes = new ArrayList<ColumnConfig>(); |
| RowNumberer numeroPlugin = new RowNumberer(); |
| numeroPlugin.setHeader("#"); |
| |
| XTemplate infoTpl = XTemplate.create("<p>"+ |
| "<span style='font-weight:bold;'>"+i18nC.publicationAuteurs()+" :</span> {fmt_auteur}<br />"+ |
| "<span style='font-weight:bold;'>"+i18nC.publicationTitre()+" :</span> {titre}<br />"+ |
| "<span style='font-weight:bold;'>"+i18nC.publicationRevueCollection()+" :</span> {collection}<br />"+ |
| "<span style='font-weight:bold;'>"+i18nC.publicationAuteurs()+" :</span> {cpu_fmt_auteur}<br />"+ |
| "<span style='font-weight:bold;'>"+i18nC.publicationTitre()+" :</span> {cpu_titre}<br />"+ |
| "<span style='font-weight:bold;'>"+i18nC.publicationRevueCollection()+" :</span> {cpu_collection}<br />"+ |
| "<span style='font-weight:bold;'>"+i18nC.publicationEditeur()+" :</span> {_editeur_}"+ |
| "</p>"); |
| RowExpander expansionPlugin = new RowExpander(); |
| expansionPlugin.setTemplate(infoTpl); |
| |
| List<ColumnConfig> colonnes = new ArrayList<ColumnConfig>(); |
| colonnes.add(expansionPlugin); |
| colonnes.add(numeroPlugin); |
| colonnes.add(new ColumnConfig("fmt_auteur", i18nC.publicationAuteurs(), 150)); |
| colonnes.add(new ColumnConfig("titre", i18nC.publicationTitre(), 150)); |
| colonnes.add(new ColumnConfig("collection", i18nC.publicationRevueCollection(), 75)); |
| colonnes.add(new ColumnConfig("cpu_fmt_auteur", i18nC.publicationAuteurs(), 150)); |
| colonnes.add(new ColumnConfig("cpu_titre", i18nC.publicationTitre(), 150)); |
| colonnes.add(new ColumnConfig("cpu_collection", i18nC.publicationRevueCollection(), 75)); |
| colonnes.add(creerColonneEditeur()); |
| colonnes.add(creerColonneAnneePublication()); |
| colonnes.add(new ColumnConfig("indication_nvt", i18nC.publicationNvt(), 75)); |
| colonnes.add(new ColumnConfig("fascicule", i18nC.publicationFascicule(), 75)); |
| colonnes.add(new ColumnConfig("truk_pages", i18nC.publicationPage(), 50)); |
| colonnes.add(new ColumnConfig("cpu_indication_nvt", i18nC.publicationNvt(), 75)); |
| colonnes.add(new ColumnConfig("cpu_fascicule", i18nC.publicationFascicule(), 75)); |
| colonnes.add(new ColumnConfig("cpu_truk_pages", i18nC.publicationPage(), 50)); |
| |
| GridSelectionModel<CollectionAPublication> modeleDeSelection = new GridSelectionModel<CollectionAPublication>(); |
| HashMap<String, String> virtualFields = new HashMap<String, String>(); |
| virtualFields.put("_editeur_", "cpu_ce_truk_editeur"); |
| virtualFields.put("_annee_", "cpu_date_parution"); |
| virtualFields.put("_etat_", ""); |
| |
| // Modele de selection |
| GridSelectionModel<ModelData> modeleDeSelection = new GridSelectionModel<ModelData>(); |
| ColumnModel modeleDeColonnes = new ColumnModel(colonnes); |
| modeleDeColonnes.getColumn(0).setWidget(Images.ICONES.information().createImage(), "Info"); |
| |
| EditorGrid<CollectionAPublication> grillePublications = new EditorGrid<CollectionAPublication>(storeGrille, modeleDeColonnes); |
| //grillePublications.setHeight("100%"); |
| grillePublications.setBorders(true); |
| grillePublications.setSelectionModel(modeleDeSelection); |
| grillePublications.addPlugin(expansionPlugin); |
| grillePublications.addPlugin(numeroPlugin); |
| grillePublications.getView().setForceFit(true); |
| grillePublications.setAutoExpandColumn("titre"); |
| grillePublications.setStripeRows(true); |
| grillePublications.setTrackMouseOver(true); |
| // Grille |
| grillePublications = new GrillePaginable<ModelData>(modelTypeCollectionAPublication, virtualFields, proxyCollectionAPublication, colonnes, modeleDeColonnes); |
| grillePublications.getGrille().setBorders(true); |
| grillePublications.getGrille().setSelectionModel(modeleDeSelection); |
| grillePublications.getGrille().addPlugin(expansionPlugin); |
| grillePublications.getGrille().addPlugin(numeroPlugin); |
| grillePublications.getGrille().getView().setForceFit(true); |
| grillePublications.getGrille().setAutoExpandColumn("titre"); |
| grillePublications.getGrille().setStripeRows(true); |
| grillePublications.getGrille().setTrackMouseOver(true); |
| |
| // Rajouter des écouteurs |
| grillePublications.getStore().addListener(Store.Add, new Listener<StoreEvent<ModelData>>() { |
| public void handleEvent(StoreEvent<ModelData> ce) { |
| actualiserEtatBoutonsBarreOutils(); |
| } |
| }); |
| grillePublications.getStore().addListener(Store.Remove, new Listener<StoreEvent<ModelData>>() { |
| public void handleEvent(StoreEvent<ModelData> ce) { |
| actualiserEtatBoutonsBarreOutils(); |
| } |
| }); |
| |
| return grillePublications; |
| } |
| |
| private ColumnConfig creerColonneEditeur() { |
| GridCellRenderer<CollectionAPublication> editeurRendu = new GridCellRenderer<CollectionAPublication>() { |
| public String render(CollectionAPublication model, String property, ColumnData config, int rowIndex, int colIndex, ListStore<CollectionAPublication> store, Grid<CollectionAPublication> grid) { |
| String editeur = model.getPublication().getNomEditeur(); |
| GridCellRenderer<ModelData> editeurRendu = new GridCellRenderer<ModelData>() { |
| public String render(ModelData model, String property, ColumnData config, int rowIndex, int colIndex, ListStore<ModelData> store, Grid<ModelData> grid) { |
| String editeur = (new CollectionAPublication(model, false)).getPublication().getNomEditeur(); |
| model.set("_editeur_", editeur); |
| return editeur; |
| } |
| 401,9 → 463,9 |
|---|
| } |
| |
| private ColumnConfig creerColonneAnneePublication() { |
| GridCellRenderer<CollectionAPublication> datePublicationRendu = new GridCellRenderer<CollectionAPublication>() { |
| public String render(CollectionAPublication model, String property, ColumnData config, int rowIndex, int colIndex, ListStore<CollectionAPublication> store, Grid<CollectionAPublication> grid) { |
| String annee = model.getPublication().getAnneeParution(); |
| GridCellRenderer<ModelData> datePublicationRendu = new GridCellRenderer<ModelData>() { |
| public String render(ModelData model, String property, ColumnData config, int rowIndex, int colIndex, ListStore<ModelData> store, Grid<ModelData> grid) { |
| String annee = (new CollectionAPublication(model, false)).getPublication().getAnneeParution(); |
| model.set("_annee_", annee); |
| return annee; |
| } |
| 430,19 → 492,10 |
|---|
| if (nouvellesDonnees instanceof Information) { |
| Information info = (Information) nouvellesDonnees; |
| rafraichirInformation(info); |
| } else if (nouvellesDonnees instanceof PublicationListe) { |
| PublicationListe listePublications = (PublicationListe) nouvellesDonnees; |
| rafraichirPublicationListe(listePublications); |
| } else { |
| GWT.log(Mediateur.i18nM.erreurRafraichir(nouvellesDonnees.getClass(), this.getClass()), null); |
| } |
| } |
| |
| private void rafraichirPublicationListe(PublicationListe listePublications) { |
| publicationsSaisiesComboBox.getStore().removeAll(); |
| publicationsSaisiesComboBox.getStore().add(listePublications.toList()); |
| publicationsSaisiesComboBox.expand(); |
| } |
| |
| public void rafraichirInformation(Information info) { |
| if (info.getMessages() != null && !info.getMessages().toString().equals("[]")) { |
| 464,14 → 517,15 |
|---|
| mediateur.ajouterCollectionAPublication(this, collectionId, publicationsAjoutees); |
| } |
| } else if (type.equals("publication_modifiee")) { |
| if (info.getDonnee(0) != null) { |
| Publication publication = (Publication) info.getDonnee(0); |
| CollectionAPublication publicationDansGrille = grille.getStore().findModel("id_publication", publication.getId()); |
| int index = grille.getStore().indexOf(publicationDansGrille); |
| if (info.getDonnee(0) != null) { |
| Publication publication = (Publication) info.getDonnee(0); |
| ModelData publicationDansGrille = null; |
| publicationDansGrille = grille.getStore().findModel("cpu_id_publication", publication.getId()); |
| int index = grille.getStore().indexOf(publicationDansGrille); |
| grille.getStore().remove(publicationDansGrille); |
| ajouterDansGrille(publication, index); |
| } |
| } else if (type.equals("publication_ajoutee")) { |
| } else if (type.equals("publication_ajoutee")) { |
| if (info.getDonnee(0) != null) { |
| Publication publication = (Publication) info.getDonnee(0); |
| ajouterDansGrille(publication); |
| 496,17 → 550,18 |
|---|
| if (etreAccede()) { |
| int nbrePublication = grille.getStore().getCount(); |
| for (int i = 0; i < nbrePublication; i++) { |
| CollectionAPublication publicationLiee = grille.getStore().getAt(i); |
| ModelData publicationLiee = grille.getStore().getAt(i); |
| CollectionAPublication cap = new CollectionAPublication(grille.getStore().getAt(i), false); |
| if (publicationLiee.get("_etat_") != null) { |
| if (publicationLiee.get("_etat_").equals(aDonnee.ETAT_MODIFIE)) { |
| // Comme il est impossible de modifier les relations nous supprimons l'ancien enregistrement et ajoutons un nouveau avec le nouveau id_role |
| publicationsSupprimees.put("id"+idGenere++, publicationLiee); |
| publicationsSupprimees.put("id"+idGenere++, cap); |
| |
| CollectionAPublication relationAAjouter = (CollectionAPublication) publicationLiee.cloner(new CollectionAPublication()); |
| CollectionAPublication relationAAjouter = (CollectionAPublication) cap.cloner(new CollectionAPublication()); |
| publicationsAjoutees.put("id"+idGenere++, relationAAjouter); |
| } |
| if (publicationLiee.get("_etat_").equals(aDonnee.ETAT_AJOUTE)) { |
| publicationsAjoutees.put("id"+idGenere++, publicationLiee); |
| publicationsAjoutees.put("id"+idGenere++, cap); |
| } |
| // Initialisation de la grille |
| publicationLiee.set("_etat_", ""); |
| 532,8 → 587,4 |
|---|
| } |
| } |
| } |
| |
| private void obtenirPublicationsSaisies(String nom) { |
| mediateur.selectionnerPublicationParNomComplet(this, null, "%"+nom+"%"); |
| } |
| } |
| Property changes: |
|---|
| Modified: svn:mergeinfo |
|---|
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r11-933 |
|---|
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1417-1511 |
|---|