Age groups filter (fix data-for-change#717)

Author: r-darwish

anyway/flask_app.py

@@ -130,12 +130,20 @@ def generate_csv(results):
              'start_time': (int, 25), 'end_time': (int, 25), 'weather': (int, 0), 'road': (int, 0),
              'separation': (int, 0), 'surface': (int, 0), 'acctype': (int, 0), 'controlmeasure': (int, 0),
              'district': (int, 0), 'case_type': (int, 0), 'fetch_markers': (bool, True), 'fetch_vehicles': (bool, True),
-             'fetch_involved': (bool, True),
+             'fetch_involved': (bool, True), 'age_groups': (str, ""),
              'page': (int, 0),
              'per_page': (int, 0)}
 
 def get_kwargs():
     kwargs = {arg: arg_type(request.values.get(arg, default_value)) for (arg, (arg_type, default_value)) in ARG_TYPES.iteritems()}
+
+    if kwargs['age_groups']:
+        try:
+            kwargs['age_groups'] = [int(value) for value in kwargs['age_groups'].split(',')]
+        except ValueError:
+            raise Exception("bad")
+
+
     kwargs.update({arg: datetime.date.fromtimestamp(int(request.values[arg])) for arg in ('start_date', 'end_date')})
     return kwargs
 

anyway/models.py

@@ -338,6 +338,9 @@ def bounding_box_query(is_thin=False, yield_per=None, involved_and_vehicles=Fals
         if is_thin:
             markers = markers.options(load_only("id", "longitude", "latitude"))
 
+        if kwargs.get('age_groups'):
+            markers = markers.join(Involved).filter(Involved.age_group.in_(kwargs.get('age_groups')))
+
         total_records = markers.count()
         if page and per_page:
             markers = markers.offset((page - 1 ) * per_page).limit(per_page)

static/js/app.js

@@ -67,6 +67,7 @@ $(function () {
             this.show_severe = '1';
             this.show_light = '1';
             this.show_urban = 3;
+            this.age_groups = "";
             this.show_intersection = 3;
             this.show_lane = 3;
             this.show_day = 7;
@@ -292,6 +293,7 @@ $(function () {
             params["controlmeasure"] = this.controlmeasure;
             params["district"] = this.district;
             params["case_type"] = this.case_type;
+            params["age_groups"] = this.age_groups;
             return params;
         },
         setMultipleMarkersIcon: function () {
@@ -981,6 +983,33 @@ $(function () {
             this.resetMarkers();
             this.fetchMarkers();
         },
+        getAgeGroupFilter: function() {
+            var age_groups = '';
+
+            if ($("#checkbox-00-04").is(":checked")) {
+                age_groups += "1,";
+            } if ($("#checkbox-05-09").is(":checked")) {
+                age_groups += "2,";
+            } if ($("#checkbox-10-14").is(":checked")) {
+                age_groups += "3,";
+            } if ($("#checkbox-15-19").is(":checked")) {
+                age_groups += "4,";
+            } if ($("#checkbox-20-24").is(":checked")) {
+                age_groups += "5,";
+            } if ($("#checkbox-25-69").is(":checked")) {
+                age_groups += "6,7,8,9,10,11,12,13,14,";
+            } if ($("#checkbox-70-74").is(":checked")) {
+                age_groups += "15,";
+            } if ($("#checkbox-75-79").is(":checked")) {
+                age_groups += "16,";
+            } if ($("#checkbox-80-84").is(":checked")) {
+                age_groups += "17,";
+            } if ($("#checkbox-85-plus").is(":checked")) {
+                age_groups += "18,";
+            }
+
+            return (age_groups ? age_groups.slice(0, -1) : "0");
+        },
         loadFilter: function() {
             if ($("#checkbox-discussions").is(":checked")) { this.show_discussions='1'; } else { this.show_discussions=''; }
             if ($("#checkbox-accidents").is(":checked")) { this.show_markers='1'; } else { this.show_markers=''; }
@@ -1000,6 +1029,8 @@ $(function () {
                 this.show_urban = 0;
             }
 
+            this.age_groups = this.getAgeGroupFilter();
+
             if ($("#checkbox-intersection").is(":checked") && $("#checkbox-nonintersection").is(":checked")) {
                 this.show_intersection = 3;
             } else if ($("#checkbox-intersection").is(":checked")) {

templates/index.html

@@ -853,6 +853,39 @@ <h4 class="modal-title">העדפות:</h4>
                 <label for="checkbox-type-else" class="btn one">פגיעה בהולך רגל</label>
             </div>
 
+            <div class="btn-label">גילאי מעורכים</div>
+            <div class="btn-wrap separator">
+                <input type="checkbox" name="agegroups" id="checkbox-00-04" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-00-04" class="btn one">00-04</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-05-09" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-05-09" class="btn one">05-09</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-10-14" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-10-14" class="btn one">10-14</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-15-19" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-15-19" class="btn one">15-19</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-20-24" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-20-24" class="btn one">20-24</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-25-69" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-25-69" class="btn one">25-69</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-70-74" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-70-74" class="btn one">70-74</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-75-79" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-75-79" class="btn one">75-79</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-80-84" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-80-84" class="btn one">80-84</label>
+
+                <input type="checkbox" name="agegroups" id="checkbox-85-plus" value=2 onclick="app.loadFilter()" checked />
+                <label for="checkbox-85-plus" class="btn one" dir="ltr">85+</label>
+            </div>
+
         </div>
 
         <!-- FILTER ADVANCED (OD)-->