Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 200 → Rev 195

/src/org/tela_botanica/del/client/vues/rechercheobservations/detailImage.css
File deleted
/src/org/tela_botanica/del/client/vues/rechercheobservations/DetailImageVue.ui.xml
File deleted
\ No newline at end of file
/src/org/tela_botanica/del/client/vues/rechercheobservations/DetailImagePresenteur.java
File deleted
/src/org/tela_botanica/del/client/vues/rechercheobservations/DetailImageVue.java
File deleted
/src/org/tela_botanica/del/client/vues/rechercheobservations/RechercheObservationsPresenteur.java
140,7 → 140,6
public void afficherObservations() {
RechercheObservationsVue vue = (RechercheObservationsVue) getVue();
 
vue.zoneObservations.clear();
for (Observation observation : observations) {
ObservationPresenteur presenteur = new ObservationPresenteur(observation);
presenteur.go(vue.zoneObservations);
/src/org/tela_botanica/del/client/vues/rechercheobservations/ObservationVue.ui.xml
4,7 → 4,7
<ui:with field="constants" type="org.tela_botanica.del.client.i18n.Vocabulary"/>
 
<ui:style src="observation.css" />
<g:HTMLPanel styleName="{style.ligneObservation}">
<g:HTMLPanel>
<g:HTMLPanel styleName="{style.description}">
<g:Label ui:field="nomRetenu" styleName="sousTitre"/>
<g:Label ui:field="famille" />
16,10 → 16,9
<g:Label ui:field="numNomenclatural" />
</g:HTMLPanel>
<g:HorizontalPanel styleName="{style.photos}">
<g:Image ui:field="photoPrincipale" styleName="{style.photoPrincipale}"/>
<g:HTMLPanel ui:field="photos"></g:HTMLPanel>
</g:HorizontalPanel>
<g:HTMLPanel styleName="{style.photos}">
<g:Image ui:field="photoPrincipale" />
</g:HTMLPanel>
<g:FlexTable styleName="{style.determination}" ui:field="tableauPropositions" />
<g:HTMLPanel styleName="nettoyage" />
/src/org/tela_botanica/del/client/vues/rechercheobservations/ObservationPresenteur.java
7,10 → 7,7
import org.tela_botanica.del.client.modeles.Observation;
import org.tela_botanica.del.client.modeles.PropositionDetermination;
 
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Image;
 
public class ObservationPresenteur extends Presenteur {
 
43,33 → 40,8
vue.nomRetenu.setText(observation.getNomRetenu());
vue.numNomenclatural.setText(observation.getNumNomenclatural());
 
List<org.tela_botanica.del.client.modeles.Image> images = observation.getImages();
vue.photoPrincipale.setUrl((observation.getImages()).get(0).getUrl());
 
org.tela_botanica.del.client.modeles.Image imagePrincipale = images.get(0);
vue.photoPrincipale.setUrl(imagePrincipale.getUrl());
vue.photoPrincipale.setTitle(imagePrincipale.getUrlFormat("L"));
vue.photoPrincipale.setAltText(observation.getAuteur() + " - " + observation.getNomRetenu());
images.remove(0);
 
int nbImagesAffichees = 0;
for (org.tela_botanica.del.client.modeles.Image imageCourante : images) {
nbImagesAffichees++;
if (nbImagesAffichees < 5) {
Image photo = new Image();
photo.setUrl(imageCourante.getUrlFormat("CRX2S"));
photo.setTitle(imageCourante.getUrlFormat("L"));
photo.setAltText(observation.getAuteur() + " - " + observation.getNomRetenu());
photo.addClickHandler(new ClickHandler() {
 
public void onClick(ClickEvent event) {
Image photo = (Image) event.getSource();
ouvrirFenetreModale(new DetailImagePresenteur(photo.getTitle(), photo.getAltText()));
}
});
vue.photos.add(photo);
}
}
 
List<PropositionDetermination> propositions = observation.getPropositionsDetermination();
 
vue.tableauPropositions.setText(0, 0, "Certitude");
81,16 → 53,11
for (PropositionDetermination proposition : propositions) {
i++;
vue.tableauPropositions.setText(i, 0, String.valueOf(proposition.getVotesDeterminations().size()));
/*
* List<VoteDetermination> votes =
* proposition.getVotesDeterminations(); for (VoteDetermination vote
* : votes) { vote.getVote(); }
*/
vue.tableauPropositions.setText(i, 1, String.valueOf(proposition.getCommentaires().size()));
vue.tableauPropositions.setText(i, 2, proposition.getEspece());
 
}
 
handleEvents();
// vue.propositions.setText(ch);
}
 
99,14 → 66,8
}
 
protected void handleEvents() {
ObservationVue vue = (ObservationVue) this.getVue();
vue.photoPrincipale.addClickHandler(new ClickHandler() {
// TODO Auto-generated method stub
 
public void onClick(ClickEvent event) {
Image photoPrincipale = (Image) event.getSource();
ouvrirFenetreModale(new DetailImagePresenteur(photoPrincipale.getTitle(), photoPrincipale.getAltText()));
}
});
}
 
}
}
/src/org/tela_botanica/del/client/vues/rechercheobservations/ObservationVue.java
7,7 → 7,6
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.Widget;
 
public class ObservationVue extends Composite {
27,9 → 26,6
@UiField
protected Image photoPrincipale;
 
@UiField
protected Panel photos;
 
public ObservationVue() {
initWidget(binder.createAndBindUi(this));
}
/src/org/tela_botanica/del/client/vues/rechercheobservations/observation.css
1,6 → 1,3
.ligneObservation {-moz-box-shadow: 5px 0px 5px #DDD; -moz-border-radius:10px; margin-bottom:10px; border:solid 1px #DDD}
.description {border:solid 1px #EEE; border-width:0 1px 0 0; width:25%; float:left;padding : 10px; margin:0 1px 5px 0; height:150px}
.photos {border:solid 1px #EEE; border-width:0 1px 0 0; width:33%; float:left; -moz-border-radius: 0px; padding : 10px; margin:0 1px 5px 0; height:170px}
.determination {width:37%; float:left; padding : 10px; margin:0 1px 5px 0; height:150px}
.photos img {float:left; padding:2px; -moz-box-shadow:2px 2px 2px #DDD; cursor:pointer}
.photoPrincipale {height:130px; width:140px; float:left; padding:5px; cursor:pointer}
.description {border:solid 1px #AAA; border-width:0 1px 1px 0; width:30%; float:left; -moz-border-radius: 10px 0 0 10px; padding : 10px; -moz-box-shadow: 5px 5px 5px #DDD; margin:0 1px 5px 0; height:200px}
.photos {border:solid 1px #AAA; border-width:0 1px 1px 0px; width:30%; float:left; -moz-border-radius: 0px; padding : 10px; -moz-box-shadow: 5px 5px 5px #DDD; margin:0 1px 5px 0; height:200px}
.determination {border:solid 1px #AAA; border-width:0 0 1px 0px ;width:30%; float:left; -moz-border-radius: 0 10px 10px 0; padding : 10px; -moz-box-shadow: 5px 5px 5px #DDD; margin:0 1px 5px 0; height:200px}