73,6 → 73,7 |
private ColumnConfig referentielTaxoObservation; |
private ColumnConfig nomSaisiObservation; |
private ColumnConfig nomRetenuObservation; |
private ColumnConfig familleObservation; |
private ColumnConfig lieuObservation; |
private ColumnConfig altitudeObservation; |
private ColumnConfig dateObservation; |
290,6 → 291,7 |
referentielTaxoObservation = new ColumnConfig("Référentiel", "referentiel_taxo_observation", 15, true, colRend); |
nomSaisiObservation = new ColumnConfig("Nom saisi", "nomSaisi_observation", 130, true, colRend); |
nomRetenuObservation = new ColumnConfig("Nom retenu", "nomRetenu_observation", 130, true, colRend); |
familleObservation = new ColumnConfig("Famille", "famille_observation", 50, true, colRend); |
lieuObservation = new ColumnConfig("Lieu", "lieu_observation", 130, true, colRend); |
altitudeObservation = new ColumnConfig("Alt", "altitude_observation", 10, true, colRend); |
dateObservation = new ColumnConfig("Date", "date_observation", 70, true, dateRend); |
305,11 → 307,11 |
phenologieObservation = new ColumnConfig("Phénologie", "phenologie", 40, true, colRend); |
ordreObservation = new ColumnConfig("Ordre", "ordre_observation", 70, true, colRend); |
ColumnConfig[] cm = {etatObservation, referentielTaxoObservation, |
nomSaisiObservation, certitudeObservation, |
nomRetenuObservation, abondanceObservation, |
phenologieObservation, lieuObservation, |
altitudeObservation, dateObservation, |
ordreObservation}; |
nomSaisiObservation, certitudeObservation, |
nomRetenuObservation, familleObservation, |
abondanceObservation, phenologieObservation, |
lieuObservation, altitudeObservation, |
dateObservation, ordreObservation}; |
|
return cm; |
} |
557,7 → 559,7 |
if(nouvelleDonnees instanceof ListeObservation) |
{ |
ListeObservation data = (ListeObservation) nouvelleDonnees ; |
Object[][] observationData = new Object[data.size()][12]; |
Object[][] observationData = new Object[data.size()][13]; |
int i = 0 ; |
|
if(data.size() == 0) |
576,13 → 578,14 |
observationData[i][2] = obs.getNomSaisi(); |
observationData[i][3] = obs.getCertitude(); |
observationData[i][4] = obs.getNomRetenu(); |
observationData[i][5] = obs.getAbondance(); |
observationData[i][6] = obs.getPhenologie(); |
observationData[i][7] = Util.formaterLieu(obs, modeleLieu); |
observationData[i][8] = formaterAltitude(obs.getAltitude()); |
observationData[i][9] = obs.getDate(); |
observationData[i][10] = obs.getNumeroOrdre(); |
observationData[i][11] = obs.getNumeroNomenclaturalSaisi(); |
observationData[i][5] = obs.getFamille(); |
observationData[i][6] = obs.getAbondance(); |
observationData[i][7] = obs.getPhenologie(); |
observationData[i][8] = Util.formaterLieu(obs, modeleLieu); |
observationData[i][9] = formaterAltitude(obs.getAltitude()); |
observationData[i][10] = obs.getDate(); |
observationData[i][11] = obs.getNumeroOrdre(); |
observationData[i][12] = obs.getNumeroNomenclaturalSaisi(); |
|
i++ ; |
} |
681,6 → 684,7 |
FieldDef defNomSaisiObservation = new StringFieldDef("nomSaisi_observation"); |
FieldDef defCertitudeObservation = new StringFieldDef("certitude"); |
FieldDef defNomRetenuObservation = new StringFieldDef("nomRetenu_observation"); |
FieldDef defFamilleObservation = new StringFieldDef("famille_observation"); |
FieldDef defAbondanceObservation = new StringFieldDef("abondance"); |
FieldDef defPhenologieObservation = new StringFieldDef("phenologie"); |
FieldDef defLieuObservation = new StringFieldDef("lieu_observation"); |
691,7 → 695,7 |
// Non affiches : |
FieldDef defNumeroNomenclaturalSaisiObservation = new StringFieldDef("numeroNomenclaturalSaisi_observation"); |
|
FieldDef[] defTab = {defEtatObservation, defRefTaxObservation,defNomSaisiObservation, defCertitudeObservation, defNomRetenuObservation, defAbondanceObservation, |
FieldDef[] defTab = {defEtatObservation, defRefTaxObservation,defNomSaisiObservation, defCertitudeObservation, defNomRetenuObservation, defFamilleObservation, defAbondanceObservation, |
defPhenologieObservation, defLieuObservation, defAltObservation, defDateObservation, defOrdreObservation, defNumeroNomenclaturalSaisiObservation }; |
|
return defTab; |