From 1d73b292aac2d2ef006cef579a71d179a0b4623a Mon Sep 17 00:00:00 2001
From: Suin Kim <suinkim98@gmail.com>
Date: Mon, 16 Nov 2015 22:38:27 +0700
Subject: [PATCH 1/3] Update on medical report

Current progress -Filter doesn't work yet
---
 .../templates/mande/studentmedicalreport.html | 39 +++++++++++++------
 mande/urls.py                                 |  1 +
 mande/views/reports.py                        | 16 ++++----
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/mande/templates/mande/studentmedicalreport.html b/mande/templates/mande/studentmedicalreport.html
index 995afd5..02f58d3 100644
--- a/mande/templates/mande/studentmedicalreport.html
+++ b/mande/templates/mande/studentmedicalreport.html
@@ -1,24 +1,27 @@
 {% extends "base.html" %}
 {% load mandefilters %}
 {% block title %}
-Student Medical Report
+Student Medical Report {{startDate}} to {{endDate}}
 {% 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 %}
+            {% for student, key in visits.items %}
           <tr>
               <td>{{ student.site }}</td>
               <td><a href="{% url 'student_detail' student.student_id %}">{{ student }}</a></td>
-              <td>{{num}}</td>
+              <td>{{key.checkup}}</td>
+              <td>{{key.dental}}</td>
               </tr>
           {% endfor %}
         </tbody>
@@ -26,22 +29,32 @@
       </table>
     </div>
 
-
+{% endif %}
     <div class="col-md-3">
+        <form method="post" action="{% url 'student_medical_report' %}">
+          From:<br>
+          {% csrf_token %}
+          <input type="date" name="startDate" class="form-control" id="datePicker1">
+          <br>
+          To:<br>
+          {% csrf_token %}
+          <input type="date" name="endDate" class="form-control" id="datePicker2">
+          <br><br>
+          <input type="button" value="Submit" class="btn btn-xs btn-success" id="submit">
+        </form>
     </div>
 
-
 {% endblock %}
 
 {% block script %}
  <!-- DataTables JavaScript -->
 <script type="text/javascript">
-$('#datePicker').val('{{attendance_date}}');
+$('#datePicker1').val('{{startDate}}');
+$('#datePicker').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 +77,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 %}
diff --git a/mande/urls.py b/mande/urls.py
index 683bc00..cfc3099 100644
--- a/mande/urls.py
+++ b/mande/urls.py
@@ -29,6 +29,7 @@
     url(r'^reports/lag/$', views.student_lag_report, name='student_lag_report'),
     url(r'^reports/student_evaluation/$', 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'^surveys/intake/$', views.intake_survey, name='intake_survey'),
     url(r'^surveys/intake/(?P<student_id>\d+)/$', views.intake_survey, name='intake_survey'),
diff --git a/mande/views/reports.py b/mande/views/reports.py
index a594cf1..9f2a3d4 100644
--- a/mande/views/reports.py
+++ b/mande/views/reports.py
@@ -324,13 +324,15 @@ def student_evaluation_report(request):
  - 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='Check-up',appointment_date__range=[startDate,endDate]))
+                temp['dental'] = len(Health.objects.all().filter(student_id=student,appointment_type='Dental',appointment_date__range=[startDate,endDate]))
+                visits[student] = temp
+
     return render(request, 'mande/studentmedicalreport.html',
-                                {'visits':visits})
+                                {'visits':visits, 'startDate':startDate, 'endDate':endDate})

From acefc8a2b920cf72345b2b09177aec723cad148e Mon Sep 17 00:00:00 2001
From: Suin Kim <suinkim98@gmail.com>
Date: Tue, 17 Nov 2015 14:02:01 +0700
Subject: [PATCH 2/3] Medical report update

Filters work
---
 mande/templates/mande/studentmedicalreport.html | 16 ++++++++--------
 mande/views/reports.py                          |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mande/templates/mande/studentmedicalreport.html b/mande/templates/mande/studentmedicalreport.html
index 02f58d3..f0011dd 100644
--- a/mande/templates/mande/studentmedicalreport.html
+++ b/mande/templates/mande/studentmedicalreport.html
@@ -17,12 +17,12 @@
         </tr></thead>
         <tbody>
             {% 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>
+              <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>
 
@@ -30,14 +30,14 @@
     </div>
 
 {% endif %}
+
+    {% csrf_token %}
     <div class="col-md-3">
         <form method="post" action="{% url 'student_medical_report' %}">
           From:<br>
-          {% csrf_token %}
           <input type="date" name="startDate" class="form-control" id="datePicker1">
           <br>
           To:<br>
-          {% csrf_token %}
           <input type="date" name="endDate" class="form-control" id="datePicker2">
           <br><br>
           <input type="button" value="Submit" class="btn btn-xs btn-success" id="submit">
diff --git a/mande/views/reports.py b/mande/views/reports.py
index 9f2a3d4..b1a09a7 100644
--- a/mande/views/reports.py
+++ b/mande/views/reports.py
@@ -330,9 +330,10 @@ def student_medical_report(request, startDate = None, endDate=None):
     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='Check-up',appointment_date__range=[startDate,endDate]))
-                temp['dental'] = len(Health.objects.all().filter(student_id=student,appointment_type='Dental',appointment_date__range=[startDate,endDate]))
-                visits[student] = temp
+                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, 'startDate':startDate, 'endDate':endDate})

From 74e37d6afe64dd26c9f3a516a599f1e8a30e4f5f Mon Sep 17 00:00:00 2001
From: Suin Kim <suinkim98@gmail.com>
Date: Tue, 17 Nov 2015 16:04:28 +0700
Subject: [PATCH 3/3] Medical Report

Updated title and search form. Finished
---
 .../templates/mande/studentmedicalreport.html | 30 ++++++++++++-------
 mande/urls.py                                 |  4 ---
 mande/views/reports.py                        |  5 +---
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/mande/templates/mande/studentmedicalreport.html b/mande/templates/mande/studentmedicalreport.html
index f0011dd..1400138 100644
--- a/mande/templates/mande/studentmedicalreport.html
+++ b/mande/templates/mande/studentmedicalreport.html
@@ -1,7 +1,11 @@
 {% extends "base.html" %}
 {% load mandefilters %}
 {% block title %}
-Student Medical Report {{startDate}} to {{endDate}}
+{% if not visits %}
+Student Medical and Dental Report
+{% elif visits %}
+Student Medical and Dental Report <small>{{startDate}} to {{endDate}}</small>
+{% endif %}
 {% endblock %}
 
 {% block content %}
@@ -31,16 +35,22 @@
 
 {% endif %}
 
-    {% csrf_token %}
     <div class="col-md-3">
         <form method="post" action="{% url 'student_medical_report' %}">
-          From:<br>
-          <input type="date" name="startDate" class="form-control" id="datePicker1">
-          <br>
-          To:<br>
-          <input type="date" name="endDate" class="form-control" id="datePicker2">
-          <br><br>
-          <input type="button" value="Submit" class="btn btn-xs btn-success" id="submit">
+          {% 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>
 
@@ -50,7 +60,7 @@
  <!-- DataTables JavaScript -->
 <script type="text/javascript">
 $('#datePicker1').val('{{startDate}}');
-$('#datePicker').val('{{endDate}}');
+$('#datePicker2').val('{{endDate}}');
 $(function() {
   $('#submit').click(function() {
       url = '{% url 'student_medical_report'%}' + $('#datePicker1').val() +"\\"+ $('#datePicker2').val()
diff --git a/mande/urls.py b/mande/urls.py
index a45795c..38562f5 100644
--- a/mande/urls.py
+++ b/mande/urls.py
@@ -32,13 +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'),
-<<<<<<< HEAD
     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'),
 
->>>>>>> refs/remotes/AsianHope/master
-
     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'),
diff --git a/mande/views/reports.py b/mande/views/reports.py
index d24beb6..7e9ff0e 100644
--- a/mande/views/reports.py
+++ b/mande/views/reports.py
@@ -367,10 +367,8 @@ def student_medical_report(request, startDate = None, endDate=None):
                     visits[student] = dict(temp)
 
     return render(request, 'mande/studentmedicalreport.html',
-<<<<<<< HEAD
                                 {'visits':visits, 'startDate':startDate, 'endDate':endDate})
-=======
-                                {'visits':visits})
+
 '''
 *****************************************************************************
 Student Dental Report
@@ -392,4 +390,3 @@ def student_dental_report(request):
 
     return render(request, 'mande/studentdentalreport.html',
                             {'dentals_by_month_year':dentals_by_month_year})
->>>>>>> refs/remotes/AsianHope/master