From 7568bc4839d433c3c1a008015df2faa3a66cea73 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 4 Nov 2020 21:05:51 +0100
Subject: [PATCH] Settings dialog

Former-commit-id: 607853571677298ecbe95ae4b1849ff631302c93
---
 .../configuration/SettingsController.java     | 13 +++
 .../configuration/setting-not-found.xhtml     |  2 +-
 .../ui/admin/configuration/settings.xhtml     | 98 +++++++++++--------
 .../org/libreccm/ui/AdminBundle.properties    |  1 +
 .../org/libreccm/ui/AdminBundle_de.properties |  1 +
 5 files changed, 74 insertions(+), 41 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
index 402754aa5..bf7008af2 100644
--- a/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
+++ b/ccm-core/src/main/java/org/libreccm/ui/admin/configuration/SettingsController.java
@@ -109,7 +109,20 @@ public class SettingsController {
             .sorted()
             .collect(Collectors.toList());
 
+        models.put("configurationClass", configurationClass);
+        
         models.put("settings", settings);
+        
+        models.put("BigDecimalClassName", BigDecimal.class.getName());
+        models.put("BooleanClassName", Boolean.class.getName());
+        models.put("DoubleClassName", Double.class.getName());
+        models.put("FloatClassName", Float.class.getName());
+        models.put("IntegerClassName", Integer.class.getName());
+        models.put("ListClassName", List.class.getName());
+        models.put("LongClassName", Long.class.getName());
+        models.put("LocalizedStringClassName", LocalizedString.class.getName());
+        models.put("SetClassName", Set.class.getName());
+        models.put("StringClassName", String.class.getName());
 
         return "org/libreccm/ui/admin/configuration/settings.xhtml";
     }
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
index 99de853f0..a686c94f9 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/setting-not-found.xhtml
@@ -6,7 +6,7 @@
     <ui:composition template="/WEB-INF/views/org/libreccm/ui/admin/ccm-admin.xhtml">
         <ui:param name="activePage" value="configuration" />
         <ui:param name="title"
-                  value="#{AdminMessages('configuration.setting.not_found.title')}" />
+                  value="#{AdminMessages['configuration.setting.not_found.title']}" />
 
         <ui:define name="breadcrumb">
             <ui:define name="breadcrumb">
diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index 0e707a1b9..6687c1488 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -132,7 +132,9 @@
                                          id="setting-#{setting.name}-edit-dialog"
                                          tabindex="-1">
                                         <div class="modal-dialog">
-                                            <div class="modal-content">
+                                            <form action="#{mvc.uri('SettingsController#updateSettingValue', {'configurationClass': configurationClass, 'settingName': setting.name})}"
+                                                  class="modal-content"
+                                                  method="post">
                                                 <div class="modal-header">
                                                     <h2 class="model-title"
                                                         id="setting-#{setting.name}-edit-dialog">
@@ -144,42 +146,59 @@
                                                             type="button"><span aria-hidden="true">&times;</span></button>
                                                 </div>
                                                 <div class="modal-body">
-                                                    <form action="#">
-                                                        <c:choose>
-                                                            <c:when test="#{setting.valueType == BigDecimal.class.getName()}">
-                                                                <pre>BigDecimal</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Boolean.class.getName()}">
-                                                                <pre>Boolean</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Double.class.getName()}">
-                                                                <pre>Double</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Integer.class.getName()}">
-                                                                <pre>Integer</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == "int"}">
-                                                                <pre>int</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == List.class.getName()}">
-                                                                <pre>List</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == org.libreccm.l10n.LocalizedString.class.getName()}">
-                                                                <pre>LocalizedString</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == Set.class.getName()}">
-                                                                <pre>Set</pre>
-                                                            </c:when>
-                                                            <c:when test="#{setting.valueType == String.class.getName()}">
-                                                                <pre>String</pre>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <p>
-                                                                    #{AdminMessages.getMessage('configuration.settings.setting.dialog.unsupported_type', [setting.valueType])}
-                                                                </p>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </form>
+                                                    <c:choose>
+                                                        <c:when test="#{setting.valueType.equals(BigDecimalClassName)}">
+                                                            <pre>BigDecimal</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(BooleanClassName)}">
+                                                            <div class="form-group form-check">
+                                                                <input aria-describedby="#{setting.name}-setting-value-help"
+                                                                       class="form-check-input"
+                                                                       id="#{setting.name}-setting-value"
+                                                                       name="settingValue"
+                                                                       type="checkbox" />
+                                                                <label class="form-check-label"
+                                                                       for="#{setting.name}-setting-value">
+                                                                    #{AdminMessages['configuration.settings.setting.dialog.value.label']}
+                                                                </label>
+                                                                <small class="form-text text-muted"
+                                                                       id="#{setting.name}-setting-value-help">
+                                                                    #{setting.description}
+                                                                </small>
+                                                            </div>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(DoubleClassName)}">
+                                                            <pre>Double</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(IntegerClassName)}">
+                                                            <pre>Integer</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals('int')}">
+                                                            <pre>int</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(ListClassName)}">
+                                                            <pre>List</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(LocalizedStringClassName)}">
+                                                            <pre>LocalizedString</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(SetClassName)}">
+                                                            <pre>Set</pre>
+                                                        </c:when>
+                                                        <c:when test="#{setting.valueType.equals(StringClassName)}">
+                                                            <pre>String</pre>
+                                                        </c:when>
+                                                        <c:otherwise>
+                                                            <p>
+                                                                #{AdminMessages.getMessage('configuration.settings.setting.dialog.unsupported_type', [setting.valueType])}
+                                                            </p>
+                                                            <pre>
+                                                                    setting.valueType: #{setting.valueType}
+                                                                    Boolean: #{BooleanClassName}
+                                                                    LocalizedString: #{LocalizedStringClassName}
+                                                            </pre>
+                                                        </c:otherwise>
+                                                    </c:choose>
                                                 </div>
                                                 <div class="modal-footer">
                                                     <button class="btn btn-danger"
@@ -188,12 +207,11 @@
                                                         #{AdminMessages['configuration.settings.setting.dialog.close']}
                                                     </button>
                                                     <button class="btn btn-success" 
-                                                            data-dismiss="modal"
-                                                            type="button">
+                                                            type="submit">
                                                         #{AdminMessages['configuration.settings.setting.dialog.save']}
                                                     </button>
                                                 </div>
-                                            </div>
+                                            </form>
                                         </div>
                                     </div>
                                 </td>
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index fb8049b67..151739c4b 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -233,3 +233,4 @@ configuration.setting.invalid_type.title=Invalid type of value
 configuration.setting.invalid_type.message=Setting {1} of configuration class {0} is of type {2} but the value {3} can be converted into this type
 configuration.setting.not_found.title=Setting not found
 configuration.setting.not_found.message=Setting {1} of type {2} not found in configuration class {0}
+configuration.settings.setting.dialog.value.label=Value
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index 60400040e..c23c2fb8c 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -233,3 +233,4 @@ configuration.setting.invalid_type.title=Invalid type of value
 configuration.setting.invalid_type.message=Einstellung {1} der Konfigurations-Klasse {0} ist vom Typ {2}, der angegebene Wert {3} kann aber nicht in diesen Typ konvertiert werden
 configuration.setting.not_found.title=Einstellung nicht gefunden
 configuration.setting.not_found.message=Keine Einstellung {1} vom Typ {3} in Konfiguration {0} gefunden
+configuration.settings.setting.dialog.value.label=Wert