Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1571 → Rev 1572

/trunk/src/org/tela_botanica/client/vues/observation/ListeObservationVue.java
71,6 → 71,7
private ColumnConfig nomSaisiObservation;
private ColumnConfig nomRetenuObservation;
private ColumnConfig lieuObservation;
private ColumnConfig altitudeObservation;
private ColumnConfig dateObservation;
private ColumnConfig ordreObservation;
private ColumnConfig abondanceObservation;
278,10 → 279,12
}
});
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);
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);
abondanceObservation = new ColumnConfig("Abondance", "abondance", 50, true, colRend);
certitudeObservation = new ColumnConfig("Identification", "certitude", 50, true, new Renderer() {
294,7 → 297,12
});
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, dateObservation, ordreObservation};
ColumnConfig[] cm = {etatObservation, referentielTaxoObservation,
nomSaisiObservation, certitudeObservation,
nomRetenuObservation, abondanceObservation,
phenologieObservation, lieuObservation,
altitudeObservation, dateObservation,
ordreObservation};
return cm;
}
542,7 → 550,7
if(nouvelleDonnees instanceof ListeObservation)
{
ListeObservation data = (ListeObservation) nouvelleDonnees ;
Object[][] observationData = new Object[data.size()][11];
Object[][] observationData = new Object[data.size()][12];
int i = 0 ;
if(data.size() == 0)
564,9 → 572,10
observationData[i][5] = obs.getAbondance();
observationData[i][6] = obs.getPhenologie();
observationData[i][7] = Util.formaterLieu(obs, modeleLieu);
observationData[i][8] = obs.getDate();
observationData[i][9] = obs.getNumeroOrdre();
observationData[i][10] = obs.getNumeroNomenclaturalSaisi();
observationData[i][8] = formaterAltitude(obs.getAltitude());
observationData[i][9] = obs.getDate();
observationData[i][10] = obs.getNumeroOrdre();
observationData[i][11] = obs.getNumeroNomenclaturalSaisi();
i++ ;
}
647,6 → 656,14
}
}
private String formaterAltitude(String alt) {
String alfFmt = Util.formaterNombre(alt);
if(!alfFmt.isEmpty() && !Util.estZero(alfFmt)) {
alfFmt = alfFmt+" m.";
}
return alfFmt;
}
private FieldDef[] getDefinitionChamps() {
// creation du store qui les contient
FieldDef defEtatObservation = new StringFieldDef("etat_observation");
657,6 → 674,7
FieldDef defAbondanceObservation = new StringFieldDef("abondance");
FieldDef defPhenologieObservation = new StringFieldDef("phenologie");
FieldDef defLieuObservation = new StringFieldDef("lieu_observation");
FieldDef defAltObservation = new StringFieldDef("altitude_observation");
FieldDef defDateObservation = new StringFieldDef("date_observation");
FieldDef defOrdreObservation = new IntegerFieldDef("ordre_observation");
664,7 → 682,7
FieldDef defNumeroNomenclaturalSaisiObservation = new StringFieldDef("numeroNomenclaturalSaisi_observation");
 
FieldDef[] defTab = {defEtatObservation, defRefTaxObservation,defNomSaisiObservation, defCertitudeObservation, defNomRetenuObservation, defAbondanceObservation,
defPhenologieObservation, defLieuObservation, defDateObservation, defOrdreObservation, defNumeroNomenclaturalSaisiObservation };
defPhenologieObservation, defLieuObservation, defAltObservation, defDateObservation, defOrdreObservation, defNumeroNomenclaturalSaisiObservation };
return defTab;
}