From 34a818ecbb3c8e03ca2d9d8a6255081e15b90bb3 Mon Sep 17 00:00:00 2001
From: michigg <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Sat, 21 Oct 2017 23:43:06 +0200
Subject: [PATCH] bugfix rating view

---
 ofu_app/apps/food/views.py                 |  3 +-
 ofu_app/static/js/food/rating.js           | 38 ++++++++++------------
 ofu_app/templates/macros/food_macros.jinja |  4 +--
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py
index 6612995..eda054b 100644
--- a/ofu_app/apps/food/views.py
+++ b/ofu_app/apps/food/views.py
@@ -41,8 +41,7 @@ def daily_food(request):
         food.save()
         print("DONE")
 
-    today = datetime.datetime.now()
-    daily_menus = Menu.objects.filter(date__exact=today)
+    today = datetime.datetime.now() - datetime.timedelta(1)
     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()
diff --git a/ofu_app/static/js/food/rating.js b/ofu_app/static/js/food/rating.js
index cdd4ac6..83c95c9 100644
--- a/ofu_app/static/js/food/rating.js
+++ b/ofu_app/static/js/food/rating.js
@@ -4,10 +4,7 @@
 document.addEventListener('DOMContentLoaded', rate_init);
 
 function rate_init() {
-    add_Stars('feki');
-    add_Stars('austr');
-    add_Stars('erba');
-    add_Stars('markuspl');
+    add_Stars();
     $('.star').on("mouseenter mouseleave", function () {
         showRating(this);
     }).on("click", function () {
@@ -15,32 +12,31 @@ function rate_init() {
     })
 }
 
-function add_Stars(id) {
-    $('#' + id + ' .food-item').each(function () {
-        console.log($(this).data('food'));
-        console.log($(this).data('rating'));
+function add_Stars() {
+    console.log($('.food-item'));
+    $('.food-item').each(function () {
         var food = $(this).data('food');
         var rating = $(this).data('rating');
+        console.log("ITEM: " + $(this) + " FOOD-ID: " + food + " FOOD-RATING: " + rating);
         for (var i = 0; i < 5; i++) {
-            $(this).find('.rating-wrapper').append('<i id="star-' + (i + 1) + '-' + id + '-' + food + '" class="fa fa-star-o star" aria-hidden="true"></i>');
+            $(this).find('.rating-wrapper').append('<i class="star-' + (i + 1) + '-' + food + ' fa fa-star-o star" aria-hidden="true"></i>');
         }
-        buildRating(id, food, rating);
+        buildRating(food, rating);
     });
 }
 
 function showRating(obj) {
-    //console.log($(obj).attr('id'));
-    splitted_id = $(obj).attr('id').split('-');
+    splitted_id = $(obj).attr('class').split(' ')[0].split('-');
+    console.log(splitted_id);
     var rating = splitted_id[1];
-    var id = splitted_id[2];
-    var food = splitted_id[3];
-    buildRating(id, food, rating);
+    var food_id = splitted_id[2];
+    buildRating(food_id, rating);
 }
 
-function buildRating(id, food, rating) {
-    for (var i = 0; i < 5; i++) {
-        var icon_id = '#star-' + (i + 1) + '-' + id + '-' + food;
-        if (i < rating) {
+function buildRating(food_id, rating) {
+    for (var i = 1; i < 6; i++) {
+        var icon_id = '.star-' + i + '-' + food_id;
+        if (i <= rating) {
             $(icon_id).removeClass('fa-star-o').addClass('fa-star');
         } else {
             $(icon_id).removeClass('fa-star').addClass('fa-star-o');
@@ -49,9 +45,9 @@ function buildRating(id, food, rating) {
 }
 
 function sendRating(obj) {
-    splitted_id = $(obj).attr('id').split('-');
+    splitted_id = $(obj).attr('class').split(' ')[0].split('-');
     var rating = splitted_id[1];
-    var food_id = splitted_id[3];
+    var food_id = splitted_id[2];
     //TODO: Better URL handling
     var url = window.location.href;
     console.log(url);
diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja
index b4fdbd8..c6e1079 100644
--- a/ofu_app/templates/macros/food_macros.jinja
+++ b/ofu_app/templates/macros/food_macros.jinja
@@ -34,8 +34,8 @@
     <ul class="border">
         {% for single_food in menu %}
             <li data-food="{{ single_food.id }}" data-rating="{{ single_food.rating }}" class="food-item">
-                <p>{{ single_food.name }}<span
-                        class="rating-wrapper"></span></p>
+                <p>{{ single_food.name }}</p>
+                <p class="rating-wrapper"></p>
             </li>
         {% endfor %}
     </ul>