From c5ad46c411d67697f2a23cfa6bccc31ee9ca973e Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Mon, 16 Oct 2017 12:42:12 +0300
Subject: [PATCH] Add category to role model

---
 locale/en/LC_MESSAGES/django.mo              | Bin 7141 -> 7141 bytes
 locale/en/LC_MESSAGES/django.po              | 134 ++++++++++++++-----
 locale/fi/LC_MESSAGES/django.mo              | Bin 10580 -> 11243 bytes
 locale/fi/LC_MESSAGES/django.po              | 131 +++++++++++++-----
 members/templates/application_form_base.html |   2 +-
 webapp/forms.py                              |   2 +-
 webapp/migrations/0029_baserole_category.py  |  20 +++
 webapp/models.py                             |  18 +++
 8 files changed, 236 insertions(+), 71 deletions(-)
 create mode 100644 webapp/migrations/0029_baserole_category.py

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 467a9896026d64422093c6bd47dc4f61c397b19f..7317b08406262f8865e4c83742c324be129ac244 100644
GIT binary patch
delta 20
bcmaEA{?vTKT_JWe1w$h%BZJLPgcvyiR!Rov

delta 20
bcmaEA{?vTKT_JWO1p@;s6VuI4gcvyiRw@SP

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index ac4ecc7..9070691 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-12 00:48+0300\n"
+"POT-Creation-Date: 2017-10-16 12:20+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,8 +167,8 @@ msgstr "Select rotation to edit"
 msgid "id"
 msgstr "id"
 
-#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93
-#: webapp/models.py:126 webapp/templates/kaehmy_list.html:40
+#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:110
+#: webapp/models.py:144 webapp/templates/kaehmy_list.html:40
 msgid "Name"
 msgstr "Name"
 
@@ -210,7 +210,7 @@ msgstr "First name"
 msgid "Last name"
 msgstr "Last name"
 
-#: members/models.py:16 webapp/models.py:127
+#: members/models.py:16 webapp/models.py:145
 #: webapp/templates/kaehmy_list.html:44
 msgid "Email"
 msgstr "Email"
@@ -556,14 +556,18 @@ msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 msgid "Custom roles"
 msgstr "Total challenges:"
 
-#: webapp/forms.py:30
+#: webapp/forms.py:30 webapp/forms.py:33
 #, fuzzy
 #| msgid "Total challenges:"
 msgid "Preset roles"
 msgstr "Total challenges:"
 
-#: webapp/forms.py:40
-msgid "Invalid value"
+#: webapp/forms.py:41
+msgid "Invalid phone number"
+msgstr ""
+
+#: webapp/forms.py:49
+msgid "Custom role with the same name already exists."
 msgstr ""
 
 #: webapp/models.py:17
@@ -622,95 +626,165 @@ msgstr "Rotation"
 msgid "Registrations"
 msgstr "Rotations"
 
-#: webapp/models.py:94 webapp/models.py:166
+#: webapp/models.py:94
+#, fuzzy
+#| msgid "Corporate"
+msgid "Corporate affairs"
+msgstr "Corporate"
+
+#: webapp/models.py:95 webapp/templates/freshmen.html:7
+#: webapp/templates/navigation.html:16
+msgid "Freshmen"
+msgstr "Freshmen"
+
+#: webapp/models.py:96 webapp/templates/international.html:7
+#: webapp/templates/navigation.html:30
+msgid "International"
+msgstr "International"
+
+#: webapp/models.py:97
+#, fuzzy
+#| msgid "External image"
+msgid "External affairs"
+msgstr "External image"
+
+#: webapp/models.py:98
+msgid "Media"
+msgstr ""
+
+#: webapp/models.py:99
+msgid "Technology"
+msgstr ""
+
+#: webapp/models.py:100
+msgid "Wellbeing"
+msgstr ""
+
+#: webapp/models.py:101
+msgid "Elepaja"
+msgstr ""
+
+#: webapp/models.py:102
+msgid "Ceremonies"
+msgstr ""
+
+#: webapp/models.py:103
+msgid "Culture"
+msgstr ""
+
+#: webapp/models.py:104
+msgid "Studies"
+msgstr ""
+
+#: webapp/models.py:105
+#, fuzzy
+#| msgid "Sössö articles"
+msgid "Sössö magazine"
+msgstr "Sössö articles"
+
+#: webapp/models.py:106
+#, fuzzy
+#| msgid "Applications"
+msgid "Alumni relations"
+msgstr "Applications"
+
+#: webapp/models.py:107
+msgid "Others"
+msgstr ""
+
+#: webapp/models.py:111 webapp/models.py:184
 #, fuzzy
 #| msgid "Add member"
 msgid "Board member"
 msgstr "Add member"
 
-#: webapp/models.py:98
+#: webapp/models.py:112
+msgid "Category"
+msgstr ""
+
+#: webapp/models.py:116
 #, fuzzy
 #| msgid "Add member"
 msgid "board member"
 msgstr "Add member"
 
-#: webapp/models.py:104
+#: webapp/models.py:122
 #, fuzzy
 #| msgid "Duration"
 msgid "Description"
 msgstr "Duration"
 
-#: webapp/models.py:105
+#: webapp/models.py:123
 msgid "Summary"
 msgstr ""
 
-#: webapp/models.py:112
+#: webapp/models.py:130
 #, fuzzy
 #| msgid "Total challenges:"
 msgid "Preset kaehmy role"
 msgstr "Total challenges:"
 
-#: webapp/models.py:113
+#: webapp/models.py:131
 #, fuzzy
 #| msgid "Total challenges:"
 msgid "Preset kaehmy roles"
 msgstr "Total challenges:"
 
-#: webapp/models.py:120
+#: webapp/models.py:138
 #, fuzzy
 #| msgid "Total challenges:"
 msgid "Custom kaehmy role"
 msgstr "Total challenges:"
 
-#: webapp/models.py:121
+#: webapp/models.py:139
 #, fuzzy
 #| msgid "Total challenges:"
 msgid "Custom kaehmy roles"
 msgstr "Total challenges:"
 
-#: webapp/models.py:140
+#: webapp/models.py:158
 msgid "Message"
 msgstr ""
 
-#: webapp/models.py:142
+#: webapp/models.py:160
 msgid "Timestamp"
 msgstr ""
 
-#: webapp/models.py:160 webapp/models.py:224
+#: webapp/models.py:178 webapp/models.py:242
 msgid "Phone number"
 msgstr ""
 
-#: webapp/models.py:161
+#: webapp/models.py:179
 msgid "Year"
 msgstr ""
 
-#: webapp/models.py:162
+#: webapp/models.py:180
 msgid "Text"
 msgstr ""
 
-#: webapp/models.py:164
+#: webapp/models.py:182
 msgid "Custom role name"
 msgstr ""
 
-#: webapp/models.py:174
+#: webapp/models.py:192
 #, fuzzy
 #| msgid "Member applications"
 msgid "Kaehmy application: {}"
 msgstr "Member applications"
 
-#: webapp/models.py:209
+#: webapp/models.py:227
 msgid "Role"
 msgstr ""
 
-#: webapp/models.py:211
+#: webapp/models.py:229
 msgid "Start date"
 msgstr ""
 
-#: webapp/models.py:212
+#: webapp/models.py:230
 msgid "End date"
 msgstr ""
 
-#: webapp/models.py:222
+#: webapp/models.py:240
 msgid "Official"
 msgstr ""
 
@@ -730,18 +804,10 @@ msgstr "Contact"
 msgid "Event calendar"
 msgstr "Event calendar"
 
-#: webapp/templates/freshmen.html:7 webapp/templates/navigation.html:16
-msgid "Freshmen"
-msgstr "Freshmen"
-
 #: webapp/templates/guild.html:7
 msgid "Kilta"
 msgstr "Guild"
 
-#: webapp/templates/international.html:7 webapp/templates/navigation.html:30
-msgid "International"
-msgstr "International"
-
 #: webapp/templates/jobs.html:7 webapp/templates/navigation.html:20
 msgid "Jobs"
 msgstr "Jobs"
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index b7afd579d45c1f58a952d099b271046d7ecbc511..bae8927ce573a7896898a714e3d376ba0ae543f6 100644
GIT binary patch
delta 4762
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

delta 4155
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

diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index 5ff63fa..76fb992 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-12 00:48+0300\n"
+"POT-Creation-Date: 2017-10-16 12:20+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -168,8 +168,8 @@ msgstr "Valitse muokattava rotaatio"
 msgid "id"
 msgstr "id"
 
-#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93
-#: webapp/models.py:126 webapp/templates/kaehmy_list.html:40
+#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:110
+#: webapp/models.py:144 webapp/templates/kaehmy_list.html:40
 msgid "Name"
 msgstr "Nimi"
 
@@ -209,7 +209,7 @@ msgstr "Etunimi"
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: members/models.py:16 webapp/models.py:127
+#: members/models.py:16 webapp/models.py:145
 #: webapp/templates/kaehmy_list.html:44
 msgid "Email"
 msgstr "Sähköposti"
@@ -547,13 +547,17 @@ msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 msgid "Custom roles"
 msgstr "Uudet virat"
 
-#: webapp/forms.py:30
+#: webapp/forms.py:30 webapp/forms.py:33
 msgid "Preset roles"
 msgstr "Kaehmyvirat"
 
-#: webapp/forms.py:40
-msgid "Invalid value"
-msgstr "Epäkelpo arvo"
+#: webapp/forms.py:41
+msgid "Invalid phone number"
+msgstr "Virheellinen puhelinnumero"
+
+#: webapp/forms.py:49
+msgid "Custom role with the same name already exists."
+msgstr "Samanniminen virka on jo olemassa"
 
 #: webapp/models.py:17
 msgid "Webapp"
@@ -603,79 +607,141 @@ msgstr "Ilmoittautuminen"
 msgid "Registrations"
 msgstr "Ilmoittautumiset"
 
-#: webapp/models.py:94 webapp/models.py:166
+#: webapp/models.py:94
+msgid "Corporate affairs"
+msgstr "Yrityssuhteet"
+
+#: webapp/models.py:95 webapp/templates/freshmen.html:7
+#: webapp/templates/navigation.html:16
+msgid "Freshmen"
+msgstr "Fuksit"
+
+#: webapp/models.py:96 webapp/templates/international.html:7
+#: webapp/templates/navigation.html:30
+msgid "International"
+msgstr "International"
+
+#: webapp/models.py:97
+msgid "External affairs"
+msgstr "Ulkosuhteet"
+
+#: webapp/models.py:98
+msgid "Media"
+msgstr "Media"
+
+#: webapp/models.py:99
+msgid "Technology"
+msgstr "Teknologia"
+
+#: webapp/models.py:100
+msgid "Wellbeing"
+msgstr "Hyvinvointi"
+
+#: webapp/models.py:101
+msgid "Elepaja"
+msgstr "Elepaja"
+
+#: webapp/models.py:102
+msgid "Ceremonies"
+msgstr "Hupitapahtumat"
+
+#: webapp/models.py:103
+msgid "Culture"
+msgstr "Kulttuuri"
+
+#: webapp/models.py:104
+msgid "Studies"
+msgstr "Opinnot"
+
+#: webapp/models.py:105
+msgid "Sössö magazine"
+msgstr "Kiltalehti Sössö"
+
+#: webapp/models.py:106
+msgid "Alumni relations"
+msgstr "Alumnisuhteet"
+
+#: webapp/models.py:107
+msgid "Others"
+msgstr "Muut"
+
+#: webapp/models.py:111 webapp/models.py:184
 msgid "Board member"
 msgstr "Hallituksen jäsen"
 
-#: webapp/models.py:98
+#: webapp/models.py:112
+msgid "Category"
+msgstr "Kategoria"
+
+#: webapp/models.py:116
 msgid "board member"
 msgstr "Hallituksen jäsen"
 
-#: webapp/models.py:104
+#: webapp/models.py:122
 msgid "Description"
 msgstr "Kuvaus"
 
-#: webapp/models.py:105
+#: webapp/models.py:123
 msgid "Summary"
 msgstr "Tiivistelmä"
 
-#: webapp/models.py:112
+#: webapp/models.py:130
 msgid "Preset kaehmy role"
 msgstr "Kaehmyvirka"
 
-#: webapp/models.py:113
+#: webapp/models.py:131
 msgid "Preset kaehmy roles"
 msgstr "Kaehmyvirat"
 
-#: webapp/models.py:120
+#: webapp/models.py:138
 msgid "Custom kaehmy role"
 msgstr "Uusi virka"
 
-#: webapp/models.py:121
+#: webapp/models.py:139
 msgid "Custom kaehmy roles"
 msgstr "Uudet kaehmyvirat"
 
-#: webapp/models.py:140
+#: webapp/models.py:158
 msgid "Message"
 msgstr "Viesti"
 
-#: webapp/models.py:142
+#: webapp/models.py:160
 msgid "Timestamp"
 msgstr "Aikaleima"
 
-#: webapp/models.py:160 webapp/models.py:224
+#: webapp/models.py:178 webapp/models.py:242
 msgid "Phone number"
 msgstr "Puhelinnumero"
 
-#: webapp/models.py:161
+#: webapp/models.py:179
 msgid "Year"
 msgstr "Vuosi"
 
-#: webapp/models.py:162
+#: webapp/models.py:180
 msgid "Text"
 msgstr "Teksti"
 
-#: webapp/models.py:164
+#: webapp/models.py:182
 msgid "Custom role name"
 msgstr "Uusi virka"
 
-#: webapp/models.py:174
+#: webapp/models.py:192
 msgid "Kaehmy application: {}"
 msgstr "Kaehmy: {}"
 
-#: webapp/models.py:209
+#: webapp/models.py:227
 msgid "Role"
 msgstr "Rooli"
 
-#: webapp/models.py:211
+#: webapp/models.py:229
 msgid "Start date"
 msgstr "Alkupäivämäärä"
 
-#: webapp/models.py:212
+#: webapp/models.py:230
 msgid "End date"
 msgstr "Loppupäivämäärä"
 
-#: webapp/models.py:222
+#: webapp/models.py:240
 msgid "Official"
 msgstr "Toimihenkilö"
 
@@ -695,18 +761,10 @@ msgstr "Yhteystiedot"
 msgid "Event calendar"
 msgstr "Tapahtumakalenteri"
 
-#: webapp/templates/freshmen.html:7 webapp/templates/navigation.html:16
-msgid "Freshmen"
-msgstr "Fuksit"
-
 #: webapp/templates/guild.html:7
 msgid "Kilta"
 msgstr "Kilta"
 
-#: webapp/templates/international.html:7 webapp/templates/navigation.html:30
-msgid "International"
-msgstr "International"
-
 #: webapp/templates/jobs.html:7 webapp/templates/navigation.html:20
 msgid "Jobs"
 msgstr "Työpaikat"
@@ -805,6 +863,9 @@ msgstr "Kaikki haasteet"
 msgid "Total challenges:"
 msgstr "Haasteita yhteensä:"
 
+#~ msgid "Invalid value"
+#~ msgstr "Epäkelpo arvo"
+
 #~ msgid "Roles"
 #~ msgstr "Roolit"
 
diff --git a/members/templates/application_form_base.html b/members/templates/application_form_base.html
index 5f57e1b..aa0ae3a 100644
--- a/members/templates/application_form_base.html
+++ b/members/templates/application_form_base.html
@@ -5,7 +5,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="uli uli">
+        <meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
         <meta name="author" content="veedeeämkoo">
 
         <title>Jäsenhakemus</title>
diff --git a/webapp/forms.py b/webapp/forms.py
index 6ca9737..d5c7067 100644
--- a/webapp/forms.py
+++ b/webapp/forms.py
@@ -29,7 +29,7 @@ class KaehmyForm_Form(forms.ModelForm):
         self.fields["custom_roles"].queryset = CustomKaehmyRole.objects.all()
         self.fields["preset_roles"].widget = forms.widgets.CheckboxSelectMultiple(attrs={'title': _('Preset roles')})
         self.fields["preset_roles"].help_text = ""
-        self.fields["preset_roles"].queryset = PresetKaehmyRole.objects.all()
+        self.fields["preset_roles"].queryset = PresetKaehmyRole.objects.order_by('category')
         self.fields["preset_roles"].label = _('Preset roles')
 
     def clean_phone_number(self):
diff --git a/webapp/migrations/0029_baserole_category.py b/webapp/migrations/0029_baserole_category.py
new file mode 100644
index 0000000..39ad05f
--- /dev/null
+++ b/webapp/migrations/0029_baserole_category.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-16 09:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0028_telegramchannel'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='baserole',
+            name='category',
+            field=models.CharField(choices=[('corporate', 'Corporate affairs'), ('freshman', 'Freshmen'), ('international', 'International'), ('external', 'External affairs'), ('media', 'Media'), ('tech', 'Technology'), ('wellbeing', 'Wellbeing'), ('elepaja', 'Elepaja'), ('ceremonies', 'Ceremonies'), ('culture', 'Culture'), ('studies', 'Studies'), ('sosso', 'Sössö magazine'), ('alumni', 'Alumni relations'), ('others', 'Others')], default='others', max_length=255, verbose_name='Category'),
+        ),
+    ]
diff --git a/webapp/models.py b/webapp/models.py
index b1a3ae1..af01aab 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -90,8 +90,26 @@ class Registration(models.Model):
 class BaseRole(models.Model):
     """Base model for occupations/roles."""
 
+    CATEGORIES = (
+        ('corporate', _('Corporate affairs')),
+        ('freshman', _('Freshmen')),
+        ('international', _('International')),
+        ('external', _('External affairs')),
+        ('media', _('Media')),
+        ('tech', _('Technology')),
+        ('wellbeing', _('Wellbeing')),
+        ('elepaja', _('Elepaja')),
+        ('ceremonies', _('Ceremonies')),
+        ('culture', _('Culture')),
+        ('studies', _('Studies')),
+        ('sosso', _('Sössö magazine')),
+        ('alumni', _('Alumni relations')),
+        ('others', _('Others')),
+    )
+
     name = models.CharField(_('Name'), max_length=255)
     is_board = models.BooleanField(_('Board member'))
+    category = models.CharField(_('Category'), choices=CATEGORIES, default='others', max_length=255)
 
     def __str__(self):
         n = self.name.capitalize()