Agenda Vytvořené objednávky

Přidány záložky Doklady a Položky.

closes #148

src/main/java/info/bukova/isspst/StringUtils.java

@@ -124,10 +124,29 @@ public class StringUtils
 		
 		for (int i = 0; i < list.size(); i++)
 		{
+			String item = StringUtils.nullStr(list.get(i));
 			result = StringUtils.addSeparator(result, separator);
-			result += list.get(i);
+			result += item;
 		}
 		
 		return result;
 	}
+
+	public static String joinNotEmpty(List<String> list, String separator)
+	{
+		String result = "";
+
+		for (int i = 0; i < list.size(); i++)
+		{
+			String item = StringUtils.nullStr(list.get(i));
+
+			if (!item.isEmpty())
+			{
+				result = StringUtils.addSeparator(result, separator);
+				result += item;
+			}
+		}
+
+		return result;
+	}
 }

src/main/java/info/bukova/isspst/ui/DocumentViewModel.java

@@ -1,11 +1,17 @@
 package info.bukova.isspst.ui;
 
+import info.bukova.isspst.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.zkoss.bind.annotation.BindingParam;
 import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.event.KeyEvent;
 import org.zkoss.zul.Combobox;
+import org.zkoss.zul.Messagebox;
 
 public class DocumentViewModel
 {
@@ -77,4 +83,22 @@ public class DocumentViewModel
 			break;
 		}
 	}
+
+	@Command
+	public void testPressKey(@BindingParam("keyEvent") KeyEvent keyEvent)
+	{
+		int keyCode = keyEvent.getKeyCode();
+		boolean isCtrlKey = keyEvent.isCtrlKey();
+		boolean isAltKey = keyEvent.isAltKey();
+		boolean isShiftKey = keyEvent.isShiftKey();
+
+		List<String> list = new ArrayList<String>();
+		list.add(isCtrlKey ? "Ctrl" : "");
+		list.add(isAltKey ? "Alt" : "");
+		list.add(isShiftKey ? "Shift" : "");
+		list.add(Integer.toString(keyCode));
+		String sMsg = StringUtils.joinNotEmpty(list, "+");
+		
+		Messagebox.show(sMsg + " is pressed", "testPressKey", Messagebox.OK, Messagebox.EXCLAMATION);
+	}
 }

src/main/java/info/bukova/isspst/ui/main/orders/created/OrderList.java

@@ -4,6 +4,7 @@ import info.bukova.isspst.AddressUtils;
 import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.AddressEmb;
 import info.bukova.isspst.data.Order;
+import info.bukova.isspst.data.OrderItem;
 import info.bukova.isspst.data.SettingsData;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.filters.OrderFilter;
@@ -13,12 +14,17 @@ import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.ui.ListViewModel;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.zkoss.bind.annotation.BindingParam;
+import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.Init;
+import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
+import org.zkoss.zul.Listbox;
 
 public class OrderList extends ListViewModel<Order>
 {
@@ -37,6 +43,10 @@ public class OrderList extends ListViewModel<Order>
 	@WireVariable
 	protected UserService userService;
 
+	protected OrderItem selectedOrderItem;
+
+	protected List<OrderItem> orderItems;
+
 	@Init(superclass = true)
 	public void initOrderList()
 	{
@@ -44,6 +54,7 @@ public class OrderList extends ListViewModel<Order>
 		dataClass = Order.class;
 		formZul = "orderForm.zul";
 		dataFilter = new OrderFilter(getFilterTemplate());
+		this.orderItems = new ArrayList<OrderItem>();
 	}
 
 	public List<AddressEmb> getSuppAddresses()
@@ -85,4 +96,43 @@ public class OrderList extends ListViewModel<Order>
 	{
 		return userService.getAll();
 	}
+
+	public OrderItem getSelectedOrderItem()
+	{
+		return selectedOrderItem;
+	}
+
+	public void setSelectedOrderItem(OrderItem selectedOrderItem)
+	{
+		this.selectedOrderItem = selectedOrderItem;
+	}
+
+	public List<OrderItem> getOrderItems()
+	{
+		return orderItems;
+	}
+
+	public void setOrderItems(List<OrderItem> orderItems)
+	{
+		this.orderItems = orderItems;
+	}
+
+	@Command
+	@NotifyChange("orderItems")
+	public void onChangeSelectOrder(@BindingParam("ctrl") Listbox lb)
+	{
+		if (lb == null)
+		{
+			return;
+		}
+
+		if (lb.getSelectedIndex() > -1)
+		{
+			this.orderItems = this.getDataBean().getItems();
+		}
+		else
+		{
+			this.orderItems = new ArrayList<OrderItem>();
+		}
+	}
 }