Merge remote-tracking branch 'origin/master'

Evolveum · May 30, 2022 · 886d79a · 886d79a
2 parents 5f7f3e4 + 82d4e20
commit 886d79a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CatalogTilePanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CatalogTilePanel.java
@@ -40,6 +40,7 @@ public CatalogTilePanel(String id, IModel<CatalogTile> model) {
     private void initLayout() {
         add(AttributeAppender.append("class", "catalog-tile-panel d-flex flex-column align-items-center bordered p-4"));
         add(AttributeAppender.append("class", () -> getModelObject().isSelected() ? "active" : null));
+        setOutputMarkupId(true);
 
         WebMarkupContainer logo = new WebMarkupContainer(ID_LOGO);
         logo.add(AttributeAppender.append("class", () -> getModelObject().getLogo()));
@@ -69,7 +70,7 @@ protected void onEvent(AjaxRequestTarget target) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-
+                CatalogTilePanel.this.onAdd(target);
             }
         };
         add(add);
@@ -78,13 +79,22 @@ public void onClick(AjaxRequestTarget target) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-
+                CatalogTilePanel.this.onDetails(target);
             }
         };
         add(details);
     }
 
-    protected void onClick(AjaxRequestTarget target) {
+    protected void onAdd(AjaxRequestTarget target) {
+
+    }
 
+    protected void onDetails(AjaxRequestTarget target) {
+
+    }
+
+    protected void onClick(AjaxRequestTarget target) {
+        getModelObject().toggle();
+        target.add(this);
     }
 }
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
@@ -16,29 +16,29 @@
                 <div class="card-header">
                     <h3 class="card-title">
                         <i class="fas fa-cash-register mr-1"></i>
-                        Checkout
+                        <wicket:message key="ShoppingCartPanel.checkout"/>
                     </h3>
                 </div>
                 <div class="card-body d-flex flex-column gap-2">
                     <label class="mb-0">
-                        Validity
+                        <wicket:message key="ShoppingCartPanel.validity"/>
                         <i class="fas fa-info-circle fa-xs text-primary"></i>
                     </label>
                     <select class="form-control">
-
+                        <!-- todo -->
                     </select>
                     <label class="mb-0">
-                        Comment
+                        <wicket:message key="ShoppingCartPanel.comment"/>
                         <i class="fas fa-info-circle fa-xs text-primary"></i>
                     </label>
                     <textarea class="form-control" rows="4"></textarea>
                     <a class="btn btn-danger">
                         <i class="fas fa-triangle-exclamation mr-1"></i>
-                        Open conflict solver
+                        <wicket:message key="ShoppingCartPanel.openConflict"/>
                     </a>
                     <a class="btn btn-success">
                         <i class="fas fa-credit-card mr-1"></i>
-                        Submit my request
+                        <wicket:message key="ShoppingCartPanel.submit"/>
                     </a>
                 </div>
             </div>
@@ -49,25 +49,25 @@ <h3 class="card-title">
 <wicket:fragment wicket:id="tableHeaderFragment">
     <h3 class="card-title">
         <i class="fa-solid fa-cart-shopping mr-1"></i>
-        Items in cart
+        <wicket:message key="ShoppingCartPanel.tableHeader"/>
     </h3>
 </wicket:fragment>
 
 <wicket:fragment wicket:id="tableFooterFragment">
     <a class="btn btn-outline-primary" wicket:id="clearCart">
         <i class="fa-solid fa-recycle mr-1"></i>
-        Clear the shopping cart
+        <wicket:message key="ShoppingCartPanel.clearCart"/>
     </a>
 </wicket:fragment>
 
 <wicket:fragment wicket:id="tableButtonColumn">
     <a class="btn btn-link" wicket:id="edit">
         <i class="fas fa-pen-to-square mr-1"></i>
-        Edit
+        <wicket:message key="ShoppingCartPanel.edit"/>
     </a>
     <a class="btn btn-link text-danger" wicket:id="remove">
         <i class="fas fa-trash-can mr-1"></i>
-        Remove
+        <wicket:message key="ShoppingCartPanel.remove"/>
     </a>
 </wicket:fragment>
 </html>
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/TilePanel.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/TilePanel.java
@@ -35,6 +35,7 @@ public TilePanel(String id, IModel<Tile> model) {
     private void initLayout() {
         add(AttributeAppender.append("class", "tile-panel d-flex flex-column align-items-center bg-white rounded p-3"));
         add(AttributeAppender.append("class", () -> getModelObject().isSelected() ? "active" : null));
+        setOutputMarkupId(true);
 
         WebMarkupContainer icon = new WebMarkupContainer(ID_ICON);
         icon.add(AttributeAppender.append("class", () -> getModelObject().getIcon()));
@@ -55,6 +56,7 @@ protected void onEvent(AjaxRequestTarget target) {
     }
 
     protected void onClick(AjaxRequestTarget target) {
-
+        getModelObject().toggle();
+        target.add(this);
     }
 }