Přidaná sestava "Protokol o kontrole" - digitální podpis při schvalování nákupů.

closes #237

cacert.pem

@@ -0,0 +1,79 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 16464111046498525641 (0xe47c45c4252121c9)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=CZ, ST=Vysocina, O=bukova.info, CN=Josef Rokos/emailAddress=rokos@bukova.info
+        Validity
+            Not Before: Jun 24 09:59:50 2015 GMT
+            Not After : Jun 21 09:59:50 2025 GMT
+        Subject: C=CZ, ST=Vysocina, O=bukova.info, CN=Josef Rokos/emailAddress=rokos@bukova.info
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:bc:fb:64:50:5b:58:03:8c:20:1c:77:d3:50:31:
+                    94:55:78:d6:05:bb:bc:88:9d:cb:20:b1:8c:ff:ac:
+                    fc:97:1a:b1:9c:29:c4:ac:af:ed:3b:de:93:d5:cf:
+                    75:3e:d0:05:41:32:bf:12:25:53:60:28:af:ff:3e:
+                    3c:3a:4c:52:78:3f:b2:78:b9:c6:2f:fc:0e:44:eb:
+                    65:c3:7f:38:2b:ab:88:37:8c:68:55:69:e3:3d:5e:
+                    9b:99:25:11:55:06:ab:e8:c1:fa:54:da:5b:e7:9b:
+                    3e:3f:39:4f:cf:b3:cb:48:cf:96:02:89:0b:7e:24:
+                    c7:00:e9:ce:8d:ea:07:cf:21:f2:89:51:c8:cc:7a:
+                    04:e4:68:6f:1c:a8:e0:76:18:40:62:ee:2f:bd:13:
+                    64:b7:1e:2e:18:bb:b1:d4:17:d5:fb:1f:07:59:65:
+                    46:f0:c4:51:dc:ac:62:ff:31:a8:72:26:a6:1a:88:
+                    37:23:82:49:9a:02:d2:39:74:98:71:7f:a4:77:52:
+                    3a:ed:22:2e:99:9c:81:2c:48:16:3c:82:7b:af:2c:
+                    0d:4b:28:4d:e0:46:7d:b5:b8:ea:3f:e7:5a:5b:4f:
+                    d8:06:b2:a3:86:2f:8b:5b:9c:bc:04:2e:64:b6:e1:
+                    09:c9:14:6d:54:7e:86:40:7b:66:33:27:33:4a:3d:
+                    7c:97
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                EF:9B:88:5C:07:27:79:EA:60:90:5C:7A:28:45:FB:7F:35:E6:CB:3F
+            X509v3 Authority Key Identifier: 
+                keyid:EF:9B:88:5C:07:27:79:EA:60:90:5C:7A:28:45:FB:7F:35:E6:CB:3F
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+         08:e9:a4:32:cc:35:7c:66:5a:ea:f2:bd:e6:75:78:81:52:11:
+         22:27:32:c9:ec:91:6e:51:8a:f1:1e:0f:25:8a:e1:64:ba:e4:
+         85:1c:e4:fd:75:f0:26:3d:65:62:16:29:20:4f:5f:d2:66:36:
+         de:2b:bd:7b:96:71:f6:2c:d1:c5:54:69:89:dd:52:20:49:49:
+         b1:ac:09:b4:1e:33:59:0d:89:fd:a4:28:7a:70:96:e5:cb:58:
+         7e:b9:1d:02:7a:33:ee:ad:6a:ad:2c:3c:5e:7d:cc:f5:72:69:
+         51:fd:77:b4:0f:10:fd:9e:c2:1a:04:c5:a9:56:6e:fd:66:9f:
+         b6:1c:f9:d3:68:f4:4f:8c:6c:67:af:f5:e0:a5:30:67:a6:a7:
+         9b:6e:16:89:8a:e5:b4:20:f4:f7:74:f4:9c:ca:5d:c7:2f:e6:
+         30:9d:6b:2e:95:29:c1:e7:aa:d7:d6:59:dc:a9:f0:10:40:02:
+         66:3f:58:a2:38:8c:89:1a:0b:94:1a:e5:80:49:14:44:f4:06:
+         b1:11:1a:cd:ef:76:6a:bf:f8:6f:58:9d:af:a3:6b:9a:8e:bb:
+         6c:10:d6:d8:4e:73:58:20:0b:99:38:41:d4:22:d4:80:0b:09:
+         0d:25:40:3e:66:15:a0:44:4e:d6:59:5a:58:07:e5:4b:62:f1:
+         e9:ae:b6:7c
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIJAOR8RcQlISHJMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNV
+BAYTAkNaMREwDwYDVQQIDAhWeXNvY2luYTEUMBIGA1UECgwLYnVrb3ZhLmluZm8x
+FDASBgNVBAMMC0pvc2VmIFJva29zMSAwHgYJKoZIhvcNAQkBFhFyb2tvc0BidWtv
+dmEuaW5mbzAeFw0xNTA2MjQwOTU5NTBaFw0yNTA2MjEwOTU5NTBaMG4xCzAJBgNV
+BAYTAkNaMREwDwYDVQQIDAhWeXNvY2luYTEUMBIGA1UECgwLYnVrb3ZhLmluZm8x
+FDASBgNVBAMMC0pvc2VmIFJva29zMSAwHgYJKoZIhvcNAQkBFhFyb2tvc0BidWtv
+dmEuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALz7ZFBbWAOM
+IBx301AxlFV41gW7vIidyyCxjP+s/JcasZwpxKyv7Tvek9XPdT7QBUEyvxIlU2Ao
+r/8+PDpMUng/sni5xi/8DkTrZcN/OCuriDeMaFVp4z1em5klEVUGq+jB+lTaW+eb
+Pj85T8+zy0jPlgKJC34kxwDpzo3qB88h8olRyMx6BORobxyo4HYYQGLuL70TZLce
+Lhi7sdQX1fsfB1llRvDEUdysYv8xqHImphqINyOCSZoC0jl0mHF/pHdSOu0iLpmc
+gSxIFjyCe68sDUsoTeBGfbW46j/nWltP2Aayo4Yvi1ucvAQuZLbhCckUbVR+hkB7
+ZjMnM0o9fJcCAwEAAaNQME4wHQYDVR0OBBYEFO+biFwHJ3nqYJBceihF+3815ss/
+MB8GA1UdIwQYMBaAFO+biFwHJ3nqYJBceihF+3815ss/MAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAjppDLMNXxmWuryveZ1eIFSESInMsnskW5RivEe
+DyWK4WS65IUc5P118CY9ZWIWKSBPX9JmNt4rvXuWcfYs0cVUaYndUiBJSbGsCbQe
+M1kNif2kKHpwluXLWH65HQJ6M+6taq0sPF59zPVyaVH9d7QPEP2ewhoExalWbv1m
+n7Yc+dNo9E+MbGev9eClMGemp5tuFomK5bQg9Pd09JzKXccv5jCday6VKcHnqtfW
+Wdyp8BBAAmY/WKI4jIkaC5Qa5YBJFET0BrERGs3vdmq/+G9Yna+ja5qOu2wQ1thO
+c1ggC5k4QdQi1IALCQ0lQD5mFaBETtZZWlgH5Uti8emutnw=
+-----END CERTIFICATE-----

pom.xml

@@ -215,16 +215,20 @@
 		
 		<!-- Hibernate -->
 		<dependency>
-    		<groupId>org.hibernate</groupId>
-    		<artifactId>hibernate-core</artifactId>
-    		<version>4.2.8.Final</version>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.2.8.Final</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.hibernate</groupId>
-    		<artifactId>hibernate-validator</artifactId>
-    		<version>4.3.0.Final</version>
-    	</dependency>
-    	
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.3.0.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-search</artifactId>
+			<version>4.4.6.Final</version>
+		</dependency>
 		
 		<!-- ZK  -->
 		<dependency>
@@ -344,7 +348,20 @@
 			<artifactId>joda-time</artifactId>
 			<version>2.4</version>
 		</dependency>
-	
+
+		<!-- Text extractors -->
+		<dependency>
+			<groupId>org.apache.odftoolkit</groupId>
+			<artifactId>simple-odf</artifactId>
+			<version>0.7-incubating</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.11</version>
+		</dependency>
+
 		<!-- Test -->
 		<dependency>
 			<groupId>junit</groupId>

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

@@ -11,6 +11,8 @@ 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.fulltext.FullTextService;
 import info.bukova.isspst.services.munits.MUnitService;
 import info.bukova.isspst.services.numberseries.NumberSeriesService;
 import info.bukova.isspst.services.requirement.RequirementTypeService;
@@ -18,21 +20,21 @@ import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.services.users.PermissionService;
 import info.bukova.isspst.services.users.RoleService;
 import info.bukova.isspst.services.users.UserService;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.math.BigDecimal;
+import java.util.List;
+
 public class AppInitListener implements ServletContextListener {
 
+
+	private DbInfoService dbInfoService;
 	private MUnitService mUnitsService;
 	private RoleService roleService;
 	private UserService userService;
@@ -40,6 +42,7 @@ public class AppInitListener implements ServletContextListener {
 	private NumberSeriesService nsService;
 	private RequirementTypeService reqTypeService;
 	private GlobalSettingsService gSettingsService;
+	private FullTextService ftService;
 	
 	@Override
 	public void contextDestroyed(ServletContextEvent arg0) {
@@ -52,6 +55,7 @@ public class AppInitListener implements ServletContextListener {
 		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);
@@ -59,8 +63,10 @@ public class AppInitListener implements ServletContextListener {
 		nsService =ctx.getBean(NumberSeriesService.class);
 		gSettingsService = ctx.getBean(GlobalSettingsService.class);
 		reqTypeService = ctx.getBean(RequirementTypeService.class);
+		ftService = ctx.getBean(FullTextService.class);
 		
 		userService.grantAdmin();
+		this.checkDbInfo();
 		checkMUnits();
 		checkRoles();
 		checkUsers();
@@ -69,11 +75,33 @@ public class AppInitListener implements ServletContextListener {
 		this.checkNumberSeries();
 		checkReqTypes();
 		this.checkGlobalSettings();
+		buildFulltext();
 		userService.removeAccess();
 		
 		loadModuleReports();
 	}
 	
+	private void buildFulltext() {
+		ftService.reindex();
+	}
+	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();
@@ -200,6 +228,9 @@ public class AppInitListener implements ServletContextListener {
 	
 	private void checkPermissions() {
 		for (Module m : Constants.MODULES) {
+			if (!m.isDefaultPermissions()) {
+				continue;
+			}
 			for (Permission p : Constants.DEF_PERMISSIONS) {
 				if (permService.getPermissionByModule(m.getId(), p.getAuthority()) == null) {
 					p.setModule(m.getId());

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

@@ -1,13 +1,48 @@
 package info.bukova.isspst;
 
+import org.jfree.util.Log;
 
 public class BooleanUtils
 {
-	public static boolean isEqualByBoolean(Boolean b1, Boolean b2)
+	private static final String TAG = BooleanUtils.class.getSimpleName();
+
+	public static boolean isEqualByBooleanValue(Boolean b1, Boolean b2)
 	{
 		boolean bool1 = ((b1 == null) ? false : b1.booleanValue());
 		boolean bool2 = ((b2 == null) ? false : b2.booleanValue());
 		boolean equals = (bool1 == bool2);
 		return equals;
 	}
+
+	public static boolean isEqualByBoolean(Boolean b1, Boolean b2)
+	{
+		if ((b1 == null) && (b2 == null))
+		{
+			return true;
+		}
+		else if ((b1 != null) && (b2 != null))
+		{
+			return (b1.booleanValue() == b2.booleanValue());
+		}
+
+		return false;
+	}
+
+	public static boolean isEqualFilterByBoolean(Boolean value, Boolean filterValue)
+	{
+		if (filterValue == null)
+		{
+			// Show all records
+			return true;
+		}
+		
+		if (value == null)
+		{
+			// Fuck!!! Tri-state data (null, false, true)... We need new solution for selecting ALL data
+			Log.warn(TAG + "\nVelky Boolean v databazi... Pozor na filtrovani.");
+			return true;
+		}
+		
+		return (value.booleanValue() == filterValue.booleanValue());
+	}
 }

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

@@ -1,19 +1,19 @@
 package info.bukova.isspst;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
+import info.bukova.isspst.data.Order;
 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.TripBill;
+import info.bukova.isspst.data.TripBillApproval;
 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.buildings.BuildingService;
+import info.bukova.isspst.services.fulltext.FullTextService;
 import info.bukova.isspst.services.invoicing.InvoicingService;
 import info.bukova.isspst.services.munits.MUnitService;
 import info.bukova.isspst.services.orders.ApprovedService;
@@ -23,13 +23,20 @@ import info.bukova.isspst.services.reqsubjects.ServiceItemService;
 import info.bukova.isspst.services.requirement.RequirementService;
 import info.bukova.isspst.services.requirement.RequirementTypeService;
 import info.bukova.isspst.services.requirement.TripRequirementService;
+import info.bukova.isspst.services.signeddocs.SignedDocumentService;
 import info.bukova.isspst.services.tripbill.TripBillService;
 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 = 5;
+
 	public final static String DEF_ADMIN = "admin";
 	public final static String DEF_ADMIN_PASSWD = "admin";
 	public final static String ROLE_USER = "ROLE_USER";
@@ -79,6 +86,8 @@ public class Constants {
 	public final static String MOD_APPROVED = "APPROVED";
 	public final static String MOD_ORDER = "ORDER";
 	public final static String MOD_INVOICING = "INVOICING";
+	public final static String MOD_SEARCH = "SEARCH";
+	public final static String MOD_SIGNEDDOCS = "SIGNEDDOCS";
 	public final static Module MODULES[] = {
 			new Module(MOD_USERS, "Uživatelé", UserService.class),
 			new Module(MOD_PERMISSIONS, "Práva", RoleService.class),
@@ -94,7 +103,10 @@ public class Constants {
 			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_INVOICING, "Fakturace požadavků", InvoicingService.class),
+			new Module(MOD_SEARCH, "Fulltextové vyhledávání", FullTextService.class, true, false), 
+			new Module(MOD_SIGNEDDOCS, "Podepsané dokumenty", SignedDocumentService.class, true, false),
+		};
 	
 	public final static String PERM_APPROVE = "PERM_APPROVE";
 	public final static String PERM_SHOW_WORKGROUP_REQ = "PERM_SHOW_WORKGROUP_REQ";
@@ -102,29 +114,38 @@ 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 String PERM_SEARCH = "PERM_SEARCH";
 	
 	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),
 		new Permission(PERM_APPROVE, "Schválení", MOD_TRIPREQUIREMENTS, PermissionType.WORKGROUP),
+		
+		new Permission(PERM_SEARCH, "Vyhledávat", MOD_SEARCH, PermissionType.GLOBAL),
+			new Permission(PERM_READ, "Číst", MOD_SIGNEDDOCS, PermissionType.GLOBAL)
 	};
 	
 	public final static String DYNAMIC_REPORT_NAME = "Tabulková sestava";
 	public final static ReportMapping REPORTS[] = {
-		new ReportMapping(MOD_ADDRESSBOOK, new Report("Adresní karty", "address")),
-		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_ADDRESSBOOK, new Report(1, false, "Adresní karty", "address")),
+			new ReportMapping(MOD_ADDRESSBOOK, new Report(2, false, "Adresa", "address", false, true)),
+			new ReportMapping(MOD_TRIPBILL, new Report(3, false, "Žádost", "tripRequirement", false, true)),
+			new ReportMapping(MOD_TRIPBILL, new Report(4, true, "Vyúčtování", "tripBill", false, true, true)),
+			new ReportMapping(MOD_ORDER, new Report(5, false, "Objednávka", "order", true, true)),
+			new ReportMapping(MOD_REQUIREMENTS, new Report(6, false, "Požadavky", "requirements")),
+			new ReportMapping(MOD_TRIPREQUIREMENTS, new Report(7, true, "Žádost o SC", "tripRequirementApp", false, true)),
+			new ReportMapping(MOD_REQUIREMENTS, new Report(8, true, "Protokol o kontrole", "orderRequirement", false, true))
 	};
 	
 	public final static String REQTYPE_ORDER = "ORDER";
@@ -141,5 +162,17 @@ public class Constants {
 	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/");
+		put(TripBillApproval.class, "/main/trips/requirements/");
+		put(Order.class, "/main/orders/created/");
+		put(TripBill.class, "/main/trips/bill/");
 	}} );
+
+	public final static int LEN_TEXT = 255;
+	public final static int LEN_DESCRIPTION = 8192;
+	public final static int LEN_RESULT_MESSAGE = 8192;
+	
+	public final static String MAIL_URL_KEYWORD = "-url-";
+
+	public final static String KEY_SIGN_DATA = "SIGN_DATA";
+	public final static String KEY_SIGN_GUID = "SIGN_GUID";
 }

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

@@ -1,16 +1,26 @@
 package info.bukova.isspst;
 
 import info.bukova.isspst.reporting.Report;
+import info.bukova.isspst.services.AbstractService;
+import info.bukova.isspst.services.ModuleNotActiveException;
 
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author Pepa Rokos
+ *
+ * Třída reprezentuje informace o modulu (agendě).
+ *  
+ */
 public class Module {
 	
 	private String id;
 	private String name;
 	private Class<?> serviceClass;
 	private List<Report> reports;
+	private boolean defaultPermissions;
+	private boolean active;
 	
 	public Class<?> getServiceClass() {
 		return serviceClass;
@@ -20,11 +30,42 @@ public class Module {
 		this.serviceClass = serviceClass;
 	}
 
+	/**
+	 * 
+	 * @param id identifikátor modulu
+	 * @param name jméno zobrazované v aplikaci
+	 * @param serviceClass servisní třída
+	 */
 	public Module(String id, String name, Class<?> serviceClass) {
 		this.id = id;
 		this.name = name;
 		this.serviceClass = serviceClass;
 		reports = new ArrayList<Report>();
+		defaultPermissions = true;
+		active = true;
+	}
+	
+	/**
+	 * @param id identifikátor modulu
+	 * @param name jméno zobrazované v aplikaci
+	 * @param serviceClass servisní třída
+	 * @param active příznak, jestli je modul aktivní
+	 */
+	public Module(String id, String name, Class<?> serviceClass, boolean active) {
+		this(id, name, serviceClass);
+		this.active = active;
+	}
+	
+	/**
+	 * @param id identifikátor modulu
+	 * @param name jméno zobrazované v aplikaci
+	 * @param serviceClass servisní třída
+	 * @param active příznak, jestli je modul aktivní.
+	 * @param defaultPermissions příznak určující jestli modul kontroluje výchozí práva (čtení, zápis, modifikace, mazání)
+	 */
+	public Module(String id, String name, Class<?> serviceClass, boolean active, boolean defaultPermissions) {
+		this(id, name, serviceClass, active);
+		this.defaultPermissions = defaultPermissions;
 	}
 	
 	public String getId() {
@@ -51,4 +92,33 @@ public class Module {
 		this.reports.add(report);
 	}
 
+	/**
+	 * Pokud je true, modul kontroluje výchozí práva (čtení, zápis, modifikace, mazání). Má vliv
+	 * na generování formulářů v nastavení práv.
+	 * 
+	 * @return výchozí práva. Default true
+	 */
+	public boolean isDefaultPermissions() {
+		return defaultPermissions;
+	}
+
+	public void setDefaultPermissions(boolean defaultPermissions) {
+		this.defaultPermissions = defaultPermissions;
+	}
+
+	/**
+	 * Určuje, zda je modul aktivní. Neaktivní moduly nejsou viditelné v UI. Při pokusu o přístup přímo přes URL
+	 * se generuje výjimka {@link ModuleNotActiveException}. Pokud servisní třída modulu nedědí z {@link AbstractService},
+	 * musí se implementovat kontrola aktivity do příslušné třídy.
+	 * 
+	 * @return aktivita. Default true
+	 */
+	public boolean isActive() {
+		return active;
+	}
+
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+
 }

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

@@ -0,0 +1,94 @@
+package info.bukova.isspst;
+
+import info.bukova.isspst.data.DataModel;
+import info.bukova.isspst.services.Service;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import javax.servlet.ServletContext;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ModuleUtils {
+	
+	public static List<Module> getActiveModules() {
+		List<Module> modules = new ArrayList<Module>();
+		
+		for (Module m : Arrays.asList(Constants.MODULES)) {
+			if (m.isActive()) {
+				modules.add(m);
+			}
+		}
+		
+		return modules;
+	}
+	
+	public static Module getModule(Class<?> serviceClass) {
+		for (Module m : Constants.MODULES) {
+			if (Arrays.asList(serviceClass.getInterfaces()).contains(m.getServiceClass())) {
+				return m;
+			}
+		}
+		
+		return null;
+	}
+	
+	public static Module getModule(String id) {
+		for (Module m : Constants.MODULES) {
+			if (m.getId().equals(id)) {
+				return m;
+			}
+		}
+		
+		return null;
+	}
+
+	public static Module getModule(DataModel entity, ServletContext sc) {
+		WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
+		for (Module m : Constants.MODULES) {
+			Service<?> service;
+
+			try {
+				service = (Service<?>) ctx.getBean(m.getServiceClass());
+			} catch (NoSuchBeanDefinitionException e) {
+				String[] beans = ctx.getBeanNamesForType(m.getServiceClass());
+
+				for (String s : beans) {
+					service = (Service<?>) ctx.getBean(s);
+
+					if (service.getEntityClasses().contains(entity.getClass())) {
+						return m;
+					}
+				}
+
+				continue;
+			} catch (ClassCastException e) { //nestandardní moduly neřeší...
+				continue;
+			}
+
+			if (service.getEntityClasses().contains(entity.getClass())) {
+				return m;
+			}
+		}
+
+		return null;
+	}
+
+	public static Service<?> getServiceInstance(Module m, ServletContext sc) {
+		WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
+
+		try {
+			return (Service<?>) ctx.getBean(m.getServiceClass());
+		} catch (NoSuchBeanDefinitionException e) {
+			String[] beans = ctx.getBeanNamesForType(m.getServiceClass());
+			return (Service<?>) ctx.getBean(beans[0]);
+		}
+	}
+	
+	public static boolean isActive(String id) {
+		return getModule(id).isActive();
+	}
+
+}

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

@@ -0,0 +1,31 @@
+package info.bukova.isspst;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RegExUtils {
+	public static List<String> getMatches(String input, String regEx, int group) {
+		List<String> list = new ArrayList<String>();
+		
+		if (!StringUtils.isNullOrEmpty(input) && !StringUtils.isNullOrEmpty(regEx)) {
+			Pattern pattern = Pattern.compile(regEx);
+			Matcher matcher = pattern.matcher(input);
+			int groupCount = matcher.groupCount() + 1;
+
+			if ((groupCount >= 0) && (group < groupCount)) {
+				while (matcher.find()) {
+					String item = matcher.group(group);
+					list.add(item);
+				}
+			}
+		}
+
+		return list;
+	}
+
+	public static List<String> getMatches(String input, String regEx) {
+		return RegExUtils.getMatches(input, regEx, 0);
+	}
+}

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

@@ -29,10 +29,10 @@ public class RequirementUrlResolver implements EntityUrlResolver {
 		
 		Requirement req = (Requirement)entity;
 		
-		if (req.getKind() == Constants.REQ_TYPE_MATERIAL) {
-			return defaultUrl + Constants.URL_MAP.get(req) + "material/?select=" + String.valueOf(req.getId());
+		if (req.getKind() != null && 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) + "services/?select=" + String.valueOf(req.getId());
+			return defaultUrl + Constants.URL_MAP.get(req.getClass()) + "services/?select=" + String.valueOf(req.getId());
 		}
 	}
 

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

@@ -5,6 +5,7 @@ import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -13,16 +14,18 @@ public class SessionData implements Serializable {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -764426911263559758L;
+	private static final long serialVersionUID = -764426911263559759L;
 	
 	private List<Workgroup> userCentres;
 	private List<Workgroup> userWorkgroups;
 	private User currentUser;
 	private Map<Integer, List<Role>> workgroupRoles;
 	private boolean loginFailed;
-	
+	private Map<String, Object> properties;
+
 	public SessionData() {
 		loginFailed = false;
+		properties = new HashMap<String, Object>();
 	}
 
 	public List<Workgroup> getUserCentres() {
@@ -65,4 +68,11 @@ public class SessionData implements Serializable {
 		this.loginFailed = loginFailed;
 	}
 
+	public void setProperty(String key, Object value) {
+		properties.put(key, value);
+	}
+
+	public Object getProperty(String key) {
+		return properties.get(key);
+	}
 }

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

@@ -0,0 +1,25 @@
+package info.bukova.isspst;
+
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Pepa Rokos
+ */
+public class SpringUtils {
+
+	private static WebApplicationContext webCtx(ServletContext sc) {
+		return WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
+	}
+
+	public static Object getBean(String name, ServletContext sc) {
+		return webCtx(sc).getBean(name);
+	}
+
+	public static <T> T getBean(Class<T> clazz, ServletContext sc) {
+		return webCtx(sc).getBean(clazz);
+	}
+
+}

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

@@ -1,11 +1,21 @@
 package info.bukova.isspst;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.zkoss.util.resource.Labels;
 
 public class StringUtils
 {
+	public static boolean isNullOrEmpty(String str)
+	{
+		return ((str == null) || (str.isEmpty()));
+	}
+
+	public static boolean isNullOrTrimmedEmpty(String str)
+	{
+		return ((str == null) || (str.trim().isEmpty()));
+	}
 
 	public static String nullToEmptyString(String str)
 	{
@@ -149,4 +159,47 @@ 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/TripBillAprovalUrlResolver.java

@@ -0,0 +1,29 @@
+package info.bukova.isspst;
+
+import info.bukova.isspst.data.TripBillApproval;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author Pepa Rokos
+ */
+public class TripBillAprovalUrlResolver implements EntityUrlResolver {
+
+	@Autowired
+	private HttpServletRequest request;
+
+	@Override
+	public String entityUrl(Object entity) {
+		String defUrl = request.getRequestURL().toString();
+		defUrl = defUrl.substring(0, defUrl.indexOf(request.getServletPath()));
+
+		if (entity instanceof TripBillApproval) {
+			String url = Constants.URL_MAP.get(entity.getClass());
+
+			return defUrl + url + "?select=" + String.valueOf(((TripBillApproval)entity).getBill().getRequirement().getId());
+		}
+
+		return defUrl + "/app";
+	}
+}

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

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

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

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

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

@@ -0,0 +1,9 @@
+package info.bukova.isspst.dao;
+
+import info.bukova.isspst.data.TripBillApproval;
+
+/**
+ * @author Pepa Rokos
+ */
+public interface TripBillApprovalDao extends BaseDao<TripBillApproval> {
+}

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

@@ -0,0 +1,9 @@
+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/SignedDocumentDaoJPA.java

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

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

@@ -0,0 +1,11 @@
+package info.bukova.isspst.dao.jpa;
+
+import info.bukova.isspst.dao.TripBillApprovalDao;
+import info.bukova.isspst.data.TripBillApproval;
+
+/**
+ * @author Pepa Rokos
+ */
+public class TripBillApprovalDaoJPA extends BaseDaoJPA<TripBillApproval> implements TripBillApprovalDao {
+
+}

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

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

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

@@ -7,11 +7,18 @@ import java.util.List;
 
 import javax.persistence.Embeddable;
 
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+
 @Embeddable
+@Indexed
 public class AddressEmb
 {
 
 	private int id;
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String company;
 	private String department;
 	private String contactName;

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

@@ -11,7 +11,11 @@ import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
 
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
+
 @MappedSuperclass
+@Indexed
 public abstract class BaseData implements OwnedDataModel {
 	
 	@Id
@@ -24,9 +28,11 @@ public abstract class BaseData implements OwnedDataModel {
 	private Date modified;
 	@ManyToOne(fetch=FetchType.LAZY)
 	@JoinColumn(name="OWNED_BY_ID")
+	@IndexedEmbedded
 	private User ownedBy;
 	@ManyToOne(fetch=FetchType.LAZY)
 	@JoinColumn(name="MODIFIED_BY_ID")
+	@IndexedEmbedded
 	private User modifiedBy;
 	@Transient
 	private boolean valid;

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

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

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

@@ -0,0 +1,28 @@
+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/FileContent.java

@@ -0,0 +1,97 @@
+package info.bukova.isspst.data;
+
+import org.hibernate.annotations.Type;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author Pepa Rokos
+ */
+@Entity
+@Table(name = "FILE_CONTENTS")
+@Indexed
+public class FileContent {
+
+	@Id
+	@Column(name = "ID")
+	@GeneratedValue
+	private int id;
+
+	@Column(name = "CONTENT")
+	@Type(type = "text")
+	@Field(index = Index.YES, analyze = Analyze.YES)
+	private String plainText;
+
+	@Column(name = "CONTENT_TYPE")
+	private String contentType;
+
+	@Column(name = "PATH_IN_FILESYSTEM")
+	private String pathInFilesystem;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getPlainText() {
+		return plainText;
+
+	}
+
+	public void setPlainText(String content) {
+		this.plainText = content;
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+
+	public String getPathInFilesystem() {
+		return pathInFilesystem;
+	}
+
+	public void setPathInFilesystem(String pathInFilesystem) {
+		this.pathInFilesystem = pathInFilesystem;
+	}
+
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof FileContent)) return false;
+
+		FileContent that = (FileContent) o;
+
+		if (id != that.id) return false;
+		if (plainText != null ? !plainText.equals(that.plainText) : that.plainText != null) return false;
+		if (contentType != null ? !contentType.equals(that.contentType) : that.contentType != null) return false;
+		if (pathInFilesystem != null ? !pathInFilesystem.equals(that.pathInFilesystem) : that.pathInFilesystem != null)
+			return false;
+
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = id;
+		result = 31 * result + (plainText != null ? plainText.hashCode() : 0);
+		result = 31 * result + (contentType != null ? contentType.hashCode() : 0);
+		result = 31 * result + (pathInFilesystem != null ? pathInFilesystem.hashCode() : 0);
+		return result;
+	}
+}

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

@@ -0,0 +1,152 @@
+package info.bukova.isspst.data;
+
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.CascadeType;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "FILE_METAINFO")
+@Indexed
+public class FileMetainfo extends BaseData {
+
+	@Column(name = "FILE_NAME")
+	@Field(index = Index.YES, analyze = Analyze.YES)
+	private String fileName;
+
+	@Column(name = "MODULE_ID")
+	private String moduleId;
+
+	@Column(name = "RECORD_ID")
+	private int recordId;
+
+	@ManyToOne(fetch = FetchType.EAGER)
+	@JoinColumn(name = "CONTENT_ID")
+	@Cascade(CascadeType.SAVE_UPDATE)
+	@IndexedEmbedded
+	private FileContent content;
+
+	@Column(name = "MD5")
+	private String md5;
+
+	@Column(name = "DESCRIPTION")
+	@Field(index = Index.YES, analyze = Analyze.YES)
+	private String description;
+
+	private void ensureContentExists() {
+		if (content == null) {
+			content = new FileContent();
+		}
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public String getPathInFilesystem() {
+		if (content != null) {
+			return content.getPathInFilesystem();
+		}
+		return null;
+	}
+
+	public void setPathInFilesystem(String pathInFilesystem) {
+		ensureContentExists();
+		content.setPathInFilesystem(pathInFilesystem);
+	}
+
+	public String getModuleId() {
+		return moduleId;
+	}
+
+	public void setModuleId(String moduleId) {
+		this.moduleId = moduleId;
+	}
+
+	public int getRecordId() {
+		return recordId;
+	}
+
+	public void setRecordId(int recordId) {
+		this.recordId = recordId;
+	}
+
+	public FileContent getContent() {
+		return content;
+	}
+
+	public void setContent(FileContent content) {
+		this.content = content;
+	}
+
+	public String getMd5() {
+		return md5;
+	}
+
+	public void setMd5(String md5) {
+		this.md5 = md5;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getContentType() {
+		if (content != null) {
+			return content.getContentType();
+		}
+
+		return null;
+	}
+
+	public void setContentType(String contentType) {
+		ensureContentExists();
+		content.setContentType(contentType);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof FileMetainfo)) return false;
+
+		FileMetainfo that = (FileMetainfo) o;
+
+		if (recordId != that.recordId) return false;
+		if (content != null ? !content.equals(that.content) : that.content != null) return false;
+		if (description != null ? !description.equals(that.description) : that.description != null) return false;
+		if (fileName != null ? !fileName.equals(that.fileName) : that.fileName != null) return false;
+		if (md5 != null ? !md5.equals(that.md5) : that.md5 != null) return false;
+		if (moduleId != null ? !moduleId.equals(that.moduleId) : that.moduleId != null) return false;
+
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = fileName != null ? fileName.hashCode() : 0;
+		result = 31 * result + (moduleId != null ? moduleId.hashCode() : 0);
+		result = 31 * result + recordId;
+		result = 31 * result + (content != null ? content.hashCode() : 0);
+		result = 31 * result + (md5 != null ? md5.hashCode() : 0);
+		result = 31 * result + (description != null ? description.hashCode() : 0);
+		return result;
+	}
+}

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

@@ -17,7 +17,8 @@ import org.hibernate.annotations.LazyCollectionOption;
 
 @Entity
 @Table(name = "INVOICING")
-public class Invoicing extends BaseData {
+public class Invoicing extends BaseData implements Cloneable
+{
 	
 	@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@JoinColumn(name = "REQUIREMENT_ID")
@@ -31,6 +32,9 @@ public class Invoicing extends BaseData {
 	@Column(name = "TOTAL_INVOICED", precision = 15, scale = 4)
 	private BigDecimal totalInvoiced;
 
+	@Column(name = "COMPLETED")
+	private boolean completed;
+
 	public Requirement getRequirement() {
 		return requirement;
 	}
@@ -55,4 +59,20 @@ public class Invoicing extends BaseData {
 		this.totalInvoiced = totalInvoiced;
 	}
 
+	public boolean isCompleted()
+	{
+		return completed;
+	}
+
+	public void setCompleted(boolean completed)
+	{
+		this.completed = completed;
+	}
+
+	@Override
+	public Object clone() throws CloneNotSupportedException
+	{
+		Invoicing cloned = (Invoicing) super.clone();
+		return cloned;
+	}
 }

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

@@ -1,5 +1,7 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.Constants;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -220,6 +222,23 @@ public class JoinedItem implements DataModel, FilterableRequirement
 		this.ownedBy = owner;
 	}
 
+	protected Boolean itemMaterial;
+
+	public boolean isItemMaterialReal()
+	{
+		return ((this.requirement != null) && (this.requirement.getKind() == Constants.REQ_TYPE_MATERIAL));
+	}
+
+	public Boolean getItemMaterial()
+	{
+		return this.itemMaterial;
+	}
+
+	public void setItemMaterial(Boolean value)
+	{
+		this.itemMaterial = value;
+	}
+
 	@Override
 	public boolean equals(Object obj)
 	{

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

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

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

@@ -1,5 +1,6 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.Constants;
 import info.bukova.isspst.StringUtils;
 
 import javax.persistence.Column;
@@ -14,11 +15,14 @@ public class MUnitEmb
 	@Column(name = "MUNIT_NAME")
 	private String name;
 
-	@Column(name = "MUNIT_DESCRIPTION")
+	@Column(name = "MUNIT_DESCRIPTION", length = Constants.LEN_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,5 +1,7 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.Constants;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -16,9 +18,15 @@ import javax.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
 
 @Entity
 @Table(name = "ORDERS")
+@Indexed
 public class Order extends BaseData implements Cloneable
 {
 
@@ -35,7 +43,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")),
+			@AttributeOverride(name = "description", column = @Column(name = "SUPPLIER_DESCRIPTION", length = Constants.LEN_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")),
@@ -45,6 +53,7 @@ public class Order extends BaseData implements Cloneable
 			@AttributeOverride(name = "street", column = @Column(name = "SUPPLIER_STREET")),
 			@AttributeOverride(name = "web", column = @Column(name = "SUPPLIER_WEB")),
 			@AttributeOverride(name = "zipCode", column = @Column(name = "SUPPLIER_ZIP_CODE")) })
+	@IndexedEmbedded
 	private AddressEmb suplier;
 
 	@Embedded
@@ -54,7 +63,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")),
+			@AttributeOverride(name = "description", column = @Column(name = "INVOICE_DESCRIPTION", length = Constants.LEN_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")),
@@ -73,7 +82,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")),
+			@AttributeOverride(name = "description", column = @Column(name = "DELIVERY_DESCRIPTION", length = Constants.LEN_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")),
@@ -94,11 +103,13 @@ public class Order extends BaseData implements Cloneable
 	@Column(name = "DELIVERY_TYPE")
 	private String deliveryType;
 
-	@Column(name = "DESCRIPTION")
+	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String description;
 
 	@OneToMany(cascade = CascadeType.ALL, mappedBy = "order", orphanRemoval = true)
 	@LazyCollection(LazyCollectionOption.TRUE)
+	@IndexedEmbedded
 	private List<OrderItem> items;
 
 	@Column(name = "TOTAL", precision = 15, scale = 4)

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

@@ -1,5 +1,7 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.Constants;
+
 import java.math.BigDecimal;
 
 import javax.persistence.Column;
@@ -12,8 +14,14 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+
 @Entity
 @Table(name = "ORDER_ITEM")
+@Indexed
 public class OrderItem
 {
 
@@ -26,9 +34,11 @@ public class OrderItem
 	private String code;
 
 	@Column(name = "NAME")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String name;
 
 	@Column(name = "TEXTITEM")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String textItem;
 
 	@Column(name = "QUANTITY", precision = 15, scale = 4)
@@ -43,7 +53,8 @@ public class OrderItem
 	@Column(name = "TOTAL", precision = 15, scale = 4)
 	private BigDecimal total;
 
-	@Column(name = "DESCRIPTION")
+	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String description;
 
 	@ManyToOne(fetch = FetchType.EAGER)

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

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

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

@@ -12,11 +12,16 @@ import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
+
 @Entity
 @Table(name = "REQUIREMENT")
+@Indexed
 public class Requirement extends RequirementBase
 {
 	@OneToMany(fetch = FetchType.LAZY, mappedBy = "requirement", cascade = CascadeType.ALL, orphanRemoval = true)
+	@IndexedEmbedded
 	private List<RequirementItem> items;
 
 	@Column(name = "DELIVERYDATE")

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

@@ -1,5 +1,7 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.Constants;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -17,8 +19,13 @@ import javax.persistence.OrderBy;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 
 @MappedSuperclass
+@Indexed
 public class RequirementBase extends BaseData implements FilterableRequirement {
 	
 	@ManyToOne(fetch = FetchType.LAZY)
@@ -29,10 +36,12 @@ public class RequirementBase extends BaseData implements FilterableRequirement {
 	@OrderBy("CENTRE, WORDER")
 	private List<Workflow> workflow;
 	@Column(name = "NUMSER", unique = true)
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String numser;
 	@Column(name = "REQ_DATE")
 	private Date reqDate;
-	@Column(name = "DESCRIPTION")
+	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String description;
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "CENTRE_ID")

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

@@ -1,5 +1,7 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.Constants;
+
 import java.math.BigDecimal;
 
 import javax.persistence.Column;
@@ -12,8 +14,15 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
+
 @Entity
 @Table(name = "REQUIREMENT_ITEMS")
+@Indexed
 public class RequirementItem
 {
 	@Id
@@ -33,9 +42,11 @@ public class RequirementItem
 	private String code;
 	
 	@Column(name = "NAME")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String name;
 
 	@Column(name = "TEXTITEM")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String textItem;
 
 	@Column(name = "QUANTITY", precision=15, scale=4)
@@ -50,7 +61,8 @@ public class RequirementItem
 	@Column(name = "TOTAL", precision=15, scale=4)
 	private BigDecimal total;
 
-	@Column(name = "DESCRIPTION")
+	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String description;
 	
 	@Column(name = "DELIVERED")

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

@@ -1,5 +1,7 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.Constants;
+
 import java.util.Date;
 
 import javax.persistence.Column;
@@ -42,7 +44,7 @@ public abstract class RequirementSubject implements OwnedDataModel {
 	private String code;
 	@Column(name = "NAME")
 	private String name;
-	@Column(name = "DESCRIPTION")
+	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
 	private String description;
 	
 	@NotEmpty(message = "{MaterialFormCodeConstr}")

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

@@ -1,13 +1,15 @@
 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.JoinTable;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
@@ -22,7 +24,7 @@ public class RequirementType extends BaseData {
 	
 	@Column(name = "TYPE")
 	private String type;
-	@Column(name = "DESCRIPTION")
+	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
 	private String description;
 	@OneToMany(cascade = CascadeType.ALL, orphanRemoval=true)
 	@LazyCollection(LazyCollectionOption.FALSE)

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

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

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

@@ -14,6 +14,8 @@ public class SettingsData {
 	private MailMessage newReqTemplate;
 	private MailMessage authReqTemplate;
 	private MailMessage confReqTemplate;
+	private MailMessage confReqTripPassenger;
+	private MailMessage reqPassenger;
 	private Address mainAddress;
 	private List<Address> shippingAddrs;
 	private String bankName;
@@ -22,11 +24,14 @@ public class SettingsData {
 	private List<Vehicle> vehicles;
 	private Map<Integer, BigDecimal[]> refunds;
 	private String stampFile;
+	private String logoFile;
 	
 	public SettingsData() {
 		newReqTemplate = new MailMessage();
 		authReqTemplate = new MailMessage();
 		confReqTemplate = new MailMessage();
+		confReqTripPassenger = new MailMessage();
+		reqPassenger = new MailMessage();
 		mainAddress = new Address();
 		shippingAddrs = new ArrayList<Address>();
 		vehicles = new ArrayList<Vehicle>();
@@ -140,4 +145,29 @@ public class SettingsData {
 		this.stampFile = stampFile;
 	}
 
+	public String getLogoFile()
+	{
+		return logoFile;
+	}
+
+	public void setLogoFile(String logoFile)
+	{
+		this.logoFile = logoFile;
+	}
+
+	public MailMessage getConfReqTripPassenger() {
+		return confReqTripPassenger;
+	}
+
+	public void setConfReqTripPassenger(MailMessage confReqTripPassenger) {
+		this.confReqTripPassenger = confReqTripPassenger;
+	}
+
+	public MailMessage getReqPassenger() {
+		return reqPassenger;
+	}
+
+	public void setReqPassenger(MailMessage reqPassenger) {
+		this.reqPassenger = reqPassenger;
+	}
 }

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

@@ -0,0 +1,114 @@
+package info.bukova.isspst.data;
+
+import info.bukova.isspst.Constants;
+import info.bukova.isspst.Module;
+import info.bukova.isspst.StringUtils;
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.annotations.IndexedEmbedded;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Entity
+@Table(name = "SIGNED_DOCUMENTS")
+public class SignedDocument extends BaseData {
+
+	@Column(name = "MODULE_NAME", length = Constants.LEN_TEXT)
+	private String moduleName;
+
+	@Column(name = "RECORD_ID")
+	private int recordId;
+
+	@Column(name = "NUMSER", length = Constants.LEN_TEXT)
+	private String numser;
+
+	@Column(name = "DESCRIPTION", length = Constants.LEN_DESCRIPTION)
+	private String description;
+
+	@Column(name = "SIGN_DATE")
+	private Date signDate;
+
+	@OneToMany(cascade = CascadeType.ALL, mappedBy = "signedDocument", orphanRemoval = true)
+	@LazyCollection(LazyCollectionOption.TRUE)
+	@IndexedEmbedded
+	private List<SignedDocumentItem> items;
+
+	public String getModuleName() {
+		return moduleName;
+	}
+
+	public void setModuleName(String moduleName) {
+		this.moduleName = moduleName;
+	}
+
+	public int getRecordId() {
+		return recordId;
+	}
+
+	public void setRecordId(int recordId) {
+		this.recordId = recordId;
+	}
+
+	public String getNumser() {
+		return numser;
+	}
+
+	public void setNumser(String numser) {
+		this.numser = numser;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Date getSignDate() {
+		return signDate;
+	}
+
+	public void setSignDate(Date signDate) {
+		this.signDate = signDate;
+	}
+
+	public String getAgendaName() {
+
+		if (StringUtils.isNullOrEmpty(this.moduleName)) {
+			return "";
+		}
+
+		for (Module m : Constants.MODULES) {
+			if (this.moduleName.equals(m.getId())) {
+				return m.getName();
+			}
+		}
+
+		return "";
+	}
+
+	public List<SignedDocumentItem> getItems() {
+		return items;
+	}
+
+	public void setItems(List<SignedDocumentItem> items) {
+		this.items = items;
+	}
+
+	public void addItem(SignedDocumentItem item) {
+		if (items == null) {
+			items = new ArrayList<SignedDocumentItem>();
+		}
+
+		item.setSignedDocument(this);
+		this.items.add(item);
+	}
+}

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

@@ -0,0 +1,88 @@
+package info.bukova.isspst.data;
+
+import info.bukova.isspst.Constants;
+import info.bukova.isspst.reporting.Report;
+import info.bukova.isspst.reporting.ReportMapping;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "SIGNED_DOCUMENTS_ITEMS")
+public class SignedDocumentItem {
+
+	@Id
+	@Column(name = "ID")
+	@GeneratedValue
+	private int id;
+
+	@Column(name = "REPORT_ID")
+	private long reportId;
+
+	@Column(name = "REPORT_NAME", length = Constants.LEN_TEXT)
+	private String reportName;
+
+	@Column(name = "FILENAME", length = Constants.LEN_TEXT)
+	private String fileName;
+
+	@ManyToOne
+	@JoinColumn(name = "SIGNED_DOCUMENT_ID")
+	private SignedDocument signedDocument;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public long getReportId() {
+		return reportId;
+	}
+
+	public void setReportId(long reportId) {
+		this.reportId = reportId;
+	}
+
+	public String getReportName() {
+		return reportName;
+	}
+
+	public void setReportName(String reportName) {
+		this.reportName = reportName;
+	}
+
+	public String getActualReportName() {
+		for (ReportMapping rm : Constants.REPORTS) {
+			Report rep = rm.getReport();
+
+			if (this.reportId == rep.getReportId()) {
+				return rep.getName();
+			}
+		}
+
+		return reportName;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public SignedDocument getSignedDocument() {
+		return signedDocument;
+	}
+
+	public void setSignedDocument(SignedDocument signedDocument) {
+		this.signedDocument = signedDocument;
+	}
+}

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

@@ -1,9 +1,14 @@
 package info.bukova.isspst.data;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import info.bukova.isspst.Constants;
+import info.bukova.isspst.storage.EntityWithAttachment;
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -13,13 +18,15 @@ 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;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Entity
 @Table(name = "TRIP_BILL")
-public class TripBill extends BaseData {
+@Indexed
+public class TripBill extends BaseData implements EntityWithAttachment {
 
 	@OneToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "REQUIREMENT_ID")
@@ -28,6 +35,11 @@ public class TripBill extends BaseData {
 	private Date resultMessageDate;
 	@Column(name = "SIGN_DATE")
 	private Date signDate;
+
+	@Column(name = "RESULT_MESSAGE", length = Constants.LEN_RESULT_MESSAGE)
+	@Field(index = Index.YES, analyze = Analyze.YES)
+	private String resultMessage;
+
 	@Column(name = "FREE_MEALS")
 	private boolean freeMeals;
 	@Column(name = "FREE_HOUSING")
@@ -44,9 +56,19 @@ public class TripBill extends BaseData {
 	private BigDecimal downPayment;
 	@Column(name = "TOTAL", precision = 15, scale = 4)
 	private BigDecimal total;
+	@OneToMany(cascade = CascadeType.ALL)
+	@LazyCollection(LazyCollectionOption.TRUE)
+	@IndexedEmbedded
+	private List<FileMetainfo> attachedFiles;
+	@OneToOne(fetch = FetchType.EAGER)
+	@JoinColumn(name = "APPROVAL_ID")
+	private TripBillApproval approval;
+	@Column(name = "SAVED")
+	private Boolean saved; // Nastaveno na true, pokud uživatel udělá změnu- nepřenáší se pak částky od žadatele
 	
 	public TripBill() {
 		billItems = new ArrayList<TripBillItem>();
+		attachedFiles = new ArrayList<FileMetainfo>();
 	}
 
 	public TripRequirement getRequirement() {
@@ -73,6 +95,16 @@ public class TripBill extends BaseData {
 		this.signDate = signDate;
 	}
 
+	public String getResultMessage()
+	{
+		return resultMessage;
+	}
+
+	public void setResultMessage(String resultMessage)
+	{
+		this.resultMessage = resultMessage;
+	}
+
 	public boolean isFreeMeals() {
 		return freeMeals;
 	}
@@ -121,4 +153,37 @@ public class TripBill extends BaseData {
 		this.total = total;
 	}
 
+	public List<FileMetainfo> getAttachedFiles() {
+		return attachedFiles;
+	}
+
+	@Override
+	public void addAttachment(FileMetainfo metaInfo) {
+		attachedFiles.add(metaInfo);
+	}
+
+	@Override
+	public void removeAttachment(FileMetainfo metainfo) {
+		attachedFiles.remove(metainfo);
+	}
+
+	public void setAttachedFiles(List<FileMetainfo> attachedFiles) {
+		this.attachedFiles = attachedFiles;
+	}
+
+	public TripBillApproval getApproval() {
+		return approval;
+	}
+
+	public void setApproval(TripBillApproval approval) {
+		this.approval = approval;
+	}
+
+	public Boolean getSaved() {
+		return saved;
+	}
+
+	public void setSaved(Boolean saved) {
+		this.saved = saved;
+	}
 }

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

@@ -0,0 +1,44 @@
+package info.bukova.isspst.data;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+/**
+ * @author Pepa Rokos
+ */
+
+@Entity
+@Table(name = "TRIP_BILL_APPROVAL")
+public class TripBillApproval extends RequirementBase {
+
+	@OneToOne(fetch = FetchType.EAGER)
+	@JoinColumn(name = "TRIPBILL_ID")
+	private TripBill bill;
+
+	@Override
+	public String getNumser() {
+
+		if (bill == null) {
+			return "";
+		}
+
+		TripRequirement tr = bill.getRequirement();
+
+		if (tr == null) {
+			return "";
+		}
+
+		return tr.getNumser();
+	}
+
+	public TripBill getBill() {
+		return bill;
+	}
+
+	public void setBill(TripBill bill) {
+		this.bill = bill;
+	}
+}

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

@@ -1,7 +1,6 @@
 package info.bukova.isspst.data;
 
-import java.math.BigDecimal;
-import java.util.Date;
+import info.bukova.isspst.Constants;
 
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
@@ -9,6 +8,8 @@ import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.math.BigDecimal;
+import java.util.Date;
 
 @Entity
 @Table(name = "TRIP_BILL_ITEMS")
@@ -33,7 +34,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"))
+			@AttributeOverride(name = "description", column = @Column(name = "BACK_VEHICLE_DESCRIPTION", length = Constants.LEN_DESCRIPTION))
 	})
 	private Vehicle backVehicle;
 	@Column(name = "BEGIN_WORK")
@@ -63,6 +64,35 @@ public class TripBillItem extends BaseData {
 	@Column(name = "ADJUSTED_TOTAL", precision = 15, scale = 4)
 	private BigDecimal adjustedTotal;
 
+	public TripBillItem() {
+
+	}
+
+	public TripBillItem(TripBillItem src) {
+		date = src.getDate();
+		to = src.getTo();
+		back = src.getBack();
+		toDeparture = src.getToDeparture();
+		toArrival = src.getToArrival();
+		backDeparture = src.getBackDeparture();
+		backArrival = src.getBackArrival();
+		toVehicle = src.getToVehicle();
+		backVehicle = src.getBackVehicle();
+		beginWork = src.getBeginWork();
+		endWork = src.getEndWork();
+		freeMealsCount = src.getFreeMealsCount();
+		distance = src.getDistance();
+		fuelConsumption = src.getFuelConsumption();
+		distanceAmount = src.getDistanceAmount();
+		fuelAmount = src.getFuelAmount();
+		carefare = src.getCarefare();
+		housing = src.getHousing();
+		meals = src.getMeals();
+		otherExpenses = src.getOtherExpenses();
+		total = src.getTotal();
+		adjustedTotal = src.getAdjustedTotal();
+	}
+
 	public Date getDate() {
 		return date;
 	}

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

@@ -1,28 +1,40 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.storage.EntityWithAttachment;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.IndexedEmbedded;
 
 @Entity
 @Table(name = "TRIPREQUIREMENT")
-public class TripRequirement extends RequirementBase {
+@Indexed
+public class TripRequirement extends RequirementBase implements EntityWithAttachment {
 	
 	@Column(name = "TRIP_FROM")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String from;
 	@Column(name = "TRIP_TO")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String to;
 	@Column(name = "TRIP_DATE")
 	private Date tripDate;
@@ -34,16 +46,28 @@ public class TripRequirement extends RequirementBase {
 	@LazyCollection(LazyCollectionOption.TRUE)
 	@JoinTable(name="TRIPREQUIREMENT_PASSANGER", joinColumns={@JoinColumn(name="TRIPREQUIREMENT_ID")}, inverseJoinColumns={@JoinColumn(name="USER_ID")})
 	private List<User> passengers;
+
+	@Column(name = "FOREIGN_PERSONS")
+	@Field(index = Index.YES, analyze = Analyze.YES)
+	private String foreignPersons;
+
 	@Embedded
 	private Vehicle vehicle;
 	@Column(name = "REQUIRE_DOWN_PAYMENT")
 	private Boolean requireDownPayment;
 	@Column(name = "DOWN_PAYMENT", precision = 15, scale = 4)
 	private BigDecimal downPayment;
+	@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
+	@LazyCollection(LazyCollectionOption.TRUE)
+	@IndexedEmbedded
+	private List<FileMetainfo> attachedFiles;
+	@Column(name = "BILL_FOR_PASSENGERS")
+	private Boolean billForPassengers;
 
 	public TripRequirement() {
 		this.setOwnedBy(new User());
 		passengers = new ArrayList<User>();
+		attachedFiles = new ArrayList<FileMetainfo>();
 	}
 	
 	public String getFrom() {
@@ -94,6 +118,16 @@ public class TripRequirement extends RequirementBase {
 		this.passengers = passengers;
 	}
 
+	public String getForeignPersons()
+	{
+		return foreignPersons;
+	}
+
+	public void setForeignPersons(String foreignPersons)
+	{
+		this.foreignPersons = foreignPersons;
+	}
+
 	public Vehicle getVehicle() {
 		return vehicle;
 	}
@@ -118,4 +152,30 @@ public class TripRequirement extends RequirementBase {
 		this.downPayment = downPayment;
 	}
 
+	@Override
+	public List<FileMetainfo> getAttachedFiles() {
+		return attachedFiles;
+	}
+
+	public void setAttachedFiles(List<FileMetainfo> attachedFiles) {
+		this.attachedFiles = attachedFiles;
+	}
+
+	@Override
+	public void addAttachment(FileMetainfo metaInfo) {
+		attachedFiles.add(metaInfo);
+	}
+
+	@Override
+	public void removeAttachment(FileMetainfo metainfo) {
+		attachedFiles.remove(metainfo);
+	}
+
+	public Boolean getBillForPassengers() {
+		return billForPassengers;
+	}
+
+	public void setBillForPassengers(Boolean billForPassengers) {
+		this.billForPassengers = billForPassengers;
+	}
 }

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

@@ -14,10 +14,15 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
+import org.hibernate.search.annotations.Analyze;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
 import org.springframework.security.core.userdetails.UserDetails;
 
 @Entity
 @Table(name="USER")
+@Indexed
 public class User extends Member implements UserDetails, DataModel {
 
 	/**
@@ -32,8 +37,10 @@ public class User extends Member implements UserDetails, DataModel {
 	@Column(name="ENABLED")
 	private boolean enabled;
 	@Column(name="FIRST_NAME")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String firstName;
 	@Column(name="LAST_NAME")
+	@Field(index = Index.YES, analyze = Analyze.YES)
 	private String lastName;
 	@Column(name="PERSONAL_NUMBER")
 	private String personalNumber;

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

@@ -1,5 +1,10 @@
 package info.bukova.isspst.data;
 
+import info.bukova.isspst.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
@@ -47,4 +52,22 @@ public class UsersAddress {
 		this.city = city;
 	}
 	
+	public String toString() {
+		List<String> list = new ArrayList<String>();
+		list.add(this.street);
+		list.add(this.houseNumber);
+		final String s1 = StringUtils.joinNotEmpty(list, " ");
+
+		list.clear();
+		list.add(this.zipCode);
+		list.add(this.city);
+		final String s2 = StringUtils.joinNotEmpty(list, " ");
+
+		list.clear();
+		list.add(s1);
+		list.add(s2);
+		final String s = StringUtils.joinNotEmpty(list, ", ");
+
+		return s;
+	}
 }

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

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

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

@@ -1,15 +1,14 @@
 package info.bukova.isspst.data;
 
-import java.math.BigDecimal;
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-
-import org.hibernate.annotations.LazyCollection;
-import org.hibernate.annotations.LazyCollectionOption;
+import java.math.BigDecimal;
 
 @Entity
 @Table(name = "WORKFLOW")
@@ -24,7 +23,9 @@ public class Workflow extends BaseData {
 	@Column(name = "WORDER")
 	private Integer wOrder;
 	@Column(name = "WLIMIT", precision=15, scale=4)
-	private BigDecimal limit; 
+	private BigDecimal limit;
+	@Column(name = "SIGNATURE")
+	private Boolean signature;
 
 	public Boolean getCentre() {
 		return centre;
@@ -68,4 +69,11 @@ public class Workflow extends BaseData {
 		this.limit = limit;
 	}
 
+	public Boolean getSignature() {
+		return signature;
+	}
+
+	public void setSignature(Boolean signature) {
+		this.signature = signature;
+	}
 }

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

@@ -0,0 +1,57 @@
+package info.bukova.isspst.filters;
+
+import info.bukova.isspst.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Listitem;
+
+@SuppressWarnings("serial")
+public class BooleanFilterListbox extends Listbox
+{
+	class TristateBooleanListItem extends TristateBoolean
+	{
+		public TristateBooleanListItem(String text, int value)
+		{
+			this.setText(text);
+			this.setValue(value);
+		}
+
+		private String text;
+
+		public String getText()
+		{
+			return text;
+		}
+
+		public void setText(String text)
+		{
+			this.text = text;
+		}
+	}
+
+	public BooleanFilterListbox()
+	{
+		super();
+
+		List<TristateBooleanListItem> list = new ArrayList<TristateBooleanListItem>();
+		list.add(new TristateBooleanListItem(StringUtils.localize("LabelAll"), TristateBoolean.NULL));
+		list.add(new TristateBooleanListItem(StringUtils.localize("LabelNo"), TristateBoolean.FALSE));
+		list.add(new TristateBooleanListItem(StringUtils.localize("LabelYes"), TristateBoolean.TRUE));
+
+		for (int i = 0; i < list.size(); i++)
+		{
+			TristateBooleanListItem triStateItem = (TristateBooleanListItem) list.get(i);
+			this.appendItem(triStateItem.getText(), "");
+
+			Listitem item = this.getItemAtIndex(i);
+			item.setValue((TristateBoolean) triStateItem);
+		}
+
+		this.setSelectedIndex(0);
+		// this.setHflex("1");
+		this.setMold("select");
+	}
+}

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

@@ -4,6 +4,7 @@ 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;
@@ -48,8 +49,9 @@ public class InvoicingFilter implements Filter<Invoicing>
 			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);
+			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundWorkgroup && foundUser);
 		}
 
 		@Factory

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

@@ -1,5 +1,6 @@
 package info.bukova.isspst.filters;
 
+import info.bukova.isspst.BooleanUtils;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.JoinedItem;
 import info.bukova.isspst.data.MUnitEmb;
@@ -42,6 +43,7 @@ public class JoinedItemFilter implements Filter<JoinedItem>
 		@Override
 		public boolean matchesSafely(JoinedItem item)
 		{
+			boolean foundItemMaterial = BooleanUtils.isEqualFilterByBoolean(item.isItemMaterialReal(), condition.getItemMaterial());
 			boolean foundCode = StringUtils.isEqualForFilter(item.getCode(), condition.getCode());
 			boolean foundName = StringUtils.isEqualForFilter(item.getName(), condition.getName());
 			boolean foundTextItem = StringUtils.isEqualForFilter(item.getTextItem(), condition.getTextItem());
@@ -56,7 +58,18 @@ public class JoinedItemFilter implements Filter<JoinedItem>
 			boolean foundCenter = Workgroup.isEqualByWorkgroupForFilter(item.getCentre(), condition.getCentre());
 			boolean foundOwner = User.isEqualByUserForFilter(item.getOwnedBy(), condition.getOwnedBy());
 			boolean foundDescription = StringUtils.isEqualForFilter(item.getDescription(), condition.getDescription());
-			return (foundCode && foundName && foundTextItem && foundDescription && foundQuantity && foundUnitPrice && foundMUnit && foundTotal && foundWorkgroup && foundCenter && foundOwner && foundDescription);
+			return (foundItemMaterial
+					&& foundCode
+					&& foundName
+					&& foundTextItem
+					&& foundDescription
+					&& foundQuantity
+					&& foundUnitPrice
+					&& foundMUnit
+					&& foundTotal
+					&& foundWorkgroup
+					&& foundCenter
+					&& foundOwner && foundDescription);
 		}
 
 		@Factory

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

@@ -47,7 +47,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());
+			boolean foundProject = BooleanUtils.isEqualByBooleanValue(item.getProject(), condition.getProject());
 			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundDeliveryDate && foundUser && foundProject);
 		}
 

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

@@ -0,0 +1,64 @@
+package info.bukova.isspst.filters;
+
+import info.bukova.isspst.DateTimeUtils;
+import info.bukova.isspst.StringUtils;
+import info.bukova.isspst.data.SignedDocument;
+
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+public class SignedDocumentFilter implements Filter<SignedDocument>
+{
+	private SignedDocument condition;
+
+	public SignedDocumentFilter(SignedDocument cond)
+	{
+		this.condition = cond;
+	}
+
+	private static class SignedDocumentMatcher extends TypeSafeMatcher<SignedDocument>
+	{
+		private SignedDocument condition;
+
+		public SignedDocumentMatcher(SignedDocument cond)
+		{
+			this.condition = cond;
+		}
+
+		@Override
+		public void describeTo(Description desc)
+		{
+			desc.appendText("SignedDocument matches");
+		}
+
+		@Override
+		public boolean matchesSafely(SignedDocument item)
+		{
+			boolean foundAgendaName = StringUtils.isEqualForFilter(item.getAgendaName(), condition.getAgendaName());
+			boolean foundNumSer = StringUtils.isEqualForFilter(item.getNumser(), condition.getNumser());
+			boolean foundDescription = StringUtils.isEqualForFilter(item.getDescription(), condition.getDescription());
+			boolean foundSignDate = DateTimeUtils.isEqualByDateForFilter(item.getSignDate(), condition.getSignDate());
+			return (foundAgendaName && foundNumSer && foundDescription && foundSignDate);
+		}
+
+		@Factory
+		public static Matcher<SignedDocument> matchBuilding(SignedDocument item)
+		{
+			return new SignedDocumentMatcher(item);
+		}
+	}
+
+	@Override
+	public SignedDocumentMatcher matcher()
+	{
+		return new SignedDocumentMatcher(condition);
+	}
+
+	@Override
+	public String queryString()
+	{
+		return "";
+	}
+}

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

@@ -0,0 +1,87 @@
+package info.bukova.isspst.filters;
+
+import org.jfree.util.Log;
+
+public class TristateBoolean
+{
+	private static final String TAG = TristateBoolean.class.getSimpleName();
+
+	public static final int NULL = -1;
+	public static final int FALSE = 0;
+	public static final int TRUE = 1;
+
+	public static final int getValidValue(final int value)
+	{
+		if ((value != TristateBoolean.NULL) && (value != TristateBoolean.FALSE) && (value != TristateBoolean.TRUE))
+		{
+			Log.warn(TAG + "\nBad tristate boolean value.");
+			return TristateBoolean.NULL;
+		}
+
+		return value;
+	}
+
+	public TristateBoolean()
+	{
+		this.setValue(TristateBoolean.NULL);
+	}
+
+	public TristateBoolean(boolean value)
+	{
+		this.setValue(value ? TristateBoolean.TRUE : TristateBoolean.FALSE);
+	}
+
+	public TristateBoolean(int value)
+	{
+		this.setValue(value);
+	}
+
+	protected int value;
+
+	public int getValue()
+	{
+		return value;
+	}
+
+	public void setValue(int value)
+	{
+		this.value = TristateBoolean.getValidValue(value);
+	}
+
+	public Boolean getBoolean()
+	{
+		switch (this.value)
+		{
+		case TristateBoolean.FALSE:
+			return new Boolean(false);
+
+		case TristateBoolean.TRUE:
+			return new Boolean(true);
+
+		default:
+			return null;
+		}
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		if (obj != null)
+		{
+			if (obj instanceof TristateBoolean)
+			{
+				TristateBoolean item = (TristateBoolean) obj;
+				int thisValue = this.getValue();
+				int itemValue = item.getValue();
+				return (thisValue == itemValue);
+			}
+		}
+
+		return false;
+	}
+
+	public boolean equals(int value)
+	{
+		return (this.getValue() == value);
+	}
+}

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

@@ -1,5 +1,6 @@
 package info.bukova.isspst.mail;
 
+import info.bukova.isspst.Constants;
 import info.bukova.isspst.EntityUrlResolver;
 import info.bukova.isspst.UrlResolverHolder;
 
@@ -57,7 +58,7 @@ public class EntityMessageBuilder implements MessageBuilder {
 		
 		for (String p : properties) {
 			try {
-				if (p.equals("-url-")) {
+				if (p.equals(Constants.MAIL_URL_KEYWORD)) {
 					ret = ret.replaceAll("\\[" + p + "\\]", getUrl(data));
 				} else {
 					ret = ret.replaceAll("\\[" + p + "\\]", BeanUtils.getProperty(data, p));

src/main/java/info/bukova/isspst/reporting/ParamFiller.java

@@ -1,8 +1,7 @@
 package info.bukova.isspst.reporting;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import com.mysql.jdbc.StringUtils;
+import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.AuthItem;
 import info.bukova.isspst.data.Order;
 import info.bukova.isspst.data.TripBill;
@@ -10,11 +9,14 @@ import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.UserSettingsData;
 import info.bukova.isspst.services.requirement.TripRequirementService;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
+import info.bukova.isspst.services.tripbill.TripBillApprovalService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.storage.FileStorage;
-
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class ParamFiller {
 	
 	@Autowired
@@ -27,6 +29,8 @@ public class ParamFiller {
 	private TripRequirementService tripReqService;
 	@Autowired
 	private GlobalSettingsService settingService;
+	@Autowired
+	private TripBillApprovalService tripBillApprovalService;
 	
 	public void fill() {
 		if (definition.getDataSet() == null || definition.getDataSet().isEmpty()) {
@@ -45,6 +49,7 @@ public class ParamFiller {
 		
 		if ((definition.getDataSet().get(0) instanceof TripBill) 
 				&& definition.getReport().isSingleRecord()) {
+
 			if (userService.getUserSettings().getSignatureFile() != null 
 					&& !userService.getUserSettings().getSignatureFile().isEmpty()) {
 				definition.setParam("P_USER_SIGNATURE", storage.serverPath(userService.getUserSettings().getSignatureFile()));
@@ -52,18 +57,32 @@ public class ParamFiller {
 			
 			TripBill tb = (TripBill)definition.getDataSet().get(0);
 			tripReqService.loadAuthItems(tb.getRequirement());
-			AuthItem lastAuth = tb.getRequirement().getAuthorization().get(tb.getRequirement().getAuthorization().size() - 1);
-			
-			definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate());
-			
-			User u = lastAuth.getApprover();
-			
-			UserSettingsData approverSettings = userService.getUserSettings(u);
-			
-			if (approverSettings != null 
-					&& approverSettings.getSignatureFile() != null 
-					&& !approverSettings.getSignatureFile().isEmpty()) {
-				definition.setParam("P_APPROVER_SIGNATURE", storage.serverPath(approverSettings.getSignatureFile()));
+
+			if (tb.getApproval() != null) {
+				tripBillApprovalService.loadAuthItems(tb.getApproval());
+			}
+
+			if (tb.getApproval() != null && tb.getApproval().getAuthorization() != null && !tb.getApproval().getAuthorization().isEmpty()) {
+
+				AuthItem lastButOneAuth = tb.getApproval().getAuthorization().get(0);
+				definition.setParam("P_PREV_APPROVE_DATE", lastButOneAuth.getAuthDate());
+
+				User lastButOneUser = lastButOneAuth.getApprover();
+				UserSettingsData prevApproverSettings = userService.getUserSettings(lastButOneUser);
+
+				if (prevApproverSettings != null && !StringUtils.isNullOrEmpty(prevApproverSettings.getSignatureFile())) {
+					definition.setParam("P_PREV_APPROVER_SIGNATURE", storage.serverPath(prevApproverSettings.getSignatureFile()));
+				}
+
+				AuthItem lastAuth = tb.getApproval().getAuthorization().get(tb.getApproval().getAuthorization().size() - 1);
+				definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate());
+
+				User u = lastAuth.getApprover();
+				UserSettingsData approverSettings = userService.getUserSettings(u);
+
+				if (approverSettings != null && !StringUtils.isNullOrEmpty(approverSettings.getSignatureFile())) {
+					definition.setParam("P_APPROVER_SIGNATURE", storage.serverPath(approverSettings.getSignatureFile()));
+				}
 			}
 		}
 		
@@ -74,6 +93,15 @@ public class ParamFiller {
 				definition.setParam("P_STAMP", storage.serverPath(settingService.getSettings().getStampFile()));
 			}
 		}
+
+		definition.setParam("P_LOGO", storage.serverPath(settingService.getSettings().getLogoFile()));
+
+		Address mainAddress = settingService.getSettings().getMainAddress();
+
+		if (mainAddress != null) {
+			String addr = (StringUtils.isNullOrEmpty(mainAddress.getCompany()) ? "" : mainAddress.getCompany());
+			definition.setParam("P_MAIN_ADDRESS", addr);
+		}
 	}
 
 }

src/main/java/info/bukova/isspst/reporting/PredefinedGenerator.java

@@ -1,18 +1,21 @@
 package info.bukova.isspst.reporting;
 
-import java.io.File;
-
-import javax.servlet.ServletContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import info.bukova.isspst.SpringUtils;
+import info.bukova.isspst.data.DataModel;
+import info.bukova.isspst.data.SignedDocumentItem;
+import info.bukova.isspst.services.signeddocs.SignedDocumentService;
+import info.bukova.isspst.storage.ReportFileStorage;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.JasperRunManager;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 import net.sf.jasperreports.engine.util.JRLoader;
 import net.sf.jasperreports.engine.util.JRProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletContext;
+import java.io.File;
 
 @SuppressWarnings("deprecation")
 public class PredefinedGenerator implements Generator {
@@ -20,7 +23,7 @@ public class PredefinedGenerator implements Generator {
 	private ReportDefinition definition;
 	private ServletContext ctx;
 	private final static Logger logger = LoggerFactory.getLogger(PredefinedGenerator.class);
-	
+
 	public PredefinedGenerator(ReportDefinition definition, ServletContext ctx) {
 		this.definition = definition;
 		this.ctx = ctx;
@@ -29,7 +32,12 @@ public class PredefinedGenerator implements Generator {
 	@Override
 	public byte[] generate() {
 		byte[] bytes = null;
-		
+		SignedDocumentItem signedItem = getSignedDocument();
+
+		if (signedItem != null) {
+			return fromStorage(signedItem);
+		}
+
 		try {
 			JasperReport report = (JasperReport) JRLoader.loadObject(getReportFile());
 			JRProperties.setProperty("net.sf.jasperreports.default.pdf.encoding", "Cp1250");
@@ -43,6 +51,18 @@ public class PredefinedGenerator implements Generator {
 		
 		return bytes;
 	}
+
+	private byte[] fromStorage(SignedDocumentItem sdItem) {
+		ReportFileStorage reportStorage = SpringUtils.getBean(ReportFileStorage.class, ctx);
+		return reportStorage.fileData(sdItem);
+	}
+
+	private SignedDocumentItem getSignedDocument() {
+		SignedDocumentService sdService = SpringUtils.getBean(SignedDocumentService.class, ctx);
+		SignedDocumentItem sdItem = sdService.getItem((DataModel) definition.getDataSet().get(0), definition.getReport().getReportId());
+
+		return sdItem;
+	}
 	
 	protected File getReportFile() {
 		return new File(ctx.getRealPath("WEB-INF/reports") + "/" + definition.getReport().getJasperFile() + ".jasper");

src/main/java/info/bukova/isspst/reporting/Report.java

@@ -4,48 +4,77 @@ package info.bukova.isspst.reporting;
 public class Report {
 
 	private ReportType type;
+	private long reportId;
+	private boolean signable;
 	private String name;
 	private String jasperFile;
 	private boolean hasSettings;
 	private boolean singleRecord;
+	private boolean hasCondition;
 	
 	public Report() {
+		this.reportId = 0;
+		this.signable = false;
 		hasSettings = false;
 		singleRecord = false;
+		hasCondition = false;
 	}
 	
 	/**
+	 * @param reportId
+	 * @param signable
 	 * @param name
 	 * @param jasperFile
 	 */
-	public Report(String name, String jasperFile) {
+	public Report(long reportId, boolean signable, String name, String jasperFile) {
 		this();
 		this.type = ReportType.DEFINED;
+		this.reportId = reportId;
+		this.signable = signable;
 		this.name = name;
 		this.jasperFile = jasperFile;
 	}
 	
 	/**
+	 * @param reportId
+	 * @param signable
 	 * @param name
 	 * @param jasperFile
 	 * @param hasSettings
 	 */
-	public Report(String name, String jasperFile, boolean hasSettings) {
-		this(name, jasperFile);
+	public Report(long reportId, boolean signable, String name, String jasperFile, boolean hasSettings) {
+		this(reportId, signable, name, jasperFile);
 		this.hasSettings = hasSettings;
 	}
 	
 	/**
+	 * @param reportId
+	 * @param signable
 	 * @param name
 	 * @param jasperFile
 	 * @param hasSettings
 	 * @param singleRecord
 	 */
-	public Report(String name, String jasperFile, boolean hasSettings, boolean singleRecord) {
-		this(name, jasperFile, hasSettings);
+	public Report(long reportId, boolean signable, String name, String jasperFile, boolean hasSettings, boolean singleRecord) {
+		this(reportId, signable, name, jasperFile, hasSettings);
 		this.singleRecord = singleRecord;
 	}
 
+	/**
+	 * 
+	 * @param reportId
+	 * @param signable
+	 * @param name
+	 * @param jasperFile
+	 * @param hasSettings
+	 * @param singleRecord
+	 * @param hasCondition
+	 */
+	public Report(long reportId, boolean signable, String name, String jasperFile, boolean hasSettings, boolean singleRecord, boolean hasCondition) {
+		this(reportId, signable, name, jasperFile, hasSettings, singleRecord);
+		this.hasCondition = hasCondition;
+	}
+
 	public ReportType getType() {
 		return type;
 	}
@@ -86,4 +115,27 @@ public class Report {
 		this.singleRecord = singleRecord;
 	}
 
+	public boolean isHasCondition() {
+		return hasCondition;
+	}
+
+	public void setHasCondition(boolean hasCondition) {
+		this.hasCondition = hasCondition;
+	}
+
+	public long getReportId() {
+		return reportId;
+	}
+
+	public void setReportId(long reportId) {
+		this.reportId = reportId;
+	}
+
+	public boolean isSignable() {
+		return signable;
+	}
+
+	public void setSignable(boolean signable) {
+		this.signable = signable;
+	}
 }

src/main/java/info/bukova/isspst/reporting/ReportController.java

@@ -1,17 +1,17 @@
 package info.bukova.isspst.reporting;
 
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
+import info.bukova.isspst.storage.ReportFileStorage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+
 @Controller
 public class ReportController {
 	
@@ -21,6 +21,8 @@ public class ReportController {
 	private GeneratorFactory factory;
 	@Autowired
 	private ParamFiller paramFiller;
+	@Autowired
+	private ReportFileStorage reportFileStorage;
 	private static final String ERROR_MESSAGE = "<html><body><b>Generator returned no data!</b><br/>%s</body></html>";
 	private final static Logger logger = LoggerFactory.getLogger(ReportController.class);
 	
@@ -46,13 +48,20 @@ public class ReportController {
 		try {
 			os = response.getOutputStream();
 			
-			if (reportDefinition.getReport() == null || reportDefinition.getDataSet() == null) {
+			if ((reportDefinition.getReport() == null || reportDefinition.getDataSet() == null) && reportDefinition.getSignedDocItem() == null) {
 				throw new ReportException("Definition is null");
 			}
-			
-			paramFiller.fill();
-			Generator gen = factory.createGenerator(reportDefinition);
-			byte[] data = gen.generate();
+
+			byte[] data;
+
+			if (reportDefinition.getSignedDocItem() == null) {
+				paramFiller.fill();
+				Generator gen = factory.createGenerator(reportDefinition);
+				data = gen.generate();
+			} else {
+				data = reportFileStorage.fileData(reportDefinition.getSignedDocItem());
+			}
+
 			response.setContentType(contentType);
 			response.setContentLength(data.length);
 			

src/main/java/info/bukova/isspst/reporting/ReportDefinition.java

@@ -1,5 +1,6 @@
 package info.bukova.isspst.reporting;
 
+import info.bukova.isspst.data.SignedDocumentItem;
 import info.bukova.isspst.services.Service;
 
 import java.io.Serializable;
@@ -20,6 +21,7 @@ public class ReportDefinition implements Serializable {
 	private List<String> fieldsToPrint;
 	private String reportTitle;
 	private Service<Object>	service;
+	private SignedDocumentItem signedDocItem;
 
  	public ReportDefinition() {
  		params = new HashMap<String, Object>();
@@ -92,6 +94,7 @@ public class ReportDefinition implements Serializable {
 		reportTitle = "";
 		service = null;
 		params.clear();
+		signedDocItem = null;
 	}
 
 	public String getReportTitle() {
@@ -110,4 +113,11 @@ public class ReportDefinition implements Serializable {
 		this.service = service;
 	}
 
+	public SignedDocumentItem getSignedDocItem() {
+		return signedDocItem;
+	}
+
+	public void setSignedDocItem(SignedDocumentItem signedDocItem) {
+		this.signedDocItem = signedDocItem;
+	}
 }

src/main/java/info/bukova/isspst/reporting/SignaturePdfHandler.java

@@ -0,0 +1,66 @@
+package info.bukova.isspst.reporting;
+
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.pdf.PdfAnnotation;
+import com.lowagie.text.pdf.PdfFormField;
+import com.lowagie.text.pdf.PdfName;
+import net.sf.jasperreports.engine.JRGenericPrintElement;
+import net.sf.jasperreports.engine.JRPropertiesMap;
+import net.sf.jasperreports.engine.export.GenericElementHandler;
+import net.sf.jasperreports.engine.export.GenericElementHandlerBundle;
+import net.sf.jasperreports.engine.export.GenericElementPdfHandler;
+import net.sf.jasperreports.engine.export.JRPdfExporter;
+import net.sf.jasperreports.engine.export.JRPdfExporterContext;
+import net.sf.jasperreports.extensions.ExtensionsRegistry;
+import net.sf.jasperreports.extensions.ExtensionsRegistryFactory;
+import net.sf.jasperreports.extensions.SingletonExtensionRegistry;
+
+/**
+ * @author Pepa Rokos
+ */
+public class SignaturePdfHandler implements GenericElementPdfHandler, GenericElementHandlerBundle, ExtensionsRegistryFactory {
+
+	@Override
+	public ExtensionsRegistry createRegistry(String registryId, JRPropertiesMap properties) {
+		return new SingletonExtensionRegistry<GenericElementHandlerBundle>(GenericElementHandlerBundle.class, this);
+	}
+
+	@Override
+	public void exportElement(JRPdfExporterContext exporterContext, JRGenericPrintElement element) {
+		PdfFormField field = PdfFormField.createSignature(exporterContext.getPdfWriter());
+		Object param = element.getParameterValue("index");
+		String index = param != null ? String.valueOf(param) : null;
+
+		if (index != null) {
+			field.setFieldName("signature-" + index);
+		} else {
+			field.setFieldName("signature");
+		}
+
+		field.setFieldFlags(PdfAnnotation.FLAGS_PRINT | PdfAnnotation.FLAGS_LOCKED);
+		field.setWidget(new Rectangle(element.getX(),
+				exporterContext.getExportedReport().getPageHeight() - element.getY(),
+				element.getX() + element.getWidth(),
+				exporterContext.getExportedReport().getPageHeight() - element.getY() - element.getHeight()), PdfName.HIGHLIGHT);
+		exporterContext.getPdfWriter().addAnnotation(field);
+	}
+
+	@Override
+	public boolean toExport(JRGenericPrintElement element) {
+		return true;
+	}
+
+	@Override
+	public String getNamespace() {
+		return "urn:sig:sig";
+	}
+
+	@Override
+	public GenericElementHandler getHandler(String elementName, String exporterKey) {
+		if (elementName.equals("signature") && exporterKey.equals(JRPdfExporter.PDF_EXPORTER_KEY)) {
+			return this;
+		}
+
+		return null;
+	}
+}

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

@@ -24,10 +24,16 @@ public abstract class AbstractRequirementEvaluator extends AbstractModuleEvaluat
 			return false;
 		}
 		
-		RequirementBase req = (RequirementBase) targetDomainObject;
-		
-		if (permission.equals(Constants.PERM_EDIT_NEW)) {
-			return req.getState() == RequirementState.NEW;
+		if (targetDomainObject instanceof RequirementBase) {
+			RequirementBase req = (RequirementBase) targetDomainObject;
+
+			if (permission.equals(Constants.PERM_EDIT_NEW)) {
+				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/AuthPopulator.java

@@ -5,9 +5,6 @@ import info.bukova.isspst.data.User;
 import info.bukova.isspst.services.users.LdapUserImporter;
 import info.bukova.isspst.services.users.RoleService;
 import info.bukova.isspst.services.users.UserService;
-
-import java.util.Collection;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ldap.core.DirContextOperations;
@@ -15,6 +12,8 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
 
+import java.util.Collection;
+
 public class AuthPopulator implements LdapAuthoritiesPopulator {
 
 	private UserService userService;
@@ -30,7 +29,8 @@ public class AuthPopulator implements LdapAuthoritiesPopulator {
 	public Collection<? extends GrantedAuthority> getGrantedAuthorities(
 			DirContextOperations userData, String login) {
 
-		User user = null;
+		User user;
+
 		try {
 			user = (User) userService.loadUserByUsername(login);
 		} catch (UsernameNotFoundException e) {

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

@@ -1,11 +1,13 @@
 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;
@@ -39,11 +41,31 @@ 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)) {
+			if (p.getAuthority().equals(permission) 
+					&& p.getModule().equals(moduleId)) {
 				appPermission = p;
+				break;
 			}
 		}
 
@@ -66,7 +88,8 @@ public class WorkgroupAwareServiceEvaluator implements Evaluator {
 			
 			for (Role r : wgRoles) {
 				for (Permission p : r.getPermissions()) {
-					if (p.getAuthority().equals(appPermission.getAuthority())) {
+					if (p.getAuthority().equals(appPermission.getAuthority())
+							&& p.getModule().equals(appPermission.getModule())) {
 						return true;
 					}
 				}

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

@@ -1,7 +1,7 @@
 package info.bukova.isspst.services;
 
-import java.util.Date;
-
+import info.bukova.isspst.data.OwnedDataModel;
+import info.bukova.isspst.data.User;
 import org.hibernate.NonUniqueResultException;
 import org.hibernate.Query;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -9,8 +9,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.transaction.annotation.Transactional;
 
-import info.bukova.isspst.data.OwnedDataModel;
-import info.bukova.isspst.data.User;
+import java.util.Date;
 
 public class AbstractOwnedService<T extends OwnedDataModel> extends AbstractService<T> {
 	
@@ -32,6 +31,7 @@ public class AbstractOwnedService<T extends OwnedDataModel> extends AbstractServ
 		entity.setModifiedBy(getLoggedInUser());
 		entity.setModified(new Date());
 		dao.modify(entity);
+		maintainStorrage();
 	}
 	
 	@Transactional

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

@@ -1,8 +1,7 @@
 package info.bukova.isspst.services;
 
-import static ch.lambdaj.Lambda.filter;
-import info.bukova.isspst.Constants;
 import info.bukova.isspst.Module;
+import info.bukova.isspst.ModuleUtils;
 import info.bukova.isspst.SessionData;
 import info.bukova.isspst.dao.BaseDao;
 import info.bukova.isspst.dao.QueryDao;
@@ -11,23 +10,26 @@ import info.bukova.isspst.data.NumberSeries;
 import info.bukova.isspst.filters.Filter;
 import info.bukova.isspst.reporting.Report;
 import info.bukova.isspst.services.numberseries.NumberSeriesService;
+import info.bukova.isspst.storage.DocumentFileStorage;
+import org.hibernate.NonUniqueResultException;
+import org.hibernate.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.GenericTypeResolver;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.ConstraintViolation;
+import javax.validation.Validator;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
-
-import org.hibernate.NonUniqueResultException;
-import org.hibernate.Query;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
+import static ch.lambdaj.Lambda.filter;
 
 public abstract class AbstractService<T extends DataModel> implements Service<T> {
 
@@ -37,9 +39,26 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 	protected SessionData sessionData;
 	@Autowired
 	protected QueryDao queryDao;
+	private DocumentFileStorage documentFileStorage;
 
 	private NumberSeriesService numberSeriesService;
-	
+	private Class<T> entityClass;
+
+
+	public AbstractService() {
+		entityClass = (Class<T>) GenericTypeResolver.resolveTypeArgument(getClass(), AbstractService.class);
+	}
+
+	@Override
+	public List<Class<?>> getEntityClasses() {
+		List<Class<?>> classes = new ArrayList<Class<?>>();
+		classes.add(entityClass);
+		return classes;
+	}
+
+	public void setDocumentFileStorage(DocumentFileStorage storage) {
+		this.documentFileStorage = storage;
+	}
 
 	public NumberSeriesService getNumberSeriesService()
 	{
@@ -59,6 +78,16 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 		return "";
 	}
 	
+	public String getDeleteEntityPermission() {
+		return "";
+	}
+
+	protected void maintainStorrage() {
+		if (documentFileStorage != null) {
+			documentFileStorage.purge();
+		}
+	}
+	
 	@Override
 	@PreAuthorize("hasPermission(this, 'PERM_ADD')")
 	public final T create() {
@@ -73,6 +102,10 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 			throw new IsspstException("DAO is null");
 		}
 		
+		if (getModule() != null && !getModule().isActive()) {
+			throw new ModuleNotActiveException();
+		}
+		
 		validate(entity);
 		entity.setCreated(new Date());
 		dao.add(entity);
@@ -86,20 +119,31 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 			throw new IsspstException("DAO is null");
 		}
 		
+		if (getModule() != null && !getModule().isActive()) {
+			throw new ModuleNotActiveException();
+		}
+		
 		validate(entity);
 		entity.setModified(new Date());
 		dao.modify(entity);
+		maintainStorrage();
 	}
 
 	@Override
 	@Transactional
-	@PreAuthorize("hasPermission(this, 'PERM_DELETE')")
+	@PreAuthorize("hasPermission(this, 'PERM_DELETE') or hasPermission(#entity, this.getDeleteEntityPermission())")
 	public void delete(T entity) {
 		if (dao == null) {
 			throw new IsspstException("DAO is null");
 		}
 		
+		if (getModule() != null && !getModule().isActive()) {
+			throw new ModuleNotActiveException();
+		}
+
 		dao.delete(entity);
+
+		maintainStorrage(); // poklidit přiložené soubory
 	}
 	
 	@Override
@@ -137,6 +181,10 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 			throw new IsspstException("DAO is null");
 		}
 		
+		if (getModule() != null && !getModule().isActive()) {
+			throw new ModuleNotActiveException();
+		}
+		
 		return dao.getById(id);
 	}
 	
@@ -148,6 +196,10 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 			throw new IsspstException("DAO is null");
 		}
 		
+		if (getModule() != null && !getModule().isActive()) {
+			throw new ModuleNotActiveException();
+		}
+		
 		return dao.getAll();
 	}
 
@@ -159,6 +211,10 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 			throw new IsspstException("DAO is null");
 		}
 		
+		if (getModule() != null && !getModule().isActive()) {
+			throw new ModuleNotActiveException();
+		}
+		
 		return dao.execQuery(query);
 	}
 
@@ -171,6 +227,10 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 			throw new IsspstException("DAO is null");
 		}
 		
+		if (getModule() != null && !getModule().isActive()) {
+			throw new ModuleNotActiveException();
+		}
+		
 		try {
 			Query q = dao.getQuery(query);
 			return (T) q.uniqueResult();
@@ -189,13 +249,7 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 	
 	@Override
 	public Module getModule() {
-		for (Module m : Constants.MODULES) {
-			if (Arrays.asList(this.getClass().getInterfaces()).contains(m.getServiceClass())) {
-				return m;
-			}
-		}
-		
-		return null;
+		return ModuleUtils.getModule(this.getClass());
 	}
 	
 	public List<Report> getReports() {
@@ -234,6 +288,10 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 	@Override
 	@Transactional
 	public void loadLazyData(String group, T entity) {
+		if (entity == null) {
+			return;
+		}
+
 		Method[] methods = this.getClass().getMethods();
 		
 		for (Method m : methods) {
@@ -256,4 +314,9 @@ public abstract class AbstractService<T extends DataModel> implements Service<T>
 			}
 		}
 	}
+
+	@Override
+	public boolean canPrintRecord(T entity) {
+		return true;
+	}
 }

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

@@ -0,0 +1,14 @@
+package info.bukova.isspst.services;
+
+public class ModuleNotActiveException extends IsspstException {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1219763294556500698L;
+	
+	public ModuleNotActiveException() {
+		super("Module deactivated");
+	}
+
+}

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

@@ -22,5 +22,7 @@ public interface Service<T> {
 	public List<T> filterList(List<T> sourceList, Filter<T> filter);
 	public Module getModule();
 	public List<Report> getReports();
+	public boolean canPrintRecord(T entity);
+	public List<Class<?>> getEntityClasses();
 	
 }

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,157 @@
+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;
+			}
+		}
+
+		// String source = UserCountUtils.encryptUserCount(1000);
+		// long users = UserCountUtils.decryptUserCount(source);
+
+		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();
+				}
+			}
+
+			if (dbVersion < 3)
+			{
+				sql = "UPDATE INVOICING SET COMPLETED = false WHERE (COMPLETED Is NULL) ";
+				sq = this.dao.getSession().createSQLQuery(sql);
+				sq.executeUpdate();
+			}
+
+			if (dbVersion < 4)
+			{
+				sql = "UPDATE TRIP_BILL SET RESULT_MESSAGE = 'Zpráva z pracovní cesty' WHERE (RESULT_MESSAGE Is NULL) ";
+				sq = this.dao.getSession().createSQLQuery(sql);
+				sq.executeUpdate();
+			}
+
+			if (dbVersion < 5) {
+				sql = "ALTER TABLE TRIP_BILL MODIFY RESULT_MESSAGE VARCHAR(" + String.valueOf(Constants.LEN_RESULT_MESSAGE) + ")";
+				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/fulltext/AbstractExtractor.java

@@ -0,0 +1,14 @@
+package info.bukova.isspst.services.fulltext;
+
+import java.io.ByteArrayInputStream;
+
+/**
+ * @author Pepa Rokos
+ */
+public abstract class AbstractExtractor implements Extractor {
+
+	public String extract(byte[] data) {
+		return extract(new ByteArrayInputStream(data));
+	}
+
+}

src/main/java/info/bukova/isspst/services/fulltext/AbstractOfficeExtractor.java

@@ -0,0 +1,25 @@
+package info.bukova.isspst.services.fulltext;
+
+import org.apache.poi.POIXMLTextExtractor;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Pepa Rokos
+ */
+public abstract class AbstractOfficeExtractor extends AbstractExtractor {
+
+	@Override
+	public String extract(InputStream is) throws ExtractorException {
+		try {
+			POIXMLTextExtractor extractor = createExtractor(is);
+			return extractor.getText();
+		} catch (IOException e) {
+			throw new ExtractorException(e);
+		}
+	}
+
+	protected abstract POIXMLTextExtractor createExtractor(InputStream is) throws IOException;
+
+}

src/main/java/info/bukova/isspst/services/fulltext/ExcelExtractor.java

@@ -0,0 +1,19 @@
+package info.bukova.isspst.services.fulltext;
+
+import org.apache.poi.POIXMLTextExtractor;
+import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Pepa Rokos
+ */
+public class ExcelExtractor extends AbstractOfficeExtractor implements Extractor {
+
+	@Override
+	protected POIXMLTextExtractor createExtractor(InputStream is) throws IOException {
+		return new XSSFExcelExtractor(new XSSFWorkbook(is));
+	}
+}

src/main/java/info/bukova/isspst/services/fulltext/Extractor.java

@@ -0,0 +1,30 @@
+package info.bukova.isspst.services.fulltext;
+
+import java.io.InputStream;
+
+/**
+ * @author Pepa Rokos
+ *
+ * Rozhraní extractoru čistého textu z formátů Office a PDF
+ */
+public interface Extractor {
+
+	/**
+	 * Extrahuje text z předaného pole bytů
+	 *
+	 * @param data zdrajová data
+	 * @return čistý text
+	 * @throws ExtractorException
+	 */
+	public String extract(byte[] data) throws ExtractorException;
+
+	/**
+	 * Extrahuje text z předaného InputStream objektu
+	 *
+	 * @param is zdrojový InputStream
+	 * @return čistý text
+	 * @throws ExtractorException
+	 */
+	public String extract(InputStream is) throws ExtractorException;
+
+}

src/main/java/info/bukova/isspst/services/fulltext/ExtractorException.java

@@ -0,0 +1,16 @@
+package info.bukova.isspst.services.fulltext;
+
+import info.bukova.isspst.services.IsspstException;
+
+/**
+ * @author Pepa Rokos
+ *
+ * Výjimka extrakce textu
+ */
+public class ExtractorException extends IsspstException {
+
+	public ExtractorException(Throwable cause) {
+		super("Extractor exception: ", cause);
+	}
+
+}

src/main/java/info/bukova/isspst/services/fulltext/ExtractorFactory.java

@@ -0,0 +1,42 @@
+package info.bukova.isspst.services.fulltext;
+
+/**
+ * @author Pepa Rokos
+ *
+ * Factory pro konkrétní extractor
+ */
+public class ExtractorFactory {
+
+	/**
+	 * Vytvoří extractor podle předaného content typu
+	 *
+	 * @param contentType
+	 * @return Extractor
+	 */
+	public static Extractor createExtractor(String contentType) {
+		if (contentType.equals("application/vnd.oasis.opendocument.text")
+				|| contentType.equals("application/vnd.oasis.opendocument.spreadsheet")
+				|| contentType.equals("application/vnd.oasis.opendocument.presentation")) {
+			return new OdfExtractor();
+		}
+
+		if (contentType.equals("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) {
+			return new WordExtractor();
+		}
+
+		if (contentType.equals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
+			return new ExcelExtractor();
+		}
+
+		if (contentType.equals("application/vnd.openxmlformats-officedocument.presentationml.slideshow")) {
+			return new PowerPointExtractor();
+		}
+
+		if (contentType.equals("application/pdf")) {
+			return new PdfExtractor();
+		}
+
+		return null;
+	}
+
+}

src/main/java/info/bukova/isspst/services/fulltext/FullTextService.java

@@ -0,0 +1,42 @@
+package info.bukova.isspst.services.fulltext;
+
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Indexed;
+
+import java.util.List;
+
+/**
+ * @author Pepa Rokos
+ * 
+ * Rozhraní služby fulltextového vyhledávání
+ *
+ */
+public interface FullTextService {
+	
+	/**
+	 * Přegeneruje fulltextový index.
+	 */
+	public void reindex();
+	
+	
+	/**
+	 * Vyhledává entity zadané třídy. Třída entity musí být anotovaná {@link Indexed}
+	 * 
+	 * @param entityClass třída entity k vyhledání
+	 * @param fields property entity kde se bude vyhledávat. Musí být anotované {@link Field}
+	 * @param word vyhledávaný výraz
+	 * @return list odpovídajících entit
+	 */
+	public List<?> search(Class<?> entityClass, String[] fields, String word);
+	
+	
+	/**
+	 * Globální vyhledávání ve všech entitách, jejichš třídy jsou anotované {@link Indexed} a 
+	 * property {@link Field}
+	 * 
+	 * @param word vyhledávaný výraz
+	 * @return list odpovídajících entit
+	 */
+	public List<?> globalSearch(String word);
+
+}

src/main/java/info/bukova/isspst/services/fulltext/FullTextServiceImpl.java

@@ -0,0 +1,154 @@
+package info.bukova.isspst.services.fulltext;
+
+import info.bukova.isspst.ModuleUtils;
+import info.bukova.isspst.dao.QueryDao;
+import info.bukova.isspst.data.BaseData;
+import info.bukova.isspst.data.User;
+import info.bukova.isspst.services.ModuleNotActiveException;
+import info.bukova.isspst.sort.ReflectionTools;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Sort;
+import org.hibernate.Hibernate;
+import org.hibernate.search.FullTextQuery;
+import org.hibernate.search.FullTextSession;
+import org.hibernate.search.Search;
+import org.hibernate.search.annotations.IndexedEmbedded;
+import org.hibernate.search.query.dsl.QueryBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FullTextServiceImpl implements FullTextService {
+	
+	@Autowired
+	private QueryDao queryDao;
+	private List<Class<?>> classesForSearch;
+	private Map<Class<?>, String[]> fields;
+	private List<Class<?>> nestedClasses;
+	
+	public FullTextServiceImpl() {
+		nestedClasses = new ArrayList<Class<?>>();
+		nestedClasses.add(User.class);
+		nestedClasses.add(BaseData.class);
+	}
+
+	@Override
+	@Transactional
+	public void reindex() {
+		Logger logger = LoggerFactory.getLogger(FullTextServiceImpl.class);
+		logger.info("Indexing database for fulltext search");
+		FullTextSession ftSession = Search.getFullTextSession(queryDao.getSession());
+		ftSession.createIndexer().start();
+	}
+
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_SEARCH')")
+	public List<?> search(Class<?> entityClass, String[] fields, String word) {
+		checkActivity();
+		FullTextSession session = Search.getFullTextSession(queryDao.getSession());
+		QueryBuilder qb = session.getSearchFactory().buildQueryBuilder().forEntity(entityClass).get();
+		
+		Query luceneQuery = qb.keyword().onFields(fields).matching(word).createQuery();
+		FullTextQuery hiberQuery = session.createFullTextQuery(luceneQuery, entityClass);
+		hiberQuery.setSort(Sort.RELEVANCE);
+		
+		return hiberQuery.list();
+	}
+
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_SEARCH')")
+	public List<?> globalSearch(String word) {
+		checkActivity();
+		List<Object> result = new ArrayList<Object>();
+		
+		for (Class<?> clazz : classesForSearch()) {
+			result.addAll(search(clazz, fields.get(clazz), word));
+		}
+		
+		for (Object o : result) {
+			BaseData data = (BaseData) o;
+			Hibernate.initialize(data.getModifiedBy());
+			Hibernate.initialize(data.getOwnedBy());
+		}
+		
+		return result;
+	}
+	
+	private void checkActivity() {
+		if (!ModuleUtils.getModule(this.getClass()).isActive()) {
+			throw new ModuleNotActiveException();
+		}
+	}
+	
+	private List<Class<?>> classesForSearch() {
+		if (classesForSearch != null) {
+			return classesForSearch;
+		}
+		
+		classesForSearch = new ArrayList<Class<?>>();
+		fields = new HashMap<Class<?>, String[]>();
+		FullTextSession session = Search.getFullTextSession(queryDao.getSession());
+		
+		for (Class<?> clazz : session.getSearchFactory().getIndexedTypes()) {
+			if (nestedClasses.contains(clazz)) {
+				continue;
+			}
+			
+			classesForSearch.add(clazz);
+			fields.put(clazz, fields(clazz, ""));
+		}
+		
+		return classesForSearch;
+	}
+	
+	private String[] fields(Class<?> clazz, String prefix) {
+		List<String> res = new ArrayList<String>();
+		
+		for (Field field : ReflectionTools.getFields(clazz)) {
+			for (Annotation a : field.getDeclaredAnnotations()) {
+				if (a instanceof org.hibernate.search.annotations.Field) {
+					res.add(prefix + field.getName());
+				}
+				
+				if (a instanceof IndexedEmbedded) {
+					Class<?> fieldClass;
+					
+					fieldClass = field.getType();
+					if (fieldClass.isAssignableFrom(List.class)) {
+						ParameterizedType type = (ParameterizedType) field.getGenericType();
+						Type[] types = type.getActualTypeArguments();
+						if (types.length == 1) {
+							fieldClass = (Class<?>)types[0];
+						}
+					}
+										
+					classesForSearch.remove(fieldClass);
+					fields.remove(fieldClass);
+					nestedClasses.add(fieldClass);
+					
+					String nestedPrefix = prefix + field.getName() + ".";
+					res.addAll(Arrays.asList(fields(fieldClass, nestedPrefix)));
+				}
+			}
+		}
+		
+		String resArray[] = new String[res.size()];
+		resArray = res.toArray(resArray);
+		return resArray;
+	}
+
+}

src/main/java/info/bukova/isspst/services/fulltext/OdfExtractor.java

@@ -0,0 +1,24 @@
+package info.bukova.isspst.services.fulltext;
+
+import org.odftoolkit.simple.Document;
+import org.odftoolkit.simple.common.TextExtractor;
+
+import java.io.InputStream;
+
+/**
+ * @author Pepa Rokos
+ */
+public class OdfExtractor extends AbstractExtractor implements Extractor {
+
+	@Override
+	public String extract(InputStream is) throws ExtractorException {
+		try {
+			Document odfDocument = Document.loadDocument(is);
+			TextExtractor extractor = TextExtractor.newOdfTextExtractor(odfDocument.getContentRoot());
+
+			return extractor.getText();
+		} catch (Exception e) {
+			throw new ExtractorException(e);
+		}
+	}
+}

src/main/java/info/bukova/isspst/services/fulltext/PdfExtractor.java

@@ -0,0 +1,32 @@
+package info.bukova.isspst.services.fulltext;
+
+import com.lowagie.text.pdf.PdfReader;
+import com.lowagie.text.pdf.parser.PdfTextExtractor;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Pepa Rokos
+ */
+public class PdfExtractor extends AbstractExtractor implements Extractor {
+
+	@Override
+	public String extract(InputStream is) throws ExtractorException {
+		try {
+			PdfReader reader = new PdfReader(is);
+			PdfTextExtractor extractor = new PdfTextExtractor(reader);
+			StringBuilder sb = new StringBuilder();
+
+			for (int i = 1; i <= reader.getNumberOfPages(); i++) {
+				sb.append(extractor.getTextFromPage(i));
+			}
+
+			return sb.toString();
+
+		} catch (IOException e) {
+			throw new ExtractorException(e);
+		}
+	}
+
+}

src/main/java/info/bukova/isspst/services/fulltext/PowerPointExtractor.java

@@ -0,0 +1,20 @@
+package info.bukova.isspst.services.fulltext;
+
+import org.apache.poi.POIXMLTextExtractor;
+import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
+import org.apache.poi.xslf.usermodel.XMLSlideShow;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Pepa Rokos
+ */
+public class PowerPointExtractor extends AbstractOfficeExtractor implements Extractor {
+
+	@Override
+	protected POIXMLTextExtractor createExtractor(InputStream is) throws IOException {
+		return new XSLFPowerPointExtractor(new XMLSlideShow(is));
+	}
+
+}

src/main/java/info/bukova/isspst/services/fulltext/WordExtractor.java

@@ -0,0 +1,19 @@
+package info.bukova.isspst.services.fulltext;
+
+import org.apache.poi.POIXMLTextExtractor;
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Pepa Rokos
+ */
+public class WordExtractor extends AbstractOfficeExtractor implements Extractor {
+
+	@Override
+	protected POIXMLTextExtractor createExtractor(InputStream is) throws IOException {
+		return new XWPFWordExtractor(new XWPFDocument(is));
+	}
+}

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

@@ -1,11 +1,12 @@
 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;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 public interface InvoicingService extends Service<Invoicing> {
 	
 	public BigDecimal totalInvoicedForWorkgroup(Workgroup workgroup);
@@ -16,4 +17,7 @@ public interface InvoicingService extends Service<Invoicing> {
 	
 	public void calculate(Invoicing invoicing);
 
+	public List<Invoicing> getPendingList();
+
+	public List<Invoicing> getArchiveList();
 }

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

@@ -7,9 +7,11 @@ 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
@@ -54,4 +56,40 @@ public class InvoicingServiceImpl extends AbstractOwnedService<Invoicing> implem
 		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();
+	}
+	
+	@Transactional
+	@LazyLoader("form")
+	public void loadOwnedBy(Invoicing invoice) {
+		Invoicing inv = getById(invoice.getId());
+		Hibernate.initialize(inv.getRequirement().getOwnedBy());
+		invoice.getRequirement().setOwnedBy(inv.getRequirement().getOwnedBy());
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_READ')")
+	public List<Invoicing> getPendingList()
+	{
+		Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where (inv.completed Is Null or inv.completed = false) order by rq.numser");
+		return q.list();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_READ')")
+	public List<Invoicing> getArchiveList()
+	{
+		Query q = dao.getQuery("select inv from Invoicing as inv join fetch inv.requirement rq join fetch rq.ownedBy where inv.completed = true order by rq.numser");
+		return q.list();
+	}
 }

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

@@ -1,9 +1,13 @@
 package info.bukova.isspst.services.orders;
 
+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;
@@ -55,4 +59,27 @@ public class ApprovedServiceImpl extends AbstractService<JoinedItem> implements
 
 		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/orders/OrderService.java

@@ -22,5 +22,7 @@ public interface OrderService extends Service<Order> {
 
 	public BigDecimal calcSumTotalFromItems(List<OrderItem> items);
 
+	public void addApprovedItems(Order order, boolean orderedChanged);
+
 	public void updateApprovedItems(Order order, boolean orderedChanged);
 }

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

@@ -180,15 +180,14 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
 		return sumTotal;
 	}
 
-	@Transactional
-	public void updateApprovedItems(Order order, boolean orderedChanged)
+	protected void setApprovedItems(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);
@@ -196,7 +195,41 @@ public class OrderServiceImpl extends AbstractOwnedService<Order> implements
 				}
 			}
 		}
+	}
 
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_ADD')")
+	public void addApprovedItems(Order order, boolean orderedChanged)
+	{
+		this.add(order);
+		this.setApprovedItems(order, orderedChanged);
+	}
+
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_EDIT') or hasPermission(#entity, this.getUpdateEntityPermission())")
+	public void updateApprovedItems(Order order, boolean orderedChanged)
+	{
+		this.setApprovedItems(order, orderedChanged);
 		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/requirement/ApproveException.java

@@ -0,0 +1,24 @@
+package info.bukova.isspst.services.requirement;
+
+import info.bukova.isspst.services.IsspstException;
+
+/**
+ * @author Pepa Rokos
+ */
+public class ApproveException extends IsspstException {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = -3794779381621324848L;
+
+	public ApproveException() {
+		super();
+	}
+
+	public ApproveException(String message) {
+		super(message);
+		this.setReason(message);
+	}
+
+}

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

@@ -38,9 +38,8 @@ 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 state != :state and kind = :kind");
+		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and kind = :kind");
 		q.setParameter("owner", getLoggedInUser());
-		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_MATERIAL);
 		return q.list();
 	}
@@ -53,9 +52,8 @@ 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 tr.state != :state and 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 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();
 	}
@@ -70,9 +68,8 @@ 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 tr.state != :state and w in (:wgList) and kind = :kind order by tr.numser");
+				+ " tr join fetch tr.ownedBy join tr.workgroup w where 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,9 +38,8 @@ 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 state != :state and kind = :kind");
+		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner and kind = :kind");
 		q.setParameter("owner", getLoggedInUser());
-		q.setParameter("state", RequirementState.APPROVED);
 		q.setParameter("kind", Constants.REQ_TYPE_SERVICES);
 		return q.list();
 	}
@@ -53,9 +52,8 @@ 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 tr.state != :state and 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 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();
 	}
@@ -70,9 +68,8 @@ 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 tr.state != :state and w in (:wgList) and kind = :kind order by tr.numser");
+				+ " tr join fetch tr.ownedBy join tr.workgroup w where 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

@@ -2,8 +2,10 @@ package info.bukova.isspst.services.requirement;
 
 import info.bukova.isspst.data.RequirementBase;
 import info.bukova.isspst.data.User;
+import info.bukova.isspst.data.Workflow;
 import info.bukova.isspst.services.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,8 +23,11 @@ public interface RequirementBaseService<T extends RequirementBase> extends Servi
 	public void loadType(T data);
 	public void loadWorkflow(T data);
 	public void approve(T entity);
+	public void approve(T entity, Date approveDate, byte[] signedPdf);
 	public boolean canApprove(T entity);
 	public List<User> getNextApprover(T entity);
+	public boolean prepareSignData(T entity, Date approveDate);
+	public Workflow getNextWorkflow(T entity);
 	
 	public List<T> getMy();
 

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

@@ -1,28 +1,38 @@
 package info.bukova.isspst.services.requirement;
 
 import info.bukova.isspst.Constants;
+import info.bukova.isspst.Module;
+import info.bukova.isspst.ModuleUtils;
 import info.bukova.isspst.data.AuthItem;
+import info.bukova.isspst.data.DataModel;
 import info.bukova.isspst.data.JobMapping;
 import info.bukova.isspst.data.RequirementBase;
 import info.bukova.isspst.data.RequirementState;
 import info.bukova.isspst.data.Role;
 import info.bukova.isspst.data.SettingsData;
+import info.bukova.isspst.data.SignedDocument;
+import info.bukova.isspst.data.SignedDocumentItem;
 import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workflow;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.mail.MailMessage;
 import info.bukova.isspst.mail.Mailer;
 import info.bukova.isspst.mail.MessageBuilder;
+import info.bukova.isspst.reporting.Generator;
+import info.bukova.isspst.reporting.GeneratorFactory;
+import info.bukova.isspst.reporting.ParamFiller;
+import info.bukova.isspst.reporting.Report;
+import info.bukova.isspst.reporting.ReportDefinition;
 import info.bukova.isspst.services.AbstractOwnedService;
 import info.bukova.isspst.services.LazyLoader;
+import info.bukova.isspst.services.Service;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
+import info.bukova.isspst.services.signeddocs.SignedDocumentService;
 import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import info.bukova.isspst.signapi.SignData;
+import info.bukova.isspst.storage.FileStorage;
+import info.bukova.isspst.storage.ReportFileStorage;
 import org.hibernate.LazyInitializationException;
 import org.hibernate.Query;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +40,12 @@ import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.ServletContext;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
 /**
  * @author Pepa Rokos
  * @author Franta Přibyl
@@ -51,6 +67,20 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 	private UserService userService;
 	@Autowired
 	protected WorkgroupService workgroupService;
+	@Autowired
+	private ReportDefinition reportDefinition;
+	@Autowired
+	private ParamFiller paramFiller;
+	@Autowired
+	private GeneratorFactory genFactory;
+	@Autowired
+	private ServletContext servletContext;
+	@Autowired
+	private FileStorage storage;
+	@Autowired
+	private SignedDocumentService signedDocumentService;
+	@Autowired
+	private ReportFileStorage signedDocStorage;
 
 	@Override
 	@Transactional
@@ -76,11 +106,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		
 		super.add(entity);
 		
-		if (canApprove(entity)) {
-			approve(entity);
-		} else {
-			this.sendToApprovers(entity);
-		}
+		this.postAdd(entity);
 	}
 	
 	private void checkEnable() {
@@ -104,6 +130,14 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		}
 	}
 
+	protected void postAdd(T entity) {
+		if (canApprove(entity)) {
+			approve(entity);
+		} else {
+			this.sendToApprovers(entity);
+		}
+	}
+
 	protected void addWorkflow(T entity) {
 		if (entity.getType() == null) {
 			return;
@@ -116,6 +150,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 				workflow.setLimit(w.getLimit());
 				workflow.setOrder(w.getOrder());
 				workflow.setRole(w.getRole());
+				workflow.setSignature(w.getSignature());
 				entity.getWorkflow().add(workflow);
 			}
 		}
@@ -211,37 +246,51 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		}
 	}
 
-	protected void approve(T entity, User user) {
+	protected void approve(T entity, User user, Date approveDate, byte[] signedPdf) {
 		T e = (T) dao.getById(entity.getId());
-		
+
+		if (e.getReqDate().getTime() > approveDate.getTime()) {
+			throw new ApproveException("ErrApproveBeforeRequirement");
+		}
+
+		if (e.getLastApproveDate() != null && e.getLastApproveDate().getTime() > approveDate.getTime()) {
+			throw new ApproveException("ErrAppreveBeforeLastApprove");
+		}
+
 		Workflow wf = getNextWorkflow(e);
 		if (wf == null) {
 			return;
 		}
-		
+
 		Role role = wf.getRole();
 		AuthItem auth = new AuthItem();
 		auth.setApprover(user);
 		auth.setRole(role);
-		auth.setAuthDate(new Date());
-		
+		auth.setAuthDate(approveDate);
+
 		e.getAuthorization().add(auth);
-		
+
 		if (getNextWorkflow(e) == null) {
 			e.setState(RequirementState.APPROVED);
 		} else {
 			e.setState(RequirementState.PARTIALLY);
 		}
-		
+
 		super.update(e);
-		
-		if (!autoApprove(e)) {
+
+		if (signedPdf != null) {
+			saveSignedDoc(e, signedPdf);
+		} else if (wf.getSignature() != null && wf.getSignature()) {
+			throw new ApproveException("ErrApproveMustBeSigned");
+		}
+
+		if (!autoApprove(e, approveDate)) {
 			this.sendToApprovers(e);
-			
+
 			SettingsData settings = settingsService.getSettings();
 			MailMessage message = null;
-				
-			if (e.getOwnedBy().getEmail() != null 
+
+			if (e.getOwnedBy().getEmail() != null
 					&& !e.getOwnedBy().getEmail().isEmpty()
 					&& e.getOwnedBy().isNotify()) {
 				if (e.getState() == RequirementState.APPROVED && settings.getConfReqTemplate() != null) {
@@ -249,17 +298,21 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 				} else if (settings.getAuthReqTemplate() != null) {
 					message = messageBuilder.buildMessage(settings.getAuthReqTemplate(), e);
 				}
-				
+
 				if (message != null) {
 					message.setFrom(getLoggedInUser().getEmail());
 					message.setTo(e.getOwnedBy().getEmail());
-					mailer.send(message);	
+					mailer.send(message);
 				}
 			}
 		}
-		
+
 		postApprove(e);
 	}
+
+	protected void approve(T entity, User user) {
+		approve(entity, user, new Date(), null);
+	}
 	
 	@Override
 	@Transactional
@@ -268,13 +321,21 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		approve(entity, getLoggedInUser());
 	}
 
+	@Override
+	@Transactional
+	@PreAuthorize("this.canApprove(#entity)")
+	public void approve(T entity, Date approveDate, byte[] signedPdf) {
+		approve(entity, getLoggedInUser(), approveDate, signedPdf);
+	}
+
 	/**
 	 * 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
+	 * @param approveDate
 	 * @return true pokud se provedlo automatické schválení.
 	 */
-	protected boolean autoApprove(T entity) {
+	protected boolean autoApprove(T entity, Date approveDate) {
 		return false;
 	}
 	
@@ -287,6 +348,30 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		
 	}
 
+	protected void saveSignedDoc(T entity, byte[] signedPdf) {
+		DataModel reportEntity = entityForSignReport(entity);
+		SignedDocumentItem signedItem = signedDocumentService.getItem(entityForSignReport(entity), getSignReport(entity).getReportId());
+
+		if (signedItem == null) {
+			SignedDocument signDoc = new SignedDocument();
+			signDoc.setDescription(entity.getDescription());
+			signDoc.setNumser(entity.getNumser());
+			signDoc.setRecordId(reportEntity.getId());
+			signDoc.setModuleName(ModuleUtils.getModule(reportEntity, servletContext).getId());
+			signDoc.setSignDate(entity.getLastApproveDate());
+
+			SignedDocumentItem item = new SignedDocumentItem();
+			item.setReportId(reportDefinition.getReport().getReportId());
+			item.setReportName(reportDefinition.getReport().getName());
+			signDoc.addItem(item);
+
+			signedDocStorage.saveFile(signedPdf, item);
+			signedDocumentService.addFromApprove(signDoc);
+		} else {
+			signedDocStorage.saveFile(signedPdf, signedItem);
+		}
+	}
+
 	@Override
 	@Transactional
 	public boolean canApprove(T entity) {
@@ -297,8 +382,12 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		
 		return false;
 	}
-	
-	protected Workflow getNextWorkflow(T e) {
+
+	@Override
+	@Transactional
+	public Workflow getNextWorkflow(T entity) {
+		T e = dao.getById(entity.getId());
+
 		AuthItem authItem = null;
 		if (e.getWorkflow() == null) {
 			return null;
@@ -334,9 +423,8 @@ 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 and state != :state");
+		Query q = dao.getQuery("from " + dao.getEntityName() + " where ownedBy = :owner");
 		q.setParameter("owner", getLoggedInUser());
-		q.setParameter("state", RequirementState.APPROVED);
 		return q.list();
 	}
 
@@ -348,9 +436,8 @@ 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 tr.state != :state and 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 c in (:wgList) order by tr.numser");
 		q.setParameterList("wgList", wgList);
-		q.setParameter("state", RequirementState.APPROVED);
 		return q.list();
 	}
 
@@ -362,9 +449,8 @@ 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 tr.state != :state and 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 w in (:wgList) order by tr.numser");
 		q.setParameterList("wgList", wgList);
-		q.setParameter("state", RequirementState.APPROVED);
 		return q.list();
 	}
 
@@ -382,5 +468,102 @@ 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;
+	}
 
+	@Override
+	@Transactional
+	public boolean prepareSignData(T entity, Date approveDate) {
+		SignData data = new SignData();
+		sessionData.setProperty(Constants.KEY_SIGN_DATA, data);
+		data.setSignGuid(UUID.randomUUID().toString());
+		sessionData.setProperty(Constants.KEY_SIGN_GUID, data.getSignGuid());
+
+		reportDefinition.clear();
+		reportDefinition.setSingleObject(entityForSignReport(entity));
+
+		Report report = getSignReport(entity);
+
+		if (report == null) {
+			return false;
+		}
+
+		reportDefinition.setReport(report);
+		Module module = ModuleUtils.getModule(entityForSignReport(entity), servletContext);
+		reportDefinition.setService((Service<Object>) ModuleUtils.getServiceInstance(module, servletContext));
+
+		paramFiller.fill();
+		Generator gen = genFactory.createGenerator(reportDefinition);
+		data.setPdfData(gen.generate());
+		data.setDescription(entity.getDescription());
+		data.setNumser(entity.getNumser());
+		data.setSignDate(approveDate);
+		data.setSigned(signedDocumentService.getItem(entityForSignReport(entity), report.getReportId()) != null);
+
+		if (getNextWorkflow(entity).getCentre()) { // viditelné podpisy lze pouze na urovni strediska
+			if (entity.getState() == RequirementState.NEW) {
+				data.setAreaId(1);
+			} else {
+				loadAuthItems(entity);
+				int wgCount = 0;
+				for (Workflow wf : entity.getWorkflow()) {
+					if (!wf.getCentre()) {
+						++wgCount;
+					}
+				}
+				data.setAreaId(entity.getAuthorization().size() - wgCount + 1);
+			}
+
+			if (userService.getUserSettings().getSignatureFile() != null) {
+				data.setSignImg(storage.fileData(userService.getUserSettings().getSignatureFile()));
+			}
+		}
+
+		return true;
+	}
+
+	protected DataModel entityForSignReport(T entity) {
+		return entity;
+	}
+
+	private Report getSignReport(T entity) {
+		Module module = ModuleUtils.getModule(entityForSignReport(entity), servletContext);
+		Report report = null;
+
+		for (Report r : module.getReports()) {
+			if (r.isSignable()) {
+				report = r;
+				break;
+			}
+		}
+
+		return report;
+	}
+
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_EDIT') or hasPermission(#entity, this.getUpdateEntityPermission())")
+	public void update(T entity) {
+		entity.getAuthorization().clear();
+		entity.setState(RequirementState.NEW);
+
+		SignedDocument doc = signedDocumentService.getForEntity(entity);
+		if (doc != null) {
+			signedDocumentService.delFromApprove(doc);
+		}
+
+		super.update(entity);
+		sendToApprovers(entity);
+	}
+
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_DELETE') or hasPermission(#entity, this.getDeleteEntityPermission())")
+	public void delete(T entity) {
+		signedDocumentService.delFromApprove(signedDocumentService.getForEntity(entity));
+		super.delete(entity);
+	}
 }

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

@@ -26,4 +26,6 @@ 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

@@ -10,15 +10,15 @@ 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 org.hibernate.Hibernate;
+import org.hibernate.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-import org.hibernate.Hibernate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * @author Pepa Rokos
  * @author Franta Přibyl
@@ -47,7 +47,7 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
 	}
 
 	@Override
-	protected boolean autoApprove(Requirement entity)
+	protected boolean autoApprove(Requirement entity, Date approveDate)
 	{
 		List<User> approvers = this.getNextApprover(entity);
 		Workflow nextWf = this.getNextWorkflow(entity);
@@ -60,7 +60,7 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
 		if ((entity.getSumTotal() != null) 
 				&& (entity.getSumTotal().compareTo(nextWf.getLimit()) == -1))
 		{
-			approve(entity, approvers.get(0));
+			approve(entity, approvers.get(0), approveDate, null);
 			return true;
 		}
 
@@ -240,4 +240,15 @@ public class RequirementServiceImpl extends RequirementBaseServiceImpl<Requireme
 			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/TripRequirementService.java

@@ -1,10 +1,23 @@
 package info.bukova.isspst.services.requirement;
 
+import info.bukova.isspst.data.TripBill;
 import info.bukova.isspst.data.TripRequirement;
 
+import java.util.List;
+
 public interface TripRequirementService extends RequirementBaseService<TripRequirement>
 {
 	
 	public void loadPassangers(TripRequirement entity);
+
+	public TripBill getTripBill(TripRequirement requirement);
+
+	/**
+	 * Vrátí seznam vyúčtování, která josu vázána k požadavku
+	 *
+	 * @param entity požadavek
+	 * @return seznam vyúčtování
+	 */
+	public List<TripBill> getBills(TripRequirement entity);
 	
 }

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

@@ -4,17 +4,26 @@ import info.bukova.isspst.Constants;
 import info.bukova.isspst.data.NumberSeries;
 import info.bukova.isspst.data.RequirementState;
 import info.bukova.isspst.data.TripBill;
+import info.bukova.isspst.data.TripBillApproval;
 import info.bukova.isspst.data.TripRequirement;
 import info.bukova.isspst.data.User;
+import info.bukova.isspst.mail.MailMessage;
+import info.bukova.isspst.mail.Mailer;
+import info.bukova.isspst.mail.MessageBuilder;
 import info.bukova.isspst.services.LazyLoader;
+import info.bukova.isspst.services.settings.GlobalSettingsService;
+import info.bukova.isspst.services.tripbill.TripBillApprovalService;
 import info.bukova.isspst.services.tripbill.TripBillService;
-import info.bukova.isspst.services.workgroups.WorkgroupService;
+import info.bukova.isspst.services.users.UserService;
+import org.hibernate.Hibernate;
+import org.hibernate.LazyInitializationException;
+import org.hibernate.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
-
-import org.hibernate.LazyInitializationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
 
 public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripRequirement>
 		implements TripRequirementService, RequirementBaseService<TripRequirement> {
@@ -22,9 +31,17 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 	@Autowired
 	private RequirementTypeService reqTypeService;
 	@Autowired
-	private WorkgroupService workgroupService;
-	@Autowired
 	private TripBillService tripBillService;
+	@Autowired
+	private TripBillApprovalService tripBillApprovalService;
+	@Autowired
+	private Mailer mailer;
+	@Autowired
+	private MessageBuilder messageBuilder;
+	@Autowired
+	private GlobalSettingsService settingsService;
+	@Autowired
+	private UserService userService;
 
 	@Override
 	protected TripRequirement createEntity() {
@@ -36,6 +53,45 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 		return tr;
 	}
 
+	@Override
+	@Transactional
+	@PreAuthorize("hasPermission(this, 'PERM_EDIT') or hasPermission(#entity, this.getUpdateEntityPermission())")
+	public void update(TripRequirement entity) {
+		super.update(entity);
+
+		if (entity.getState() == RequirementState.APPROVED) {
+			for (TripBill bill : getBills(entity)) {
+				TripBill newBill = tripBillService.createTripBill(entity);
+				bill.getBillItems().clear();
+				bill.getBillItems().addAll(newBill.getBillItems());
+				TripBillApproval approval = bill.getApproval();
+
+				if (approval != null) {
+					tripBillApprovalService.delete(approval);
+				}
+
+				bill.setApproval(null);
+				tripBillService.calculate(bill);
+				tripBillService.update(bill);
+			}
+		}
+	}
+
+	@Override
+	protected void postAdd(TripRequirement entity) {
+		super.postAdd(entity);
+		sendMailToPassengers(entity, settingsService.getSettings().getReqPassenger());
+	}
+
+	private void sendMailToPassengers(TripRequirement entity, MailMessage messageTemplate) {
+		if (entity.getBillForPassengers() != null && !entity.getPassengers().isEmpty() && messageTemplate != null) {
+			MailMessage message = messageBuilder.buildMessage(messageTemplate, entity);
+			message.setFrom(userService.getCurrent().getEmail());
+			message.setTo(userService.getEmailsForSend(entity.getPassengers()));
+			mailer.send(message);
+		}
+	}
+
 	@Override
 	@Transactional
 	@LazyLoader("form")
@@ -53,6 +109,36 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 		}
 	}
 
+	@Override
+	@Transactional
+	public TripBill getTripBill(TripRequirement requirement) {
+		Query q = dao.getQuery("from TripBill tb where tb.requirement = :req");
+		q.setParameter("req", requirement);
+		List<TripBill> result = q.list();
+
+		if (result.size() > 0) {
+			return result.get(0);
+		}
+
+		return null;
+	}
+
+	@Override
+	@Transactional
+	public List<TripBill> getBills(TripRequirement entity) {
+		Query q = queryDao.getQuery("from TripBill bill where bill.requirement = :req");
+		q.setParameter("req", entity);
+		return q.list();
+	}
+
+	@Transactional
+	@LazyLoader("form")
+	public void loadAttachments(TripRequirement entity) {
+		TripRequirement e = dao.getById(entity.getId());
+		Hibernate.initialize(e.getAttachedFiles());
+		entity.setAttachedFiles(e.getAttachedFiles());
+	}
+
 	@Override
 	protected void postApprove(TripRequirement entity) {
 		if (entity.getState() == RequirementState.APPROVED) {
@@ -60,14 +146,18 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripR
 			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);
+
+			if (entity.getBillForPassengers() != null && entity.getBillForPassengers()) {
+				for (User u : entity.getPassengers()) {
+					if (!u.equals(entity.getOwnedBy())) {
+						TripBill passBill = tripBillService.createPassengersBill(entity);
+						tripBillService.add(passBill);
+						passBill.setOwnedBy(u);
+						tripBillService.update(passBill);
+					}
 				}
+
+				sendMailToPassengers(entity, settingsService.getSettings().getConfReqTripPassenger());
 			}
 		}
 	}

src/main/java/info/bukova/isspst/services/signeddocs/SignedDocumentService.java

@@ -0,0 +1,15 @@
+package info.bukova.isspst.services.signeddocs;
+
+import info.bukova.isspst.data.DataModel;
+import info.bukova.isspst.data.SignedDocument;
+import info.bukova.isspst.data.SignedDocumentItem;
+import info.bukova.isspst.services.Service;
+
+public interface SignedDocumentService extends Service<SignedDocument> {
+
+	SignedDocument getForEntity(DataModel entity);
+	SignedDocumentItem getItem(DataModel entity, long reportId);
+	void addFromApprove(SignedDocument document);
+	void delFromApprove(SignedDocument document);
+
+}

src/main/java/info/bukova/isspst/services/signeddocs/SignedDocumentServiceImpl.java

@@ -0,0 +1,87 @@
+package info.bukova.isspst.services.signeddocs;
+
+import info.bukova.isspst.Module;
+import info.bukova.isspst.ModuleUtils;
+import info.bukova.isspst.data.DataModel;
+import info.bukova.isspst.data.SignedDocument;
+import info.bukova.isspst.data.SignedDocumentItem;
+import info.bukova.isspst.services.AbstractOwnedService;
+import info.bukova.isspst.services.LazyLoader;
+
+import info.bukova.isspst.storage.ReportFileStorage;
+import org.hibernate.Hibernate;
+import org.hibernate.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.ServletContext;
+
+public class SignedDocumentServiceImpl extends AbstractOwnedService<SignedDocument> implements SignedDocumentService {
+
+	@Autowired
+	private ServletContext servletContext;
+	@Autowired
+	private ReportFileStorage signedDocStorage;
+
+	@LazyLoader("grid")
+	@Transactional
+	public void lazyLoadItems(SignedDocument signedDocument) {
+		if (signedDocument == null) {
+			return;
+		}
+
+		SignedDocument sd = dao.getById(signedDocument.getId());
+		Hibernate.initialize(sd.getItems());
+		signedDocument.setItems(sd.getItems());
+	}
+
+	@Override
+	@Transactional
+	public SignedDocument getForEntity(DataModel entity) {
+		Module module = ModuleUtils.getModule(entity, servletContext);
+
+		if (module == null) {
+			return null;
+		}
+
+		Query q = dao.getQuery("from SignedDocument where moduleName = :module and recordId = :record");
+		q.setParameter("module", module.getId());
+		q.setParameter("record", entity.getId());
+
+		return (SignedDocument) q.uniqueResult();
+	}
+
+	@Override
+	@Transactional
+	public SignedDocumentItem getItem(DataModel entity, long reportId) {
+		SignedDocument doc = getForEntity(entity);
+
+		if (doc == null) {
+			return null;
+		}
+
+		for (SignedDocumentItem item : doc.getItems()) {
+			if (item.getReportId() == reportId) {
+				return item;
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public void addFromApprove(SignedDocument document) {
+		super.add(document);
+	}
+
+	@Override
+	public void delFromApprove(SignedDocument document) {
+		super.delete(document);
+
+		for (SignedDocumentItem item : document.getItems()) {
+			signedDocStorage.removeFile(item);
+		}
+	}
+
+
+}