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

Požadavky na materiály a služby

Browse Source 
- do záložek [Má střediska], [Mé komise] a [Vše] přidán sloupec
[Vytvořil]
- opraveno plnění a filtrování středisek na všech záložkách
- služba userService přesunuta do třídy RequirementSubpage

closes #144
This commit is contained in:
František Přibyl
2014-10-01 13:04:16 +02:00
parent 60a87e5d52
commit ab5ed12772
12 changed files with 148 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/filters/RequirementFilter.java
+5 -1
View File
@@ -3,6 +3,8 @@ package info.bukova.isspst.filters;
import info.bukova.isspst.DateTimeUtils;
import info.bukova.isspst.StringUtils;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.User;
import info.bukova.isspst.data.Workgroup;
import org.hamcrest.Description;
import org.hamcrest.Factory;
@@ -40,9 +42,11 @@ public class RequirementFilter implements Filter<Requirement>
{
boolean foundNumser = StringUtils.isEqualForFilter(item.getNumser(), condition.getNumser());
boolean foundReqDate = DateTimeUtils.isEqualByDateForFilter(item.getReqDate(), condition.getReqDate());
boolean foundCenter = Workgroup.isEqualByWorkgroupForFilter(item.getCentre(), condition.getCentre());
boolean foundDescription = StringUtils.isEqualForFilter(item.getDescription(), condition.getDescription());
boolean foundDeliveryDate = DateTimeUtils.isEqualByDateForFilter(item.getDeliveryDate(), condition.getDeliveryDate());
return foundNumser && foundReqDate && foundDescription && foundDeliveryDate;
boolean foundUser = User.isEqualByUserForFilter(item.getOwnedBy(), condition.getOwnedBy());
return (foundNumser && foundReqDate && foundCenter && foundDescription && foundDeliveryDate && foundUser);
}
@Factory
src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMy.java
+1 -5
View File
@@ -4,7 +4,6 @@ import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
@@ -21,15 +20,12 @@ public class ReqListMy extends RequirementSubpage<Requirement>
@WireVariable
protected RequirementService requirementService;
@WireVariable
protected UserService userService;
@WireVariable
protected WorkgroupService workgroupService;
public List<Workgroup> getCentres()
{
return workgroupService.getUserCentres(userService.getCurrent());
return workgroupService.getCentres();
}
@Init
src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java
+1 -5
View File
@@ -4,7 +4,6 @@ import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
@@ -23,15 +22,12 @@ public class ReqListMyAll extends RequirementSubpage<Requirement>
@WireVariable
protected RequirementService requirementService;
@WireVariable
protected UserService userService;
@WireVariable
protected WorkgroupService workgroupService;
public List<Workgroup> getCentres()
{
return workgroupService.getUserCentres(userService.getCurrent());
return workgroupService.getCentres();
}
@Init
src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java
-4
View File
@@ -4,7 +4,6 @@ import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
@@ -23,9 +22,6 @@ public class ReqListMyCenters extends RequirementSubpage<Requirement>
@WireVariable
protected RequirementService requirementService;
@WireVariable
protected UserService userService;
@WireVariable
protected WorkgroupService workgroupService;
src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java
+1 -5
View File
@@ -4,7 +4,6 @@ import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
@@ -23,15 +22,12 @@ public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
@WireVariable
protected RequirementService requirementService;
@WireVariable
protected UserService userService;
@WireVariable
protected WorkgroupService workgroupService;
public List<Workgroup> getCentres()
{
return workgroupService.getUserCentres(userService.getCurrent());
return workgroupService.getCentres();
}
@Init
src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java
+13
View File
@@ -1,17 +1,30 @@
package info.bukova.isspst.ui.requirement;
import info.bukova.isspst.data.RequirementBase;
import info.bukova.isspst.data.User;
import info.bukova.isspst.services.requirement.RequirementBaseService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.ui.BigDecimalConverter;
import info.bukova.isspst.ui.ListViewModel;
import java.util.List;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
import org.zkoss.zk.ui.select.annotation.WireVariable;
public class RequirementSubpage<T extends RequirementBase> extends ListViewModel<T> {
@WireVariable
protected UserService userService;
public List<User> getAllUsers()
{
return userService.getAll();
}
private BigDecimalConverter bigDecimalConverter;
public BigDecimalConverter getBigDecimalConverter()
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
+2 -3
View File
@@ -4,7 +4,6 @@ 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.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import java.util.ArrayList;
@@ -21,10 +20,10 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
@WireVariable
private TripRequirementService tripRequirementService;
@WireVariable
private WorkgroupService workgroupService;
@WireVariable
private UserService userService;
private List<Workgroup> myCentres;
@Init
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
+3 -3
View File
@@ -4,7 +4,6 @@ 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.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import java.util.ArrayList;
@@ -21,11 +20,12 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
@WireVariable
private TripRequirementService tripRequirementService;
@WireVariable
private WorkgroupService workgroupService;
@WireVariable
private UserService userService;
private List<Workgroup> myCentres;
private List<Workgroup> myWorkgroups;
@Init