Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Matheus Lins
2 parents 93032820 1846ce70
Showing 12 changed files with 52 additions and 7 deletions Show diff stats
amadeus/settings.py
avaliacao/__init__.py
avaliacao/admin.py
avaliacao/apps.py
avaliacao/migrations/__init__.py
avaliacao/models.py
avaliacao/tests.py
avaliacao/urls.py
avaliacao/views.py
core/urls.py
courses/urls.py
manage.py
@@ -55,6 +55,8 @@ INSTALLED_APPS = [
     'courses',
     'forum',
     'poll',
+    'avaliacao',
+
 ]
 MIDDLEWARE_CLASSES = [
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AvaliacaoConfig(AppConfig):
+    name = 'avaliacao'
@@ -0,0 +1,20 @@
+from django.utils.translation import ugettext_lazy as _
+from django.db import models
+from autoslug.fields import AutoSlugField
+from users.models import User
+from core.models import Resource
+from courses.models import Activity
+
+class Avaliacao(Activity):
+
+    name_avalicao = models.CharField(_('Name'), max_length = 100)
+    init_date = models.DateField(_('Begin of Avaliacao Date'))
+    end_date = models.DateField(_('End of Avaliacao Date'))
+
+    class Meta:
+        #ordering = ('create_date','name')
+        verbose_name = _('Avaliacao')
+        verbose_name_plural = _('Avaliacoes')
+
+def __str__(self):
+    return str(self.name) + str("/") + str(self.topic)
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns =[
+
+]
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
 from django.conf.urls import url, include
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.views import password_reset, password_reset_done,password_reset_confirm, password_reset_complete
-
 from . import views
@@ -12,10 +11,13 @@ urlpatterns = [
     url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
     url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
     url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
+]
-	url(r'^reset/$', password_reset, {'template_name':'registration/passwor_reset_form.html','email_template_name':'registration/password_reset_email.html','post_reset_redirect':'done/'}, name="password_reset"),
-	url(r'^reset/done/$', password_reset_done, {'template_name':'registration/passwor_reset_done.html'}),
-	url(r'^reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'template_name':'registration/password_reset_confirm.html'}),
-	url(r'^done/$', password_reset_complete,{'template_name':'registration/passwor_reset_complete.html'}),
+#Reset Password
+urlpatterns += [
+	url(r'^password/reset/$', password_reset, {'post_reset_redirect' : 'password/reset/done/','template_name': 'registration/passwor_reset_form.html'}, name="password_reset"),
+	url(r'^password/reset/done/$', password_reset_done, {'template_name': 'registration/passwor_reset_done.html'}),
+	url(r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', password_reset_confirm, {'post_reset_redirect' : 'password/done/', 'template_name': 'registration/password_reset_confirm.html'}),
+	url(r'^password/done/$', password_reset_complete,{'template_name': 'registration/passwor_reset_complete.html'}),
 ]
@@ -25,6 +25,6 @@ urlpatterns = [
 	url(r'^forum/', include('forum.urls', namespace = 'forum')),
-	url(r'^poll/', include('poll.urls', namespace = 'poll'))
-
+	url(r'^poll/', include('poll.urls', namespace = 'poll')),
+	url(r'^avaliacao/', include('avaliacao.urls', namespace = 'avaliacao'))
 ]
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+from django.apps import AppConfig
	2	+
	3	+
	4	+class AvaliacaoConfig(AppConfig):
	5	+ name = 'avaliacao'
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+from django.utils.translation import ugettext_lazy as _
	2	+from django.db import models
	3	+from autoslug.fields import AutoSlugField
	4	+from users.models import User
	5	+from core.models import Resource
	6	+from courses.models import Activity
	7	+
	8	+class Avaliacao(Activity):
	9	+
	10	+ name_avalicao = models.CharField(_('Name'), max_length = 100)
	11	+ init_date = models.DateField(_('Begin of Avaliacao Date'))
	12	+ end_date = models.DateField(_('End of Avaliacao Date'))
	13	+
	14	+ class Meta:
	15	+ #ordering = ('create_date','name')
	16	+ verbose_name = _('Avaliacao')
	17	+ verbose_name_plural = _('Avaliacoes')
	18	+
	19	+def __str__(self):
	20	+ return str(self.name) + str("/") + str(self.topic)
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.test import TestCase
	2	+
	3	+# Create your tests here.
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+from django.conf.urls import url
	2	+
	3	+from . import views
	4	+
	5	+urlpatterns =[
	6	+
	7	+]
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.shortcuts import render
	2	+
	3	+# Create your views here.
	@@ -25,6 +25,6 @@ urlpatterns = [		@@ -25,6 +25,6 @@ urlpatterns = [
25		25
26		26
27	url(r'^forum/', include('forum.urls', namespace = 'forum')),	27	url(r'^forum/', include('forum.urls', namespace = 'forum')),
28	- url(r'^poll/', include('poll.urls', namespace = 'poll'))
29	-	28	+ url(r'^poll/', include('poll.urls', namespace = 'poll')),
		29	+ url(r'^avaliacao/', include('avaliacao.urls', namespace = 'avaliacao'))
30	]	30	]