V agendě Fakturace bylo rozchozeno filtrování podle žadatele.

Odkaz na nápovědu v toolbaru.
Zvýšen session timeout na 480 minut.
refs #182

src/main/java/info/bukova/isspst/filters/InvoicingFilter.java

@@ -4,6 +4,7 @@ import info.bukova.isspst.DateTimeUtils;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.Invoicing;
 import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
 
 import org.hamcrest.Description;
@@ -48,8 +49,9 @@ public class InvoicingFilter implements Filter<Invoicing>
 			boolean foundReqDate = DateTimeUtils.isEqualByDateForFilter(item.getRequirement().getReqDate(), condition.getRequirement().getReqDate());
 			boolean foundCenter = Workgroup.isEqualByWorkgroupForFilter(item.getRequirement().getCentre(), condition.getRequirement().getCentre());
 			boolean foundWorkgroup = Workgroup.isEqualByWorkgroupForFilter(item.getRequirement().getWorkgroup(), condition.getRequirement().getWorkgroup());
+			boolean foundUser = User.isEqualByUserForFilter(item.getRequirement().getOwnedBy(), condition.getRequirement().getOwnedBy());
 			boolean foundDescription = StringUtils.isEqualForFilter(item.getRequirement().getDescription(), condition.getRequirement().getDescription());
-			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundWorkgroup);
+			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundWorkgroup && foundUser);
 		}
 
 		@Factory

src/main/java/info/bukova/isspst/ui/main/approved/ApprovedList.java

@@ -85,7 +85,7 @@ public class ApprovedList extends ListViewModel<JoinedItem>
 
 	public List<User> getUsers()
 	{
-		return this.userService.getAll();
+		return this.userService.getUsersForCombo();
 	}
 
 	@Command

src/main/java/info/bukova/isspst/ui/main/invoicing/InvoicingList.java

@@ -3,9 +3,11 @@ package info.bukova.isspst.ui.main.invoicing;
 import java.util.List;
 
 import info.bukova.isspst.data.Invoicing;
+import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.filters.InvoicingFilter;
 import info.bukova.isspst.services.invoicing.InvoicingService;
+import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.ListViewModel;
 
@@ -18,6 +20,8 @@ public class InvoicingList extends ListViewModel<Invoicing> {
 	private InvoicingService invoicingService;
 	@WireVariable
 	private WorkgroupService workgroupService;
+	@WireVariable
+	private UserService userService;
 
 	@Init(superclass = true)
 	public void initInvoicing() {
@@ -45,4 +49,8 @@ public class InvoicingList extends ListViewModel<Invoicing> {
 		return workgroupService.getWorkgroups();
 	}
 	
+	public List<User> getUsers() {
+		return userService.getUsersForCombo();
+	}
+	
 }

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

@@ -358,3 +358,6 @@ WorkgroupFormCannotAddUser=Uživatele nelze přidat
 WorkgroupFormCannotAddWorkgroup=Komisi nelze přidat
 WorkgroupFormOrderLimit=Limit nákupů
 WorkgroupIsInWorkgroup=Komisi nelze smazat, protože je členem některého střediska
+
+GoogleDriveUrl=Odkaz na Google Drive
+Help=Pomoc

src/main/webapp/WEB-INF/web.xml

@@ -187,6 +187,10 @@
   		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
+	<session-config>
+      <session-timeout>480</session-timeout>
+  </session-config>
+	
 	<welcome-file-list>
 		<welcome-file>index.zul</welcome-file>
 		<welcome-file>index.zhtml</welcome-file>

src/main/webapp/app/mainMenu.zul

@@ -133,5 +133,8 @@
 					href="/j_spring_security_logout" />
 			</menupopup>
 		</menu>
+		<menuitem label="${labels.Help}" target="blank"
+          href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid"
+          tooltiptext="${labels.GoogleDriveUrl}" />
 	</menubar>
 </zk>

src/main/webapp/app/template.zhtml

@@ -51,6 +51,6 @@
 		<div id="mainData">
 			<u:include src="${gridZul}" />
 		</div>
-		<div id="footer"> Verze 1.0 </div>
+		<div id="footer"> Verze 1.3 </div>
 	</div>
 </html>

src/main/webapp/main/invoicing/invoicingGrid.zul

@@ -121,6 +121,27 @@
 						<div sclass="find-grid-img">
 							<image src="/img/funnel.png" />
 						</div>
+					</div>
+				</auxheader>
+				<auxheader>
+				  <div zclass="find-grid-cell">
+            <div sclass="find-grid-divtextbox">
+              <combobox
+                ctrlKeys="${labels.HandleComboKeyFilter}"
+                onCtrlKey="@command('handleComboKeyFilter', ctrl=self, keyEvent=event)"
+                onChange="@command('doFilter')"
+                width="100%"
+                selectedItem="@bind(vm.filterTemplate.requirement.ownedBy)"
+                model="@load(vm.users)"
+                readonly="true">
+                <template name="model">
+                  <comboitem label="@load(each.fullName)" />
+                </template>
+              </combobox>
+            </div>
+            <div sclass="find-grid-img">
+              <image src="/img/funnel.png" />
+            </div>
           </div>
 				</auxheader>
 				<auxheader>