Commit 23dadadb authored by Okhin's avatar Okhin

Adding the extended form fields and a timestamp on violations

parent 5646e531
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('bt', '0004_auto_20160301_2103'),
]
operations = [
migrations.AlterField(
model_name='violation',
name='country',
field=models.CharField(max_length=2, choices=[(b'BE', 'Belgium'), (b'BG', 'Bulgaria'), (b'CH', 'Switzerland'), (b'CZ', 'Czech Republic'), (b'DK', 'Denmark'), (b'DE', 'Germany'), (b'EE', 'Estonia'), (b'IE', 'Ireland'), (b'EL', 'Greece'), (b'ES', 'Spain'), (b'FR', 'France'), (b'IC', 'Iceland'), (b'IS', 'Iceland'), (b'IT', 'Italy'), (b'CY', 'Cyprus'), (b'LI', 'Liechtenstein'), (b'LV', 'Latvia'), (b'LT', 'Lithuania'), (b'LU', 'Luxembourg'), (b'HU', 'Hungary'), (b'MT', 'Malta'), (b'NL', 'Netherlands'), (b'NO', 'Norway'), (b'AT', 'Austria'), (b'PL', 'Poland'), (b'PT', 'Portugal'), (b'RO', 'Romania'), (b'SI', 'Slovenia'), (b'SK', 'Slovakia'), (b'FI', 'Finland'), (b'SE', 'Sweden'), (b'UK', 'United Kingdom')]),
),
migrations.AlterField(
model_name='violation',
name='resource',
field=models.CharField(blank=True, max_length=20, choices=[(b'port', 'port'), (b'protocol', 'protocol'), (b'service', 'service'), (b'site', 'website'), (b'user', 'user'), (b'ip', 'ip'), (b'video', 'video streaming'), (b'audio', 'audio streaming'), (b'class', 'class of application or contraint'), (b'other', 'other')]),
),
migrations.AlterField(
model_name='violation',
name='type',
field=models.CharField(blank=True, max_length=20, choices=[(b'zerorating', 'Zero Rating'), (b'blocking', 'Blocking'), (b'throttling', 'Throttling'), (b'prioritisation', 'Prioritisation'), (b'specialised', 'Specialised Service'), (b'other', 'Other')]),
),
]
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
import datetime
class Migration(migrations.Migration):
dependencies = [
('bt', '0005_auto_20160302_1202'),
]
operations = [
migrations.AddField(
model_name='violation',
name='creation_date',
field=models.DateField(default=datetime.datetime(2016, 3, 2, 12, 14, 23, 907012), auto_now_add=True),
preserve_default=False,
),
]
...@@ -47,7 +47,7 @@ RESOURCES = ( ...@@ -47,7 +47,7 @@ RESOURCES = (
('video', _('video streaming')), ('video', _('video streaming')),
('audio', _('audio streaming')), ('audio', _('audio streaming')),
('class', _('class of application or contraint')), ('class', _('class of application or contraint')),
('other', _('other') ('other', _('other'))
) )
TYPES = ( TYPES = (
('zerorating', _('Zero Rating')), ('zerorating', _('Zero Rating')),
...@@ -84,7 +84,6 @@ class Operator(models.Model): ...@@ -84,7 +84,6 @@ class Operator(models.Model):
def __unicode__(self): def __unicode__(self):
return self.name return self.name
class Violation(models.Model): class Violation(models.Model):
country = models.CharField(max_length=2, choices=COUNTRIES) country = models.CharField(max_length=2, choices=COUNTRIES)
operator_ref = models.ForeignKey(Operator, related_name="violations") operator_ref = models.ForeignKey(Operator, related_name="violations")
...@@ -101,6 +100,7 @@ class Violation(models.Model): ...@@ -101,6 +100,7 @@ class Violation(models.Model):
state = models.CharField(max_length=20, choices=STATUS, default='new', blank=True) state = models.CharField(max_length=20, choices=STATUS, default='new', blank=True)
editorial = models.TextField(null=True, blank=True) editorial = models.TextField(null=True, blank=True)
old = models.BooleanField(default="False") old = models.BooleanField(default="False")
creation_date = models.DateField(auto_now_add=True)
def confirmations(self): def confirmations(self):
return self.confirmation_set.filter(key='').count() return self.confirmation_set.filter(key='').count()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment