IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do sestav žádosti o služební cestu a vyúčtování vstupuje podpis

Browse Source 
uživatele a podpis schvalovatele. 
closes #132
This commit is contained in:
Josef Rokos
2014-09-08 15:25:08 +02:00
parent d108f4a070
commit 74586f9820
8 changed files with 103 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/reporting/DefinitionFiller.java
-44
View File
@@ -1,44 +0,0 @@
package info.bukova.isspst.reporting;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
public class DefinitionFiller {
@Autowired
ReportDefinition definition;
@SuppressWarnings("unchecked")
private void setData(Object data) {
if (data instanceof List) {
definition.setDataSet((List<Object>)data);
} else {
definition.setSingleObject(data);
}
}
public void fillDefinition(Report report, Object data) {
definition.clear();
definition.setReport(report);
setData(data);
}
public void fillDefinition(Report report, Object data, Map<String, Object> params) {
fillDefinition(report, data);
definition.setParams(params);
}
public void fillDefinition(Report report, Object data, String[] columns) {
fillDefinition(report, data);
definition.setFieldsToPrint(Arrays.asList(columns));
}
public void fillDefinition(Report report, Object data, String[] columns, Map<String, Object> params) {
fillDefinition(report, data, params);
definition.setFieldsToPrint(Arrays.asList(columns));
}
}
src/main/java/info/bukova/isspst/reporting/ParamFiller.java
+54
View File
@@ -0,0 +1,54 @@
package info.bukova.isspst.reporting;
import info.bukova.isspst.data.AuthItem;
import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.User;
import info.bukova.isspst.data.UserSettingsData;
import info.bukova.isspst.services.requirement.TripRequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.storage.FileStorage;
import org.springframework.beans.factory.annotation.Autowired;
public class ParamFiller {
@Autowired
private ReportDefinition definition;
@Autowired
private UserService userService;
@Autowired
private FileStorage storage;
@Autowired
private TripRequirementService tripReqService;
public void fill() {
if (definition.getDataSet() == null || definition.getDataSet().isEmpty()) {
return;
}
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()));
}
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()));
}
}
}
}
src/main/java/info/bukova/isspst/reporting/ReportController.java
+8 -2
View File
@@ -6,6 +6,8 @@ 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;
@@ -17,7 +19,10 @@ public class ReportController {
private ReportDefinition reportDefinition;
@Autowired
private GeneratorFactory factory;
@Autowired
private ParamFiller paramFiller;
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);
private void writeError(OutputStream stream, Throwable e) {
writeError(stream, e.toString());
@@ -45,6 +50,7 @@ public class ReportController {
throw new ReportException("Definition is null");
}
paramFiller.fill();
Generator gen = factory.createGenerator(reportDefinition);
byte[] data = gen.generate();
response.setContentType(contentType);
@@ -54,13 +60,13 @@ public class ReportController {
os.flush();
os.close();
} catch (IOException e) {
e.printStackTrace();
logger.error("I/O error: " + e.getMessage());
} catch (ReportException e) {
logger.error("Report generation error: " + e.getMessage());
writeError(os, e);
} finally {
if (os != null) {
try {
os.flush();
os.close();
} catch (IOException e) {
e.printStackTrace();