From 4cb612ad500aaee2a7db470eca77d8a575924bd0 Mon Sep 17 00:00:00 2001
From: Sven van Hal <sven@svenvanhal.nl>
Date: Wed, 2 Sep 2015 23:26:03 +0200
Subject: [PATCH 1/3] Add educational mailing to Person model.

---
 .../0008_person_mail_educational.py           | 19 +++++++++++++++++++
 ldb/models.py                                 |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ldb/migrations/0008_person_mail_educational.py

diff --git a/ldb/migrations/0008_person_mail_educational.py b/ldb/migrations/0008_person_mail_educational.py
new file mode 100644
index 00000000..e1dcee3c
--- /dev/null
+++ b/ldb/migrations/0008_person_mail_educational.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ldb', '0007_person_membership_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='person',
+            name='mail_educational',
+            field=models.BooleanField(default=True, verbose_name='educational mailing'),
+        ),
+    ]
diff --git a/ldb/models.py b/ldb/models.py
index 7e3bc8e9..b2ab7a43 100644
--- a/ldb/models.py
+++ b/ldb/models.py
@@ -155,6 +155,7 @@ class Meta:
     # Subscriptions
     mail_announcements = models.BooleanField(_('announcements mailing'), default=True)
     mail_company = models.BooleanField(_('company mailing'), default=True)
+    mail_educational = models.BooleanField(_('educational mailing'), default=True)
 
     ldap_username = CharNullField(_('LDAP username'), max_length=64, blank=True, null=True, unique=True)
 
@@ -213,7 +214,7 @@ def formatted_name(self):
     def subscriptions(self):
         return get_attributes(self, ['machazine', 'constitution_card',
                                      'christmas_card', 'board_invites',
-                                     'mail_announcements', 'mail_company'])
+                                     'mail_announcements', 'mail_company', 'mail_educational'])
 
     @property
     def gender_symbol(self):

From 8c968c41496605cc101650e05b1609c249fff632 Mon Sep 17 00:00:00 2001
From: Sven van Hal <sven@svenvanhal.nl>
Date: Wed, 2 Sep 2015 23:26:48 +0200
Subject: [PATCH 2/3] Add educational mailing to mailing preferences.

---
 ldb/admin.py                         |  2 +-
 ldb/export.py                        |  2 +-
 ldb/static/partials/ldb/export.html  | 16 ++++++++++++++++
 ldb/static/partials/ldb/person.html  |  1 +
 ldb/templates/ldb/export_lists.html  |  4 ++++
 ldb/templates/ldb/person_detail.html |  1 +
 ldb/templates/ldb/person_form.html   |  2 +-
 7 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ldb/admin.py b/ldb/admin.py
index cd08cc1b..188902b4 100644
--- a/ldb/admin.py
+++ b/ldb/admin.py
@@ -72,7 +72,7 @@ class PersonAdmin(CompareVersionAdmin):
         (_('Other'), {'fields': ['gender', 'birthdate', 'deceased', 'comment']}),
         (_('Subscriptions'), {'fields': ['machazine', 'board_invites', 'constitution_card',
                                          'christmas_card', 'yearbook',
-                                         'mail_announcements', 'mail_company']}),
+                                         'mail_announcements', 'mail_company', 'mail_educational']}),
     ]
     inlines = [MemberInline, CommitteeMembershipInline, StudentInline, AlumnusInline, EmployeeInline]
 
diff --git a/ldb/export.py b/ldb/export.py
index 70ff6523..70b725b3 100644
--- a/ldb/export.py
+++ b/ldb/export.py
@@ -182,7 +182,7 @@ def set_querysets(self, query):
     allowed_filters = {
         'entity': ['country', 'machazine', 'board_invites', 'constitution_card', 'christmas_card', 'yearbook'],
         'organization': [],
-        'person': ['mail_announcements', 'mail_company'],
+        'person': ['mail_announcements', 'mail_company', 'mail_educational'],
         'person__member': ['associate_member', 'donating_member', 'merit_invitations'],
         'person__student': ['first_year', 'enrolled', 'yearbook_permission'],
         'person__alumnus': [],
diff --git a/ldb/static/partials/ldb/export.html b/ldb/static/partials/ldb/export.html
index 7be9991c..ef8fe0f4 100644
--- a/ldb/static/partials/ldb/export.html
+++ b/ldb/static/partials/ldb/export.html
@@ -185,6 +185,22 @@ <h1>2. Filters</h1>
             <span class="help-block">Is aangemeld voor Bedrijvenmailing.</span>
           </div>
         </div>
+
+        <div class="control-group">
+          <div class="control-label">Onderwijsmailing:</div>
+          <div class="controls">
+            <label class="radio inline">
+              <input type="radio" ng-model="export.filters.person__mail_educational" value="true"> Ja
+            </label>
+            <label class="radio inline">
+              <input type="radio" ng-model="export.filters.person__mail_educational" value="false"> Nee
+            </label>
+            <label class="radio inline">
+              <input type="radio" ng-model="export.filters.person__mail_educational" value="undefined"> Maakt niet uit
+            </label>
+            <span class="help-block">Is aangemeld voor Onderwijsmailing.</span>
+          </div>
+        </div>
       </fieldset>
 
       <fieldset ng-show="export.queryset.members || export.queryset.merit || export.queryset.honorary">
diff --git a/ldb/static/partials/ldb/person.html b/ldb/static/partials/ldb/person.html
index 363a34c7..e97e1376 100644
--- a/ldb/static/partials/ldb/person.html
+++ b/ldb/static/partials/ldb/person.html
@@ -251,6 +251,7 @@ <h2>Aanmeldingen</h2>
 
       <span ch-editable ch-model="person.mail_announcements" ch-template="check"></span> Algemene mailing<br />
       <span ch-editable ch-model="person.mail_company" ch-template="check"></span> Bedrijvenmailing<br />
+      <span ch-editable ch-model="person.mail_educational" ch-template="check"></span> Onderwijsmailing<br />
         
     </section>
 
diff --git a/ldb/templates/ldb/export_lists.html b/ldb/templates/ldb/export_lists.html
index b98d7aaa..4b3f1b06 100644
--- a/ldb/templates/ldb/export_lists.html
+++ b/ldb/templates/ldb/export_lists.html
@@ -12,6 +12,10 @@ <h2>Mailinglijsten</h2>
 
     <a href="{% url 'ldb_export_list' type='mailing' list='company' %}">Bedrijvenmailing</a>
 
+    <br/>
+
+    <a href="{% url 'ldb_export_list' type='mailing' list='educational' %}">Onderwijsmailing</a>
+
     <h2>Adreslijsten</h2>
 
     <a href="{% url 'ldb_export_list' type='address' list='machazine' %}">MaCHazine</a>
diff --git a/ldb/templates/ldb/person_detail.html b/ldb/templates/ldb/person_detail.html
index 9a207bd0..c8c24ad6 100644
--- a/ldb/templates/ldb/person_detail.html
+++ b/ldb/templates/ldb/person_detail.html
@@ -160,6 +160,7 @@ <h2 class="page-header">
           {% stcontrol_janee person 'yearbook' %}
           {% stcontrol_janee person 'mail_announcements' %}
           {% stcontrol_janee person 'mail_company' %}
+          {% stcontrol_janee person 'mail_educational' %}
           {% if person.member.merit_date_from %}
             {% stcontrol_janee person.member 'merit_invitations' %}
           {% endif %}
diff --git a/ldb/templates/ldb/person_form.html b/ldb/templates/ldb/person_form.html
index a88f8cbe..b860fb75 100644
--- a/ldb/templates/ldb/person_form.html
+++ b/ldb/templates/ldb/person_form.html
@@ -83,7 +83,7 @@ <h2 class="page-header">Persoon aanmaken</h2>
         <div class="col-md-6">
           <fieldset>
             <legend>Aanmeldingen</legend>
-            {% get_fieldset machazine,board_invites,constitution_card,christmas_card,yearbook,mail_announcements,mail_company as subscription_fields from form %}
+            {% get_fieldset machazine,board_invites,constitution_card,christmas_card,yearbook,mail_announcements,mail_company,mail_educational as subscription_fields from form %}
             {% bootstrap_form subscription_fields layout='horizontal' horizontal_label_class='col-md-4 visible-md-block visible-lg-block' %}
           </fieldset>
 

From ec9a34e453de9d007548116600555010df62874e Mon Sep 17 00:00:00 2001
From: Sven van Hal <sven@svenvanhal.nl>
Date: Sat, 5 Sep 2015 12:33:54 +0200
Subject: [PATCH 3/3] Rename to education mailing.

---
 ldb/admin.py                                   | 2 +-
 ldb/export.py                                  | 2 +-
 ldb/migrations/0008_person_mail_educational.py | 4 ++--
 ldb/models.py                                  | 4 ++--
 ldb/static/partials/ldb/export.html            | 6 +++---
 ldb/static/partials/ldb/person.html            | 2 +-
 ldb/templates/ldb/export_lists.html            | 2 +-
 ldb/templates/ldb/person_detail.html           | 2 +-
 ldb/templates/ldb/person_form.html             | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ldb/admin.py b/ldb/admin.py
index 188902b4..7c56adca 100644
--- a/ldb/admin.py
+++ b/ldb/admin.py
@@ -72,7 +72,7 @@ class PersonAdmin(CompareVersionAdmin):
         (_('Other'), {'fields': ['gender', 'birthdate', 'deceased', 'comment']}),
         (_('Subscriptions'), {'fields': ['machazine', 'board_invites', 'constitution_card',
                                          'christmas_card', 'yearbook',
-                                         'mail_announcements', 'mail_company', 'mail_educational']}),
+                                         'mail_announcements', 'mail_company', 'mail_education']}),
     ]
     inlines = [MemberInline, CommitteeMembershipInline, StudentInline, AlumnusInline, EmployeeInline]
 
diff --git a/ldb/export.py b/ldb/export.py
index 70b725b3..e755fe28 100644
--- a/ldb/export.py
+++ b/ldb/export.py
@@ -182,7 +182,7 @@ def set_querysets(self, query):
     allowed_filters = {
         'entity': ['country', 'machazine', 'board_invites', 'constitution_card', 'christmas_card', 'yearbook'],
         'organization': [],
-        'person': ['mail_announcements', 'mail_company', 'mail_educational'],
+        'person': ['mail_announcements', 'mail_company', 'mail_education'],
         'person__member': ['associate_member', 'donating_member', 'merit_invitations'],
         'person__student': ['first_year', 'enrolled', 'yearbook_permission'],
         'person__alumnus': [],
diff --git a/ldb/migrations/0008_person_mail_educational.py b/ldb/migrations/0008_person_mail_educational.py
index e1dcee3c..f13eec3f 100644
--- a/ldb/migrations/0008_person_mail_educational.py
+++ b/ldb/migrations/0008_person_mail_educational.py
@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name='person',
-            name='mail_educational',
-            field=models.BooleanField(default=True, verbose_name='educational mailing'),
+            name='mail_education',
+            field=models.BooleanField(default=True, verbose_name='education mailing'),
         ),
     ]
diff --git a/ldb/models.py b/ldb/models.py
index b2ab7a43..4a7a9f93 100644
--- a/ldb/models.py
+++ b/ldb/models.py
@@ -155,7 +155,7 @@ class Meta:
     # Subscriptions
     mail_announcements = models.BooleanField(_('announcements mailing'), default=True)
     mail_company = models.BooleanField(_('company mailing'), default=True)
-    mail_educational = models.BooleanField(_('educational mailing'), default=True)
+    mail_education = models.BooleanField(_('education mailing'), default=True)
 
     ldap_username = CharNullField(_('LDAP username'), max_length=64, blank=True, null=True, unique=True)
 
@@ -214,7 +214,7 @@ def formatted_name(self):
     def subscriptions(self):
         return get_attributes(self, ['machazine', 'constitution_card',
                                      'christmas_card', 'board_invites',
-                                     'mail_announcements', 'mail_company', 'mail_educational'])
+                                     'mail_announcements', 'mail_company', 'mail_education'])
 
     @property
     def gender_symbol(self):
diff --git a/ldb/static/partials/ldb/export.html b/ldb/static/partials/ldb/export.html
index ef8fe0f4..b124c4df 100644
--- a/ldb/static/partials/ldb/export.html
+++ b/ldb/static/partials/ldb/export.html
@@ -190,13 +190,13 @@ <h1>2. Filters</h1>
           <div class="control-label">Onderwijsmailing:</div>
           <div class="controls">
             <label class="radio inline">
-              <input type="radio" ng-model="export.filters.person__mail_educational" value="true"> Ja
+              <input type="radio" ng-model="export.filters.person__mail_education" value="true"> Ja
             </label>
             <label class="radio inline">
-              <input type="radio" ng-model="export.filters.person__mail_educational" value="false"> Nee
+              <input type="radio" ng-model="export.filters.person__mail_education" value="false"> Nee
             </label>
             <label class="radio inline">
-              <input type="radio" ng-model="export.filters.person__mail_educational" value="undefined"> Maakt niet uit
+              <input type="radio" ng-model="export.filters.person__mail_education" value="undefined"> Maakt niet uit
             </label>
             <span class="help-block">Is aangemeld voor Onderwijsmailing.</span>
           </div>
diff --git a/ldb/static/partials/ldb/person.html b/ldb/static/partials/ldb/person.html
index e97e1376..19e44382 100644
--- a/ldb/static/partials/ldb/person.html
+++ b/ldb/static/partials/ldb/person.html
@@ -251,7 +251,7 @@ <h2>Aanmeldingen</h2>
 
       <span ch-editable ch-model="person.mail_announcements" ch-template="check"></span> Algemene mailing<br />
       <span ch-editable ch-model="person.mail_company" ch-template="check"></span> Bedrijvenmailing<br />
-      <span ch-editable ch-model="person.mail_educational" ch-template="check"></span> Onderwijsmailing<br />
+      <span ch-editable ch-model="person.mail_education" ch-template="check"></span> Onderwijsmailing<br />
         
     </section>
 
diff --git a/ldb/templates/ldb/export_lists.html b/ldb/templates/ldb/export_lists.html
index 4b3f1b06..45112fd5 100644
--- a/ldb/templates/ldb/export_lists.html
+++ b/ldb/templates/ldb/export_lists.html
@@ -14,7 +14,7 @@ <h2>Mailinglijsten</h2>
 
     <br/>
 
-    <a href="{% url 'ldb_export_list' type='mailing' list='educational' %}">Onderwijsmailing</a>
+    <a href="{% url 'ldb_export_list' type='mailing' list='education' %}">Onderwijsmailing</a>
 
     <h2>Adreslijsten</h2>
 
diff --git a/ldb/templates/ldb/person_detail.html b/ldb/templates/ldb/person_detail.html
index c8c24ad6..b90419d6 100644
--- a/ldb/templates/ldb/person_detail.html
+++ b/ldb/templates/ldb/person_detail.html
@@ -160,7 +160,7 @@ <h2 class="page-header">
           {% stcontrol_janee person 'yearbook' %}
           {% stcontrol_janee person 'mail_announcements' %}
           {% stcontrol_janee person 'mail_company' %}
-          {% stcontrol_janee person 'mail_educational' %}
+          {% stcontrol_janee person 'mail_education' %}
           {% if person.member.merit_date_from %}
             {% stcontrol_janee person.member 'merit_invitations' %}
           {% endif %}
diff --git a/ldb/templates/ldb/person_form.html b/ldb/templates/ldb/person_form.html
index b860fb75..13e3499a 100644
--- a/ldb/templates/ldb/person_form.html
+++ b/ldb/templates/ldb/person_form.html
@@ -83,7 +83,7 @@ <h2 class="page-header">Persoon aanmaken</h2>
         <div class="col-md-6">
           <fieldset>
             <legend>Aanmeldingen</legend>
-            {% get_fieldset machazine,board_invites,constitution_card,christmas_card,yearbook,mail_announcements,mail_company,mail_educational as subscription_fields from form %}
+            {% get_fieldset machazine,board_invites,constitution_card,christmas_card,yearbook,mail_announcements,mail_company,mail_education as subscription_fields from form %}
             {% bootstrap_form subscription_fields layout='horizontal' horizontal_label_class='col-md-4 visible-md-block visible-lg-block' %}
           </fieldset>