TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Add category to role model

See merge request !60
This commit is contained in:
Jan Tuomi
2017-10-16 12:42:36 +03:00
parent 4f499af4cf c5ad46c411
commit d7d0b377f2
8 changed files with 236 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locale/en/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/en/LC_MESSAGES/django.po
+100 -34
View File
@@ -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"
locale/fi/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/fi/LC_MESSAGES/django.po
+96 -35
View File
@@ -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"
members/templates/application_form_base.html
+1 -1
View File
@@ -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>
webapp/forms.py
+1 -1
View File
@@ -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):
webapp/migrations/0029_baserole_category.py
+20
View File
@@ -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'),
),
]
webapp/models.py
+18
View File
@@ -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()