request access ui, 3rd step (shopping cart UI), wip

Evolveum · May 27, 2022 · a700c3d · a700c3d
1 parent 2301c97
commit a700c3d
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 19 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -51,13 +51,18 @@
                     </li>
                 </wicket:enclosure>
                 <wicket:remove>
-                    <!-- todo waiting for proper implementation -->
-                    <li class="nav-item notification">
-                        <a class="nav-link">
-                            <i class="fas fa-bell"></i>
-                            <span class="badge badge-danger">1</span>
-                        </a>
-                    </li>
+                <li class="nav-item notification">
+                    <a class="nav-link">
+                        <i class="fas fa-cart-shopping"></i>
+                        <span class="badge badge-danger">1</span>
+                    </a>
+                </li>
+                <li class="nav-item notification">
+                    <a class="nav-link">
+                        <i class="fas fa-bell"></i>
+                        <span class="badge badge-danger">1</span>
+                    </a>
+                </li>
                 </wicket:remove>
                 <li class="nav-item dropdown">
                     <div wicket:id="locale"/>

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.html b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.html
@@ -19,7 +19,7 @@
             </div>
             <div wicket:id="menu"/>
         </div>
-        <div class="flex-grow-1">
+        <div class="d-flex flex-grow-1 flex-wrap gap-3">
             <wicket:container wicket:id="tiles">
                 <div wicket:id="tile"/>
             </wicket:container>

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
@@ -7,6 +7,7 @@
 
 package com.evolveum.midpoint.gui.impl.page.self.requestAccess;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.wicket.markup.html.list.ListItem;
@@ -50,11 +51,15 @@ private void initLayout() {
         DetailsMenuPanel menu = new DetailsMenuPanel(ID_MENU);
         add(menu);
 
-        CatalogTile t = new CatalogTile("fas fa-building", "Canteen");
-        t.setLogo("fas fa-utensils fa-2x");
-        t.setDescription("Grants you access to canteen services, coffee bar and vending machines");
+        List<CatalogTile> list = new ArrayList<>();
+        for (int i=0;i<10;i++) {
+            CatalogTile t = new CatalogTile("fas fa-building", "Canteen");
+            t.setLogo("fas fa-utensils fa-2x");
+            t.setDescription("Grants you access to canteen services, coffee bar and vending machines");
+            list.add(t);
+        }
 
-        IModel<List<CatalogTile>> model = Model.ofList(List.of(t));
+        IModel<List<CatalogTile>> model = Model.ofList(list);
 
         ListView<CatalogTile> tiles = new ListView<>(ID_TILES, model) {
 

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.html b/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.html
@@ -33,11 +33,11 @@ <h3 class="card-title">
                     </label>
                     <textarea class="form-control" rows="4"></textarea>
                     <a class="btn btn-danger">
-                        <i class="fas fa-triangle-exclamation"></i>
+                        <i class="fas fa-triangle-exclamation mr-1"></i>
                         Open conflict solver
                     </a>
                     <a class="btn btn-success">
-                        <i class="fas fa-credit-card"></i>
+                        <i class="fas fa-credit-card mr-1"></i>
                         Submit my request
                     </a>
                 </div>
@@ -46,20 +46,27 @@ <h3 class="card-title">
     </div>
 </wicket:panel>
 
+<wicket:fragment wicket:id="tableHeaderFragment">
+    <h3 class="card-title">
+        <i class="fa-solid fa-cart-shopping mr-1"></i>
+        Items in cart
+    </h3>
+</wicket:fragment>
+
 <wicket:fragment wicket:id="tableFooterFragment">
     <a class="btn btn-outline-primary" wicket:id="clearCart">
-        <i class="fa-solid fa-recycle"></i>
+        <i class="fa-solid fa-recycle mr-1"></i>
         Clear the shopping cart
     </a>
 </wicket:fragment>
 
 <wicket:fragment wicket:id="tableButtonColumn">
     <a class="btn btn-link" wicket:id="edit">
-        <i class="fas fa-pen-to-square"></i>
+        <i class="fas fa-pen-to-square mr-1"></i>
         Edit
     </a>
     <a class="btn btn-link text-danger" wicket:id="remove">
-        <i class="fas fa-trash-can"></i>
+        <i class="fas fa-trash-can mr-1"></i>
         Remove
     </a>
 </wicket:fragment>

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java b/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
@@ -32,6 +33,8 @@
 public class ShoppingCartPanel extends BasePanel implements WizardPanel {
 
     private static final String ID_TABLE = "table";
+
+    private static final String ID_TABLE_HEADER_FRAGMENT = "tableHeaderFragment";
     private static final String ID_TABLE_FOOTER_FRAGMENT = "tableFooterFragment";
     private static final String ID_TABLE_BUTTON_COLUMN = "tableButtonColumn";
     private static final String ID_CLEAR_CART = "clearCart";
@@ -72,6 +75,11 @@ public void onClick(AjaxRequestTarget target) {
 
                 return fragment;
             }
+
+            @Override
+            protected Component createHeader(String headerId) {
+                return new Fragment(headerId, ID_TABLE_HEADER_FRAGMENT, ShoppingCartPanel.this);
+            }
         };
         add(table);
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html
@@ -16,9 +16,9 @@
 </wicket:panel>
 
 <wicket:fragment wicket:id="pagingFooter">
-    <div class="d-flex justify-content-between">
+    <div class="d-flex justify-content-between align-items-center">
         <div class="d-flex" wicket:id="buttonToolbar"/>
-        <div class="d-flex" wicket:id="footerContainer">
+        <div class="d-flex align-items-center" wicket:id="footerContainer">
             <div class="mr-2">
                 <span class="align-middle" wicket:id="count"/>
             </div>