Přepracovány styly pro celkový vzhled okna, nastavení rolování gridu.
BigDecimalConverter přesunut do báze... Odstraněna stará cesta k původním požadavkům. Nové požadavky připraveny do tabů.
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
package info.bukova.isspst.ui.main.orders.requirements;
|
||||
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.zkoss.bind.annotation.Init;
|
||||
import org.zkoss.zk.ui.select.annotation.WireVariable;
|
||||
|
||||
public class ReqListMy extends RequirementSubpage<Requirement>
|
||||
{
|
||||
|
||||
@WireVariable
|
||||
private RequirementService requirementService;
|
||||
|
||||
@WireVariable
|
||||
private UserService userService;
|
||||
|
||||
@WireVariable
|
||||
private WorkgroupService workgroupService;
|
||||
|
||||
public List<Workgroup> getCentres()
|
||||
{
|
||||
return workgroupService.getUserCentres(userService.getCurrent());
|
||||
}
|
||||
|
||||
@Init
|
||||
public void init()
|
||||
{
|
||||
super.init();
|
||||
service = requirementService;
|
||||
dataClass = Requirement.class;
|
||||
formZul = "reqForm.zul";
|
||||
dataFilter = new RequirementFilter(getFilterTemplate());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Requirement> getListFromService()
|
||||
{
|
||||
return super.getListFromService();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package info.bukova.isspst.ui.main.orders.requirements;
|
||||
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.zkoss.bind.annotation.Init;
|
||||
import org.zkoss.zk.ui.select.annotation.WireVariable;
|
||||
|
||||
public class ReqListMyAll extends RequirementSubpage<Requirement>
|
||||
{
|
||||
|
||||
@WireVariable
|
||||
private RequirementService requirementService;
|
||||
|
||||
@WireVariable
|
||||
private UserService userService;
|
||||
|
||||
@WireVariable
|
||||
private WorkgroupService workgroupService;
|
||||
|
||||
public List<Workgroup> getCentres()
|
||||
{
|
||||
return workgroupService.getUserCentres(userService.getCurrent());
|
||||
}
|
||||
|
||||
@Init
|
||||
public void init()
|
||||
{
|
||||
super.init();
|
||||
service = requirementService;
|
||||
dataClass = Requirement.class;
|
||||
formZul = "reqForm.zul";
|
||||
dataFilter = new RequirementFilter(getFilterTemplate());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Requirement> getListFromService()
|
||||
{
|
||||
return super.getListFromService();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package info.bukova.isspst.ui.main.orders.requirements;
|
||||
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.zkoss.bind.annotation.Init;
|
||||
import org.zkoss.zk.ui.select.annotation.WireVariable;
|
||||
|
||||
public class ReqListMyCenters extends RequirementSubpage<Requirement>
|
||||
{
|
||||
|
||||
@WireVariable
|
||||
private RequirementService requirementService;
|
||||
|
||||
@WireVariable
|
||||
private UserService userService;
|
||||
|
||||
@WireVariable
|
||||
private WorkgroupService workgroupService;
|
||||
|
||||
public List<Workgroup> getCentres()
|
||||
{
|
||||
return workgroupService.getUserCentres(userService.getCurrent());
|
||||
}
|
||||
|
||||
@Init
|
||||
public void init()
|
||||
{
|
||||
super.init();
|
||||
service = requirementService;
|
||||
dataClass = Requirement.class;
|
||||
formZul = "reqForm.zul";
|
||||
dataFilter = new RequirementFilter(getFilterTemplate());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Requirement> getListFromService()
|
||||
{
|
||||
return super.getListFromService();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package info.bukova.isspst.ui.main.orders.requirements;
|
||||
|
||||
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;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.zkoss.bind.annotation.Init;
|
||||
import org.zkoss.zk.ui.select.annotation.WireVariable;
|
||||
|
||||
public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
|
||||
{
|
||||
|
||||
@WireVariable
|
||||
private RequirementService requirementService;
|
||||
|
||||
@WireVariable
|
||||
private UserService userService;
|
||||
|
||||
@WireVariable
|
||||
private WorkgroupService workgroupService;
|
||||
|
||||
public List<Workgroup> getCentres()
|
||||
{
|
||||
return workgroupService.getUserCentres(userService.getCurrent());
|
||||
}
|
||||
|
||||
@Init
|
||||
public void init()
|
||||
{
|
||||
super.init();
|
||||
service = requirementService;
|
||||
dataClass = Requirement.class;
|
||||
formZul = "reqForm.zul";
|
||||
dataFilter = new RequirementFilter(getFilterTemplate());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Requirement> getListFromService()
|
||||
{
|
||||
return super.getListFromService();
|
||||
}
|
||||
}
|
||||
@@ -2,14 +2,34 @@ package info.bukova.isspst.ui.requirement;
|
||||
|
||||
import info.bukova.isspst.data.RequirementBase;
|
||||
import info.bukova.isspst.services.requirement.RequirementBaseService;
|
||||
import info.bukova.isspst.ui.BigDecimalConverter;
|
||||
import info.bukova.isspst.ui.ListViewModel;
|
||||
|
||||
import org.zkoss.bind.BindUtils;
|
||||
import org.zkoss.bind.annotation.Command;
|
||||
import org.zkoss.bind.annotation.Init;
|
||||
import org.zkoss.bind.annotation.NotifyChange;
|
||||
|
||||
public class RequirementSubpage<T extends RequirementBase> extends ListViewModel<T> {
|
||||
|
||||
private BigDecimalConverter bigDecimalConverter;
|
||||
|
||||
public BigDecimalConverter getBigDecimalConverter()
|
||||
{
|
||||
return bigDecimalConverter;
|
||||
}
|
||||
|
||||
public void setBigDecimalConverter(BigDecimalConverter bigDecimalConverter)
|
||||
{
|
||||
this.bigDecimalConverter = bigDecimalConverter;
|
||||
}
|
||||
|
||||
@Init
|
||||
public void init()
|
||||
{
|
||||
this.bigDecimalConverter = new BigDecimalConverter();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private RequirementBaseService<T> getReqService()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user