| /trunk/src/org/tela_botanica/client/composants/AideFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AideFenetre.java:r11-60 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/AideFenetre.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java:r11-893 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java |
|---|
| 84,7 → 84,7 |
| plc.setLimit(limit); |
| plc.setOffset(start); |
| reader = new TransformateurJSONaModelData<PagingLoadResult<ModelData>>(modeltype); |
| reader = new TransformateurJSONaModelData<PagingLoadResult<ModelData>>(modeltype, null); |
| loader = new ChargeurListe<PagingLoadResult<ModelData>>(proxy, reader, this); |
| loader.setLimit(plc.getLimit()); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/GrillePaginable.java |
|---|
| 1,5 → 1,6 |
| package org.tela_botanica.client.composants; |
| import java.util.HashMap; |
| import java.util.List; |
| import java.util.Map; |
| 32,6 → 33,7 |
| import com.extjs.gxt.ui.client.widget.grid.GridSelectionModel; |
| import com.extjs.gxt.ui.client.widget.grid.RowNumberer; |
| import com.extjs.gxt.ui.client.widget.layout.FitLayout; |
| import com.extjs.gxt.ui.client.widget.selection.SelectionModel; |
| import com.extjs.gxt.ui.client.widget.toolbar.PagingToolBar; |
| public class GrillePaginable<D extends ModelData> extends ContentPanel implements Rafraichissable, GrilleParametrable<D> { |
| 52,7 → 54,7 |
| private ListStore<D> storeGrille = null; |
| // Elements graphiques |
| EditorGrid<D> grillePersonne = null; |
| EditorGrid<D> grille = null; |
| List<ColumnConfig> colonnes = null; |
| ColumnModel modeleDeColonnes = null; |
| 64,7 → 66,7 |
| Constructeur |
| --------------*/ |
| public GrillePaginable(ModelType modeltype, Proxy<D> proxy, List<ColumnConfig> colonnes, ColumnModel modeleDeColonnes) { |
| public GrillePaginable(ModelType modeltype, HashMap<String, String> virtualFields, Proxy<D> proxy, List<ColumnConfig> colonnes, ColumnModel modeleDeColonnes) { |
| // Récupération des paramètres |
| this.modelType = modeltype; |
| 80,7 → 82,7 |
| plc.setLimit(limit); |
| plc.setOffset(start); |
| reader = new TransformateurJSONaModelData<PagingLoadResult<D>>(modelType); |
| reader = new TransformateurJSONaModelData<PagingLoadResult<D>>(modelType, virtualFields); |
| loader = new ChargeurListe<PagingLoadResult<D>>(proxy, reader, this); |
| loader.setLimit(plc.getLimit()); |
| 92,6 → 94,12 |
| } |
| }); |
| loader.addListener(Loader.Load, new Listener<LoadEvent>() { |
| public void handleEvent(LoadEvent be) { |
| } |
| }); |
| // Création de la grille |
| creerGrille(); |
| } |
| 102,7 → 110,7 |
| ------------*/ |
| public EditorGrid<D> getGrille() { |
| return grillePersonne; |
| return grille; |
| } |
| public ListStore<D> getStore() { |
| 109,11 → 117,20 |
| return storeGrille; |
| } |
| public GridSelectionModel<D> getSelectionModel() { |
| return grille.getSelectionModel(); |
| } |
| public D getSelection() { |
| return grillePersonne.getSelectionModel().getSelectedItem(); |
| } |
| return grille.getSelectionModel().getSelectedItem(); |
| } |
| @SuppressWarnings("unchecked") |
| public Proxy getProxy() { |
| return this.proxy; |
| } |
| /*----------------------------- |
| Rafraichir |
| -----------------------------*/ |
| 155,25 → 172,24 |
| GridSelectionModel<D> modeleDeSelection = new GridSelectionModel<D>(); |
| grillePersonne = new EditorGrid<D>(storeGrille, modeleDeColonnes); |
| grillePersonne.setHeight("100%"); |
| grillePersonne.setBorders(true); |
| grillePersonne.setSelectionModel(modeleDeSelection); |
| grillePersonne.addPlugin(pluginLigneNumero); |
| grillePersonne.getView().setForceFit(true); |
| grillePersonne.setAutoExpandColumn("fmt_nom_complet"); |
| grillePersonne.setStripeRows(true); |
| grillePersonne.setBorders(true); |
| grille = new EditorGrid<D>(storeGrille, modeleDeColonnes); |
| grille.setHeight("100%"); |
| grille.setBorders(true); |
| grille.setSelectionModel(modeleDeSelection); |
| grille.addPlugin(pluginLigneNumero); |
| grille.getView().setForceFit(true); |
| grille.setStripeRows(true); |
| grille.setBorders(true); |
| grillePersonne.setStateful(true); |
| grille.setStateful(true); |
| grillePersonne.addListener(Events.Attach, new Listener<GridEvent<D>>() { |
| grille.addListener(Events.Attach, new Listener<GridEvent<D>>() { |
| public void handleEvent(GridEvent<D> be) { |
| PagingLoadConfig config = new BasePagingLoadConfig(); |
| config.setOffset(0); |
| config.setLimit(50); |
| config.setOffset(start); |
| config.setLimit(limit); |
| Map<String, Object> state = grillePersonne.getState(); |
| Map<String, Object> state = grille.getState(); |
| if (state.containsKey("offset")) { |
| int offset = (Integer)state.get("offset"); |
| int limit = (Integer)state.get("limit"); |
| 188,6 → 204,10 |
| } |
| }); |
| this.add(grillePersonne); |
| this.add(grille); |
| } |
| public void reload() { |
| loader.load(); |
| } |
| } |
| /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1417-1511 |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r11-853 |
| /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r11-857 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java:r11-969 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/HashMapComposants.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/InfoLogger.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/InfoLogger.java:r11-1208 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/InfoLogger.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java:r11-1022 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/AproposFenetre.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r11-1028 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r11-59 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java |
|---|
| 302,13 → 302,18 |
| public void supprimerValeurDuRecapitulatif(String texte) { |
| if (champRecapitulatif.getValue() != null) { |
| // comme c'est le nom de la valeur qui est passée en paramètre, |
| // on doit récupérer son id |
| ListStore<Valeur> valeurs = champValeurCombo.getStore(); |
| Valeur objetValeur = valeurs.findModel("nom", texte); |
| String texteValeur = ""; |
| if (objetValeur != null) { |
| texteValeur = objetValeur.getId(); |
| if (estComboBox) { |
| // comme c'est le nom de la valeur qui est passée en paramètre, |
| // on doit récupérer son id |
| ListStore<Valeur> valeurs = champValeurCombo.getStore(); |
| Valeur objetValeur = valeurs.findModel("nom", texte); |
| if (objetValeur != null) { |
| texteValeur = objetValeur.getId(); |
| } else { |
| texteValeur = texte; |
| } |
| } else { |
| texteValeur = texte; |
| } |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1417-1511 |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r11-664 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1417-1511 |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r11-720 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java |
|---|
| 68,10 → 68,8 |
| public void componentSelected(ButtonEvent ce) { |
| String valeur = ce.getComponent().getData("valeur"); |
| LayoutContainer valeurLayout = valeurs.get(valeur); |
| principalLayout.remove(valeurLayout); |
| sousContenu.remove(valeurLayout); |
| valeurs.remove(valeur); |
| supprimerValeurDuRecapitulatif(valeur); |
| actualiserLayoutGlobal(); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r11-699 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyCollectionAPublication.java |
|---|
| New file |
| 0,0 → 1,80 |
| package org.tela_botanica.client.composants.pagination; |
| import java.util.ArrayList; |
| import java.util.HashMap; |
| import java.util.List; |
| import org.tela_botanica.client.Mediateur; |
| import org.tela_botanica.client.RegistreId; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.ValeurListe; |
| import org.tela_botanica.client.modeles.ValeurListeAsyncDao; |
| import org.tela_botanica.client.synchronisation.Sequenceur; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.UtilString; |
| import com.extjs.gxt.ui.client.Registry; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadConfig; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadResult; |
| import com.extjs.gxt.ui.client.data.DataReader; |
| import com.extjs.gxt.ui.client.data.MemoryProxy; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONObject; |
| import com.google.gwt.json.client.JSONString; |
| import com.google.gwt.user.client.rpc.AsyncCallback; |
| public class ProxyCollectionAPublication<D> extends Proxy { |
| String collectionId = null; |
| public ProxyCollectionAPublication(Sequenceur sequenceur, String collectionId) { |
| super(sequenceur); |
| this.collectionId = collectionId; |
| } |
| @Override |
| public void load(TransformateurJSONaModelData reader, Object loadConfig, AsyncCallback callback, String recherche) { |
| this.reader = reader; |
| this.callback = callback; |
| this.loadConfig = loadConfig; |
| BasePagingLoadConfig lc = (BasePagingLoadConfig)loadConfig; |
| if (!UtilString.isEmpty(this.collectionId)) { |
| mediateur.selectionnerCollectionAPublication(this, this.collectionId, recherche, lc.getOffset(), lc.getLimit(), sequenceur); |
| } |
| } |
| @Override |
| @SuppressWarnings("unchecked") |
| public void rafraichir(Object nouvellesDonnees) { |
| try |
| { |
| D donneesRetour = null; |
| if (nouvellesDonnees!=null) { |
| data = nouvellesDonnees; |
| if (reader != null) |
| { |
| donneesRetour = (D) reader.read(loadConfig, data); |
| } |
| else |
| { |
| donneesRetour = (D) data; |
| if (donneesRetour instanceof List) |
| { |
| donneesRetour = (D) new ArrayList((List) donneesRetour); |
| } |
| } |
| } |
| callback.onSuccess(donneesRetour); |
| } |
| catch (Exception e) |
| { |
| callback.onFailure(e); |
| } |
| } |
| } |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyCommentaires.java |
|---|
| New file |
| 0,0 → 1,76 |
| package org.tela_botanica.client.composants.pagination; |
| import java.util.ArrayList; |
| import java.util.HashMap; |
| import java.util.List; |
| import org.tela_botanica.client.Mediateur; |
| import org.tela_botanica.client.RegistreId; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.Information; |
| import org.tela_botanica.client.modeles.ValeurListe; |
| import org.tela_botanica.client.modeles.ValeurListeAsyncDao; |
| import org.tela_botanica.client.modeles.projet.Projet; |
| import org.tela_botanica.client.synchronisation.Sequenceur; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.UtilString; |
| import com.extjs.gxt.ui.client.Registry; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadConfig; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadResult; |
| import com.extjs.gxt.ui.client.data.DataReader; |
| import com.extjs.gxt.ui.client.data.MemoryProxy; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONArray; |
| import com.google.gwt.json.client.JSONObject; |
| import com.google.gwt.json.client.JSONString; |
| import com.google.gwt.user.client.rpc.AsyncCallback; |
| public class ProxyCommentaires<D> extends Proxy { |
| public ProxyCommentaires(Sequenceur sequenceur) { |
| super(sequenceur); |
| } |
| @Override |
| public void load(TransformateurJSONaModelData reader, Object loadConfig, AsyncCallback callback, String recherche) { |
| this.reader = reader; |
| this.callback = callback; |
| this.loadConfig = loadConfig; |
| BasePagingLoadConfig lc = (BasePagingLoadConfig)loadConfig; |
| mediateur.selectionnerCommentaire(this, recherche, lc.getOffset(), lc.getLimit(), sequenceur); |
| } |
| @Override |
| @SuppressWarnings("unchecked") |
| public void rafraichir(Object nouvellesDonnees) { |
| try |
| { |
| data = nouvellesDonnees; |
| D d = null; |
| if (reader != null) |
| { |
| d = (D) reader.read(loadConfig, data); |
| } |
| else |
| { |
| d = (D) data; |
| if (d instanceof List) |
| { |
| d = (D) new ArrayList((List) d); |
| } |
| } |
| callback.onSuccess(d); |
| } |
| catch (Exception e) |
| { |
| callback.onFailure(e); |
| } |
| } |
| } |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyPublications.java |
|---|
| New file |
| 0,0 → 1,76 |
| package org.tela_botanica.client.composants.pagination; |
| import java.util.ArrayList; |
| import java.util.HashMap; |
| import java.util.List; |
| import org.tela_botanica.client.Mediateur; |
| import org.tela_botanica.client.RegistreId; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.Information; |
| import org.tela_botanica.client.modeles.ValeurListe; |
| import org.tela_botanica.client.modeles.ValeurListeAsyncDao; |
| import org.tela_botanica.client.modeles.projet.Projet; |
| import org.tela_botanica.client.synchronisation.Sequenceur; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.UtilString; |
| import com.extjs.gxt.ui.client.Registry; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadConfig; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadResult; |
| import com.extjs.gxt.ui.client.data.DataReader; |
| import com.extjs.gxt.ui.client.data.MemoryProxy; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONArray; |
| import com.google.gwt.json.client.JSONObject; |
| import com.google.gwt.json.client.JSONString; |
| import com.google.gwt.user.client.rpc.AsyncCallback; |
| public class ProxyPublications<D> extends Proxy { |
| public ProxyPublications(Sequenceur sequenceur) { |
| super(sequenceur); |
| } |
| @Override |
| public void load(TransformateurJSONaModelData reader, Object loadConfig, AsyncCallback callback, String recherche) { |
| this.reader = reader; |
| this.callback = callback; |
| this.loadConfig = loadConfig; |
| BasePagingLoadConfig lc = (BasePagingLoadConfig)loadConfig; |
| mediateur.selectionnerPublication(this, recherche, lc.getOffset(), lc.getLimit(), sequenceur); |
| } |
| @Override |
| @SuppressWarnings("unchecked") |
| public void rafraichir(Object nouvellesDonnees) { |
| try |
| { |
| data = nouvellesDonnees; |
| D d = null; |
| if (reader != null) |
| { |
| d = (D) reader.read(loadConfig, data); |
| } |
| else |
| { |
| d = (D) data; |
| if (d instanceof List) |
| { |
| d = (D) new ArrayList((List) d); |
| } |
| } |
| callback.onSuccess(d); |
| } |
| catch (Exception e) |
| { |
| callback.onFailure(e); |
| } |
| } |
| } |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyPersonnesAPublication.java |
|---|
| New file |
| 0,0 → 1,82 |
| package org.tela_botanica.client.composants.pagination; |
| import java.util.ArrayList; |
| import java.util.HashMap; |
| import java.util.List; |
| import org.tela_botanica.client.Mediateur; |
| import org.tela_botanica.client.RegistreId; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.ValeurListe; |
| import org.tela_botanica.client.modeles.ValeurListeAsyncDao; |
| import org.tela_botanica.client.synchronisation.Sequenceur; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.UtilString; |
| import com.extjs.gxt.ui.client.Registry; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadConfig; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadResult; |
| import com.extjs.gxt.ui.client.data.DataReader; |
| import com.extjs.gxt.ui.client.data.MemoryProxy; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONObject; |
| import com.google.gwt.json.client.JSONString; |
| import com.google.gwt.user.client.rpc.AsyncCallback; |
| public class ProxyPersonnesAPublication<D> extends Proxy { |
| String publicationId = null; |
| public ProxyPersonnesAPublication(Sequenceur sequenceur, String publicationId) { |
| super(sequenceur); |
| this.publicationId = publicationId; |
| } |
| @Override |
| public void load(TransformateurJSONaModelData reader, Object loadConfig, AsyncCallback callback, String recherche) { |
| this.reader = reader; |
| this.callback = callback; |
| this.loadConfig = loadConfig; |
| BasePagingLoadConfig lc = (BasePagingLoadConfig)loadConfig; |
| if (!UtilString.isEmpty(this.publicationId)) { |
| mediateur.selectionnerPersonnesAPublication(this, this.publicationId, recherche, lc.getOffset(), lc.getLimit(), sequenceur); |
| } else { |
| this.rafraichir(null); |
| } |
| } |
| public void setPublicationId(String publicationId) { |
| this.publicationId = publicationId; |
| } |
| @Override |
| @SuppressWarnings("unchecked") |
| public void rafraichir(Object nouvellesDonnees) { |
| try |
| { |
| D donneesRetour = null; |
| if (nouvellesDonnees!=null) { |
| data = nouvellesDonnees; |
| if (reader != null) |
| { |
| donneesRetour = (D) reader.read(loadConfig, data); |
| } |
| else |
| { |
| donneesRetour = (D) data; |
| if (donneesRetour instanceof List) |
| { |
| donneesRetour = (D) new ArrayList((List) donneesRetour); |
| } |
| } |
| } |
| callback.onSuccess(donneesRetour); |
| } |
| catch (Exception e) |
| { |
| callback.onFailure(e); |
| } |
| } |
| } |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyPublicationsAPersonne.java |
|---|
| New file |
| 0,0 → 1,93 |
| package org.tela_botanica.client.composants.pagination; |
| import java.util.ArrayList; |
| import java.util.HashMap; |
| import java.util.List; |
| import org.tela_botanica.client.Mediateur; |
| import org.tela_botanica.client.RegistreId; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.Valeur; |
| import org.tela_botanica.client.modeles.ValeurListe; |
| import org.tela_botanica.client.modeles.ValeurListeAsyncDao; |
| import org.tela_botanica.client.modeles.publication.PublicationAPersonneListe; |
| import org.tela_botanica.client.synchronisation.Sequenceur; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.UtilString; |
| import com.extjs.gxt.ui.client.Registry; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadConfig; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadResult; |
| import com.extjs.gxt.ui.client.data.DataReader; |
| import com.extjs.gxt.ui.client.data.MemoryProxy; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONObject; |
| import com.google.gwt.json.client.JSONString; |
| import com.google.gwt.user.client.rpc.AsyncCallback; |
| public class ProxyPublicationsAPersonne<D> extends Proxy { |
| String personneId = null; |
| List<Valeur> rolesId = null; |
| public ProxyPublicationsAPersonne(Sequenceur sequenceur, String personneId, List<Valeur> rolesId) { |
| super(sequenceur); |
| this.personneId = personneId; |
| this.rolesId = rolesId; |
| } |
| @Override |
| public void load(TransformateurJSONaModelData reader, Object loadConfig, AsyncCallback callback, String recherche) { |
| this.reader = reader; |
| this.callback = callback; |
| this.loadConfig = loadConfig; |
| BasePagingLoadConfig lc = (BasePagingLoadConfig)loadConfig; |
| if (!UtilString.isEmpty(this.personneId)) { |
| mediateur.selectionnerPublicationsAPersonne(this, personneId, rolesId, recherche, lc.getOffset(), lc.getLimit(), sequenceur); |
| } else { |
| this.rafraichir(null); |
| } |
| } |
| public void setPersonneId(String personneId) { |
| this.personneId = personneId; |
| } |
| public void setRolesId(List<Valeur> rolesId) { |
| this.rolesId = rolesId; |
| } |
| @Override |
| @SuppressWarnings("unchecked") |
| public void rafraichir(Object nouvellesDonnees) { |
| try |
| { |
| D donneesRetour = null; |
| if (nouvellesDonnees!=null) { |
| data = nouvellesDonnees; |
| if (reader != null) |
| { |
| donneesRetour = (D) reader.read(loadConfig, data); |
| } |
| else |
| { |
| donneesRetour = (D) data; |
| if (donneesRetour instanceof List) |
| { |
| donneesRetour = (D) new ArrayList((List) donneesRetour); |
| } |
| } |
| } |
| callback.onSuccess(donneesRetour); |
| } |
| catch (Exception e) |
| { |
| callback.onFailure(e); |
| } |
| } |
| } |
| /trunk/src/org/tela_botanica/client/composants/pagination/Proxy.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/Proxy.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/pagination/ProxyCollectionACommentaire.java |
|---|
| New file |
| 0,0 → 1,78 |
| package org.tela_botanica.client.composants.pagination; |
| import java.util.ArrayList; |
| import java.util.HashMap; |
| import java.util.List; |
| import org.tela_botanica.client.Mediateur; |
| import org.tela_botanica.client.RegistreId; |
| import org.tela_botanica.client.interfaces.Rafraichissable; |
| import org.tela_botanica.client.modeles.ValeurListe; |
| import org.tela_botanica.client.modeles.ValeurListeAsyncDao; |
| import org.tela_botanica.client.synchronisation.Sequenceur; |
| import org.tela_botanica.client.util.Debug; |
| import org.tela_botanica.client.util.UtilString; |
| import com.extjs.gxt.ui.client.Registry; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadConfig; |
| import com.extjs.gxt.ui.client.data.BasePagingLoadResult; |
| import com.extjs.gxt.ui.client.data.DataReader; |
| import com.extjs.gxt.ui.client.data.MemoryProxy; |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONObject; |
| import com.google.gwt.json.client.JSONString; |
| import com.google.gwt.user.client.rpc.AsyncCallback; |
| public class ProxyCollectionACommentaire<D> extends Proxy { |
| String collectionId = null; |
| public ProxyCollectionACommentaire(Sequenceur sequenceur, String collectionId) { |
| super(sequenceur); |
| this.collectionId = collectionId; |
| } |
| @Override |
| public void load(TransformateurJSONaModelData reader, Object loadConfig, AsyncCallback callback, String recherche) { |
| this.reader = reader; |
| this.callback = callback; |
| this.loadConfig = loadConfig; |
| BasePagingLoadConfig lc = (BasePagingLoadConfig)loadConfig; |
| if (!UtilString.isEmpty(this.collectionId)) { |
| mediateur.selectionnerCollectionACommentaire(this, this.collectionId, recherche, lc.getOffset(), lc.getLimit(), sequenceur); |
| } |
| } |
| @Override |
| @SuppressWarnings("unchecked") |
| public void rafraichir(Object nouvellesDonnees) { |
| try |
| { |
| D donneesRetour = null; |
| if (nouvellesDonnees!=null) { |
| data = nouvellesDonnees; |
| if (reader != null) |
| { |
| donneesRetour = (D) reader.read(loadConfig, data); |
| } |
| else |
| { |
| donneesRetour = (D) data; |
| if (donneesRetour instanceof List) |
| { |
| donneesRetour = (D) new ArrayList((List) donneesRetour); |
| } |
| } |
| } |
| callback.onSuccess(donneesRetour); |
| } |
| catch (Exception e) |
| { |
| callback.onFailure(e); |
| } |
| } |
| } |
| /trunk/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java |
|---|
| 2,7 → 2,10 |
| import java.util.ArrayList; |
| import java.util.Date; |
| import java.util.HashMap; |
| import java.util.Iterator; |
| import java.util.List; |
| import java.util.Set; |
| import org.tela_botanica.client.modeles.ValeurListe; |
| import org.tela_botanica.client.util.Debug; |
| 31,9 → 34,13 |
| private ModelType modelType = null; |
| public TransformateurJSONaModelData(ModelType modelType) { |
| // HashMap<'nom du champ virtuel', 'nom du champ à binder'> |
| private HashMap<String, String> virtualFields = null; |
| public TransformateurJSONaModelData(ModelType modelType, HashMap<String, String> virtualFields) { |
| super(modelType); |
| this.modelType = modelType; |
| this.virtualFields = virtualFields; |
| } |
| @SuppressWarnings("unchecked") |
| 121,6 → 128,22 |
| } else if (value.isNull() != null) { |
| model.set(name, null); |
| } |
| if (virtualFields != null) { |
| Set<String> cles = virtualFields.keySet(); |
| Iterator<String> it = cles.iterator(); |
| while(it.hasNext()) { |
| String vField = it.next(); |
| // si il y a un champ à binder |
| if (virtualFields.get(vField) != null) { |
| model.set(vField, model.get(virtualFields.get(vField))); |
| } |
| // sinon affecter la propriété à 'chaîne vide' |
| else { |
| model.set(virtualFields.get(vField), ""); |
| } |
| } |
| } |
| } |
| models.add(model); |
| } |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r11-838 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1417-1511 |
| /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r11-858 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1417-1511 |