From d7e02f4ccca3b6893d587b0b1ac1736a2d37379c Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Thu, 2 Oct 2014 16:00:14 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Implementov=C3=A1no=20hl=C3=ADd=C3=A1n?= =?UTF-8?q?=C3=AD=20limit=C5=AF=20pro=20komise.=20Po=C5=BEadavek,=20kter?= =?UTF-8?q?=C3=BD=20by=20p=C5=99ekro=C4=8D=C3=ADl=20limit=20komise=20nelze?= =?UTF-8?q?=20ulo=C5=BEit.=20V=20glob=C3=A1ln=C3=ADm=20nastaven=C3=AD=20by?= =?UTF-8?q?l=20rozchozen=20checkbox=20"Povolit=20zad=C3=A1v=C3=A1n=C3=AD?= =?UTF-8?q?=20po=C5=BEadavk=C5=AF".=20closes=20#137?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/approved/OrderService.java | 3 + .../services/approved/OrderServiceImpl.java | 10 +++ .../RequirementBaseServiceImpl.java | 11 ++- .../requirement/RequirementServiceImpl.java | 29 +++++++ .../isspst/ui/dashboard/DashBoardVM.java | 16 +++- .../WEB-INF/locales/zk-label.properties | 4 + src/main/webapp/app/info.zul | 75 +++++++++++++----- src/main/webapp/img/money-small.png | Bin 0 -> 1428 bytes src/main/webapp/img/money.png | Bin 0 -> 3152 bytes 9 files changed, 124 insertions(+), 24 deletions(-) create mode 100644 src/main/webapp/img/money-small.png create mode 100644 src/main/webapp/img/money.png diff --git a/src/main/java/info/bukova/isspst/services/approved/OrderService.java b/src/main/java/info/bukova/isspst/services/approved/OrderService.java index 4d36ba21..c0aed201 100644 --- a/src/main/java/info/bukova/isspst/services/approved/OrderService.java +++ b/src/main/java/info/bukova/isspst/services/approved/OrderService.java @@ -1,13 +1,16 @@ package info.bukova.isspst.services.approved; +import java.math.BigDecimal; import java.util.List; import info.bukova.isspst.data.JoinedItem; import info.bukova.isspst.data.Order; +import info.bukova.isspst.data.Workgroup; import info.bukova.isspst.services.Service; public interface OrderService extends Service { public Order createOrder(List items); + public BigDecimal totalOrderedForWorkgroup(Workgroup workgroup); } diff --git a/src/main/java/info/bukova/isspst/services/approved/OrderServiceImpl.java b/src/main/java/info/bukova/isspst/services/approved/OrderServiceImpl.java index 1e7decc7..dbe02066 100644 --- a/src/main/java/info/bukova/isspst/services/approved/OrderServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/approved/OrderServiceImpl.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import org.hibernate.Query; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -12,6 +13,7 @@ import info.bukova.isspst.data.AddressEmb; import info.bukova.isspst.data.JoinedItem; import info.bukova.isspst.data.Order; import info.bukova.isspst.data.OrderItem; +import info.bukova.isspst.data.Workgroup; import info.bukova.isspst.services.AbstractOwnedService; import info.bukova.isspst.services.settings.GlobalSettingsService; @@ -42,6 +44,14 @@ public class OrderServiceImpl extends AbstractOwnedService implements return order; } + @Override + @Transactional + public BigDecimal totalOrderedForWorkgroup(Workgroup workgroup) { + Query q = dao.getQuery("select sum(oi.total) from OrderItem oi join oi.reqItem ri join ri.requirement rq join rq.workgroup w where ri.delivered = true and w = :workgroup"); + q.setParameter("workgroup", workgroup); + return (BigDecimal)q.uniqueResult(); + } + @Override @Transactional @PreAuthorize("hasPermission(this, 'PERM_ADD')") diff --git a/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java index 0b4765ed..77b8891a 100644 --- a/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java @@ -56,18 +56,27 @@ public abstract class RequirementBaseServiceImpl exte } entity.setWorkgroup(reqWorkgroup); - entity.setNumser(this.getNumberSerie()); this.addWorkflow(entity); + + checkEnable(); if (!canAdd(entity)) { throw new AddRequirementException(); } + entity.setNumser(this.getNumberSerie()); + super.add(entity); this.sendToApprovers(entity); } + private void checkEnable() { + if (!settingsService.getSettings().isEnableRequirements()) { + throw new AddRequirementException("RequirementsDisabled"); + } + } + protected boolean canAdd(T entity) { return true; } diff --git a/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java index dcc9ba11..8eef0ae1 100644 --- a/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java @@ -8,7 +8,9 @@ import info.bukova.isspst.data.RequirementSubject; import info.bukova.isspst.data.User; import info.bukova.isspst.data.Workflow; import info.bukova.isspst.services.LazyLoader; +import info.bukova.isspst.services.approved.OrderService; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -21,6 +23,8 @@ public class RequirementServiceImpl extends @Autowired private RequirementTypeService reqTypeService; + @Autowired + private OrderService orderService; @Override protected Requirement createEntity() { @@ -49,6 +53,31 @@ public class RequirementServiceImpl extends return false; } + + @Override + protected boolean canAdd(Requirement entity) { + if (entity.getWorkgroup() != null + && entity.getWorkgroup().getLimit() != null + && entity.getWorkgroup().getLimit().compareTo(BigDecimal.ZERO) != 0) { + + BigDecimal total = orderService.totalOrderedForWorkgroup(entity.getWorkgroup()); + + if (total == null) { + total = BigDecimal.ZERO; + } + + total = total.add(entity.getSumTotal()); + + if (total.compareTo(entity.getWorkgroup().getLimit()) <= 0) { + return true; + } + + } else { + return true; + } + + throw new AddRequirementException("LimitExceeded"); + } /* * Lazy load pro načtení seznamu skupin materiálu nebo služeb do comba. diff --git a/src/main/java/info/bukova/isspst/ui/dashboard/DashBoardVM.java b/src/main/java/info/bukova/isspst/ui/dashboard/DashBoardVM.java index ae4784bc..7be10133 100644 --- a/src/main/java/info/bukova/isspst/ui/dashboard/DashBoardVM.java +++ b/src/main/java/info/bukova/isspst/ui/dashboard/DashBoardVM.java @@ -3,9 +3,12 @@ package info.bukova.isspst.ui.dashboard; import info.bukova.isspst.data.Role; import info.bukova.isspst.data.User; import info.bukova.isspst.data.Workgroup; +import info.bukova.isspst.services.approved.OrderService; import info.bukova.isspst.services.users.UserService; import info.bukova.isspst.services.workgroups.WorkgroupService; +import info.bukova.isspst.ui.DocumentViewModel; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -14,20 +17,24 @@ import java.util.Map; import org.zkoss.bind.annotation.Init; import org.zkoss.zk.ui.select.annotation.WireVariable; -public class DashBoardVM { +public class DashBoardVM extends DocumentViewModel { @WireVariable private WorkgroupService workgroupService; @WireVariable private UserService userService; + @WireVariable + private OrderService orderService; private User user; private Map> groupRoles; + private Map workgroupSpent; - @Init + @Init(superclass = true) public void init() { user = userService.getCurrent(); groupRoles = new HashMap>(); + workgroupSpent = new HashMap(); List wg = new ArrayList(); if (workgroupService.getUserCentres(user) != null) { @@ -40,6 +47,7 @@ public class DashBoardVM { for (Workgroup w : wg) { List r = workgroupService.getUserWorkgroupRoles(w, user); groupRoles.put(w, r); + workgroupSpent.put(w, orderService.totalOrderedForWorkgroup(w)); } } @@ -59,4 +67,8 @@ public class DashBoardVM { return groupRoles; } + public Map getWorkgroupSpent() { + return workgroupSpent; + } + } diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index 4546bc7f..2b9009ec 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -142,6 +142,10 @@ Centres=Střediska OfferSelectedOnly=Nabízet pouze vybraná střediska Select=Vybrat OfferedCentres=Nabízená střediska +LimitExceeded=Požadavek nelze uložit z důvodu překročení limitu komise. +Spent=Vyčerpáno: +WorkgroupLimits=Limity komisí +RequirementsDisabled=Vkládání požadavků je administrátorem zakázáno Number=Číslo: Prefix=Prefix: diff --git a/src/main/webapp/app/info.zul b/src/main/webapp/app/info.zul index ac5216c7..8d5bb0bb 100644 --- a/src/main/webapp/app/info.zul +++ b/src/main/webapp/app/info.zul @@ -40,29 +40,62 @@ - - - - + + + \ No newline at end of file diff --git a/src/main/webapp/img/money-small.png b/src/main/webapp/img/money-small.png new file mode 100644 index 0000000000000000000000000000000000000000..4ac391cfdd92522a6d1a9ec8aa14cc44a7b3edc6 GIT binary patch literal 1428 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 Date: Thu, 2 Oct 2014 16:16:39 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Opravena=20chyba=20v=20zakl=C3=A1d=C3=A1n?= =?UTF-8?q?=C3=AD=20po=C5=BEadavk=C5=AF-=20pokud=20se=20zakl=C3=A1dal=20po?= =?UTF-8?q?=C5=BEadavek,=20kter=C3=BD=20by=20p=C5=99ekro=C4=8Dil=20limit?= =?UTF-8?q?=20a=20n=C3=A1sledn=C4=9B=20se=20upravila=20=C4=8D=C3=A1stka,?= =?UTF-8?q?=20aby=20=C5=A1el=20ulo=C5=BEit,=20do=C5=A1lo=20k=20rozjet?= =?UTF-8?q?=C3=AD=20po=C5=99ad=C3=AD=20schvalovatel=C5=AF.=20refs=20#137?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/requirement/RequirementBaseServiceImpl.java | 4 ++-- src/main/webapp/app/info.zul | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java b/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java index 77b8891a..b3adda62 100644 --- a/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java +++ b/src/main/java/info/bukova/isspst/services/requirement/RequirementBaseServiceImpl.java @@ -56,14 +56,14 @@ public abstract class RequirementBaseServiceImpl exte } entity.setWorkgroup(reqWorkgroup); - this.addWorkflow(entity); - + checkEnable(); if (!canAdd(entity)) { throw new AddRequirementException(); } + this.addWorkflow(entity); entity.setNumser(this.getNumberSerie()); super.add(entity); diff --git a/src/main/webapp/app/info.zul b/src/main/webapp/app/info.zul index 8d5bb0bb..a1b78138 100644 --- a/src/main/webapp/app/info.zul +++ b/src/main/webapp/app/info.zul @@ -40,7 +40,7 @@ - +