#2 Remove Filter anhand der PropertyId

SORMAS-Foundation · Jun 24, 2016 · c290959 · c290959
1 parent 4f57525
commit c290959
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/AbstractCaseView.java b/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/AbstractCaseView.java
@@ -2,7 +2,7 @@
 
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.CssLayout;
 
 import de.symeda.sormas.ui.surveillance.caze.CaseController;
 import de.symeda.sormas.ui.surveillance.caze.CaseDataView;
@@ -16,23 +16,24 @@ public abstract class AbstractCaseView extends AbstractView {
 
     protected CaseController viewLogic = ControllerProvider.getCaseController();
     public CaseEditMenu caseEditMenu;
-    protected HorizontalLayout caseEditLayout;
+    protected CssLayout caseEditLayout;
     protected String viewName;
 
 	private String caseUuid;
 
 
     protected AbstractCaseView(String viewName) {
-        setSizeFull();
+        setWidth("900px");
+        setMargin(true);
+        setSpacing(true);
         addStyleName("crud-view");
         this.viewName = viewName;
 
         caseEditMenu = new CaseEditMenu();
     	addComponent(caseEditMenu);
+    	setExpandRatio(caseEditMenu, 0);
 
-        caseEditLayout = new HorizontalLayout();
-        caseEditLayout.setMargin(true);
-        caseEditLayout.setSpacing(true);
+        caseEditLayout = new CssLayout();
         caseEditLayout.setSizeFull();
         addComponent(caseEditLayout);
     }

diff --git a/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/CaseEditMenu.java b/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/CaseEditMenu.java
@@ -8,7 +8,6 @@
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Case navigation menu presenting a list of available views to the user.
@@ -23,8 +22,10 @@ public class CaseEditMenu extends CssLayout {
     public CaseEditMenu() {
         menuItemsLayout = new HorizontalLayout();
         menuItemsLayout.setSpacing(true);
-        menuItemsLayout.setWidth("100%");
+        menuItemsLayout.setSizeUndefined();
         addComponent(menuItemsLayout);
+
+        setSizeUndefined();
 
     }
 
@@ -36,7 +37,7 @@ public void addView(final String name, String caption, String caseUuid) {
     	String target = name+(caseUuid!=null&&!caseUuid.isEmpty()?"/"+caseUuid:"");
 
     	Button button = new Button(caption, e -> SurveillanceUI.get().getNavigator().navigateTo(target));
-    	button.setPrimaryStyleName(ValoTheme.BUTTON_LINK);
+//    	button.setPrimaryStyleName(ValoTheme.BUTTON_LINK);
 
     	menuItemsLayout.addComponent(button);
     	viewButtons.put(name, button);
@@ -64,8 +65,6 @@ public void setActiveView(String viewName) {
         }
     }
 
-
-
     public void updateLinkTarget(String name, String uuid) {
     	removeAllClicklisteners(viewButtons.get(name));
     	viewButtons.get(name).addClickListener(e -> SurveillanceUI.get().getNavigator().navigateTo(name+"/"+uuid));

diff --git a/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/caze/CaseGrid.java b/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/caze/CaseGrid.java
@@ -64,34 +64,37 @@ public Class<String> getPresentationType() {
      *            string to look for
      */
     public void setFilter(String filterString) {
-    	removeAllFilter();
+    	getContainer().removeContainerFilters(CaseDataDto.PERSON);
+    	getContainer().removeContainerFilters(CaseDataDto.DESCRIPTION);
+//    	getContainer().removeContainerFilters(CaseDataDto.CASE_STATUS);
         if (filterString.length() > 0) {
             SimpleStringFilter nameFilter = new SimpleStringFilter(
             		CaseDataDto.PERSON, filterString, true, false);
             SimpleStringFilter descFilter = new SimpleStringFilter(
             		CaseDataDto.DESCRIPTION, filterString, true, false);
-            SimpleStringFilter statusFilter = new SimpleStringFilter(
-            		CaseDataDto.CASE_STATUS, filterString, true, false);
+//            SimpleStringFilter statusFilter = new SimpleStringFilter(
+//            		CaseDataDto.CASE_STATUS, filterString, true, false);
             getContainer().addContainerFilter(
-                    new Or(nameFilter, descFilter, statusFilter));
+//            new Or(nameFilter, descFilter, statusFilter));
+            new Or(nameFilter, descFilter));
         }
 
     }
 
     public void setFilter(CaseStatus statusToFilter) {
-    	removeAllFilter();
+    	removeAllStatusFilter();
     	Equal filter = new Equal(CaseDataDto.CASE_STATUS, statusToFilter);  
         getContainer().addContainerFilter(filter);
     }
 
     public void setFilter(Disease disease) {
-    	removeAllFilter();
+    	getContainer().removeContainerFilters(CaseDataDto.DISEASE);
     	Equal filter = new Equal(CaseDataDto.DISEASE, disease);  
         getContainer().addContainerFilter(filter);
 	}
 
-    public void removeAllFilter() {
-    	getContainer().removeAllContainerFilters();
+    public void removeAllStatusFilter() {
+    	getContainer().removeContainerFilters(CaseDataDto.CASE_STATUS);
     }
 
     @SuppressWarnings("unchecked")

diff --git a/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/caze/CasesView.java b/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/surveillance/caze/CasesView.java
@@ -66,7 +66,7 @@ public HorizontalLayout createTopBar() {
     	topLayout.setSpacing(true);
     	topLayout.setWidth("100%");
 
-    	Button statusAll = new Button("all", e -> grid.removeAllFilter());
+    	Button statusAll = new Button("all", e -> grid.removeAllStatusFilter());
         statusAll.setStyleName(ValoTheme.BUTTON_LINK);
         topLayout.addComponent(statusAll);
 

diff --git a/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractView.java b/sormas-surveillance-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractView.java
@@ -2,11 +2,11 @@
 
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
-import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Notification.Type;
+import com.vaadin.ui.VerticalLayout;
 
-public abstract class AbstractView extends CssLayout implements View {
+public abstract class AbstractView extends VerticalLayout implements View {
 
 	private static final long serialVersionUID = -1L;