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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Josef Rokos
2015-06-24 12:54:57 +02:00
parent d6cff454fd 1d30f0d0c7
commit d7999e78ca
9 changed files with 415 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/Constants.java
+2 -2
View File
@@ -6,7 +6,6 @@ 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.SignedDocument;
import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.TripBillApproval;
import info.bukova.isspst.data.TripRequirement;
@@ -24,6 +23,7 @@ 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;
@@ -105,7 +105,7 @@ public class Constants {
new Module(MOD_ORDER, "Objednávky", OrderService.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", SignedDocument.class, true, false),
new Module(MOD_SIGNEDDOCS, "Podepsané dokumenty", SignedDocumentService.class, true, false),
};
public final static String PERM_APPROVE = "PERM_APPROVE";
src/main/java/info/bukova/isspst/data/SignedDocument.java
+26 -1
View File
@@ -5,11 +5,18 @@ import info.bukova.isspst.Module;
import info.bukova.isspst.StringUtils;
import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
import org.hibernate.search.annotations.IndexedEmbedded;
@Entity
@Table(name = "SIGNED_DOCUMENTS")
public class SignedDocument extends BaseData {
@@ -29,6 +36,11 @@ public class SignedDocument extends BaseData {
@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;
}
@@ -76,11 +88,24 @@ public class SignedDocument extends BaseData {
}
for (Module m : Constants.MODULES) {
if (m.getId() == this.moduleName) {
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) {
item.setSignedDocument(this);
this.items.add(item);
}
}
src/main/java/info/bukova/isspst/data/SignedDocumentItem.java
+14
View File
@@ -1,6 +1,8 @@
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;
@@ -56,6 +58,18 @@ public class SignedDocumentItem {
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;
}
src/main/java/info/bukova/isspst/filters/SignedDocumentFilter.java
+64
View File
@@ -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/services/signeddocs/SignedDocumentServiceImpl.java
+15
View File
@@ -2,6 +2,21 @@ package info.bukova.isspst.services.signeddocs;
import info.bukova.isspst.data.SignedDocument;
import info.bukova.isspst.services.AbstractOwnedService;
import info.bukova.isspst.services.LazyLoader;
import org.hibernate.Hibernate;
import org.springframework.transaction.annotation.Transactional;
public class SignedDocumentServiceImpl extends AbstractOwnedService<SignedDocument> implements SignedDocumentService {
@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());
}
}
src/main/java/info/bukova/isspst/ui/signeddocs/SignedDocsList.java
+73
View File
@@ -0,0 +1,73 @@
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.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.select.annotation.WireVariable;
import org.zkoss.zul.Listbox;
public class SignedDocsList extends ListViewModel<SignedDocument>
{
@SuppressWarnings("unused")
private final static Logger log = LoggerFactory.getLogger(SignedDocsList.class.getName());
@WireVariable
protected SignedDocumentService signedDocumentService;
protected SignedDocumentItem signedDocumentItem;
protected List<SignedDocumentItem> signedDocumentItems;
@Init(superclass = true)
public void initSignedDocsList() {
service = signedDocumentService;
dataClass = SignedDocument.class;
formZul = "form.zul";
dataFilter = new SignedDocumentFilter(getFilterTemplate());
this.signedDocumentItem = null;
this.signedDocumentItems = new ArrayList<SignedDocumentItem>();
}
public SignedDocumentItem getSignedDocumentItem() {
return signedDocumentItem;
}
public void setSignedDocumentItem(SignedDocumentItem signedDocumentItem) {
this.signedDocumentItem = signedDocumentItem;
}
public List<SignedDocumentItem> getSignedDocumentItems() {
return signedDocumentItems;
}
public void setSignedDocumentItems(List<SignedDocumentItem> signedDocumentItems) {
this.signedDocumentItems = signedDocumentItems;
}
@Command
@NotifyChange("signedDocumentItems")
public void onChangeSelectSignedDocs(@BindingParam("ctrl") Listbox lb) {
if (lb == null) {
return;
}
if (lb.getSelectedIndex() > -1) {
this.signedDocumentItems = this.getDataBean().getItems();
}
else {
this.signedDocumentItems = new ArrayList<SignedDocumentItem>();
}
}
}