diff --git a/Pipfile b/Pipfile index ff69e9b..b360aeb 100644 --- a/Pipfile +++ b/Pipfile @@ -11,6 +11,7 @@ pydotplus = "*" [packages] django = "*" +django-cacheops = "*" [requires] python_version = "3.8" diff --git a/bak b/bak new file mode 100644 index 0000000..2bdfb79 --- /dev/null +++ b/bak @@ -0,0 +1,6 @@ + + {% if coin.name %} +
{{ coin.found_on|date:"d.m.Y" }}: {{ coin.value|floatformat:2 }} € von {{ coin.year }} "{{ coin.name }}" aus {{ coin.country}} von {{ coin.found_by }}
+ {⅝ else %} +{{ coin.found_on|date:"d.m.Y" }}: {{ coin.value|floatformat:2 }} € von {{ coin.year }} aus {{ coin.country}} von {{ coin.found_by }}
+ {% endif %} diff --git a/coinmanager/coinc/models.py b/coinmanager/coinc/models.py index fd7bfeb..de2a194 100644 --- a/coinmanager/coinc/models.py +++ b/coinmanager/coinc/models.py @@ -49,7 +49,7 @@ class Country(Model): def __str__(self): - return f"{self.name} {self.name_iso} {self.comment}" + return f"{self.name}" diff --git a/coinmanager/coinc/templates/coinc/index.html b/coinmanager/coinc/templates/coinc/index.html index 16654cb..61b4ac7 100644 --- a/coinmanager/coinc/templates/coinc/index.html +++ b/coinmanager/coinc/templates/coinc/index.html @@ -2,9 +2,9 @@ {% if countrys %}{{ coin.found_on|date:"d.m.Y" }}: {{ coin.value|floatformat:2 }} € {{ coin.name }} von {{ coin.found_by }}
+{{ coin.found_on|date:"d.m.Y" }}: {{ coin.value|floatformat:2 }} € von {{ coin.year }} aus {{ coin.country}} von {{ coin.found_by }}
{% endfor %} {% else %}Trage zuerst Länder im Adminbereich ein.
{% endif %} diff --git a/coinmanager/coinc/templates/footer.html b/coinmanager/coinc/templates/footer.html index 825fc56..ff9bee1 100644 --- a/coinmanager/coinc/templates/footer.html +++ b/coinmanager/coinc/templates/footer.html @@ -1,3 +1,3 @@ - Version 210705 + Version 210712