Download as
Browse Code »

Commit 32fa886a5042971851a76cff06a99ec284430336

Authored by Felipe Henrique de Almeida Bormann
1 parent 2900c425
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

modified subject app, added migration

Showing 2 changed files with 58 additions and 14 deletions   Show diff stats
subjects/migrations/0001_initial.py 0 → 100644
  Diff comments   View file @32fa886
... ... @@ -0,0 +1,44 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-12-26 20:21
  3 +from __future__ import unicode_literals
  4 +
  5 +import autoslug.fields
  6 +from django.conf import settings
  7 +from django.db import migrations, models
  8 +import django.db.models.deletion
  9 +
  10 +
  11 +class Migration(migrations.Migration):
  12 +
  13 + initial = True
  14 +
  15 + dependencies = [
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  17 + ('categories', '0003_auto_20161226_1358'),
  18 + ]
  19 +
  20 + operations = [
  21 + migrations.CreateModel(
  22 + name='Subject',
  23 + fields=[
  24 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  25 + ('name', models.CharField(max_length=200, unique=True, verbose_name='Name')),
  26 + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
  27 + ('description_brief', models.CharField(max_length=100, verbose_name='simpler_description')),
  28 + ('description', models.CharField(max_length=300, verbose_name='description')),
  29 + ('visible', models.BooleanField(verbose_name='visible')),
  30 + ('init_date', models.DateField(verbose_name='Begin of Subject Date')),
  31 + ('end_date', models.DateField(verbose_name='End of Subject Date')),
  32 + ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
  33 + ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
  34 + ('max_upload_size', models.IntegerField(verbose_name='Maximum upload size')),
  35 + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='categories.Category')),
  36 + ('professor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='professor', to=settings.AUTH_USER_MODEL)),
  37 + ('students', models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
  38 + ],
  39 + options={
  40 + 'verbose_name_plural': 'Subjects',
  41 + 'verbose_name': 'Subject',
  42 + },
  43 + ),
  44 + ]
... ...
subjects/models.py
  Diff comments   View file @32fa886
... ... @@ -10,25 +10,25 @@ from categories.models import Category
10 10  
11 11 class Subject(models.Model):
12 12  
13   - name = models.CharField( _("Name"), unique = True,max_length= 200)
14   - slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
  13 + name = models.CharField( _("Name"), unique = True,max_length= 200)
  14 + slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
15 15  
16   - description_brief = models.CharField(_("simpler_description"), max_length= 100)
17   - description = models.CharField(_("description"), max_length = 300)
18   - visible = models.BooleanField(_("visible"))
  16 + description_brief = models.CharField(_("simpler_description"), max_length= 100)
  17 + description = models.CharField(_("description"), max_length = 300)
  18 + visible = models.BooleanField(_("visible"))
19 19  
20   - init_date = models.DateField(_('Begin of Subject Date'))
21   - end_date = models.DateField(_('End of Subject Date'))
  20 + init_date = models.DateField(_('Begin of Subject Date'))
  21 + end_date = models.DateField(_('End of Subject Date'))
22 22  
23   - create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
24   - update_date = models.DateTimeField(_('Date of last update'), auto_now=True)
  23 + create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
  24 + update_date = models.DateTimeField(_('Date of last update'), auto_now=True)
25 25  
26   - professor = models.ForeignKey(User, related_name="professor")
27   - students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student', blank = True)
  26 + professor = models.ForeignKey(User, related_name="professor")
  27 + students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student', blank = True)
28 28  
29   - category = models.ForeignKey(Category, related_name="subject_category")
  29 + category = models.ForeignKey(Category, related_name="subject_category")
30 30  
31   - max_upload_size = models.IntegerField(_("Maximum upload size"))
  31 + max_upload_size = models.IntegerField(_("Maximum upload size"))
32 32 class Meta:
33 33 verbose_name = "Subject"
34 34 verbose_name_plural = "Subjects"
... ... @@ -37,4 +37,4 @@ class Subject(models.Model):
37 37 pass
38 38  
39 39  
40   -class Marker(models.Model):
  40 +
... ...