back to present

ofu_app/apps/food/views.py

@@ -11,7 +11,7 @@ from django.http import HttpResponse
 
 # Create your views here.
 def daily_food(request):
-    today = datetime.datetime.now() - datetime.timedelta(2)
+    today = datetime.datetime.now()
     feki_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Feldkirchenstraße").last()
     austr_menu = Menu.objects.filter(date__exact=today).filter(location__contains="Austraße").last()
     erba_cafete = Menu.objects.filter(date__exact=today).filter(location__contains="Erba").last()
@@ -90,4 +90,18 @@ def food_rating(request):
         food.rating = sum / global_count
         print("SUMME: " + str(sum / global_count))
         food.save()
-    return HttpResponse(status=200)
+        return HttpResponse(status=200)
+
+    return HttpResponse(status=404)
+
+
+def food_image(request):
+    food_id = request.GET.get('food_id', None)
+    img = request.GET.get('img', None)
+    if food_id and img:
+        food = SingleFood.objects.get(id=food_id)
+        food.image = img
+        food.save()
+        return HttpResponse(status=200)
+
+    return HttpResponse(status=404)

ofu_app/static/js/food/image_capturing.js

@@ -13,18 +13,31 @@ function add_img_class() {
 }
 
 function readURL(obj) {
-    var picClass = "img-" + $(obj).attr('class').split(' ')[1].split('-')[2];
+    var inputClass = "img-upload-" + $(obj).attr('class').split(' ')[1].split('-')[2];
-    console.log(picClass);
+    console.log(inputClass);
-    input = $('.' + picClass)[0];
+    input = $('.' + inputClass)[0];
     var file = input.files[0];
     console.log(file);
 
-    var reader = new FileReader();
+    if (window.FileReader) {
-    reader.onload = function () {
+        reader = new FileReader();
-        document.getElementById('clock').style.backgroundImage = "url(" + reader.result + ")";
+        reader.onloadend = function (e) {
-    }
+            var picClass = "img-" + $(obj).attr('class').split(' ')[1].split('-')[2];
-    if (file) {
+            showUploadedItem(e.target.result, picClass);
+        };
         reader.readAsDataURL(file);
-    } else {
     }
+
+}
+
+function showUploadedItem(source, picClass) {
+    console.log("Show Image: " + picClass + "  source: " + source);
+    $('.' + picClass).each(function () {
+        console.log($(this));
+        $(this).attr('src',source);
+    });
+}
+
+function upload_image(source) {
+
 }

ofu_app/templates/macros/food_macros.jinja

@@ -1,5 +1,5 @@
 {% macro day_menu(title, location_menu, fail_text, css_id='menu') -%}
-    <div id="{{ css_id }}" class="col p-2 menu">
+    <div id="{{ css_id }}" class="col-12 col-sm-12 col-md-12 col-lg-6 col-xl-6 p-2 menu">
         <div class="p-3 border border-dark rounded bg-light text-dark">
             <h2>{{ title }} </h2>
             {% if location_menu %}
@@ -13,7 +13,7 @@
 {% endmacro %}
 
 {% macro week_menu(title, location_menus, fail_text) -%}
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 p-2">
+    <div class="col-12 col-sm-12 col-md-12 col-lg-6 col-xl-6 p-2">
         <div class="p-3 border border-dark rounded bg-light text-dark">
             <h2>{{ title }}</h2>
             {% if location_menus %}
@@ -35,21 +35,22 @@
         {% for single_food in menu %}
             <li data-food="{{ single_food.id }}" data-rating="{{ single_food.rating }}" class="food-item">
                 <div class="row">
-                    <div class="food-name col-8"><p>{{ single_food.name }}</p></div>
+                    <div class="food-name col-12"><p>{{ single_food.name }}</p></div>
-                    <div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="Gericht" width="304"
+                    {#<div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="Gericht" width="80"
-                                                          height="236"></div>
+                                                          height="80"></div>#}
                 </div>
                 <div class="row">
                     <div class="rating-wrapper col-6 text-left"></div>
-                    <div class="col-6 text-right">
+                    {#<div class="col-6 text-right">
-                        <label for="pic-upload" class="custom-pic-upload">
+                        <label for="pic-upload-{{ single_food.id }}" class="custom-pic-upload">
                             <i class="fa fa-camera" aria-hidden="true"></i>
                         </label>
                         <div class="pic-input-wrapper">
-                            {# TODO: extract style to external css file #}
+                            #}{# TODO: extract style to external css file #}{#
-                            <input id="pic-upload" class="pic-upload" type="file" name="photo" id="upload-photo" style="display: none !important;"/>
+                            <input id="pic-upload-{{ single_food.id }}" class="pic-upload" type="file" name="photo"
+                                   id="upload-photo" style="display: none !important;"/>
                         </div>
-                    </div>
+                    </div>#}
                 </div>
             </li>
         {% endfor %}