diff --git a/app/migrations/__init__.py b/app/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/app/migrations/__init__.py +++ /dev/null diff --git a/core/decorators.py b/core/decorators.py index 8c90c66..eaa3aa0 100644 --- a/core/decorators.py +++ b/core/decorators.py @@ -55,33 +55,33 @@ def notification_decorator(read = False, message = '', actor = None, users = [], #Do something before the call response = view_function(request, *args, **kwargs) - action = Action.objects.filter(name = not_action) + action = Action.objects.filter(name = self.not_action) resource = Resource.objects.filter(name = not_resource) - - if not action: - action = Action(name = not_action) - action.save() - else: + print(resource_link) + if action.exists(): action = action[0] - - if not resource: - resource = Resource(name = not_resource) - resource.save() else: + action = Action(name = self.not_action) + action.save() + + if resource.exists(): resource = resource[0] + else: + resource = Resource(name = self.not_resource, link= resource_link) + print(resource) + resource.save() action_resource = Action_Resource.objects.filter(action = action, resource = resource) - if not action_resource: + if action_resource.exists(): + action_resource = action_resource[0] + else: action_resource = Action_Resource(action = action, resource = resource) action_resource.save() - else: - action_resource = action_resource[0] - - if request.user.is_authenticated: #the user was authenticated by the view - notification = Notification(actor = request.user, message= message, - action_resource = action_resource, user = request.user) + for user in users: + notification = Notification(user=user, actor= actor, message=message, action_resource= action_resource) + notification.save() #Do something after the call diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 0bd7587..70c28e4 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-06 17:50 +# Generated by Django 1.10 on 2016-09-20 13:57 from __future__ import unicode_literals +import autoslug.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -24,8 +25,8 @@ class Migration(migrations.Migration): ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name': 'Action', 'verbose_name_plural': 'Actions', + 'verbose_name': 'Action', }, ), migrations.CreateModel( @@ -35,22 +36,37 @@ class Migration(migrations.Migration): ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')), ], options={ - 'verbose_name': 'Action_Resource', 'verbose_name_plural': 'Action_Resources', + 'verbose_name': 'Action_Resource', + }, + ), + migrations.CreateModel( + name='Log', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), + ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), + ], + options={ + 'verbose_name_plural': 'Logs', + 'verbose_name': 'Log', }, ), migrations.CreateModel( name='Notification', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('message', models.TextField(verbose_name='message')), + ('message', models.TextField(verbose_name='Message')), ('read', models.BooleanField(default=False, verbose_name='Read')), + ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), + ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')), ], options={ - 'verbose_name': 'Action_Resource', - 'verbose_name_plural': 'Action_Resources', + 'verbose_name_plural': 'Notifications', + 'verbose_name': 'Notification', }, ), migrations.CreateModel( @@ -58,11 +74,13 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=100, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, null=True, populate_from='name', unique=True, verbose_name='Slug')), ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')), + ('url', models.CharField(default='', max_length=100, verbose_name='URL')), ], options={ - 'verbose_name': 'Resource', 'verbose_name_plural': 'Resources', + 'verbose_name': 'Resource', }, ), migrations.AddField( diff --git a/core/migrations/0002_auto_20160907_0038.py b/core/migrations/0002_auto_20160907_0038.py deleted file mode 100644 index b8a5bcb..0000000 --- a/core/migrations/0002_auto_20160907_0038.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-07 03:38 -from __future__ import unicode_literals - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -from django.utils.timezone import utc - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Log', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), - ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), - ], - options={ - 'verbose_name_plural': 'Logs', - 'verbose_name': 'Log', - }, - ), - migrations.AlterModelOptions( - name='notification', - options={'verbose_name': 'Notification', 'verbose_name_plural': 'Notifications'}, - ), - migrations.AddField( - model_name='notification', - name='datetime', - field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 9, 7, 3, 38, 49, 367825, tzinfo=utc), verbose_name='Date and Time of action'), - preserve_default=False, - ), - migrations.AlterField( - model_name='notification', - name='message', - field=models.TextField(verbose_name='Message'), - ), - ] diff --git a/core/migrations/0003_auto_20160908_1108.py b/core/migrations/0003_auto_20160908_1108.py deleted file mode 100644 index 8164680..0000000 --- a/core/migrations/0003_auto_20160908_1108.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 14:08 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0002_auto_20160907_0038'), - ] - - operations = [ - migrations.AddField( - model_name='notification', - name='actor', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'), - ), - migrations.AlterField( - model_name='notification', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - ] diff --git a/core/migrations/0004_auto_20160908_1151.py b/core/migrations/0004_auto_20160908_1151.py deleted file mode 100644 index 4f276c5..0000000 --- a/core/migrations/0004_auto_20160908_1151.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 14:51 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0003_auto_20160908_1108'), - ] - - operations = [ - migrations.AlterField( - model_name='resource', - name='name', - field=models.CharField(max_length=100, unique=True, verbose_name='Name'), - ), - ] diff --git a/core/migrations/0005_resource_link.py b/core/migrations/0005_resource_link.py deleted file mode 100644 index cef38e6..0000000 --- a/core/migrations/0005_resource_link.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-12 14:36 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0004_auto_20160908_1151'), - ] - - operations = [ - migrations.AddField( - model_name='resource', - name='link', - field=models.CharField(default='', max_length=100, unique=True, verbose_name='URL'), - ), - ] diff --git a/core/migrations/0006_auto_20160912_1138.py b/core/migrations/0006_auto_20160912_1138.py deleted file mode 100644 index dc49559..0000000 --- a/core/migrations/0006_auto_20160912_1138.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-12 14:38 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0005_resource_link'), - ] - - operations = [ - migrations.AlterField( - model_name='resource', - name='link', - field=models.CharField(default='', max_length=100, verbose_name='URL'), - ), - ] diff --git a/core/migrations/0007_remove_resource_link.py b/core/migrations/0007_remove_resource_link.py deleted file mode 100644 index c49aa70..0000000 --- a/core/migrations/0007_remove_resource_link.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-12 14:51 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0006_auto_20160912_1138'), - ] - - operations = [ - migrations.RemoveField( - model_name='resource', - name='link', - ), - ] diff --git a/core/migrations/0008_resource_link.py b/core/migrations/0008_resource_link.py deleted file mode 100644 index 906bd52..0000000 --- a/core/migrations/0008_resource_link.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-12 14:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0007_remove_resource_link'), - ] - - operations = [ - migrations.AddField( - model_name='resource', - name='link', - field=models.CharField(default='', max_length=100, verbose_name='URL'), - ), - ] diff --git a/core/migrations/0009_auto_20160916_0126.py b/core/migrations/0009_auto_20160916_0126.py deleted file mode 100644 index 40bfc5b..0000000 --- a/core/migrations/0009_auto_20160916_0126.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-16 04:26 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0008_resource_link'), - ] - - operations = [ - migrations.RenameField( - model_name='resource', - old_name='link', - new_name='url', - ), - ] diff --git a/core/models.py b/core/models.py index 698a256..e0c1984 100644 --- a/core/models.py +++ b/core/models.py @@ -1,6 +1,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from users.models import User +from autoslug.fields import AutoSlugField # Create your models here. class Action(models.Model): @@ -32,7 +33,8 @@ class Resource(models.Model): @link: Which URL made that resource able to find """ - name = models.CharField(_('Name'), max_length =100, unique=True) + name = models.CharField(_('Name'), max_length =100) + slug = AutoSlugField(_("Slug"), populate_from='name', unique=True, null=True) created_date = models.DateField(_('Created Date'), auto_now_add=True) url = models.CharField(_('URL'), max_length =100, default="") diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index e632e0f..7641011 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,53 +1,128 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-18 22:41 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Course', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, verbose_name='Nome')), - ('slug', models.SlugField(max_length=100, verbose_name='Identificador')), - ('objectivies', models.TextField(blank=True, verbose_name='Objetivos')), - ('content', models.TextField(blank=True, verbose_name='Conteúdo')), - ('max_students', models.PositiveIntegerField(blank=True, verbose_name='Máximo de Alunos')), - ('create_date', models.DateField(auto_now_add=True, verbose_name='Criação')), - ('init_register_date', models.DateField(verbose_name='Data de Cadastro (Início)')), - ('end_register_date', models.DateField(verbose_name='Data de Cadastro (Final)')), - ('init_date', models.DateField(verbose_name='Data de Início do Curso')), - ('end_date', models.DateField(verbose_name='Data de Final do Curso')), - ('image', models.ImageField(blank=True, upload_to='', verbose_name='Imagem')), - ], - options={ - 'verbose_name_plural': 'Cursos', - 'verbose_name': 'Curso', - }, - ), - migrations.CreateModel( - name='Module', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, verbose_name='Nome')), - ('slug', models.SlugField(max_length=100, verbose_name='Identificador')), - ('description', models.TextField(blank=True, verbose_name='Descrição')), - ('visible', models.BooleanField(default=True, verbose_name='Visível')), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Course', verbose_name='Curso')), - ], - options={ - 'verbose_name_plural': 'Módulos', - 'verbose_name': 'Módulo', - }, - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-20 13:57 +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 = [ + ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Activity', + fields=[ + ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), + ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), + ('limit_date', models.DateTimeField(verbose_name='Deliver Date')), + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')), + ], + bases=('core.resource',), + ), + migrations.CreateModel( + name='Category', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), + ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), + ], + options={ + 'verbose_name': 'Category', + 'verbose_name_plural': 'Categories', + }, + ), + migrations.CreateModel( + name='Course', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), + ('objectivies', models.TextField(blank=True, verbose_name='Objectivies')), + ('content', models.TextField(blank=True, verbose_name='Content')), + ('max_students', models.PositiveIntegerField(blank=True, verbose_name='Maximum Students')), + ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), + ('init_register_date', models.DateField(verbose_name='Register Date (Begin)')), + ('end_register_date', models.DateField(verbose_name='Register Date (End)')), + ('init_date', models.DateField(verbose_name='Begin of Course Date')), + ('end_date', models.DateField(verbose_name='End of Course Date')), + ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')), + ('professors', models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), + ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), + ], + options={ + 'verbose_name': 'Course', + 'verbose_name_plural': 'Courses', + 'ordering': ('create_date', 'name'), + }, + ), + migrations.CreateModel( + name='Material', + fields=[ + ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), + ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')), + ], + bases=('core.resource',), + ), + migrations.CreateModel( + name='Subject', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('visible', models.BooleanField(default=False, 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')), + ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), + ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), + ], + options={ + 'verbose_name': 'Subject', + 'verbose_name_plural': 'Subjects', + 'ordering': ('create_date', 'name'), + }, + ), + migrations.CreateModel( + name='Topic', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('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')), + ('visible', models.BooleanField(default=False, verbose_name='Visible')), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')), + ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), + ], + options={ + 'verbose_name': 'Topic', + 'verbose_name_plural': 'Topics', + 'ordering': ('create_date', 'name'), + }, + ), + migrations.AddField( + model_name='material', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), + ), + migrations.AddField( + model_name='activity', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/courses/migrations/0002_auto_20160720_1837.py b/courses/migrations/0002_auto_20160720_1837.py deleted file mode 100644 index 9b0a90e..0000000 --- a/courses/migrations/0002_auto_20160720_1837.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-20 21:37 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -import django.db.models.deletion -from django.utils.timezone import utc - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Category', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, verbose_name='Nome')), - ('slug', models.SlugField(max_length=100, verbose_name='Identificador')), - ('create_date', models.DateField(auto_now_add=True, verbose_name='Criação')), - ], - options={ - 'verbose_name': 'Categoria', - 'verbose_name_plural': 'Categorias', - }, - ), - migrations.AddField( - model_name='module', - name='create_date', - field=models.DateField(auto_now_add=True, default=datetime.datetime(2016, 7, 20, 21, 37, 26, 975666, tzinfo=utc), verbose_name='Criação'), - preserve_default=False, - ), - migrations.AlterField( - model_name='course', - name='image', - field=models.ImageField(blank=True, default='uploads/no_image.jpg', upload_to='uploads/', verbose_name='Imagem'), - ), - migrations.AddField( - model_name='course', - name='category', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Categoria'), - ), - ] diff --git a/courses/migrations/0003_auto_20160722_1735.py b/courses/migrations/0003_auto_20160722_1735.py deleted file mode 100644 index 082e99d..0000000 --- a/courses/migrations/0003_auto_20160722_1735.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-22 20:35 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0002_auto_20160720_1837'), - ] - - operations = [ - migrations.AlterField( - model_name='category', - name='name', - field=models.CharField(max_length=100, unique=True, verbose_name='Nome'), - ), - migrations.AlterField( - model_name='course', - name='name', - field=models.CharField(max_length=100, unique=True, verbose_name='Nome'), - ), - ] diff --git a/courses/migrations/0004_auto_20160728_1625.py b/courses/migrations/0004_auto_20160728_1625.py deleted file mode 100644 index a39559c..0000000 --- a/courses/migrations/0004_auto_20160728_1625.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-28 19:25 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0003_auto_20160722_1735'), - ] - - operations = [ - migrations.AlterField( - model_name='course', - name='image', - field=models.ImageField(blank=True, default='no_image.jpg', upload_to='courses/', verbose_name='Imagem'), - ), - ] diff --git a/courses/migrations/0005_auto_20160815_0922.py b/courses/migrations/0005_auto_20160815_0922.py deleted file mode 100644 index 118c96d..0000000 --- a/courses/migrations/0005_auto_20160815_0922.py +++ /dev/null @@ -1,140 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-15 12:22 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0004_auto_20160728_1625'), - ] - - operations = [ - migrations.AlterModelOptions( - name='category', - options={'verbose_name': 'Category', 'verbose_name_plural': 'Categories'}, - ), - migrations.AlterModelOptions( - name='course', - options={'verbose_name': 'Course', 'verbose_name_plural': 'Courses'}, - ), - migrations.AlterModelOptions( - name='module', - options={'verbose_name': 'Module', 'verbose_name_plural': 'Modules'}, - ), - migrations.AddField( - model_name='course', - name='user', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - migrations.AlterField( - model_name='category', - name='create_date', - field=models.DateField(auto_now_add=True, verbose_name='Creation Date'), - ), - migrations.AlterField( - model_name='category', - name='name', - field=models.CharField(max_length=100, unique=True, verbose_name='Name'), - ), - migrations.AlterField( - model_name='category', - name='slug', - field=models.SlugField(max_length=100, verbose_name='Slug'), - ), - migrations.AlterField( - model_name='course', - name='category', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'), - ), - migrations.AlterField( - model_name='course', - name='content', - field=models.TextField(blank=True, verbose_name='Content'), - ), - migrations.AlterField( - model_name='course', - name='create_date', - field=models.DateField(auto_now_add=True, verbose_name='Creation Date'), - ), - migrations.AlterField( - model_name='course', - name='end_date', - field=models.DateField(verbose_name='End of Course Date'), - ), - migrations.AlterField( - model_name='course', - name='end_register_date', - field=models.DateField(verbose_name='Register Date (End)'), - ), - migrations.AlterField( - model_name='course', - name='image', - field=models.ImageField(blank=True, default='no_image.jpg', upload_to='courses/', verbose_name='Image'), - ), - migrations.AlterField( - model_name='course', - name='init_date', - field=models.DateField(verbose_name='Begin of Course Date'), - ), - migrations.AlterField( - model_name='course', - name='init_register_date', - field=models.DateField(verbose_name='Register Date (Begin)'), - ), - migrations.AlterField( - model_name='course', - name='max_students', - field=models.PositiveIntegerField(blank=True, verbose_name='Maximum Students'), - ), - migrations.AlterField( - model_name='course', - name='name', - field=models.CharField(max_length=100, unique=True, verbose_name='Name'), - ), - migrations.AlterField( - model_name='course', - name='objectivies', - field=models.TextField(blank=True, verbose_name='Objectivies'), - ), - migrations.AlterField( - model_name='course', - name='slug', - field=models.SlugField(max_length=100, verbose_name='Slug'), - ), - migrations.AlterField( - model_name='module', - name='course', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Course', verbose_name='Course'), - ), - migrations.AlterField( - model_name='module', - name='create_date', - field=models.DateField(auto_now_add=True, verbose_name='Creation Date'), - ), - migrations.AlterField( - model_name='module', - name='description', - field=models.TextField(blank=True, verbose_name='Description'), - ), - migrations.AlterField( - model_name='module', - name='name', - field=models.CharField(max_length=100, verbose_name='Name'), - ), - migrations.AlterField( - model_name='module', - name='slug', - field=models.SlugField(max_length=100, verbose_name='Slug'), - ), - migrations.AlterField( - model_name='module', - name='visible', - field=models.BooleanField(default=True, verbose_name='Visible'), - ), - ] diff --git a/courses/migrations/0006_auto_20160907_2259.py b/courses/migrations/0006_auto_20160907_2259.py deleted file mode 100644 index 8ec1a23..0000000 --- a/courses/migrations/0006_auto_20160907_2259.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 01:59 -from __future__ import unicode_literals - -import autoslug.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0005_auto_20160815_0922'), - ] - - 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=100, verbose_name='Name')), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), - ('description', models.TextField(blank=True, verbose_name='Description')), - ('visible', models.BooleanField(default=True, verbose_name='Visible')), - ('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')), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), - ], - options={ - 'verbose_name': 'Subject', - 'verbose_name_plural': 'Subjects', - }, - ), - migrations.RemoveField( - model_name='module', - name='course', - ), - migrations.DeleteModel( - name='Module', - ), - ] diff --git a/courses/migrations/0007_topic.py b/courses/migrations/0007_topic.py deleted file mode 100644 index caa2dcb..0000000 --- a/courses/migrations/0007_topic.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 02:51 -from __future__ import unicode_literals - -import autoslug.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0006_auto_20160907_2259'), - ] - - operations = [ - migrations.CreateModel( - name='Topic', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, verbose_name='Name')), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), - ('description', models.TextField(blank=True, verbose_name='Description')), - ('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')), - ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topics', to='courses.Subject', verbose_name='Subject')), - ], - options={ - 'verbose_name': 'Topic', - 'verbose_name_plural': 'Topics', - }, - ), - ] diff --git a/courses/migrations/0008_auto_20160908_1332.py b/courses/migrations/0008_auto_20160908_1332.py deleted file mode 100644 index fec1b85..0000000 --- a/courses/migrations/0008_auto_20160908_1332.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 16:32 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0007_topic'), - ] - - operations = [ - migrations.AddField( - model_name='subject', - name='professors', - field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='topic', - name='owner', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='topics', to=settings.AUTH_USER_MODEL, verbose_name='Owner'), - ), - ] diff --git a/courses/migrations/0009_auto_20160908_1625.py b/courses/migrations/0009_auto_20160908_1625.py deleted file mode 100644 index 2998551..0000000 --- a/courses/migrations/0009_auto_20160908_1625.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 19:25 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0008_auto_20160908_1332'), - ] - - operations = [ - migrations.AlterModelOptions( - name='subject', - options={'ordering': ('create_date',), 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects'}, - ), - migrations.AlterModelOptions( - name='topic', - options={'ordering': ('create_date',), 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics'}, - ), - ] diff --git a/courses/migrations/0010_auto_20160914_2119.py b/courses/migrations/0010_auto_20160914_2119.py deleted file mode 100644 index bd8330a..0000000 --- a/courses/migrations/0010_auto_20160914_2119.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-15 00:19 -from __future__ import unicode_literals - -import autoslug.fields -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0009_auto_20160908_1625'), - ] - - operations = [ - migrations.RemoveField( - model_name='course', - name='user', - ), - migrations.AddField( - model_name='course', - name='professors', - field=models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AlterField( - model_name='category', - name='slug', - field=autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug'), - ), - migrations.AlterField( - model_name='course', - name='name', - field=models.CharField(max_length=100, verbose_name='Name'), - ), - migrations.AlterField( - model_name='course', - name='slug', - field=autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug'), - ), - ] diff --git a/courses/migrations/0011_auto_20160914_2126.py b/courses/migrations/0011_auto_20160914_2126.py deleted file mode 100644 index ca3e72b..0000000 --- a/courses/migrations/0011_auto_20160914_2126.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-15 00:26 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0010_auto_20160914_2119'), - ] - - operations = [ - migrations.AlterModelOptions( - name='course', - options={'ordering': ('create_date', 'name'), 'verbose_name': 'Course', 'verbose_name_plural': 'Courses'}, - ), - migrations.AlterModelOptions( - name='subject', - options={'ordering': ('create_date', 'name'), 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects'}, - ), - migrations.AlterModelOptions( - name='topic', - options={'ordering': ('create_date', 'name'), 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics'}, - ), - migrations.AlterField( - model_name='course', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'), - ), - migrations.AlterField( - model_name='course', - name='image', - field=models.ImageField(blank=True, upload_to='courses/', verbose_name='Image'), - ), - migrations.AlterField( - model_name='subject', - name='visible', - field=models.BooleanField(default=False, verbose_name='Visible'), - ), - migrations.AlterField( - model_name='topic', - name='owner', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topics', to=settings.AUTH_USER_MODEL, verbose_name='Owner'), - ), - ] diff --git a/courses/migrations/0012_course_students.py b/courses/migrations/0012_course_students.py deleted file mode 100644 index f70c1c1..0000000 --- a/courses/migrations/0012_course_students.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-15 02:57 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0011_auto_20160914_2126'), - ] - - operations = [ - migrations.AddField( - model_name='course', - name='students', - field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - ] diff --git a/courses/migrations/0013_auto_20160916_0001.py b/courses/migrations/0013_auto_20160916_0001.py deleted file mode 100644 index db05de7..0000000 --- a/courses/migrations/0013_auto_20160916_0001.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-16 03:01 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0012_course_students'), - ] - - operations = [ - migrations.AddField( - model_name='subject', - name='end_date', - field=models.DateField(default=django.utils.timezone.now, verbose_name='End of Subject Date'), - preserve_default=False, - ), - migrations.AddField( - model_name='subject', - name='init_date', - field=models.DateField(default=django.utils.timezone.now, verbose_name='Begin of Subject Date'), - preserve_default=False, - ), - ] diff --git a/courses/migrations/0013_auto_20160916_0126.py b/courses/migrations/0013_auto_20160916_0126.py deleted file mode 100644 index aad2dba..0000000 --- a/courses/migrations/0013_auto_20160916_0126.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-16 04:26 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0009_auto_20160916_0126'), - ('courses', '0012_course_students'), - ] - - operations = [ - migrations.CreateModel( - name='Activity', - fields=[ - ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), - ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), - ('limit_date', models.DateTimeField(verbose_name='Deliver Date')), - ('grade', models.IntegerField(verbose_name='grade')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='student')), - ], - bases=('core.resource',), - ), - migrations.CreateModel( - name='Link', - fields=[ - ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), - ('url_field', models.CharField(max_length=300, verbose_name='url')), - ], - bases=('core.resource',), - ), - migrations.AddField( - model_name='topic', - name='visible', - field=models.BooleanField(default=False, verbose_name='Visible'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic', to='courses.Topic', verbose_name='Topic'), - ), - ] diff --git a/courses/migrations/0014_merge_20160916_0255.py b/courses/migrations/0014_merge_20160916_0255.py deleted file mode 100644 index 77403ef..0000000 --- a/courses/migrations/0014_merge_20160916_0255.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-16 05:55 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0013_auto_20160916_0001'), - ('courses', '0013_auto_20160916_0126'), - ] - - operations = [ - ] diff --git a/courses/models.py b/courses/models.py index 73f7cb2..6f855f0 100644 --- a/courses/models.py +++ b/courses/models.py @@ -71,8 +71,8 @@ class Topic(models.Model): description = models.TextField(_('Description'), blank = True) create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) update_date = models.DateTimeField(_('Date of last update'), auto_now=True) - subject = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name="topics") - owner = models.ForeignKey(User, verbose_name = _('Owner'), related_name="topics") + subject = models.ForeignKey(Subject, verbose_name = _('Subject')) + owner = models.ForeignKey(User, verbose_name = _('Owner')) visible = models.BooleanField(_('Visible'), default=False) class Meta: @@ -89,9 +89,9 @@ Activity is something that has a deadline and has to be delivered by the student """ class Activity(Resource): create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) - topic = models.ForeignKey(Topic, verbose_name = _('Topic'), related_name="topic") + topic = models.ForeignKey(Topic, verbose_name = _('Topic')) limit_date = models.DateTimeField(_('Deliver Date')) - student = models.ForeignKey(User, verbose_name = _('student'), related_name="student") + student = models.ForeignKey(User, verbose_name = _('student')) """ @@ -99,11 +99,7 @@ It represents any Material inside a topic, be it a file, a link, etc. """ class Material(Resource): create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) - topic = models.ForeignKey(Topic, verbose_name = _('Topic'), related_name="topic") - student = models.ForeignKey(User, verbose_name = _('student'), related_name="student") + topic = models.ForeignKey(Topic, verbose_name = _('Topic')) + student = models.ForeignKey(User, verbose_name = _('student')) + -""" -It is one kind of possible resources available inside a Topic. -""" -class Link(Material): - url_field = models.CharField(_('url'), max_length= 300) diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index 54a2949..7652e23 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -1,50 +1,52 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-28 19:25 -from __future__ import unicode_literals - -import django.contrib.auth.models -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0007_alter_validators_add_error_messages'), - ] - - operations = [ - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('login', models.CharField(help_text='Um nome curto que será usado para identificá-lo de forma única na plataforma e também para acessá-la', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\w.@+-]+$', 32), 'Informe um nome de usuário válido. Este valor deve conter apenas letras, números e os caracteres: @/./+/-/_ .', 'invalid')], verbose_name='Login')), - ('email', models.EmailField(max_length=254, unique=True, verbose_name='E-mail')), - ('name', models.CharField(blank=True, max_length=100, verbose_name='Nome')), - ('city', models.CharField(blank=True, max_length=90, verbose_name='Cidade')), - ('state', models.CharField(blank=True, max_length=30, verbose_name='Estado')), - ('gender', models.CharField(choices=[('M', 'Masculino'), ('F', 'Feminino')], max_length=1, verbose_name='Sexo')), - ('image', models.ImageField(blank=True, default='no_image.jpg', upload_to='users/', verbose_name='Imagem')), - ('birth_date', models.DateField(blank=True, verbose_name='Data de Nascimento')), - ('phone', models.CharField(blank=True, max_length=30, verbose_name='Telefone')), - ('cpf', models.CharField(blank=True, max_length=15, verbose_name='Cpf')), - ('type_profile', models.IntegerField(choices=[(1, 'Administrador'), (2, 'Professor'), (3, 'Aluno')], verbose_name='Tipo')), - ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Data de Cadastro')), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), - ], - options={ - 'verbose_name_plural': 'Usuários', - 'verbose_name': 'Usuário', - }, - managers=[ - ('objects', django.contrib.auth.models.UserManager()), - ], - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-20 13:57 +from __future__ import unicode_literals + +import django.contrib.auth.models +import django.core.validators +from django.db import migrations, models +import re + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0008_alter_user_username_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\w.@+-]+$', 32), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', 'invalid')], verbose_name='Login')), + ('email', models.EmailField(max_length=254, unique=True, verbose_name='Mail')), + ('name', models.CharField(blank=True, max_length=100, verbose_name='Name')), + ('city', models.CharField(blank=True, max_length=90, verbose_name='City')), + ('state', models.CharField(blank=True, max_length=30, verbose_name='State')), + ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender')), + ('image', models.ImageField(blank=True, upload_to='users/', verbose_name='Image')), + ('birth_date', models.DateField(blank=True, null=True, verbose_name='Birth Date')), + ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')), + ('cpf', models.CharField(blank=True, max_length=15, verbose_name='Cpf')), + ('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')), + ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), + ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')), + ('is_active', models.BooleanField(default=True, verbose_name='Active')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'User', + 'verbose_name_plural': 'Users', + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/users/migrations/0002_auto_20160728_1629.py b/users/migrations/0002_auto_20160728_1629.py deleted file mode 100644 index 48128db..0000000 --- a/users/migrations/0002_auto_20160728_1629.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-28 19:29 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='user', - old_name='login', - new_name='username', - ), - ] diff --git a/users/migrations/0003_auto_20160728_1631.py b/users/migrations/0003_auto_20160728_1631.py deleted file mode 100644 index 9ac1e83..0000000 --- a/users/migrations/0003_auto_20160728_1631.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-28 19:31 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_auto_20160728_1629'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='is_active', - field=models.BooleanField(default=True, verbose_name='Ativo'), - ), - migrations.AddField( - model_name='user', - name='is_staff', - field=models.BooleanField(default=False, verbose_name='Administrador'), - ), - migrations.AlterField( - model_name='user', - name='type_profile', - field=models.IntegerField(choices=[(1, 'Professor'), (2, 'Aluno')], verbose_name='Tipo'), - ), - ] diff --git a/users/migrations/0004_auto_20160728_1634.py b/users/migrations/0004_auto_20160728_1634.py deleted file mode 100644 index f8a0128..0000000 --- a/users/migrations/0004_auto_20160728_1634.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-28 19:34 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_auto_20160728_1631'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='birth_date', - field=models.DateField(blank=True, null=True, verbose_name='Data de Nascimento'), - ), - ] diff --git a/users/migrations/0005_auto_20160728_1636.py b/users/migrations/0005_auto_20160728_1636.py deleted file mode 100644 index 4538825..0000000 --- a/users/migrations/0005_auto_20160728_1636.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-28 19:36 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_auto_20160728_1634'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='type_profile', - field=models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Aluno')], null=True, verbose_name='Tipo'), - ), - ] diff --git a/users/migrations/0006_auto_20160815_0922.py b/users/migrations/0006_auto_20160815_0922.py deleted file mode 100644 index f1ef6f2..0000000 --- a/users/migrations/0006_auto_20160815_0922.py +++ /dev/null @@ -1,81 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-15 12:22 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0005_auto_20160728_1636'), - ] - - operations = [ - migrations.AlterModelOptions( - name='user', - options={'verbose_name': 'User', 'verbose_name_plural': 'Users'}, - ), - migrations.AlterField( - model_name='user', - name='birth_date', - field=models.DateField(blank=True, null=True, verbose_name='Birth Date'), - ), - migrations.AlterField( - model_name='user', - name='city', - field=models.CharField(blank=True, max_length=90, verbose_name='City'), - ), - migrations.AlterField( - model_name='user', - name='date_created', - field=models.DateTimeField(auto_now_add=True, verbose_name='Create Date'), - ), - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(max_length=254, unique=True, verbose_name='Mail'), - ), - migrations.AlterField( - model_name='user', - name='gender', - field=models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender'), - ), - migrations.AlterField( - model_name='user', - name='image', - field=models.ImageField(blank=True, default='no_image.jpg', upload_to='users/', verbose_name='Image'), - ), - migrations.AlterField( - model_name='user', - name='is_active', - field=models.BooleanField(default=True, verbose_name='Active'), - ), - migrations.AlterField( - model_name='user', - name='name', - field=models.CharField(blank=True, max_length=100, verbose_name='Name'), - ), - migrations.AlterField( - model_name='user', - name='phone', - field=models.CharField(blank=True, max_length=30, verbose_name='Phone'), - ), - migrations.AlterField( - model_name='user', - name='state', - field=models.CharField(blank=True, max_length=30, verbose_name='State'), - ), - migrations.AlterField( - model_name='user', - name='type_profile', - field=models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], null=True, verbose_name='Type'), - ), - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\w.@+-]+$', 32), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', 'invalid')], verbose_name='Login'), - ), - ] diff --git a/users/migrations/0007_auto_20160825_1801.py b/users/migrations/0007_auto_20160825_1801.py deleted file mode 100644 index 228319d..0000000 --- a/users/migrations/0007_auto_20160825_1801.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-25 21:01 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0006_auto_20160815_0922'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile(b'^[\\w.@+-]+$'), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', b'invalid')], verbose_name='Login'), - ), - ] diff --git a/users/migrations/0008_auto_20160902_2123.py b/users/migrations/0008_auto_20160902_2123.py deleted file mode 100644 index 4695c0e..0000000 --- a/users/migrations/0008_auto_20160902_2123.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-03 00:23 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0007_auto_20160825_1801'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='type_profile', - field=models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type'), - ), - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\w.@+-]+$', 32), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', 'invalid')], verbose_name='Login'), - ), - ] diff --git a/users/migrations/0009_auto_20160906_1450.py b/users/migrations/0009_auto_20160906_1450.py deleted file mode 100644 index a073011..0000000 --- a/users/migrations/0009_auto_20160906_1450.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-06 17:50 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0008_auto_20160902_2123'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile(b'^[\\w.@+-]+$'), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', b'invalid')], verbose_name='Login'), - ), - ] diff --git a/users/migrations/0010_auto_20160906_2332.py b/users/migrations/0010_auto_20160906_2332.py deleted file mode 100644 index 55ca9d2..0000000 --- a/users/migrations/0010_auto_20160906_2332.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-09-07 02:32 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0009_auto_20160906_1450'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\w.@+-]+$', 32), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', 'invalid')], verbose_name='Login'), - ), - ] diff --git a/users/migrations/0011_auto_20160908_1108.py b/users/migrations/0011_auto_20160908_1108.py deleted file mode 100644 index c53c79f..0000000 --- a/users/migrations/0011_auto_20160908_1108.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 14:08 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0010_auto_20160906_2332'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile(b'^[\\w.@+-]+$'), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', b'invalid')], verbose_name='Login'), - ), - ] diff --git a/users/migrations/0012_auto_20160908_1625.py b/users/migrations/0012_auto_20160908_1625.py deleted file mode 100644 index c4b1a99..0000000 --- a/users/migrations/0012_auto_20160908_1625.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-08 19:25 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0011_auto_20160908_1108'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\w.@+-]+$', 32), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', 'invalid')], verbose_name='Login'), - ), - ] diff --git a/users/migrations/0013_auto_20160915_2334.py b/users/migrations/0013_auto_20160915_2334.py deleted file mode 100644 index 9bc9ea5..0000000 --- a/users/migrations/0013_auto_20160915_2334.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-16 02:34 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0012_auto_20160908_1625'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='image', - field=models.ImageField(blank=True, upload_to='users/', verbose_name='Image'), - ), - ] -- libgit2 0.21.2