diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
old mode 100644
new mode 100755
diff --git a/LICENSE.txt b/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/VIPSWeb/__init__.py b/VIPSWeb/__init__.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/context_processors.py b/VIPSWeb/context_processors.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/local_settings_sample.py b/VIPSWeb/local_settings_sample.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.mo b/VIPSWeb/locale/bg/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.mo b/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.mo b/VIPSWeb/locale/bs/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/djangojs.mo b/VIPSWeb/locale/bs/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/bs/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.mo b/VIPSWeb/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.po b/VIPSWeb/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/djangojs.mo b/VIPSWeb/locale/de/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/de/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.mo b/VIPSWeb/locale/fi/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.po b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/djangojs.mo b/VIPSWeb/locale/fi/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/fi/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.mo b/VIPSWeb/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.mo b/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.mo b/VIPSWeb/locale/vi/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.po b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/djangojs.mo b/VIPSWeb/locale/vi/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/vi/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/djangojs.mo b/VIPSWeb/locale/zh_CN/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/zh_CN/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/bootstrap-theme.css b/VIPSWeb/static/css/3rdparty/bootstrap-theme.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/bootstrap-theme.min.css b/VIPSWeb/static/css/3rdparty/bootstrap-theme.min.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/bootstrap.css b/VIPSWeb/static/css/3rdparty/bootstrap.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/bootstrap.min.css b/VIPSWeb/static/css/3rdparty/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/chosen-bootstrap.css b/VIPSWeb/static/css/3rdparty/chosen-bootstrap.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/chosen-sprite.png b/VIPSWeb/static/css/3rdparty/chosen-sprite.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/chosen-sprite@2x.png b/VIPSWeb/static/css/3rdparty/chosen-sprite@2x.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/chosen.min.css b/VIPSWeb/static/css/3rdparty/chosen.min.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/font-awesome.min.css b/VIPSWeb/static/css/3rdparty/font-awesome.min.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/light-bottom.css b/VIPSWeb/static/css/3rdparty/light-bottom.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/ol.css b/VIPSWeb/static/css/3rdparty/ol.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/3rdparty/weather-icons.min.css b/VIPSWeb/static/css/3rdparty/weather-icons.min.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/fonts/fontawesome-webfont.ttf b/VIPSWeb/static/css/fonts/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/fonts/fontawesome-webfont.woff b/VIPSWeb/static/css/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/fonts/fontawesome-webfont.woff2 b/VIPSWeb/static/css/fonts/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/add_to_favourites.png b/VIPSWeb/static/css/icons/add_to_favourites.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/checkbox_checked.png b/VIPSWeb/static/css/icons/checkbox_checked.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/checkbox_unchecked.png b/VIPSWeb/static/css/icons/checkbox_unchecked.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/forecast_status_1.png b/VIPSWeb/static/css/icons/forecast_status_1.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/forecast_status_2.png b/VIPSWeb/static/css/icons/forecast_status_2.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/forecast_status_3.png b/VIPSWeb/static/css/icons/forecast_status_3.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/forecast_status_4.png b/VIPSWeb/static/css/icons/forecast_status_4.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/radio_checked.png b/VIPSWeb/static/css/icons/radio_checked.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/radio_unchecked.png b/VIPSWeb/static/css/icons/radio_unchecked.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/remove_from_favourites.png b/VIPSWeb/static/css/icons/remove_from_favourites.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/station_icon_status_0.png b/VIPSWeb/static/css/icons/station_icon_status_0.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/station_icon_status_1.png b/VIPSWeb/static/css/icons/station_icon_status_1.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/station_icon_status_2.png b/VIPSWeb/static/css/icons/station_icon_status_2.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/station_icon_status_3.png b/VIPSWeb/static/css/icons/station_icon_status_3.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/icons/station_icon_status_4.png b/VIPSWeb/static/css/icons/station_icon_status_4.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/signin.css b/VIPSWeb/static/css/signin.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/favicon.ico b/VIPSWeb/static/favicon.ico
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/languageSelectorIcon.png b/VIPSWeb/static/images/languageSelectorIcon.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/languageSelectorIcon_large.png b/VIPSWeb/static/images/languageSelectorIcon_large.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/logo_NLR.gif b/VIPSWeb/static/images/logo_NLR.gif
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/logo_nibio.svg b/VIPSWeb/static/images/logo_nibio.svg
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/logo_vips.png b/VIPSWeb/static/images/logo_vips.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/logo_vips.svg b/VIPSWeb/static/images/logo_vips.svg
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/logo_vips_new.png b/VIPSWeb/static/images/logo_vips_new.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/logo_vips_newest.png b/VIPSWeb/static/images/logo_vips_newest.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/images/placeholders/placeholder_map.png b/VIPSWeb/static/images/placeholders/placeholder_map.png
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/bootstrap.js b/VIPSWeb/static/js/3rdparty/bootstrap.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/bootstrap.min.js b/VIPSWeb/static/js/3rdparty/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/chosen.jquery.min.js b/VIPSWeb/static/js/3rdparty/chosen.jquery.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/cookieconsent.min.js b/VIPSWeb/static/js/3rdparty/cookieconsent.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/highcharts.js b/VIPSWeb/static/js/3rdparty/highcharts.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/html5shiv.js b/VIPSWeb/static/js/3rdparty/html5shiv.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/jquery-1.11.1.min.js b/VIPSWeb/static/js/3rdparty/jquery-1.11.1.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/modernizr_custom.js b/VIPSWeb/static/js/3rdparty/modernizr_custom.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/moment-timezone-with-data.min.js b/VIPSWeb/static/js/3rdparty/moment-timezone-with-data.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/moment-timezone.min.js b/VIPSWeb/static/js/3rdparty/moment-timezone.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/moment.min.js b/VIPSWeb/static/js/3rdparty/moment.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/ol-debug.js b/VIPSWeb/static/js/3rdparty/ol-debug.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/ol.js b/VIPSWeb/static/js/3rdparty/ol.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/3rdparty/respond.min.js b/VIPSWeb/static/js/3rdparty/respond.min.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/forecastmap.js b/VIPSWeb/static/js/forecastmap.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js b/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/util.js b/VIPSWeb/static/js/util.js
old mode 100644
new mode 100755
index db71bdd8b1ad1c0144b30126bfb789592e4aab10..d1e28f9fa7467c27e8cdcfe2980ed8bf6ceb28eb
--- a/VIPSWeb/static/js/util.js
+++ b/VIPSWeb/static/js/util.js
@@ -290,4 +290,27 @@ var sortObservationMessages = function(a,b)
return 0;
};
return 1;
+}
+
+var sortOrganisms = function(a,b)
+{
+ var nameA = getLocalizedOrganismName(a);
+ var nameB = getLocalizedOrganismName(b);
+ return nameA < nameB ? -1 :
+ nameA > nameB ? 1 :
+ 0;
+}
+
+function getMultipleSelectedValues(list)
+{
+ var retVal = [];
+ for(var i=0; i<list.options.length;i++)
+ {
+ var opt = list.options[i];
+ if(opt.selected)
+ {
+ retVal.push(opt.value);
+ }
+ }
+ return retVal;
}
\ No newline at end of file
diff --git a/VIPSWeb/static/js/validateForm.js b/VIPSWeb/static/js/validateForm.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/js/weatherStationSelectorMap.js b/VIPSWeb/static/js/weatherStationSelectorMap.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/test/mockKML.kml b/VIPSWeb/static/test/mockKML.kml
old mode 100644
new mode 100755
diff --git a/VIPSWeb/static/test/oatFloweringModelForm.html b/VIPSWeb/static/test/oatFloweringModelForm.html
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templates/404.html b/VIPSWeb/templates/404.html
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templates/503.html b/VIPSWeb/templates/503.html
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templates/base_with_date_picker.html b/VIPSWeb/templates/base_with_date_picker.html
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templates/settings.js b/VIPSWeb/templates/settings.js
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templatetags/.gitignore b/VIPSWeb/templatetags/.gitignore
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templatetags/__init__.py b/VIPSWeb/templatetags/__init__.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/urls.py b/VIPSWeb/urls.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py
old mode 100644
new mode 100755
diff --git a/VIPSWeb/wsgi.py b/VIPSWeb/wsgi.py
old mode 100644
new mode 100755
diff --git a/applefruitmoth/__init__.py b/applefruitmoth/__init__.py
old mode 100644
new mode 100755
diff --git a/applefruitmoth/admin.py b/applefruitmoth/admin.py
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/de/LC_MESSAGES/django.mo b/applefruitmoth/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/de/LC_MESSAGES/django.po b/applefruitmoth/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/nb/LC_MESSAGES/django.mo b/applefruitmoth/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/nb/LC_MESSAGES/django.po b/applefruitmoth/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/zh_CN/LC_MESSAGES/django.mo b/applefruitmoth/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/zh_CN/LC_MESSAGES/django.po b/applefruitmoth/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/zh_CN/LC_MESSAGES/zh_CN.mo b/applefruitmoth/locale/zh_CN/LC_MESSAGES/zh_CN.mo
old mode 100644
new mode 100755
diff --git a/applefruitmoth/locale/zh_CN/LC_MESSAGES/zh_CN.po b/applefruitmoth/locale/zh_CN/LC_MESSAGES/zh_CN.po
old mode 100644
new mode 100755
diff --git a/applefruitmoth/migrations/__init__.py b/applefruitmoth/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/applefruitmoth/models.py b/applefruitmoth/models.py
old mode 100644
new mode 100755
diff --git a/applefruitmoth/static/applefruitmoth/js/map.js b/applefruitmoth/static/applefruitmoth/js/map.js
old mode 100644
new mode 100755
diff --git a/applefruitmoth/templates/applefruitmoth/index.html b/applefruitmoth/templates/applefruitmoth/index.html
old mode 100644
new mode 100755
diff --git a/applefruitmoth/tests.py b/applefruitmoth/tests.py
old mode 100644
new mode 100755
diff --git a/applefruitmoth/urls.py b/applefruitmoth/urls.py
old mode 100644
new mode 100755
diff --git a/applefruitmoth/views.py b/applefruitmoth/views.py
old mode 100644
new mode 100755
diff --git a/calculators/__init__.py b/calculators/__init__.py
old mode 100644
new mode 100755
diff --git a/calculators/admin.py b/calculators/admin.py
old mode 100644
new mode 100755
diff --git a/calculators/locale/de/LC_MESSAGES/django.mo b/calculators/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/calculators/locale/de/LC_MESSAGES/django.po b/calculators/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/calculators/locale/nb/LC_MESSAGES/django.mo b/calculators/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/calculators/locale/nb/LC_MESSAGES/django.po b/calculators/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/calculators/locale/zh_CN/LC_MESSAGES/django.mo b/calculators/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/calculators/locale/zh_CN/LC_MESSAGES/django.po b/calculators/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/calculators/models.py b/calculators/models.py
old mode 100644
new mode 100755
diff --git a/calculators/static/calculators/formdefinitions/EILForm.json b/calculators/static/calculators/formdefinitions/EILForm.json
old mode 100644
new mode 100755
diff --git a/calculators/static/calculators/js/eil.js b/calculators/static/calculators/js/eil.js
old mode 100644
new mode 100755
diff --git a/calculators/templates/calculators/eil.html b/calculators/templates/calculators/eil.html
old mode 100644
new mode 100755
diff --git a/calculators/templates/calculators/index.html b/calculators/templates/calculators/index.html
old mode 100644
new mode 100755
diff --git a/calculators/tests.py b/calculators/tests.py
old mode 100644
new mode 100755
diff --git a/calculators/urls.py b/calculators/urls.py
old mode 100644
new mode 100755
diff --git a/calculators/views.py b/calculators/views.py
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/__init__.py b/cerealblotchmodels/__init__.py
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/admin.py b/cerealblotchmodels/admin.py
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/locale/de/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/locale/de/LC_MESSAGES/django.po b/cerealblotchmodels/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.po b/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/models.py b/cerealblotchmodels/models.py
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json b/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/index.html b/cerealblotchmodels/templates/cerealblotchmodels/index.html
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/tests.py b/cerealblotchmodels/tests.py
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/urls.py b/cerealblotchmodels/urls.py
old mode 100644
new mode 100755
diff --git a/cerealblotchmodels/views.py b/cerealblotchmodels/views.py
old mode 100644
new mode 100755
diff --git a/common/__init__.py b/common/__init__.py
old mode 100644
new mode 100755
diff --git a/common/middleware/__init__.py b/common/middleware/__init__.py
old mode 100644
new mode 100755
diff --git a/common/middleware/whodid.py b/common/middleware/whodid.py
old mode 100644
new mode 100755
diff --git a/common/util.py b/common/util.py
old mode 100644
new mode 100755
diff --git a/forecasts/__init__.py b/forecasts/__init__.py
old mode 100644
new mode 100755
diff --git a/forecasts/admin.py b/forecasts/admin.py
old mode 100644
new mode 100755
diff --git a/forecasts/locale/bg/LC_MESSAGES/django.mo b/forecasts/locale/bg/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/forecasts/locale/bg/LC_MESSAGES/django.po b/forecasts/locale/bg/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/forecasts/locale/bs/LC_MESSAGES/django.mo b/forecasts/locale/bs/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/forecasts/locale/bs/LC_MESSAGES/django.po b/forecasts/locale/bs/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/forecasts/locale/de/LC_MESSAGES/django.mo b/forecasts/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/forecasts/locale/de/LC_MESSAGES/django.po b/forecasts/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/forecasts/locale/nb/LC_MESSAGES/django.mo b/forecasts/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/forecasts/locale/nb/LC_MESSAGES/django.po b/forecasts/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/forecasts/locale/zh_CN/LC_MESSAGES/django.mo b/forecasts/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/forecasts/locale/zh_CN/LC_MESSAGES/django.po b/forecasts/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/forecasts/models.py b/forecasts/models.py
old mode 100644
new mode 100755
diff --git a/forecasts/static/forecasts/js/forecasts.js b/forecasts/static/forecasts/js/forecasts.js
old mode 100644
new mode 100755
diff --git a/forecasts/templates/forecasts/bogus_translation_template.html b/forecasts/templates/forecasts/bogus_translation_template.html
old mode 100644
new mode 100755
diff --git a/forecasts/templates/forecasts/detail.html b/forecasts/templates/forecasts/detail.html
old mode 100644
new mode 100755
diff --git a/forecasts/templates/forecasts/detail_error.html b/forecasts/templates/forecasts/detail_error.html
old mode 100644
new mode 100755
diff --git a/forecasts/templates/forecasts/index.html b/forecasts/templates/forecasts/index.html
old mode 100644
new mode 100755
diff --git a/forecasts/templates/models/detail.html b/forecasts/templates/models/detail.html
old mode 100644
new mode 100755
diff --git a/forecasts/templates/models/detail_test.html b/forecasts/templates/models/detail_test.html
old mode 100644
new mode 100755
diff --git a/forecasts/templates/models/index.html b/forecasts/templates/models/index.html
old mode 100644
new mode 100755
diff --git a/forecasts/templates/models/modelLocalNames.js b/forecasts/templates/models/modelLocalNames.js
old mode 100644
new mode 100755
diff --git a/forecasts/templatetags/__init__.py b/forecasts/templatetags/__init__.py
old mode 100644
new mode 100755
diff --git a/forecasts/templatetags/forecast_extras.py b/forecasts/templatetags/forecast_extras.py
old mode 100644
new mode 100755
diff --git a/forecasts/tests.py b/forecasts/tests.py
old mode 100644
new mode 100755
diff --git a/forecasts/urls.py b/forecasts/urls.py
old mode 100644
new mode 100755
diff --git a/forecasts/views.py b/forecasts/views.py
old mode 100644
new mode 100755
diff --git a/fusarium/__init__.py b/fusarium/__init__.py
old mode 100644
new mode 100755
diff --git a/fusarium/admin.py b/fusarium/admin.py
old mode 100644
new mode 100755
diff --git a/fusarium/locale/de/LC_MESSAGES/django.mo b/fusarium/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/fusarium/locale/de/LC_MESSAGES/django.po b/fusarium/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/fusarium/locale/nb/LC_MESSAGES/django.mo b/fusarium/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/fusarium/locale/nb/LC_MESSAGES/django.po b/fusarium/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/fusarium/locale/zh_CN/LC_MESSAGES/django.mo b/fusarium/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/fusarium/locale/zh_CN/LC_MESSAGES/django.po b/fusarium/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/fusarium/migrations/__init__.py b/fusarium/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/fusarium/models.py b/fusarium/models.py
old mode 100644
new mode 100755
diff --git a/fusarium/static/fusarium/js/oatFloweringModelForm.js b/fusarium/static/fusarium/js/oatFloweringModelForm.js
old mode 100644
new mode 100755
diff --git a/fusarium/templates/fusarium/oat_flowering.html b/fusarium/templates/fusarium/oat_flowering.html
old mode 100644
new mode 100755
diff --git a/fusarium/tests.py b/fusarium/tests.py
old mode 100644
new mode 100755
diff --git a/fusarium/urls.py b/fusarium/urls.py
old mode 100644
new mode 100755
diff --git a/fusarium/views.py b/fusarium/views.py
old mode 100644
new mode 100755
diff --git a/information/__init__.py b/information/__init__.py
old mode 100644
new mode 100755
diff --git a/information/admin.py b/information/admin.py
old mode 100644
new mode 100755
diff --git a/information/locale/bg/LC_MESSAGES/django.mo b/information/locale/bg/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/information/locale/bg/LC_MESSAGES/django.po b/information/locale/bg/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/information/locale/bs/LC_MESSAGES/django.mo b/information/locale/bs/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/information/locale/bs/LC_MESSAGES/django.po b/information/locale/bs/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/information/locale/de/LC_MESSAGES/django.mo b/information/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/information/locale/de/LC_MESSAGES/django.po b/information/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/information/locale/nb/LC_MESSAGES/django.mo b/information/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/information/locale/nb/LC_MESSAGES/django.po b/information/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/information/locale/zh_CN/LC_MESSAGES/django.mo b/information/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/information/locale/zh_CN/LC_MESSAGES/django.po b/information/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/information/migrations/0001_initial.py b/information/migrations/0001_initial.py
old mode 100644
new mode 100755
diff --git a/information/migrations/0002_information_ordering.py b/information/migrations/0002_information_ordering.py
old mode 100644
new mode 100755
diff --git a/information/migrations/__init__.py b/information/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/information/models.py b/information/models.py
old mode 100644
new mode 100755
diff --git a/information/templates/information/detail.html b/information/templates/information/detail.html
old mode 100644
new mode 100755
diff --git a/information/templates/information/index.html b/information/templates/information/index.html
old mode 100644
new mode 100755
diff --git a/information/tests.py b/information/tests.py
old mode 100644
new mode 100755
diff --git a/information/urls.py b/information/urls.py
old mode 100644
new mode 100755
diff --git a/information/views.py b/information/views.py
old mode 100644
new mode 100755
diff --git a/manage.py b/manage.py
old mode 100644
new mode 100755
diff --git a/observations/__init__.py b/observations/__init__.py
old mode 100644
new mode 100755
diff --git a/observations/admin.py b/observations/admin.py
old mode 100644
new mode 100755
diff --git a/observations/locale/de/LC_MESSAGES/django.mo b/observations/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/observations/locale/de/LC_MESSAGES/django.po b/observations/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/observations/locale/nb/LC_MESSAGES/django.mo b/observations/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/observations/locale/nb/LC_MESSAGES/django.po b/observations/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/observations/locale/zh_CN/LC_MESSAGES/django.mo b/observations/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/observations/locale/zh_CN/LC_MESSAGES/django.po b/observations/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/observations/migrations/__init__.py b/observations/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/observations/models.py b/observations/models.py
old mode 100644
new mode 100755
diff --git a/observations/static/observations/images/bug.png b/observations/static/observations/images/bug.png
old mode 100644
new mode 100755
diff --git a/observations/static/observations/images/bug_medium.png b/observations/static/observations/images/bug_medium.png
old mode 100644
new mode 100755
diff --git a/observations/static/observations/images/observation_marker.png b/observations/static/observations/images/observation_marker.png
old mode 100644
new mode 100755
diff --git a/observations/static/observations/js/observationViewMap.js b/observations/static/observations/js/observationViewMap.js
old mode 100644
new mode 100755
diff --git a/observations/templates/observations/detail.html b/observations/templates/observations/detail.html
old mode 100644
new mode 100755
diff --git a/observations/templates/observations/index.html b/observations/templates/observations/index.html
old mode 100644
new mode 100755
index 5076b6fdfa821ed23e51558fb5c2b25103f81bb9..81ac2e2f00d2002fe187570927aa224cd3b4dc69
--- a/observations/templates/observations/index.html
+++ b/observations/templates/observations/index.html
@@ -29,12 +29,21 @@
<div class="row">
<div class="col-xs-3">
<div class="form-group">
- <select id="pestFilterList" class="form-control" onchange="filterOnPest(this)">
+ <select id="pestFilterList" class="form-control" onchange="filterObservations();">
<option value="-1">{% trans "All pests" %}</option>
</select>
</div>
</div>
- <div class="col-xs-9">
+ <div class="col-xs-3">
+ <div class="form-group">
+ <select name="cropCategoryFilterList" id="cropCategoryFilterList" class="form-control chosen-select" multiple="multiple" onchange="filterObservations();">
+ {% for crop_category in crop_categories|dictsort:"name" %}
+ <option value="{{crop_category.crop_category_id}}">{{crop_category.name}}</option>
+ {% endfor %}
+ </select>
+ </div>
+ </div>
+ <div class="col-xs-6">
</div>
</div>
<table class="table">
@@ -50,21 +59,38 @@
<tbody id="observationList"></tbody>
</table>
+{% endblock %}
+{% block extendCSS %}
+<link href="{% static "css/3rdparty/chosen.min.css" %}" rel="stylesheet" media="screen" />
+<link href="{% static "css/3rdparty/chosen-bootstrap.css" %}" rel="stylesheet" media="screen" />
{% endblock %}
{% block customJS %}
+<script type="text/javascript" src="{% static "js/3rdparty/chosen.jquery.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/3rdparty/moment.min.js" %}"></script>
<script type="text/javascript" src="{% url "views.settings_js" %}"></script>
<script type="text/javascript" src="{% static "js/util.js" %}"></script>
<script type="text/javascript">
var allObservations = [];
- var allPests = {};
+ var allPests = [];
+ var allPestIds = [];
+ var cropCategories = {
+ {% for crop_category in crop_categories %}
+ {{crop_category.crop_category_id}}:{{crop_category.crop_ids}}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ };
$(document).ready(function() {
+ $(".chosen-select").chosen({placeholder_text_multiple:"{% trans "Crops" %}"});
$.getJSON("/vipslogicproxy/rest/observation/broadcast/list/" + settings.vipsOrganizationId, function( json ) {
allObservations = json;
allObservations.sort(sortObservationMessages).reverse();
for(var i in allObservations)
{
- allPests[allObservations[i].organism.organismId] = allObservations[i].organism;
+ var currentOrganism = allObservations[i].organism;
+ if(allPestIds.indexOf(currentOrganism.organismId) < 0)
+ {
+ allPests.push(currentOrganism);
+ allPestIds.push(currentOrganism.organismId);
+ }
}
renderPestFilterList();
renderObservations(allObservations);
@@ -94,6 +120,7 @@
{
var pestFilterList = document.getElementById("pestFilterList");
pestFilterList.options.length = 1;
+ allPests.sort(sortOrganisms);
for(var i in allPests)
{
var pestOpt = new Option(getLocalizedOrganismName(allPests[i]), allPests[i].organismId);
@@ -101,29 +128,62 @@
}
}
+
+ function filterOnCropGroup(cropGroupFilterList)
+ {
+ var selectedCropGroupId = parseInt(cropGroupFilterList.options[cropGroupFilterList.options.selectedIndex].value);
+ }
- function filterOnPest(pestFilterList)
+ function filterObservations()
{
+ var pestFilterList = document.getElementById("pestFilterList");
+ var cropCategoryFilterList = document.getElementById("cropCategoryFilterList");
+
var selectedPestOrganismId = parseInt(pestFilterList.options[pestFilterList.options.selectedIndex].value);
+ var selectedCropCategoryIds = getMultipleSelectedValues(cropCategoryFilterList);
+ //console.info(selectedCropCategoryIds);
var filteredObservations = [];
- if(selectedPestOrganismId == -1)
- {
- filteredObservations = allObservations;
- }
- else
+
+ for(var i=0;i<allObservations.length;i++)
{
- for(var i in allObservations)
- {
- var obs = allObservations[i];
- if(obs.organism.organismId == selectedPestOrganismId)
+ var obs = allObservations[i];
+
+ var validCropCategory = false;
+ if(selectedCropCategoryIds.length > 0)
+ {
+ for(var j=0;j<selectedCropCategoryIds.length;j++)
{
- filteredObservations.push(obs);
- }
+ if(cropCategories[selectedCropCategoryIds[j]].indexOf(obs.cropOrganism.organismId) >= 0)
+ {
+ validCropCategory = true;
+ }
+ }
+ }
+ else
+ {
+ validCropCategory = true;
+ }
+
+ var validPest = false;
+ if(selectedPestOrganismId == -1)
+ {
+ validPest = true;
+ }
+ else if(obs.organism.organismId == selectedPestOrganismId)
+ {
+ validPest = true;
+ }
+
+ if(validCropCategory && validPest)
+ {
+ filteredObservations.push(obs);
}
}
+
renderObservations(filteredObservations);
}
+
</script>
{% endblock %}
\ No newline at end of file
diff --git a/observations/tests.py b/observations/tests.py
old mode 100644
new mode 100755
diff --git a/observations/urls.py b/observations/urls.py
old mode 100644
new mode 100755
diff --git a/observations/views.py b/observations/views.py
old mode 100644
new mode 100755
index 7be7d5390424bdd6fcd5bbf88a87371525b75214..091827f5333ecc2ca7431283c24d7e1fe52f3e62
--- a/observations/views.py
+++ b/observations/views.py
@@ -18,10 +18,12 @@
# @author: Tor-Einar Skog <tor-einar.skog@nibio.no>
from django.shortcuts import render
+from django.utils import translation
+from organisms.models import CropCategory
def index(request):
context = {
-
+ 'crop_categories': CropCategory.get_crop_categories(translation.get_language())
}
return render(request, 'observations/index.html', context)
diff --git a/organisms/__init__.py b/organisms/__init__.py
old mode 100644
new mode 100755
diff --git a/organisms/admin.py b/organisms/admin.py
old mode 100644
new mode 100755
diff --git a/organisms/locale/bs/LC_MESSAGES/django.mo b/organisms/locale/bs/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/organisms/locale/bs/LC_MESSAGES/django.po b/organisms/locale/bs/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/organisms/locale/de/LC_MESSAGES/django.mo b/organisms/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/organisms/locale/de/LC_MESSAGES/django.po b/organisms/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/organisms/locale/nb/LC_MESSAGES/custom.mo b/organisms/locale/nb/LC_MESSAGES/custom.mo
old mode 100644
new mode 100755
diff --git a/organisms/locale/nb/LC_MESSAGES/custom.po b/organisms/locale/nb/LC_MESSAGES/custom.po
old mode 100644
new mode 100755
diff --git a/organisms/locale/nb/LC_MESSAGES/django.mo b/organisms/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/organisms/locale/nb/LC_MESSAGES/django.po b/organisms/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/organisms/locale/zh_CN/LC_MESSAGES/django.mo b/organisms/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/organisms/locale/zh_CN/LC_MESSAGES/django.po b/organisms/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/organisms/models.py b/organisms/models.py
old mode 100644
new mode 100755
diff --git a/organisms/static/organisms/organismsUtil.js b/organisms/static/organisms/organismsUtil.js
old mode 100644
new mode 100755
diff --git a/organisms/templates/organisms/index.html b/organisms/templates/organisms/index.html
old mode 100644
new mode 100755
diff --git a/organisms/tests.py b/organisms/tests.py
old mode 100644
new mode 100755
diff --git a/organisms/urls.py b/organisms/urls.py
old mode 100644
new mode 100755
diff --git a/organisms/views.py b/organisms/views.py
old mode 100644
new mode 100755
diff --git a/requirements.txt b/requirements.txt
old mode 100644
new mode 100755
diff --git a/roughage/__init__.py b/roughage/__init__.py
old mode 100644
new mode 100755
diff --git a/roughage/admin.py b/roughage/admin.py
old mode 100644
new mode 100755
diff --git a/roughage/locale/de/LC_MESSAGES/django.mo b/roughage/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/roughage/locale/de/LC_MESSAGES/django.po b/roughage/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/roughage/locale/de/LC_MESSAGES/djangojs.mo b/roughage/locale/de/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/roughage/locale/de/LC_MESSAGES/djangojs.po b/roughage/locale/de/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/roughage/locale/nb/LC_MESSAGES/django.mo b/roughage/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/roughage/locale/nb/LC_MESSAGES/django.po b/roughage/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/roughage/locale/nb/LC_MESSAGES/djangojs.mo b/roughage/locale/nb/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/roughage/locale/nb/LC_MESSAGES/djangojs.po b/roughage/locale/nb/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/django.mo b/roughage/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/django.po b/roughage/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/djangojs.mo b/roughage/locale/zh_CN/LC_MESSAGES/djangojs.mo
old mode 100644
new mode 100755
diff --git a/roughage/locale/zh_CN/LC_MESSAGES/djangojs.po b/roughage/locale/zh_CN/LC_MESSAGES/djangojs.po
old mode 100644
new mode 100755
diff --git a/roughage/migrations/__init__.py b/roughage/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/roughage/models.py b/roughage/models.py
old mode 100644
new mode 100755
diff --git a/roughage/static/roughage/formdefinitions/grassDrying.json b/roughage/static/roughage/formdefinitions/grassDrying.json
old mode 100644
new mode 100755
diff --git a/roughage/static/roughage/formdefinitions/roughageNutrition.json b/roughage/static/roughage/formdefinitions/roughageNutrition.json
old mode 100644
new mode 100755
diff --git a/roughage/static/roughage/js/nutrition.js b/roughage/static/roughage/js/nutrition.js
old mode 100644
new mode 100755
diff --git a/roughage/templates/roughage/nutrition.html b/roughage/templates/roughage/nutrition.html
old mode 100644
new mode 100755
diff --git a/roughage/tests.py b/roughage/tests.py
old mode 100644
new mode 100755
diff --git a/roughage/urls.py b/roughage/urls.py
old mode 100644
new mode 100755
diff --git a/roughage/views.py b/roughage/views.py
old mode 100644
new mode 100755
diff --git a/security/__init__.py b/security/__init__.py
old mode 100644
new mode 100755
diff --git a/security/admin.py b/security/admin.py
old mode 100644
new mode 100755
diff --git a/security/middleware/__init__.py b/security/middleware/__init__.py
old mode 100644
new mode 100755
diff --git a/security/middleware/check_login_middleware.py b/security/middleware/check_login_middleware.py
old mode 100644
new mode 100755
diff --git a/security/migrations/__init__.py b/security/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/security/models.py b/security/models.py
old mode 100644
new mode 100755
diff --git a/security/static/security/js/crossdomainstorage.js b/security/static/security/js/crossdomainstorage.js
old mode 100644
new mode 100755
diff --git a/security/static/security/js/loginHandler.js b/security/static/security/js/loginHandler.js
old mode 100644
new mode 100755
diff --git a/security/templates/security/login_form.html b/security/templates/security/login_form.html
old mode 100644
new mode 100755
diff --git a/security/tests.py b/security/tests.py
old mode 100644
new mode 100755
diff --git a/security/urls.py b/security/urls.py
old mode 100644
new mode 100755
diff --git a/security/views.py b/security/views.py
old mode 100644
new mode 100755
diff --git a/vips_messages/__init__.py b/vips_messages/__init__.py
old mode 100644
new mode 100755
diff --git a/vips_messages/admin.py b/vips_messages/admin.py
old mode 100644
new mode 100755
diff --git a/vips_messages/apps.py b/vips_messages/apps.py
old mode 100644
new mode 100755
diff --git a/vips_messages/forms.py b/vips_messages/forms.py
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/bg/LC_MESSAGES/django.mo b/vips_messages/locale/bg/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/bg/LC_MESSAGES/django.po b/vips_messages/locale/bg/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/bs/LC_MESSAGES/django.mo b/vips_messages/locale/bs/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/bs/LC_MESSAGES/django.po b/vips_messages/locale/bs/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/de/LC_MESSAGES/django.mo b/vips_messages/locale/de/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/de/LC_MESSAGES/django.po b/vips_messages/locale/de/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/nb/LC_MESSAGES/django.mo b/vips_messages/locale/nb/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/nb/LC_MESSAGES/django.po b/vips_messages/locale/nb/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/vi/LC_MESSAGES/django.mo b/vips_messages/locale/vi/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/vi/LC_MESSAGES/django.po b/vips_messages/locale/vi/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/zh_CN/LC_MESSAGES/django.mo b/vips_messages/locale/zh_CN/LC_MESSAGES/django.mo
old mode 100644
new mode 100755
diff --git a/vips_messages/locale/zh_CN/LC_MESSAGES/django.po b/vips_messages/locale/zh_CN/LC_MESSAGES/django.po
old mode 100644
new mode 100755
diff --git a/vips_messages/migrations/0001_initial.py b/vips_messages/migrations/0001_initial.py
old mode 100644
new mode 100755
diff --git a/vips_messages/migrations/0002_auto_20160303_1002.py b/vips_messages/migrations/0002_auto_20160303_1002.py
old mode 100644
new mode 100755
diff --git a/vips_messages/migrations/0003_auto_20160331_1121.py b/vips_messages/migrations/0003_auto_20160331_1121.py
old mode 100644
new mode 100755
diff --git a/vips_messages/migrations/0004_auto_20160712_1001.py b/vips_messages/migrations/0004_auto_20160712_1001.py
old mode 100644
new mode 100755
diff --git a/vips_messages/migrations/__init__.py b/vips_messages/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/vips_messages/models.py b/vips_messages/models.py
old mode 100644
new mode 100755
diff --git a/vips_messages/templates/messages/detail.html b/vips_messages/templates/messages/detail.html
old mode 100644
new mode 100755
diff --git a/vips_messages/templates/messages/index.html b/vips_messages/templates/messages/index.html
old mode 100644
new mode 100755
index 1d39ba2905f785b7588a9f77be030e05c5c00671..50a64ffccc187480d20275d5a8dee59535b06a4c
--- a/vips_messages/templates/messages/index.html
+++ b/vips_messages/templates/messages/index.html
@@ -18,7 +18,7 @@
<div class="form-group">
<select name="cropCategoryIds" class="form-control chosen-select" onchange="cropCategoryFilter(this);">
<option value="-1">{% trans "All crop categories" %}</option>
- {% for crop_category in crop_categories %}
+ {% for crop_category in crop_categories|dictsort:"name" %}
<option value="{{crop_category.crop_category_id}}">{{crop_category.name}}</option>
{% endfor %}
</select>
diff --git a/vips_messages/tests.py b/vips_messages/tests.py
old mode 100644
new mode 100755
diff --git a/vips_messages/urls.py b/vips_messages/urls.py
old mode 100644
new mode 100755
diff --git a/vips_messages/views.py b/vips_messages/views.py
old mode 100644
new mode 100755