From beb0ddff7e280351f119d3df1e31ea4fc6365969 Mon Sep 17 00:00:00 2001 From: Flo Ha Date: Thu, 8 Sep 2022 18:57:47 +0200 Subject: [PATCH] remove obsolete utils --- gaehsnitz/utils.py | 84 ---------------------------------------------- gaehsnitz/views.py | 1 - 2 files changed, 85 deletions(-) delete mode 100644 gaehsnitz/utils.py diff --git a/gaehsnitz/utils.py b/gaehsnitz/utils.py deleted file mode 100644 index b776b2b..0000000 --- a/gaehsnitz/utils.py +++ /dev/null @@ -1,84 +0,0 @@ -from typing import List, Union - -_crates = "crates" -_bottles_per_crate = "bottles_per_crate" -_bottle_size = "bottle_size" -_price_per_crate = "price_per_crate" -_deposit_per_crate = "deposit_per_crate" - -drinks = { - "Sterni": { - _crates: 30, _bottles_per_crate: 20, _bottle_size: 0.5, - _price_per_crate: 8.90, _deposit_per_crate: 3.10, - }, - "Uri": { - _crates: 20, _bottles_per_crate: 20, _bottle_size: 0.5, - _price_per_crate: 13.50, _deposit_per_crate: 3.10, - }, - "Wasser": { - _crates: 15, _bottles_per_crate: 12, _bottle_size: 0.7, - _price_per_crate: 4.50, _deposit_per_crate: 3.30, - }, - "Radler": { - _crates: 8, _bottles_per_crate: 20, _bottle_size: 0.5, - _price_per_crate: 13.00, _deposit_per_crate: 3.10, - }, - "Mate": { - _crates: 5, _bottles_per_crate: 20, _bottle_size: 0.5, - _price_per_crate: 17.00, _deposit_per_crate: 4.50, - }, - "Vita-Cola": { - _crates: 2, _bottles_per_crate: 12, _bottle_size: 1, - _price_per_crate: 10.00, _deposit_per_crate: 3.30, - }, - "Pepsi": { - _crates: 2, _bottles_per_crate: 12, _bottle_size: 1, - _price_per_crate: 12.00, _deposit_per_crate: 3.30, - }, -} - - -def generate_drinks_table() -> List[List[Union[str, int, float]]]: - table_data = [ - [ - "Getränk", "Kästen", - "Fl. / K.", "Fl. ges.", - "Menge / Fl.", "Menge / K.", "Menge ges.", - "Preis / Fl.", "Preis / K.", "Preis ges.", - "Pfand / K.", "Pfand ges.", - ] - ] - - total_crates = total_bottles = total_amount = total_price = total_deposit = 0 - - for name, details in drinks.items(): - bottles = details[_crates] * details[_bottles_per_crate] - amount_per_crate = details[_bottle_size] * details[_bottles_per_crate] - amount = amount_per_crate * details[_crates] - price_per_bottle = details[_price_per_crate] / details[_bottles_per_crate] - price = details[_price_per_crate] * details[_crates] - deposit = details[_deposit_per_crate] * details[_crates] - - table_data.append([ - name, str(details[_crates]), - str(details[_bottles_per_crate]), str(bottles), - f"{details[_bottle_size]:.1f}l", f"{amount_per_crate:.1f}l", f"{amount:.1f}l", - f"{price_per_bottle:.2f}€", f"{details[_price_per_crate]:.2f}€", f"{price:.2f}€", - f"{details[_deposit_per_crate]:.2f}€", f"{deposit:.2f}€", - ]) - - total_crates += details[_crates] - total_bottles += bottles - total_amount += amount - total_price += price - total_deposit += deposit - - table_data.append([ - "Summe", str(total_crates), - "", str(total_bottles), - "", "", f"{total_amount:.1f}l", - "", "", f"{total_price:.2f}€", - "", f"{total_deposit:.2f}€", - ]) - - return table_data diff --git a/gaehsnitz/views.py b/gaehsnitz/views.py index 55240d8..c3d46f1 100644 --- a/gaehsnitz/views.py +++ b/gaehsnitz/views.py @@ -5,7 +5,6 @@ from django.utils import timezone from django.views.generic import TemplateView from gaehsnitz.models import Payment -from gaehsnitz.utils import generate_drinks_table festival_start_date, festival_end_date = date(2022, 8, 25), date(2022, 8, 28)