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

smash/web/models.py

@@ -222,7 +222,8 @@ class Room (models.Model):
 
 class AppointmentType (models.Model):
     required_equipment = models.ManyToManyField(Item,
-        verbose_name='Required equipment'
+        verbose_name='Required equipment',
+        blank = True
     )
     code = models.CharField(max_length=20,
         verbose_name='Appointment code'

smash/web/templates/subjects/visitdetails.html

@@ -36,6 +36,7 @@
                 {% if element.2 %}(Finished)
                 {% else %}(Not finished)
                 {% endif %}
+                 <a href="{% url 'web.views.visit_details' element.3 %}"><font color="#D3D3D3">Details >>></font></a> 
               </h5>
             </div>
             <div class="box-footer">

smash/web/views.py

@@ -153,8 +153,9 @@ def subject_visit_details(request, id):
 	for vis in visits:
 		assign = vis.appointment_set.all()
 		finished = vis.is_finished
+		visid = vis.id
 		visform = VisitDetailForm(instance=vis)
-		endlist.append((visform,assign,finished))
+		endlist.append((visform,assign,finished,visid))
 
 	#print len(endlist)
 	#print endlist[0]