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

static/mealplanner_script.js

@@ -30,7 +30,23 @@ $( function() {
 });
 
 function plan_meal() {
-
+	var meal_date = $('#datepicker').datepicker('getDate');
+	if(isNaN($('#spinner-hour').val()) || isNaN($('#spinner-minute').val())) {
+		alert('Invalid time entered.');
+		return;
+	}
+	if(isNaN($('#deadline').val())) {
+		alert('Invalid deadline entered.');
+		return;
+	}
+	if ((0 <= +$('#spinner-hour').val() <= 23) && (0 <= +$('#spinner-minute').val() <= 59)) {
+		meal_date.setHours(+$('#spinner-hour').val(), +$('#spinner-minute').val())
+	} else {
+		alert('Invalid time entered.');
+		return;
+	}
+	var description_v = $('#flavor-text').val();
+	var deadline_amount = $('#deadline').val();
 }
 
 function add_user() {

templates/meal_planner.html

@@ -39,7 +39,7 @@
 		<input type="text" name="flavor_text" id="flavor-text">
 		<h3>Can join until</h3>
 		<div class="sub-flex" id="deadline">
-			<input type="text" name="deadline-amount" id="deadline-amount" pattern="[0-9]+">
+			<input type="text" name="deadline-amount" id="deadline-amount" pattern="^\d+(\.\d+)?$">
 			<select id="deadline-unit">
 				<option value="m">Minutes</option>
 				<option value="h" selected>Hours</option>