Update on medical report

mande/templates/mande/studentmedicalreport.html

@@ -1,47 +1,70 @@
 {% extends "base.html" %}
 {% load mandefilters %}
 {% block title %}
-Student Medical Report
+{% if not visits %}
+Student Medical and Dental Report
+{% elif visits %}
+Student Medical and Dental Report <small>{{startDate}} to {{endDate}}</small>
+{% endif %}
 {% endblock %}
 
 {% block content %}
+{% if visits %}
 <div class="col-md-9">
       <table class="table table-bordered table-striped table-hover" id="medicalReportTable">
         <thead><tr>
           <th>Site</th>
           <th>Student</th>
-          <th>Medical Visits</th>
+          <th>Check-Ups</th>
+          <th>Dental Visits</th>
 
         </tr></thead>
         <tbody>
-            {% for student, num in visits.items %}
-          <tr>
-              <td>{{ student.site }}</td>
-              <td><a href="{% url 'student_detail' student.student_id %}">{{ student }}</a></td>
-              <td>{{num}}</td>
-              </tr>
+            {% for student, key in visits.items %}
+              <tr>
+                  <td>{{ student.site }}</td>
+                  <td><a href="{% url 'student_detail' student.student_id %}">{{ student }}</a></td>
+                  <td>{{key.checkup}}</td>
+                  <td>{{key.dental}}</td>
+                  </tr>
           {% endfor %}
         </tbody>
 
       </table>
     </div>
 
+{% endif %}
 
     <div class="col-md-3">
+        <form method="post" action="{% url 'student_medical_report' %}">
+          {% csrf_token %}
+          <div class="col-md-12">
+            <div class="form-group">
+              From:<br>
+              <input type="date" name="startDate" class="form-control" id="datePicker1">
+            </div>
+            <div class="form-group">
+              To:<br>
+              <input type="date" name="endDate" class="form-control" id="datePicker2">
+            </div>
+            <div class="form-group">
+              <input type="button" value="Search" class="btn btn-primary form-control" id="submit">
+            </div>
+          </div>
+        </form>
     </div>
 
-
 {% endblock %}
 
 {% block script %}
  <!-- DataTables JavaScript -->
 <script type="text/javascript">
-$('#datePicker').val('{{attendance_date}}');
+$('#datePicker1').val('{{startDate}}');
+$('#datePicker2').val('{{endDate}}');
 $(function() {
-      $('#datePicker').change(function() {
-          //split on /
-          url = '{%url 'student_medical_report' %}' + $(this).val()
-          window.location.href = url
+  $('#submit').click(function() {
+      url = '{% url 'student_medical_report'%}' + $('#datePicker1').val() +"\\"+ $('#datePicker2').val()
+        window.location.href = url
       });
     });
 $(document).ready(function(){
@@ -64,5 +87,7 @@
   });
 });
 </script>
-
+<link type="text/css" href="/media/jquery/css/smoothness/jquery-ui-1.8.18.custom.css" rel="Stylesheet" />
+<script type="text/javascript" src="/media/jquery/js/jquery-1.7.1.min.js"></script>
+<script type="text/javascript" src="/media/jquery/js/jquery-ui-1.8.18.custom.min.js"></script>
 {% endblock %}

mande/urls.py

@@ -32,9 +32,9 @@
     url(r'^reports/student_evaluation/$', views.student_evaluation_report, name='student_evaluation_report'),
     url(r'^reports/student_evaluation/(?P<classroom_id>\d+)/$', views.student_evaluation_report, name='student_evaluation_report'),
     url(r'^reports/student_medical/$', views.student_medical_report, name='student_medical_report'),
+    url(r'^reports/student_medical/(?P<startDate>\d{4}-\d{1,2}-\d{1,2})/(?P<endDate>\d{4}-\d{1,2}-\d{1,2})/$', views.student_medical_report, name='student_medical_report'),
     url(r'^reports/student_dental/$', views.student_dental_report, name='student_dental_report'),
 
-
     url(r'^surveys/intake/$', views.intake_survey, name='intake_survey'),
     url(r'^surveys/intake/(?P<student_id>\d+)/$', views.intake_survey, name='intake_survey'),
     url(r'^surveys/intake/update/(?P<student_id>\d+)/$', views.intake_update, name='intake_update'),

mande/views/reports.py

@@ -367,16 +367,20 @@ def student_evaluation_report(request,classroom_id=None):
  - lists all student medical visits
 *****************************************************************************
 '''
-def student_medical_report(request):
+def student_medical_report(request, startDate = None, endDate=None):
     enrolled_students = getEnrolledStudents()
     visits = {}
-    for student in enrolled_students:
-        try:
-            visits[student] = len(Health.objects.all().filter(student_id=student))
-        except ObjectDoesNotExist:
-            pass
+    temp = {'checkup':0,'dental':0}
+    if startDate and endDate:
+        for student in enrolled_students:
+                temp['checkup'] = len(Health.objects.all().filter(student_id=student,appointment_type='CHECKUP',appointment_date__range=(startDate,endDate)))
+                temp['dental'] = len(Health.objects.all().filter(student_id=student,appointment_type='DENTAL',appointment_date__range=(startDate,endDate)))
+                if temp['checkup'] != 0 or temp['dental'] != 0:
+                    visits[student] = dict(temp)
+
     return render(request, 'mande/studentmedicalreport.html',
-                                {'visits':visits})
+                                {'visits':visits, 'startDate':startDate, 'endDate':endDate})
+
 '''
 *****************************************************************************
 Student Dental Report