Implementace uložiště podepsaných dokumentů. Při prvním podpisu se uloží podepsané PDF a vytvoří se záznam v agendě podepsaných dokumentů.

closes #243

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/data/SignedDocument.java

@@ -3,19 +3,18 @@ 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 java.util.Date;
+import org.hibernate.annotations.LazyCollectionOption;
-import java.util.List;
+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 org.hibernate.annotations.LazyCollection;
+import java.util.Date;
-import org.hibernate.annotations.LazyCollectionOption;
+import java.util.List;
-import org.hibernate.search.annotations.IndexedEmbedded;
 
 @Entity
 @Table(name = "SIGNED_DOCUMENTS")
@@ -105,6 +104,10 @@ public class SignedDocument extends BaseData {
 	}
 
 	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

@@ -22,7 +22,7 @@ public class SignedDocumentItem {
 	private int id;
 
 	@Column(name = "REPORT_ID")
-	private int reportId;
+	private long reportId;
 
 	@Column(name = "REPORT_NAME", length = Constants.LEN_TEXT)
 	private String reportName;
@@ -42,11 +42,11 @@ public class SignedDocumentItem {
 		this.id = id;
 	}
 
-	public int getReportId() {
+	public long getReportId() {
 		return reportId;
 	}
 
-	public void setReportId(int reportId) {
+	public void setReportId(long reportId) {
 		this.reportId = reportId;
 	}
 

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

@@ -74,7 +74,7 @@ public class ParamFiller {
 					definition.setParam("P_PREV_APPROVER_SIGNATURE", storage.serverPath(prevApproverSettings.getSignatureFile()));
 				}
 
-				AuthItem lastAuth = tb.getApproval().getAuthorization().get(tb.getRequirement().getAuthorization().size() - 1);
+				AuthItem lastAuth = tb.getApproval().getAuthorization().get(tb.getApproval().getAuthorization().size() - 1);
 				definition.setParam("P_APPROVE_DATE", lastAuth.getAuthDate());
 
 				User u = lastAuth.getApprover();

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

@@ -1,18 +1,21 @@
 package info.bukova.isspst.reporting;
 
-import java.io.File;
+import info.bukova.isspst.SpringUtils;
-
+import info.bukova.isspst.data.DataModel;
-import javax.servlet.ServletContext;
+import info.bukova.isspst.data.SignedDocumentItem;
-
+import info.bukova.isspst.services.signeddocs.SignedDocumentService;
-import org.slf4j.Logger;
+import info.bukova.isspst.storage.ReportFileStorage;
-import org.slf4j.LoggerFactory;
-
 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/ReportController.java

@@ -1,17 +1,17 @@
 package info.bukova.isspst.reporting;
 
-import java.io.IOException;
+import info.bukova.isspst.storage.ReportFileStorage;
-import java.io.OutputStream;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
 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();
+			byte[] data;
-			Generator gen = factory.createGenerator(reportDefinition);
+
-			byte[] data = gen.generate();
+			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/services/requirement/RequirementBaseServiceImpl.java

@@ -10,6 +10,8 @@ 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;
@@ -25,10 +27,12 @@ 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 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;
@@ -73,6 +77,10 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 	private ServletContext servletContext;
 	@Autowired
 	private FileStorage storage;
+	@Autowired
+	private SignedDocumentService signedDocumentService;
+	@Autowired
+	private ReportFileStorage signedDocStorage;
 
 	@Override
 	@Transactional
@@ -292,6 +300,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 			}
 		}
 
+		saveSignedDoc(e);
 		postApprove(e);
 	}
 
@@ -333,6 +342,36 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		
 	}
 
+	protected void saveSignedDoc(T entity) {
+		/*
+		if (!entity.equals(reportDefinition.getDataSet().get(0))) {
+			throw new ApproveException();
+		}*/
+
+		DataModel reportEntity = (DataModel) reportDefinition.getDataSet().get(0);
+		SignedDocumentItem signedItem = signedDocumentService.getItem(entity, reportDefinition.getReport().getReportId());
+		SignData data = (SignData) sessionData.getProperty(Constants.KEY_SIGN_DATA);
+
+		if (signedItem == null) {
+			data = (SignData) sessionData.getProperty(Constants.KEY_SIGN_DATA);
+			SignedDocument signDoc = new SignedDocument();
+			signDoc.setDescription(entity.getDescription());
+			signDoc.setNumser(entity.getNumser());
+			signDoc.setRecordId(reportEntity.getId());
+			signDoc.setModuleName(ModuleUtils.getModule(reportEntity, servletContext).getId());
+
+			SignedDocumentItem item = new SignedDocumentItem();
+			item.setReportId(reportDefinition.getReport().getReportId());
+			item.setReportName(reportDefinition.getReport().getName());
+			signDoc.addItem(item);
+
+			signedDocStorage.saveFile(data.getPdfData(), item);
+			signedDocumentService.addFromApprove(signDoc);
+		} else {
+			signedDocStorage.saveFile(data.getPdfData(), signedItem);
+		}
+	}
+
 	@Override
 	@Transactional
 	public boolean canApprove(T entity) {
@@ -464,6 +503,7 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
 		data.setDescription(entity.getDescription());
 		data.setNumser(entity.getNumser());
 		data.setSignDate(approveDate);
+		data.setSigned(signedDocumentService.getItem(entityForReport(entity), report.getReportId()) != null);
 
 		if (entity.getState() == RequirementState.NEW) {
 			data.setAreaId(1);

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

@@ -1,8 +1,14 @@
 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);
+
 }

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

@@ -1,13 +1,25 @@
 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 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;
+
 	@LazyLoader("grid")
 	@Transactional
 	public void lazyLoadItems(SignedDocument signedDocument) {
@@ -19,4 +31,45 @@ public class SignedDocumentServiceImpl extends AbstractOwnedService<SignedDocume
 		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);
+	}
+
+
 }

src/main/java/info/bukova/isspst/storage/AbstractFileStorage.java

@@ -19,9 +19,9 @@ public abstract class AbstractFileStorage<T> implements FileStorage<T> {
 			os.flush();
 			os.close();
 		} catch (FileNotFoundException e) {
-			e.printStackTrace();
+			throw new StorageException("File cannot be found: " + file.getName(), e.getCause());
 		} catch (IOException e) {
-			e.printStackTrace();
+			throw new StorageException("Cannot write file: " + file.getName(), e.getCause());
 		} finally {
 			try {
 				if (os != null) {

src/main/java/info/bukova/isspst/storage/ReportFileStorage.java

@@ -0,0 +1,10 @@
+package info.bukova.isspst.storage;
+
+import info.bukova.isspst.data.SignedDocumentItem;
+
+/**
+ * @author Pepa Rokos
+ */
+public interface ReportFileStorage extends FileStorage<SignedDocumentItem> {
+
+}

src/main/java/info/bukova/isspst/storage/ReportFileStorageImpl.java

@@ -0,0 +1,75 @@
+package info.bukova.isspst.storage;
+
+import info.bukova.isspst.data.SignedDocumentItem;
+
+import java.io.File;
+import java.util.UUID;
+
+/**
+ * @author Pepa Rokos
+ */
+public class ReportFileStorageImpl extends AbstractFileStorage<SignedDocumentItem> implements ReportFileStorage {
+
+	private String rootPath;
+
+	public void setRootPath(String rootPath) {
+		this.rootPath = rootPath;
+	}
+
+	private String getFilePath(String fileName) {
+		return rootPath + "/" + fileName;
+	}
+
+	@Override
+	public void saveFile(byte[] data, SignedDocumentItem signedDocumentItem) {
+		String fileName = signedDocumentItem.getFileName();
+
+		if (fileName == null) {
+			fileName = UUID.randomUUID().toString() + ".pdf";
+		}
+
+		saveFileDataToPath(data, getFilePath(fileName));
+		signedDocumentItem.setFileName(fileName);
+	}
+
+	@Override
+	public void saveFile(File file, SignedDocumentItem fileId) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void removeFile(SignedDocumentItem signedDocumentItem) {
+		removeFileByPath(getFilePath(signedDocumentItem.getFileName()));
+	}
+
+	@Override
+	public void moveFile(String source, String destination) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void createDirectory(String dir) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public byte[] fileData(SignedDocumentItem signedDocumentItem) {
+		return fileDataFromPath(getFilePath(signedDocumentItem.getFileName()));
+	}
+
+	@Override
+	public File file(SignedDocumentItem signedDocumentItem) {
+		return null;
+	}
+
+	@Override
+	public boolean dirExists(String path) {
+		return false;
+	}
+
+	@Override
+	public String serverPath(SignedDocumentItem signedDocumentItem) {
+		return null;
+	}
+
+}

src/main/java/info/bukova/isspst/ui/signeddocs/SignedDocsList.java

@@ -3,20 +3,22 @@ package info.bukova.isspst.ui.signeddocs;
 import info.bukova.isspst.data.SignedDocument;
 import info.bukova.isspst.data.SignedDocumentItem;
 import info.bukova.isspst.filters.SignedDocumentFilter;
+import info.bukova.isspst.reporting.ReportDefinition;
 import info.bukova.isspst.services.signeddocs.SignedDocumentService;
 import info.bukova.isspst.ui.ListViewModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.zkoss.bind.annotation.BindingParam;
 import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Window;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class SignedDocsList extends ListViewModel<SignedDocument>
 {
@@ -30,6 +32,9 @@ public class SignedDocsList extends ListViewModel<SignedDocument>
 
 	protected List<SignedDocumentItem> signedDocumentItems;
 
+	@WireVariable
+	private ReportDefinition reportDefinition;
+
 	@Init(superclass = true)
 	public void initSignedDocsList() {
 		service = signedDocumentService;
@@ -70,4 +75,12 @@ public class SignedDocsList extends ListViewModel<SignedDocument>
 			this.signedDocumentItems = new ArrayList<SignedDocumentItem>();
 		}
 	}
+
+	@Command
+	public void onOpen(@BindingParam("item") SignedDocumentItem item) {
+		reportDefinition.clear();
+		reportDefinition.setSignedDocItem(item);
+		Window reportWin = (Window) Executions.createComponents("/app/reporting/report.zul", null, null);
+		reportWin.doModal();
+	}
 }

src/main/webapp/WEB-INF/reports/tripBill.jrxml

@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tripBill" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="10" bottomMargin="20" uuid="f59e8277-a431-4cdc-abaa-c82c1cf193af">
 	<property name="ireport.zoom" value="1.5"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="511"/>
+	<property name="ireport.y" value="396"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
 	</parameter>
@@ -58,12 +58,6 @@
 	</background>
 	<pageHeader>
 		<band height="275" splitType="Stretch">
-			<image onErrorType="Blank">
-				<reportElement uuid="f9a1f9fe-b6d4-4b1d-972a-59d43b380a5b" x="440" y="206" width="130" height="43">
-					<printWhenExpression><![CDATA[$P{P_PREV_APPROVER_SIGNATURE} != null]]></printWhenExpression>
-				</reportElement>
-				<imageExpression><![CDATA[$P{P_PREV_APPROVER_SIGNATURE}]]></imageExpression>
-			</image>
 			<staticText>
 				<reportElement uuid="6e60bd03-48b9-4555-91ab-757532d93e6a" x="10" y="61" width="143" height="20"/>
 				<textElement>
@@ -236,11 +230,13 @@ tuzemské pracovní cesty]]></text>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{P_MAIN_ADDRESS}]]></textFieldExpression>
 			</textField>
-			<textField pattern="dd. MM. yyyy" isBlankWhenNull="false">
+			<genericElement>
-				<reportElement uuid="d8f79af9-b603-4103-9f78-a98ef574447e" x="340" y="229" width="100" height="20"/>
+				<reportElement uuid="14ae63ff-6be2-4419-9f39-8c9c8d2daf42" x="382" y="206" width="162" height="42"/>
-				<textElement verticalAlignment="Bottom"/>
+				<genericElementType namespace="urn:sig:sig" name="signature"/>
-				<textFieldExpression><![CDATA[$P{P_PREV_APPROVE_DATE}]]></textFieldExpression>
+				<genericElementParameter name="index">
-			</textField>
+					<valueExpression><![CDATA[1]]></valueExpression>
+				</genericElementParameter>
+			</genericElement>
 		</band>
 	</pageHeader>
 	<detail>
@@ -427,12 +423,6 @@ tuzemské pracovní cesty]]></text>
 				</reportElement>
 				<imageExpression><![CDATA[$P{P_PREV_APPROVER_SIGNATURE}]]></imageExpression>
 			</image>
-			<image onErrorType="Blank">
-				<reportElement uuid="2e42de6e-3f15-42c0-8a1d-5a21809f3193" x="290" y="103" width="130" height="46">
-					<printWhenExpression><![CDATA[$P{P_APPROVER_SIGNATURE} != null]]></printWhenExpression>
-				</reportElement>
-				<imageExpression><![CDATA[$P{P_APPROVER_SIGNATURE}]]></imageExpression>
-			</image>
 			<staticText>
 				<reportElement uuid="58e4cf15-a8e1-4b4d-b491-ad4a1825f0a3" x="281" y="5" width="30" height="15"/>
 				<textElement/>
@@ -472,11 +462,6 @@ tuzemské pracovní cesty]]></text>
 				</textElement>
 				<text><![CDATA[Účtovaná náhrada byla přezkoušena a upravena na Kč:]]></text>
 			</staticText>
-			<staticText>
-				<reportElement uuid="4aca1ec1-c2dc-47b9-a973-40ded5f52d29" x="260" y="103" width="290" height="20"/>
-				<textElement/>
-				<text><![CDATA[Datum a podpis zaměstnance, který upravil vyúčtování]]></text>
-			</staticText>
 			<line>
 				<reportElement uuid="2665a0ca-420d-46dc-9085-522ed3950c44" x="291" y="149" width="130" height="1"/>
 			</line>
@@ -571,13 +556,6 @@ tuzemské pracovní cesty]]></text>
 			<line>
 				<reportElement uuid="5e5a7c99-962e-4c99-b3ba-dbed5315f5aa" x="-1" y="-2" width="1" height="195"/>
 			</line>
-			<textField pattern="dd. MM. yyyy">
-				<reportElement uuid="7bbd89ae-f9e7-4359-b2df-5020b7a57456" x="292" y="135" width="100" height="13"/>
-				<textElement>
-					<font size="8"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{P_APPROVE_DATE}]]></textFieldExpression>
-			</textField>
 			<textField pattern="dd. MM. yyyy">
 				<reportElement uuid="8f8ad8d2-dc49-46cc-8732-914951931569" x="440" y="135" width="100" height="15"/>
 				<textElement>
@@ -585,6 +563,18 @@ tuzemské pracovní cesty]]></text>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{P_PREV_APPROVE_DATE}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement uuid="4aca1ec1-c2dc-47b9-a973-40ded5f52d29" x="260" y="103" width="290" height="20"/>
+				<textElement/>
+				<text><![CDATA[Datum a podpis zaměstnance, který upravil vyúčtování]]></text>
+			</staticText>
+			<genericElement>
+				<reportElement uuid="3753147d-3c79-4377-b296-3281ab3d54b3" x="291" y="103" width="130" height="46"/>
+				<genericElementType namespace="urn:sig:sig" name="signature"/>
+				<genericElementParameter name="index">
+					<valueExpression><![CDATA[2]]></valueExpression>
+				</genericElementParameter>
+			</genericElement>
 		</band>
 	</summary>
 </jasperReport>

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -183,6 +183,10 @@
 		<property name="rootPath" value="${storage.root}"/>
 	</bean>
 
+	<bean id="signeDocStorage" class="info.bukova.isspst.storage.ReportFileStorageImpl">
+		<property name="rootPath" value="${storage.signedDocuments}"/>
+	</bean>
+
 	<!-- Session data -->
 	<bean id="sessionData" class="info.bukova.isspst.SessionData" scope="session">
 		<aop:scoped-proxy/>

src/main/webapp/WEB-INF/storage.properties

@@ -1,2 +1,3 @@
 storage.root=/home/pepa/tmp/isspst
-storage.fulltextIndex=/home/pepa/tmp/isspst
+storage.fulltextIndex=/home/pepa/tmp/isspst
+storage.signedDocuments=/home/pepa/tmp/isspst/signedDoc

src/main/webapp/lists/signeddocs/grid.zul

@@ -1,5 +1,7 @@
 <?page contentType="text/html;charset=UTF-8"?>
-<zk>
+<zk xmlns="http://www.zkoss.org/2005/zul"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 	<window
 	vflex="1"
@@ -125,18 +127,23 @@
 							model="@load(vm.signedDocumentItems)">
 							<listhead menupopup="auto">
 								<listheader
-									hflex="1"
+									hflex="2"
 									sort="czech(actualReportName)"
 									label="${labels.PrintReports}" />
 								<listheader
-									hflex="2"
+									hflex="3"
 									sort="czech(fileName)"
 									label="${labels.FileName}" />
+								<listheader
+									hflex="1"/>
 							</listhead>
 							<template name="model">
 								<listitem>
 									<listcell label="@load(each.actualReportName)" />
 									<listcell label="@load(each.fileName)" />
+									<listcell>
+										<button label="Otevřít" onClick="@command('onOpen', item = each)" sclass="nicebutton"/>
+									</listcell>
 								</listitem>
 							</template>
 						</listbox>