88,6 → 88,11 |
*/ |
private ColumnConfig ordreObservation; |
/** |
* Config de colonne |
*/ |
private ColumnConfig abondanceObservation; |
|
/** |
* Modele de colonnes |
*/ |
private ColumnModel modeleColonnes; |
158,7 → 163,7 |
bt = new BarrePaginationVue(this); |
bt.setLabelElement("Observations"); |
bt.setTaillePageParDefaut(20); |
bt.setIntervallesPages(new String[] {"400","200", "100" , "50" , "20", "10"}) ; |
bt.setIntervallesPages(new String[] {"1000","400","200","100","50","20","10"}) ; |
|
Toolbar barreActions = new Toolbar(); |
ToolbarButton publier = new ToolbarButton("Rendre publiques"); |
280,13 → 285,14 |
nomSaisiObservation = new ColumnConfig("Nom saisi", "nomSaisi_observation", 200, true, colRend); |
nomRetenuObservation = new ColumnConfig("Nom retenu", "nomRetenu_observation", 200, true, colRend); |
lieuObservation = new ColumnConfig("Lieu", "lieu_observation", 200, true, colRend); |
dateObservation = new ColumnConfig("Date", "date_observation", 120, true, dateRend); |
dateObservation = new ColumnConfig("Date", "date_observation", 70, true, dateRend); |
abondanceObservation = new ColumnConfig("Abondance", "abondance", 50, true, colRend); |
ordreObservation = new ColumnConfig("Ordre", "ordre_observation", 50, true, colRend); |
|
|
// on associe le modèle de colonnes |
|
ColumnConfig[] cm = {etatObservation, nomSaisiObservation, nomRetenuObservation, lieuObservation, dateObservation, ordreObservation}; |
ColumnConfig[] cm = {etatObservation, nomSaisiObservation, nomRetenuObservation, abondanceObservation, lieuObservation, dateObservation, ordreObservation}; |
|
modeleColonnes = new ColumnModel(cm); |
|
300,6 → 306,7 |
FieldDef defEtatObservation = new StringFieldDef("etat_observation"); |
FieldDef defNomSaisiObservation = new StringFieldDef("nomSaisi_observation"); |
FieldDef defNomRetenuObservation = new StringFieldDef("nomRetenu_observation"); |
FieldDef defAbondanceObservation = new IntegerFieldDef("abondance"); |
FieldDef defLieuObservation = new StringFieldDef("lieu_observation"); |
FieldDef defDateObservation = new StringFieldDef("date_observation"); |
FieldDef defOrdreObservation = new IntegerFieldDef("ordre_observation"); |
306,7 → 313,7 |
|
|
FieldDef[] defTab = { defEtatObservation, defNomSaisiObservation, defNomRetenuObservation, |
defLieuObservation, defDateObservation, defOrdreObservation }; |
defAbondanceObservation, defLieuObservation, defDateObservation, defOrdreObservation }; |
|
RecordDef rd = new RecordDef(defTab); |
st = new Store(rd); |
581,7 → 588,7 |
{ |
|
ListeObservation data = (ListeObservation) nouvelleDonnees ; |
Object[][] observationData = new Object[data.size()][7]; |
Object[][] observationData = new Object[data.size()][8]; |
int i = 0 ; |
|
if(data.size() == 0) |
598,11 → 605,11 |
observationData[i][0] = obs.getTransmis(); |
observationData[i][1] = obs.getNomSaisi(); |
observationData[i][2] = obs.getNomRetenu(); |
|
observationData[i][3] = Util.formaterLieu(obs, modeleLieu); |
observationData[i][4] = obs.getDate(); |
observationData[i][5] = obs.getNumeroOrdre(); |
observationData[i][6] = obs.getNumeroNomenclaturalSaisi(); |
observationData[i][3] = obs.getAbondance(); |
observationData[i][4] = Util.formaterLieu(obs, modeleLieu); |
observationData[i][5] = obs.getDate(); |
observationData[i][6] = obs.getNumeroOrdre(); |
observationData[i][7] = obs.getNumeroNomenclaturalSaisi(); |
|
i++ ; |
} |
611,6 → 618,7 |
FieldDef defEtatObservation = new StringFieldDef("etat_observation"); |
FieldDef defNomSaisiObservation = new StringFieldDef("nomSaisi_observation"); |
FieldDef defNomRetenuObservation = new StringFieldDef("nomRetenu_observation"); |
FieldDef defAbondanceObservation = new StringFieldDef("abondance"); |
FieldDef defLieuObservation = new StringFieldDef("lieu_observation"); |
FieldDef defDateObservation = new StringFieldDef("date_observation"); |
FieldDef defOrdreObservation = new IntegerFieldDef("ordre_observation"); |
621,7 → 629,7 |
|
// on associe le store |
|
FieldDef[] defTab = { defEtatObservation, defNomSaisiObservation, defNomRetenuObservation, |
FieldDef[] defTab = { defEtatObservation, defNomSaisiObservation, defNomRetenuObservation, defAbondanceObservation, |
defLieuObservation, defDateObservation, defOrdreObservation, defNumeroNomenclaturalSaisiObservation }; |
|
RecordDef rd = new RecordDef(defTab); |
935,6 → 943,7 |
FieldDef defEtatObservation = new StringFieldDef("etat_observation"); |
FieldDef defNomSaisiObservation = new StringFieldDef("nomSaisi_observation"); |
FieldDef defNomRetenuObservation = new StringFieldDef("nomRetenu_observation"); |
FieldDef defAbondanceObservation = new IntegerFieldDef("abondance"); |
FieldDef defLieuObservation = new StringFieldDef("lieu_observation"); |
FieldDef defDateObservation = new StringFieldDef("date_observation"); |
FieldDef defOrdreObservation = new IntegerFieldDef("ordre_observation"); |
943,7 → 952,7 |
FieldDef defNumeroNomenclaturalSaisiObservation = new StringFieldDef("numeroNomenclaturalSaisi_observation"); |
|
FieldDef[] defTab = { defEtatObservation, defNomSaisiObservation, defNomRetenuObservation, |
defLieuObservation, defDateObservation, defOrdreObservation }; |
defAbondanceObservation, defLieuObservation, defDateObservation, defOrdreObservation }; |
|
RecordDef rd = new RecordDef(defTab); |
st = new Store(rd); |