Do objednávek přidána suma za fakturu.

closes #152

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

@@ -2,8 +2,13 @@ package info.bukova.isspst;
 
 import java.math.BigDecimal;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class BigDecimalUtils
 {
+	private final static Logger log = LoggerFactory.getLogger(BigDecimalUtils.class.getName());
+
 	public static boolean isEqualByDecimalForFilter(BigDecimal value, BigDecimal search)
 	{
 		if (search == null)
@@ -11,14 +16,18 @@ public class BigDecimalUtils
 			return true;
 		}
 
-		else if (value != null)
+		if (value == null)
 		{
+			value = BigDecimal.ZERO;
+		}
+
 		String valueS = value.toPlainString();
 		String searchS = search.toPlainString();
-			return valueS.startsWith(searchS);
+		boolean result = (valueS.compareTo(searchS) == 0);
-			// return (value.compareTo(search) == 0);
+
-		}
+		String s = "search='" + searchS + "', value='" + valueS + "', equal=" + (result ? "true" : "false");
+		log.info(s);
 
-		return false;
+		return result;
 	}
 }

src/main/java/info/bukova/isspst/data/Order.java

@@ -19,7 +19,8 @@ import org.hibernate.annotations.LazyCollectionOption;
 
 @Entity
 @Table(name = "ORDERS")
-public class Order extends BaseData {
+public class Order extends BaseData
+{
 
 	@Column(name = "NUMSER")
 	private String numser;
@@ -43,8 +44,7 @@ public class Order extends BaseData {
 			@AttributeOverride(name = "state", column = @Column(name = "SUPPLIER_STATE")),
 			@AttributeOverride(name = "street", column = @Column(name = "SUPPLIER_STREET")),
 			@AttributeOverride(name = "web", column = @Column(name = "SUPPLIER_WEB")),
-		@AttributeOverride(name = "zipCode",	 	column = @Column(name = "SUPPLIER_ZIP_CODE"))
+			@AttributeOverride(name = "zipCode", column = @Column(name = "SUPPLIER_ZIP_CODE")) })
-	})
 	private AddressEmb suplier;
 
 	@Embedded
@@ -63,8 +63,7 @@ public class Order extends BaseData {
 			@AttributeOverride(name = "state", column = @Column(name = "INVOICE_STATE")),
 			@AttributeOverride(name = "street", column = @Column(name = "INVOICE_STREET")),
 			@AttributeOverride(name = "web", column = @Column(name = "INVOICE_WEB")),
-		@AttributeOverride(name = "zipCode",	 	column = @Column(name = "INVOICE_ZIP_CODE"))
+			@AttributeOverride(name = "zipCode", column = @Column(name = "INVOICE_ZIP_CODE")) })
-	})
 	private AddressEmb address;
 
 	@Embedded
@@ -83,8 +82,7 @@ public class Order extends BaseData {
 			@AttributeOverride(name = "state", column = @Column(name = "DELIVERY_STATE")),
 			@AttributeOverride(name = "street", column = @Column(name = "DELIVERY_STREET")),
 			@AttributeOverride(name = "web", column = @Column(name = "DELIVERY_WEB")),
-		@AttributeOverride(name = "zipCode",	 	column = @Column(name = "DELIVERY_ZIP_CODE"))
+			@AttributeOverride(name = "zipCode", column = @Column(name = "DELIVERY_ZIP_CODE")) })
-	})
 	private AddressEmb deliveryAddress;
 
 	@Column(name = "DELIVERY_DATE")
@@ -103,7 +101,7 @@ public class Order extends BaseData {
 	@LazyCollection(LazyCollectionOption.TRUE)
 	private List<OrderItem> items;
 
-	@Column(name = "TOTAL", precision=15, scale=4)
+	@Column(name = "TOTAL", precision = 15, scale = 4)
 	private BigDecimal total;
 
 	@Column(name = "ORDERED")
@@ -118,133 +116,180 @@ public class Order extends BaseData {
 	@Column(name = "INVOICE_NUMBER")
 	private String invoiceNumber;
 
-	public Order() {
+	@Column(name = "INVOICE_TOTAL", precision = 15, scale = 4)
-		items = new ArrayList<OrderItem>();
+	private BigDecimal invoiceTotal;
+
+	public Order()
+	{
+		this.items = new ArrayList<OrderItem>();
+		this.total = BigDecimal.ZERO;
+		this.invoiceTotal = BigDecimal.ZERO;
 	}
 
-	public String getNumser() {
+	public String getNumser()
+	{
 		return numser;
 	}
 
-	public void setNumser(String numser) {
+	public void setNumser(String numser)
+	{
 		this.numser = numser;
 	}
 
-	public AddressEmb getSuplier() {
+	public AddressEmb getSuplier()
+	{
 		return suplier;
 	}
 
-	public void setSuplier(AddressEmb suplier) {
+	public void setSuplier(AddressEmb suplier)
+	{
 		this.suplier = suplier;
 	}
 
-	public AddressEmb getAddress() {
+	public AddressEmb getAddress()
+	{
 		return address;
 	}
 
-	public void setAddress(AddressEmb address) {
+	public void setAddress(AddressEmb address)
+	{
 		this.address = address;
 	}
 
-	public Date getDeliveryDate() {
+	public Date getDeliveryDate()
+	{
 		return deliveryDate;
 	}
 
-	public void setDeliveryDate(Date deliveryDate) {
+	public void setDeliveryDate(Date deliveryDate)
+	{
 		this.deliveryDate = deliveryDate;
 	}
 
-	public String getDeliveryType() {
+	public String getDeliveryType()
+	{
 		return deliveryType;
 	}
 
-	public void setDeliveryType(String deliveryType) {
+	public void setDeliveryType(String deliveryType)
+	{
 		this.deliveryType = deliveryType;
 	}
 
-	public String getDescription() {
+	public String getDescription()
+	{
 		return description;
 	}
 
-	public void setDescription(String description) {
+	public void setDescription(String description)
+	{
 		this.description = description;
 	}
 
-	public AddressEmb getDeliveryAddress() {
+	public AddressEmb getDeliveryAddress()
+	{
 		return deliveryAddress;
 	}
 
-	public void setDeliveryAddress(AddressEmb deliveryAddress) {
+	public void setDeliveryAddress(AddressEmb deliveryAddress)
+	{
 		this.deliveryAddress = deliveryAddress;
 	}
 
-	public Date getDeliveredDate() {
+	public Date getDeliveredDate()
+	{
 		return deliveredDate;
 	}
 
-	public void setDeliveredDate(Date deliveredDate) {
+	public void setDeliveredDate(Date deliveredDate)
+	{
 		this.deliveredDate = deliveredDate;
 	}
 
-	public List<OrderItem> getItems() {
+	public List<OrderItem> getItems()
+	{
 		return items;
 	}
 
-	public void addItem(OrderItem item) {
+	public void addItem(OrderItem item)
+	{
 		item.setOrder(this);
 		items.add(item);
 	}
 
-	public void setItems(List<OrderItem> items) {
+	public void setItems(List<OrderItem> items)
+	{
 		this.items = items;
 	}
 
-	public boolean isDelivered() {
+	public boolean isDelivered()
+	{
 		return delivered;
 	}
 
-	public void setDelivered(boolean delivered) {
+	public void setDelivered(boolean delivered)
+	{
 		this.delivered = delivered;
 	}
 
-	public boolean isInvoiced() {
+	public boolean isInvoiced()
+	{
 		return invoiced;
 	}
 
-	public void setInvoiced(boolean invoiced) {
+	public void setInvoiced(boolean invoiced)
+	{
 		this.invoiced = invoiced;
 	}
 
-	public String getInvoiceNumber() {
+	public String getInvoiceNumber()
+	{
 		return invoiceNumber;
 	}
 
-	public void setInvoiceNumber(String invoiceNumber) {
+	public void setInvoiceNumber(String invoiceNumber)
+	{
 		this.invoiceNumber = invoiceNumber;
 	}
 
-	public boolean isOrdered() {
+	public boolean isOrdered()
+	{
 		return ordered;
 	}
 
-	public void setOrdered(boolean ordered) {
+	public void setOrdered(boolean ordered)
+	{
 		this.ordered = ordered;
 	}
 
-	public Date getOrderDate() {
+	public Date getOrderDate()
+	{
 		return orderDate;
 	}
 
-	public void setOrderDate(Date orderDate) {
+	public void setOrderDate(Date orderDate)
+	{
 		this.orderDate = orderDate;
 	}
 
-	public BigDecimal getTotal() {
+	public BigDecimal getTotal()
+	{
 		return total;
 	}
 
-	public void setTotal(BigDecimal total) {
+	public void setTotal(BigDecimal total)
+	{
 		this.total = total;
 	}
 
+	public BigDecimal getInvoiceTotal()
+	{
+		return invoiceTotal;
+	}
+
+	public void setInvoiceTotal(BigDecimal invoiceTotal)
+	{
+		this.invoiceTotal = invoiceTotal;
+	}
+
 }

src/main/java/info/bukova/isspst/filters/JoinedItemFilter.java

@@ -1,6 +1,5 @@
 package info.bukova.isspst.filters;
 
-import info.bukova.isspst.BigDecimalUtils;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.JoinedItem;
 import info.bukova.isspst.data.MUnitEmb;
@@ -46,10 +45,13 @@ public class JoinedItemFilter implements Filter<JoinedItem>
 			boolean foundCode = StringUtils.isEqualForFilter(item.getCode(), condition.getCode());
 			boolean foundName = StringUtils.isEqualForFilter(item.getName(), condition.getName());
 			boolean foundTextItem = StringUtils.isEqualForFilter(item.getTextItem(), condition.getTextItem());
-			boolean foundQuantity = BigDecimalUtils.isEqualByDecimalForFilter(item.getQuantity(), condition.getQuantity());
+			boolean foundQuantity = true;// BigDecimalUtils.isEqualByDecimalForFilter(item.getQuantity(),
-			boolean foundUnitPrice = BigDecimalUtils.isEqualByDecimalForFilter(item.getUnitPrice(), condition.getUnitPrice());
+											// condition.getQuantity());
+			boolean foundUnitPrice = true; // BigDecimalUtils.isEqualByDecimalForFilter(item.getUnitPrice(),
+											// condition.getUnitPrice());
 			boolean foundMUnit = MUnitEmb.isEqualMUnitEmbForFilter(item.getMunit(), condition.getMunit());
-			boolean foundTotal = BigDecimalUtils.isEqualByDecimalForFilter(item.getTotal(), condition.getTotal());
+			boolean foundTotal = true;// BigDecimalUtils.isEqualByDecimalForFilter(item.getTotal(),
+										// condition.getTotal());
 			boolean foundWorkgroup = Workgroup.isEqualByWorkgroupForFilter(item.getWorkgroup(), condition.getWorkgroup());
 			boolean foundCenter = Workgroup.isEqualByWorkgroupForFilter(item.getCentre(), condition.getCentre());
 			boolean foundOwner = User.isEqualByUserForFilter(item.getOwnedBy(), condition.getOwnedBy());

src/main/java/info/bukova/isspst/filters/OrderFilter.java

@@ -1,6 +1,5 @@
 package info.bukova.isspst.filters;
 
-import info.bukova.isspst.BigDecimalUtils;
 import info.bukova.isspst.DateTimeUtils;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.AddressEmb;
@@ -45,10 +44,13 @@ public class OrderFilter implements Filter<Order>
 		{
 			boolean foundNumSer = StringUtils.isEqualForFilter(item.getNumser(), condition.getNumser());
 			boolean foundOrderDate = DateTimeUtils.isEqualByDateForFilter(item.getOrderDate(), condition.getOrderDate());
-			boolean foundTotal = BigDecimalUtils.isEqualByDecimalForFilter(item.getTotal(), condition.getTotal());
+			boolean foundTotal = true;// BigDecimalUtils.isEqualByDecimalForFilter(item.getTotal(),
+										// condition.getTotal());
 			boolean foundDeliveryDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveryDate(), condition.getDeliveryDate());
 			boolean foundDeliveredDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveredDate(), condition.getDeliveredDate());
 			boolean foundInvoiceNumber = StringUtils.isEqualForFilter(item.getInvoiceNumber(), condition.getInvoiceNumber());
+			boolean foundInvoiceTotal = true;// BigDecimalUtils.isEqualByDecimalForFilter(item.getInvoiceTotal(),
+												// condition.getInvoiceTotal());
 			boolean foundSupplierAddr = AddressEmb.isEqualByAddressEmbForFilter(item.getSuplier(), condition.getSuplier());
 			boolean foundDeliveryAddr = AddressEmb.isEqualByAddressEmbForFilter(item.getDeliveryAddress(), condition.getDeliveryAddress());
 			boolean foundInvoiceAddr = AddressEmb.isEqualByAddressEmbForFilter(item.getAddress(), condition.getAddress());
@@ -60,6 +62,7 @@ public class OrderFilter implements Filter<Order>
 					&& foundDeliveryDate
 					&& foundDeliveredDate
 					&& foundInvoiceNumber
+					&& foundInvoiceTotal
 					&& foundSupplierAddr
 					&& foundDeliveryAddr
 					&& foundInvoiceAddr

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -326,6 +326,7 @@ OrderFormDescription=Popis
 OrderFormOrdered=Objednáno
 OrderFormDeliveredDate=Dodáno dne
 OrderFormInvoiceNumber=Číslo faktury
+OrderFormInvoiceTotal=Částka faktury
 
 HandleComboKeyFilter=#del
 HandleComboKey=$#del

src/main/webapp/main/orders/created/grid.zul

@@ -51,6 +51,11 @@
 								hflex="10"
 								sort="auto(invoiceNumber)"
 								label="${labels.OrderFormInvoiceNumber}" />
+							<listheader
+								hflex="7"
+								align="right"
+								sort="auto(invoiceTotal)"
+								label="${labels.OrderFormInvoiceTotal}" />
 							<listheader
 								hflex="15"
 								sort="auto(suplier.company)"
@@ -151,6 +156,7 @@
 									</div>
 								</div>
 							</auxheader>
+							<auxheader></auxheader>
 							<auxheader>
 								<div zclass="find-grid-cell">
 									<div sclass="find-grid-divtextbox">
@@ -251,6 +257,7 @@
 								<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
 								<listcell label="@load(each.deliveredDate) @converter('formatedDate', format=labels.DateFormat)" />
 								<listcell label="@load(each.invoiceNumber)" />
+								<listcell label="@load(each.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
 								<listcell label="@load(each.suplier)" />
 								<listcell label="@load(each.deliveryAddress)" />
 								<listcell label="@load(each.address)" />

src/main/webapp/main/orders/created/orderForm.zul

@@ -103,6 +103,15 @@
 												readonly="@load(empty fx.created)" />
 										</cell>
 									</row>
+									<row>
+										<cell sclass="row-title">${labels.OrderFormInvoiceTotal} :</cell>
+										<cell>
+											<textbox
+												id="idOrderInvoiceTotal"
+												width="150px"
+												value="@bind(fx.invoiceTotal) @converter(vm.standardBigDecimalConverter)" />
+										</cell>
+									</row>
 									<row>
 										<cell sclass="row-title">${labels.OrderFormDescription} :</cell>
 										<cell>