assignment tab feature (switch types button), not finished

Evolveum · Nov 19, 2018 · 499afd8 · 499afd8
1 parent 9c8e132
commit 499afd8
Show file tree

Hide file tree

Showing 14 changed files with 496 additions and 499 deletions.
diff --git a/.../com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.java b/.../com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.java
@@ -26,7 +26,6 @@
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.assignment.AssignmentPanel;
 import com.evolveum.midpoint.web.component.form.Form;
 import com.evolveum.midpoint.web.component.prism.ItemVisibility;
 import com.evolveum.midpoint.web.component.prism.ItemWrapper;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/session/ObjectTabStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/session/ObjectTabStorage.java
@@ -19,14 +19,18 @@
 import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.web.session.PageStorage;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+
+import javax.xml.namespace.QName;
 
 /**
  * @author skublik
  */
 public class ObjectTabStorage implements PageStorage{
 
 	private static final long serialVersionUID = 1L;
-
+
+	private QName type = null;
 	private ObjectPaging objectPaging;
 
 
@@ -49,6 +53,14 @@ public void setPaging(ObjectPaging objectPaging) {
         this.objectPaging = objectPaging;
     }
 
+    public QName getType() {
+        return type;
+    }
+
+    public void setType(QName type) {
+        this.type = type;
+    }
+
     @Override
     public String debugDump() {
         return debugDump(0);

diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html b/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java b/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.html b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.html
@@ -15,13 +15,28 @@
   -->
 
 <!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
+<html xmlns:wicket="http://wicket.apache.org" xmlns:div="http://wicket.apache.org">
 	<wicket:panel>
+		<div wicket:id="typeSwitchPanel" class="btn-group">
+			<div wicket:id="typeLink" class="btn btn-default" />
+		</div>
 		<div wicket:id="assignments"/>
-		<wicket:fragment wicket:id="searchFragment">
-    	</wicket:fragment>
-    	<wicket:fragment wicket:id="specificContainersFragment">
-    		<div wicket:id="activationPanel" />
-    	</wicket:fragment>
+		<wicket:child />
+
+		<wicket:fragment wicket:id="specificContainersFragment">
+			<div class="top-level-prism-container" wicket:id="activationPanel" />
+			<div class="top-level-prism-container" wicket:id="specificContainers" />
+		</wicket:fragment>
+
+		<wicket:fragment wicket:id="buttonToolbarFragment">
+			<div wicket:id="newItemButton" />
+			<div class="btn btn-default btn-sm" wicket:id="showAllAssignmentsButton" />
+		</wicket:fragment>
+
+		<!--<wicket:fragment wicket:id="searchFragment">-->
+    	<!--</wicket:fragment>-->
+    	<!--<wicket:fragment wicket:id="specificContainersFragment">-->
+    		<!--<div wicket:id="activationPanel" />-->
+    	<!--</wicket:fragment>-->
 	</wicket:panel>
 </html>