Multiple locations per exam.

2 files changed, 10 insertions, 24 deletions

diff --git a/modules-available/exams/templates/page-add-exam.html b/modules-available/exams/templates/page-add-exam.html
index a537e7e9..ebbccd6b 100644
--- a/modules-available/exams/templates/page-add-exam.html
+++ b/modules-available/exams/templates/page-add-exam.html
@@ -2,8 +2,8 @@
 
 <form class="form" method="POST" action="?do=exams&action=add">
     <div class="form-group">
-        <label for="location">Location</label>
-        <select name="location" class="form-control">
+        <label for="locations">Location</label>
+        <select id="locations" multiple="multiple" name="locations[]" class="">
             {{#locations}}
             <option value="{{locationid}}"> {{locationname}} </option>
             {{/locations}}
@@ -13,22 +13,22 @@
     <div class="row">
         <div class="form-group col-xs-6">
             <label for="starttime_date">Start Date</label>
-            <input class="form-control datepicker" name="starttime_date" />
+            <input required class="form-control datepicker" name="starttime_date" />
         </div>
         <div class="form-group col-xs-6">
             <label for="starttime_time">Start Time</label>
-            <input type="text" class="form-control timepicker" name="starttime_time" />
+            <input required type="text" class="form-control timepicker" name="starttime_time" />
         </div>
     </div>
 
     <div class="row">
         <div class="form-group col-xs-6">
             <label for="endtime_date">End Date</label>
-            <input class="form-control datepicker" name="endtime_date" />
+            <input required class="form-control datepicker" name="endtime_date" />
         </div>
         <div class="form-group col-xs-6">
             <label for="endtime_time">End Time</label>
-            <input type="texxt" class="form-control timepicker" name="endtime_time" />
+            <input required type="texxt" class="form-control timepicker" name="endtime_time" />
         </div>
     </div>
     <div class="row">
@@ -55,5 +55,7 @@ document.addEventListener("DOMContentLoaded", function () {
     };
     $('.datepicker').datepicker(dateSettings);
     $('.timepicker').timepicker(timeSettings);
+
+    $('#locations').multiselect({numberDisplayed: 1});
 }, false);
 // --></script>
diff --git a/modules-available/exams/templates/page-exams.html b/modules-available/exams/templates/page-exams.html
index 8758b408..95c73d34 100644
--- a/modules-available/exams/templates/page-exams.html
+++ b/modules-available/exams/templates/page-exams.html
@@ -12,9 +12,7 @@
 		{{#exams}}
 			<tr>
 				<td>{{examid}}</td>
-				<td>
-					<a href="?do=baseconfig&module=locations&locationid={{locationid}}"> {{locationname}} </a>
-				</td>
+				<td> {{locationnames}} </td>
 				<td>{{starttime}}</td>
 				<td>{{endtime}}</td>
 				<td>
@@ -38,11 +36,7 @@
 
 
 function customOrder(a, b) {
-	console.log("a is ");
-	console.log(a);
-	console.log("b is ");
-	console.log(b);
-	return 1000;
+	return 1000; // just in order of appeareance
 }
 
 document.addEventListener("DOMContentLoaded", function () {
@@ -53,16 +47,6 @@ document.addEventListener("DOMContentLoaded", function () {
 	console.log(items_plain);
 	var groups = new vis.DataSet(groups_plain);
 	var items = new vis.DataSet(items_plain);
-	// var groups = new vis.DataSet([
-	// 								{ id: 1, content:'RZ -101' },
-	// 								{ id: 2, content:'RZ -104' }
-	// 							]);
-	// var items = new vis.DataSet([
-	// 							{ id: 1, group: 1, content: 'Bio 1', start: '2016-06-15 10:30', end : '2016-06-15 14:45'},
-	// 							{ id: 2, group: 1, content: 'Bio 2', start: '2016-06-15 10:45', end : '2016-06-15 15:00'},
-	// 							{ id: 3, group: 2, content: 'Englisch', start: '2016-06-15 16:00', end : '2016-06-15 17:15'},
-	// 							{ id: 4, group: 1, content: 'BACKGROUND', start: '2016-06-15-11:00', end: '2016-06-15 18:00', type: 'background'}
-	// ]);
 
 	var options = {
 		'start' : '{{{vis_begin}}}',