in progress

Signed-off-by: Johnny Mariéthoz <[email protected]>
rero · Nov 20, 2024 · 79d3f9c · 79d3f9c
1 parent fa88227
commit 79d3f9c
Show file tree

Hide file tree

Showing 14 changed files with 182 additions and 166 deletions.
diff --git a/rero_ils/jsonschemas/common/countries-v0.0.1.json b/rero_ils/jsonschemas/common/countries-v0.0.1.json
@@ -381,6 +381,10 @@
     "widget": {
       "formlyConfig": {
         "props": {
+          "placeholder": "Select an option…",
+          "sort": true,
+          "sortOrder": "asc",
+          "filter": true,
           "itemCssClass": "col-lg-4",
           "options": [
             {
@@ -1887,4 +1891,4 @@
       }
     }
   }
-}
+}
diff --git a/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html b/rero_ils/modules/documents/templates/rero_ils/detailed_view_documents.html
@@ -369,7 +369,8 @@ <h3>
           <public-search-holdings
             documentpid="{{ record.pid }}"
             viewcode="{{ viewcode }}"
-          ></public-search-holdings>
+            class="rero-ils-ui"
+          />
         {% endif %}
         <!-- ILL REQUEST ON GLOBAL VIEW-->
         {% if holdings_count > 0 %}

diff --git a/rero_ils/modules/ill_requests/templates/rero_ils/ill_request_form.html b/rero_ils/modules/ill_requests/templates/rero_ils/ill_request_form.html
@@ -111,5 +111,4 @@ <h5 class="modal-title">{{ _('Document is available') }}</h5>
       </div>
     </div>
   </div>
-
 {%- endblock body %}
diff --git a/rero_ils/modules/patrons/templates/rero_ils/patron_profile.html b/rero_ils/modules/patrons/templates/rero_ils/patron_profile.html
@@ -18,13 +18,8 @@
 #}
 {% extends 'rero_ils/page.html' %}
 
-{%- block css %}
-{{ super() }}
-{{ node_assets('@rero/rero-ils-ui/dist/public-patron-profile', ['styles.*css'], 'css') }}
-{%- endblock css %}
-
 {%- block body %}
-<public-patron-profile language="{{ current_i18n.locale.language[:2] }}" viewcode="{{ viewcode }}"></public-patron-profile>
+<public-patron-profile language="{{ current_i18n.locale.language[:2] }}" viewcode="{{ viewcode }}" class="rero-ils-ui"/>
 {%- endblock body %}
 
 {%- block javascript %}

diff --git a/rero_ils/modules/patrons/views.py b/rero_ils/modules/patrons/views.py
@@ -237,10 +237,10 @@ def get_messages(patron_pid):
     for note in patron.get("notes", []):
         if note.get("type") == "public_note":
             messages.append({"type": "warning", "content": note.get("content")})
-    bootstrap_alert_mapping = {"error": "danger"}
+    prime_alert_mapping = {"warning": "warn"}
     for message in messages:
         msg_type = message["type"]
-        message["type"] = bootstrap_alert_mapping.get(msg_type, msg_type)
+        message["type"] = prime_alert_mapping.get(msg_type, msg_type)
     return jsonify(messages)
 
 

diff --git a/rero_ils/modules/users/jsonschemas/users/user-v0.0.1.json b/rero_ils/modules/users/jsonschemas/users/user-v0.0.1.json
@@ -77,6 +77,7 @@
     },
     "gender": {
       "title": "Gender",
+      "type": "string",
       "enum": [
         "male",
         "female",
@@ -86,15 +87,16 @@
       "widget": {
         "formlyConfig": {
           "props": {
+            "placeholder": "Select an option…",
             "options": [
-              {
-                "label": "male",
-                "value": "male"
-              },
               {
                 "label": "female",
                 "value": "female"
               },
+              {
+                "label": "male",
+                "value": "male"
+              },
               {
                 "label": "other",
                 "value": "other"
@@ -294,4 +296,4 @@
       }
     }
   }
-}
+}
diff --git a/rero_ils/modules/users/templates/rero_ils/user_password.html b/rero_ils/modules/users/templates/rero_ils/user_password.html
@@ -20,7 +20,7 @@
 
 {%- block body %}
 <h1 class="mt-2">{{ _('Change password') }}</h1>
-<public-user-password-change referer="{{ request.referrer }}"></public-user-password-change>
+<public-user-password-change referer="{{ request.referrer }}" class="rero-ils-ui" />
 {%- endblock body %}
 
 {%- block javascript %}

diff --git a/rero_ils/modules/users/templates/rero_ils/user_profile.html b/rero_ils/modules/users/templates/rero_ils/user_profile.html
@@ -20,7 +20,7 @@
 
 {%- block body %}
 <h1 class="mt-2">{{ _('Profile') }}</h1>
-<public-user-profile-edit referer="{{ request.referrer }}"></public-user-profile-edit>
+<public-user-profile-edit referer="{{ request.referrer }}" class="rero-ils-ui"/>
 {%- endblock body %}
 
 {%- block javascript %}
-Original file line number
+Diff line change
@@ Expand Up @@
           </div>
         </div>
       </div>
     {%- endblock body %}