Merge pull request #148 from meomancer/enriched-healthsites

fixing bug when click add new marker
healthsites · Jul 13, 2016 · 203f7e7 · 203f7e7
2 parents e84bc8a + d50b663
commit 203f7e7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/django_project/event_mapper/static/event_mapper/js/add_event.js b/django_project/event_mapper/static/event_mapper/js/add_event.js
@@ -47,6 +47,7 @@ function update_new_event_marker(lat, lng) {
     // change button state
     $("#add_button").show();
     $("#update_button").hide();
+    reset_form();
 }
 
 function remove_new_marker() {

diff --git a/django_project/healthsites/tasks/daily_assessment_report.py b/django_project/healthsites/tasks/daily_assessment_report.py
@@ -36,7 +36,7 @@ def generate_html_report(start_time, end_time):
     date = datetime.strptime("%d %d %d" % (start_time.year, start_time.month, start_time.day), '%Y %m %d')
     reports = []
     for assessment in assessments:
-        reports.append(assessment.get_dict(True))
+        reports.append(assessment.get_dict())
     report_html = render_to_string(
         'report_file.html',
         {

diff --git a/django_project/healthsites/templates/healthsites.html b/django_project/healthsites/templates/healthsites.html
@@ -98,7 +98,6 @@
             if (!$('#side_panel').is(":visible")) {
                 toggle_side_panel();
             }
-            console.log(selected_marker);
             map.removeLayer(selected_marker);
         }
 

diff --git a/django_project/healthsites/templates/report_file.html b/django_project/healthsites/templates/report_file.html
@@ -19,7 +19,7 @@ <h4>number of assessment : {{ number }}</h4>
     <div style="text-align: left">
         {% for assessment in assessments %}
             <hr>
-            <h2><b>{{ assessment.healthsite.name }}</b></h2>
+            <h2><b>{{ assessment.name }}</b></h2>
             <div><b>created : </b>{{ assessment.created_date }}</div>
             <div><b>data captor : </b>{{ assessment.data_captor }}</div>
             <h3><b>assessment criteria</b></h3>

diff --git a/django_project/healthsites/views/assessment_view.py b/django_project/healthsites/views/assessment_view.py
@@ -91,7 +91,7 @@ def download_report(request, year, month, day):
     date = datetime.strptime(year + " " + month + " " + day, '%Y %m %d')
     reports = []
     for assessment in assessments:
-        reports.append(assessment.get_dict(True))
+        reports.append(assessment.get_dict())
     return render_to_response(
         'report_file.html',
         {