diff --git a/doc/release-notes.rst b/doc/release-notes.rst index 1dd1f08ced..a35b105001 100644 --- a/doc/release-notes.rst +++ b/doc/release-notes.rst @@ -6,6 +6,18 @@ Release notes This release is scheduled for end Februari 2024. You can already check out a `preview `_. +.. rubric:: User interface + +- | In the `preferences screen `_ + you can now reset your screen personalization. + | You can restart from a clean slate. Or you can inherit them from another user. + Or you can copy them from another scenario. + +.. rubric:: Odoo integration + +- | 15, 16, 17: The mapping of calendars now includes the odoo identifier. + | This is needed to guarantuee uniquess of the calendars. + 8.4.0 (2024-01-19) ================== diff --git a/doc/user-interface/_images/user-preferences.png b/doc/user-interface/_images/user-preferences.png index e4e1cd3907..1d1827f3ca 100644 Binary files a/doc/user-interface/_images/user-preferences.png and b/doc/user-interface/_images/user-preferences.png differ diff --git a/doc/user-interface/getting-around/changing-password.rst b/doc/user-interface/getting-around/changing-password.rst index 3049fcfa75..1c09a8c64f 100644 --- a/doc/user-interface/getting-around/changing-password.rst +++ b/doc/user-interface/getting-around/changing-password.rst @@ -2,10 +2,13 @@ Changing your password ====================== -From the top right of the screen "My Preferences" or from the menu bar a screen can be opened where you can change your password. +You can change your password from the login screen, or from the preferences +screen that show when you click your user name in the top right corner of +the screen. -Users often choose poor passwords. -We enforce a certain validation rules for passwords: +An administrator can use the user administration screen to change passwords as well. + +Users often choose poor passwords. We enforce the following validation rules for passwords: * Passwords need to be at least 8 characters. @@ -15,7 +18,5 @@ We enforce a certain validation rules for passwords: * Password cannot be part of a list of commonly used passwords. -An administrator can use the user administration screen to change passwords as well. - .. image:: ../_images/change-password.png :alt: Change password diff --git a/doc/user-interface/getting-around/user-preferences.rst b/doc/user-interface/getting-around/user-preferences.rst index 59582c7a28..56e764ae38 100644 --- a/doc/user-interface/getting-around/user-preferences.rst +++ b/doc/user-interface/getting-around/user-preferences.rst @@ -23,11 +23,22 @@ For each user frePPle stores a number of personal settings and preferences. * | **Avatar**: | A small picture of yourself. - | The uploaded picture must 1) be square (ie same height and width), + | The uploaded picture must 1) be square (ie same height and width), 2) be in jpeg, png or gif format and 3) be smaller than 100kB. - + * | **Password**: | To change the password enter the current one and twice the new value. +* | **Reset personalization**: + | With the wrench icon every user can personalize the layout of each screen: + columns displayed, column ordering, column width, favorites, filters, ... + | With this option you can (re-)initialize these settings in different ways: + + * Erase all personalizations and restart from the default settings. + + * Inherit personalizations from another user. + + * Copy personalizations between scenarios. + .. image:: ../_images/user-preferences.png :alt: User preferences diff --git a/freppledb/common/templates/common/preferences.html b/freppledb/common/templates/common/preferences.html index 12e5000bb7..15ec6d09d9 100644 --- a/freppledb/common/templates/common/preferences.html +++ b/freppledb/common/templates/common/preferences.html @@ -28,6 +28,10 @@ $("#scenariobtn").text($(this).text()); $("#default_scenario").val($(this).prop('name')); }); + $("#ul_personalize li a").click(function() { + $("#btn_personalize").text($(this).text()); + $("#personalization").val($(this).prop('data-type') + '-' + $(this).prop('data-name')); + }); }); @@ -41,6 +45,13 @@

{{ title }}  

{% endif %} +
+ +
{% endblock %} {% block content %} @@ -50,50 +61,62 @@

{{ title }}   + {% if form.non_field_errors %}
{{ form.non_field_errors }}
{% endif %} -
-
+
+
{% if request.user.languageList|length > 2 %} -
-
- +
+
+
- + +
{% endif %} -
-
- +
+
+
- {% trans "Number of records per page" %}
{% if THEMES|length > 1 %}
-
- +
+
@@ -111,33 +134,42 @@

{{ title }}   {% endif %} {% if SCENARIOS|length > 1 %} -
-
- +
+
+
- + + +
{% endif %} -
-
- +
+
+
{% if request.user.avatar %} - {% else %} + {% else %} {% endif %}
{{ title }}  
-
-
- +
+
+
@@ -162,6 +198,32 @@

{{ title }}   {% endif %}

+ +
+
+ +
+
+
+ + +
+
+
+
diff --git a/freppledb/common/views.py b/freppledb/common/views.py index 9a42cc6798..be50b5a6a9 100644 --- a/freppledb/common/views.py +++ b/freppledb/common/views.py @@ -477,6 +477,10 @@ def preferences(request): "SCENARIOS": Scenario.objects.using(DEFAULT_DB_ALIAS) .filter(status="In use") .order_by("name"), + "USERS": User.objects.using(DEFAULT_DB_ALIAS) + .order_by("username") + .exclude(username=request.user.username) + .only("username"), }, )