Merge branch...

Merge branch '28-there-should-be-a-way-to-add-an-appointment-with-external-person-neither-a-subject-nor-control' into 'master'

button to add general appointment added

Closes #28

See merge request !28

smash/web/templates/appointments/index.html

@@ -79,6 +79,14 @@
                     <div id="calendar"></div>
                 </div>
             </div>
+            <div class="col-md-3">
+                <a href="{% url 'web.views.appointment_add_general' %}" type="button"
+                   class="btn btn-block btn-default">Add General appointment</a>
+            </div>
+            <div class="col-md-3">
+                <a href="{% url 'web.views.subjects' %}" type="button"
+                   class="btn btn-block btn-default">Add Subject appointment</a>
+            </div>
         </div>
     </div>
 {% endblock maincontent %}

smash/web/urls.py

@@ -26,7 +26,7 @@ urlpatterns = [
     url(r'^appointments/details/(?P<id>\d+)$', views.appointment.appointment_details,
         name='web.views.appointment_details'),
     url(r'^appointments/add/(?P<visit_id>\d+)$', views.appointment.appointment_add, name='web.views.appointment_add'),
-    url(r'^appointments/add/general$', views.appointment.appointment_add, name='web.views.appointment_add'),
+    url(r'^appointments/add/general$', views.appointment.appointment_add, name='web.views.appointment_add_general'),
     url(r'^appointments/edit/(?P<id>\d+)$', views.appointment.appointment_edit, name='web.views.appointment_edit'),
 
     url(r'^visits$', views.visit.visits, name='web.views.visits'),