Sort kaehmys in the correct order

This commit is contained in:
Jan Tuomi
2017-10-18 11:16:20 +03:00
parent 89bb68d222
commit cd94c0d0f4
7 changed files with 164 additions and 75 deletions
@@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2017-10-18 07:17
from __future__ import unicode_literals
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('webapp', '0033_telegramchannel_name'),
]
operations = [
migrations.AlterModelOptions(
name='kaehmyform',
options={'verbose_name': 'Kaehmylomake', 'verbose_name_plural': 'Kaehmylomakkeet'},
),
migrations.AlterModelOptions(
name='kaehmymessage',
options={'verbose_name': 'Kaehmykommentti', 'verbose_name_plural': 'Kaehmykommentit'},
),
migrations.AlterModelOptions(
name='telegramchannel',
options={'verbose_name': 'Telegram channel', 'verbose_name_plural': 'Telegram channels'},
),
migrations.RemoveField(
model_name='kaehmymessage',
name='timestamp',
),
migrations.AddField(
model_name='messageparent',
name='timestamp',
field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Timestamp'),
),
]
+15 -1
View File
@@ -143,6 +143,7 @@ class MessageParent(models.Model):
name = models.CharField(_('Name'), max_length=255, default='')
email = models.EmailField(_('Email'), default='')
timestamp = models.DateTimeField(_('Timestamp'), default=timezone.now)
def __str__(self):
return 'Message parent #{}'.format(self.id)
@@ -155,9 +156,12 @@ class KaehmyMessage(MessageParent):
Every message relates to certain kaehmyform or parent message.
"""
class Meta:
verbose_name = _('Kaehmykommentti')
verbose_name_plural = _('Kaehmykommentit')
message = models.TextField(_('Message'))
parent = models.ForeignKey('MessageParent', related_name='messages')
timestamp = models.DateTimeField(_('Timestamp'), default=timezone.now)
class KaehmyForm(MessageParent):
@@ -173,6 +177,10 @@ class KaehmyForm(MessageParent):
(4, '4'),
(5, 'N'),
)
class Meta:
verbose_name = _('Kaehmylomake')
verbose_name_plural = _('Kaehmylomakkeet')
phone_number = models.CharField(
_('Phone number'), max_length=10, default="")
@@ -232,6 +240,7 @@ class Role(PresetRole):
"""Meta class for Role model."""
verbose_name = _('Role')
verbose_name_plural = _('Roles')
start_date = models.DateField(_('Start date'))
end_date = models.DateField(_('End date'))
@@ -245,6 +254,7 @@ class Official(User):
"""Meta class for Official class."""
verbose_name = _('Official')
verbose_name_plural = _('Officials')
phone_number = PhoneNumberField(_('Phone number'))
@@ -271,6 +281,10 @@ class OhlhafvChallenge(models.Model):
class TelegramChannel(models.Model):
"""Model containing the channel id of a Telegram chat"""
class Meta:
verbose_name = _('Telegram channel')
verbose_name_plural = _('Telegram channels')
name = models.CharField(max_length=255)
channel_id = models.CharField(max_length=255, unique=True)
+1 -1
View File
@@ -226,7 +226,7 @@ def ohlhafv_list(request, *args, **kwargs):
def kaehmy_list_view(request, *args, **kwargs):
"""Kaehmy application list"""
applications = KaehmyForm.objects.all()
applications = KaehmyForm.objects.order_by('-timestamp')
context = {
'applications': applications,