From 32fa886a5042971851a76cff06a99ec284430336 Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Mon, 26 Dec 2016 17:21:52 -0300 Subject: [PATCH] modified subject app, added migration --- subjects/migrations/0001_initial.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ subjects/models.py | 28 ++++++++++++++-------------- 2 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 subjects/migrations/0001_initial.py diff --git a/subjects/migrations/0001_initial.py b/subjects/migrations/0001_initial.py new file mode 100644 index 0000000..ee84767 --- /dev/null +++ b/subjects/migrations/0001_initial.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-26 20:21 +from __future__ import unicode_literals + +import autoslug.fields +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('categories', '0003_auto_20161226_1358'), + ] + + operations = [ + migrations.CreateModel( + name='Subject', + 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')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), + ('description_brief', models.CharField(max_length=100, verbose_name='simpler_description')), + ('description', models.CharField(max_length=300, verbose_name='description')), + ('visible', models.BooleanField(verbose_name='visible')), + ('init_date', models.DateField(verbose_name='Begin of Subject Date')), + ('end_date', models.DateField(verbose_name='End of Subject Date')), + ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), + ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), + ('max_upload_size', models.IntegerField(verbose_name='Maximum upload size')), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='categories.Category')), + ('professor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='professor', to=settings.AUTH_USER_MODEL)), + ('students', models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), + ], + options={ + 'verbose_name_plural': 'Subjects', + 'verbose_name': 'Subject', + }, + ), + ] diff --git a/subjects/models.py b/subjects/models.py index ff3d861..13a2f2c 100644 --- a/subjects/models.py +++ b/subjects/models.py @@ -10,25 +10,25 @@ from categories.models import Category class Subject(models.Model): - name = models.CharField( _("Name"), unique = True,max_length= 200) - slug = AutoSlugField(_("Slug"),populate_from='name',unique=True) + name = models.CharField( _("Name"), unique = True,max_length= 200) + slug = AutoSlugField(_("Slug"),populate_from='name',unique=True) - description_brief = models.CharField(_("simpler_description"), max_length= 100) - description = models.CharField(_("description"), max_length = 300) - visible = models.BooleanField(_("visible")) + description_brief = models.CharField(_("simpler_description"), max_length= 100) + description = models.CharField(_("description"), max_length = 300) + visible = models.BooleanField(_("visible")) - init_date = models.DateField(_('Begin of Subject Date')) - end_date = models.DateField(_('End of Subject Date')) + init_date = models.DateField(_('Begin of Subject Date')) + end_date = models.DateField(_('End of Subject Date')) - create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) - update_date = models.DateTimeField(_('Date of last update'), auto_now=True) + create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) + update_date = models.DateTimeField(_('Date of last update'), auto_now=True) - professor = models.ForeignKey(User, related_name="professor") - students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student', blank = True) + professor = models.ForeignKey(User, related_name="professor") + students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student', blank = True) - category = models.ForeignKey(Category, related_name="subject_category") + category = models.ForeignKey(Category, related_name="subject_category") - max_upload_size = models.IntegerField(_("Maximum upload size")) + max_upload_size = models.IntegerField(_("Maximum upload size")) class Meta: verbose_name = "Subject" verbose_name_plural = "Subjects" @@ -37,4 +37,4 @@ class Subject(models.Model): pass -class Marker(models.Model): + -- libgit2 0.21.2