From 003139831016700d4834916c36a9c785d50a7afb Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Mon, 26 Dec 2016 20:54:37 -0300 Subject: [PATCH] created marker model and subject relationship with them --- subjects/migrations/0002_auto_20161226_2054.py | 27 +++++++++++++++++++++++++++ subjects/models.py | 6 ++++++ 2 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 subjects/migrations/0002_auto_20161226_2054.py diff --git a/subjects/migrations/0002_auto_20161226_2054.py b/subjects/migrations/0002_auto_20161226_2054.py new file mode 100644 index 0000000..29522c8 --- /dev/null +++ b/subjects/migrations/0002_auto_20161226_2054.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-26 23:54 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('subjects', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Marker', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, unique=True, verbose_name='Name')), + ], + ), + migrations.AddField( + model_name='subject', + name='markers', + field=models.ManyToManyField(to='subjects.Marker', verbose_name='markers'), + ), + ] diff --git a/subjects/models.py b/subjects/models.py index 13a2f2c..e60f8e5 100644 --- a/subjects/models.py +++ b/subjects/models.py @@ -8,6 +8,9 @@ from users.models import User from categories.models import Category +class Marker(models.Model): + name = models.CharField( _("Name"), unique = True,max_length= 200) + class Subject(models.Model): name = models.CharField( _("Name"), unique = True,max_length= 200) @@ -20,6 +23,8 @@ class Subject(models.Model): init_date = models.DateField(_('Begin of Subject Date')) end_date = models.DateField(_('End of Subject Date')) + markers = models.ManyToManyField(Marker, verbose_name='markers') + create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) update_date = models.DateTimeField(_('Date of last update'), auto_now=True) @@ -38,3 +43,4 @@ class Subject(models.Model): + -- libgit2 0.21.2