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

Do agendy požadavků na služební cesty byla přidána možnost prohlížení vyúčtování služební cesty.

Browse Source 
closes #200
This commit is contained in:
Josef Rokos
2015-02-15 19:14:03 +01:00
parent 678c140a94
commit 1df90a41c4
13 changed files with 557 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/services/requirement/TripRequirementService.java
+2
View File
@@ -1,10 +1,12 @@
package info.bukova.isspst.services.requirement;
import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.TripRequirement;
public interface TripRequirementService extends RequirementBaseService<TripRequirement>
{
public void loadPassangers(TripRequirement entity);
public TripBill getTripBill(TripRequirement requirement);
}
src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java
+16
View File
@@ -7,10 +7,12 @@ import info.bukova.isspst.services.tripbill.TripBillService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import org.hibernate.Hibernate;
import org.hibernate.LazyInitializationException;
import org.hibernate.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
public class TripRequirementServiceImpl extends RequirementBaseServiceImpl<TripRequirement>
implements TripRequirementService, RequirementBaseService<TripRequirement> {
@@ -49,6 +51,20 @@ 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;
}
@Transactional
@LazyLoader("form")
public void loadAttachments(TripRequirement entity) {
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
+26 -4
View File
@@ -1,20 +1,26 @@
package info.bukova.isspst.ui.requirement;
import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.TripRequirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.TripRequirementFilter;
import info.bukova.isspst.services.requirement.TripRequirementService;
import info.bukova.isspst.services.tripbill.TripBillService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import java.util.ArrayList;
import java.util.List;
import org.springframework.security.access.AccessDeniedException;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.GlobalCommand;
import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Window;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class TripRequirementListAll extends RequirementSubpage<TripRequirement> {
@@ -22,6 +28,8 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
private TripRequirementService tripRequirementService;
@WireVariable
private WorkgroupService workgroupService;
@WireVariable
private TripBillService tripBillService;
private List<Workgroup> allCentres;
private List<Workgroup> allWorkgroups;
@@ -65,4 +73,18 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
BindUtils.postGlobalCommand(null, null, "selectAll", null);
}
@Command
public void showTripBill() {
if (getDataBean() == null) {
return;
}
TripBill tb = tripRequirementService.getTripBill(getDataBean());
tripBillService.loadLazyData(tb);
Map<String, Object> params = new HashMap<String, Object>();
params.put("selected", tb);
Window win = (Window) Executions.createComponents("tripBill.zul", null, params);
win.doModal();
}
}
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
+27 -4
View File
@@ -1,20 +1,26 @@
package info.bukova.isspst.ui.requirement;
import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.TripRequirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.TripRequirementFilter;
import info.bukova.isspst.services.requirement.TripRequirementService;
import info.bukova.isspst.services.tripbill.TripBillService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import java.util.ArrayList;
import java.util.List;
import org.springframework.security.access.AccessDeniedException;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.GlobalCommand;
import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Window;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class TripRequirementListCentre extends RequirementSubpage<TripRequirement> {
@@ -24,6 +30,9 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
@WireVariable
private WorkgroupService workgroupService;
@WireVariable
private TripBillService tripBillService;
private List<Workgroup> myCentres;
@Init
@@ -61,4 +70,18 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
BindUtils.postGlobalCommand(null, null, "selectCentre", null);
}
@Command
public void showTripBill() {
if (getDataBean() == null) {
return;
}
TripBill tb = tripRequirementService.getTripBill(getDataBean());
tripBillService.loadLazyData(tb);
Map<String, Object> params = new HashMap<String, Object>();
params.put("selected", tb);
Window win = (Window) Executions.createComponents("tripBill.zul", null, params);
win.doModal();
}
}
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
+27 -4
View File
@@ -1,20 +1,26 @@
package info.bukova.isspst.ui.requirement;
import info.bukova.isspst.data.TripBill;
import info.bukova.isspst.data.TripRequirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.TripRequirementFilter;
import info.bukova.isspst.services.requirement.TripRequirementService;
import info.bukova.isspst.services.tripbill.TripBillService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import java.util.ArrayList;
import java.util.List;
import org.springframework.security.access.AccessDeniedException;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.GlobalCommand;
import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.select.annotation.WireVariable;
import org.zkoss.zul.Window;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequirement> {
@@ -24,6 +30,9 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
@WireVariable
private WorkgroupService workgroupService;
@WireVariable
private TripBillService tripBillService;
private List<Workgroup> myCentres;
private List<Workgroup> myWorkgroups;
@@ -68,4 +77,18 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
BindUtils.postGlobalCommand(null, null, "selectWorkgroup", null);
}
@Command
public void showTripBill() {
if (getDataBean() == null) {
return;
}
TripBill tb = tripRequirementService.getTripBill(getDataBean());
tripBillService.loadLazyData(tb);
Map<String, Object> params = new HashMap<String, Object>();
params.put("selected", tb);
Window win = (Window) Executions.createComponents("tripBill.zul", null, params);
win.doModal();
}
}