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

 /*
  * Copyright 2006 Google Inc.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  * License for the specific language governing permissions and limitations under
  * the License.
  */
 package org.tela_botanica.client;
 import java.util.Iterator;
 import java.util.Vector;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.client.HTTPRequest;
 import com.google.gwt.user.client.ResponseTextHandler;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.Grid;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.DockPanel;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.Label;
 /*
  * Le retour de getUser appelle updateCount qui appelle update pour veiller à une
  * initialisation correcte
+ *
  */
 public class InventoryItemList extends Composite implements
 		AutoCompleteAsyncTextBoxListener {
 	// Barre de navigation
 	private class NavBar extends Composite implements ClickListener {
 		public final DockPanel bar = new DockPanel();
 		public final Button gotoFirst = new Button("&lt;&lt;", this);
 		public final Button gotoNext = new Button("&gt;", this);
 		public final Button gotoPrev = new Button("&lt;", this);
 		public final Button gotoEnd = new Button("&gt;&gt;", this);
 		public final HTML status = new HTML();
 		public NavBar() {
 			initWidget(bar);
 			bar.setStyleName("navbar");
 			status.setStyleName("status");
 			HorizontalPanel buttons = new HorizontalPanel();
 			buttons.add(status);
 			buttons.setCellHorizontalAlignment(status,
 					HasHorizontalAlignment.ALIGN_RIGHT);
 			buttons.setCellVerticalAlignment(status,
 					HasVerticalAlignment.ALIGN_MIDDLE);
 			buttons.setCellWidth(status, "100%");
 			buttons.add(gotoFirst);
 			buttons.add(gotoPrev);
 			buttons.add(gotoNext);
 			buttons.add(gotoEnd);
 			bar.add(buttons, DockPanel.EAST);
 			bar.setCellHorizontalAlignment(buttons, DockPanel.ALIGN_RIGHT);
 			bar.setCellHorizontalAlignment(buttons, DockPanel.ALIGN_LEFT);
 			bar.setVerticalAlignment(DockPanel.ALIGN_MIDDLE);
 			VerticalPanel actions = new VerticalPanel();
+			HorizontalPanel actionButton = new HorizontalPanel();
+			HTML addButton = new HTML("Nouvelle&nbsp;observation");
+			addButton.setStyleName("html_button");
+		    addButton.addClickListener(
+		    		new ClickListener() {
+		    			public void onClick(Widget w) {
+		    				 openEntryPanel();
+		    			}
+		    		}
+		    );
-			HorizontalPanel actionButton = new HorizontalPanel();
+		    actionButton.add(addButton);
 			HTML delButton=new HTML("Suppression");
 			delButton.setStyleName("html_button");
 			delButton.addClickListener(
 			    	new ClickListener() {
 			    		public void onClick(Widget sender) {
 			    			mediator.getInventoryItemList().deleteElement();
+			    		}
+			     	}
 			);
 			actionButton.add(delButton);
 			HTML exportButton=new HTML("<a href=\""+mediator.getServiceBaseUrl()+"/InventoryExport/" +mediator.getUser()+"\">"+"Tout exporter</a>");
 			actionButton.add(exportButton);
 			exportButton.setStyleName("html_button");
 			actionButton.setSpacing(5);
 			actions.add(actionButton);
+			HorizontalPanel selections = new HorizontalPanel();
+			selections.setSpacing(3);
+			selections.add(new HTML("S&eacute;lection : "));
+			Label allLabel = new Label("Tous");
+			Label separatorLabel = new Label(",");
+			Label noneLabel = new Label("Aucun");
+			allLabel.setStyleName("selection_label");
+			noneLabel.setStyleName("selection_label");
+			selections.add(allLabel);
+			allLabel.addClickListener(
+				    	new ClickListener() {
+				    		public void onClick(Widget sender) {
+				    			selectAll();
+				    		}
+				     	}
+			);
+			selections.add(separatorLabel);
+			selections.add(noneLabel);
+			noneLabel.addClickListener(
+				    	new ClickListener() {
+				    		public void onClick(Widget sender) {
+				    			deselectAll();
+				    		}
+				     	}
+			);
+			actionButton.add(selections);
 			bar.add(actions, DockPanel.WEST);
+		}
+		private void openEntryPanel() {
+		             mediator.onEntryClick();
+		}
 		public void onClick(Widget sender) {
 			if (sender == gotoNext) {
 				// Move forward a page.
 				startIndex += VISIBLE_TAXON_COUNT;
 				if (startIndex >= count)
 					startIndex -= VISIBLE_TAXON_COUNT;
 			} else {
 				if (sender == gotoPrev) {
 					// Move back a page.
 					startIndex -= VISIBLE_TAXON_COUNT;
 					if (startIndex < 0)
 						startIndex = 0;
 				} else {
 					if (sender == gotoEnd) {
 						gotoEnd();
 					} else {
 						if (sender == gotoFirst) {
 							startIndex = 0;
+						}
+					}
+				}
+			}
 			update();
+		}
+	}
 	private void setStatusText(String text) {
 		navBar.status.setText(text);
+	}
 	private static final int VISIBLE_TAXON_COUNT = 15;
 	private Grid header = new Grid(1, 7);
 	private FlexTable table = new FlexTable();
 	private VerticalPanel panel = new VerticalPanel();
 	private int startIndex = 0;
 	private String serviceBaseUrl = null;
 	private int count = 65000;
 	private String user;
 	private NavBar navBar=null;
 	private Mediator mediator = null;
-	// Optimization
-	int sizeChecked=0;
-	int itemDeleted=0;
-	// Données alimentant la saisie : texte et valeur localité, texte et valeur communes
- 	private String nameText=null;
- 	private String nameValue=null;
- 	private String locationText=null;
- 	private String locationValue=null;
- 	//
+	private String location = "all";
-	private String location = "all";
+	private String date = "all";
 	public InventoryItemList(Mediator med) {
 		mediator=med;
 	    mediator.registerInventoryItemList(this);
 		user=mediator.getUser();
 	    serviceBaseUrl = mediator.getServiceBaseUrl();
 		navBar = new NavBar();
 		// Information complementaire : un tableau associe au retour de
 		// l'assistant de saisie
 		// Mise en forme du header
 		header.setCellSpacing(0);
 		header.setCellPadding(2);
 		header.setWidth("100%");
-		header.setStyleName("taxon-ListHeader");
+		header.setStyleName("inventoryItem-ListHeader");
 		header.setText(0, 0, "");
-		header.setText(0, 1, "Nom saisi");
+		header.setHTML(0, 1, "Plante observ&eacute;e");
-		header.setText(0, 2, "Nom retenu");
+		header.setHTML(0, 2, "R&eacute;f&eacute;rence retenue");
-		header.setHTML(0, 3, "Code<br>Nomenclatural");
+		header.setHTML(0, 3, "R&eacute;f&eacute;rence<br>Nomenclaturale");
-		header.setHTML(0, 4, "Code<br>Taxonomique");
+		header.setHTML(0, 4, "R&eacute;f&eacute;rence<br>Taxonomique");
 		header.setText(0, 5, "Famille");
-		header.setText(0, 6, "Localisation");
+		header.setText(0, 6, "Commune");
 		header.getCellFormatter().setWidth(0, 0, "2%");
 		header.getCellFormatter().setWidth(0, 1, "31%");
 		header.getCellFormatter().setWidth(0, 2, "31%");
 		header.getCellFormatter().setWidth(0, 3, "9%");
 		header.getCellFormatter().setWidth(0, 4, "9%");
 		header.getCellFormatter().setWidth(0, 5, "9%");
 		header.getCellFormatter().setWidth(0, 6, "9%");
 		// Mise en forme de la table.
 		table.setCellSpacing(0);
 		table.setBorderWidth(0);
 		table.setCellPadding(2);
 		table.setWidth("100%");
 		// Mise en forme barre navigation
 		navBar.setWidth("100%");
-		table.setStyleName("taxon-List");
+		table.setStyleName("inventoryItem-List");
 		panel.add(navBar);
 		panel.add(header);
 		panel.add(table);
-		HorizontalPanel selections = new HorizontalPanel();
-		selections.setSpacing(3);
-		selections.add(new HTML("S&eacute;lection : "));
-		Label allLabel = new Label("Tous");
-		Label separatorLabel = new Label(",");
-		Label noneLabel = new Label("Aucun");
-		allLabel.setStyleName("selection_label");
-		noneLabel.setStyleName("selection_label");
-		selections.add(allLabel);
-		allLabel.addClickListener(
-			    	new ClickListener() {
-			    		public void onClick(Widget sender) {
-			    			selectAll();
-			    		}
-			     	}
-		);
-		selections.add(separatorLabel);
-		selections.add(noneLabel);
-		noneLabel.addClickListener(
-			    	new ClickListener() {
-			    		public void onClick(Widget sender) {
-			    			deselectAll();
-			    		}
-			     	}
-		);
-		panel.add(selections);
-		updateCount();
+		//updateCount();
 		// update()
 		initWidget(panel);
+	}
 	/**
 	 * Action lancee par la selection d'un nom dans l'assistant de saisie. Lance
 	 * la recherche d'informations complémentaires (famille, numero
 	 * nomenclaturaux etc) et met a jour l'inventaire (addelement())
+	 *
 	 * @return void
 	 */
 	public void onValidate(SourcesAutoCompleteAsyncTextBoxEvents sender,
 			  String str, String value) {
-	// Le nom de plante est requis
-	 if (mediator.getNameAssistant().getText().compareTo("")==0) {
+	mediator.onAddInventoryItem();
-		 return;
+	}
-	 }
-		nameText=(mediator.getNameAssistant()).getText();
-		nameValue=(mediator.getNameAssistant()).getValue();
+	public void addelement() {
-		locationText=(mediator.getLocationAssistant()).getText();
-		locationValue=(mediator.getLocationAssistant()).getValue();
+	if (mediator.inventoryItemIsValid()) {
-		 // Suppresion indication departementale (on pourrait faire mieux !!)
-		 int pos=locationText.indexOf(" (" );
-		 if (pos>=0) {
-			 locationText=locationText.substring(0,pos);
-		 }
+		final InventoryItem inventoryItem=mediator.getInventoryItem();
-				setStatusDisabled();
+		setStatusDisabled();
 				// On met a jour rapidement l'affichage puis on lance la requete  ....
 		/*		int row = table.insertRow(table.getRowCount());
 				// Case a cocher
 				table.setWidget(row, 0, new CheckBox());
 				// Nom saisi
 				table.setText(row, 1, nameText);
 				table.getFlexCellFormatter().setWidth(row, 0, "2%");
 				table.getFlexCellFormatter()
 						.setWidth(row, 1, "31%");*/
 				// Recherche complement d'information
-				if (nameValue !=null) {
+				if (inventoryItem.getNomenclaturalNumber() !=null) {
-					HTTPRequest.asyncGet(serviceBaseUrl + "/NameValid/" + nameValue,
+					HTTPRequest.asyncGet(serviceBaseUrl + "/NameValid/" + inventoryItem.getNomenclaturalNumber(),
 							new ResponseTextHandler() {
 								public void onCompletion(String strcomplete) {
 									JSONValue jsonValue = JSONParser.parse(strcomplete);
 									JSONArray jsonArray;
 									if ((jsonArray = jsonValue.isArray()) != null) {
 										// Nom retenu, Num Nomen nom retenu, Num Taxon,
 										// Famille
-										addElement(nameText, nameValue,
+										addElement(inventoryItem.getName(), inventoryItem.getNomenclaturalNumber(),
 												((JSONString) jsonArray.get(0))
 														.stringValue(),
 												((JSONString) jsonArray.get(1))
 														.stringValue(),
 												((JSONString) jsonArray.get(2))
 														.stringValue(),
 												((JSONString) jsonArray.get(3))
 														.stringValue(),
-														locationText,locationValue);
+														inventoryItem.getLocation(),inventoryItem.getLocation_id(),inventoryItem.getDate(),inventoryItem.getComplementlocation(),inventoryItem.getComment());
+									}
+								}
 							});
+				}
 				// Saisie libre
 				else {
-					addElement(nameText, " ", " ", " ", " ", " ",locationText,locationValue);
+					addElement(inventoryItem.getName(), " ", " ", " ", " ", " ",inventoryItem.getLocation(),inventoryItem.getLocation_id(),inventoryItem.getDate(),inventoryItem.getComplementlocation(),inventoryItem.getComment());
+				}
+		}
+	else {
+		return;
+	}
+	}
 	/**
 	 * Ajoute un element à l'inventaire
+	 *
 	 * @param nom_sel :
 	 *            nom selectionne
 	 * @param num_nom_sel :
 	 *            numero nomenclatural nom selectionne
 	 * @param nom_ret :
 	 *            nom retenu
 	 * @param num_nom_ret :
 	 *            numero nomenclaturel nom retenu
 	 * @param num_taxon :
 	 *            numero taxonomique
 	 * @param famille :
 	 *            famille
 	 */
-	public void addElement(String nom_sel, String num_nom_sel, String nom_ret,
+	private void addElement(String nom_sel, String num_nom_sel, String nom_ret,
-			String num_nom_ret, String num_taxon, String famille,final String loc, String id_location) {
+			String num_nom_ret, String num_taxon, String famille,final String loc, String id_location,String dat, String complementLocation, String comment) {
 		// Calcul du nouveau numéro d'ordre
 		count++;
 		HTTPRequest.asyncPost(serviceBaseUrl + "/Inventory/", "identifiant="
 				+ user + "&nom_sel=" + nom_sel + "&num_nom_sel=" + num_nom_sel
 				+ "&nom_ret=" + nom_ret + "&num_nom_ret=" + num_nom_ret
-				+ "&num_taxon=" + num_taxon + "&famille=" + famille + "&location=" + loc + "&id_location=" + id_location,
+				+ "&num_taxon=" + num_taxon + "&famille=" + famille + "&location=" + loc + "&id_location=" + id_location + "&date_observation=" + dat
+				+ "&station="+ complementLocation + "&commentaire="+ comment,
 		new ResponseTextHandler() {
 			public void onCompletion(String str) {
 					location=loc;
+					if (location.compareTo("")==0) {
+						location="000null";
+					}
 					updateCount();
+			}
 		});
+	}
 	/**
 	 * Suppression d'un element lde l'inventaire, a partir de son numero d'ordre
+	 *
 	 */
 	public void deleteElement() {
 		setStatusDisabled();
 		boolean checked = false;
 		Vector parseChecked = new Vector();
 		// TODO : optimiser
 		// Lifo ...
+		for (int i = table.getRowCount() - 1; i >= 0; i--) {
-		for (int i = table.getRowCount() - 1; i >= 0; i--) {
+			 if (table.getWidget(i, 0)!=null) {
-			if (((CheckBox) table.getWidget(i, 0)).isChecked()) {
+				 if (((CheckBox) table.getWidget(i, 0)).isChecked()) {
-				checked = true;
+					 checked = true;
-				// Numero ordre
+					 // Numero ordre
-				parseChecked.add(table.getText(i, 7));
+					 parseChecked.add(table.getText(i, 7));
+					 count--;
-				count--;
+				 }
+			 }
 		}
-		sizeChecked=parseChecked.size();
-		itemDeleted=0;
+		StringBuffer ids=new StringBuffer();
 		for (Iterator it = parseChecked.iterator(); it.hasNext();) {
+			ids.append((String)it.next());
+			if (it.hasNext()) ids.append(",");
-			itemDeleted++;
+		}
-			HTTPRequest.asyncPost(serviceBaseUrl + "/Inventory/" + user
+		HTTPRequest.asyncPost(serviceBaseUrl + "/Inventory/" + user
-						+ "/" + (String) it.next(), "action=DELETE",
+						+ "/" + ids.toString(), "action=DELETE",
 						new ResponseTextHandler() {
 							public void onCompletion(String str) {
-								// Optimisation : on ne lance la suppression qu'a la fin
-								    if (itemDeleted==sizeChecked) {
 										updateCount();
-								    }
+							}
 						});
 		if (!checked) {
 			setStatusEnabled();
+		}
+	}
 	/**
 	 * Selection de l'ensemble des elements affichés
+	 *
 	 */
 	public void selectAll() {
 		// TODO : optimiser ...
+		for (int i = table.getRowCount() - 1; i >= 0; i--) {
-		for (int i = table.getRowCount() - 1; i >= 0; i--) {
+			 if (table.getWidget(i, 0)!=null)
 			 ((CheckBox) table.getWidget(i, 0)).setChecked(true);
+		}
+	}
 	public void deselectAll() {
 		// TODO : optimiser ...
+		for (int i = table.getRowCount() - 1; i >= 0; i--) {
-		for (int i = table.getRowCount() - 1; i >= 0; i--) {
+			 if (table.getWidget(i, 0)!=null)
 			((CheckBox) table.getWidget(i, 0)).setChecked(false);
+		}
+	}
 	/**
 	 * Recherche nombre d'enregistrement pour l'utilisateur et la localite en cours
+	 *
 	 */
 	public void updateCount() {
 		setStatusDisabled();
+		String adate="all";
+		if (date.compareTo("all")!=0) {
+			adate=date.substring(6,10)+"-"+date.substring(3,5)+"-"+date.substring(0,2)+" 00:00:00";
+		}
-		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location,
+		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location + "/" + adate ,
 				new ResponseTextHandler() {
 					public void onCompletion(String str) {
 						JSONValue jsonValue = JSONParser.parse(str);
 						JSONNumber jsonNumber;
 						if ((jsonNumber = jsonValue.isNumber()) != null) {
 							count = (int) jsonNumber.getValue();
 							/*
 							if (count==0) {
 								location="all";
+							}
 							*/
 							if (location.compareTo("")==0)
 								location="000null";
 							mediator.onInventoryItemUpdate(location);
 							gotoEnd(); // Derniere page
 							update();
+						}
+					}
 				});
+	}
 	/**
 	 * Mise a jour de l'affichage, à partir des données d'inventaire deja
 	 * saisies. La valeur de this.startIndex permet de determiner quelles
 	 * données seront affichées
+	 *
 	 *  @param deep : force une mise a jour totale
 	 */
 	public void update() {
 		setStatusDisabled();
+		String adate="all";
+		if (date.compareTo("all")!=0) {
+			adate=date.substring(6,10)+"-"+date.substring(3,5)+"-"+date.substring(0,2)+" 00:00:00";
+		}
-		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location +"/"
+		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location +"/" + adate + "/"+
 				+ startIndex + "/" + VISIBLE_TAXON_COUNT,
 		new ResponseTextHandler() {
 			public void onCompletion(String str) {
 				JSONValue jsonValue = JSONParser.parse(str);
 				JSONArray jsonArray;
 				JSONArray jsonArrayNested;
 				int row=0;
 				int i=0;
 				if ((jsonArray = jsonValue.isArray()) != null) {
 					int arraySize = jsonArray.size();
 					for (i = 0; i < arraySize; ++i) {
 						if ((jsonArrayNested = jsonArray.get(i).isArray()) != null) {
 							if (i>=table.getRowCount()) {
 								 row = table.insertRow(table.getRowCount());
+							}
 							else {
 								row = i;
+							}
 							// Case a cocher
 							table.setWidget(row, 0, new CheckBox());
 							// Nom saisi
 							table.setText(row, 1, ((JSONString) jsonArrayNested
 									.get(0)).stringValue());
 							// Nom retenu
+							String aname=((JSONString) jsonArrayNested .get(2)).stringValue();
+							if (aname.compareTo("null")==0) {
-							table.setText(row, 2, ((JSONString) jsonArrayNested
+								table.setText(row, 2, "");
+							}
+							else {
-									.get(2)).stringValue());
+								table.setText(row, 2, aname);
+							}
 							// Num nomenclatural
+							String ann=((JSONString) jsonArrayNested .get(3)).stringValue();
+							if (ann.compareTo("0")==0) {
-							table.setText(row, 3, ((JSONString) jsonArrayNested
+								table.setText(row, 3, "");
+							}
+							else {
-									.get(1)).stringValue());
+								table.setText(row, 3, ann);
+							}
 							// Num Taxonomique
+							String ant=((JSONString) jsonArrayNested .get(4)).stringValue();
+							if (ant.compareTo("0")==0) {
-							table.setText(row, 4, ((JSONString) jsonArrayNested
+								table.setText(row, 4, "");
+							}
+							else {
-									.get(4)).stringValue());
+								table.setText(row, 4, ann);
+							}
 							// Famille
+							String afamily=((JSONString) jsonArrayNested .get(5)).stringValue();
+							if (afamily.compareTo("null")==0) {
-							table.setText(row, 5, ((JSONString) jsonArrayNested
+								table.setText(row, 5, "");
+							}
+							else {
-									.get(5)).stringValue());
+								table.setText(row, 5, afamily);
+							}
 							table.getFlexCellFormatter().setWidth(row, 0, "2%");
 							table.getFlexCellFormatter()
 									.setWidth(row, 1, "31%");
 							table.getFlexCellFormatter()
 									.setWidth(row, 2, "31%");
-							table.getFlexCellFormatter().setWidth(row, 3, "9%");
-							table.getFlexCellFormatter().setWidth(row, 4, "9%");
-							table.getFlexCellFormatter().setWidth(row, 5, "9%");
 						// TODO : Bool ici non ?
+							// Affichage contenu commune si tout demandé.
+							String aloc=((JSONString) jsonArrayNested .get(6)).stringValue();
 							if (location.compareTo("all")==0) {
 //								Localisation - Lieu
-								String aloc=((JSONString) jsonArrayNested .get(6)).stringValue();
-								if (aloc.compareTo("000null")==00) {
+								if (aloc.compareTo("000null")==0) {
 									table.setText(row, 6, "Inconnu");
+								}
 								else {
-									table.setText(row, 6, ((JSONString) jsonArrayNested .get(6)).stringValue());
+									table.setText(row, 6, aloc );
+								}
+								header.getCellFormatter().setVisible(0, 6,true);
+								table.getFlexCellFormatter().setWidth(row, 1, "31%");
+								table.getFlexCellFormatter().setWidth(row, 2, "31%");
+								table.getFlexCellFormatter().setWidth(row, 3, "9%");
+								table.getFlexCellFormatter().setWidth(row, 4, "9%");
+								table.getFlexCellFormatter().setWidth(row, 5, "9%");
-								header.getCellFormatter().setVisible(0, 6,true);
+								table.getFlexCellFormatter().setWidth(row, 6, "9%");
+							}
 							else {
 								header.getCellFormatter().setVisible(0, 6,false);
 								table.getCellFormatter().setVisible(row, 6,false);
+								table.getFlexCellFormatter().setWidth(row, 1, "36%");
+								table.getFlexCellFormatter().setWidth(row, 2, "36%");
+								table.getFlexCellFormatter().setWidth(row, 3, "9%");
+								table.getFlexCellFormatter().setWidth(row, 4, "9%");
+								table.getFlexCellFormatter().setWidth(row, 5, "8%");
+							}
-							table.getFlexCellFormatter().setWidth(row, 6, "9%");
 							// Numero d'ordre (caché)
 							table.setText(row, 7, ((JSONString) jsonArrayNested
 									.get(7)).stringValue());
 							table.getCellFormatter().setVisible(row, 7, false);
+						}
+					}
+				}
 				// Suppression fin ancien affichage
 				if (i<table.getRowCount()-1) {
 					 for (int j = table.getRowCount() - 1; j > i-1; j--) {
 						 table.removeRow(j);
+					 }
+				}
 				setStatusEnabled();
+			}
 		});
+	}
 	/**
 	 * Affichage message d'attente et désactivation navigation
+	 *
 	 * @param
 	 * @return void
 	 */
 	private void setStatusDisabled() {
 		navBar.gotoFirst.setEnabled(false);
 		navBar.gotoPrev.setEnabled(false);
 		navBar.gotoNext.setEnabled(false);
 		navBar.gotoEnd.setEnabled(false);
 		setStatusText("Patientez ...");
+	}
 	/**
 	 * Affichage numero de page et gestion de la navigation
+	 *
 	 */
 	private void setStatusEnabled() {
 		// Il y a forcemment un disabled avant d'arriver ici
 		if (count > 0) {
 			if (startIndex >= VISIBLE_TAXON_COUNT) { // Au dela de la
 														// premiere page
 				navBar.gotoPrev.setEnabled(true);
 				navBar.gotoFirst.setEnabled(true);
 				if (startIndex < (count - VISIBLE_TAXON_COUNT)) { // Pas la
 																	// derniere
 																	// page
 					navBar.gotoNext.setEnabled(true);
 					navBar.gotoEnd.setEnabled(true);
 					setStatusText((startIndex + 1) + " - "
 							+ (startIndex + VISIBLE_TAXON_COUNT) + " sur " + count );
 				} else { // Derniere page
 					setStatusText((startIndex + 1) + " - " + count + " sur " + count );
+				}
 			} else { // Premiere page
 				if (count > VISIBLE_TAXON_COUNT) { // Des pages derrieres
 					navBar.gotoNext.setEnabled(true);
 					navBar.gotoEnd.setEnabled(true);
 					setStatusText((startIndex + 1) + " - "
 							+ (startIndex + VISIBLE_TAXON_COUNT) + " sur " + count);
 				} else {
 					setStatusText((startIndex + 1) + " - " + count + " sur " + count);
+				}
+			}
+		}
 		else { // Pas d'inventaire, pas de navigation
 			setStatusText("0 - 0 sur 0");
+		}
+	}
 	/*
 	 * Positionnement index de parcours (this.startIndex) pour affichage de la
 	 * dernière page
+	 *
 	 * @param
 	 * @return void
 	 */
 	private void gotoEnd() {
 		if ((count == 0) || (count % VISIBLE_TAXON_COUNT) > 0) {
 			startIndex = count - (count % VISIBLE_TAXON_COUNT);
 		} else {
 			startIndex = count - VISIBLE_TAXON_COUNT;
+		}
+	}
 	/*
 	 * Localite en cours
+	 *
 	 */
 	public void setLocation(String location) {
 		this.location = location;
+	}
+	public void setDate(String date) {
+		this.date = date;
+	}
+}

Subversion Repositories eFlore/Archives.cel-v1

(root)/trunk/src/org/tela_botanica/client/InventoryItemList.java – Rev 11 → 12