Add view and allow for duplicate hostpital numbers

elcid/urls.py

@@ -10,6 +10,7 @@
 from elcid import api
 
 from elcid import views
+from plugins.appointments import views as appointment_views
 
 urlpatterns = [
     url('^admin/bulk-create-users$', views.BulkCreateUserView.as_view(), name='bulk-create-users'),
@@ -22,7 +23,10 @@
         r'^elcid/renal_handover',
         views.RenalHandover.as_view(),
         name="renal_handover"
-    )
+    ),
+    url(r'^appointments/tb-clinic-list/',
+        appointment_views.ClinicListView.as_view(),
+        name='tb-clinic-list')
 ]
 
 urlpatterns += opatterns

plugins/appointments/management/commands/initial_tb_import.py

@@ -53,7 +53,10 @@ def handle(self, *args, **kwargs):
             if Patient.objects.filter(demographics__hospital_number=mrn).count() == 0:
                 patient = self.create_patient_for_mrn(mrn)
             else:
-                patient = Patient.objects.get(demographics__hospital_number=mrn)
+                try:
+                    patient = Patient.objects.get(demographics__hospital_number=mrn)
+                except:
+                    patient = Patient.objects.filter(demographics__hospital_number=mrn).first()
 
             our_appointment = Appointment(patient=patient)
 

plugins/appointments/templates/appointments/clinic_list.html

@@ -0,0 +1,30 @@
+{% extends 'app_layouts/layout_base.html' %}
+{% block ngapp %}{% endblock %}
+{% block loading %}{% endblock %}
+
+{% block content %}
+  <div class="row content-offset">
+    <div class="col-md-10 col-md-offset-1">
+      <h2 >Upcoming TB Clinic Appointments</h2>
+    </div>
+  </div>
+  {% for appointment in object_list %}
+    <div class="row">
+      <div class="col-md-3">
+        {{ appointment.start_datetime }}
+        <br />
+        {{ appointment.duration}}
+      </div>
+      <div class="col-md-3">
+        {{ appointment.derived_appointment_type }}
+      </div>
+      <div class="col-md-3">
+        {{ appointment.patient.demographics.name }}
+      </div>
+      <div class="col-md-3">
+        {{ appointment.patient.demographics.hospital_number }}
+        {{ appointment.patient.demographics.date_of_birth }}
+      </div>
+    </div>
+  {% endfor %}
+{% endblock %}

plugins/appointments/views.py

@@ -0,0 +1,21 @@
+"""
+Views for the Appointment plugin
+"""
+import datetime
+
+from django.views.generic import ListView
+
+from plugins.appointments.models import Appointment
+
+
+class ClinicListView(ListView):
+    """
+    Show a list of all future appointments
+    """
+    model         = Appointment
+    template_name = 'appointments/clinic_list.html'
+
+    def get_queryset(self):
+        return Appointment.objects.filter(
+            start_datetime__gte=datetime.date.today()
+        ).exclude(status_code='Canceled')