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

src/main/java/info/bukova/isspst/ui/renderers/RequirementsItemRenderer.java

@@ -0,0 +1,39 @@
+package info.bukova.isspst.ui.renderers;
+
+import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.RequirementState;
+
+import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Listitem;
+
+@SuppressWarnings("serial")
+public class RequirementsItemRenderer extends GenericListitemRenderer<Requirement>
+{
+	@Override
+	protected void changeProperties(Listbox lb, Listitem li, int index, String varnm)
+	{
+		Requirement requirement = this.getObjectOfStates();
+		RequirementState state = requirement.getState();
+
+		if (state != null)
+		{
+			if (state == RequirementState.PARTIALLY)
+			{
+				li.setSclass("req-select-partially");
+			}
+			else if (state == RequirementState.APPROVED)
+			{
+				Boolean isProject = requirement.getProject();
+
+				if ((isProject != null) && (isProject.booleanValue() == true))
+				{
+					li.setSclass("req-select-approved-project");
+				}
+				else
+				{
+					li.setSclass("req-select-approved");
+				}
+			}
+		}
+	}
+}

src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java

@@ -6,6 +6,7 @@ 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 info.bukova.isspst.ui.renderers.RequirementsItemRenderer;
 
 import java.util.List;
 
@@ -20,6 +21,8 @@ public class RequirementSubpage<T extends RequirementBase> extends ListViewModel
 	@WireVariable
 	protected UserService userService;
 
+	protected RequirementsItemRenderer requirementsItemRenderer;
+
 	public List<User> getAllUsers()
 	{
 		return userService.getAll();
@@ -41,6 +44,7 @@ public class RequirementSubpage<T extends RequirementBase> extends ListViewModel
 	public void initRequirementSubpage()
 	{
 		this.bigDecimalConverter = new BigDecimalConverter();
+		this.requirementsItemRenderer = new RequirementsItemRenderer();
 	}
 
 	private RequirementBaseService<T> getReqService()
@@ -69,6 +73,16 @@ public class RequirementSubpage<T extends RequirementBase> extends ListViewModel
 		return false;
 	}
 
+	public RequirementsItemRenderer getRequirementsItemRenderer()
+	{
+		return requirementsItemRenderer;
+	}
+
+	public void setRequirementsItemRenderer(RequirementsItemRenderer requirementsItemRenderer)
+	{
+		this.requirementsItemRenderer = requirementsItemRenderer;
+	}
+
 	@Override
 	protected void afterSelect() {
 		BindUtils.postNotifyChange(null, null, this, "canApprove");

src/main/webapp/css/zk-modify.css

@@ -76,4 +76,16 @@
 
 .order-select-delivered {
 	background-color: #d19fe8 !important;
-}
+}
+
+.req-select-partially	{
+	background-color: #fffb90 !important;
+}
+
+.req-select-approved	{
+	background-color: #afffb5 !important;
+}
+
+.req-select-approved-project	{
+	background-color: #87cefa !important;
+}

src/main/webapp/main/orders/requirements/reqListMy.zul

@@ -1,5 +1,6 @@
 <listbox
 	vflex="1"
+	itemRenderer="@load(vm.requirementsItemRenderer)"
 	selectedItem="@bind(vm.dataBean)"
 	model="@load(vm.dataList)"
 	onAfterRender="@command('afterRender')"
@@ -144,7 +145,7 @@
 		</auxheader>
 	</auxhead>
 	<template name="model">
-		<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+		<listitem>
 			<listcell label="@load(each.project) @converter(vm.standardBoolConverter)" />
 			<listcell label="@load(each.numser)" />
 			<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />

src/main/webapp/main/orders/requirements/reqListMyAll.zul

@@ -2,6 +2,7 @@
 	<listbox
 		vflex="1"
 		hflex="7"
+		itemRenderer="@load(vm.requirementsItemRenderer)"
 		selectedItem="@bind(vm.dataBean)"
 		model="@load(vm.dataList)"
 		onAfterRender="@command('afterRender')"
@@ -171,7 +172,7 @@
 			</auxheader>
 		</auxhead>
 		<template name="model">
-			<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+			<listitem>
 				<listcell label="@load(each.project) @converter(vm.standardBoolConverter)" />
 				<listcell label="@load(each.numser)" />
 				<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />

src/main/webapp/main/orders/requirements/reqListMyCenters.zul

@@ -2,6 +2,7 @@
 	<listbox
 		vflex="1"
 		hflex="7"
+		itemRenderer="@load(vm.requirementsItemRenderer)"
 		selectedItem="@bind(vm.dataBean)"
 		model="@load(vm.dataList)"
 		onAfterRender="@command('afterRender')"
@@ -171,7 +172,7 @@
 			</auxheader>
 		</auxhead>
 		<template name="model">
-			<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+			<listitem>
 				<listcell label="@load(each.project) @converter(vm.standardBoolConverter)" />
 				<listcell label="@load(each.numser)" />
 				<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />

src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul

@@ -2,6 +2,7 @@
 	<listbox
 		vflex="1"
 		hflex="7"
+		itemRenderer="@load(vm.requirementsItemRenderer)"
 		selectedItem="@bind(vm.dataBean)"
 		model="@load(vm.dataList)"
 		onAfterRender="@command('afterRender')"
@@ -171,7 +172,7 @@
 			</auxheader>
 		</auxhead>
 		<template name="model">
-			<listitem style="@load((each.state eq 'PARTIALLY') ? 'background-color: #fffb90' : ((each.state eq 'APPROVED') ? 'background-color: #afffb5' : ''))">
+			<listitem>
 				<listcell label="@load(each.project) @converter(vm.standardBoolConverter)" />
 				<listcell label="@load(each.numser)" />
 				<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />