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

 		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 Button gotoEnd = new Button("&gt;&gt;", this);
+		public final HTML status = new HTML();
 		public final HTML status = new HTML();
 		public NavBar() {
 		public NavBar() {
+			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();
+		    			}
+		    		}
 		    );
 			VerticalPanel actions = new VerticalPanel();
-			HorizontalPanel actionButton = new HorizontalPanel();
+		    actionButton.add(addButton);
 			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);
 			actions.add(actionButton);
+			bar.add(actions, DockPanel.WEST);
+		}
 		private void openEntryPanel() {
 			bar.add(actions, DockPanel.WEST);
 		             mediator.onEntryClick();
 	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 Mediator mediator = null;
  	//
 	private String location = "all";
 		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");
 		// 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(navBar);
 		panel.add(header);
-		panel.add(selections);
+		panel.add(table);
+		//updateCount();
+		// update()
 		initWidget(panel);
 		updateCount();
 		// update()
+	}
 	 * @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();
 				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(inventoryItem.getName(), " ", " ", " ", " ", " ",inventoryItem.getLocation(),inventoryItem.getLocation_id(),inventoryItem.getDate(),inventoryItem.getComplementlocation(),inventoryItem.getComment());
 				// Saisie libre
 				else {
 	 *            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
-				+ user + "&nom_sel=" + nom_sel + "&num_nom_sel=" + num_nom_sel
+				+ "&nom_ret=" + nom_ret + "&num_nom_ret=" + num_nom_ret
-				+ "&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
-				+ "&num_taxon=" + num_taxon + "&famille=" + famille + "&location=" + loc + "&id_location=" + id_location,
+				+ "&station="+ complementLocation + "&commentaire="+ comment,
+		new ResponseTextHandler() {
 			public void onCompletion(String str) {
-		new ResponseTextHandler() {
+					location=loc;
 					if (location.compareTo("")==0) {
-			public void onCompletion(String str) {
+						location="000null";
 		setStatusDisabled();
 		boolean checked = false;
+		Vector parseChecked = new Vector();
 		Vector parseChecked = new Vector();
 		// TODO : optimiser
+		// Lifo ...
-		// 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());
-		for (Iterator it = parseChecked.iterator(); it.hasNext();) {
+			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) {
+						new ResponseTextHandler() {
-										updateCount();
+							public void onCompletion(String str) {
-								    }
 										updateCount();
 						});
 						});
+	 *
 	 */
+	public void selectAll() {
 	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() {
-	public void deselectAll() {
+		// TODO : optimiser ...
 		for (int i = table.getRowCount() - 1; i >= 0; i--) {
+	 *
 	 */
 	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";
-		setStatusDisabled();
+		}
-		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location,
+		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location + "/" + adate ,
 				new ResponseTextHandler() {
 	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";
 		setStatusDisabled();
-		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location +"/"
+		HTTPRequest.asyncGet(serviceBaseUrl + "/InventoryItemList/" + user + "/" + location +"/" + adate + "/"+
 				+ startIndex + "/" + VISIBLE_TAXON_COUNT,
 		new ResponseTextHandler() {
 			public void onCompletion(String str) {
 			public void onCompletion(String str) {
 				JSONValue jsonValue = JSONParser.parse(str);
-				JSONValue jsonValue = JSONParser.parse(str);
+				JSONArray jsonArray;
-				JSONArray jsonArray;
+				JSONArray jsonArrayNested;
 								 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()
-							table.getFlexCellFormatter().setWidth(row, 5, "9%");
+									.setWidth(row, 2, "31%");
+						// TODO : Bool ici non ?
+							// Affichage contenu commune si tout demandé.
 							String aloc=((JSONString) jsonArrayNested .get(6)).stringValue();
 						// TODO : Bool ici non ?
-							if (location.compareTo("all")==0) {
+							if (location.compareTo("all")==0) {
 //								Localisation - Lieu
-								String aloc=((JSONString) jsonArrayNested .get(6)).stringValue();
+//								Localisation - Lieu
-								if (aloc.compareTo("000null")==00) {
+								if (aloc.compareTo("000null")==0) {
 									table.setText(row, 6, "Inconnu");
+								}
 								else {
+									table.setText(row, 6, aloc );
+								}
+								header.getCellFormatter().setVisible(0, 6,true);
+								table.getFlexCellFormatter().setWidth(row, 1, "31%");
+								table.getFlexCellFormatter().setWidth(row, 2, "31%");
 								else {
-									table.setText(row, 6, ((JSONString) jsonArrayNested .get(6)).stringValue());
+								table.getFlexCellFormatter().setWidth(row, 3, "9%");
 								table.getFlexCellFormatter().setWidth(row, 4, "9%");
 								table.getFlexCellFormatter().setWidth(row, 5, "9%");
+								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%");
-								header.getCellFormatter().setVisible(0, 6,true);
+								table.getFlexCellFormatter().setWidth(row, 2, "36%");
-							else {
+								table.getFlexCellFormatter().setWidth(row, 3, "9%");
-								header.getCellFormatter().setVisible(0, 6,false);
+								table.getFlexCellFormatter().setWidth(row, 4, "9%");
+						}
+					}
+				}
 				// Suppression fin ancien affichage
 				if (i<table.getRowCount()-1) {
 					 for (int j = table.getRowCount() - 1; j > i-1; j--) {
 	 */
 	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 @ 12 – Rev 11 → 12