[WarpMain] Fixed things

www/web/locale/de/LC_MESSAGES/django.po

@@ -549,7 +549,7 @@ msgstr ""
 
 #: warpmain/templates/warpmain/main.html:36
 msgid "created_by"
-msgstr ""
+msgstr "Erstellt von"
 
 #: warppay/templates/warppay/main.html:6
 msgid "News"

www/web/warpfood/admin.py

@@ -3,19 +3,26 @@ from warpfood.models import *
 
 # Register your models here.
 
-
 @admin.register(FoodService)
 class FoodServiceAdmin(admin.ModelAdmin):
         pass
 
+
 @admin.register(FoodCategory)
 class FoodCategoryAdmin(admin.ModelAdmin):
         pass
 
+
 @admin.register(FoodProduct)
 class FoodProductAdmin(admin.ModelAdmin):
         pass
 
+
 @admin.register(FoodSheet)
 class FoodSheetAdmin(admin.ModelAdmin):
         pass
+
+
+@admin.register(FoodOrder)
+class FoodOrderAdmin(admin.ModelAdmin):
+        pass

www/web/warpfood/models.py

@@ -47,8 +47,6 @@ class FoodSheet(models.Model):
         return str(self.date) + " - " + str(self.food_service)
 
 
-
-
 class FoodOrder(models.Model):
     sheet = models.ForeignKey(FoodSheet, on_delete=models.CASCADE)
     user = models.CharField(max_length=100,null=True)
@@ -57,7 +55,10 @@ class FoodOrder(models.Model):
     comment = models.CharField(max_length=100, null=True)
     price = models.FloatField()
     paid = models.BooleanField(default=False)
+    product_id = models.IntegerField(default=0)
 
+    def __str__(self):
+        return str(self.user) + " - " + str(self.article)
 
 class FoodSheetForm(ModelForm):
     estimated_order_time = forms.DateTimeField(widget=DateTimePicker(options={"format": "YYYY-MM-DD HH:mm", "pickTime": True, "inline":True, "sideBySide": True}))
@@ -72,16 +73,16 @@ class FoodOrderForm(ModelForm):
 
     class Meta:
         model = FoodOrder
-        fields = ['sheet', 'user', 'article', 'size', 'comment', 'price', 'paid']
-        widgets = {'paid': HiddenInput(), 'sheet': HiddenInput(), 'user': HiddenInput()}
+        fields = ['sheet', 'user', 'article', 'size', 'comment', 'price', 'paid', 'product_id']
+        widgets = {'paid': HiddenInput(), 'sheet': HiddenInput(), 'user': HiddenInput(), 'product_id': HiddenInput()}
 
 class FoodOrderFormExt(ModelForm):
     comment = forms.CharField(required=False)
 
     class Meta:
         model = FoodOrder
-        fields = ['sheet', 'user', 'article', 'size', 'comment', 'price', 'paid']
-        widgets = {'sheet': HiddenInput(), 'paid': HiddenInput()}
+        fields = ['sheet', 'user', 'article', 'size', 'comment', 'price', 'paid', 'product_id']
+        widgets = {'sheet': HiddenInput(), 'paid': HiddenInput(), 'product_id': HiddenInput()}
 
 class FoodServiceForm(ModelForm):
     class Meta:

www/web/warpfood/templates/warpfood/view.html

@@ -140,7 +140,7 @@
                                 <div role="tabpanel" class="tab-pane fade in{% if category == "Pizza" %} active {% endif %}" id="{{ category }}">
                                 <table class="table table-striped table-hover">
                                     {% for product in products %}
-                                        <tr data-link="javascript:choose_food_product('{{ product.name }}','{{ product.size }}','{{ product.price }}');">
+                                        <tr data-link="javascript:choose_food_product('{{ product.name }}','{{ product.size }}','{{ product.price }}', '{{ product.id }}');">
                                             <td>{{ product.name }}</td>
                                             <td>{{ product.size }}</td>
                                             <td>{{ product.price }}</td></tr>
@@ -171,10 +171,11 @@
 
 {% block custom_javascript %}
     <script>
-        function choose_food_product(name, size, price) {
+        function choose_food_product(name, size, price, product_id) {
             document.getElementById("id_article").value = name;
             document.getElementById("id_size").value = size;
             document.getElementById("id_price").value = price.replace(/,/g, '.');
+            document.getElementById("id_product_id").value = product_id;
             $('#product_modal').modal('hide')
         }
     </script>

www/web/warpfood/views.py

@@ -8,7 +8,7 @@ from reportlab.pdfgen import canvas
 from django.http import HttpResponse
 from datetime import datetime
 from django.conf import settings
-
+from datetime import datetime, timedelta
 #
 # ToDo: Insert TemplateTag for Euro Format
 # ToDo: Username with hidden Field. Maybe insecure
@@ -22,12 +22,17 @@ def index(request):
             form = FoodSheetForm(request.POST)
             if form.is_valid():
                 form.save()
-
+    """
+    time_threshold = datetime.now() - timedelta(hours=24)
+    print(timedelta(hours=24))
+    print(len(FoodSheet.objects.filter(order_time__lt=time_threshold))) #) #.delete()
+    """
     page_context['pizza_services'] = FoodService.objects.all()
     page_context['create_food_sheet'] = form
     page_context['food_sheets'] = FoodSheet.objects.order_by("-id")
     return HttpResponse(render(request, 'warpfood/main.html', page_context))
 
+
 def edit_sheet(request, sheet_id=0):
     if sheet_id != 0 and request.user.is_superuser:
         try:

www/web/warpmain/templates/warpmain/main.html

@@ -6,23 +6,23 @@
 
 <h2>{% block title %}{% trans "news" %}{% endblock %}</h2>
 
-{% if user.is_superuser %}
-    <br/>
-    <button class="btn btn-success" data-toggle="collapse" data-target="#add_news"><span class="glyphicon glyphicon-plus"></span>&nbsp;{% trans "add_news" %}</button>
-    <br/><br/>
-    <div class="panel panel-default">
-        <div class="panel-body collapse {{ collapse }}" id="add_news">
-            <form class="form-horizontal" method="POST" role="form">
-                 {{ create_news_form | bootstrap_horizontal }}
-                <div class="form-group">
-                    <div class="col-sm-offset-2 col-sm-10">
-                        {% csrf_token %}
-                        <button style="float: left" type="submit" formmethod="post" class="btn btn-primary">{% trans "create" %}</button>
+    {% if user.is_superuser %}
+        <br/>
+        <button class="btn btn-success" data-toggle="collapse" data-target="#add_news"><span class="glyphicon glyphicon-plus"></span>&nbsp;{% trans "add_news" %}</button>
+        <br/><br/>
+        <div class="panel panel-default">
+            <div class="panel-body collapse {{ collapse }}" id="add_news">
+                <form class="form-horizontal" method="POST" role="form">
+                     {{ create_news_form | bootstrap_horizontal }}
+                    <div class="form-group">
+                        <div class="col-sm-offset-2 col-sm-10">
+                            {% csrf_token %}
+                            <button style="float: left" type="submit" formmethod="post" class="btn btn-primary">{% trans "create" %}</button>
+                        </div>
                     </div>
-                </div>
-            </form>
+                </form>
+            </div>
         </div>
-    </div>
     {%  endif %}
     {% for news in news_list %}
         <div class="panel panel-primary">