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

Opravena editace existujících položek požadavků

Browse Source
This commit is contained in:
Josef Rokos
2014-09-05 08:41:56 +02:00
parent 5fd9f1844b
commit 372814e4b3
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/services/requirement/RequirementTypeServiceImpl.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class RequirementTypeServiceImpl extends AbstractOwnedService<Requiremen
public List<Workgroup> filterCentres(RequirementType reqType,
List<Workgroup> source) {
if (!reqType.getLimitCentres()) {
if (reqType.getLimitCentres() == null || !reqType.getLimitCentres()) {
return source;
}
src/main/java/info/bukova/isspst/ui/main/orders/requirements/RequirementForm.java
+5
View File
@@ -5,6 +5,7 @@ import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.RequirementItem;
import info.bukova.isspst.data.RequirementSubject;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.requirement.RequirementTypeService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
@@ -40,6 +41,9 @@ public class RequirementForm extends FormViewModel<Requirement>
@WireVariable
private RequirementTypeService reqTypeService;
@WireVariable
private RequirementService requirementService;
private RequirementItem selectedItem;
@@ -105,6 +109,7 @@ public class RequirementForm extends FormViewModel<Requirement>
this.setBigDecimalConverter(new BigDecimalConverter());
this.setRequirementFormValidator(new RequirementFormValidator());
this.setSyncItems(this.getDataBean().getItems());
requirementService.loadType(getDataBean());
this.centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent()));
}
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementForm.java
+4
View File
@@ -13,6 +13,7 @@ import info.bukova.isspst.data.TripRequirement;
import info.bukova.isspst.data.User;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.services.requirement.RequirementTypeService;
import info.bukova.isspst.services.requirement.TripRequirementService;
import info.bukova.isspst.services.settings.GlobalSettingsService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
@@ -29,6 +30,8 @@ public class TripRequirementForm extends FormViewModel<TripRequirement> {
private GlobalSettingsService settingsService;
@WireVariable
private RequirementTypeService reqTypeService;
@WireVariable
private TripRequirementService tripRequirementService;
private List<Workgroup> centres;
private List<User> users;
private List<User> passengers;
@@ -37,6 +40,7 @@ public class TripRequirementForm extends FormViewModel<TripRequirement> {
@Init(superclass = true)
public void init() {
tripRequirementService.loadType(getDataBean());
centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent()));
users = userService.getAll();
passengers = getDataBean().getPassengers();