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

Conflicts:
	src/main/java/info/bukova/isspst/services/approved/OrderServiceImpl.java

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -142,6 +142,10 @@ Centres=Střediska
 OfferSelectedOnly=Nabízet pouze vybraná střediska
 Select=Vybrat
 OfferedCentres=Nabízená střediska
+LimitExceeded=Požadavek nelze uložit z důvodu překročení limitu komise.
+Spent=Vyčerpáno:
+WorkgroupLimits=Limity komisí
+RequirementsDisabled=Vkládání požadavků je administrátorem zakázáno
 
 Number=Číslo: 
 Prefix=Prefix: 

src/main/webapp/app/info.zul

@@ -40,29 +40,62 @@
 					</template>
 				</hbox>
 			</groupbox>
-			<groupbox
-				vflex="1"
-				mold="3d">
-				<caption
-					image="/img/commission-small.png"
-					label="${labels.WorkgroupMembership}" />
-				<hbox children="@load(vm.workgroups)">
-					<template name="children">
-						<listbox model="@load(vm.groupRoles[each])">
-							<listhead>
-								<listheader label="@load(each.fullName)" />
-							</listhead>
-							<template
-								name="model"
-								var="role">
+			<hbox vflex="1" hflex="1">
+				<groupbox
+					vflex="1"
+					hflex="1"
+					mold="3d">
+					<caption
+						image="/img/commission-small.png"
+						label="${labels.WorkgroupMembership}" />
+					<vbox
+						sclass="addScrollbar" 
+						children="@load(vm.workgroups)">
+						<template name="children">
+							<listbox model="@load(vm.groupRoles[each])">
+								<listhead>
+									<listheader label="@load(each.fullName)" />
+								</listhead>
+								<template
+									name="model"
+									var="role">
+									<listitem>
+										<listcell label="@load(role.description)" />
+									</listitem>
+								</template>
+							</listbox>
+						</template>
+					</vbox>
+				</groupbox>
+				<groupbox
+					vflex="1"
+					hflex="1"
+					mold="3d">
+					<caption
+						image="/img/money-small.png"
+						label="${labels.WorkgroupLimits}" />
+					<vbox
+						sclass="addScrollbar" 
+						children="@load(vm.workgroups)">
+						<template name="children">
+							<listbox>
+								<listhead>
+									<listheader label="@load(each.fullName)"/>
+									<listheader/>
+								</listhead>
 								<listitem>
-									<listcell label="@load(role.description)" />
+									<listcell label="${labels.Limit}"/>
+									<listcell label="@load(each.limit) @converter(vm.standardBigDecimalConverter)"/>
 								</listitem>
-							</template>
-						</listbox>
-					</template>
-				</hbox>
-			</groupbox>
+								<listitem>
+									<listcell label="${labels.Spent}"/>
+									<listcell label="@load(vm.workgroupSpent[each]) @converter(vm.standardBigDecimalConverter)"/>
+								</listitem>
+							</listbox>
+						</template>
+					</vbox>
+				</groupbox>
+			</hbox>
 		</vbox>
 	</window>
 </zk>