Merge pull request #411 from MPIB/feature_historical_modelbar

Sort models by year for Machine Models Bar dashboard widget

server/plugins/machinemodelsbar/machinemodelsbar.py

@@ -1,5 +1,6 @@
 from collections import Counter
 from operator import itemgetter
+import re
 
 from django.db.models import Q
 
@@ -30,9 +31,15 @@ def get_context(self, queryset, **kwargs):
                     machine.machine_model, machine.machine_model)
             machine_models[machine_model_friendly] += 1
 
-        data = [{"label": model, "value": machine_models[model]}
-                for model in machine_models]
-        sorted_data = sorted(data, key=itemgetter("value"))
+        def getyear(model):
+            try:
+                return re.findall(r'(\d{4})', model)[0]
+            except IndexError:
+                return 'unknown'
+
+        data = [{"label": model, "value": machine_models[model],
+                 "year": getyear(model)} for model in machine_models]
+        sorted_data = sorted(data, key=itemgetter("year"))
 
         context["data"] = sorted_data