Konfigurace pro provoz s více firmami.

pom.xml

@@ -202,6 +202,12 @@
 		</dependency>
 		
 		<!-- DB -->
+		<dependency>
+			<groupId>postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+			<version>9.1-901-1.jdbc4</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>

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

@@ -11,7 +11,6 @@ import info.bukova.isspst.data.User;
 import info.bukova.isspst.reporting.Report;
 import info.bukova.isspst.reporting.ReportMapping;
 import info.bukova.isspst.reporting.ReportType;
-import info.bukova.isspst.services.dbinfo.DbInfoService;
 import info.bukova.isspst.services.munits.MUnitService;
 import info.bukova.isspst.services.numberseries.NumberSeriesService;
 import info.bukova.isspst.services.requirement.RequirementTypeService;
@@ -34,8 +33,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
 
 public class AppInitListener implements ServletContextListener {
 
-
-	private DbInfoService dbInfoService;
 	private MUnitService mUnitsService;
 	private RoleService roleService;
 	private UserService userService;
@@ -51,11 +48,10 @@ public class AppInitListener implements ServletContextListener {
 
 	@Override
 	public void contextInitialized(ServletContextEvent evt) {
-		Logger logger = LoggerFactory.getLogger(AppInitListener.class);
+		/*Logger logger = LoggerFactory.getLogger(AppInitListener.class);
 		logger.info("Initializing database");
 		
 		WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(evt.getServletContext());
-		dbInfoService = ctx.getBean(DbInfoService.class);
 		mUnitsService = ctx.getBean(MUnitService.class);
 		roleService = ctx.getBean(RoleService.class);
 		userService = ctx.getBean(UserService.class);
@@ -65,7 +61,6 @@ public class AppInitListener implements ServletContextListener {
 		reqTypeService = ctx.getBean(RequirementTypeService.class);
 		
 		userService.grantAdmin();
-		this.checkDbInfo();
 		checkMUnits();
 		checkRoles();
 		checkUsers();
@@ -76,27 +71,9 @@ public class AppInitListener implements ServletContextListener {
 		this.checkGlobalSettings();
 		userService.removeAccess();
 		
-		loadModuleReports();
+		loadModuleReports();*/
 	}
 	
-	private void checkDbInfo()
-	{
-		List<User> userList = userService.getAll();
-
-		if (userList.isEmpty())
-		{
-			// Database is new/empty, column definition is anotated - set actual
-			// database version
-			dbInfoService.updateDatabaseVersion();
-		}
-		else
-		{
-			// Existing database - try change structure and set actual database
-			// version...
-			dbInfoService.changeDatabase();
-		}
-	}
-
 	private void checkMUnits()
 	{
 		List<MUnit> mUnits = mUnitsService.getAll();

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

@@ -1,13 +0,0 @@
-package info.bukova.isspst;
-
-
-public class BooleanUtils
-{
-	public static boolean isEqualByBoolean(Boolean b1, Boolean b2)
-	{
-		boolean bool1 = ((b1 == null) ? false : b1.booleanValue());
-		boolean bool2 = ((b2 == null) ? false : b2.booleanValue());
-		boolean equals = (bool1 == bool2);
-		return equals;
-	}
-}

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

@@ -0,0 +1,78 @@
+package info.bukova.isspst;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.hibernate.HibernateException;
+import org.hibernate.service.UnknownUnwrapTypeException;
+import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider;
+
+public class ClientConnectionPrivider implements MultiTenantConnectionProvider {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2142963179208004018L;
+	
+	private DataSource dataSource;
+
+	public ClientConnectionPrivider(DataSource dataSource) {
+		this.dataSource = dataSource;
+	}
+	
+	@SuppressWarnings("rawtypes")
+	@Override
+	public boolean isUnwrappableAs(Class unwrapType) {
+		return ConnectionProvider.class.equals( unwrapType ) || MultiTenantConnectionProvider.class.equals( unwrapType ) || ClientConnectionPrivider.class.isAssignableFrom( unwrapType );
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T unwrap(Class<T> unwrapType) {
+		if ( isUnwrappableAs( unwrapType ) ) {
+            return (T) this;
+        }
+        else {
+            throw new UnknownUnwrapTypeException( unwrapType );
+        }
+	}
+
+	@Override
+	public Connection getAnyConnection() throws SQLException {
+		return dataSource.getConnection();
+	}
+
+	@Override
+	public void releaseAnyConnection(Connection connection) throws SQLException {
+		connection.close();
+	}
+
+	@Override
+	public Connection getConnection(String tenantIdentifier)
+			throws SQLException {
+		
+		Connection con = getAnyConnection();
+		try {
+			con.createStatement().execute("SET schema '" + tenantIdentifier + "'");
+		} catch ( SQLException e ) {
+			throw new HibernateException("Could not alter JDBC connection to specified schema [" + tenantIdentifier + "]", e);
+		}
+		
+		return con;
+	}
+
+	@Override
+	public void releaseConnection(String tenantIdentifier, Connection connection)
+			throws SQLException {
+		releaseAnyConnection(connection);
+	}
+
+	@Override
+	public boolean supportsAggressiveRelease() {
+		return false;
+	}
+
+}

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

@@ -0,0 +1,35 @@
+package info.bukova.isspst;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class ClientResolver implements CurrentTenantIdentifierResolver {
+	
+	@Autowired
+	private HttpServletRequest request;
+	private static final String TOP_DOMAIN = "localhost"; // Bude se tahat z konfigurace...
+
+	@Override
+	public String resolveCurrentTenantIdentifier() {
+		String hostName = request.getServerName();
+		String tenant = "";
+		
+		if (hostName.contains(".")) {
+			tenant = hostName.substring(0, hostName.indexOf("." + TOP_DOMAIN));
+		}
+		
+		if (tenant.isEmpty()) {
+			tenant = "public";
+		}
+		
+		return tenant;
+	}
+
+	@Override
+	public boolean validateExistingCurrentSessions() {
+		return false;
+	}
+
+}

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

@@ -1,39 +0,0 @@
-package info.bukova.isspst;
-
-import info.bukova.isspst.data.DataModel;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class CommonUrlResolver implements EntityUrlResolver {
-
-	@Autowired
-	private HttpServletRequest request;
-	protected String defaultUrl;
-	
-	public CommonUrlResolver() {
-		 
-	}
-	
-	@Override
-	public String entityUrl(Object entity) {
-		if (defaultUrl == null) {
-			this.defaultUrl = request.getRequestURL().toString();
-			this.defaultUrl = defaultUrl.substring(0, defaultUrl.indexOf(request.getServletPath()));
-		}
-		
-		if (!DataModel.class.isAssignableFrom(entity.getClass())) {
-			return defaultUrl + "/app";
-		}
-		
-		String url = Constants.URL_MAP.get(entity.getClass());
-		
-		if (url == null) {
-			return defaultUrl + "/app";
-		}
-		
-		return defaultUrl + url + "?select=" + String.valueOf(((DataModel)entity).getId());
-	}
-
-}

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

@@ -2,18 +2,15 @@ package info.bukova.isspst;
 
 import info.bukova.isspst.data.Permission;
 import info.bukova.isspst.data.PermissionType;
-import info.bukova.isspst.data.Requirement;
 import info.bukova.isspst.data.RequirementType;
 import info.bukova.isspst.data.Role;
-import info.bukova.isspst.data.TripRequirement;
 import info.bukova.isspst.reporting.Report;
 import info.bukova.isspst.reporting.ReportMapping;
 import info.bukova.isspst.services.addressbook.AdbService;
+import info.bukova.isspst.services.approved.ApprovedService;
+import info.bukova.isspst.services.approved.OrderService;
 import info.bukova.isspst.services.buildings.BuildingService;
-import info.bukova.isspst.services.invoicing.InvoicingService;
 import info.bukova.isspst.services.munits.MUnitService;
-import info.bukova.isspst.services.orders.ApprovedService;
-import info.bukova.isspst.services.orders.OrderService;
 import info.bukova.isspst.services.reqsubjects.MaterialService;
 import info.bukova.isspst.services.reqsubjects.ServiceItemService;
 import info.bukova.isspst.services.requirement.RequirementService;
@@ -24,14 +21,8 @@ import info.bukova.isspst.services.users.RoleService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 public class Constants {
-
-	public final static long DB_VERSION = 2;
-
+	
 	public final static String DEF_ADMIN = "admin";
 	public final static String DEF_ADMIN_PASSWD = "admin";
 	public final static String ROLE_USER = "ROLE_USER";
@@ -80,7 +71,6 @@ public class Constants {
 	public final static String MOD_TRIPBILL = "TRIPBILL";
 	public final static String MOD_APPROVED = "APPROVED";
 	public final static String MOD_ORDER = "ORDER";
-	public final static String MOD_INVOICING = "INVOICING";
 	public final static Module MODULES[] = {
 			new Module(MOD_USERS, "Uživatelé", UserService.class),
 			new Module(MOD_PERMISSIONS, "Práva", RoleService.class),
@@ -95,8 +85,7 @@ public class Constants {
 			new Module(MOD_WORKFLOW, "Procesy schválení", RequirementTypeService.class),
 			new Module(MOD_TRIPBILL, "Cestovní příkazy", TripBillService.class),
 			new Module(MOD_APPROVED, "Schválené položky požadavků", ApprovedService.class),
-			new Module(MOD_ORDER, "Objednávky", OrderService.class),
-			new Module(MOD_INVOICING, "Fakturace požadavků", InvoicingService.class) };
+			new Module(MOD_ORDER, "Objednávky", OrderService.class) };
 	
 	public final static String PERM_APPROVE = "PERM_APPROVE";
 	public final static String PERM_SHOW_WORKGROUP_REQ = "PERM_SHOW_WORKGROUP_REQ";
@@ -104,18 +93,15 @@ public class Constants {
 	public final static String PERM_SHOW_ALL_REQ = "PERM_SHOW_ALL_REQ";
 	public final static String PERM_EDIT_NEW = "PERM_EDIT_NEW";
 	public final static String PERM_EDIT_OWN = "PERM_EDIT_OWN";
-	public final static String PERM_DELETE_NEW = "PERM_DELETE_NEW";
 	
 	public final static Permission SPECIAL_PERMISSIONS[] = {
 		new Permission(PERM_EDIT_NEW, "Upravit neschválené", MOD_REQUIREMENTS, PermissionType.GLOBAL),
-		new Permission(PERM_DELETE_NEW, "Mazat neschválené", MOD_REQUIREMENTS, PermissionType.GLOBAL),
 		new Permission(PERM_SHOW_WORKGROUP_REQ, "Zobrazení požadavků komise", MOD_REQUIREMENTS, PermissionType.WORKGROUP),
 		new Permission(PERM_SHOW_CENTRE_REQ, "Zobrazení požadavků střediska", MOD_REQUIREMENTS, PermissionType.CENTRE),
 		new Permission(PERM_SHOW_ALL_REQ, "Zobrazení všech požadavků", MOD_REQUIREMENTS, PermissionType.GLOBAL),
 		new Permission(PERM_APPROVE, "Schválení", MOD_REQUIREMENTS, PermissionType.WORKGROUP),
 		
 		new Permission(PERM_EDIT_NEW, "Upravit neschválené", MOD_TRIPREQUIREMENTS, PermissionType.GLOBAL),
-		new Permission(PERM_DELETE_NEW, "Mazat neschválené", MOD_TRIPREQUIREMENTS, PermissionType.GLOBAL),
 		new Permission(PERM_SHOW_WORKGROUP_REQ, "Zobrazení požadavků komise", MOD_TRIPREQUIREMENTS, PermissionType.WORKGROUP),
 		new Permission(PERM_SHOW_CENTRE_REQ, "Zobrazení požadavků střediska", MOD_TRIPREQUIREMENTS, PermissionType.CENTRE),
 		new Permission(PERM_SHOW_ALL_REQ, "Zobrazení všech požadavků", MOD_TRIPREQUIREMENTS, PermissionType.GLOBAL),
@@ -128,8 +114,7 @@ public class Constants {
 		new ReportMapping(MOD_ADDRESSBOOK, new Report("Adresa", "address", false, true)),
 		new ReportMapping(MOD_TRIPBILL, new Report("Žádost", "tripRequirement", false, true)),
 		new ReportMapping(MOD_TRIPBILL, new Report("Vyúčtování", "tripBill", false, true)),
-		new ReportMapping(MOD_ORDER, new Report("Objednávka", "order", true, true)),
-		new ReportMapping(MOD_REQUIREMENTS, new Report("Požadavky", "requirements"))
+		new ReportMapping(MOD_ORDER, new Report("Objednávka", "order", true, true))
 	};
 	
 	public final static String REQTYPE_ORDER = "ORDER";
@@ -141,13 +126,4 @@ public class Constants {
 
 	public final static long REQ_TYPE_MATERIAL = 1;
 	public final static long REQ_TYPE_SERVICES = 2;
-	
-	@SuppressWarnings("serial")
-	public final static Map<Class<?>, String> URL_MAP = Collections.unmodifiableMap(new HashMap<Class<?>, String>() {{
-		put(Requirement.class, "/main/orders/");
-		put(TripRequirement.class, "/main/trips/requirements/");
-	}} );
-
-	public final static int LEN_TEXT = 255;
-	public final static int LEN_DESCRIPTION = 8192;
 }

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

@@ -1,7 +0,0 @@
-package info.bukova.isspst;
-
-public interface EntityUrlResolver {
-	
-	public String entityUrl(Object entity);
-
-}

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

@@ -1,39 +0,0 @@
-package info.bukova.isspst;
-
-import info.bukova.isspst.data.Requirement;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class RequirementUrlResolver implements EntityUrlResolver {
-	
-	private String defaultUrl;
-	@Autowired
-	private HttpServletRequest request;
-	
-	public RequirementUrlResolver() {
-		
-	}
-
-	@Override
-	public String entityUrl(Object entity) {
-		if (!(entity instanceof Requirement)) {
-			return defaultUrl + "/app";
-		}
-		
-		if (defaultUrl == null) {
-			this.defaultUrl = request.getRequestURL().toString();
-			this.defaultUrl = defaultUrl.substring(0, defaultUrl.indexOf(request.getServletPath()));
-		}
-		
-		Requirement req = (Requirement)entity;
-		
-		if (req.getKind() == Constants.REQ_TYPE_MATERIAL) {
-			return defaultUrl + Constants.URL_MAP.get(req.getClass()) + "material/?select=" + String.valueOf(req.getId());
-		} else {
-			return defaultUrl + Constants.URL_MAP.get(req.getClass()) + "services/?select=" + String.valueOf(req.getId());
-		}
-	}
-
-}

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

@@ -1,6 +1,5 @@
 package info.bukova.isspst;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.zkoss.util.resource.Labels;
@@ -8,12 +7,12 @@ import org.zkoss.util.resource.Labels;
 public class StringUtils
 {
 
-	public static String nullToEmptyString(String str)
+	private static String nullStr(String str)
 	{
 		return str == null ? "" : str;
 	}
 
-	private static String zeroToEmptyString(long i)
+	private static String not0ToStr(long i)
 	{
 		return i == 0 ? "" : String.valueOf(i);
 	}
@@ -61,8 +60,8 @@ public class StringUtils
 
 	public static boolean isEqualForFilter(String value, String search)
 	{
-		value = StringUtils.nullToEmptyString(value).toLowerCase();
-		search = StringUtils.nullToEmptyString(search).toLowerCase();
+		value = StringUtils.nullStr(value).toLowerCase();
+		search = StringUtils.nullStr(search).toLowerCase();
 
 		if (search.isEmpty())
 		{
@@ -74,8 +73,8 @@ public class StringUtils
 
 	public static boolean isIcEqualForFilter(long value, long search)
 	{
-		String compareValue = StringUtils.zeroToEmptyString(value);
-		String searchValue = StringUtils.zeroToEmptyString(search);
+		String compareValue = StringUtils.not0ToStr(value);
+		String searchValue = StringUtils.not0ToStr(search);
 		return compareValue.startsWith(searchValue);
 	}
 
@@ -125,7 +124,7 @@ public class StringUtils
 		
 		for (int i = 0; i < list.size(); i++)
 		{
-			String item = StringUtils.nullToEmptyString(list.get(i));
+			String item = StringUtils.nullStr(list.get(i));
 			result = StringUtils.addSeparator(result, separator);
 			result += item;
 		}
@@ -139,7 +138,7 @@ public class StringUtils
 
 		for (int i = 0; i < list.size(); i++)
 		{
-			String item = StringUtils.nullToEmptyString(list.get(i));
+			String item = StringUtils.nullStr(list.get(i));
 
 			if (!item.isEmpty())
 			{
@@ -150,47 +149,4 @@ public class StringUtils
 
 		return result;
 	}
-
-	public static List<String> split(String value, String separator)
-	{
-		String tmp = value;
-		List<String> list = new ArrayList<String>();
-
-		if (tmp != null)
-		{
-			if ((separator == null) || separator.isEmpty() || tmp.isEmpty())
-			{
-				list.add(tmp);
-			}
-			else
-			{
-				int separatorLength = separator.length();
-				
-				while (!tmp.isEmpty())
-				{
-					String part = "";
-					int idx = tmp.indexOf(separator);
-					
-					if (idx > -1)
-					{
-						part = tmp.substring(0, idx);
-						list.add(part);
-						tmp = tmp.substring(idx + separatorLength);
-
-						if (tmp.isEmpty())
-						{
-							list.add("");
-						}
-					}
-					else
-					{
-						list.add(tmp);
-						tmp = "";
-					}
-				}
-			}
-		}
-
-		return list;
-	}
 }

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

@@ -1,30 +0,0 @@
-package info.bukova.isspst;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class UrlResolverHolder {
-	
-	private EntityUrlResolver commonResolver;
-	private Map<Class<?>, EntityUrlResolver> resolvers;
-	
-	public UrlResolverHolder(EntityUrlResolver common) {
-		this.commonResolver = common;
-		resolvers = new HashMap<Class<?>, EntityUrlResolver>();
-	}
-
-	public void setResolvers(Map<Class<?>, EntityUrlResolver> resolvers) {
-		this.resolvers = resolvers;
-	}
-	
-	public EntityUrlResolver resolverFor(Class<?> clazz) {
-		EntityUrlResolver res = resolvers.get(clazz);
-		
-		if (res == null) {
-			return commonResolver;
-		}
-		
-		return res;
-	}
-
-}

src/main/java/info/bukova/isspst/dao/DbInfoDao.java

@@ -1,7 +0,0 @@
-package info.bukova.isspst.dao;
-
-import info.bukova.isspst.data.DbInfo;
-
-public interface DbInfoDao extends BaseDao<DbInfo>
-{
-}

src/main/java/info/bukova/isspst/dao/InvoicingDao.java

@@ -1,7 +0,0 @@
-package info.bukova.isspst.dao;
-
-import info.bukova.isspst.data.Invoicing;
-
-public interface InvoicingDao extends BaseDao<Invoicing> {
-
-}

src/main/java/info/bukova/isspst/dao/RequirementItemDao.java

@@ -1,8 +0,0 @@
-package info.bukova.isspst.dao;
-
-import info.bukova.isspst.data.RequirementItem;
-
-public interface RequirementItemDao extends BaseDao<RequirementItem>
-{
-
-}

src/main/java/info/bukova/isspst/dao/jpa/DbInfoDaoJPA.java

@@ -1,9 +0,0 @@
-package info.bukova.isspst.dao.jpa;
-
-import info.bukova.isspst.dao.DbInfoDao;
-import info.bukova.isspst.data.DbInfo;
-
-public class DbInfoDaoJPA extends BaseDaoJPA<DbInfo> implements DbInfoDao
-{
-
-}

src/main/java/info/bukova/isspst/dao/jpa/InvoicingDaoJPA.java

@@ -1,9 +0,0 @@
-package info.bukova.isspst.dao.jpa;
-
-import info.bukova.isspst.dao.InvoicingDao;
-import info.bukova.isspst.data.Invoicing;
-
-public class InvoicingDaoJPA extends BaseDaoJPA<Invoicing> implements InvoicingDao {
-
-	
-}

src/main/java/info/bukova/isspst/dao/jpa/RequirementItemDaoJPA.java

@@ -1,8 +0,0 @@
-package info.bukova.isspst.dao.jpa;
-
-import info.bukova.isspst.dao.RequirementItemDao;
-import info.bukova.isspst.data.RequirementItem;
-
-public class RequirementItemDaoJPA extends BaseDaoJPA<RequirementItem> implements RequirementItemDao
-{
-}

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

@@ -1,6 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
 import info.bukova.isspst.StringUtils;
 
 import java.util.ArrayList;
@@ -46,7 +45,7 @@ public class Address extends BaseData
 	private String email;
 	@Column(name = "WEB")
 	private String web;
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 
 	@NotNull(message = "Zadejte firmu")

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +23,7 @@ public class Building extends BaseData implements DataModel {
 	@Column(name = "NAME")
 	private String name;
 
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 	
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "building", orphanRemoval = true)

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

@@ -1,28 +0,0 @@
-package info.bukova.isspst.data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "DBINFO")
-public class DbInfo extends BaseSimpleData
-{
-	@Column(name = "VERSION")
-	private long version;
-
-	public DbInfo()
-	{
-		this.version = 0;
-	}
-
-	public long getVersion()
-	{
-		return version;
-	}
-
-	public void setVersion(long version)
-	{
-		this.version = version;
-	}
-}

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

@@ -1,58 +0,0 @@
-package info.bukova.isspst.data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
-
-@Entity
-@Table(name = "INVOICING")
-public class Invoicing extends BaseData {
-	
-	@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-	@JoinColumn(name = "REQUIREMENT_ID")
-	private Requirement requirement;
-	
-	@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
-	@LazyCollection(LazyCollectionOption.TRUE)
-	@JoinColumn(name = "INVOICING_ID")
-	private List<InvoicingItem> items; 
-	
-	@Column(name = "TOTAL_INVOICED", precision = 15, scale = 4)
-	private BigDecimal totalInvoiced;
-
-	public Requirement getRequirement() {
-		return requirement;
-	}
-
-	public void setRequirement(Requirement requirement) {
-		this.requirement = requirement;
-	}
-
-	public List<InvoicingItem> getItems() {
-		return items;
-	}
-
-	public void setItems(List<InvoicingItem> items) {
-		this.items = items;
-	}
-
-	public BigDecimal getTotalInvoiced() {
-		return totalInvoiced;
-	}
-
-	public void setTotalInvoiced(BigDecimal totalInvoiced) {
-		this.totalInvoiced = totalInvoiced;
-	}
-
-}

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

@@ -1,87 +0,0 @@
-package info.bukova.isspst.data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "INVOICING_ITEM")
-public class InvoicingItem {
-
-	@Id
-	@Column(name = "ID")
-	@GeneratedValue
-	private int id;
-	
-	@Column(name = "INVOICE_DATE")
-	private Date invoiceDate;
-	
-	@Column(name = "INVOICE_NUMBER")
-	private String invoiceNumber;
-	
-	@Column(name = "AMOUNT", precision = 15, scale = 4)
-	private BigDecimal amount;
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getInvoiceDate() {
-		return invoiceDate;
-	}
-
-	public void setInvoiceDate(Date invoiceDate) {
-		this.invoiceDate = invoiceDate;
-	}
-
-	public String getInvoiceNumber() {
-		return invoiceNumber;
-	}
-
-	public void setInvoiceNumber(String invoiceNumber) {
-		this.invoiceNumber = invoiceNumber;
-	}
-
-	public BigDecimal getAmount() {
-		return amount;
-	}
-
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (obj != null)
-		{
-			if (obj instanceof InvoicingItem)
-			{
-				InvoicingItem item = (InvoicingItem)obj;
-
-				int thisId = this.getId();
-				int itemId = item.getId();
-				boolean equalsId = (thisId == itemId);
-
-				if (equalsId && (thisId == 0))
-				{
-					return super.equals(obj);
-				}
-				
-				return equalsId;
-			}
-		}
-		
-		return false;
-	}
-	
-}

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

@@ -1,6 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
 import info.bukova.isspst.StringUtils;
 
 import javax.persistence.Column;
@@ -14,7 +13,7 @@ public class MUnit extends BaseData
 	@Column(name = "NAME")
 	private String name;
 
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 
 	public String getName()

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

@@ -1,6 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
 import info.bukova.isspst.StringUtils;
 
 import javax.persistence.Column;
@@ -15,14 +14,11 @@ public class MUnitEmb
 	@Column(name = "MUNIT_NAME")
 	private String name;
 
-	@Column(name = "MUNIT_DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "MUNIT_DESCRIPTION")
 	private String description;
 
 	public MUnitEmb()
 	{
-		// Embeddable object is loaded by hibernate like NULL, if all properties
-		// are NULL. So, we set ID.
-		this.id = 0;
 	}
 
 	public MUnitEmb(MUnit munit)

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -21,7 +19,7 @@ import org.hibernate.annotations.LazyCollectionOption;
 
 @Entity
 @Table(name = "ORDERS")
-public class Order extends BaseData implements Cloneable
+public class Order extends BaseData
 {
 
 	@Column(name = "NUMSER")
@@ -37,7 +35,7 @@ public class Order extends BaseData implements Cloneable
 			@AttributeOverride(name = "company", column = @Column(name = "SUPPLIER_COMPANY")),
 			@AttributeOverride(name = "contactName", column = @Column(name = "SUPPLIER_CONTACT_NAME")),
 			@AttributeOverride(name = "department", column = @Column(name = "SUPPLIER_DEPARTMENT")),
-			@AttributeOverride(name = "description", column = @Column(name = "SUPPLIER_DESCRIPTION", length = Constants.LEN_DESCRIPTION)),
+			@AttributeOverride(name = "description", column = @Column(name = "SUPPLIER_DESCRIPTION")),
 			@AttributeOverride(name = "dic", column = @Column(name = "SUPPLIER_DIC")),
 			@AttributeOverride(name = "email", column = @Column(name = "SUPPLIER_EMAIL")),
 			@AttributeOverride(name = "houseNumber", column = @Column(name = "SUPPLIER_HOUSENUMBER")),
@@ -56,7 +54,7 @@ public class Order extends BaseData implements Cloneable
 			@AttributeOverride(name = "company", column = @Column(name = "INVOICE_COMPANY")),
 			@AttributeOverride(name = "contactName", column = @Column(name = "INVOICE_CONTACT_NAME")),
 			@AttributeOverride(name = "department", column = @Column(name = "INVOICE_DEPARTMENT")),
-			@AttributeOverride(name = "description", column = @Column(name = "INVOICE_DESCRIPTION", length = Constants.LEN_DESCRIPTION)),
+			@AttributeOverride(name = "description", column = @Column(name = "INVOICE_DESCRIPTION")),
 			@AttributeOverride(name = "dic", column = @Column(name = "INVOICE_DIC")),
 			@AttributeOverride(name = "email", column = @Column(name = "INVOICE_EMAIL")),
 			@AttributeOverride(name = "houseNumber", column = @Column(name = "INVOICE_HOUSENUMBER")),
@@ -75,7 +73,7 @@ public class Order extends BaseData implements Cloneable
 			@AttributeOverride(name = "company", column = @Column(name = "DELIVERY_COMPANY")),
 			@AttributeOverride(name = "contactName", column = @Column(name = "DELIVERY_CONTACT_NAME")),
 			@AttributeOverride(name = "department", column = @Column(name = "DELIVERY_DEPARTMENT")),
-			@AttributeOverride(name = "description", column = @Column(name = "DELIVERY_DESCRIPTION", length = Constants.LEN_DESCRIPTION)),
+			@AttributeOverride(name = "description", column = @Column(name = "DELIVERY_DESCRIPTION")),
 			@AttributeOverride(name = "dic", column = @Column(name = "DELIVERY_DIC")),
 			@AttributeOverride(name = "email", column = @Column(name = "DELIVERY_EMAIL")),
 			@AttributeOverride(name = "houseNumber", column = @Column(name = "DELIVERY_HOUSENUMBER")),
@@ -96,7 +94,7 @@ public class Order extends BaseData implements Cloneable
 	@Column(name = "DELIVERY_TYPE")
 	private String deliveryType;
 
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "order", orphanRemoval = true)
@@ -112,10 +110,20 @@ public class Order extends BaseData implements Cloneable
 	@Column(name = "DELIVERED")
 	private boolean delivered;
 
+	@Column(name = "INVOICED")
+	private boolean invoiced;
+
+	@Column(name = "INVOICE_NUMBER")
+	private String invoiceNumber;
+
+	@Column(name = "INVOICE_TOTAL", precision = 15, scale = 4)
+	private BigDecimal invoiceTotal;
+
 	public Order()
 	{
 		this.items = new ArrayList<OrderItem>();
 		this.total = BigDecimal.ZERO;
+		this.invoiceTotal = BigDecimal.ZERO;
 	}
 
 	public String getNumser()
@@ -224,6 +232,26 @@ public class Order extends BaseData implements Cloneable
 		this.delivered = delivered;
 	}
 
+	public boolean isInvoiced()
+	{
+		return invoiced;
+	}
+
+	public void setInvoiced(boolean invoiced)
+	{
+		this.invoiced = invoiced;
+	}
+
+	public String getInvoiceNumber()
+	{
+		return invoiceNumber;
+	}
+
+	public void setInvoiceNumber(String invoiceNumber)
+	{
+		this.invoiceNumber = invoiceNumber;
+	}
+
 	public boolean isOrdered()
 	{
 		return ordered;
@@ -254,29 +282,14 @@ public class Order extends BaseData implements Cloneable
 		this.total = total;
 	}
 
-	public boolean isIcludedRequirementItemFromAnotherOrder()
+	public BigDecimal getInvoiceTotal()
 	{
-		for (OrderItem oItem : this.getItems())
-		{
-			RequirementItem rItem = oItem.getReqItem();
-
-			if (rItem != null)
-			{
-				String orderNum = rItem.getOrderNum();
-				boolean isIncluded = ((orderNum != null) && !orderNum.isEmpty());
-				boolean isFromAnotherOrder = (isIncluded && !this.numser.equals(orderNum));
-				return isFromAnotherOrder;
-			}
-		}
-
-		return false;
+		return invoiceTotal;
 	}
 
-	@Override
-	public Object clone() throws CloneNotSupportedException
+	public void setInvoiceTotal(BigDecimal invoiceTotal)
 	{
-		Order cloned = (Order) super.clone();
-		cloned.setTotal(new BigDecimal(this.getTotal().toString()));
-		return cloned;
+		this.invoiceTotal = invoiceTotal;
 	}
+
 }

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.math.BigDecimal;
 
 import javax.persistence.Column;
@@ -16,53 +14,50 @@ import javax.persistence.Table;
 
 @Entity
 @Table(name = "ORDER_ITEM")
-public class OrderItem
-{
-
+public class OrderItem {
+	
 	@Id
-	@Column(name = "ID")
-	@GeneratedValue
+	@Column(name="ID")
+    @GeneratedValue
 	private int id;
-
+	
 	@Column(name = "CODE")
 	private String code;
-
+	
 	@Column(name = "NAME")
 	private String name;
 
 	@Column(name = "TEXTITEM")
 	private String textItem;
 
-	@Column(name = "QUANTITY", precision = 15, scale = 4)
+	@Column(name = "QUANTITY", precision=15, scale=4)
 	private BigDecimal quantity;
-
+	
 	@Embedded
 	private MUnitEmb munit;
 
-	@Column(name = "UNITPRICE", precision = 15, scale = 4)
+	@Column(name = "UNITPRICE", precision=15, scale=4)
 	private BigDecimal unitPrice;
 
-	@Column(name = "TOTAL", precision = 15, scale = 4)
+	@Column(name = "TOTAL", precision=15, scale=4)
 	private BigDecimal total;
 
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "REQUIREMENT_ITEM_ID")
 	private RequirementItem reqItem;
-
+	
 	@ManyToOne
 	@JoinColumn(name = "ORDER_ID")
 	private Order order;
-
-	public OrderItem()
-	{
+	
+	public OrderItem() {
 		super();
 	}
 
-	public OrderItem(RequirementItem reqItem)
-	{
+	public OrderItem(RequirementItem reqItem) {
 		super();
 		this.reqItem = reqItem;
 		this.code = reqItem.getCode();
@@ -75,113 +70,91 @@ public class OrderItem
 		this.description = reqItem.getDescription();
 	}
 
-	public int getId()
-	{
+	public int getId() {
 		return id;
 	}
 
-	public void setId(int id)
-	{
+	public void setId(int id) {
 		this.id = id;
 	}
 
-	public String getCode()
-	{
+	public String getCode() {
 		return code;
 	}
 
-	public void setCode(String code)
-	{
+	public void setCode(String code) {
 		this.code = code;
 	}
 
-	public String getName()
-	{
+	public String getName() {
 		return name;
 	}
 
-	public void setName(String name)
-	{
+	public void setName(String name) {
 		this.name = name;
 	}
 
-	public String getTextItem()
-	{
+	public String getTextItem() {
 		return textItem;
 	}
 
-	public void setTextItem(String textItem)
-	{
+	public void setTextItem(String textItem) {
 		this.textItem = textItem;
 	}
 
-	public BigDecimal getQuantity()
-	{
+	public BigDecimal getQuantity() {
 		return quantity;
 	}
 
-	public void setQuantity(BigDecimal quantity)
-	{
+	public void setQuantity(BigDecimal quantity) {
 		this.quantity = quantity;
 	}
 
-	public MUnitEmb getMunit()
-	{
+	public MUnitEmb getMunit() {
 		return munit;
 	}
 
-	public void setMunit(MUnitEmb munit)
-	{
+	public void setMunit(MUnitEmb munit) {
 		this.munit = munit;
 	}
 
-	public BigDecimal getUnitPrice()
-	{
+	public BigDecimal getUnitPrice() {
 		return unitPrice;
 	}
 
-	public void setUnitPrice(BigDecimal unitPrice)
-	{
+	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
 	}
 
-	public BigDecimal getTotal()
-	{
+	public BigDecimal getTotal() {
 		return total;
 	}
 
-	public void setTotal(BigDecimal total)
-	{
+	public void setTotal(BigDecimal total) {
 		this.total = total;
 	}
 
-	public String getDescription()
-	{
+	public String getDescription() {
 		return description;
 	}
 
-	public void setDescription(String description)
-	{
+	public void setDescription(String description) {
 		this.description = description;
 	}
 
-	public RequirementItem getReqItem()
-	{
+	public RequirementItem getReqItem() {
 		return reqItem;
 	}
 
-	public void setReqItem(RequirementItem reqItem)
-	{
+	public void setReqItem(RequirementItem reqItem) {
 		this.reqItem = reqItem;
 	}
 
-	public Order getOrder()
-	{
+	public Order getOrder() {
 		return order;
 	}
 
-	public void setOrder(Order order)
-	{
+	public void setOrder(Order order) {
 		this.order = order;
 	}
 

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -21,7 +19,7 @@ public class Permission extends BaseSimpleData implements GrantedAuthority {
 	
 	@Column(name="AUTHORITY")
 	private String authority;
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name="DESCRIPTION")
 	private String description;
 	@Column(name="MODULE")
 	private String module;

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

@@ -16,7 +16,7 @@ import javax.persistence.Table;
 @Table(name = "REQUIREMENT")
 public class Requirement extends RequirementBase
 {
-	@OneToMany(fetch = FetchType.LAZY, mappedBy = "requirement", cascade = CascadeType.ALL, orphanRemoval = true)
+	@OneToMany(fetch = FetchType.EAGER, mappedBy = "requirement", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<RequirementItem> items;
 
 	@Column(name = "DELIVERYDATE")
@@ -28,9 +28,6 @@ public class Requirement extends RequirementBase
 	@Column(name = "KIND")
 	private Long kind;
 
-	@Column(name = "PROJECT")
-	private Boolean project;
-
 	public Requirement()
 	{
 		this.setItems(new ArrayList<RequirementItem>());
@@ -81,39 +78,4 @@ public class Requirement extends RequirementBase
 	{
 		this.kind = kind;
 	}
-
-	public Boolean getProject()
-	{
-		return project;
-	}
-
-	public void setProject(Boolean project)
-	{
-		this.project = project;
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (obj != null)
-		{
-			if (obj instanceof Requirement)
-			{
-				Requirement item = (Requirement) obj;
-
-				int thisId = this.getId();
-				int itemId = item.getId();
-				boolean equalsId = (thisId == itemId);
-
-				if (equalsId && (thisId == 0))
-				{
-					return super.equals(obj);
-				}
-
-				return equalsId;
-			}
-		}
-
-		return false;
-	}
 }

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -34,7 +32,7 @@ public class RequirementBase extends BaseData implements FilterableRequirement {
 	private String numser;
 	@Column(name = "REQ_DATE")
 	private Date reqDate;
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "CENTRE_ID")
@@ -128,21 +126,5 @@ public class RequirementBase extends BaseData implements FilterableRequirement {
 	public void setWorkflow(List<Workflow> workflow) {
 		this.workflow = workflow;
 	}
-	
-	public User getLastApprover() {
-		if (authorization.isEmpty()) {
-			return null;
-		}
-		
-		return authorization.get(authorization.size() - 1).getApprover();
-	}
-	
-	public Date getLastApproveDate() {
-		if (authorization.isEmpty()) {
-			return null;
-		}
-		
-		return authorization.get(authorization.size() - 1).getAuthDate();
-	}
 
 }

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.math.BigDecimal;
 
 import javax.persistence.Column;
@@ -52,18 +50,12 @@ public class RequirementItem
 	@Column(name = "TOTAL", precision=15, scale=4)
 	private BigDecimal total;
 
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 	
 	@Column(name = "DELIVERED")
 	private Boolean delivered;
 
-	@Column(name = "ORDERNUM")
-	private String orderNum;
-	
-	@Column(name = "PAID")
-	private Boolean paid;
-
 	public int getId()
 	{
 		return id;
@@ -170,23 +162,8 @@ public class RequirementItem
 			if (obj instanceof RequirementItem)
 			{
 				RequirementItem item = (RequirementItem)obj;
-
-				int thisId = this.getId();
-				int itemId = item.getId();
-				boolean equalsId = (thisId == itemId);
-
-				if (equalsId && (thisId == 0))
-				{
-					// Při zadávání položek do gridu zatím nové položky nemají
-					// přiřazeno ID, takže se rozlišují podle reference
-					// Při hledání položky v seznamu nebo zjišťování indexu pak
-					// byly veškeré položky s ID = 0 a grid nevybíral aktivní
-					// položku správně, stejně tak nepřekresloval ani scrollbar
-					// a pod.
-					return super.equals(obj);
-				}
 				
-				return equalsId;
+				return (this.getId() == item.getId());
 			}
 		}
 		
@@ -210,22 +187,4 @@ public class RequirementItem
 	public void setDelivered(Boolean delivered) {
 		this.delivered = delivered;
 	}
-
-	public String getOrderNum()
-	{
-		return orderNum;
-	}
-
-	public void setOrderNum(String orderNum)
-	{
-		this.orderNum = orderNum;
-	}
-
-	public Boolean getPaid() {
-		return paid;
-	}
-
-	public void setPaid(Boolean paid) {
-		this.paid = paid;
-	}
 }

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.util.Date;
 
 import javax.persistence.Column;
@@ -44,9 +42,10 @@ public abstract class RequirementSubject implements OwnedDataModel {
 	private String code;
 	@Column(name = "NAME")
 	private String name;
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 	
+	
 	@NotEmpty(message = "{MaterialFormCodeConstr}")
 	public String getCode() {
 		return code;
@@ -141,16 +140,7 @@ public abstract class RequirementSubject implements OwnedDataModel {
 			{
 				RequirementSubject item = (RequirementSubject) obj;
 
-				int thisId = this.getId();
-				int itemId = item.getId();
-				boolean equalsId = (thisId == itemId);
-
-				if (equalsId && (thisId == 0))
-				{
-					return super.equals(obj);
-				}
-
-				return equalsId;
+				return (this.getId() == item.getId());
 			}
 		}
 

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

@@ -1,15 +1,13 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
+import javax.persistence.JoinColumn;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
@@ -24,7 +22,7 @@ public class RequirementType extends BaseData {
 	
 	@Column(name = "TYPE")
 	private String type;
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "DESCRIPTION")
 	private String description;
 	@OneToMany(cascade = CascadeType.ALL, orphanRemoval=true)
 	@LazyCollection(LazyCollectionOption.FALSE)

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,7 +25,7 @@ public class Role extends BaseSimpleData implements GrantedAuthority, DataModel
 	
 	@Column(name="AUTHORITY", unique=true)
 	private String authority;
-	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name="DESCRIPTION")
 	private String description;
 	@ManyToMany
 	@LazyCollection(LazyCollectionOption.FALSE)

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -35,7 +33,7 @@ public class TripBillItem extends BaseData {
 	@Embedded
 	@AttributeOverrides({
 		@AttributeOverride(name = "code", column = @Column(name = "BACK_VEHICLE_CODE")),
-			@AttributeOverride(name = "description", column = @Column(name = "BACK_VEHICLE_DESCRIPTION", length = Constants.LEN_DESCRIPTION))
+		@AttributeOverride(name = "description", column = @Column(name = "BACK_VEHICLE_DESCRIPTION"))
 	})
 	private Vehicle backVehicle;
 	@Column(name = "BEGIN_WORK")

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

@@ -26,7 +26,7 @@ public class TripRequirement extends RequirementBase {
 	private String to;
 	@Column(name = "TRIP_DATE")
 	private Date tripDate;
-	@Column(name = "END")
+	@Column(name = "TRIP_END")
 	private String end;
 	@Column(name = "END_DATE")
 	private Date endDate;

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

@@ -17,7 +17,7 @@ import javax.persistence.Table;
 import org.springframework.security.core.userdetails.UserDetails;
 
 @Entity
-@Table(name="USER")
+@Table(name="USER_LOGIN")
 public class User extends Member implements UserDetails, DataModel {
 
 	/**

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

@@ -1,7 +1,5 @@
 package info.bukova.isspst.data;
 
-import info.bukova.isspst.Constants;
-
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
@@ -10,7 +8,7 @@ public class Vehicle {
 	
 	@Column(name = "VEHICLE_CODE")
 	private String code;
-	@Column(name = "VEHICLE_DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Column(name = "VEHICLE_DESCRIPTION")
 	private String description;
 
 	public String getCode() {

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

@@ -1,76 +0,0 @@
-package info.bukova.isspst.filters;
-
-import info.bukova.isspst.DateTimeUtils;
-import info.bukova.isspst.StringUtils;
-import info.bukova.isspst.data.Invoicing;
-import info.bukova.isspst.data.Requirement;
-import info.bukova.isspst.data.User;
-import info.bukova.isspst.data.Workgroup;
-
-import org.hamcrest.Description;
-import org.hamcrest.Factory;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-
-public class InvoicingFilter implements Filter<Invoicing>
-{
-
-	private Invoicing condition;
-
-	public InvoicingFilter(Invoicing cond)
-	{
-		this.condition = cond;
-	}
-
-	private static class InvoicingMatcher extends TypeSafeMatcher<Invoicing>
-	{
-
-		private Invoicing condition;
-
-		public InvoicingMatcher(Invoicing cond)
-		{
-			this.condition = cond;
-			
-			if (condition.getRequirement() == null) {
-				condition.setRequirement(new Requirement());
-			}
-		}
-
-		@Override
-		public void describeTo(Description desc)
-		{
-			desc.appendText("Invoicing matches");
-		}
-
-		@Override
-		public boolean matchesSafely(Invoicing item)
-		{
-			boolean foundNumser = StringUtils.isEqualForFilter(item.getRequirement().getNumser(), condition.getRequirement().getNumser());
-			boolean foundReqDate = DateTimeUtils.isEqualByDateForFilter(item.getRequirement().getReqDate(), condition.getRequirement().getReqDate());
-			boolean foundCenter = Workgroup.isEqualByWorkgroupForFilter(item.getRequirement().getCentre(), condition.getRequirement().getCentre());
-			boolean foundWorkgroup = Workgroup.isEqualByWorkgroupForFilter(item.getRequirement().getWorkgroup(), condition.getRequirement().getWorkgroup());
-			boolean foundUser = User.isEqualByUserForFilter(item.getRequirement().getOwnedBy(), condition.getRequirement().getOwnedBy());
-			boolean foundDescription = StringUtils.isEqualForFilter(item.getRequirement().getDescription(), condition.getRequirement().getDescription());
-			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundWorkgroup && foundUser);
-		}
-
-		@Factory
-		public static Matcher<Invoicing> matchBuilding(Invoicing building)
-		{
-			return new InvoicingMatcher(building);
-		}
-	}
-
-	@Override
-	public InvoicingMatcher matcher()
-	{
-		return new InvoicingMatcher(condition);
-	}
-
-	@Override
-	public String queryString()
-	{
-		return "";
-	}
-
-}

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

@@ -42,24 +42,27 @@ public class OrderFilter implements Filter<Order>
 		@Override
 		public boolean matchesSafely(Order item)
 		{
-			boolean foundOrdered = (item.isOrdered() == condition.isOrdered());
 			boolean foundNumSer = StringUtils.isEqualForFilter(item.getNumser(), condition.getNumser());
 			boolean foundOrderDate = DateTimeUtils.isEqualByDateForFilter(item.getOrderDate(), condition.getOrderDate());
 			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());
 			boolean foundOwnedBy = User.isEqualByUserForFilter(item.getOwnedBy(), condition.getOwnedBy());
 			boolean foundDescription = StringUtils.isEqualForFilter(item.getDescription(), condition.getDescription());
-			return (foundOrdered
-					&& foundNumSer
+			return (foundNumSer
 					&& foundOrderDate
 					&& foundTotal
 					&& foundDeliveryDate
 					&& foundDeliveredDate
+					&& foundInvoiceNumber
+					&& foundInvoiceTotal
 					&& foundSupplierAddr
 					&& foundDeliveryAddr
 					&& foundInvoiceAddr

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

@@ -1,6 +1,5 @@
 package info.bukova.isspst.filters;
 
-import info.bukova.isspst.BooleanUtils;
 import info.bukova.isspst.DateTimeUtils;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.Requirement;
@@ -47,8 +46,7 @@ public class RequirementFilter implements Filter<Requirement>
 			boolean foundDescription = StringUtils.isEqualForFilter(item.getDescription(), condition.getDescription());
 			boolean foundDeliveryDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveryDate(), condition.getDeliveryDate());
 			boolean foundUser = User.isEqualByUserForFilter(item.getOwnedBy(), condition.getOwnedBy());
-			boolean foundProject = BooleanUtils.isEqualByBoolean(item.getProject(), condition.getProject());
-			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundDeliveryDate && foundUser && foundProject);
+			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundDeliveryDate && foundUser);
 		}
 
 		@Factory

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

@@ -3,7 +3,6 @@ package info.bukova.isspst.filters;
 import info.bukova.isspst.DateTimeUtils;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.TripRequirement;
-import info.bukova.isspst.data.User;
 
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
@@ -46,7 +45,7 @@ public class TripRequirementFilter implements Filter<TripRequirement>
 			boolean foundTo = StringUtils.isEqualForFilter(item.getTo(), condition.getTo());
 			boolean foundWorkgroup = (condition.getWorkgroup() == null ||(item.getWorkgroup() != null && item.getWorkgroup().equals(condition.getWorkgroup())));
 			boolean foundCentre = (condition.getCentre() == null || (item.getCentre() != null && item.getCentre().equals(condition.getCentre())));
-			boolean foundOwner = User.isEqualByUserForFilter(item.getOwnedBy(), condition.getOwnedBy());
+			boolean foundOwner = StringUtils.isEqualForFilter(item.getOwnedBy().getLastName(), condition.getOwnedBy().getLastName());
 			return foundNumser && foundReqDate && foundDescription && foundFrom && foundTo && foundWorkgroup && foundCentre && foundOwner;
 		}
 

src/main/java/info/bukova/isspst/mail/EntityMessageBuilder.java

@@ -1,8 +1,5 @@
 package info.bukova.isspst.mail;
 
-import info.bukova.isspst.EntityUrlResolver;
-import info.bukova.isspst.UrlResolverHolder;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +12,6 @@ public class EntityMessageBuilder implements MessageBuilder {
 	
 	private final static Logger logger = LoggerFactory.getLogger(EntityMessageBuilder.class);
 	private boolean html;
-	private UrlResolverHolder urlResolverHolder;
 
 	public void setHtml(boolean html) {
 		this.html = html;
@@ -57,11 +53,7 @@ public class EntityMessageBuilder implements MessageBuilder {
 		
 		for (String p : properties) {
 			try {
-				if (p.equals("-url-")) {
-					ret = ret.replaceAll("\\[" + p + "\\]", getUrl(data));
-				} else {
-					ret = ret.replaceAll("\\[" + p + "\\]", BeanUtils.getProperty(data, p));
-				}
+				ret = ret.replaceAll("\\[" + p + "\\]", BeanUtils.getProperty(data, p));
 			} catch (IllegalAccessException e) {
 				logger.error(e.getMessage());
 			} catch (InvocationTargetException e) {
@@ -75,18 +67,5 @@ public class EntityMessageBuilder implements MessageBuilder {
 		
 		return ret;
 	}
-	
-	private String getUrl(Object data) {
-		if (urlResolverHolder == null) {
-			return "";
-		}
-		
-		EntityUrlResolver res = urlResolverHolder.resolverFor(data.getClass());
-		return res.entityUrl(data);
-	}
-
-	public void setUrlResolverHolder(UrlResolverHolder urlResolverHolder) {
-		this.urlResolverHolder = urlResolverHolder;
-	}
 
 }

src/main/java/info/bukova/isspst/mail/MailerWithAttachement.java

@@ -42,10 +42,6 @@ public class MailerWithAttachement implements Mailer {
 					message.setFrom(from);
 				}
 			}
-			
-			if (message.getReplyTo() == null) {
-				message.setReplyTo(message.getFrom());
-			}
 
 			helper.setFrom(message.getFrom());
 			helper.setReplyTo(message.getReplyTo());
@@ -67,7 +63,6 @@ public class MailerWithAttachement implements Mailer {
 		}
 		try {
 			sender.send(mimeMessage);
-			logger.info("Mail queued for send");
 		} catch (MailAuthenticationException e) {
 			logger.error("Authentication error");
 		} catch (MailSendException e) {

src/main/java/info/bukova/isspst/security/AbstractRequirementEvaluator.java

@@ -30,10 +30,6 @@ public abstract class AbstractRequirementEvaluator extends AbstractModuleEvaluat
 			return req.getState() == RequirementState.NEW;
 		}
 		
-		if (permission.equals(Constants.PERM_DELETE_NEW)) {
-			return req.getState() == RequirementState.NEW;
-		}
-		
 		return true;
 	}
 

src/main/java/info/bukova/isspst/security/AuthMethod.java

@@ -1,9 +0,0 @@
-package info.bukova.isspst.security;
-
-public enum AuthMethod {
-	
-	DATABASE,
-	LDAP,
-	AD
-
-}

src/main/java/info/bukova/isspst/security/AuthPopulator.java

@@ -23,7 +23,6 @@ public class AuthPopulator implements LdapAuthoritiesPopulator {
 	public AuthPopulator(UserService userService, RoleService roleService) {
 		this.userService = userService;
 		this.roleService = roleService;
-		userService.setAuthMethod(AuthMethod.LDAP);
 	}
 
 	@Override

src/main/java/info/bukova/isspst/security/WorkgroupAwareServiceEvaluator.java

@@ -1,13 +1,11 @@
 package info.bukova.isspst.security;
 
 import info.bukova.isspst.Constants;
-import info.bukova.isspst.Module;
 import info.bukova.isspst.data.Permission;
 import info.bukova.isspst.data.PermissionType;
 import info.bukova.isspst.data.Role;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
-import info.bukova.isspst.services.Service;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 
 import java.util.List;
@@ -41,31 +39,11 @@ public class WorkgroupAwareServiceEvaluator implements Evaluator {
 		}
 		
 		User user = (User)authentication.getPrincipal();
-		String moduleId = "";
-		
-		if (targetDomainObject instanceof Service<?>) {
-			Service<?> service = (Service<?>)targetDomainObject;
-			Module mod = service.getModule();
-			
-			if (mod != null) {
-				moduleId = mod.getId();
-			}
-		}
-		
-		// TODO - v master větvi je na toto pomocná třída
-		/*for (Module m : Constants.MODULES) {
-			if (m.getServiceClass() != null && m.getServiceClass().isAssignableFrom(targetDomainObject.getClass())) {
-				moduleId = m.getId();
-				break;
-			}
-		}*/
 		
 		Permission appPermission = null;
 		for (Permission p : Constants.SPECIAL_PERMISSIONS) {
-			if (p.getAuthority().equals(permission) 
-					&& p.getModule().equals(moduleId)) {
+			if (p.getAuthority().equals(permission)) {
 				appPermission = p;
-				break;
 			}
 		}
 
@@ -88,8 +66,7 @@ public class WorkgroupAwareServiceEvaluator implements Evaluator {
 			
 			for (Role r : wgRoles) {
 				for (Permission p : r.getPermissions()) {
-					if (p.getAuthority().equals(appPermission.getAuthority())
-							&& p.getModule().equals(appPermission.getModule())) {
+					if (p.getAuthority().equals(appPermission.getAuthority())) {
 						return true;
 					}
 				}

src/main/java/info/bukova/isspst/services/AbstractService.java

@@ -59,10 +59,6 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 		return "";
 	}
 	
-	public String getDeleteEntityPermission() {
-		return "";
-	}
-	
 	@Override
 	@PreAuthorize("hasPermission(this, 'PERM_ADD')")
 	public final T create() {
@@ -97,7 +93,7 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 
 	@Override
 	@Transactional
-	@PreAuthorize("hasPermission(this, 'PERM_DELETE') or hasPermission(#entity, this.getDeleteEntityPermission())")
+	@PreAuthorize("hasPermission(this, 'PERM_DELETE')")
 	public void delete(T entity) {
 		if (dao == null) {
 			throw new IsspstException("DAO is null");

src/main/java/info/bukova/isspst/services/approved/ApprovedService.java

@@ -1,4 +1,4 @@
-package info.bukova.isspst.services.orders;
+package info.bukova.isspst.services.approved;
 
 import info.bukova.isspst.data.JoinedItem;
 import info.bukova.isspst.services.Service;

src/main/java/info/bukova/isspst/services/approved/ApprovedServiceImpl.java

@@ -1,13 +1,9 @@
-package info.bukova.isspst.services.orders;
+package info.bukova.isspst.services.approved;
 
-import info.bukova.isspst.Constants;
-import info.bukova.isspst.Module;
 import info.bukova.isspst.data.JoinedItem;
 import info.bukova.isspst.data.RequirementItem;
 import info.bukova.isspst.data.RequirementState;
 import info.bukova.isspst.data.Workgroup;
-import info.bukova.isspst.reporting.Report;
-import info.bukova.isspst.reporting.ReportType;
 import info.bukova.isspst.services.AbstractService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
@@ -38,14 +34,9 @@ public class ApprovedServiceImpl extends AbstractService<JoinedItem> implements
 	public List<JoinedItem> getAll()
 	{
 		List<Workgroup> wgList = workgroupService.getUserCentres(userService.getCurrent());
-		Query q = queryDao.getQuery("select item "
-				+ "from RequirementItem item left join item.requirement rq join rq.centre c "
-				+ "where rq.kind is not null "
-				+ "and rq.state = :state "
-				+ "and (rq.project Is Null or rq.project = false) "
-				+ "and c in (:wgList) "
-				+ "and (item.orderNum Is Null or item.orderNum = '')");
-		q.setParameterList("wgList", wgList);
+		Query q = queryDao
+.getQuery("select item from RequirementItem item left join item.requirement rq join rq.centre c where rq.kind is not null and rq.state = :state and c in (:wgList)");
+		q.setParameterList("wgList", wgList);		
 		q.setParameter("state", RequirementState.APPROVED);
 		List<JoinedItem> items = new ArrayList<JoinedItem>();
 
@@ -56,30 +47,7 @@ public class ApprovedServiceImpl extends AbstractService<JoinedItem> implements
 
 			items.add(new JoinedItem(it, it.getRequirement().getWorkgroup(), it.getRequirement().getCentre(), it.getRequirement().getOwnedBy()));
 		}
-
+		
 		return items;
 	}
-
-	@Override
-	public Module getModule() {
-		for (Module m : Constants.MODULES) {
-			if (m.getId() == Constants.MOD_REQUIREMENTS) {
-				return m;
-			}
-		}
-		
-		return null;
-	}
-
-	@Override
-	public List<Report> getReports() {
-		Report rep = new Report();
-		rep.setType(ReportType.DYNAMIC);
-		rep.setName(Constants.DYNAMIC_REPORT_NAME);
-		
-		List<Report> ret = new ArrayList<Report>();
-		ret.add(rep);
-		
-		return ret;
-	}
 }

src/main/java/info/bukova/isspst/services/approved/OrderService.java

@@ -1,4 +1,4 @@
-package info.bukova.isspst.services.orders;
+package info.bukova.isspst.services.approved;
 
 import info.bukova.isspst.data.JoinedItem;
 import info.bukova.isspst.data.Order;
@@ -22,5 +22,4 @@ public interface OrderService extends Service<Order> {
 
 	public BigDecimal calcSumTotalFromItems(List<OrderItem> items);
 
-	public void updateApprovedItems(Order order, boolean orderedChanged);
 }

src/main/java/info/bukova/isspst/services/approved/OrderServiceImpl.java

@@ -1,11 +1,9 @@
-package info.bukova.isspst.services.orders;
+package info.bukova.isspst.services.approved;
 
-import info.bukova.isspst.dao.RequirementItemDao;
 import info.bukova.isspst.data.AddressEmb;
 import info.bukova.isspst.data.JoinedItem;
 import info.bukova.isspst.data.Order;
 import info.bukova.isspst.data.OrderItem;
-import info.bukova.isspst.data.RequirementItem;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.services.AbstractOwnedService;
 import info.bukova.isspst.services.LazyLoader;
@@ -25,10 +23,7 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
 
 	@Autowired
 	private GlobalSettingsService globalSettings;
-
-	@Autowired
-	private RequirementItemDao requirementItemDao;
-
+	
 	@Override
 	@PreAuthorize("hasPermission(this, 'PERM_ADD')")
 	public Order createOrder(List<JoinedItem> items) {
@@ -52,13 +47,10 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
 	
 	@Override
 	@Transactional
-	public BigDecimal totalOrderedForWorkgroup(Workgroup workgroup)
-	{
-		Query q = dao.getQuery("select sum(oi.total) "
-				+ "from OrderItem oi join oi.reqItem ri join ri.requirement rq join rq.workgroup w "
-				+ "where (ri.orderNum is not null or ri.orderNum = '') and w = :workgroup ");
+	public BigDecimal totalOrderedForWorkgroup(Workgroup workgroup) {
+		Query q = dao.getQuery("select sum(oi.total) from OrderItem oi join oi.reqItem ri join ri.requirement rq join rq.workgroup w where ri.delivered = true and w = :workgroup");
 		q.setParameter("workgroup", workgroup);
-		return (BigDecimal) q.uniqueResult();
+		return (BigDecimal)q.uniqueResult();
 	}
 	
 	@Override
@@ -179,43 +171,4 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
 
 		return sumTotal;
 	}
-
-	@Transactional
-	@PreAuthorize("hasPermission(this, 'PERM_EDIT') or hasPermission(#entity, this.getUpdateEntityPermission())")
-	public void updateApprovedItems(Order order, boolean orderedChanged)
-	{
-		if (orderedChanged)
-		{
-			for (OrderItem item : order.getItems())
-			{
-				RequirementItem rItem = item.getReqItem();
-				
-				if (rItem != null)
-				{
-					rItem.setOrderNum(order.isOrdered() ? order.getNumser() : null);
-					requirementItemDao.modify(rItem);
-				}
-			}
-		}
-
-		super.update(order);
-	}
-
-	@Override
-	@Transactional
-	@PreAuthorize("hasPermission(this, 'PERM_DELETE') or hasPermission(#entity, this.getDeleteEntityPermission())")
-	public void delete(Order order) {
-		for (OrderItem item : order.getItems())
-		{
-			RequirementItem rItem = item.getReqItem();
-			
-			if (rItem != null)
-			{
-				rItem.setOrderNum(null);
-				requirementItemDao.modify(rItem);
-			}
-		}
-		
-		super.delete(order);
-	}
 }

src/main/java/info/bukova/isspst/services/dbinfo/DbInfoService.java

@@ -1,11 +0,0 @@
-package info.bukova.isspst.services.dbinfo;
-
-import info.bukova.isspst.data.DbInfo;
-import info.bukova.isspst.services.Service;
-
-public interface DbInfoService extends Service<DbInfo>
-{
-	public void changeDatabase();
-
-	public void updateDatabaseVersion();
-}

src/main/java/info/bukova/isspst/services/dbinfo/DbInfoServiceImpl.java

@@ -1,134 +0,0 @@
-package info.bukova.isspst.services.dbinfo;
-
-import info.bukova.isspst.Constants;
-import info.bukova.isspst.data.DbInfo;
-import info.bukova.isspst.services.AbstractService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.SQLQuery;
-import org.springframework.transaction.annotation.Transactional;
-
-public class DbInfoServiceImpl extends AbstractService<DbInfo> implements DbInfoService
-{
-	private DbInfo getDbInfo()
-	{
-		DbInfo dbInfo = null;
-
-		List<DbInfo> list = this.getAll();
-
-		if (list.isEmpty())
-		{
-			dbInfo = new DbInfo();
-			this.add(dbInfo);
-			list = this.getAll();
-		}
-
-		for (DbInfo item : list)
-		{
-			dbInfo = item;
-			break;
-		}
-
-		return dbInfo;
-	}
-
-	@Override
-	@Transactional
-	public void changeDatabase()
-	{
-		class Str2Str
-		{
-			private String key;
-			private String value;
-
-			public Str2Str(String key, String value)
-			{
-				this.key = key;
-				this.value = value;
-			}
-
-			public String getKey()
-			{
-				return this.key;
-			}
-
-			public String getValue()
-			{
-				return this.value;
-			}
-		}
-
-		long dbVersion = this.getDbInfo().getVersion();
-
-		if (Constants.DB_VERSION > dbVersion)
-		{
-			SQLQuery sq = null;
-			String sql = "";
-
-			if (dbVersion < 1)
-			{
-				List<Str2Str> tables = new ArrayList<Str2Str>();
-
-				tables.add(new Str2Str("address", "DESCRIPTION"));
-				tables.add(new Str2Str("building", "DESCRIPTION"));
-				tables.add(new Str2Str("material", "DESCRIPTION"));
-				tables.add(new Str2Str("munit", "DESCRIPTION"));
-				tables.add(new Str2Str("orders", "DESCRIPTION"));
-				tables.add(new Str2Str("order_item", "DESCRIPTION"));
-				tables.add(new Str2Str("permission", "DESCRIPTION"));
-				tables.add(new Str2Str("requirement", "DESCRIPTION"));
-				tables.add(new Str2Str("requirementtype", "DESCRIPTION"));
-				tables.add(new Str2Str("requirement_items", "DESCRIPTION"));
-				tables.add(new Str2Str("role", "DESCRIPTION"));
-				tables.add(new Str2Str("service", "DESCRIPTION"));
-				tables.add(new Str2Str("triprequirement", "DESCRIPTION"));
-
-				tables.add(new Str2Str("material", "MUNIT_DESCRIPTION"));
-				tables.add(new Str2Str("orders", "INVOICE_DESCRIPTION"));
-				tables.add(new Str2Str("orders", "DELIVERY_DESCRIPTION"));
-				tables.add(new Str2Str("orders", "SUPPLIER_DESCRIPTION"));
-				tables.add(new Str2Str("order_item", "MUNIT_DESCRIPTION"));
-				tables.add(new Str2Str("requirement_items", "MUNIT_DESCRIPTION"));
-				tables.add(new Str2Str("triprequirement", "VEHICLE_DESCRIPTION"));
-				tables.add(new Str2Str("trip_bill_items", "BACK_VEHICLE_DESCRIPTION"));
-				tables.add(new Str2Str("trip_bill_items", "VEHICLE_DESCRIPTION"));
-
-				for (Str2Str item : tables)
-				{
-					sql = "ALTER TABLE " + item.getKey() + " MODIFY " + item.getValue() + " VARCHAR(" + String.valueOf(Constants.LEN_DESCRIPTION) + ")";
-					sq = this.dao.getSession().createSQLQuery(sql);
-					sq.executeUpdate();
-				}
-			}
-
-			if (dbVersion < 2)
-			{
-				List<String> tables = new ArrayList<String>();
-
-				tables.add("material");
-				tables.add("order_item");
-				tables.add("requirement_items");
-				
-				for (String item : tables)
-				{
-					sql = "UPDATE " + item + " SET MUNIT_ID = 0 WHERE (MUNIT_ID Is NULL) ";
-					sq = this.dao.getSession().createSQLQuery(sql);
-					sq.executeUpdate();
-				}
-			}
-
-			this.updateDatabaseVersion();
-		}
-	}
-
-	@Override
-	@Transactional
-	public void updateDatabaseVersion()
-	{
-		DbInfo dbInfo = this.getDbInfo();
-		dbInfo.setVersion(Constants.DB_VERSION);
-		this.update(dbInfo);
-	}
-}

src/main/java/info/bukova/isspst/services/invoicing/InvoicingService.java

@@ -1,19 +0,0 @@
-package info.bukova.isspst.services.invoicing;
-
-import java.math.BigDecimal;
-
-import info.bukova.isspst.data.Invoicing;
-import info.bukova.isspst.data.Workgroup;
-import info.bukova.isspst.services.Service;
-
-public interface InvoicingService extends Service<Invoicing> {
-	
-	public BigDecimal totalInvoicedForWorkgroup(Workgroup workgroup);
-	
-	public void loadReqItems(Invoicing invoicing);
-	
-	public void loadItems(Invoicing invoicing);
-	
-	public void calculate(Invoicing invoicing);
-
-}

src/main/java/info/bukova/isspst/services/invoicing/InvoicingServiceImpl.java

@@ -1,68 +0,0 @@
-package info.bukova.isspst.services.invoicing;
-
-import info.bukova.isspst.data.Invoicing;
-import info.bukova.isspst.data.InvoicingItem;
-import info.bukova.isspst.data.Workgroup;
-import info.bukova.isspst.services.AbstractOwnedService;
-import info.bukova.isspst.services.LazyLoader;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.hibernate.Hibernate;
-import org.hibernate.Query;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
-
-public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implements
-		InvoicingService {
-
-	@Override
-	@Transactional
-	public BigDecimal totalInvoicedForWorkgroup(Workgroup workgroup) {
-		Query q = dao.getQuery("select sum(inv.totalInvoiced) "
-				+ "from Invoicing inv join inv.requirement rq join rq.workgroup w "
-				+ "where w = :workgroup ");
-		q.setParameter("workgroup", workgroup);
-		return (BigDecimal) q.uniqueResult();
-	}
-
-	@Override
-	@Transactional
-	@LazyLoader("form")
-	public void loadReqItems(Invoicing invoicing) {
-		Invoicing inv = getById(invoicing.getId());
-		Hibernate.initialize(inv.getRequirement().getItems());
-		invoicing.getRequirement().setItems(inv.getRequirement().getItems());
-	}
-
-	@Override
-	@Transactional
-	@LazyLoader({"form", "grid"})
-	public void loadItems(Invoicing invoicing) {
-		Invoicing inv = getById(invoicing.getId());
-		Hibernate.initialize(inv.getItems());
-		invoicing.setItems(inv.getItems());
-	}
-
-	@Override
-	public void calculate(Invoicing invoicing) {
-		BigDecimal total = BigDecimal.ZERO;
-		
-		for (InvoicingItem item : invoicing.getItems()) {
-			total = total.add(item.getAmount());
-		}
-		
-		invoicing.setTotalInvoiced(total);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	@Transactional
-	@PreAuthorize("hasPermission(this, 'PERM_READ')")
-	public List<Invoicing> getAll() {
-		Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy order by rq.numser");
-		return q.list();
-	}
-
-}

src/main/java/info/bukova/isspst/services/requirement/ReqMaterialServiceImpl.java

@@ -38,8 +38,9 @@ public class ReqMaterialServiceImpl extends RequirementServiceImpl implements Re
 	@PreAuthorize("hasPermission(this, 'PERM_READ')")
 	public List<Requirement> getMy()
 	{
-		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and kind = :kind");
+		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and state != :state and kind = :kind");
 		q.setParameter("owner", getLoggedInUser());
+		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
 		return q.list();
 	}
@@ -52,8 +53,9 @@ public class ReqMaterialServiceImpl extends RequirementServiceImpl implements Re
 	public List<Requirement> getCentreReq()
 	{
 		List<Workgroup> wgList = workgroupService.getUserCentres(getLoggedInUser());
-		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where c in (:wgList) and kind = :kind order by tr.numser");
+		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where tr.state != :state and c in (:wgList) and kind = :kind order by tr.numser");
 		q.setParameterList("wgList", wgList);
+		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
 		return q.list();
 	}
@@ -68,8 +70,9 @@ public class ReqMaterialServiceImpl extends RequirementServiceImpl implements Re
 		List<Workgroup> wgList = workgroupService.getUserWorkgroups(getLoggedInUser());
 		Query q = dao.getQuery("select tr from "
 				+ dao.getEntityName()
-				+ " tr join fetch tr.ownedBy join tr.workgroup w where w in (:wgList) and kind = :kind order by tr.numser");
+				+ " tr join fetch tr.ownedBy join tr.workgroup w where tr.state != :state and w in (:wgList) and kind = :kind order by tr.numser");
 		q.setParameterList("wgList", wgList);
+		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
 		return q.list();
 	}

src/main/java/info/bukova/isspst/services/requirement/ReqServicesServiceImpl.java

@@ -38,8 +38,9 @@ public class ReqServicesServiceImpl extends RequirementServiceImpl implements Re
 	@PreAuthorize("hasPermission(this, 'PERM_READ')")
 	public List<Requirement> getMy()
 	{
-		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and kind = :kind");
+		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and state != :state and kind = :kind");
 		q.setParameter("owner", getLoggedInUser());
+		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
 		return q.list();
 	}
@@ -52,8 +53,9 @@ public class ReqServicesServiceImpl extends RequirementServiceImpl implements Re
 	public List<Requirement> getCentreReq()
 	{
 		List<Workgroup> wgList = workgroupService.getUserCentres(getLoggedInUser());
-		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where c in (:wgList) and kind = :kind order by tr.numser");
+		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where tr.state != :state and c in (:wgList) and kind = :kind order by tr.numser");
 		q.setParameterList("wgList", wgList);
+		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
 		return q.list();
 	}
@@ -68,8 +70,9 @@ public class ReqServicesServiceImpl extends RequirementServiceImpl implements Re
 		List<Workgroup> wgList = workgroupService.getUserWorkgroups(getLoggedInUser());
 		Query q = dao.getQuery("select tr from "
 				+ dao.getEntityName()
-				+ " tr join fetch tr.ownedBy join tr.workgroup w where w in (:wgList) and kind = :kind order by tr.numser");
+				+ " tr join fetch tr.ownedBy join tr.workgroup w where tr.state != :state and w in (:wgList) and kind = :kind order by tr.numser");
 		q.setParameterList("wgList", wgList);
+		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
 		return q.list();
 	}

src/main/java/info/bukova/isspst/services/requirement/RequirementBaseService.java

@@ -6,14 +6,6 @@ import info.bukova.isspst.services.Service;
 
 import java.util.List;
 
-/**
- * @author Pepa Rokos
- * @author Franta Přibyl
- * 
- * Základní rozhraní všech požadavků.
- *
- * @param <T> Třída požadavku.
- */
 public interface RequirementBaseService<T extends RequirementBase> extends Service<T>
 {
 

src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java

@@ -30,14 +30,6 @@ import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 
-/**
- * @author Pepa Rokos
- * @author Franta Přibyl
- *
- * Abstraktní bázová třída všech požadavků
- *
- * @param <T> Třída požadavku
- */
 public abstract class RequirementBaseServiceImpl<T extends RequirementBase> extends
 		AbstractOwnedService<T> implements RequirementBaseService<T> {
 	
@@ -76,11 +68,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		
 		super.add(entity);
 		
-		if (canApprove(entity)) {
-			approve(entity);
-		} else {
-			this.sendToApprovers(entity);
-		}
+		this.sendToApprovers(entity);
 	}
 	
 	private void checkEnable() {
@@ -232,10 +220,12 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		} else {
 			e.setState(RequirementState.PARTIALLY);
 		}
+		entity.setState(e.getState());
+		entity.getAuthorization().add(auth);
 		
 		super.update(e);
 		
-		if (!autoApprove(e)) {
+		if (!autoApprove(entity)) {
 			this.sendToApprovers(e);
 			
 			SettingsData settings = settingsService.getSettings();
@@ -257,8 +247,6 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 				}
 			}
 		}
-		
-		postApprove(e);
 	}
 	
 	@Override
@@ -267,25 +255,10 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 	public void approve(T entity) {
 		approve(entity, getLoggedInUser());
 	}
-
-	/**
-	 * Volá se z metody approve pro automatické schválení dalším schvalovatelem v pořadí. Metoda z báze nedělá nic.
-	 * 
-	 * @param entity Požadavek
-	 * @return true pokud se provedlo automatické schválení.
-	 */
+	
 	protected boolean autoApprove(T entity) {
 		return false;
 	}
-	
-	/**
-	 * Činnost prováděná po schválení požadavku (i dílčím schválení).
-	 * 
-	 * @param entity Požadavek
-	 */
-	protected void postApprove(T entity) {
-		
-	}
 
 	@Override
 	@Transactional
@@ -334,8 +307,9 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 	@PreAuthorize("hasPermission(this, 'PERM_READ')")
 	public List<T> getMy()
 	{
-		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner");
+		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and state != :state");
 		q.setParameter("owner", getLoggedInUser());
+		q.setParameter("state", RequirementState.APPROVED);
 		return q.list();
 	}
 
@@ -347,8 +321,9 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 	public List<T> getCentreReq()
 	{
 		List<Workgroup> wgList = workgroupService.getUserCentres(getLoggedInUser());
-		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where c in (:wgList) order by tr.numser");
+		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.centre c where tr.state != :state and c in (:wgList) order by tr.numser");
 		q.setParameterList("wgList", wgList);
+		q.setParameter("state", RequirementState.APPROVED);
 		return q.list();
 	}
 
@@ -360,8 +335,9 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 	public List<T> getWorkgroupReq()
 	{
 		List<Workgroup> wgList = workgroupService.getUserWorkgroups(getLoggedInUser());
-		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.workgroup w where w in (:wgList) order by tr.numser");
+		Query q = dao.getQuery("select tr from " + dao.getEntityName() + " tr join fetch tr.ownedBy join tr.workgroup w where tr.state != :state and w in (:wgList) order by tr.numser");
 		q.setParameterList("wgList", wgList);
+		q.setParameter("state", RequirementState.APPROVED);
 		return q.list();
 	}
 
@@ -379,10 +355,5 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 	public String getUpdateEntityPermission() {
 		return Constants.PERM_EDIT_NEW;
 	}
-	
-	@Override
-	public String getDeleteEntityPermission() {
-		return Constants.PERM_DELETE_NEW;
-	}
 
 }

src/main/java/info/bukova/isspst/services/requirement/RequirementService.java

@@ -6,18 +6,9 @@ import info.bukova.isspst.data.RequirementItem;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * @author Pepa Rokos
- * @author Franta Přibyl
- * 
- * Základní rozhraní požadavků na služby a materiál.
- *
- */
 public interface RequirementService extends RequirementBaseService<Requirement>
 {
 	public void loadGroups(Requirement req);
-	
-	public void loadItems(Requirement req);
 
 	public BigDecimal calcTotalFromItem(RequirementItem item);
 
@@ -26,6 +17,4 @@ public interface RequirementService extends RequirementBaseService<Requirement>
 	public RequirementItem calcItemValuesFromItemTotal(RequirementItem item);
 
 	public BigDecimal calcSumTotalFromItems(List<RequirementItem> items);
-	
-	public BigDecimal getInvoicedAmount(Requirement req);
 }

src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java

@@ -1,7 +1,6 @@
 package info.bukova.isspst.services.requirement;
 
 import info.bukova.isspst.Constants;
-import info.bukova.isspst.data.Invoicing;
 import info.bukova.isspst.data.Requirement;
 import info.bukova.isspst.data.RequirementItem;
 import info.bukova.isspst.data.RequirementState;
@@ -9,31 +8,22 @@ import info.bukova.isspst.data.RequirementSubject;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workflow;
 import info.bukova.isspst.services.LazyLoader;
-import info.bukova.isspst.services.invoicing.InvoicingService;
+import info.bukova.isspst.services.approved.OrderService;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-import org.hibernate.Hibernate;
-import org.hibernate.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-/**
- * @author Pepa Rokos
- * @author Franta Přibyl
- * 
- * Bázová třída požadavků na materiál a služby.
- *
- */
 public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requirement> implements RequirementService, RequirementBaseService<Requirement>
 {
 
 	@Autowired
 	private RequirementTypeService reqTypeService;
 	@Autowired
-	private InvoicingService invoicingService;
+	private OrderService orderService;
 
 	@Override
 	protected Requirement createEntity()
@@ -58,8 +48,7 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
 			return false;
 		}
 
-		if ((entity.getSumTotal() != null) 
-				&& (entity.getSumTotal().compareTo(nextWf.getLimit()) == -1))
+		if (entity.getSumTotal().compareTo(nextWf.getLimit()) == -1)
 		{
 			approve(entity, approvers.get(0));
 			return true;
@@ -74,7 +63,7 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
 		if (entity.getWorkgroup() != null && entity.getWorkgroup().getLimit() != null && entity.getWorkgroup().getLimit().compareTo(BigDecimal.ZERO) != 0)
 		{
 
-			BigDecimal total = invoicingService.totalInvoicedForWorkgroup(entity.getWorkgroup());
+			BigDecimal total = orderService.totalOrderedForWorkgroup(entity.getWorkgroup());
 
 			if (total == null)
 			{
@@ -146,19 +135,6 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
 		// materiálů a služeb konzistentní
 		req.setItems(items);
 	}
-	
-	@Override
-	@Transactional
-	@LazyLoader("form")
-	public void loadItems(Requirement req) {
-		if (req == null) {
-			return;
-		}
-		
-		Requirement r = getById(req.getId());
-		Hibernate.initialize(r.getItems());
-		req.setItems(r.getItems());
-	}
 
 	@Override
 	public BigDecimal calcTotalFromItem(RequirementItem item)
@@ -232,24 +208,4 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
 
 		return sumTotal;
 	}
-
-	@Override
-	protected void postApprove(Requirement entity) {
-		if (entity.getState() == RequirementState.APPROVED) {
-			Invoicing inv = new Invoicing();
-			inv.setRequirement(entity);
-			invoicingService.add(inv);
-		}
-	}
-
-	@Override
-	@Transactional
-	public BigDecimal getInvoicedAmount(Requirement req) {
-		Query query = dao.getQuery("select invoice from Invoicing invoice join invoice.requirement rq where rq.id = :reqId");
-		query.setParameter("reqId", req.getId());
-		
-		Invoicing inv = (Invoicing) query.uniqueResult();
-		
-		return inv != null ? inv.getTotalInvoiced() : null;
-	}
 }

src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java

@@ -5,7 +5,6 @@ import info.bukova.isspst.data.NumberSeries;
 import info.bukova.isspst.data.RequirementState;
 import info.bukova.isspst.data.TripBill;
 import info.bukova.isspst.data.TripRequirement;
-import info.bukova.isspst.data.User;
 import info.bukova.isspst.services.LazyLoader;
 import info.bukova.isspst.services.tripbill.TripBillService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
@@ -14,6 +13,7 @@ import java.util.Date;
 
 import org.hibernate.LazyInitializationException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 
 public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripRequirement>
@@ -54,21 +54,16 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 	}
 
 	@Override
-	protected void postApprove(TripRequirement entity) {
+	@Transactional
+	@PreAuthorize("this.canApprove(#entity)")
+	public void approve(TripRequirement entity) {
+		super.approve(entity);
+		
 		if (entity.getState() == RequirementState.APPROVED) {
 			TripBill bill = tripBillService.createTripBill(entity);
 			tripBillService.add(bill);
 			bill.setOwnedBy(entity.getOwnedBy());
 			tripBillService.update(bill);
-			
-			for (User u : entity.getPassengers()) {
-				if (!u.equals(entity.getOwnedBy())) {
-					TripBill passBill = tripBillService.createTripBill(entity);
-					tripBillService.add(passBill);
-					passBill.setOwnedBy(u);
-					tripBillService.update(passBill);
-				}
-			}
 		}
 	}
 

src/main/java/info/bukova/isspst/services/users/AdUserCtxMapper.java

@@ -2,7 +2,6 @@ package info.bukova.isspst.services.users;
 
 import info.bukova.isspst.Constants;
 import info.bukova.isspst.data.User;
-import info.bukova.isspst.security.AuthMethod;
 
 import java.util.Collection;
 
@@ -27,14 +26,12 @@ public class AdUserCtxMapper implements UserDetailsContextMapper {
 	
 	private UserService userService;
 	private RoleService roleService;
-	private String allowedGroup;
 	
 	private final static Logger logger = LoggerFactory.getLogger(AdUserCtxMapper.class);
 	
 	public AdUserCtxMapper(UserService userService, RoleService roleService) {
 		this.userService = userService;
 		this.roleService = roleService;
-		userService.setAuthMethod(AuthMethod.AD);
 	}
 
 	@Override
@@ -46,7 +43,7 @@ public class AdUserCtxMapper implements UserDetailsContextMapper {
 			return user;
 		} catch (UsernameNotFoundException e) {
 			logger.info("Importing user from Active Directory");
-			LdapUserImporter importer = new LdapUserImporter(userService, allowedGroup);
+			LdapUserImporter importer = new LdapUserImporter(userService);
 			importer.importUser(username, userData, roleService.getRoleByAuthority(Constants.ROLE_USER));
 			
 			return userService.loadUserByUsername(username);
@@ -59,8 +56,4 @@ public class AdUserCtxMapper implements UserDetailsContextMapper {
                 "use a subclass if mapUserToContext() is required.");
 	}
 
-	public void setAllowedGroup(String allowedGroup) {
-		this.allowedGroup = allowedGroup;
-	}
-
 }

src/main/java/info/bukova/isspst/services/users/DeleteUserException.java

@@ -1,17 +0,0 @@
-package info.bukova.isspst.services.users;
-
-import info.bukova.isspst.services.IsspstException;
-
-public class DeleteUserException extends IsspstException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -5326664758639660224L;
-	
-	public DeleteUserException(String message) {
-		super(message);
-		setReason(message);
-	}
-
-}

src/main/java/info/bukova/isspst/services/users/LdapUserImporter.java

@@ -9,7 +9,6 @@ import javax.naming.NamingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ldap.core.DirContextOperations;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 /**
  * Pomocná třída pro import uživatele z LDAP serveru (nebo Active Directory) do databáze aplikace
@@ -20,18 +19,12 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 public class LdapUserImporter {
 	
 	private UserService userService;
-	private String allowedGroup;
 	private final static Logger logger = LoggerFactory.getLogger(LdapUserImporter.class);
 	
 	public LdapUserImporter(UserService userService) {
 		this.userService = userService;
 	}
 	
-	public LdapUserImporter(UserService userService, String group) {
-		this.userService = userService;
-		this.allowedGroup = group;
-	}
-	
 	/**
 	 * Provede import uživatele z LDAP do aplikační databáze
 	 * 
@@ -44,21 +37,6 @@ public class LdapUserImporter {
 		user.setUsername(login);
 		user.addAuthority(defaultRole);
 		
-		if (allowedGroup != null && !allowedGroup.isEmpty()) {
-			boolean isAllowed = false;
-			
-			for (Object atr : userData.getObjectAttributes("memberOf")) {
-				if (atr.toString().startsWith("CN="+allowedGroup)) {
-					isAllowed = true;
-					break;
-				}
-			}
-			
-			if (!isAllowed) {
-				throw new UsernameNotFoundException("User is not member of group '" + allowedGroup + "'");
-			}
-		}
-		
 		if (userData.attributeExists("givenName")) {
 			try {
 				user.setFirstName(userData.getAttributes().get("givenName").get().toString());

src/main/java/info/bukova/isspst/services/users/PermissionService.java

@@ -1,13 +1,10 @@
 package info.bukova.isspst.services.users;
 
-import java.util.List;
-
 import info.bukova.isspst.data.Permission;
 import info.bukova.isspst.services.Service;
 
 public interface PermissionService extends Service<Permission> {
 	
 	public Permission getPermissionByModule(String moduleId, String permission);
-	public List<Permission> getAllPermissions();
 	
 }

src/main/java/info/bukova/isspst/services/users/PermissionServiceImpl.java

@@ -1,12 +1,10 @@
 package info.bukova.isspst.services.users;
 
+import org.springframework.transaction.annotation.Transactional;
+
 import info.bukova.isspst.data.Permission;
 import info.bukova.isspst.services.AbstractService;
 
-import java.util.List;
-
-import org.springframework.transaction.annotation.Transactional;
-
 public class PermissionServiceImpl extends AbstractService<Permission> implements PermissionService {
 
 	@Override
@@ -15,10 +13,5 @@ public class PermissionServiceImpl extends AbstractService<Permission> implement
 		return selectSingle("from Permission where MODULE = '" + moduleId + "' and AUTHORITY = '" + permission + "'");
 	}
 
-	@Override
-	@Transactional
-	public List<Permission> getAllPermissions() {
-		return dao.getAll();
-	}
 
 }

src/main/java/info/bukova/isspst/services/users/UserService.java

@@ -5,7 +5,6 @@ import java.util.List;
 import info.bukova.isspst.data.Role;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.UserSettingsData;
-import info.bukova.isspst.security.AuthMethod;
 import info.bukova.isspst.services.Service;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -25,8 +24,4 @@ public interface UserService extends UserDetailsService, Service<User> {
 	public UserSettingsData getUserSettings(User user);
 	public UserSettingsData getUserSettings();
 	public void setUserSettings(UserSettingsData settings);
-	public void setAuthMethod(AuthMethod method);
-	public AuthMethod getAuthMethod();
-	public List<User> getUsersForCombo();
-	
 }

src/main/java/info/bukova/isspst/services/users/UserServiceImpl.java

@@ -4,13 +4,10 @@ import info.bukova.isspst.Constants;
 import info.bukova.isspst.data.Role;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.UserSettingsData;
-import info.bukova.isspst.security.AuthMethod;
 import info.bukova.isspst.services.AbstractService;
 import info.bukova.isspst.services.StringXmlMarshaller;
 //import info.bukova.isspst.services.LazyLoader;
 
-import info.bukova.isspst.services.workgroups.WorkgroupService;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -36,14 +33,10 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
 	private PasswordEncoder encoder;
 	@Autowired
 	private RoleService roleService;
-	@Autowired
-	private WorkgroupService workgroupService;
 	private StringXmlMarshaller<UserSettingsData> marshaller;
-	private AuthMethod authMethod;
 	
 	public UserServiceImpl(Marshaller marshaller, Unmarshaller unmarshaller) {
 		this.marshaller = new StringXmlMarshaller<UserSettingsData>(marshaller, unmarshaller, UserSettingsData.class);
-		authMethod = AuthMethod.DATABASE;
 	}
 	
 	public void setEncoder(PasswordEncoder encoder) {
@@ -209,33 +202,4 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
 		return Constants.PERM_EDIT_OWN;
 	}
 
-	@Override
-	public void setAuthMethod(AuthMethod method) {
-		this.authMethod = method;
-	}
-
-	@Override
-	public AuthMethod getAuthMethod() {
-		return authMethod;
-	}
-
-	@Override
-	public void delete(User entity) {
-		workgroupService.loadParents(entity);
-		
-		if (entity.getParents().isEmpty()) {
-			super.delete(entity);
-		} else {
-			throw new DeleteUserException("UserIsInWorkgroup"); 
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	@Transactional
-	public List<User> getUsersForCombo() {
-		Query q = dao.getQuery("from User u order by u.lastName");
-		return q.list();
-	}
-
 }

src/main/java/info/bukova/isspst/services/workgroups/WorkgroupException.java

@@ -13,11 +13,9 @@ public class WorkgroupException extends IsspstException {
 	public final static String MSUT_HAS_CENTER = "RoleMustHasCentre";
 	public final static String MUST_HAS_WORKGROUP = "WorkgroupMustHasCentre";
 	public final static String CYCLIC_MEMBER = "CyclicMembership";
-	public final static String HAS_PARENT = "WorkgroupIsInWorkgroup";
 	
 	public WorkgroupException(String message) {
 		super(message);
-		setReason(message);
 	}
 
 }

src/main/java/info/bukova/isspst/services/workgroups/WorkgroupServiceImpl.java

@@ -248,11 +248,6 @@ public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implem
 	@Transactional
 	@PreAuthorize("hasPermission(this, 'PERM_DELETE')")
 	public void delete(Workgroup entity) {
-		Workgroup dbWg = dao.getById(entity.getId());
-		if (!dbWg.getParents().isEmpty()) {
-			throw new WorkgroupException(WorkgroupException.HAS_PARENT);
-		}
-		
 		loadMembers(entity);
 		for (JobMapping m : entity.getMembers()) {
 			loadParents(m.getMember());

src/main/java/info/bukova/isspst/sort/CzechStringComparator.java

@@ -1,21 +1,19 @@
 package info.bukova.isspst.sort;
 
-import info.bukova.isspst.StringUtils;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.Collator;
 import java.text.ParseException;
 import java.text.RuleBasedCollator;
 import java.util.Comparator;
-import java.util.List;
 
 import org.zkoss.zk.ui.util.Clients;
 
 public class CzechStringComparator implements Comparator<Object> {
 	private String m_rule;
-	private final List<String> m_propertyPath;
+	private final String m_property;
 	private final boolean m_ascending;
+	private Method m_getter;
 	private Comparator<Object> m_comparator;
 
 	public CzechStringComparator(String property, boolean ascending) {
@@ -49,7 +47,7 @@ public class CzechStringComparator implements Comparator<Object> {
 		m_rule += "< Y,y < Ý,ý ";
 		m_rule += "< Z,z < Ź,ź < Ž,ž ";
 
-		m_propertyPath = StringUtils.split(property, ".");
+		m_property = property;
 		m_ascending = ascending;
 	}
 
@@ -74,56 +72,21 @@ public class CzechStringComparator implements Comparator<Object> {
 		return 0;
 	}
 
-	private Object getValue(Object caller)
-	{
-		Object obj = caller;
-
-		for (String property : m_propertyPath)
-		{
-			if (obj == null)
-			{
-				return null;
-			}
-
-			Method method = ReflectionTools.getGetterMethod(obj, property);
-
-			try
-			{
-				obj = method.invoke(obj);
-			}
-			catch (IllegalAccessException e)
-			{
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			catch (IllegalArgumentException e)
-			{
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			catch (InvocationTargetException e)
-			{
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-
-		return obj;
-	}
-
 	private int internalCompare(Object argL, Object argR)
 			throws ParseException, IllegalAccessException,
 			IllegalArgumentException, InvocationTargetException {
+		if (m_getter == null) {
+			m_getter = ReflectionTools.getGetterMethod(argL, m_property);
+		}
 
-		if (m_comparator == null)
-		{
+		if (m_comparator == null) {
 			Collator c = new RuleBasedCollator(m_rule);
 			c.setStrength(Collator.TERTIARY);
 			m_comparator = c;
 		}
 
-		Object valL = this.getValue(argL);
-		Object valR = this.getValue(argR);
+		Object valL = m_getter.invoke(argL);
+		Object valR = m_getter.invoke(argR);
 		boolean isNullValL = (valL == null);
 		boolean isNullValR = (valR == null);
 

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

@@ -3,13 +3,11 @@ package info.bukova.isspst.ui;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.ParseException;
-import java.util.Locale;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.zkoss.bind.BindContext;
 import org.zkoss.bind.Converter;
-import org.zkoss.util.Locales;
 import org.zkoss.zk.ui.Component;
 
 public class BigDecimalConverter implements Converter<String, BigDecimal, Component>
@@ -25,8 +23,7 @@ public class BigDecimalConverter implements Converter<String, BigDecimal, Compon
 		{
 			try
 			{
-				Locale loc = Locales.getCurrent();
-				DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance(loc);
+				DecimalFormat format = new DecimalFormat();
 				format.setParseBigDecimal(true);
 				val = (BigDecimal) format.parse(str);
 			}
@@ -46,9 +43,6 @@ public class BigDecimalConverter implements Converter<String, BigDecimal, Compon
 	@Override
 	public String coerceToUi(BigDecimal val, Component component, BindContext cx)
 	{
-		// String lang = Executions.getCurrent().getHeader("accept-language");
-		Locale loc = Locales.getCurrent();
-
 		if (val == null)
 		{
 			val = BigDecimal.ZERO;
@@ -56,13 +50,13 @@ public class BigDecimalConverter implements Converter<String, BigDecimal, Compon
 
 		val = val.setScale(2, BigDecimal.ROUND_DOWN);
 
-		DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance(loc);
+		DecimalFormat format = new DecimalFormat();
 		format.setMaximumFractionDigits(2);
 		format.setMinimumFractionDigits(2);
 		format.setGroupingUsed(true);
 		format.setGroupingSize(3);
-		String formatted = format.format(val);
-		return formatted;
+
+		return format.format(val);
 	}
 
 }

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

@@ -2,7 +2,7 @@ package info.bukova.isspst.ui;
 
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.beanutils.BeanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.zkoss.bind.SimpleForm;
@@ -34,40 +34,12 @@ public class BindingForm<T> extends SimpleForm {
 	 */
 	public void bindTo(T object) {
 		for (String key : getFieldNames()) {
-			// try {
-			// BeanUtils.setProperty(object, key, getField(key));
-			//
-			// } catch (IllegalAccessException e) {
-			// logger.warn("Cannot bind value", e);
-			// } catch (InvocationTargetException e) {
-			// logger.warn("Cannot bind value", e);
-			// }
-			try
-			{
-				if (PropertyUtils.getPropertyType(object, key).isPrimitive() 
-						&& (getField(key) == null))
-				{
-					PropertyUtils.setProperty(object, key, 0);
-				}
-				else
-				{
-					PropertyUtils.setProperty(object, key, getField(key));
-				}
-			}
-			catch (NoSuchMethodException e)
-			{
-				logger.warn("Cannot bind value " + key + " (" + e.getMessage() + ")");
-				// e.printStackTrace();
-			}
-			catch (IllegalAccessException e)
-			{
+			try {
+				BeanUtils.setProperty(object, key, getField(key));
+			} catch (IllegalAccessException e) {
 				logger.warn("Cannot bind value", e);
-				e.printStackTrace();
-			}
-			catch (InvocationTargetException e)
-			{
+			} catch (InvocationTargetException e) {
 				logger.warn("Cannot bind value", e);
-				e.printStackTrace();
 			}
 		}
 	}

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

@@ -6,22 +6,16 @@ import org.zkoss.bind.BindContext;
 import org.zkoss.bind.Converter;
 import org.zkoss.zk.ui.Component;
 
-public class BoolConverter implements Converter<String, Boolean, Component>
-{
+public class BoolConverter implements Converter<String, Boolean, Component> {
+
 	@Override
-	public Boolean coerceToBean(String str, Component component, BindContext cx)
-	{
+	public Boolean coerceToBean(String str, Component component, BindContext cx) {
 		return false;
 	}
 
 	@Override
-	public String coerceToUi(Boolean val, Component component, BindContext cx)
-	{
-		if (val == null)
-		{
-			val = new Boolean(false);
-		}
-
+	public String coerceToUi(Boolean val, Component component, BindContext cx) {
 		return StringUtils.localize(val.toString());
 	}
+
 }

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

@@ -1,6 +1,5 @@
 package info.bukova.isspst.ui;
 
-import info.bukova.isspst.Constants;
 import info.bukova.isspst.StringUtils;
 
 import java.util.ArrayList;
@@ -18,8 +17,6 @@ public class DocumentViewModel
 {
 	protected BigDecimalConverter standardBigDecimalConverter;
 
-	protected BoolConverter standardBoolConverter;
-
 	public BigDecimalConverter getStandardBigDecimalConverter()
 	{
 		return standardBigDecimalConverter;
@@ -30,31 +27,10 @@ public class DocumentViewModel
 		this.standardBigDecimalConverter = standardBigDecimalConverter;
 	}
 
-	public BoolConverter getStandardBoolConverter()
-	{
-		return standardBoolConverter;
-	}
-
-	public void setStandardBoolConverter(BoolConverter standardBoolConverter)
-	{
-		this.standardBoolConverter = standardBoolConverter;
-	}
-
-	final public int getLengthText()
-	{
-		return Constants.LEN_TEXT;
-	}
-
-	final public int getLengthDescription()
-	{
-		return Constants.LEN_DESCRIPTION;
-	}
-
 	@Init
 	public void initDocumentViewModel()
 	{
 		this.standardBigDecimalConverter = new BigDecimalConverter();
-		this.standardBoolConverter = new BoolConverter();
 	}
 
 	@Command

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

@@ -3,7 +3,6 @@ package info.bukova.isspst.ui;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.DataModel;
 import info.bukova.isspst.filters.Filter;
-import info.bukova.isspst.services.IsspstException;
 import info.bukova.isspst.services.Service;
 
 import java.util.ArrayList;
@@ -203,18 +202,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
 								BindUtils.postNotifyChange(null, null,
 										ListViewModel.this, "dataBean");
 								BindUtils.postGlobalCommand(null, null, "reloadRelated", null);
-							} catch (IsspstException e) {
-								if (e.getReason() != null) {
-									Messagebox.show(
-											StringUtils.localize(e.getReason()),
-											StringUtils.localize("Error"),
-											Messagebox.OK, Messagebox.ERROR);
-								} else {
-									Messagebox.show(
-											StringUtils.localize("DbSaveError"),
-											StringUtils.localize("Error"),
-											Messagebox.OK, Messagebox.ERROR);
-								}
 							} catch (DataIntegrityViolationException e) {
 								Messagebox.show(StringUtils.localize("DbCannotDelete"), StringUtils.localize("Error"), Messagebox.OK, Messagebox.ERROR);
 							} catch (AccessDeniedException e) {
@@ -313,16 +300,11 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
 		
 		if (selIndex > -1) {
 			this.setDataBean(dataList.get(selIndex));
-			afterSelect();
 		}
 	}
 	
 	protected void beforeSelectViaUrl() {
 
-	}
-	
-	protected void afterSelect() {
-		
 	}
 
 	@Command
@@ -353,6 +335,26 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
 		}
 	}
 
+	// private void loadFromDb() {
+	// Thread fillThread = new Thread(new Runnable() {
+	//
+	// @Override
+	// public void run() {
+	// tmpList = service.getAll();
+	//
+	// try {
+	// Thread.sleep(200);
+	// } catch (InterruptedException e) {
+	// e.printStackTrace();
+	// }
+	//
+	// fullFill = true;
+	// }
+	// });
+	//
+	// fillThread.start();
+	// }
+
 	@Command
 	public void onPrint() {
 		Map<String, Object> params = new HashMap<String, Object>();
@@ -398,9 +400,4 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
 	{
 		return this.isRecordSelected();
 	}
-	
-	public boolean isAbleToAdd()
-	{
-		return true;
-	}
 }

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

@@ -1,12 +1,8 @@
 package info.bukova.isspst.ui;
 
-import info.bukova.isspst.security.AuthMethod;
-import info.bukova.isspst.services.users.UserService;
-
 import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.Executions;
-import org.zkoss.zk.ui.select.annotation.WireVariable;
 import org.zkoss.zul.Window;
 
 public class MainMenu
@@ -14,8 +10,6 @@ public class MainMenu
 	private String contextPath;
 
 	private String moduleUrl;
-	@WireVariable
-	private UserService userService;
 
 	@Init
 	public void init()
@@ -61,8 +55,4 @@ public class MainMenu
 		Window window = (Window) Executions.createComponents("/settings/userSettings.zul", null, null);
 		window.doModal();
 	}
-	
-	public boolean isCanChangePassword() {
-		return userService.getAuthMethod() == AuthMethod.DATABASE;
-	}
 }

src/main/java/info/bukova/isspst/ui/dashboard/DashBoardVM.java

@@ -3,7 +3,7 @@ package info.bukova.isspst.ui.dashboard;
 import info.bukova.isspst.data.Role;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
-import info.bukova.isspst.services.invoicing.InvoicingService;
+import info.bukova.isspst.services.approved.OrderService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.DocumentViewModel;
@@ -24,7 +24,7 @@ public class DashBoardVM extends DocumentViewModel {
 	@WireVariable
 	private UserService userService;
 	@WireVariable
-	private InvoicingService invoicingService;
+	private OrderService orderService;
 	private User user;
 	private Map<Workgroup, List<Role>> groupRoles;
 	private Map<Workgroup, BigDecimal> workgroupSpent;
@@ -47,7 +47,7 @@ public class DashBoardVM extends DocumentViewModel {
 		for (Workgroup w : wg) {
 			List<Role> r = workgroupService.getUserWorkgroupRoles(w, user);
 			groupRoles.put(w, r);
-			workgroupSpent.put(w, invoicingService.totalInvoicedForWorkgroup(w));
+			workgroupSpent.put(w, orderService.totalOrderedForWorkgroup(w));
 		}
 	}
 	

src/main/java/info/bukova/isspst/ui/mail/MailForm.java

@@ -14,7 +14,6 @@ import info.bukova.isspst.reporting.GeneratorFactory;
 import info.bukova.isspst.reporting.ReportDefinition;
 import info.bukova.isspst.services.addressbook.AdbService;
 import info.bukova.isspst.services.users.UserService;
-import info.bukova.isspst.ui.DocumentViewModel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,8 +27,7 @@ import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 import org.zkoss.zul.Window;
 
-public class MailForm extends DocumentViewModel
-{
+public class MailForm {
 	
 	@WireVariable
 	private Mailer mailer;
@@ -54,7 +52,7 @@ public class MailForm extends DocumentViewModel
 	private int adbType;
 	private String findAddress;
 	
-	@Init(superclass = true)
+	@Init
 	public void init(@ExecutionArgParam("report") Boolean report) {
 		message = new MailMessage();
 		message.setHtml(true);

src/main/java/info/bukova/isspst/ui/main/approved/ApprovedList.java

@@ -5,8 +5,8 @@ import info.bukova.isspst.data.Order;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.filters.JoinedItemFilter;
-import info.bukova.isspst.services.orders.ApprovedService;
-import info.bukova.isspst.services.orders.OrderService;
+import info.bukova.isspst.services.approved.ApprovedService;
+import info.bukova.isspst.services.approved.OrderService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.BigDecimalConverter;
@@ -85,7 +85,7 @@ public class ApprovedList extends ListViewModel<JoinedItem>
 
 	public List<User> getUsers()
 	{
-		return this.userService.getUsersForCombo();
+		return this.userService.getAll();
 	}
 
 	@Command

src/main/java/info/bukova/isspst/ui/main/invoicing/InvoicingForm.java

@@ -1,80 +0,0 @@
-package info.bukova.isspst.ui.main.invoicing;
-
-import info.bukova.isspst.data.Invoicing;
-import info.bukova.isspst.data.InvoicingItem;
-import info.bukova.isspst.services.invoicing.InvoicingService;
-import info.bukova.isspst.ui.FormViewModel;
-
-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;
-
-public class InvoicingForm extends FormViewModel<Invoicing> {
-	
-	private InvoicingItem selectedItem;
-	private int selectedIndex;
-	@WireVariable
-	private InvoicingService invoicingService;
-	
-	@Init(superclass = true)
-	public void init() {
-		selectedIndex = -1;
-	}
-	
-	private void selectItem(InvoicingItem item) {
-		if (item != null) {
-			selectedItem = item;
-			selectedIndex = getDataBean().getItems().indexOf(item);
-		} else {
-			selectedItem = null;
-			selectedIndex = -1;
-		}
-	}
-	
-	@Command
-	@NotifyChange({"dataBean", "selectedItem", "selectedIndex"})
-	public void addItem() {
-		InvoicingItem item = new InvoicingItem();
-		getDataBean().getItems().add(item);
-		selectItem(item);
-	}
-	
-	@Command
-	@NotifyChange({"dataBean", "selectedItem", "selectedIndex"})
-	public void removeItem(@BindingParam("item") InvoicingItem item) {
-		getDataBean().getItems().remove(item);
-		selectItem(null);
-		calculate();
-	}
-	
-	@Command
-	@NotifyChange({"selectedItem", "selectedIndex"})
-	public void onFocus(@BindingParam("item") InvoicingItem item) {
-		selectItem(item);
-	}
-	
-	@Command
-	@NotifyChange("dataBean")
-	public void calculate() {
-		invoicingService.calculate(getDataBean());
-	}
-
-	public InvoicingItem getSelectedItem() {
-		return selectedItem;
-	}
-
-	public void setSelectedItem(InvoicingItem selectedItem) {
-		this.selectedItem = selectedItem;
-	}
-
-	public int getSelectedIndex() {
-		return selectedIndex;
-	}
-
-	public void setSelectedIndex(int selectedIndex) {
-		this.selectedIndex = selectedIndex;
-	}
-	
-}

src/main/java/info/bukova/isspst/ui/main/invoicing/InvoicingList.java

@@ -1,56 +0,0 @@
-package info.bukova.isspst.ui.main.invoicing;
-
-import java.util.List;
-
-import info.bukova.isspst.data.Invoicing;
-import info.bukova.isspst.data.User;
-import info.bukova.isspst.data.Workgroup;
-import info.bukova.isspst.filters.InvoicingFilter;
-import info.bukova.isspst.services.invoicing.InvoicingService;
-import info.bukova.isspst.services.users.UserService;
-import info.bukova.isspst.services.workgroups.WorkgroupService;
-import info.bukova.isspst.ui.ListViewModel;
-
-import org.zkoss.bind.annotation.Init;
-import org.zkoss.zk.ui.select.annotation.WireVariable;
-
-public class InvoicingList extends ListViewModel<Invoicing> {
-
-	@WireVariable
-	private InvoicingService invoicingService;
-	@WireVariable
-	private WorkgroupService workgroupService;
-	@WireVariable
-	private UserService userService;
-
-	@Init(superclass = true)
-	public void initInvoicing() {
-		service = invoicingService;
-		dataClass = Invoicing.class;
-		formZul = "invoicingForm.zul";
-		dataFilter = new InvoicingFilter(getFilterTemplate());
-	}
-
-	@Override
-	public boolean isAbleToAdd() {
-		return false;
-	}
-
-	@Override
-	public boolean isAbleToDelete() {
-		return false;
-	}
-	
-	public List<Workgroup> getCentres() {
-		return workgroupService.getCentres();
-	}
-	
-	public List<Workgroup> getWorkgroups() {
-		return workgroupService.getWorkgroups();
-	}
-	
-	public List<User> getUsers() {
-		return userService.getUsersForCombo();
-	}
-	
-}

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

@@ -4,18 +4,14 @@ 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.services.IsspstException;
 import info.bukova.isspst.services.addressbook.AdbService;
-import info.bukova.isspst.services.addressbook.AddressFinder;
-import info.bukova.isspst.services.orders.OrderService;
+import info.bukova.isspst.services.approved.OrderService;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.ui.FormViewModel;
 import info.bukova.isspst.validators.OrderFormValidator;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,13 +19,9 @@ import org.zkoss.bind.BindUtils;
 import org.zkoss.bind.SimpleForm;
 import org.zkoss.bind.annotation.BindingParam;
 import org.zkoss.bind.annotation.Command;
-import org.zkoss.bind.annotation.GlobalCommand;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.bind.annotation.NotifyChange;
-import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
-import org.zkoss.zul.Messagebox;
-import org.zkoss.zul.Window;
 import org.zkoss.zul.impl.InputElement;
 
 public class OrderForm extends FormViewModel<Order>
@@ -37,12 +29,8 @@ public class OrderForm extends FormViewModel<Order>
 	private final static Logger log = LoggerFactory.getLogger(OrderForm.class.getName());
 
 	@WireVariable
-	private AdbService adbService;
-	@WireVariable
-	private AddressFinder addressFinderAres;
-	@WireVariable
-	private AddressFinder addressFinderTaxID;
-	
+	protected AdbService adbService;
+
 	@WireVariable
 	protected GlobalSettingsService settingsService;
 
@@ -63,29 +51,19 @@ public class OrderForm extends FormViewModel<Order>
 
 	protected List<OrderItem> syncOrderItems;
 
-	/**
-	 * Obsah záznamu před editací
-	 */
-	protected Order recordBeforeEdit;
-
 	@Init(superclass = true)
 	public void initOrderForm()
 	{
 		this.orderFormValidator = new OrderFormValidator();
 
-		if (getDataBean().getSuplier() != null)	
-		{
-			if (getDataBean().getSuplier().getAddress().getId() != 0)
-			{
-				this.selectedSuppAddrItem = this.getDataBean().getSuplier().getAddress();
-			}
-			this.suppCompany = getDataBean().getSuplier().getCompany();
-		}
-		else
+		if (this.getDataBean().getSuplier() == null)
 		{
 			this.getDataBean().setSuplier(new AddressEmb());
 		}
 
+		this.selectedSuppAddrItem = this.getDataBean().getSuplier().getAddress();
+		this.suppCompany = this.selectedSuppAddrItem.getCompany();
+
 		if (this.getDataBean().getDeliveryAddress() == null)
 		{
 			this.getDataBean().setDeliveryAddress(new AddressEmb());
@@ -100,16 +78,6 @@ public class OrderForm extends FormViewModel<Order>
 		}
 
 		this.syncOrderItems = this.getDataBean().getItems();
-
-		try
-		{
-			this.recordBeforeEdit = (Order) this.getDataBean().clone();
-		}
-		catch (CloneNotSupportedException e)
-		{
-			log.error("Nelze provést hlubokou kopii objednávky!");
-			e.printStackTrace();
-		}
 	}
 
 	public OrderFormValidator getOrderFormValidator()
@@ -197,21 +165,10 @@ public class OrderForm extends FormViewModel<Order>
 		this.syncOrderItems = syncOrderItems;
 	}
 
-	public Order getRecordBeforeEdit()
-	{
-		return recordBeforeEdit;
-	}
-
-	public void setRecordBeforeEdit(Order recordBeforeEdit)
-	{
-		this.recordBeforeEdit = recordBeforeEdit;
-	}
-
 	@Command
 	@NotifyChange("dataBean")
 	public void doFillSuppAddress()
 	{
-		this.getDataForm().bind();
 		AddressEmb addr;
 
 		if (this.selectedSuppAddrItem == null)
@@ -233,7 +190,6 @@ public class OrderForm extends FormViewModel<Order>
 	@NotifyChange("dataBean")
 	public void doFillDeliveryAddress()
 	{
-		this.getDataForm().bind();
 		AddressEmb addr;
 
 		if (this.selectedDeliveryAddrItem == null)
@@ -296,70 +252,4 @@ public class OrderForm extends FormViewModel<Order>
 		// Calculate total price at form
 		this.calcAndUpdateFormTotalPrice(form);
 	}
-
-	@Override
-	protected void doSave()
-	{
-		// Zjisti, zda se změnil příznak objednávky (objednáno/neobjednáno)
-		boolean orderedChanged = (this.recordBeforeEdit.isOrdered() != this.getDataBean().isOrdered());
-		// Aktualizovat příznak schválených položek, aby se nemohli vložit do
-		// jiných objednávek
-		orderService.updateApprovedItems(this.getDataBean(), orderedChanged);
-	}
-	
-	@Command
-	@NotifyChange({"dataBean", "suppCompany"})
-	public void searchAddress() 
-	{
-		getDataForm().bind();
-		
-		Address adr = getDataBean().getSuplier().getAddress();
-		
-		if (adr.getIc() != 0)
-		{
-			try 
-			{
-				adbService.fillFoundData(addressFinderTaxID, adr);
-				getDataBean().setSuplier(new AddressEmb(adr));
-				suppCompany = adr.getCompany();
-			}
-			catch (IsspstException e)
-			{
-				Messagebox.show("Chyba při hledání adresy", "Chyba", Messagebox.OK, Messagebox.ERROR);
-				return;
-			}
-			
-		}
-		else 
-		{
-			Map<String, List<Address>> arg = new HashMap<String, List<Address>>();
-			try {
-				arg.put("result", adbService.lookForAddr(addressFinderAres, adr));
-			} catch (IsspstException e) {
-				Messagebox.show("Chyba při hledání adresy", "Chyba", Messagebox.OK, Messagebox.ERROR);
-				return;
-			}
-			
-			Window resWin = (Window) Executions.createComponents("/lists/addressbook/addrFindResult.zul", null, arg);
-			resWin.doModal();
-		}
-	}
-	
-	@GlobalCommand
-	@NotifyChange({"dataBean", "suppCompany"})
-	public void selectAddress(@BindingParam("selected") Address selected, @BindingParam("window") Window window) {
-		try {
-			adbService.fillFoundData(addressFinderTaxID, selected);
-		} catch (IsspstException e) {
-			e.printStackTrace();
-		}
-		
-		Address adr = getDataBean().getSuplier().getAddress();
-		adbService.mergeAddress(adr, selected, true);
-		getDataBean().setSuplier(new AddressEmb(adr));
-		suppCompany = adr.getCompany();
-		
-		if (window != null)
-			window.detach();
-	}
 }

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

@@ -9,11 +9,10 @@ import info.bukova.isspst.data.SettingsData;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.filters.OrderFilter;
 import info.bukova.isspst.services.addressbook.AdbService;
-import info.bukova.isspst.services.orders.OrderService;
+import info.bukova.isspst.services.approved.OrderService;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.ui.ListViewModel;
-import info.bukova.isspst.ui.renderers.OrderCreatedItemRenderer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,8 +47,6 @@ public class OrderList extends ListViewModel<Order>
 
 	protected List<OrderItem> orderItems;
 
-	protected OrderCreatedItemRenderer orderCreatedItemRenderer;
-
 	@Init(superclass = true)
 	public void initOrderList()
 	{
@@ -58,7 +55,6 @@ public class OrderList extends ListViewModel<Order>
 		formZul = "orderForm.zul";
 		dataFilter = new OrderFilter(getFilterTemplate());
 		this.orderItems = new ArrayList<OrderItem>();
-		this.orderCreatedItemRenderer = new OrderCreatedItemRenderer();
 	}
 
 	public List<AddressEmb> getSuppAddresses()
@@ -121,16 +117,6 @@ public class OrderList extends ListViewModel<Order>
 		this.orderItems = orderItems;
 	}
 
-	public OrderCreatedItemRenderer getOrderCreatedItemRenderer()
-	{
-		return orderCreatedItemRenderer;
-	}
-
-	public void setOrderCreatedItemRenderer(OrderCreatedItemRenderer orderCreatedItemRenderer)
-	{
-		this.orderCreatedItemRenderer = orderCreatedItemRenderer;
-	}
-
 	@Command
 	@NotifyChange("orderItems")
 	public void onChangeSelectOrder(@BindingParam("ctrl") Listbox lb)

src/main/java/info/bukova/isspst/ui/main/orders/material/ReqMaterialListMy.java

@@ -17,9 +17,10 @@ public class ReqMaterialListMy extends ReqListMy
 	@WireVariable
 	protected RequirementService reqMaterialService;
 
-	@Init(superclass = true)
-	public void initReqMaterialListMy()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = reqMaterialService;
 		formZul = "/main/orders/material/reqHeadForm.zul";
 	}

src/main/java/info/bukova/isspst/ui/main/orders/material/ReqMaterialListMyAll.java

@@ -17,9 +17,10 @@ public class ReqMaterialListMyAll extends ReqListMyAll
 	@WireVariable
 	protected RequirementService reqMaterialService;
 
-	@Init(superclass = true)
-	public void initReqMaterialListMyAll()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = reqMaterialService;
 		formZul = "/main/orders/material/reqHeadForm.zul";
 	}

src/main/java/info/bukova/isspst/ui/main/orders/material/ReqMaterialListMyCenters.java

@@ -17,9 +17,10 @@ public class ReqMaterialListMyCenters extends ReqListMyCenters
 	@WireVariable
 	protected RequirementService reqMaterialService;
 
-	@Init(superclass = true)
-	public void initReqMaterialListMyCenters()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = reqMaterialService;
 		formZul = "/main/orders/material/reqHeadForm.zul";
 	}

src/main/java/info/bukova/isspst/ui/main/orders/material/ReqMaterialListMyWorkgroups.java

@@ -17,9 +17,10 @@ public class ReqMaterialListMyWorkgroups extends ReqListMyWorkgroups
 	@WireVariable
 	protected RequirementService reqMaterialService;
 
-	@Init(superclass = true)
-	public void initReqMaterialListMyWorkgroups()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = reqMaterialService;
 		formZul = "/main/orders/material/reqHeadForm.zul";
 	}

src/main/java/info/bukova/isspst/ui/main/orders/material/SelectMaterialItems.java

@@ -29,10 +29,10 @@ public class SelectMaterialItems extends SelectItems
 	private MaterialFilter dataFilterMaterial;
 
 
-	@Init(superclass = true)
-	public void initSelectMaterialItems()
+	@Init
+	public void init()
 	{
-		// super.init();
+		super.init();
 
 		this.setFullMaterialList(materialService.getAll());
 		this.setMaterialList(this.getFullMaterialList());

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMy.java

@@ -28,9 +28,10 @@ public class ReqListMy extends RequirementSubpage<Requirement>
 		return workgroupService.getCentres();
 	}
 
-	@Init(superclass = true)
-	public void initReqListMy()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = requirementService;
 		dataClass = Requirement.class;
 		formZul = "/main/orders/requirements/reqForm.zul";

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java

@@ -7,7 +7,6 @@ import info.bukova.isspst.services.requirement.RequirementService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.requirement.RequirementSubpage;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,9 +30,10 @@ public class ReqListMyAll extends RequirementSubpage<Requirement>
 		return workgroupService.getCentres();
 	}
 
-	@Init(superclass = true)
-	public void initReqListMyAll()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = requirementService;
 		dataClass = Requirement.class;
 		formZul = "/main/orders/requirements/reqForm.zul";
@@ -65,18 +65,4 @@ public class ReqListMyAll extends RequirementSubpage<Requirement>
 	protected void beforeSelectViaUrl() {
 		BindUtils.postGlobalCommand(null, null, "selectAll", null);
 	}
-	
-	public BigDecimal getInvoicedAmount() {
-		if (getDataBean() != null) {
-			return requirementService.getInvoicedAmount(getDataBean());
-		} else {
-			return null;
-		}
-	}
-	
-	@Override
-	@NotifyChange({ "dataBean", "ableToDelete", "canApprove", "invoicedAmount" })
-	public void setDataBean(Requirement data) {
-		super.setDataBean(data);
-	}
 }

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java

@@ -7,7 +7,6 @@ import info.bukova.isspst.services.requirement.RequirementService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.requirement.RequirementSubpage;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,9 +30,10 @@ public class ReqListMyCenters extends RequirementSubpage<Requirement>
 		return workgroupService.getUserCentres(userService.getCurrent());
 	}
 
-	@Init(superclass = true)
-	public void initReqListMyCenters()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = requirementService;
 		dataClass = Requirement.class;
 		formZul = "/main/orders/requirements/reqForm.zul";
@@ -65,18 +65,4 @@ public class ReqListMyCenters extends RequirementSubpage<Requirement>
 	protected void beforeSelectViaUrl() {
 		BindUtils.postGlobalCommand(null, null, "selectCentre", null);
 	}
-	
-	public BigDecimal getInvoicedAmount() {
-		if (getDataBean() != null) {
-			return requirementService.getInvoicedAmount(getDataBean());
-		} else {
-			return null;
-		}
-	}
-	
-	@Override
-	@NotifyChange({ "dataBean", "ableToDelete", "canApprove", "invoicedAmount" })
-	public void setDataBean(Requirement data) {
-		super.setDataBean(data);
-	}
 }

src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java

@@ -7,7 +7,6 @@ import info.bukova.isspst.services.requirement.RequirementService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.requirement.RequirementSubpage;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,9 +30,10 @@ public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
 		return workgroupService.getCentres();
 	}
 
-	@Init(superclass = true)
-	public void initReqListMyWorkgroups()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = requirementService;
 		dataClass = Requirement.class;
 		formZul = "/main/orders/requirements/reqForm.zul";
@@ -65,18 +65,4 @@ public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
 	protected void beforeSelectViaUrl() {
 		BindUtils.postGlobalCommand(null, null, "selectWorkgroup", null);
 	}
-	
-	public BigDecimal getInvoicedAmount() {
-		if (getDataBean() != null) {
-			return requirementService.getInvoicedAmount(getDataBean());
-		} else {
-			return null;
-		}
-	}
-	
-	@Override
-	@NotifyChange({ "dataBean", "ableToDelete", "canApprove", "invoicedAmount" })
-	public void setDataBean(Requirement data) {
-		super.setDataBean(data);
-	}
 }

src/main/java/info/bukova/isspst/ui/main/orders/requirements/RequirementForm.java

@@ -1,6 +1,5 @@
 package info.bukova.isspst.ui.main.orders.requirements;
 
-import info.bukova.isspst.data.MUnitEmb;
 import info.bukova.isspst.data.Material;
 import info.bukova.isspst.data.Requirement;
 import info.bukova.isspst.data.RequirementItem;
@@ -126,7 +125,6 @@ public class RequirementForm extends FormViewModel<Requirement>
 	}
 
 	@Command
-	@NotifyChange({ "selItemIndex", "selectedItem" })
 	public void onFocusItem(@BindingParam("item") RequirementItem item, @BindingParam("ctrl") InputElement ctrl)
 	{
 		this.selItemIndex = this.getDataBean().getItems().indexOf(item);
@@ -149,20 +147,19 @@ public class RequirementForm extends FormViewModel<Requirement>
 	}
 
 	@Command
-	@NotifyChange({ "syncItems", "selItemIndex", "selectedItem" })
+	@NotifyChange({ "syncItems", "selItemIndex" })
 	public void removeItem(@BindingParam("form") SimpleForm form, @BindingParam("item") RequirementItem item)
 	{
 		if (item != null)
 		{
 			this.getDataBean().getItems().remove(item);
-			this.selItemIndex = -1;
-			this.selectedItem = null;
+			this.setSelItemIndex(-1);
 			this.calcAndUpdateFormTotalPrice(form);
 		}
 	}
 
 	@GlobalCommand("insertSelectedItem")
-	@NotifyChange({ "syncItems", "selItemIndex", "selectedItem" })
+	@NotifyChange({ "syncItems", "selItemIndex" })
 	public void insertSelectedItem(@BindingParam("selected") RequirementSubject selected, @BindingParam("window") Window window)
 	{
 		if (selected != null)
@@ -183,14 +180,7 @@ public class RequirementForm extends FormViewModel<Requirement>
 			if (isMaterial)
 			{
 				Material materialItem = (Material) selected;
-				MUnitEmb unit = materialItem.getMunit();
-
-				// if (unit == null)
-				// {
-				// unit = new MUnitEmb();
-				// }
-
-				item.setMunit(unit);
+				item.setMunit(materialItem.getMunit());
 			}
 
 			this.setSelectedItem(item);
@@ -205,7 +195,7 @@ public class RequirementForm extends FormViewModel<Requirement>
 	}
 
 	@Command
-	@NotifyChange({ "selectedItem" })
+	@NotifyChange({ "selectedItem", "syncItems" })
 	public void recalculate(@BindingParam("form") SimpleForm form, @BindingParam("changed") String source)
 	{
 		if (this.selectedItem == null)
@@ -229,7 +219,7 @@ public class RequirementForm extends FormViewModel<Requirement>
 	}
 
 	@Command
-	@NotifyChange({ "selectedItem" })
+	@NotifyChange({ "selectedItem", "syncItems" })
 	public void onChangeGroup()
 	{
 		// Někdo změnil skupinu materiálu nebo služby
@@ -244,15 +234,6 @@ public class RequirementForm extends FormViewModel<Requirement>
 
 		if (subject != null)
 		{
-			boolean isMaterial = (subject instanceof Material);
-
-			if (isMaterial)
-			{
-				Material materialItem = (Material) subject;
-				MUnitEmb munit = materialItem.getMunit();
-				this.selectedItem.setMunit(munit);
-			}
-
 			// Skupina materiálu nebo služeb je propojená, nastavit k zadanému
 			// kódu i správný název skupiny materiálu nebo služby
 			this.selectedItem.setName(subject.getName());
@@ -260,7 +241,7 @@ public class RequirementForm extends FormViewModel<Requirement>
 	}
 
 	@Command
-	@NotifyChange({ "syncItems", "selectedItem", "selItemIndex" })
+	@NotifyChange({ "selectedItem", "syncItems" })
 	public void addNewItem()
 	{
 		RequirementItem item = new RequirementItem();
@@ -273,11 +254,10 @@ public class RequirementForm extends FormViewModel<Requirement>
 		item.setUnitPrice(BigDecimal.valueOf(0));
 		item.setTotal(BigDecimal.valueOf(0));
 		item.setDescription("");
-		item.setMunit(new MUnitEmb());
+		item.setMunit(null);
 
+		this.setSelectedItem(item);
 		this.getDataBean().addItem(item);
-
-		this.selItemIndex = this.getDataBean().getItems().indexOf(item);
-		this.selectedItem = item;
+		this.setSelItemIndex(this.getDataBean().getItems().indexOf(item));
 	}
 }

src/main/java/info/bukova/isspst/ui/main/orders/requirements/SelectItems.java

@@ -3,14 +3,13 @@ package info.bukova.isspst.ui.main.orders.requirements;
 import info.bukova.isspst.data.MUnitEmb;
 import info.bukova.isspst.data.RequirementSubject;
 import info.bukova.isspst.services.munits.MUnitService;
-import info.bukova.isspst.ui.DocumentViewModel;
 
 import java.util.List;
 
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 
-public class SelectItems extends DocumentViewModel
+public class SelectItems
 {
 	protected RequirementSubject selectedItem;
 
@@ -20,8 +19,8 @@ public class SelectItems extends DocumentViewModel
 	protected List<MUnitEmb> munitList;
 
 
-	@Init(superclass = true)
-	public void initSelectItems()
+	@Init
+	public void init()
 	{
 		this.setMunitList(munitService.getEmbAll());
 	}

src/main/java/info/bukova/isspst/ui/main/orders/services/ReqServicesListMy.java

@@ -17,9 +17,10 @@ public class ReqServicesListMy extends ReqListMy
 	@WireVariable
 	protected RequirementService reqServicesService;
 
-	@Init(superclass = true)
-	public void initReqServicesListMy()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = reqServicesService;
 		formZul = "/main/orders/services/reqHeadForm.zul";
 	}

src/main/java/info/bukova/isspst/ui/main/orders/services/ReqServicesListMyAll.java

@@ -17,9 +17,10 @@ public class ReqServicesListMyAll extends ReqListMyAll
 	@WireVariable
 	protected RequirementService reqServicesService;
 
-	@Init(superclass = true)
-	public void initReqServicesListMyAll()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = reqServicesService;
 		formZul = "/main/orders/services/reqHeadForm.zul";
 	}

src/main/java/info/bukova/isspst/ui/main/orders/services/ReqServicesListMyCenters.java

@@ -17,9 +17,10 @@ public class ReqServicesListMyCenters extends ReqListMyCenters
 	@WireVariable
 	protected RequirementService reqServicesService;
 
-	@Init(superclass = true)
-	public void initReqServicesListMyCenters()
+	@Init
+	public void init()
 	{
+		super.init();
 		service = reqServicesService;
 		formZul = "/main/orders/services/reqHeadForm.zul";
 	}