Merge pull request #325 from aviklai/dev

#301 + #302 - added vehicle and involved data for every marker and sending it to the client after getting the values from the lamas dictionary.

main.py

@@ -130,11 +130,40 @@ def markers():
                                       is_thin),
                         mimetype="application/json")
 
-@app.route("/markers/(.*)", methods=["GET"])
-@user_required
-def marker(self, key_name):
-    marker = Marker.get_by_key_name(key_name)
-    return make_response(json.dumps(marker.serialize(self.user)))
+@app.route("/markers/<int:marker_id>", methods=["GET"])
+def marker(marker_id):
+    involved = db_session.query(Involved).filter(Involved.accident_id == marker_id)
+    vehicles = db_session.query(Vehicle).filter(Vehicle.accident_id == marker_id)
+    list_to_return = list()
+    list_to_return.append("Involved: ")
+    for inv in involved:
+        obj = inv.serialize()
+        if (92,obj["age_group"]) in lmsDictionary:
+            obj["age_group"] = lmsDictionary[92,obj["age_group"]]
+        if (66,obj["population_type"]) in lmsDictionary:
+            obj["population_type"] = lmsDictionary[66,obj["population_type"]]
+        if (77,obj["home_district"]) in lmsDictionary:
+            obj["home_district"] = lmsDictionary[77,obj["home_district"]]
+        if (79,obj["home_nafa"]) in lmsDictionary:
+            obj["home_nafa"] = lmsDictionary[79,obj["home_nafa"]]
+        if (80,obj["home_area"]) in lmsDictionary:
+            obj["home_area"] = lmsDictionary[80,obj["home_area"]]
+        if (78,obj["home_municipal_status"]) in lmsDictionary:
+            obj["home_municipal_status"] = lmsDictionary[78,obj["home_municipal_status"]]
+        if (81,obj["home_residence_type"]) in lmsDictionary:
+            obj["home_residence_type"] = lmsDictionary[81,obj["home_residence_type"]]
+        list_to_return.append(obj)
+    list_to_return.append("]")
+    list_to_return.append("Vehicles: ")
+    for veh in vehicles:
+        obj = veh.serialize()
+        if (111,obj["engine_volume"]) in lmsDictionary:
+            obj["engine_volume"] = lmsDictionary[111,obj["engine_volume"]]
+        if (112,obj["total_weight"]) in lmsDictionary:
+            obj["total_weight"] = lmsDictionary[112,obj["total_weight"]]
+        list_to_return.append(obj)
+    return make_response(json.dumps(list_to_return, ensure_ascii=False))
+
 
 @app.route("/discussion", methods=["GET", "POST"])
 @user_optional
@@ -462,9 +491,7 @@ def is_visible(self):
 
 lmsDictionary = {}
 def ReadDictionaries():
-    global dict0
-    global dict1
-    global dict2
+    global lmsDictionary
     parser = argparse.ArgumentParser()
     parser.add_argument('--path', type=str, default="static/data/lms")
     args = parser.parse_args()

models.py

@@ -347,7 +347,7 @@ def serialize(self):
             "id": self.id,
             "accident_id": self.accident_id,
             "involved_type": self.involved_type,
-            "license_aquiring_date": self.license_aquiring_date,
+            "license_acquiring_date": self.license_acquiring_date,
             "age_group": self.age_group,
             "sex": self.sex,
             "car_type": self.car_type,

static/js/marker.js

@@ -154,6 +154,9 @@ var MarkerView = Backbone.View.extend({
         return "/?marker=" + this.model.get("id") + "&" + app.getCurrentUrlParams();
     },
     clickMarker : function() {
+        $.get("/markers/" + this.model.get("id"), function (data) {
+            //alert(data);
+        });
         this.highlight();
         app.closeInfoWindow();