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

Po otevření dialogu pro zobrazení vyúčtování SC se přepne na první záložku, kterou může schválit aktuálně přihlášený uživatel.

Browse Source 
closes #217
This commit is contained in:
Josef Rokos
2015-05-17 21:52:46 +02:00
parent 0f169f8be9
commit e5a8e0f0d9
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/ui/tripbill/TripBillSummaryVM.java
+18 -8
View File
@@ -6,6 +6,7 @@ import info.bukova.isspst.data.TripBillApproval;
import info.bukova.isspst.services.requirement.TripRequirementService; import info.bukova.isspst.services.requirement.TripRequirementService;
import info.bukova.isspst.services.tripbill.TripBillApprovalService; import info.bukova.isspst.services.tripbill.TripBillApprovalService;
import info.bukova.isspst.services.tripbill.TripBillService; import info.bukova.isspst.services.tripbill.TripBillService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.ui.requirement.RequirementSubpage; import info.bukova.isspst.ui.requirement.RequirementSubpage;
import org.zkoss.bind.annotation.BindingParam; import org.zkoss.bind.annotation.BindingParam;
import org.zkoss.bind.annotation.Command; import org.zkoss.bind.annotation.Command;
@@ -33,6 +34,8 @@ public class TripBillSummaryVM extends RequirementSubpage<TripBillApproval> {
private TripBillService tripBillService; private TripBillService tripBillService;
@WireVariable @WireVariable
private TripRequirementService tripRequirementService; private TripRequirementService tripRequirementService;
@WireVariable
private UserService userService;
private TripBill bill; private TripBill bill;
private Map<Integer, Boolean> selTab; private Map<Integer, Boolean> selTab;
@@ -71,11 +74,8 @@ public class TripBillSummaryVM extends RequirementSubpage<TripBillApproval> {
bills.add(this.bill); bills.add(this.bill);
if (bill.getApproval() != null && bill.getApproval().getState() != RequirementState.APPROVED) { if (selectTab(bill)) {
isSelectedTad = true; isSelectedTad = true;
selTab.put(bill.getId(), true);
} else {
selTab.put(bill.getId(), false);
} }
for (TripBill b : tripRequirementService.getBills(bill.getRequirement())) { for (TripBill b : tripRequirementService.getBills(bill.getRequirement())) {
@@ -83,11 +83,8 @@ public class TripBillSummaryVM extends RequirementSubpage<TripBillApproval> {
tripBillService.loadLazyData(b); tripBillService.loadLazyData(b);
bills.add(b); bills.add(b);
if (!isSelectedTad && b.getApproval() != null && b.getApproval().getState() != RequirementState.APPROVED) { if (!isSelectedTad && selectTab(b)) {
setBill(b);
isSelectedTad = true; isSelectedTad = true;
} else {
selTab.put(b.getId(), false);
} }
} }
} }
@@ -99,6 +96,19 @@ public class TripBillSummaryVM extends RequirementSubpage<TripBillApproval> {
return bills; return bills;
} }
private boolean selectTab(TripBill bill) {
if (bill.getApproval() != null
&& bill.getApproval().getState() != RequirementState.APPROVED
&& tripBillApprovalService.getNextApprover(bill.getApproval()).contains(userService.getCurrent())) {
setBill(bill);
return true;
} else {
selTab.put(bill.getId(), false);
}
return false;
}
@Command @Command
public void showBill(@BindingParam("bill") TripBill bill) { public void showBill(@BindingParam("bill") TripBill bill) {
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();