diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py index 148f7ac..fded00c 100644 --- a/ofu_app/apps/food/views.py +++ b/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) diff --git a/ofu_app/static/js/food/image_capturing.js b/ofu_app/static/js/food/image_capturing.js index 9868fc9..85f4e60 100644 --- a/ofu_app/static/js/food/image_capturing.js +++ b/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]; - console.log(picClass); - input = $('.' + picClass)[0]; + var inputClass = "img-upload-" + $(obj).attr('class').split(' ')[1].split('-')[2]; + console.log(inputClass); + input = $('.' + inputClass)[0]; var file = input.files[0]; console.log(file); - var reader = new FileReader(); - reader.onload = function () { - document.getElementById('clock').style.backgroundImage = "url(" + reader.result + ")"; - } - if (file) { + if (window.FileReader) { + reader = new FileReader(); + reader.onloadend = function (e) { + var picClass = "img-" + $(obj).attr('class').split(' ')[1].split('-')[2]; + 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) { + } \ No newline at end of file diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja index 5cbbffe..16d9a53 100644 --- a/ofu_app/templates/macros/food_macros.jinja +++ b/ofu_app/templates/macros/food_macros.jinja @@ -1,5 +1,5 @@ {% macro day_menu(title, location_menu, fail_text, css_id='menu') -%} -