Merge branch 'master' of https://git-r3lab.uni.lu/piotr.atyjaszyk/scheduling-system

smash/web/forms.py

@@ -28,7 +28,6 @@ class WorkerAddForm(ModelForm):
     class Meta:
         model = Worker
         exclude = ['appointments']
-        #fields = '__all__'
 
 
 class WorkerDetailForm(ModelForm):

smash/web/templates/visits/index.html

@@ -23,11 +23,56 @@
 
 {% block maincontent %}
 <div class="row">
-	<div class="col-md-12">
-		<h3>Planning</h3>
+	<div class="col-md-5">
+		<h3>Visits</h3>
+
+    	{% if visit_list %}
+  		<table id="visit_table" class="table table-bordered table-striped">
+      		<thead>
+				<tr>
+					<th>Subject name</th>
+					<th>Full information</th>
+          <th>Visit begins</th>
+          <th>Visit ends</th>
+          <th>Visit type</th>
+          <th>Finished?</th>
+				</tr>
+			</thead>
+  			<tbody>
+		      {% for visit in visit_list %}
+		  		<tr>
+		  			<td>{{ visit.subject.firstName }} {{ visit.subject.lastName }}</td>
+		        	<td>
+		        		<button type="button" class="btn btn-block btn-default btn-xs">See full information</button>
+		        	</td>
+		        	<td>
+		        		{{ visit.visitBegin }}
+		        	</td>
+		        	<td>
+		        		{{ visit.visitEnd }}
+		        	</td>
+		        	<td>
+		        		{{ visit.get_visitType_display }}
+		        	</td>
+		        	<td>
+                {% if visit.visitFinished %}<button type="button" class="btn btn-block btn-danger">YES</button>
+                {% else %}<button type="button" class="btn btn-block btn-success">NO</button>
+                {% endif %}
+		        	</td>
+
+		  		</tr>
+		      {% endfor %}
+  			</tbody>
+  		</table>
+
+    	{% else %}
+      		<p>No visits to display.</p>
+    	{% endif %}
+
+    	<hr />
 
-    None	
 	</div>
+
 </div>
 {% endblock maincontent %}
 
@@ -39,4 +84,16 @@
 	<script src="{% static 'AdminLTE/plugins/moment.js/moment.min.js' %}"></script>
 	<script src="{% static 'AdminLTE/plugins/fullcalendar/fullcalendar.min.js' %}"></script>
 
+	<script>
+		$(function () {
+			$('#planning_table, #approaching_table').DataTable({
+			  "paging": true,
+			  "lengthChange": false,
+			  "searching": true,
+			  "ordering": true,
+			  "info": true,
+			  "autoWidth": false
+			});
+
+	</script>
 {% endblock scripts %}

smash/web/views.py

@@ -52,12 +52,14 @@ def logout(request):
 	return redirect('/login?error=' + message)
 
 
-def assignments(request):
-	return wrap_response(request, 'assignments/index.html', {})
-
 
 def visits(request):
-	return wrap_response(request, 'visits/index.html', {})
+	visit_list = Visit.objects.order_by('-visitBegin')
+	context = {
+		'visit_list': visit_list
+	}
+
+	return wrap_response(request, 'visits/index.html', context)
 
 
 def subjects(request):