From 9334b0fdf44ab17079b5f7ea031764ff94c86bad Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
Date: Mon, 13 Nov 2017 01:07:47 +0100
Subject: [PATCH] Fix age warnings for events not in the current year

---
 htdocs/admin/riders/controller.js   | 3 ++-
 htdocs/register/event/controller.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/riders/controller.js b/htdocs/admin/riders/controller.js
index 867a296c..b13e4efa 100644
--- a/htdocs/admin/riders/controller.js
+++ b/htdocs/admin/riders/controller.js
@@ -241,8 +241,9 @@ var ridersController = [
       $scope.age_year = age_year.getFullYear() - 1970 - 1;
     });
 
+    var year_of_event = (date_of_event(event) || new Date()).getFullYear();
     $scope.year_for_age = function(age) {
-      return new Date().getFullYear() - age - 1;
+      return year_of_event - age - 1;
     }
 
     function update_numbers(old_number, new_number) {
diff --git a/htdocs/register/event/controller.js b/htdocs/register/event/controller.js
index ecde5bc2..722503a6 100644
--- a/htdocs/register/event/controller.js
+++ b/htdocs/register/event/controller.js
@@ -158,8 +158,9 @@ var eventController = [
       otsv_check_class();
     });
 
+    var year_of_event = (date_of_event(event) || new Date()).getFullYear();
     $scope.year_for_age = function(age) {
-      return new Date().getFullYear() - age - 1;
+      return year_of_event - age - 1;
     }
 
     $scope.$watch('rider.class', function(class_) {