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

 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.SourcesTableEvents;
+import com.google.gwt.user.client.ui.TableListener;
 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
 			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();
-		    			}
-		    		}
-		    );
-		    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);
 			bar.setVerticalAlignment(DockPanel.ALIGN_MIDDLE);
-		}
-		private void openEntryPanel() {
 		             mediator.onEntryClick();
+		}
 		navBar.status.setText(text);
+	}
 	private static final int VISIBLE_TAXON_COUNT = 15;
-	private Grid header = new Grid(1, 7);
+	private Grid header = new Grid(1, 3);
 	private NavBar navBar=null;
+	private Mediator mediator = null;
-	private Mediator mediator = null;
+	private int  selectedRow = -1;
+	private String location = "all";
+	private String date = "all";
 	private String search = "all";
 	private String location = "all";
 		header.setCellPadding(2);
 		header.setWidth("100%");
 		header.setStyleName("inventoryItem-ListHeader");
-		header.setText(0, 0, "");
-		header.setHTML(0, 1, "Plante observ&eacute;e");
-		header.setHTML(0, 2, "R&eacute;f&eacute;rence retenue");
-		header.setHTML(0, 3, "R&eacute;f&eacute;rence<br>Nomenclaturale");
-		header.setHTML(0, 4, "R&eacute;f&eacute;rence<br>Taxonomique");
-		header.setText(0, 5, "Famille");
-		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%");
+		header.setWidget(0, 2, navBar);
 		// Mise en forme de la table.
+		table.setCellSpacing(0);
-		table.setCellSpacing(0);
+		table.setBorderWidth(0);
-		table.setBorderWidth(0);
+		table.setCellPadding(2);
-		table.setCellPadding(2);
+		table.setWidth("100%");
-		table.setWidth("100%");
 		// Mise en forme barre navigation
+		navBar.setWidth("100%");
+		table.setStyleName("inventoryItem-List");
+		//panel.add(navBar);
+		panel.add(header);
+		panel.add(table);
+		 // Hook up events.
+	    table.addTableListener(new TableListener () {
+			  public void onCellClicked(SourcesTableEvents sender, int row, int cell) {
+				  if (table.getWidget(row, 0)!=null) {
-		navBar.setWidth("100%");
+				      selectRow(row);
 				      // Numero d'ordre
-		table.setStyleName("inventoryItem-List");
+				      mediator.onInventoryItemSelected(table.getText(row, 4));
+				  }
-		panel.add(navBar);
+			  }
+	    });
+		//updateCount();
+		// update()
+		initWidget(panel);
+	}
+	  private void selectRow(int row) {
+		    styleRow(selectedRow, false);
+		    styleRow(row, true);
+		    selectedRow = row;
 		panel.add(header);
 		panel.add(table);
 	mediator.onAddInventoryItem();
+	}
+	// Action sur modification d'un element
+	public void updateElement() {
+	if (mediator.inventoryItemIsValid()) {
+		final InventoryItem inventoryItem=mediator.getInventoryItem();
+		setStatusDisabled();
+				if (inventoryItem.getNomenclaturalNumber() !=null) {
+					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
+										updateElement(inventoryItem.getOrdre(),inventoryItem.getName(), inventoryItem.getNomenclaturalNumber(),
+												((JSONString) jsonArray.get(0))
+														.stringValue(),
+												((JSONString) jsonArray.get(1))
+														.stringValue(),
+												((JSONString) jsonArray.get(2))
+														.stringValue(),
+												((JSONString) jsonArray.get(3))
+														.stringValue(),
+														inventoryItem.getLocation(),inventoryItem.getLocation_id(),inventoryItem.getDate(),inventoryItem.getComplementlocation(),inventoryItem.getComment());
+									}
+								}
+							});
+				}
+				// Saisie libre
+				else {
+					updateElement(inventoryItem.getOrdre(),inventoryItem.getName(), " ", " ", " ", " ", " ",inventoryItem.getLocation(),inventoryItem.getLocation_id(),inventoryItem.getDate(),inventoryItem.getComplementlocation(),inventoryItem.getComment());
+				}
+		}
+	else {
+		return;
+	}
+	}
 	// Action sur ajout d'un element
 	 */
 	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 dat, String complementLocation, String comment) {
 			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++;
 			public void onCompletion(String str) {
 					location=loc;
 					if (location.compareTo("")==0) {
 						location="000null";
+					}
+					add=true;
 					updateCount();
+			}
 		});
+	}
+	/**
+	 * Modifie un element de l'inventaire
+	 *
+	 * @param ordre : numero d'ordre
+	 * @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
+	 */
+	private void updateElement(String ordre, 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 dat, String complementLocation, String comment) {
+		HTTPRequest.asyncPost(serviceBaseUrl + "/Inventory/" +ordre + "/", "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 + "&date_observation=" + dat
+				+ "&station="+ complementLocation + "&commentaire="+ comment,
+		new ResponseTextHandler() {
+			public void onCompletion(String str) {
+				add=false;
+				update();
+			}
+		});
+	}
 	/**
 	 * Suppression d'un element lde l'inventaire, a partir de son numero d'ordre
+	 *
 		for (int i = table.getRowCount() - 1; i >= 0; i--) {
 			 if (table.getWidget(i, 0)!=null) {
 				 if (((CheckBox) table.getWidget(i, 0)).isChecked()) {
 					 checked = true;
 					 // Numero ordre
-					 parseChecked.add(table.getText(i, 7));
+					 parseChecked.add(table.getText(i, 4));
 					 count--;
+				 }
+			 }
+		}
 		StringBuffer ids=new StringBuffer();
 	/**
 	 * Recherche nombre d'enregistrement pour l'utilisateur et la localite en cours
+	 *
 	 */
-	public void updateCount() {
+	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";
+		}
+						}
+					}
 				});
+	}
+	private String subLeft(String text, int length) {
+		return (text.length() < length) ? text : text.substring(0, length)+ " ...";
+	}
 	/**
 	 * Mise a jour de l'affichage, à partir des données d'inventaire deja
 	 *  @param deep : force une mise a jour totale
 	 */
+	public void update() {
 	public void update() {
 //		table.setBorderWidth(1);
 		setStatusDisabled();
 		String adate="all";
+		if (date.compareTo("all")!=0) {
-		if (date.compareTo("all")!=0) {
+			adate=date.substring(6,10)+"-"+date.substring(3,5)+"-"+date.substring(0,2)+" 00:00:00";
+		}
+		String com;
+		if (location.compareTo("all")==0) {
+			com="Toutes communes";
+		}
+		else {
+			if (location.compareTo("000null")==0) {
+				com="Communes non pr&eacute;cis&eacute;es";
+			}
+			else {
+			com="Commune de "+location;
+			}
+		}
+		String dat;
+		if (date.compareTo("all")==0) {
+			dat=", toute p&eacute;riode";
+		}
+		else {
+			if (date.compareTo("00/00/0000")==0) {
+				dat=", p&eacute;riode non pr&eacute;cis&eacute;";
+			}
+			else {
+				dat=", le "+ date;
+			}
+		}
-			adate=date.substring(6,10)+"-"+date.substring(3,5)+"-"+date.substring(0,2)+" 00:00:00";
 		header.setHTML(0, 0, com +  dat );
-		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location +"/" + adate + "/"+
+		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location +"/" + adate + "/" + search + "/" +
 				+ startIndex + "/" + VISIBLE_TAXON_COUNT,
 		new ResponseTextHandler() {
+			public void onCompletion(String str) {
+				JSONValue jsonValue = JSONParser.parse(str);
 				JSONArray jsonArray;
-			public void onCompletion(String str) {
+				JSONArray jsonArrayNested;
+							}
 							else {
 								row = i;
+							}
+							left=new StringBuffer();
+							center=new StringBuffer();
+							right=new StringBuffer();
 							// Case a cocher
 							table.setWidget(row, 0, new CheckBox());
 							// Nom saisi
-							table.setText(row, 1, ((JSONString) jsonArrayNested
-									.get(0)).stringValue());
+							left.append("<b>"+((JSONString) jsonArrayNested .get(0)).stringValue()+"</b>");
 							// Nom retenu
-							String aname=((JSONString) jsonArrayNested .get(2)).stringValue();
 							String aname=((JSONString) jsonArrayNested .get(2)).stringValue();
 							if (aname.compareTo("null")==0) {
-								table.setText(row, 2, "");
+							if (aname.compareTo("null")==0) {
+							}
 							else {
-								table.setText(row, 2, aname);
+								center.append(aname+", ");
 							}
 							// Num nomenclatural
 							String ann=((JSONString) jsonArrayNested .get(3)).stringValue();
-							if (ann.compareTo("0")==0) {
+							if (ann.compareTo("0")!=0) {
-								table.setText(row, 3, "");
+								center.append(""+ann+"-");
+							}
 							else {
-								table.setText(row, 3, ann);
+								center.append("0-");
+							}
 							// Num Taxonomique
 							String ant=((JSONString) jsonArrayNested .get(4)).stringValue();
-							if (ant.compareTo("0")==0) {
+							if (ant.compareTo("0")!=0) {
-								table.setText(row, 4, "");
+								center.append(ant+", ");
+							}
 							else {
-								table.setText(row, 4, ann);
+								center.append("0, ");
 							}
+							// Famille
+							String afamily=((JSONString) jsonArrayNested .get(5)).stringValue();
-							// Famille
+							if (afamily.compareTo("null")==0) {
+								//
+							}
-							String afamily=((JSONString) jsonArrayNested .get(5)).stringValue();
+							else {
+								center.append(afamily+", ");
+							}
+							String aloc=((JSONString) jsonArrayNested .get(6)).stringValue();
+//								Localisation - Lieu
+								if (aloc.compareTo("000null")==0) {
+									if (center.length()==0) {
+										center.append("Commune absente");
+									}
+									else {
-							if (afamily.compareTo("null")==0) {
+										center.append("commune absente");
+									}
+								}
-								table.setText(row, 5, "");
+								else {
+									if (center.length()==0) {
+										center.append("Commune de "+aloc);
-							}
+									}
+									else {
+										center.append("commune de "+aloc);
+									}
+								}
-							else {
-								table.setText(row, 5, afamily);
+								String alieudit=((JSONString) jsonArrayNested .get(9)).stringValue();
+//								Localisation - Lieu dit
-							}
+								if (alieudit.compareTo("null")!=0) {
 									center.append(", "+alieudit);
 							table.getFlexCellFormatter().setWidth(row, 0, "2%");
-							table.getFlexCellFormatter()
-									.setWidth(row, 1, "31%");
+								String acomment=((JSONString) jsonArrayNested .get(10)).stringValue();
-							table.getFlexCellFormatter()
-									.setWidth(row, 2, "31%");
-						// TODO : Bool ici non ?
-							// Affichage contenu commune si tout demandé.
-							String aloc=((JSONString) jsonArrayNested .get(6)).stringValue();
-							if (location.compareTo("all")==0) {
-//								Localisation - Lieu
-								if (aloc.compareTo("000null")==0) {
-									table.setText(row, 6, "Inconnu");
-								}
-								else {
-									table.setText(row, 6, aloc );
-								}
+//								Commentaire
+								if (acomment.compareTo("null")!=0) {
+									center.append(", "+acomment);
+								}
+								String adate=((JSONString) jsonArrayNested .get(8)).stringValue();
+//								Date
+								if (adate.compareTo("0000-00-00 00:00:00")!=0) {
+									right.append("<b>"+adate+"</b>");
+								}
 								else {
-								header.getCellFormatter().setVisible(0, 6,true);
+//									right.append("<b>00/00/0000</b>");
+								}
+							table.setHTML(row, 1, subLeft("&nbsp;"+left,40));
+							table.setHTML(row, 2, subLeft("&nbsp;"+center,120));
+							table.setHTML(row, 3, subLeft("&nbsp;"+right,25));
+							table.getRowFormatter().removeStyleName(row, "inventoryItem-SelectedRow");
-								table.getFlexCellFormatter().setWidth(row, 1, "31%");
-								table.getFlexCellFormatter().setWidth(row, 2, "31%");
+							table.getCellFormatter().setWordWrap(row,1,false);
 							table.getCellFormatter().setWidth(row,1,"10%");
-								table.getFlexCellFormatter().setWidth(row, 3, "9%");
+							table.getCellFormatter().setWordWrap(row,2,false);
-								table.getFlexCellFormatter().setWidth(row, 4, "9%");
+							table.getCellFormatter().setWordWrap(row,3,false);
+							table.getCellFormatter().setWidth(row,3,"7%");
-								table.getFlexCellFormatter().setWidth(row, 5, "9%");
-								table.getFlexCellFormatter().setWidth(row, 6, "9%");
+							String aordre=((JSONString) jsonArrayNested.get(7)).stringValue();
-							}
+							// Numero d'ordre (caché)
+							table.setText(row, 4, aordre);
-							else {
+							if (add){
+								if (i ==(arraySize -1)) {
+									selectRow(row);
-								header.getCellFormatter().setVisible(0, 6,false);
+									mediator.getEntryPanel().setOrdre(aordre);
+								}
 								table.getCellFormatter().setVisible(row, 6,false);
+							}
+							else {
-								table.getFlexCellFormatter().setWidth(row, 1, "36%");
+								if ((mediator.getEntryPanel().getOrdre()!=null) && (mediator.getEntryPanel().getOrdre().compareTo(aordre)==0)) {
-								table.getFlexCellFormatter().setWidth(row, 2, "36%");
+									selectRow(row);
+		}
+	}
+	/*
+	 * Recherche en cours
+	 *
+	 */
+	public void setSearch(String search) {
+		this.search = search;
+	}
 	/*
 	 * Localite en cours
+	 *

Subversion Repositories eFlore/Archives.cel-v1

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