- {% if field.auto_id == 'id_birth_date' %}
- {% render_field field class='form-control input-sm date-picker' %}
-
-
{{ field.help_text }}
- {% elif field.auto_id == 'id_image' %}
- {% render_field field class='form-control input-sm' %}
-
-
-
-
-
-
- {% elif field.auto_id == 'id_curriculum' %}
- {% render_field field class='form-control input-sm' %}
-
-
-
-
-
-
- {% elif field.auto_id == 'id_cpf' %}
- {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
-
- {% elif field.auto_id == 'id_year_titration' %}
- {% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
+
+
+
+
+
+
+
{% trans "User Register" %}
+
+
- {% elif field.auto_id == 'id_phone' %}
- {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
- {% else %}
- {% render_field field class='form-control' %}
-
{{ field.help_text }}
- {% endif %}
-
+
+
-
+
{% endblock %}
diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py
index 4f2c706..d1a8c9f 100644
--- a/courses/migrations/0001_initial.py
+++ b/courses/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
import autoslug.fields
@@ -44,7 +44,7 @@ class Migration(migrations.Migration):
('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')),
+ ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
],
options={
'verbose_name': 'Category',
@@ -60,7 +60,7 @@ class Migration(migrations.Migration):
('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')),
+ ('create_date', models.DateTimeField(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')),
@@ -68,9 +68,9 @@ class Migration(migrations.Migration):
('public', models.BooleanField(default=False, verbose_name='Public')),
],
options={
- 'ordering': ('create_date', 'name'),
'verbose_name': 'Course',
'verbose_name_plural': 'Courses',
+ 'ordering': ('create_date', 'name'),
},
),
migrations.CreateModel(
@@ -79,7 +79,7 @@ class Migration(migrations.Migration):
('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')),
+ ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
],
options={
'verbose_name': 'Category',
@@ -123,11 +123,13 @@ class Migration(migrations.Migration):
('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')),
+ ('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category')),
+ ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
],
options={
- 'ordering': ('create_date', 'name'),
'verbose_name': 'Subject',
'verbose_name_plural': 'Subjects',
+ 'ordering': ('create_date', 'name'),
},
),
migrations.CreateModel(
@@ -137,6 +139,7 @@ class Migration(migrations.Migration):
('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')),
+ ('subjects', models.ManyToManyField(to='courses.Subject')),
],
options={
'verbose_name': 'subject category',
@@ -153,11 +156,12 @@ class Migration(migrations.Migration):
('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')),
+ ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
],
options={
- 'ordering': ('create_date', 'name'),
'verbose_name': 'Topic',
'verbose_name_plural': 'Topics',
+ 'ordering': ('create_date', 'name'),
},
),
]
diff --git a/courses/migrations/0002_auto_20161114_0144.py b/courses/migrations/0002_auto_20161114_0144.py
deleted file mode 100644
index fe1444e..0000000
--- a/courses/migrations/0002_auto_20161114_0144.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
-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):
-
- initial = True
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('courses', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='topic',
- name='owner',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
- ),
- migrations.AddField(
- model_name='topic',
- name='subject',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'),
- ),
- migrations.AddField(
- model_name='subjectcategory',
- name='subjects',
- field=models.ManyToManyField(to='courses.Subject'),
- ),
- migrations.AddField(
- model_name='subject',
- name='category',
- field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category'),
- ),
- migrations.AddField(
- model_name='subject',
- name='course',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
- ),
- migrations.AddField(
- model_name='subject',
- name='professors',
- field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
- ),
- migrations.AddField(
- model_name='subject',
- name='students',
- field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
- ),
- migrations.AddField(
- model_name='material',
- name='students',
- field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
- ),
- migrations.AddField(
- model_name='material',
- name='topic',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
- ),
- migrations.AddField(
- model_name='linkmaterial',
- name='material',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
- ),
- migrations.AddField(
- model_name='filematerial',
- name='material',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
- ),
- migrations.AddField(
- model_name='course',
- name='category',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
- ),
- migrations.AddField(
- model_name='course',
- name='coordenator',
- field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
- ),
- migrations.AddField(
- model_name='course',
- name='professors',
- field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
- ),
- migrations.AddField(
- model_name='course',
- name='students',
- field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
- ),
- migrations.AddField(
- model_name='activityfile',
- name='diet',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
- ),
- migrations.AddField(
- model_name='activity',
- name='students',
- field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
- ),
- migrations.AddField(
- model_name='activity',
- name='topic',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
- ),
- ]
diff --git a/courses/migrations/0002_auto_20161115_1936.py b/courses/migrations/0002_auto_20161115_1936.py
new file mode 100644
index 0000000..f3dfad1
--- /dev/null
+++ b/courses/migrations/0002_auto_20161115_1936.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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):
+
+ initial = True
+
+ dependencies = [
+ ('courses', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='subject',
+ name='professors',
+ field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+ ),
+ migrations.AddField(
+ model_name='subject',
+ name='students',
+ field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+ ),
+ migrations.AddField(
+ model_name='material',
+ name='students',
+ field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+ ),
+ migrations.AddField(
+ model_name='material',
+ name='topic',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
+ ),
+ migrations.AddField(
+ model_name='linkmaterial',
+ name='material',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
+ ),
+ migrations.AddField(
+ model_name='filematerial',
+ name='material',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
+ ),
+ migrations.AddField(
+ model_name='course',
+ name='category',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
+ ),
+ migrations.AddField(
+ model_name='course',
+ name='coordenator',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
+ ),
+ migrations.AddField(
+ model_name='course',
+ name='professors',
+ field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
+ ),
+ migrations.AddField(
+ model_name='course',
+ name='students',
+ field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+ ),
+ migrations.AddField(
+ model_name='activityfile',
+ name='diet',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
+ ),
+ migrations.AddField(
+ model_name='activity',
+ name='students',
+ field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+ ),
+ migrations.AddField(
+ model_name='activity',
+ name='topic',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
+ ),
+ ]
diff --git a/courses/models.py b/courses/models.py
index 1ecf84f..ecee6df 100644
--- a/courses/models.py
+++ b/courses/models.py
@@ -13,7 +13,7 @@ class CourseCategory(models.Model):
name = models.CharField(_('Name'), max_length = 100, unique = True)
slug = AutoSlugField(_("Slug"),populate_from='name',unique=True)
- create_date = models.DateField(_('Creation Date'), auto_now_add = True)
+ create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
class Meta:
verbose_name = _('Category')
@@ -25,7 +25,7 @@ class CourseCategory(models.Model):
class CategorySubject(models.Model):
name = models.CharField(_('Name'), max_length=100, unique=True)
slug = AutoSlugField(_("Slug"), populate_from='name', unique=True)
- create_date = models.DateField(_('Creation Date'), auto_now_add=True)
+ create_date = models.DateTimeField(_('Creation Date'), auto_now_add=True)
class Meta:
verbose_name = _('Category')
@@ -41,7 +41,7 @@ class Course(models.Model):
objectivies = models.TextField(_('Objectivies'), blank = True)
content = models.TextField(_('Content'), blank = True)
max_students = models.PositiveIntegerField(_('Maximum Students'), blank = True)
- create_date = models.DateField(_('Creation Date'), auto_now_add = True)
+ create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
init_register_date = models.DateField(_('Register Date (Begin)'))
end_register_date = models.DateField(_('Register Date (End)'))
init_date = models.DateField(_('Begin of Course Date'))
@@ -106,7 +106,6 @@ class Topic(models.Model):
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'))
- owner = models.ForeignKey(User, verbose_name = _('Owner'))
visible = models.BooleanField(_('Visible'), default=False)
class Meta:
diff --git a/courses/views.py b/courses/views.py
index 2c58628..f6bbebe 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -429,7 +429,7 @@ class FilteredView(LoginRequiredMixin, generic.ListView):
redirect_field_name = 'next'
template_name = 'course/filtered.html'
context_object_name = 'courses'
- paginate_by = 3
+ paginate_by = 10
def get_queryset(self):
category = get_object_or_404(CourseCategory, slug = self.kwargs.get('slug'))
@@ -447,11 +447,11 @@ class IndexCatView(LoginRequiredMixin, generic.ListView):
login_url = reverse_lazy("core:home")
redirect_field_name = 'next'
- queryset = sorted(CourseCategory.objects.all(),key = lambda x:x.name)
+ queryset = CourseCategory.objects.all().order_by("name")
template_name = 'category/index.html'
context_object_name = 'categories'
- paginate_by = 5
-
+ paginate_by = 10
+
class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
allowed_roles = ['professor', 'system_admin']
@@ -589,7 +589,7 @@ class ReplicateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificat
def form_valid(self, form):
self.object = form.save()
-
+
return super(ReplicateSubjectView, self).form_valid(form)
def get_success_url(self):
@@ -1065,4 +1065,4 @@ class ReplicateTopicView (LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
super(ReplicateTopicView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
- return super(ReplicateTopicView, self).form_valid(form)
\ No newline at end of file
+ return super(ReplicateTopicView, self).form_valid(form)
diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py
index 1464ad5..c6f9857 100644
--- a/exam/migrations/0001_initial.py
+++ b/exam/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
from django.db import migrations, models
@@ -23,9 +23,9 @@ class Migration(migrations.Migration):
('order', models.PositiveSmallIntegerField(verbose_name='Order')),
],
options={
- 'ordering': ('order',),
'verbose_name': 'Answer',
'verbose_name_plural': 'Answers',
+ 'ordering': ('order',),
},
),
migrations.CreateModel(
diff --git a/exam/migrations/0002_auto_20161114_0144.py b/exam/migrations/0002_auto_20161114_0144.py
deleted file mode 100644
index a1493de..0000000
--- a/exam/migrations/0002_auto_20161114_0144.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
-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):
-
- initial = True
-
- dependencies = [
- ('exam', '0001_initial'),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.AddField(
- model_name='answersstudent',
- name='student',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
- ),
- migrations.AddField(
- model_name='answer',
- name='exam',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
- ),
- ]
diff --git a/exam/migrations/0002_auto_20161115_1936.py b/exam/migrations/0002_auto_20161115_1936.py
new file mode 100644
index 0000000..893c18b
--- /dev/null
+++ b/exam/migrations/0002_auto_20161115_1936.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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):
+
+ initial = True
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('exam', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='answersstudent',
+ name='student',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
+ ),
+ migrations.AddField(
+ model_name='answer',
+ name='exam',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
+ ),
+ ]
diff --git a/exercise/migrations/0001_initial.py b/exercise/migrations/0001_initial.py
index 2de77e8..592f56a 100644
--- a/exercise/migrations/0001_initial.py
+++ b/exercise/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py
index 7afc54a..ec27f7a 100644
--- a/files/migrations/0001_initial.py
+++ b/files/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
from django.db import migrations, models
@@ -26,9 +26,9 @@ class Migration(migrations.Migration):
('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')),
],
options={
- 'ordering': ('-id',),
'verbose_name': 'File',
'verbose_name_plural': 'Files',
+ 'ordering': ('-id',),
},
bases=('courses.material',),
),
diff --git a/files/migrations/0002_topicfile_professor.py b/files/migrations/0002_topicfile_professor.py
index 549ca29..ffe048e 100644
--- a/files/migrations/0002_topicfile_professor.py
+++ b/files/migrations/0002_topicfile_professor.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
from django.conf import settings
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('files', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('files', '0001_initial'),
]
operations = [
diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py
index 414d9ed..4479156 100644
--- a/forum/migrations/0001_initial.py
+++ b/forum/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/forum/migrations/0002_auto_20161114_0144.py b/forum/migrations/0002_auto_20161114_0144.py
deleted file mode 100644
index 7f9cea5..0000000
--- a/forum/migrations/0002_auto_20161114_0144.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
-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):
-
- initial = True
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('forum', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='postanswer',
- name='user',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
- ),
- migrations.AddField(
- model_name='post',
- name='forum',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
- ),
- migrations.AddField(
- model_name='post',
- name='user',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
- ),
- ]
diff --git a/forum/migrations/0002_auto_20161115_1936.py b/forum/migrations/0002_auto_20161115_1936.py
new file mode 100644
index 0000000..5b45aa1
--- /dev/null
+++ b/forum/migrations/0002_auto_20161115_1936.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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):
+
+ initial = True
+
+ dependencies = [
+ ('forum', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='postanswer',
+ name='user',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
+ ),
+ migrations.AddField(
+ model_name='post',
+ name='forum',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
+ ),
+ migrations.AddField(
+ model_name='post',
+ name='user',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
+ ),
+ ]
diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py
index 548113e..01407af 100644
--- a/links/migrations/0001_initial.py
+++ b/links/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py
index e6a24a6..fb1dcba 100644
--- a/poll/migrations/0001_initial.py
+++ b/poll/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
from django.db import migrations, models
@@ -23,9 +23,9 @@ class Migration(migrations.Migration):
('order', models.PositiveSmallIntegerField(verbose_name='Order')),
],
options={
- 'ordering': ('order',),
'verbose_name': 'Answer',
'verbose_name_plural': 'Answers',
+ 'ordering': ('order',),
},
),
migrations.CreateModel(
diff --git a/poll/migrations/0002_auto_20161114_0144.py b/poll/migrations/0002_auto_20161114_0144.py
deleted file mode 100644
index 1e55b06..0000000
--- a/poll/migrations/0002_auto_20161114_0144.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
-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):
-
- initial = True
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('poll', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='answersstudent',
- name='student',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
- ),
- migrations.AddField(
- model_name='answer',
- name='poll',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
- ),
- ]
diff --git a/poll/migrations/0002_auto_20161115_1936.py b/poll/migrations/0002_auto_20161115_1936.py
new file mode 100644
index 0000000..9febe70
--- /dev/null
+++ b/poll/migrations/0002_auto_20161115_1936.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:36
+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):
+
+ initial = True
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('poll', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='answersstudent',
+ name='student',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
+ ),
+ migrations.AddField(
+ model_name='answer',
+ name='poll',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
+ ),
+ ]
diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py
index 17cb67b..c1a29a5 100644
--- a/users/migrations/0001_initial.py
+++ b/users/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-11-14 04:44
+# Generated by Django 1.10 on 2016-11-15 22:36
from __future__ import unicode_literals
import django.contrib.auth.models
@@ -26,14 +26,14 @@ class Migration(migrations.Migration):
('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')),
+ ('name', models.CharField(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(null=True, verbose_name='Birth Date')),
+ ('image', models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Image')),
+ ('birth_date', models.DateField(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')),
+ ('cpf', models.CharField(max_length=15, verbose_name='Cpf')),
('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')),
('titration', models.CharField(blank=True, max_length=50, null=True, verbose_name='Titration')),
('year_titration', models.CharField(blank=True, max_length=4, null=True, verbose_name='Year of titration')),
diff --git a/users/migrations/0002_auto_20161115_1941.py b/users/migrations/0002_auto_20161115_1941.py
new file mode 100644
index 0000000..808788e
--- /dev/null
+++ b/users/migrations/0002_auto_20161115_1941.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-15 22:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='user',
+ name='birth_date',
+ field=models.DateField(null=True, verbose_name='Birth Date'),
+ ),
+ ]
diff --git a/users/models.py b/users/models.py
index 634c7f1..29a9e0f 100644
--- a/users/models.py
+++ b/users/models.py
@@ -16,14 +16,14 @@ class User(AbstractBaseUser, PermissionsMixin):
)
], help_text = _('A short name that will be used to identify you in the platform and to access it'))
email = models.EmailField(_('Mail'), unique = True)
- name = models.CharField(_('Name'), max_length = 100, blank = True)
+ name = models.CharField(_('Name'), max_length = 100)
city = models.CharField(_('City'), max_length = 90, blank = True)
state = models.CharField(_('State'), max_length = 30, blank = True)
gender = models.CharField(_('Gender'), max_length = 1, choices = (('M', _('Male')), ('F', _('Female'))))
- image = models.ImageField(verbose_name = _('Image'), blank = True, upload_to = 'users/')
+ image = models.ImageField(verbose_name = _('Image'), null=True, blank = True, upload_to = 'users/')
birth_date = models.DateField(_('Birth Date'), null=True)
phone = models.CharField(_('Phone'), max_length = 30, blank = True)
- cpf = models.CharField(_('Cpf'), max_length = 15, blank = True)
+ cpf = models.CharField(_('Cpf'), max_length = 15)
type_profile = models.IntegerField(_('Type'), null = True, blank = True, choices = ((1, _('Professor')), (2, _('Student'))), default=2)
titration = models.CharField(_('Titration'), max_length = 50, blank = True, null = True)
year_titration = models.CharField(_('Year of titration'), max_length = 4, blank = True, null = True)
@@ -56,4 +56,4 @@ class User(AbstractBaseUser, PermissionsMixin):
if self.image and hasattr(self.image, 'url'):
return self.image.url
else:
- return static('img/no_image.jpg')
\ No newline at end of file
+ return static('img/no_image.jpg')
--
libgit2 0.21.2
-