Přidána sestava pro žádost o služební cestu.

refs #122

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

@@ -94,7 +94,8 @@ public class Constants {
 	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("Adresna", "address", false, true))
+		new ReportMapping(MOD_ADDRESSBOOK, new Report("Adresa", "address", false, true)),
+		new ReportMapping(MOD_TRIPBILL, new Report("Žádost", "tripRequirement", false, true))
 	};
 	
 	public final static String REQTYPE_ORDER = "ORDER";

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

@@ -4,7 +4,6 @@ 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;
@@ -30,7 +29,7 @@ public class TripRequirement extends RequirementBase {
 	private String end;
 	@Column(name = "END_DATE")
 	private Date endDate;
-	@ManyToMany(cascade = CascadeType.ALL)
+	@ManyToMany
 	@LazyCollection(LazyCollectionOption.TRUE)
 	@JoinTable(name="TRIPREQUIREMENT_PASSANGER", joinColumns={@JoinColumn(name="TRIPREQUIREMENT_ID")}, inverseJoinColumns={@JoinColumn(name="USER_ID")})
 	private List<User> passengers;

src/main/java/info/bukova/isspst/services/tripbill/TripBillService.java

@@ -12,5 +12,7 @@ public interface TripBillService extends Service<TripBill> {
 	public void loadItems(TripBill bill);
 	public void calculate(TripBill bill);
 	public List<TripBill> getMy();
+	public void loadOwner(TripBill bill);
+	public void loadPassengers(TripBill bill);
 
 }

src/main/java/info/bukova/isspst/services/tripbill/TripBillServiceImpl.java

@@ -61,7 +61,7 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
 
 	@Override
 	@Transactional
-	@LazyLoader("form")
+	@LazyLoader({"form", "print"})
 	public void loadItems(TripBill entity) {
 		try {
 			if (entity.getBillItems() == null) {
@@ -174,4 +174,24 @@ public class TripBillServiceImpl extends AbstractOwnedService<TripBill> implemen
 		return this.execQuery("from TripBill as tb join fetch tb.ownedBy");
 	}
 
+	@Override
+	@Transactional
+	@LazyLoader("print")
+	public void loadOwner(TripBill bill) {
+		TripBill tb = dao.getById(bill.getId());
+		tb.getOwnedBy().getFirstName();
+		bill.setOwnedBy(tb.getOwnedBy());
+	}
+
+	@Override
+	@Transactional
+	@LazyLoader("print")
+	public void loadPassengers(TripBill bill) {
+		Query q = dao.getQuery("from TripRequirement where id = :id");
+		q.setParameter("id", bill.getRequirement().getId());
+		TripRequirement tr = (TripRequirement) q.uniqueResult();
+		tr.getPassengers().size();
+		bill.getRequirement().setPassengers(tr.getPassengers());
+	}
+
 }