ChaoticByte/drinks-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

Release 6 (devel -> main)

Browse source 
See merge request W13R/drinks-manager!2
This commit is contained in:
Julian Müller 2022-05-26 17:34:19 +00:00
commit 04fc3cbb7b
13 changed files with 31 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

17
README.md
View file

@ -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
application/app/admin.py
View file

@ -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)

2
application/app/forms.py
View file

@ -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):

9
application/app/models.py
View file

@ -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)

2
application/app/templates/index.html
View file

@ -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>

4
application/app/templates/order.html
View file

@ -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 %}

42
application/app/templates/statistics.html
View file

@ -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 %}

5
application/app/templates/userPanel.html
View file

@ -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
application/app/views.py
View file

@ -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
lib/env.sh
View file

@ -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/"

10
static/css/statistics.css
View file

@ -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;

7
static/js/order.js
View file

@ -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);

42
static/js/statistics.js
View file

@ -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");
}
}