WebSVN – eFlore/Archives.cel-v1 – Diff – /trunk/src/org/tela_botanica/client/EntryPanel.java

 public class EntryPanel extends Composite   {
   private NameAssistant nameAssistant = null;
   private LocationAssistant locationAssistant = null;
   private TextBox date = new TextBox();
+  private TextBox lieudit = new TextBox();
-  private TextBox complementLocation = new TextBox();
+  private TextBox milieu = new TextBox();
   private TextBox comment = new TextBox();
+  private Button dateSelector = new Button("...");
+  private Button validButton = new Button("Ajouter");
   private Button dateSelector = new Button("...");
   boolean visible=false;
   private Mediator mediator=null;
+  public EntryPanel(final Mediator med) {
+  Grid observation = new Grid(4,4);
+  // Formatage affichage
+  for (int i=0; i<4;i++) {
+	observation.getCellFormatter().setWidth(i, 0, "3%");
+	observation.getCellFormatter().setWidth(i, 1, "47%");
-  public EntryPanel(final Mediator med) {
 	observation.getCellFormatter().setWidth(i, 2, "3%");
-	  Grid inner = new Grid(3,4);
+	observation.getCellFormatter().setWidth(i, 3, "47%");
+  }
    mediator=med;
    user=mediator.getUser();
-   mediator=med;
-   user=mediator.getUser();
+   // Declaration des elements du dialogue de saisie aupres du mediator
+   mediator.registerEntryPanel(this);
+   mediator.registerDate(date);
-   mediator.registerEntryPanel(this);
+   mediator.registerComment(comment);
+   mediator.registerMilieu(milieu);
-   mediator.registerDate(date);
+   mediator.registerLieudit(lieudit);
-   mediator.registerComment(comment);
-   mediator.registerComplementLocation(complementLocation);
+   VerticalPanel outer = new VerticalPanel();
+// Name assistant et location assistant : widget auto-completion sur nom scientifique ou commune
-   VerticalPanel outer = new VerticalPanel();
+	nameAssistant = new NameAssistant(mediator);
+	locationAssistant = new LocationAssistant(mediator);
-   outer.add(new HTML("<b>Saisir&nbsp;un&nbsp;relev&eacute;&nbsp;:</b>"));
+	 // Saisie Commune
-   for (int i=0; i<3;i++) {
-	inner.getCellFormatter().setWidth(i, 0, "3%");
-	inner.getCellFormatter().setWidth(i, 1, "47%");
-	inner.getCellFormatter().setWidth(i, 2, "3%");
+     observation.setHTML(2,0,"Commune:&nbsp;");
+     observation.setWidget(2,1,locationAssistant);
-	inner.getCellFormatter().setWidth(i, 3, "47%");
+     locationAssistant.setWidth("100%");
+	 // Saisie lieu-dit
-   }
+     observation.setHTML(2,2,"Lieu-dit:&nbsp;");
+     observation.setWidget(2,3,lieudit);
+     lieudit.setWidth("100%");
+     lieudit.addKeyboardListener( new KeyboardListener() {
-	nameAssistant = new NameAssistant(mediator);
+ 		  public void onKeyDown(Widget arg0, char arg1, int arg2) {
+ 			  if(arg1 == KEY_ENTER)
+ 			    {
+ 				 onValidateTextBox(lieudit);
+ 			    }
+ 		  }
+ 		  public void onKeyUp(Widget arg0, char arg1, int arg2) { }
+ 		  public void onKeyPress(Widget arg0, char arg1, int arg2) { }
+ 		  }
+     );
+	 // Saisie (milieu)
+     observation.setHTML(3,0,"Milieu:&nbsp;");
+     observation.setWidget(3,1,milieu);
+     milieu.setWidth("100%");
+     // Validation par entree sur cette zone de texte
+     milieu.addKeyboardListener( new KeyboardListener() {
-	locationAssistant = new LocationAssistant(mediator);
+ 		  public void onKeyDown(Widget arg0, char arg1, int arg2) {
  			  if(arg1 == KEY_ENTER)
 	        choicesPopup.setWidth(dateSelector.getOffsetWidth() + "px");
+    	   }
+       }
+     });
-     });
+ 	// Saisie Espece
+   observation.setHTML(0,0,"Esp&egrave;ce:&nbsp;");
+   observation.setWidget(0,1,nameAssistant);
+   nameAssistant.setWidth("100%");
-    inner.setHTML(2,0,"Date:&nbsp;");
+   observation.setHTML(0,2,"Date:&nbsp;");
     HorizontalPanel datePanel = new HorizontalPanel();
     datePanel.add(date);
+    datePanel.add(dateSelector);
+    observation.setWidget(0,3,datePanel);
     datePanel.add(dateSelector);
-    inner.setWidget(2,1,datePanel);
+    // Saisie date
     // Validation par entree sur cette zone de texte
     // Saisie date
-    date.addKeyboardListener( new KeyboardListener() {
-    		  public void onKeyDown(Widget arg0, char arg1, int arg2) {
-    			  if(arg1 == KEY_ENTER)
-    			    {
-    				 if (ordre==null) {
-       				     mediator.onAddInventoryItem();
-       				     date.setText("");
+    date.addKeyboardListener( new KeyboardListener() {
-       				 else {
+    		  public void onKeyDown(Widget arg0, char arg1, int arg2) {
-       				     mediator.onModifyInventoryItem(ordre);
+    			  if(arg1 == KEY_ENTER)
+    		  }
     );
-	 // Saisie Complement de lieu  (station)
-    inner.setHTML(1,2,"Station:&nbsp;");
-    inner.setWidget(1,3,complementLocation);
-    complementLocation.setWidth("100%");
-    complementLocation.addKeyboardListener( new KeyboardListener() {
-		  public void onKeyDown(Widget arg0, char arg1, int arg2) {
-			  if(arg1 == KEY_ENTER)
-			    {
-				  	if (ordre==null) {
-   				     mediator.onAddInventoryItem();
-   				     complementLocation.setText("");
-   				  	}
-   				  	else {
-   				     mediator.onModifyInventoryItem(ordre);
-   				     ordre=null;
-   				 }
-			    }
-		  }
-		  public void onKeyUp(Widget arg0, char arg1, int arg2) { }
-		  public void onKeyPress(Widget arg0, char arg1, int arg2) { }
-    );
 	 // Saisie Commentaire
+    observation.setHTML(1,0,"Notes:&nbsp;");
     observation.setWidget(1,1,comment);
     inner.setHTML(2,2,"Notes:&nbsp;");
-    inner.setWidget(2,3,comment);
+    comment.setWidth("100%");
-    comment.setWidth("100%");
-    comment.addKeyboardListener( new KeyboardListener() {
-		  public void onKeyDown(Widget arg0, char arg1, int arg2) {
-			  if(arg1 == KEY_ENTER)
-			    {
-				  	if (ordre==null) {
+    // Validation par entree sur cette zone de texte
    				     mediator.onAddInventoryItem();
-   				     comment.setText("");
+    comment.addKeyboardListener( new KeyboardListener() {
-   				  	else {
+		  public void onKeyDown(Widget arg0, char arg1, int arg2) {
-   				     mediator.onModifyInventoryItem(ordre);
+			  if(arg1 == KEY_ENTER)
-   				     ordre=null;
-   				  	}
-			    }
+			    {
+    				  onValidateTextBox(comment);
+			    }
+		  }
+		  public void onKeyUp(Widget arg0, char arg1, int arg2) { }
-		  public void onKeyUp(Widget arg0, char arg1, int arg2) { }
+		  public void onKeyPress(Widget arg0, char arg1, int arg2) { }
 		  public void onKeyPress(Widget arg0, char arg1, int arg2) { }
+		  }
   );
   );
     HorizontalPanel actionPanel= new HorizontalPanel();
     actionPanel.add(validButton);
-	inner.setWidth("100%");
+	observation.setWidth("100%");
-	outer.add(inner);
+	outer.add(observation);
 						JSONValue jsonValue = JSONParser.parse(strcomplete);
 						JSONArray jsonArray;
 						if ((jsonArray = jsonValue.isArray()) != null) {
-								String aname = ((JSONString) jsonArray.get(0)).stringValue();
 								String aname = Util.toCelString(((JSONString) jsonArray.get(0)).toString());
-								// Nom
-								if (aname.compareTo("null")!=0) {
+								// Nom
-									nameAssistant.setText(((JSONString) jsonArray.get(0)).stringValue());
 								if (aname.compareTo("null")!=0) {
-									// Numero nomenclatural
 									nameAssistant.setText(aname);
-									nameAssistant.setValue(anum);
+									// Numero nomenclatural
 									nameAssistant.setValue(anum);
   }
 	/*
-	 * Numero d'ordre du relev� affich�
+	 * Numero d'ordre du releve affiche + mise à jour bouton
+	 *
+	 */
+	public void setOrdre(String ordre) {
+		this.ordre = ordre;
+		if (ordre==null) {
+			this.validButton.setText("Ajouter");
 	 */
 		else {
-	public void setOrdre(String ordre) {
+			this.validButton.setText("Modifier");
 		this.ordre = ordre;
+	}
 	/*
+	 * Numero d'ordre du releve affiche
+	 *
+	 */
+	public String getOrdre() {
+		return this.ordre;
+	}
+    // Validation par entree sur cette zone de texte
+    private void onValidateTextBox(TextBox textbox) {
+		  	if (ordre==null) {
+			  // Numero ordre vide : ajout d'une observation
+			     mediator.onAddInventoryItem();
+			     textbox.setText("");
 	 * Numero d'ordre du relev� affich�
-	 *
+			  	else {
-	 */
+			     mediator.onModifyInventoryItem(ordre);
 			     ordre=null;
 	public String getOrdre() {
 				JSONValue jsonValue = JSONParser.parse(str);
 				JSONArray jsonArray;
 				if ((jsonArray = jsonValue.isArray()) != null) {
-				if ((jsonArray = jsonValue.isArray()) != null) {
+							// Nom saisi
-							// Nom saisi
+							nameAssistant.setText(Util.toCelString(((JSONString) jsonArray.get(0)).toString()));
 							nameAssistant.setText(((JSONString) jsonArray.get(0)).stringValue());
 							else {
 								nameAssistant.setValue(null);
+							}
 							// Commune
-							String aloc=((JSONString) jsonArray .get(6)).stringValue();
+							String aloc=Util.toCelString(((JSONString) jsonArray .get(6)).toString());
 							if (aloc.compareTo("000null")!=0) {
 								locationAssistant.setText(aloc);
 							else {
 								date.setText("");
+							}
-							String astation=((JSONString) jsonArray .get(9)).stringValue();
+							String astation=Util.toCelString(((JSONString) jsonArray .get(9)).toString());
 //							Station
 							if (astation.compareTo("000null")!=0) {
-								complementLocation.setText(astation);
+								milieu.setText(astation);
+							}
 							else {
-								complementLocation.setText("");
+								milieu.setText("");
+							}
-							String acomment=((JSONString) jsonArray .get(10)).stringValue();
+							String acomment=Util.toCelString(((JSONString) jsonArray .get(10)).toString());
+}
+/* +--Fin du code ---------------------------------------------------------------------------------------+
+* $Log$
+* Revision 1.7  2007-09-17 19:25:34  ddelon
-/* +--Fin du code ---------------------------------------------------------------------------------------+
+* Documentation
 * $Log$
 * Revision 1.6  2007-06-06 13:29:30  ddelon
 * v0.09
+*

Subversion Repositories eFlore/Archives.cel-v1

(root)/trunk/src/org/tela_botanica/client/EntryPanel.java – Rev 26 → 27