From ec7672816aea8c5323ac3b2774f503bacf1bcbc4 Mon Sep 17 00:00:00 2001
From: W13R <9070224-W13R@users.noreply.gitlab.com>
Date: Tue, 24 May 2022 18:49:04 +0200
Subject: [PATCH 1/6] rename the field 'binary_availability' to 'do_not_count'
 in model Drink

---
 application/app/admin.py             | 2 +-
 application/app/forms.py             | 2 +-
 application/app/models.py            | 9 +++++----
 application/app/templates/index.html | 2 +-
 application/app/templates/order.html | 4 ++--
 application/app/views.py             | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/application/app/admin.py b/application/app/admin.py
index c3b7b20..66b072a 100644
--- a/application/app/admin.py
+++ b/application/app/admin.py
@@ -66,7 +66,7 @@ class CustomDrinkAdmin(admin.ModelAdmin):
 
     model = Drink
     form = CustomDrinkForm
-    list_display = ["product_name", "content_litres", "price", "available", "binary_availability", "deleted"]
+    list_display = ["product_name", "content_litres", "price", "available", "do_not_count", "deleted"]
 
 adminSite.register(Drink, CustomDrinkAdmin)
 
diff --git a/application/app/forms.py b/application/app/forms.py
index 6f14d23..6dc4900 100644
--- a/application/app/forms.py
+++ b/application/app/forms.py
@@ -26,7 +26,7 @@ class CustomDrinkForm(forms.ModelForm):
 
     class Meta:
         model = Drink
-        fields = ("product_name", "content_litres", "price", "binary_availability", "available", "deleted")
+        fields = ("product_name", "content_litres", "price", "do_not_count", "available", "deleted")
 
 
 class CustomRegisterTransactionForm(forms.ModelForm):
diff --git a/application/app/models.py b/application/app/models.py
index 2e544dc..95692b0 100644
--- a/application/app/models.py
+++ b/application/app/models.py
@@ -41,10 +41,11 @@ class Drink(models.Model):
     available = models.PositiveIntegerField(default=0)
     deleted = models.BooleanField(default=False)
 
-    # when the following field is true:
+    # when the following field is true, the amount of drinks will
+    # not change and will not be displayed.
     # available > 0 -> there is a indefinetly amount of drinks left
     # available < 1 -> there are no drinks left
-    binary_availability = models.BooleanField(default=False)
+    do_not_count = models.BooleanField(default=False)
 
     def delete(self, *args, **kwargs):
         self.deleted = True
@@ -123,7 +124,7 @@ class Order(models.Model):
     def save(self, *args, **kwargs):
         drink = Drink.objects.get(pk=self.drink.pk)
         if self._state.adding and drink.available > 0:
-            if not drink.binary_availability:
+            if not drink.do_not_count:
                 drink.available -= self.amount
                 drink.save()
             self.product_name = drink.product_name
@@ -139,7 +140,7 @@ class Order(models.Model):
         self.user.balance += self.price_sum
         self.user.save()
         drink = Drink.objects.get(pk=self.drink.pk)
-        if not drink.binary_availability:
+        if not drink.do_not_count:
             drink.available += self.amount
             drink.save()
         super().delete(*args, **kwargs)
diff --git a/application/app/templates/index.html b/application/app/templates/index.html
index d8d8b71..c639390 100644
--- a/application/app/templates/index.html
+++ b/application/app/templates/index.html
@@ -20,7 +20,7 @@
 
         <ul class="availableDrinksList">
             {% for drink in available_drinks %}
-                {% if drink.binary_availability %}
+                {% if drink.do_not_count %}
                     <li>
                         <a class="button" href="/order/{{ drink.id }}">
                             <span>{{ drink }}</span>
diff --git a/application/app/templates/order.html b/application/app/templates/order.html
index 3c99638..b4f2263 100644
--- a/application/app/templates/order.html
+++ b/application/app/templates/order.html
@@ -35,7 +35,7 @@
                     <div class="column" id="pricePerDrink" data-drink-price="{% localize off %}{{ drink.price }}{% endlocalize %}">{{ drink.price }}</div>
                 </div>
 
-                {% if not drink.binary_availability %}
+                {% if not drink.do_not_count %}
                 <div class="row">
                     <div class="column">{% translate "Available" %}:</div>
                     <div class="column">{{ drink.available }}</div>
@@ -47,7 +47,7 @@
                     <div class="column">
                         <span class="customNumberInput">
                             <button type="button" class="customNumberInput-minus" id="numberOfDrinksBtnA">-</button>
-                            {% if drink.binary_availability %}
+                            {% if drink.do_not_count %}
                             <input type="number" class="customNumberInputField" name="numberOfDrinks" id="numberOfDrinks"
                                 min="1" max="100" value="1">
                             {% else %}
diff --git a/application/app/views.py b/application/app/views.py
index 7e153be..152d8bd 100644
--- a/application/app/views.py
+++ b/application/app/views.py
@@ -126,7 +126,7 @@ def api_order_drink(request):
 
             drink = Drink.objects.get(pk=drinkID)
 
-            if ((drink.binary_availability and drink.available > 0) or (drink.available >= amount)) and not drink.deleted:
+            if ((drink.do_not_count and drink.available > 0) or (drink.available >= amount)) and not drink.deleted:
                 Order.objects.create(drink=drink, user=user, amount=amount)
                 return HttpResponse("success", status=200)
             else:
-- 
2.43.0


From 537818fc275cbf8d7f8d3d3cd1550244c7ac5958 Mon Sep 17 00:00:00 2001
From: W13R <9070224-W13R@users.noreply.gitlab.com>
Date: Tue, 24 May 2022 18:57:17 +0200
Subject: [PATCH 2/6] Added 'admin panel' userpanel menu entry for staff
 accounts

---
 application/app/templates/userPanel.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/app/templates/userPanel.html b/application/app/templates/userPanel.html
index 2ec16c2..4d0bba3 100644
--- a/application/app/templates/userPanel.html
+++ b/application/app/templates/userPanel.html
@@ -24,11 +24,10 @@
             <div class="dropDownList">
                 <a class="button dropDownChoice" id="navBarBtnHistory" href="/history">{% translate "History" %}</a>
                 <a class="button dropDownChoice" id="navBarBtnStatistics" href="/statistics">{% translate "Statistics" %}</a>
-                {% if user.is_superuser %}
+                {% if user.is_superuser or user.is_staff %}
                     <a class="button dropDownChoice" href="/admin/">Admin Panel</a>
-                {% else %}
-                    <a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
                 {% endif %}
+                <a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
                 <a class="button dropDownChoice" href="/accounts/logout">{% translate "Logout" %}</a>
             </div>
         </div>
-- 
2.43.0


From 22382eef6e126d92c02be8abd9172ab22abc8201 Mon Sep 17 00:00:00 2001
From: W13R <9070224-W13R@users.noreply.gitlab.com>
Date: Tue, 24 May 2022 20:28:16 +0200
Subject: [PATCH 3/6] Added NaN-checks for the number input on the order page
 to fix some weird behaviour

---
 static/js/order.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/static/js/order.js b/static/js/order.js
index d7f0f86..8451e8c 100644
--- a/static/js/order.js
+++ b/static/js/order.js
@@ -21,6 +21,9 @@ document.addEventListener("DOMContentLoaded", () => {
         setTimeout(() => {
 
             let number_of_drinks = parseFloat(order_number_of_drinks_input.value);
+            if (isNaN(number_of_drinks)) {
+                number_of_drinks = 1;
+            }
             let calculated_sum = order_price_per_drink * number_of_drinks;
             order_sum_element.innerText = new Intl.NumberFormat(undefined, {minimumFractionDigits: 2}).format(calculated_sum);
 
@@ -41,6 +44,10 @@ document.addEventListener("DOMContentLoaded", () => {
 
         event.preventDefault(); // Don't do the default submit action!
 
+        if (isNaN(parseFloat(order_number_of_drinks_input.value))) {
+            order_number_of_drinks_input.value = 1;
+        }
+
         let xhr = new XMLHttpRequest();
         let formData = new FormData(order_form);
 
-- 
2.43.0


From 95d37dbc3d73a85eaa44c25989b6f67a5cc37d3d Mon Sep 17 00:00:00 2001
From: W13R <9070224-W13R@users.noreply.gitlab.com>
Date: Tue, 24 May 2022 20:30:44 +0200
Subject: [PATCH 4/6] Remove the paragraph about versioning from the README

---
 README.md | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index e557514..d84db1e 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ You have to bring your own PostgreSQL Database though.
 
 ## Setup, Installation, Updating and Dependencies
 
-see [Setup](docs/Setup.md)
+You can find the latest releases [here](https://gitlab.com/W13R/drinks-manager/-/releases), but for Installation/Updating, you should consider using Git.  
+For more information see [Setup](docs/Setup.md).
 
 
 ## Configuration
@@ -28,17 +29,3 @@ see [Configuration](docs/Configuration.md)
 After setup, run ```./run.sh help``` to see a help text.  
 Start the production server with ```./run.sh server```. You can ignore the error message about the "lifespan error".
 For more commands, see [Commands](docs/Commands.md).
-
-
-## Versions
-
-You can find the latest releases [here](https://gitlab.com/W13R/drinks-manager/-/releases).
-For Installation/Updating, you should consider using git,
-though (for more information see [Setup](docs/Setup.md)).
-
-The releases are versioned after the following scheme:
-
-`MAJOR`.`MINOR`
-
-- `MAJOR`: may include **breaking changes** and/or significant new features
-- `MINOR`: will only include bugfixes and smaller, **non-breaking changes**
-- 
2.43.0


From 9f965b8119a73982a036ded57684fae24533729c Mon Sep 17 00:00:00 2001
From: W13R <9070224-W13R@users.noreply.gitlab.com>
Date: Tue, 24 May 2022 20:49:18 +0200
Subject: [PATCH 5/6] Rearranged statistics page

---
 application/app/templates/statistics.html | 42 ++++-------------------
 static/css/statistics.css                 | 10 ++----
 static/js/statistics.js                   | 42 -----------------------
 3 files changed, 8 insertions(+), 86 deletions(-)
 delete mode 100644 static/js/statistics.js

diff --git a/application/app/templates/statistics.html b/application/app/templates/statistics.html
index 967fb1a..9d26016 100644
--- a/application/app/templates/statistics.html
+++ b/application/app/templates/statistics.html
@@ -20,37 +20,9 @@
 
     <div class="mainContainer">
 
-        <div class="dropDownMenu" id="statisticsDropDownMenu">
-            <button class="dropDownButton" id="statisticsDropDownMenuButton">
-                <div>
-                    {% translate "Choose" %}
-                </div>
-            </button>
-            <div class="dropDownList">
-                <button class="sChoice dropDownChoice" data-statistics_div="noyopd">
-                    {% translate "Your orders per drink" %}
-                </button>
-                <button class="sChoice dropDownChoice" data-statistics_div="yopwd">
-                    {% translate "Your orders per weekday" %}
-                </button>
-                <button class="sChoice dropDownChoice" data-statistics_div="yopml12m">
-                    {% translate "Your orders per month (last 12 months)" %}
-                </button>
-                <button class="sChoice dropDownChoice" data-statistics_div="noaopd">
-                    {% translate "All orders per drink" %}
-                </button>
-                <button class="sChoice dropDownChoice" data-statistics_div="aopwd">
-                    {% translate "All orders per weekday" %}
-                </button>
-                <button class="sChoice dropDownChoice" data-statistics_div="aopml12m">
-                    {% translate "All orders per month (last 12 months)" %}
-                </button>
-            </div>
-        </div>
-
         <div class="tablesContainer">
 
-            <div id="noyopd" class="statisticsTable nodisplay">
+            <div id="noyopd" class="statisticsTable">
                 <h1>{% translate "Your orders per drink" %}</h1>
                 {% if noyopd %}
                 <table>
@@ -70,7 +42,7 @@
                 {% endif %}
             </div>
 
-            <div id="noaopd" class="statisticsTable nodisplay">
+            <div id="noaopd" class="statisticsTable">
                 <h1>{% translate "All orders per drink" %}</h1>
                 {% if noaopd %}
                 <table>
@@ -90,7 +62,7 @@
                 {% endif %}
             </div>
     
-            <div id="yopml12m" class="statisticsTable nodisplay">
+            <div id="yopml12m" class="statisticsTable">
                 <h1>{% translate "Your orders per month (last 12 months)" %}</h1>
                 {% if yopml12m %}
                 <table>
@@ -110,7 +82,7 @@
                 {% endif %}
             </div>
 
-            <div id="aopml12m" class="statisticsTable nodisplay">
+            <div id="aopml12m" class="statisticsTable">
                 <h1>{% translate "All orders per month (last 12 months)" %}</h1>
                 {% if aopml12m %}
                 <table>
@@ -130,7 +102,7 @@
                 {% endif %}
             </div>
 
-            <div id="yopwd" class="statisticsTable nodisplay">
+            <div id="yopwd" class="statisticsTable">
                 <h1>{% translate "Your orders per weekday" %}</h1>
                 {% if yopwd %}
                 <table>
@@ -150,7 +122,7 @@
                 {% endif %}
             </div>
 
-            <div id="aopwd" class="statisticsTable nodisplay">
+            <div id="aopwd" class="statisticsTable">
                 <h1>{% translate "All orders per weekday" %}</h1>
                 {% if aopwd %}
                 <table>
@@ -174,6 +146,4 @@
 
     </div>
 
-    <script src="/static/js/statistics.js"></script>
-
 {% endblock %}
diff --git a/static/css/statistics.css b/static/css/statistics.css
index 2c97e82..9416b17 100644
--- a/static/css/statistics.css
+++ b/static/css/statistics.css
@@ -1,24 +1,21 @@
 .mainContainer {
+    min-width: 70vw;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: start;
-    width: 100%;
-    flex-grow: 1;
 }
 .statsHeading {
     min-width: max-content;
-    margin-left: 2rem;
     margin-top: 0;
 }
 .tablesContainer {
-    position: absolute;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: start;
     width: 95%;
-    margin-top: 5rem;
+    margin-top: 2rem;
 }
 .statisticsTable {
     margin-bottom: 2rem;
@@ -46,9 +43,6 @@
 .statisticsTable td:last-child {
     text-align: right;
 }
-#statisticsDropDownMenu .dropDownList {
-    z-index: 195;    
-}
 @media only screen and (max-width: 700px) {
     .statisticsTable h1 {
         min-width: 90vw;
diff --git a/static/js/statistics.js b/static/js/statistics.js
deleted file mode 100644
index 0cfdb26..0000000
--- a/static/js/statistics.js
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-
-    let statistics_dropdown_choices;
-    let statistics_tables;
-
-    let dropDownMenuActive = false;
-
-    document.addEventListener("DOMContentLoaded", () => {
-
-        // elements
-        let statistics_dropdown_menu = document.getElementById("statisticsDropDownMenu");
-        let statistics_dropdown_menu_button = document.getElementById("statisticsDropDownMenuButton");
-        statistics_dropdown_choices = [...statistics_dropdown_menu.getElementsByClassName("sChoice")];
-        statistics_tables = [...document.getElementsByClassName("statisticsTable")];
-
-        statistics_dropdown_menu_button.addEventListener("click", () => {
-            if (statistics_dropdown_menu.classList.contains("dropDownVisible")) {
-                statistics_dropdown_menu.classList.remove("dropDownVisible");
-            }
-            else {
-                statistics_dropdown_menu.classList.add("dropDownVisible");
-            }
-        })
-        
-        statistics_dropdown_choices.forEach(element => {
-
-            element.addEventListener("click", () => {
-                changeStatisticsChoice(element.innerText, element.dataset.statistics_div);
-            })
-
-        })
-
-    })
-
-    function changeStatisticsChoice(choice_name, div_id) {
-        statistics_tables.forEach(element => {
-            element.classList.add("nodisplay");
-        })
-        document.getElementById(div_id).classList.remove("nodisplay");
-    }
-
-}
\ No newline at end of file
-- 
2.43.0


From 5edc1862f43ba17b7ed3ec42bcec0ea9c3141264 Mon Sep 17 00:00:00 2001
From: W13R <9070224-W13R@users.noreply.gitlab.com>
Date: Thu, 26 May 2022 19:32:33 +0200
Subject: [PATCH 6/6] Bump version to 6

---
 lib/env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/env.sh b/lib/env.sh
index 67baa3f..5c3bf23 100644
--- 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="5.0"
+export APP_VERSION="6"
 export PYTHONPATH="$(pwd)/packages/"
-- 
2.43.0