From 9b8bfe22286d717480c3d80619906244be975676 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Sun, 8 Mar 2015 19:33:15 +0100 Subject: [PATCH] =?UTF-8?q?Na=20formul=C3=A1=C5=99=20po=C5=BEadavku=20na?= =?UTF-8?q?=20slu=C5=BEebn=C3=AD=20byl=20p=C5=99id=C3=A1n=20checkbox=20pro?= =?UTF-8?q?=20vygenerov=C3=A1n=C3=AD=20vy=C3=BA=C4=8Dtov=C3=A1n=C3=AD=20sl?= =?UTF-8?q?u=C5=BEebn=C3=AD=20cesty=20i=20pro=20spolucestuj=C3=ADc=C3=AD.?= =?UTF-8?q?=20Spolucestuj=C3=ADc=C3=AD=20nem=C5=AF=C5=BEou=20vy=C3=BA?= =?UTF-8?q?=C4=8Dtov=C3=A1n=C3=AD=20m=C4=9Bnit.=20closes=20#212?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/bukova/isspst/data/TripBillItem.java | 34 ++++++++++++-- .../bukova/isspst/data/TripRequirement.java | 9 ++++ .../TripRequirementServiceImpl.java | 16 ++++--- .../tripbill/TripBillServiceImpl.java | 31 ++++++++++++- .../isspst/ui/tripbill/TripBillForm.java | 10 +++++ src/main/webapp/app/search/searchForm.zul | 4 +- src/main/webapp/img/search-072.png | Bin 0 -> 9041 bytes .../trips/requirements/requirementsForm.zul | 3 ++ .../main/trips/requirements/tripBill.zul | 2 +- .../webapp/main/trips/tripBillInterior.zul | 42 +++++++++--------- 10 files changed, 117 insertions(+), 34 deletions(-) create mode 100644 src/main/webapp/img/search-072.png diff --git a/src/main/java/info/bukova/isspst/data/TripBillItem.java b/src/main/java/info/bukova/isspst/data/TripBillItem.java index 577f01a6..062f6f31 100644 --- a/src/main/java/info/bukova/isspst/data/TripBillItem.java +++ b/src/main/java/info/bukova/isspst/data/TripBillItem.java @@ -2,15 +2,14 @@ package info.bukova.isspst.data; import info.bukova.isspst.Constants; -import java.math.BigDecimal; -import java.util.Date; - import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.Table; +import java.math.BigDecimal; +import java.util.Date; @Entity @Table(name = "TRIP_BILL_ITEMS") @@ -65,6 +64,35 @@ public class TripBillItem extends BaseData { @Column(name = "ADJUSTED_TOTAL", precision = 15, scale = 4) private BigDecimal adjustedTotal; + public TripBillItem() { + + } + + public TripBillItem(TripBillItem src) { + date = src.getDate(); + to = src.getTo(); + back = src.getBack(); + toDeparture = src.getToDeparture(); + toArrival = src.getToArrival(); + backDeparture = src.getBackDeparture(); + backArrival = src.getBackArrival(); + toVehicle = src.getToVehicle(); + backVehicle = src.getBackVehicle(); + beginWork = src.getBeginWork(); + endWork = src.getEndWork(); + freeMealsCount = src.getFreeMealsCount(); + distance = src.getDistance(); + fuelConsumption = src.getFuelConsumption(); + distanceAmount = src.getDistanceAmount(); + fuelAmount = src.getFuelAmount(); + carefare = src.getCarefare(); + housing = src.getHousing(); + meals = src.getMeals(); + otherExpenses = src.getOtherExpenses(); + total = src.getTotal(); + adjustedTotal = src.getAdjustedTotal(); + } + public Date getDate() { return date; } diff --git a/src/main/java/info/bukova/isspst/data/TripRequirement.java b/src/main/java/info/bukova/isspst/data/TripRequirement.java index 6339cbac..d10ab802 100644 --- a/src/main/java/info/bukova/isspst/data/TripRequirement.java +++ b/src/main/java/info/bukova/isspst/data/TripRequirement.java @@ -42,6 +42,8 @@ public class TripRequirement extends RequirementBase implements EntityWithAttach @LazyCollection(LazyCollectionOption.TRUE) @IndexedEmbedded private List attachedFiles; + @Column(name = "BILL_FOR_PASSENGERS") + private Boolean billForPassengers; public TripRequirement() { this.setOwnedBy(new User()); @@ -140,4 +142,11 @@ public class TripRequirement extends RequirementBase implements EntityWithAttach attachedFiles.remove(metainfo); } + public Boolean getBillForPassengers() { + return billForPassengers; + } + + public void setBillForPassengers(Boolean billForPassengers) { + this.billForPassengers = billForPassengers; + } } diff --git a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java index 6071221b..1a2b4952 100644 --- a/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java @@ -110,13 +110,15 @@ public class TripRequirementServiceImpl extends RequirementBaseServiceImpl implemen @Override @Transactional - @LazyLoader("print") + @LazyLoader({"print", "form"}) public void loadOwner(TripBill bill) { TripBill tb = dao.getById(bill.getId()); tb.getOwnedBy().getFirstName(); + tb.getRequirement().getOwnedBy().getFirstName(); bill.setOwnedBy(tb.getOwnedBy()); + bill.getRequirement().setOwnedBy(tb.getRequirement().getOwnedBy()); } @Override @@ -196,4 +198,31 @@ public class TripBillServiceImpl extends AbstractOwnedService implemen bill.getRequirement().setPassengers(tr.getPassengers()); } + @Override + @Transactional + @PreAuthorize("hasPermission(this, 'PERM_EDIT') or hasPermission(#entity, this.getUpdateEntityPermission())") + public void update(TripBill entity) { + super.update(entity); + + TripRequirement req = entity.getRequirement(); + Query q = dao.getQuery("from TripBill where requirement = :req and id != :id"); + q.setParameter("req", req); + q.setParameter("id", entity.getId()); + + List bills = q.list(); + for (TripBill tb : bills) { + tb.getBillItems().clear(); + + for (TripBillItem item : entity.getBillItems()) { + tb.getBillItems().add(new TripBillItem(item)); + } + + tb.setFreeCarfare(entity.isFreeCarfare()); + tb.setFreeHousing(entity.isFreeHousing()); + tb.setFreeMeals(entity.isFreeMeals()); + calculate(tb); + super.update(tb); + } + + } } diff --git a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java index fcfe8c75..91f4420b 100644 --- a/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java +++ b/src/main/java/info/bukova/isspst/ui/tripbill/TripBillForm.java @@ -38,4 +38,14 @@ public class TripBillForm extends FormWithUpload { return vehicles; } + public boolean isBillDisabled() { + if (getDataBean().getRequirement().getBillForPassengers() != null + && getDataBean().getRequirement().getBillForPassengers() + && !getDataBean().getOwnedBy().equals(getDataBean().getRequirement().getOwnedBy())) { + return true; + } + + return false; + } + } diff --git a/src/main/webapp/app/search/searchForm.zul b/src/main/webapp/app/search/searchForm.zul index bbeacd0c..c13bf717 100644 --- a/src/main/webapp/app/search/searchForm.zul +++ b/src/main/webapp/app/search/searchForm.zul @@ -16,7 +16,9 @@
- +
+ +
diff --git a/src/main/webapp/img/search-072.png b/src/main/webapp/img/search-072.png new file mode 100644 index 0000000000000000000000000000000000000000..cd4c8b5c41f456faa200c2b7e474be136fc8c921 GIT binary patch literal 9041 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/main/trips/requirements/requirementsForm.zul b/src/main/webapp/main/trips/requirements/requirementsForm.zul index 0aaee1b2..62e03fc0 100644 --- a/src/main/webapp/main/trips/requirements/requirementsForm.zul +++ b/src/main/webapp/main/trips/requirements/requirementsForm.zul @@ -147,6 +147,9 @@ sclass="nicebutton" disabled="@load(vm.selUser eq null)"/> + diff --git a/src/main/webapp/main/trips/requirements/tripBill.zul b/src/main/webapp/main/trips/requirements/tripBill.zul index 7fdaa8fd..1c35e63f 100644 --- a/src/main/webapp/main/trips/requirements/tripBill.zul +++ b/src/main/webapp/main/trips/requirements/tripBill.zul @@ -21,7 +21,7 @@ zclass="form-caption" label="${labels.TravelOrdersFormTitle}" /> - + diff --git a/src/main/webapp/main/trips/tripBillInterior.zul b/src/main/webapp/main/trips/tripBillInterior.zul index 07bf2c2a..50d1342a 100644 --- a/src/main/webapp/main/trips/tripBillInterior.zul +++ b/src/main/webapp/main/trips/tripBillInterior.zul @@ -56,21 +56,21 @@ + disabled="@load(vm.billDisabled or disabled)"/> + disabled="@load(vm.billDisabled or disabled)" /> + disabled="@load(vm.billDisabled or disabled)" /> @@ -237,12 +237,12 @@ value="@load(each.to)" maxlength="@load(vm.lengthText)" sclass="grid-textbox-max-left" - readonly="${disabled}"/> + readonly="@load(vm.billDisabled or disabled)"/> + readonly="@load(vm.billDisabled or disabled)"/> + disabled="@load(vm.billDisabled or disabled)"/> + disabled="@load(vm.billDisabled or disabled)"/> + disabled="@load(vm.billDisabled or disabled)"/> + disabled="@load(vm.billDisabled or disabled)"/> + disabled="@load(vm.billDisabled or disabled)"> @@ -289,7 +289,7 @@ selectedItem="@bind(each.backVehicle)" width="67px" readonly="true" - disabled="${disabled}"> + disabled="@load(vm.billDisabled or disabled)"> @@ -300,12 +300,12 @@ width="68px" value="@bind(each.beginWork)" format="short" - disabled="${disabled}"/> + disabled="@load(vm.billDisabled or disabled)"/> + disabled="@load(vm.billDisabled or disabled)"/> + readonly="@load(vm.billDisabled or disabled)"/> + readonly="@load(vm.billDisabled or disabled)"/> + readonly="@load(vm.billDisabled or disabled)"/> + readonly="@load(vm.billDisabled or disabled)"/> + readonly="@load(vm.billDisabled or disabled)"/> + readonly="@load(vm.billDisabled or disabled)"/> @@ -366,7 +366,7 @@ value="@bind(each.otherExpenses) @converter(vm.standardBigDecimalConverter)" maxlength="@load(vm.lengthText)" onChange="@command('calculate')" - readonly="${disabled}"/> + readonly="@load(vm.billDisabled or disabled)"/>