Download as
Browse Code »

Commit 973b673b38b9d0a14bdbcd4b142ca16809d27813

Authored by Matheus Lins
1 parent e44949c9
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

updating list category #136

Showing 22 changed files with 331 additions and 282 deletions   Show diff stats
core/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-22 04:31 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
6 -from django.conf import settings  
7 from django.db import migrations, models 6 from django.db import migrations, models
8 import django.db.models.deletion 7 import django.db.models.deletion
9 8
@@ -13,7 +12,6 @@ class Migration(migrations.Migration): @@ -13,7 +12,6 @@ class Migration(migrations.Migration):
13 initial = True 12 initial = True
14 13
15 dependencies = [ 14 dependencies = [
16 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
17 ] 15 ]
18 16
19 operations = [ 17 operations = [
@@ -22,7 +20,7 @@ class Migration(migrations.Migration): @@ -22,7 +20,7 @@ class Migration(migrations.Migration):
22 fields=[ 20 fields=[
23 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 21 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
24 ('name', models.CharField(max_length=100, verbose_name='Name')), 22 ('name', models.CharField(max_length=100, verbose_name='Name')),
25 - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from=('name',), unique=True, verbose_name='Slug')), 23 + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
26 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')), 24 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')),
27 ], 25 ],
28 options={ 26 options={
@@ -34,7 +32,6 @@ class Migration(migrations.Migration): @@ -34,7 +32,6 @@ class Migration(migrations.Migration):
34 name='Action_Resource', 32 name='Action_Resource',
35 fields=[ 33 fields=[
36 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 34 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
37 - ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')),  
38 ], 35 ],
39 options={ 36 options={
40 'verbose_name_plural': 'Action_Resources', 37 'verbose_name_plural': 'Action_Resources',
@@ -46,8 +43,6 @@ class Migration(migrations.Migration): @@ -46,8 +43,6 @@ class Migration(migrations.Migration):
46 fields=[ 43 fields=[
47 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 44 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
48 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), 45 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
49 - ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),  
50 - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),  
51 ], 46 ],
52 options={ 47 options={
53 'verbose_name_plural': 'Logs', 48 'verbose_name_plural': 'Logs',
@@ -74,8 +69,6 @@ class Migration(migrations.Migration): @@ -74,8 +69,6 @@ class Migration(migrations.Migration):
74 ('read', models.BooleanField(default=False, verbose_name='Read')), 69 ('read', models.BooleanField(default=False, verbose_name='Read')),
75 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), 70 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
76 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), 71 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
77 - ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')),  
78 - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')),  
79 ], 72 ],
80 options={ 73 options={
81 'verbose_name_plural': 'Notifications', 74 'verbose_name_plural': 'Notifications',
@@ -96,9 +89,4 @@ class Migration(migrations.Migration): @@ -96,9 +89,4 @@ class Migration(migrations.Migration):
96 'verbose_name': 'Resource', 89 'verbose_name': 'Resource',
97 }, 90 },
98 ), 91 ),
99 - migrations.AddField(  
100 - model_name='action_resource',  
101 - name='resource',  
102 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),  
103 - ),  
104 ] 92 ]
core/migrations/0002_auto_20161022_0158.py
View file @e44949c
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-22 04:58  
3 -from __future__ import unicode_literals  
4 -  
5 -import autoslug.fields  
6 -from django.db import migrations  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('core', '0001_initial'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AlterField(  
17 - model_name='action',  
18 - name='slug',  
19 - field=autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug'),  
20 - ),  
21 - ]  
core/migrations/0002_auto_20161024_1559.py 0 → 100644
  Diff comments   View file @973b673
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-24 18:59
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('core', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='notification',
  22 + name='actor',
  23 + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='notification',
  27 + name='user',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='log',
  32 + name='action_resource',
  33 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),
  34 + ),
  35 + migrations.AddField(
  36 + model_name='log',
  37 + name='user',
  38 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),
  39 + ),
  40 + migrations.AddField(
  41 + model_name='action_resource',
  42 + name='action',
  43 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),
  44 + ),
  45 + migrations.AddField(
  46 + model_name='action_resource',
  47 + name='resource',
  48 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
  49 + ),
  50 + ]
courses/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-22 04:32 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
6 -from django.conf import settings  
7 from django.db import migrations, models 6 from django.db import migrations, models
8 import django.db.models.deletion 7 import django.db.models.deletion
9 import s3direct.fields 8 import s3direct.fields
@@ -15,7 +14,6 @@ class Migration(migrations.Migration): @@ -15,7 +14,6 @@ class Migration(migrations.Migration):
15 14
16 dependencies = [ 15 dependencies = [
17 ('core', '0001_initial'), 16 ('core', '0001_initial'),
18 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
19 ] 17 ]
20 18
21 operations = [ 19 operations = [
@@ -25,7 +23,6 @@ class Migration(migrations.Migration): @@ -25,7 +23,6 @@ class Migration(migrations.Migration):
25 ('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')), 23 ('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')),
26 ('limit_date', models.DateField(verbose_name='Deliver Date')), 24 ('limit_date', models.DateField(verbose_name='Deliver Date')),
27 ('all_students', models.BooleanField(default=False, verbose_name='All Students')), 25 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
28 - ('students', models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students')),  
29 ], 26 ],
30 bases=('core.resource',), 27 bases=('core.resource',),
31 ), 28 ),
@@ -35,7 +32,6 @@ class Migration(migrations.Migration): @@ -35,7 +32,6 @@ class Migration(migrations.Migration):
35 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 32 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
36 ('pdf', s3direct.fields.S3DirectField()), 33 ('pdf', s3direct.fields.S3DirectField()),
37 ('name', models.CharField(max_length=100)), 34 ('name', models.CharField(max_length=100)),
38 - ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')),  
39 ], 35 ],
40 options={ 36 options={
41 'verbose_name_plural': 'Activitys Files', 37 'verbose_name_plural': 'Activitys Files',
@@ -70,12 +66,12 @@ class Migration(migrations.Migration): @@ -70,12 +66,12 @@ class Migration(migrations.Migration):
70 ('init_date', models.DateField(verbose_name='Begin of Course Date')), 66 ('init_date', models.DateField(verbose_name='Begin of Course Date')),
71 ('end_date', models.DateField(verbose_name='End of Course Date')), 67 ('end_date', models.DateField(verbose_name='End of Course Date')),
72 ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), 68 ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')),
73 - ('public', models.BooleanField(verbose_name='Public')), 69 + ('public', models.BooleanField(default=False, verbose_name='Public')),
74 ], 70 ],
75 options={ 71 options={
  72 + 'ordering': ('create_date', 'name'),
76 'verbose_name_plural': 'Courses', 73 'verbose_name_plural': 'Courses',
77 'verbose_name': 'Course', 74 'verbose_name': 'Course',
78 - 'ordering': ('create_date', 'name'),  
79 }, 75 },
80 ), 76 ),
81 migrations.CreateModel( 77 migrations.CreateModel(
@@ -113,7 +109,6 @@ class Migration(migrations.Migration): @@ -113,7 +109,6 @@ class Migration(migrations.Migration):
113 fields=[ 109 fields=[
114 ('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')), 110 ('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')),
115 ('all_students', models.BooleanField(default=False, verbose_name='All Students')), 111 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
116 - ('students', models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students')),  
117 ], 112 ],
118 bases=('core.resource',), 113 bases=('core.resource',),
119 ), 114 ),
@@ -129,15 +124,11 @@ class Migration(migrations.Migration): @@ -129,15 +124,11 @@ class Migration(migrations.Migration):
129 ('end_date', models.DateField(verbose_name='End of Subject Date')), 124 ('end_date', models.DateField(verbose_name='End of Subject Date')),
130 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), 125 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
131 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), 126 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
132 - ('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category')),  
133 - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),  
134 - ('professors', models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),  
135 - ('students', models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),  
136 ], 127 ],
137 options={ 128 options={
  129 + 'ordering': ('create_date', 'name'),
138 'verbose_name_plural': 'Subjects', 130 'verbose_name_plural': 'Subjects',
139 'verbose_name': 'Subject', 131 'verbose_name': 'Subject',
140 - 'ordering': ('create_date', 'name'),  
141 }, 132 },
142 ), 133 ),
143 migrations.CreateModel( 134 migrations.CreateModel(
@@ -147,7 +138,6 @@ class Migration(migrations.Migration): @@ -147,7 +138,6 @@ class Migration(migrations.Migration):
147 ('name', models.CharField(max_length=100, verbose_name='Name')), 138 ('name', models.CharField(max_length=100, verbose_name='Name')),
148 ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), 139 ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
149 ('description', models.TextField(blank=True, verbose_name='Description')), 140 ('description', models.TextField(blank=True, verbose_name='Description')),
150 - ('subjects', models.ManyToManyField(to='courses.Subject')),  
151 ], 141 ],
152 options={ 142 options={
153 'verbose_name_plural': 'subject categories', 143 'verbose_name_plural': 'subject categories',
@@ -164,48 +154,11 @@ class Migration(migrations.Migration): @@ -164,48 +154,11 @@ class Migration(migrations.Migration):
164 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), 154 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
165 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), 155 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
166 ('visible', models.BooleanField(default=False, verbose_name='Visible')), 156 ('visible', models.BooleanField(default=False, verbose_name='Visible')),
167 - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')),  
168 - ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),  
169 ], 157 ],
170 options={ 158 options={
  159 + 'ordering': ('create_date', 'name'),
171 'verbose_name_plural': 'Topics', 160 'verbose_name_plural': 'Topics',
172 'verbose_name': 'Topic', 161 'verbose_name': 'Topic',
173 - 'ordering': ('create_date', 'name'),  
174 }, 162 },
175 ), 163 ),
176 - migrations.AddField(  
177 - model_name='material',  
178 - name='topic',  
179 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),  
180 - ),  
181 - migrations.AddField(  
182 - model_name='linkmaterial',  
183 - name='material',  
184 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),  
185 - ),  
186 - migrations.AddField(  
187 - model_name='filematerial',  
188 - name='material',  
189 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),  
190 - ),  
191 - migrations.AddField(  
192 - model_name='course',  
193 - name='category',  
194 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),  
195 - ),  
196 - migrations.AddField(  
197 - model_name='course',  
198 - name='professors',  
199 - field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),  
200 - ),  
201 - migrations.AddField(  
202 - model_name='course',  
203 - name='students',  
204 - field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),  
205 - ),  
206 - migrations.AddField(  
207 - model_name='activity',  
208 - name='topic',  
209 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),  
210 - ),  
211 ] 164 ]
courses/migrations/0002_auto_20161024_1428.py
View file @e44949c
@@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-24 17:28  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -  
7 -  
8 -class Migration(migrations.Migration):  
9 -  
10 - dependencies = [  
11 - ('courses', '0001_initial'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.AlterField(  
16 - model_name='course',  
17 - name='public',  
18 - field=models.BooleanField(default=False, verbose_name='Public'),  
19 - ),  
20 - ]  
courses/migrations/0002_auto_20161024_1559.py 0 → 100644
  Diff comments   View file @973b673
@@ -0,0 +1,105 @@ @@ -0,0 +1,105 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-24 18:59
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('courses', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='topic',
  22 + name='owner',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='topic',
  27 + name='subject',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='subjectcategory',
  32 + name='subjects',
  33 + field=models.ManyToManyField(to='courses.Subject'),
  34 + ),
  35 + migrations.AddField(
  36 + model_name='subject',
  37 + name='category',
  38 + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category'),
  39 + ),
  40 + migrations.AddField(
  41 + model_name='subject',
  42 + name='course',
  43 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'),
  44 + ),
  45 + migrations.AddField(
  46 + model_name='subject',
  47 + name='professors',
  48 + field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  49 + ),
  50 + migrations.AddField(
  51 + model_name='subject',
  52 + name='students',
  53 + field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  54 + ),
  55 + migrations.AddField(
  56 + model_name='material',
  57 + name='students',
  58 + field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  59 + ),
  60 + migrations.AddField(
  61 + model_name='material',
  62 + name='topic',
  63 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
  64 + ),
  65 + migrations.AddField(
  66 + model_name='linkmaterial',
  67 + name='material',
  68 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
  69 + ),
  70 + migrations.AddField(
  71 + model_name='filematerial',
  72 + name='material',
  73 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
  74 + ),
  75 + migrations.AddField(
  76 + model_name='course',
  77 + name='category',
  78 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
  79 + ),
  80 + migrations.AddField(
  81 + model_name='course',
  82 + name='professors',
  83 + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  84 + ),
  85 + migrations.AddField(
  86 + model_name='course',
  87 + name='students',
  88 + field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  89 + ),
  90 + migrations.AddField(
  91 + model_name='activityfile',
  92 + name='diet',
  93 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
  94 + ),
  95 + migrations.AddField(
  96 + model_name='activity',
  97 + name='students',
  98 + field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  99 + ),
  100 + migrations.AddField(
  101 + model_name='activity',
  102 + name='topic',
  103 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
  104 + ),
  105 + ]
courses/static/js/modal_category.js
  Diff comments   View file @973b673
@@ -5,7 +5,7 @@ var Submite = { @@ -5,7 +5,7 @@ var Submite = {
5 $.post(url,dados, function(data){ 5 $.post(url,dados, function(data){
6 $(id_li_link).remove(); 6 $(id_li_link).remove();
7 $("#modal_category").empty(); 7 $("#modal_category").empty();
8 - $("div.modal-backdrop.fade.in").remove(); 8 + $("#accordion").remove();
9 alertify.success("Category removed successfully!"); 9 alertify.success("Category removed successfully!");
10 }).fail(function(){ 10 }).fail(function(){
11 $("#modal_category").empty(); 11 $("#modal_category").empty();
courses/templates/category/index.html
  Diff comments   View file @973b673
@@ -64,37 +64,36 @@ @@ -64,37 +64,36 @@
64 </div> 64 </div>
65 {% endfor %} 65 {% endfor %}
66 {% endif %} 66 {% endif %}
67 - <div class="table-responsive">  
68 - <table class="table table-striped">  
69 - <thead>  
70 - <tr>  
71 - <th>{% trans 'Name' %}</th>  
72 - <th>{% trans 'Slug' %}</th>  
73 - <th class="text-center">{% trans 'Actions' %}</th>  
74 - </tr>  
75 - </thead>  
76 - <tbody>  
77 - {% if categories|length > 0 %}  
78 - {% for category in categories %}  
79 - <tr>  
80 - <td>{{ category }}</td>  
81 - <td>{{ category.slug }}</td>  
82 - <td class="text-center">  
83 - <a href="{% url 'course:update_cat' category.slug %}" class="btn btn-primary btn-sm"><span class="glyphicon glyphicon-edit"></span></a>  
84 - <a href="javascript:modal.get('{% url 'course:delete_cat' category.slug %}','#category','#modal_category');" class="btn btn-danger btn-sm"><span class="glyphicon glyphicon-trash"></span></a>  
85 - </td>  
86 - </tr>  
87 - {% endfor %}  
88 - {% else %}  
89 - <tr>  
90 - <td colspan="3">  
91 - {% trans 'No categories found' %}  
92 - </td>  
93 - </tr>  
94 - {% endif %}  
95 - </tbody>  
96 - </table>  
97 - </div> 67 + {% if categories|length > 0 %}
  68 + {% for category in categories %}
  69 + <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
  70 + <div class="group">
  71 + <div class="panel panel-info">
  72 + <div class="panel-heading" role="tab">
  73 + <div class="row">
  74 + <div class="col-xs-9 col-md-10 titleTopic">
  75 + <h4 style="color:white">{{category}}</h4>
  76 + </div>
  77 +
  78 + <div class="col-xs-4 col-md-2" id="divMoreActions">
  79 + <div class="btn-group">
  80 + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  81 + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
  82 + </button>
  83 + <ul class="dropdown-menu" aria-labelledby="moreActions">
  84 + <li><a href="{% url 'course:update_cat' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Update' %}</a></li>
  85 + <li><a href="javascript:modal.get('{% url 'course:delete_cat' category.slug %}','#category','#modal_category');"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remover' %}</a></li>
  86 + </ul>
  87 + </div>
  88 + </div>
  89 +
  90 + </div>
  91 + </div>
  92 + </div>
  93 + </div>
  94 + </div>
  95 + {% endfor %}
  96 + {% endif %}
98 <div class="row" id="modal_category"> 97 <div class="row" id="modal_category">
99 <script src="{% static 'js/modal_category.js' %}"></script> 98 <script src="{% static 'js/modal_category.js' %}"></script>
100 {% endblock %} 99 {% endblock %}
101 \ No newline at end of file 100 \ No newline at end of file
exam/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-22 04:32 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 -from django.conf import settings  
6 from django.db import migrations, models 5 from django.db import migrations, models
7 import django.db.models.deletion 6 import django.db.models.deletion
8 7
@@ -12,7 +11,6 @@ class Migration(migrations.Migration): @@ -12,7 +11,6 @@ class Migration(migrations.Migration):
12 initial = True 11 initial = True
13 12
14 dependencies = [ 13 dependencies = [
15 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
16 ('courses', '0001_initial'), 14 ('courses', '0001_initial'),
17 ] 15 ]
18 16
@@ -25,9 +23,9 @@ class Migration(migrations.Migration): @@ -25,9 +23,9 @@ class Migration(migrations.Migration):
25 ('order', models.PositiveSmallIntegerField(verbose_name='Order')), 23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
26 ], 24 ],
27 options={ 25 options={
  26 + 'ordering': ('order',),
28 'verbose_name_plural': 'Answers', 27 'verbose_name_plural': 'Answers',
29 'verbose_name': 'Answer', 28 'verbose_name': 'Answer',
30 - 'ordering': ('order',),  
31 }, 29 },
32 ), 30 ),
33 migrations.CreateModel( 31 migrations.CreateModel(
@@ -48,6 +46,7 @@ class Migration(migrations.Migration): @@ -48,6 +46,7 @@ class Migration(migrations.Migration):
48 fields=[ 46 fields=[
49 ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')), 47 ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')),
50 ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')), 48 ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')),
  49 + ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')),
51 ], 50 ],
52 options={ 51 options={
53 'verbose_name_plural': 'Exams', 52 'verbose_name_plural': 'Exams',
@@ -60,14 +59,4 @@ class Migration(migrations.Migration): @@ -60,14 +59,4 @@ class Migration(migrations.Migration):
60 name='exam', 59 name='exam',
61 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_exam', to='exam.Exam', verbose_name='Exam'), 60 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_exam', to='exam.Exam', verbose_name='Exam'),
62 ), 61 ),
63 - migrations.AddField(  
64 - model_name='answersstudent',  
65 - name='student',  
66 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),  
67 - ),  
68 - migrations.AddField(  
69 - model_name='answer',  
70 - name='exam',  
71 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),  
72 - ),  
73 ] 62 ]
exam/migrations/0002_auto_20161024_1559.py 0 → 100644
  Diff comments   View file @973b673
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-24 18:59
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('exam', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='answersstudent',
  22 + name='student',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='answer',
  27 + name='exam',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
  29 + ),
  30 + ]
files/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-22 04:32 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 -from django.conf import settings  
6 from django.db import migrations, models 5 from django.db import migrations, models
7 import django.db.models.deletion 6 import django.db.models.deletion
8 import files.models 7 import files.models
@@ -13,9 +12,8 @@ class Migration(migrations.Migration): @@ -13,9 +12,8 @@ class Migration(migrations.Migration):
13 initial = True 12 initial = True
14 13
15 dependencies = [ 14 dependencies = [
16 - ('courses', '0001_initial'),  
17 ('core', '0001_initial'), 15 ('core', '0001_initial'),
18 - migrations.swappable_dependency(settings.AUTH_USER_MODEL), 16 + ('courses', '0001_initial'),
19 ] 17 ]
20 18
21 operations = [ 19 operations = [
@@ -26,12 +24,11 @@ class Migration(migrations.Migration): @@ -26,12 +24,11 @@ class Migration(migrations.Migration):
26 ('description', models.TextField(blank=True, verbose_name='Description')), 24 ('description', models.TextField(blank=True, verbose_name='Description')),
27 ('file_url', models.FileField(upload_to=files.models.file_path, verbose_name='File')), 25 ('file_url', models.FileField(upload_to=files.models.file_path, verbose_name='File')),
28 ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')), 26 ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')),
29 - ('professor', models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),  
30 ], 27 ],
31 options={ 28 options={
32 - 'verbose_name': 'File',  
33 'ordering': ('-id',), 29 'ordering': ('-id',),
34 'verbose_name_plural': 'Files', 30 'verbose_name_plural': 'Files',
  31 + 'verbose_name': 'File',
35 }, 32 },
36 bases=('courses.material',), 33 bases=('courses.material',),
37 ), 34 ),
files/migrations/0002_topicfile_professor.py 0 → 100644
  Diff comments   View file @973b673
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-24 18:59
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +
  8 +
  9 +class Migration(migrations.Migration):
  10 +
  11 + initial = True
  12 +
  13 + dependencies = [
  14 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  15 + ('files', '0001_initial'),
  16 + ]
  17 +
  18 + operations = [
  19 + migrations.AddField(
  20 + model_name='topicfile',
  21 + name='professor',
  22 + field=models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  23 + ),
  24 + ]
forum/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-22 04:32 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 -from django.conf import settings  
6 from django.db import migrations, models 5 from django.db import migrations, models
7 import django.db.models.deletion 6 import django.db.models.deletion
8 7
@@ -13,7 +12,6 @@ class Migration(migrations.Migration): @@ -13,7 +12,6 @@ class Migration(migrations.Migration):
13 12
14 dependencies = [ 13 dependencies = [
15 ('courses', '0001_initial'), 14 ('courses', '0001_initial'),
16 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
17 ] 15 ]
18 16
19 operations = [ 17 operations = [
@@ -38,8 +36,6 @@ class Migration(migrations.Migration): @@ -38,8 +36,6 @@ class Migration(migrations.Migration):
38 ('message', models.TextField(verbose_name='Post message')), 36 ('message', models.TextField(verbose_name='Post message')),
39 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), 37 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
40 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), 38 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
41 - ('forum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum')),  
42 - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),  
43 ], 39 ],
44 options={ 40 options={
45 'verbose_name_plural': 'Posts', 41 'verbose_name_plural': 'Posts',
@@ -54,7 +50,6 @@ class Migration(migrations.Migration): @@ -54,7 +50,6 @@ class Migration(migrations.Migration):
54 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), 50 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
55 ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')), 51 ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')),
56 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), 52 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
57 - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),  
58 ], 53 ],
59 options={ 54 options={
60 'verbose_name_plural': 'Post Answers', 55 'verbose_name_plural': 'Post Answers',
forum/migrations/0002_auto_20161024_1559.py 0 → 100644
  Diff comments   View file @973b673
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-24 18:59
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('forum', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='postanswer',
  22 + name='user',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='post',
  27 + name='forum',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='post',
  32 + name='user',
  33 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
  34 + ),
  35 + ]
links/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-22 04:32 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from django.db import migrations, models 5 from django.db import migrations, models
poll/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-22 04:32 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 -from django.conf import settings  
6 from django.db import migrations, models 5 from django.db import migrations, models
7 import django.db.models.deletion 6 import django.db.models.deletion
8 7
@@ -13,7 +12,6 @@ class Migration(migrations.Migration): @@ -13,7 +12,6 @@ class Migration(migrations.Migration):
13 12
14 dependencies = [ 13 dependencies = [
15 ('courses', '0001_initial'), 14 ('courses', '0001_initial'),
16 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
17 ] 15 ]
18 16
19 operations = [ 17 operations = [
@@ -26,8 +24,8 @@ class Migration(migrations.Migration): @@ -26,8 +24,8 @@ class Migration(migrations.Migration):
26 ], 24 ],
27 options={ 25 options={
28 'ordering': ('order',), 26 'ordering': ('order',),
29 - 'verbose_name': 'Answer',  
30 'verbose_name_plural': 'Answers', 27 'verbose_name_plural': 'Answers',
  28 + 'verbose_name': 'Answer',
31 }, 29 },
32 ), 30 ),
33 migrations.CreateModel( 31 migrations.CreateModel(
@@ -39,8 +37,8 @@ class Migration(migrations.Migration): @@ -39,8 +37,8 @@ class Migration(migrations.Migration):
39 ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')), 37 ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),
40 ], 38 ],
41 options={ 39 options={
42 - 'verbose_name': 'Answer Stundent',  
43 'verbose_name_plural': 'Answers Student', 40 'verbose_name_plural': 'Answers Student',
  41 + 'verbose_name': 'Answer Stundent',
44 }, 42 },
45 ), 43 ),
46 migrations.CreateModel( 44 migrations.CreateModel(
@@ -49,8 +47,8 @@ class Migration(migrations.Migration): @@ -49,8 +47,8 @@ class Migration(migrations.Migration):
49 ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')), 47 ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')),
50 ], 48 ],
51 options={ 49 options={
52 - 'verbose_name': 'Poll',  
53 'verbose_name_plural': 'Polls', 50 'verbose_name_plural': 'Polls',
  51 + 'verbose_name': 'Poll',
54 }, 52 },
55 bases=('courses.activity',), 53 bases=('courses.activity',),
56 ), 54 ),
@@ -59,14 +57,4 @@ class Migration(migrations.Migration): @@ -59,14 +57,4 @@ class Migration(migrations.Migration):
59 name='poll', 57 name='poll',
60 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'), 58 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'),
61 ), 59 ),
62 - migrations.AddField(  
63 - model_name='answersstudent',  
64 - name='student',  
65 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),  
66 - ),  
67 - migrations.AddField(  
68 - model_name='answer',  
69 - name='poll',  
70 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),  
71 - ),  
72 ] 60 ]
poll/migrations/0002_auto_20161024_1559.py 0 → 100644
  Diff comments   View file @973b673
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-10-24 18:59
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('poll', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='answersstudent',
  22 + name='student',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='answer',
  27 + name='poll',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
  29 + ),
  30 + ]
users/migrations/0001_initial.py
  Diff comments   View file @973b673
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-18 21:42 2 +# Generated by Django 1.10 on 2016-10-24 18:59
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import django.contrib.auth.models 5 import django.contrib.auth.models
@@ -31,10 +31,14 @@ class Migration(migrations.Migration): @@ -31,10 +31,14 @@ class Migration(migrations.Migration):
31 ('state', models.CharField(blank=True, max_length=30, verbose_name='State')), 31 ('state', models.CharField(blank=True, max_length=30, verbose_name='State')),
32 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender')), 32 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender')),
33 ('image', models.ImageField(blank=True, upload_to='users/', verbose_name='Image')), 33 ('image', models.ImageField(blank=True, upload_to='users/', verbose_name='Image')),
34 - ('birth_date', models.DateField(blank=True, null=True, verbose_name='Birth Date')), 34 + ('birth_date', models.DateField(null=True, verbose_name='Birth Date')),
35 ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')), 35 ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')),
36 ('cpf', models.CharField(blank=True, max_length=15, verbose_name='Cpf')), 36 ('cpf', models.CharField(blank=True, max_length=15, verbose_name='Cpf')),
37 ('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')), 37 ('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')),
  38 + ('titration', models.CharField(blank=True, max_length=50, null=True, verbose_name='Titration')),
  39 + ('year_titration', models.CharField(blank=True, max_length=4, null=True, verbose_name='Year of titration')),
  40 + ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution where he had titration')),
  41 + ('curriculum', models.FileField(blank=True, null=True, upload_to='users/curriculum/', verbose_name='Curriculum')),
38 ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), 42 ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
39 ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')), 43 ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')),
40 ('is_active', models.BooleanField(default=True, verbose_name='Active')), 44 ('is_active', models.BooleanField(default=True, verbose_name='Active')),
@@ -42,8 +46,8 @@ class Migration(migrations.Migration): @@ -42,8 +46,8 @@ class Migration(migrations.Migration):
42 ('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')), 46 ('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')),
43 ], 47 ],
44 options={ 48 options={
45 - 'verbose_name': 'User',  
46 'verbose_name_plural': 'Users', 49 'verbose_name_plural': 'Users',
  50 + 'verbose_name': 'User',
47 }, 51 },
48 managers=[ 52 managers=[
49 ('objects', django.contrib.auth.models.UserManager()), 53 ('objects', django.contrib.auth.models.UserManager()),
users/migrations/0002_auto_20161021_0741.py
View file @e44949c
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-21 10:41  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import django.utils.timezone  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('users', '0001_initial'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AlterField(  
17 - model_name='user',  
18 - name='birth_date',  
19 - field=models.DateField(default=django.utils.timezone.now, verbose_name='Birth Date'),  
20 - preserve_default=False,  
21 - ),  
22 - ]  
users/migrations/0003_auto_20161021_0812.py
View file @e44949c
@@ -1,35 +0,0 @@ @@ -1,35 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-21 11:12  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -  
7 -  
8 -class Migration(migrations.Migration):  
9 -  
10 - dependencies = [  
11 - ('users', '0002_auto_20161021_0741'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.AddField(  
16 - model_name='user',  
17 - name='curriculum',  
18 - field=models.FileField(null=True, upload_to='users/curriculum/', verbose_name='Curriculum'),  
19 - ),  
20 - migrations.AddField(  
21 - model_name='user',  
22 - name='institution',  
23 - field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution where he had titration'),  
24 - ),  
25 - migrations.AddField(  
26 - model_name='user',  
27 - name='titration',  
28 - field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Titration'),  
29 - ),  
30 - migrations.AddField(  
31 - model_name='user',  
32 - name='year_titration',  
33 - field=models.CharField(blank=True, max_length=4, null=True, verbose_name='Year of titration'),  
34 - ),  
35 - ]  
users/migrations/0004_auto_20161021_0820.py
View file @e44949c
@@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-21 11:20  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -  
7 -  
8 -class Migration(migrations.Migration):  
9 -  
10 - dependencies = [  
11 - ('users', '0003_auto_20161021_0812'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.AlterField(  
16 - model_name='user',  
17 - name='curriculum',  
18 - field=models.FileField(blank=True, null=True, upload_to='users/curriculum/', verbose_name='Curriculum'),  
19 - ),  
20 - ]  
users/migrations/0005_auto_20161021_1131.py
View file @e44949c
@@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-21 14:31  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -  
7 -  
8 -class Migration(migrations.Migration):  
9 -  
10 - dependencies = [  
11 - ('users', '0004_auto_20161021_0820'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.AlterField(  
16 - model_name='user',  
17 - name='birth_date',  
18 - field=models.DateField(null=True, verbose_name='Birth Date'),  
19 - ),  
20 - ]