Do globálního nastavení byly přidány dopravní prostředky.

refs #101

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

@@ -16,6 +16,7 @@ public class SettingsData {
 	private String bankName;
 	private String accountNumber;
 	private String bankCode;
+	private List<Vehicle> vehicles;
 	
 	public SettingsData() {
 		newReqTemplate = new MailMessage();
@@ -23,6 +24,7 @@ public class SettingsData {
 		confReqTemplate = new MailMessage();
 		mainAddress = new Address();
 		shippingAddrs = new ArrayList<Address>();
+		vehicles = new ArrayList<Vehicle>();
 	}
 
 	public boolean isEnableRequirements() {
@@ -97,4 +99,12 @@ public class SettingsData {
 		this.bankCode = bankCode;
 	}
 
+	public List<Vehicle> getVehicles() {
+		return vehicles;
+	}
+
+	public void setVehicles(List<Vehicle> vehicles) {
+		this.vehicles = vehicles;
+	}
+
 }

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

@@ -0,0 +1,67 @@
+package info.bukova.isspst.data;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class Vehicle {
+	
+	@Column(name = "VEHICLE_CODE")
+	private String code;
+	@Column(name = "VEHICLE_DESCRIPTION")
+	private String description;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((code == null) ? 0 : code.hashCode());
+		result = prime * result
+				+ ((description == null) ? 0 : description.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Vehicle other = (Vehicle) obj;
+		if (code == null) {
+			if (other.code != null)
+				return false;
+		} else if (!code.equals(other.code))
+			return false;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return code + (description != null ? " - " + description : "");
+	}
+
+}

src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java

@@ -12,6 +12,7 @@ import org.zkoss.zul.Window;
 import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.Requirement;
 import info.bukova.isspst.data.SettingsData;
+import info.bukova.isspst.data.Vehicle;
 import info.bukova.isspst.mail.MailMessage;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.sort.ReflectionTools;
@@ -70,6 +71,18 @@ public class GlobalSettingsVM {
 	public void removeAddress(@BindingParam("addr") Address addr) {
 		settings.getShippingAddrs().remove(addr);
 	}
+	
+	@Command
+	@NotifyChange("settings")
+	public void addVehicle() {
+		settings.getVehicles().add(new Vehicle());
+	}
+	
+	@Command
+	@NotifyChange("settings")
+	public void removeVehicle(@BindingParam("vehicle") Vehicle vehicle) {
+		settings.getVehicles().remove(vehicle);
+	}
 
 	public Address getSelAddress() {
 		return selAddress;