Merge branch 'master' of git.elab.kth.se:davide/KUKapp

kukv1.py

@@ -85,7 +85,7 @@ def getUpcomingMeals():
 			meals[-1]['needs_confirmation'] = False
 		leaderboard = applyTempMeal(leaderboard, meals[-1])
 	r.close()
-	return meals
+	return meals, leaderboard
 
 def applyTempMeal(leaderboard, meal):
 	ld = leaderboard[:]
@@ -165,7 +165,8 @@ def removeme():
 
 @app.route('/')
 def index():
-	return render_template('meal_list.html', leaderboard=getLeaderboard(), meals=getUpcomingMeals())
+	meals, _ = getUpcomingMeals()
+	return render_template('meal_list.html', leaderboard=getLeaderboard(), meals=meals)
 
 @app.route('/viewmeal')
 def view_meal():
@@ -200,11 +201,9 @@ def search_users():
 def get_kuk_candidate():
 	date = datetime.datetime.strptime(request.args.get('date'), '%Y-%m-%d %H:%M')
 	meal_eaters = request.args.get('eaters').split(',')
-	u_meals = getUpcomingMeals()
-	leaderboard = getLeaderboard()
-	for meal in u_meals:
-		leaderboard = applyTempMeal(leaderboard, meal)
-	return [e['name'] for e in leaderboard if e['name'] in eaters][0]
+	u_meals, t_lb = getUpcomingMeals()
+	
+	return [e['name'] for e in t_lb if e['name'] in meal_eaters][0]
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():

static/mealplanner_script.js

@@ -74,7 +74,7 @@ function add_user() {
 		});
 		e = '<div class="add-people-container" id="for-user-' + new_eater + '">\
 			<div class="flex-card" style="margin: 0">\
-				<img src="static/' + new_eater + '.png">\
+				<img src="static/' + new_eater + '.png" class="flex-thumb">\
 				<span class="username">' + new_eater + '</span>\
 			</div>\
 			<div class="small-round-button" onclick="remove_user(\'' + new_eater + '\')"><i class="fa fa-minus" aria-hidden="true"></i></div>\