Release 12 (devel -> main)

See merge request W13R/drinks-manager!10
2022-08-06 17:01:24 +00:00 · 2022-08-06 17:01:24 +00:00 · b6b058f346
commit b6b058f346
parent 284c08d350 80b407069d
14 changed files with 101 additions and 36 deletions
--- a/application/app/admin.py
+++ b/application/app/admin.py
@ -45,10 +45,13 @@ class CustomUserAdmin(UserAdmin):

    fieldsets_ = list((*UserAdmin.fieldsets,))
    fieldsets_.insert(1, (
-            "Balance",
-            {"fields": ("balance", "allow_order_with_negative_balance")},
-        )
-    )
+        "Balance",
+        {"fields": ("balance", "allow_order_with_negative_balance")},
+    ))
+    fieldsets_.insert(2, (
+        "Profile Picture",
+        {"fields": ("profile_picture_filename",)},
+    ))
    fieldsets = tuple(fieldsets_)

    list_display = ["username", "balance", "is_active", "allow_order_with_negative_balance"]
--- a/application/app/models.py
+++ b/application/app/models.py
@ -20,6 +20,7 @@ class User(AbstractUser):

    balance = models.DecimalField(max_digits=8, decimal_places=2, default=0.00)
    allow_order_with_negative_balance = models.BooleanField(default=False)
+    profile_picture_filename = models.CharField(default="default.svg", max_length=25)

    def delete(self, *args, **kwargs):
        self.balance = 0
--- a/application/app/templates/deposit.html
+++ b/application/app/templates/deposit.html
@ -35,5 +35,6 @@
    </form>

    <script src="/static/js/deposit.js"></script>
+    <script src="/static/js/autoreload.js"></script>
   
 {% endblock %}
--- a/application/app/templates/history.html
+++ b/application/app/templates/history.html
@ -33,4 +33,6 @@
        {% translate "No history." %}
    {% endif %}

+    <script src="/static/js/autoreload.js"></script>
+        
 {% endblock %}
--- a/application/app/templates/index.html
+++ b/application/app/templates/index.html
@ -44,4 +44,6 @@
            
    {% endif %}

+    <script src="/static/js/autoreload.js"></script>
+
 {% endblock %}
--- a/application/app/templates/order.html
+++ b/application/app/templates/order.html
@ -97,4 +97,6 @@

    {% endif %}

+    <script src="/static/js/autoreload.js"></script>
+
 {% endblock %}
--- a/application/app/templates/registration/login.html
+++ b/application/app/templates/registration/login.html
@ -2,6 +2,7 @@
 {% extends "baseLayout.html" %}

 {% load i18n %}
+{% load static %}

 {% block title %}
    {% translate "Drinks - Login" %}
@ -68,19 +69,20 @@
        <ul class="userlist">
            {% for user_ in user_list %}
                <li class="userlistButton button" data-username="{{ user_.username }}">
+                    <img src="{% static 'profilepictures/'|add:user_.profile_picture_filename %}">
+                    <div>
+                        {% if user_.first_name %}

-                    {% if user_.first_name %}
+                            {% if user_.last_name %}
+                                {{ user_.last_name }},
+                            {% endif %}

-                        {% if user_.last_name %}
-                            {{ user_.last_name }},
+                            {{ user_.first_name }}
+
+                        {% else %}
+                            {{ user_.username }}
                        {% endif %}
-
-                        {{ user_.first_name }}
-
-                    {% else %}
-                        {{ user_.username }}
-                    {% endif %}
-
+                    </div>
                </li>
            {% endfor %}
        </ul>
--- a/application/app/templates/statistics.html
+++ b/application/app/templates/statistics.html
@ -146,4 +146,6 @@

    </div>

+    <script src="/static/js/autoreload.js"></script>
+
 {% endblock %}
--- a/application/app/templates/userPanel.html
+++ b/application/app/templates/userPanel.html
@ -1,18 +1,22 @@
 {% load i18n %}
+{% load static %}

 <div class="userPanel">
    <div class="userInfo">
-        {% if user.first_name != "" %}
-            {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
-        {% else %}
-            {% translate "User" %}: {{ user.username }}
-        {% endif %}
-        &nbsp;-&nbsp;
-        {% if user.balance < 0.01 %}
-            <span class="userBalanceWarn">{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
-        {% else %}
-            <span>{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
-        {% endif %}
+        <img src="{% static 'profilepictures/'|add:user.profile_picture_filename %}">
+        <span>
+            {% if user.first_name != "" %}
+                {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
+            {% else %}
+                {% translate "User" %}: {{ user.username }}
+            {% endif %}
+            &nbsp;-&nbsp;
+            {% if user.balance < 0.01 %}
+                <span class="userBalanceWarn">{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
+            {% else %}
+                <span>{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
+            {% endif %}
+        </span>
    </div>
    <div class="horizontalButtonList">
        <a class="button" id="navBarBtnHome" href="/">Home</a>
--- a/lib/env.sh
+++ b/lib/env.sh
@ -2,5 +2,5 @@

 export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt"
 export STATIC_FILES="$(pwd)/static/"
-export APP_VERSION="11"
+export APP_VERSION="12"
 export PYTHONPATH="$(pwd)/packages/"
--- a/static/css/login.css
+++ b/static/css/login.css
@ -25,14 +25,27 @@ main > h1 {
    justify-content: center;
    align-items: center;
 }
-.userlist li {
+.userlist > li {
    display: flex;
    width: 100%;
    align-items: center;
    justify-content: center;
-    padding: .8rem 1.1rem;
    margin-bottom: .5rem;
+    padding: 0 .5rem;
+}
+.userlist > li > img {
+    margin-right: auto;
+    margin-left: 0;
+    height: 2rem;
+    width: 2rem;
+}
+.userlist > li > div {
+    display: flex;
+    flex-grow: 1;
+    align-items: center;
+    justify-content: center;
    text-align: center;
+    padding: .8rem 1.1rem;
 }
 .userlistButton {
    font-size: 1.1rem;
@ -102,11 +115,6 @@ form .horizontalButtonList {
    .userlist {
        width: 100%;
    }
-    .userlist li {
-        width: 100%;
-        padding-left: 0;
-        padding-right: 0;
-    }
    .pinpad table tr td button {
        height: 4.2rem;
        width: 4.2rem;
--- a/static/css/main.css
+++ b/static/css/main.css
@ -67,10 +67,17 @@ main {
    align-items: center;
    margin-top: 1rem;
    font-size: 1rem;
-    width: 90%;
+    width: 94%;
 }
-.userInfo span {
+.userInfo > span {
    font-size: 1.1rem;
+    vertical-align: middle;
+}
+.userInfo > img {
+    vertical-align: middle;
+    width: 1.8rem;
+    height: 1.8rem;
+    margin: .5rem;
 }
 .userPanel > .horizontalButtonList {
    margin-left: auto;
--- a/static/js/autoreload.js
+++ b/static/js/autoreload.js
@ -0,0 +1,3 @@
+setInterval(() => {
+    location.reload();
+}, 1000*60*2); // reload after 2 minutes
--- a/static/profilepictures/default.svg
+++ b/static/profilepictures/default.svg
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <g
+     id="layer1">
+    <circle
+       style="fill:#808080;fill-opacity:1;stroke:#fffcfe;stroke-opacity:1"
+       id="path848"
+       cx="8"
+       cy="4.5"
+       r="2.5" />
+    <path
+       style="fill:#7f7f7f;fill-opacity:1;stroke:#fffcff;stroke-opacity:1"
+       id="path3433"
+       d="m -3,-13.499699 a 5,5 0 0 1 -2.5,4.3301274 5,5 0 0 1 -5,0 5,5 0 0 1 -2.5,-4.3301274 h 5 z"
+       transform="scale(-1)" />
+  </g>
+</svg>