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

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source
This commit is contained in:
Josef Rokos
2014-07-17 12:41:44 +02:00
parent a8020789be 568bed6f9b
commit c7d1c72ce0
15 changed files with 189 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java
+8
View File
@@ -1,9 +1,12 @@
package info.bukova.isspst.services.requirement;
import info.bukova.isspst.Constants;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.RequirementState;
import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -11,11 +14,16 @@ public class RequirementServiceImpl extends
RequirementBaseServiceImpl<Requirement> implements RequirementService,
RequirementBaseService<Requirement> {
@Autowired
private RequirementTypeService reqTypeService;
@Override
protected Requirement createEntity() {
Requirement entity = new Requirement();
entity.setReqDate(new Date());
entity.setType(reqTypeService.getTypeById(Constants.REQTYPE_ORDER));
entity.setState(RequirementState.NEW);
return entity;
}
src/main/java/info/bukova/isspst/ui/MainMenu.java
+51
View File
@@ -0,0 +1,51 @@
package info.bukova.isspst.ui;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zul.Window;
public class MainMenu
{
private String contextPath;
private String moduleUrl;
@Init
public void init()
{
this.contextPath = Executions.getCurrent().getContextPath();
this.moduleUrl = Executions.getCurrent().getDesktop().getRequestPath();
}
public String getContextPath()
{
return this.contextPath;
}
public String getModuleUrl()
{
return this.moduleUrl;
}
@Command
public void passwd()
{
Window window = (Window) Executions.createComponents("/app/passwd.zul", null, null);
window.doModal();
}
@Command
public void numSeries()
{
Window window = (Window) Executions.createComponents("/settings/numberSeries.zul", null, null);
window.doModal();
}
@Command
public void globalSettings()
{
Window window = (Window) Executions.createComponents("/settings/globalSettings.zul", null, null);
window.doModal();
}
}
src/main/java/info/bukova/isspst/ui/NavigationVM.java
-72
View File
@@ -1,72 +0,0 @@
package info.bukova.isspst.ui;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zul.Window;
public class NavigationVM {
private String contextPath;
private String moduleUrl;
@Init
public void init() {
contextPath = Executions.getCurrent().getContextPath();
moduleUrl = Executions.getCurrent().getDesktop().getRequestPath();
}
@Command
public void passwd() {
Window window = (Window)Executions.createComponents("/app/passwd.zul", null, null);
window.doModal();
}
@Command
public void numSeries() {
Window window = (Window)Executions.createComponents("/settings/numberSeries.zul", null, null);
window.doModal();
}
@Command
public void globalSettings() {
Window window = (Window)Executions.createComponents("/settings/globalSettings.zul", null, null);
window.doModal();
}
public String getContextPath() {
return contextPath;
}
public String getModuleUrl() {
return moduleUrl;
}
public boolean isOrders() {
return moduleUrl.contains("orders");
}
public boolean isTrips() {
return moduleUrl.contains("trips");
}
public boolean isSettings() {
return moduleUrl.contains("settings");
}
public boolean isAdmin() {
return moduleUrl.contains("admin");
}
public boolean isUser() {
return moduleUrl.contains("passwd");
}
public boolean isLists() {
return moduleUrl.contains("lists");
}
public boolean isRequirements() {
return moduleUrl.contains("requirements");
}
}
src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java
+6 -9
View File
@@ -9,22 +9,21 @@ import org.zkoss.bind.annotation.NotifyChange;
public class RequirementSubpage<T extends RequirementBase> extends ListViewModel<T> {
protected RequirementBaseService<T> reqService;
@SuppressWarnings("unchecked")
public void init() {
reqService = (RequirementBaseService<T>) service;
private RequirementBaseService<T> getReqService()
{
return (RequirementBaseService<T>) service;
}
@Override
protected void loadLazyData(T data) {
reqService.loadAuthItems(data);
this.getReqService().loadAuthItems(data);
}
@Command
@NotifyChange({"dataBean", "canApprove"})
public void approve() {
reqService.approve(getDataBean());
this.getReqService().approve(getDataBean());
}
@Override
@@ -35,11 +34,9 @@ public class RequirementSubpage<T extends RequirementBase> extends ListViewModel
public boolean isCanApprove() {
if (getDataBean() != null) {
return reqService.canApprove(getDataBean());
return this.getReqService().canApprove(getDataBean());
}
return false;
}
}
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
-1
View File
@@ -32,7 +32,6 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
allCentres = workgroupService.getCentres();
allWorkgroups = workgroupService.getWorkgroups();
super.init();
}
@Override
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
-1
View File
@@ -33,7 +33,6 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
dataFilter = new TripRequirementFilter(getFilterTemplate());
myCentres = workgroupService.getUserCentres(userService.getCurrent());
super.init();
}
@Override
src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
-1
View File
@@ -35,7 +35,6 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
myCentres = workgroupService.getUserCentres(userService.getCurrent());
myWorkgroups = workgroupService.getUserWorkgroups(userService.getCurrent());
super.init();
}
@Override