Improved and made Mixin 100% functional, still need decorator and improve messages #41

fbormann
1 parent d6f77fae
Showing 10 changed files with 110 additions and 54 deletions Show diff stats
app/views.py
core/migrations/0005_resource_link.py
core/migrations/0006_auto_20160912_1138.py
core/migrations/0007_remove_resource_link.py
core/migrations/0008_resource_link.py
core/mixins.py
core/models.py
core/templates/base.html
core/views.py
courses/views.py
@@ -28,40 +28,11 @@ class AppIndex(LoginRequiredMixin, LogMixin, TemplateView, NotificationMixin):
 			context['courses'] = Course.objects.filter(user = self.request.user)
 		context['title'] = 'Amadeus'
-		self.createNotification("teste")
-		notifications = Notification.objects.filter(user= self.request.user, read=False)
+		#super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="users")
+		notifications = Notification.objects.filter(user= self.request.user, read=False)
 		context['notifications'] = notifications
-		print(notifications)
-
+		
 		return self.response_class(request = self.request, template = template, context = context, using = self.template_engine, **response_kwargs)
-	def createNotification(self, mensagem='', actor=None, users = User.objects.all(), not_action = '', not_resource=''): #the default will be a broadcast
-		action = Action.objects.filter(name = not_action)
-		resource = Resource.objects.filter(name = self.not_resource)
-		print(action)
-		if not action:
-			action = Action(name = self.not_action)
-			action.save()
-		else:
-			action = action[0]
-
-		if not resource:
-			resource = Resource(name = self.not_resource)
-			resource.save()
-		else:
-			resource = resource[0]
-
-		action_resource = Action_Resource.objects.filter(action = action, resource = resource)
-
-		if not action_resource:
-			action_resource = Action_Resource(action = action, resource = resource)
-			action_resource.save()
-		else:
-			action_resource = action_resource[0]
-
-		for user in users:
-			print(user)
-			notification = Notification(user=user, actor= actor, message=mensagem, action_resource= action_resource)
-			notification.save()
@@ -0,0 +1,20 @@
+# -*- 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'),
+        ),
+    ]
@@ -0,0 +1,20 @@
+# -*- 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'),
+        ),
+    ]
@@ -0,0 +1,19 @@
+# -*- 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',
+        ),
+    ]
@@ -0,0 +1,20 @@
+# -*- 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'),
+        ),
+    ]
@@ -44,32 +44,33 @@ class NotificationMixin(object):
 	not_action = ''
 	not_resource = ''
-	def createNotification(message='', actor=None, users = User.objects.all(), not_action = '', not_resource=''): #the default will be a broadcast
+	def createNotification(self, message='', actor=None, users = User.objects.all(), not_action = '', not_resource='', resource_link=''): #the default will be a broadcast
 		action = Action.objects.filter(name = self.not_action)
-		resource = Resource.objects.filter(name = self.not_resource)
-
-		if not action:
+		resource = Resource.objects.filter(name = not_resource)
+		
+		if action.exists():
+			action = action[0]
+		else:
 			action = Action(name = self.not_action)
 			action.save()
-		else:
-			action = action[0]
-		if not resource:
-			resource = Resource(name = self.not_resource)
-			resource.save()
-		else:
+		if resource.exists():
 			resource = resource[0]
+		else:
+			resource = Resource(name = self.not_resource, link= resource_link)
+			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]
 		for user in users:
 			notification = Notification(user=user, actor= actor, message=message, action_resource= action_resource)
+			notification.save()
 	def dispatch(self, request, *args, **kwargs):
@@ -29,11 +29,14 @@ class Resource(models.Model):
             @name: name of the resource affected, it will be unique because a resource can be affecte 
             by a huge amount of actions
             @created_date: The date the resource was created
+            @link: Which URL made that resource able to find
     """
     name = models.CharField(_('Name'), max_length =100, unique=True)
     created_date = models.DateField(_('Created Date'), auto_now_add=True)
-    
+    link = models.CharField(_('URL'), max_length =100, default="")
+
+
     class Meta:
         verbose_name = "Resource"
         verbose_name_plural = "Resources"    
@@ -59,7 +59,7 @@
 			                     	{% for notification in notifications  %}
 			                     		{% if notification.actor %} <!-- if the notification has a user-->
 			                     			<li>
-					                          <a><div class="list-group-item">
+					                          <a href="{{ notification.action_resource.resource.link }}"><div class="list-group-item">
 					                          <div class="row-picture">
 					                            <img class="circle" src="http://lorempixel.com/56/56/people/1" alt="icon">
 					                            <div class="least-content pull-right">{{ notification.datetime }}</div>
@@ -72,7 +72,7 @@
 					                        </li>
 			                     		{% else %}
 			                     			 <li>
-					                            <a>
+					                            <a href="{{ notification.action_resource.resource.link }}">
 					                                <div class="list-group-item">
 					                                  <div class="row-action-primary">
 					                                    <i class="material-icons">folder</i>
@@ -9,6 +9,7 @@ from django.views.generic import CreateView, UpdateView
 from django.http import HttpResponse
 from django.core.mail import send_mail,BadHeaderError
 from django.conf import settings
+from core.mixins import NotificationMixin
 from rolepermissions.shortcuts import assign_role
@@ -25,7 +26,7 @@ def index(request):
 	return render(request, "index.html", context)
-class RegisterUser(CreateView):
+class RegisterUser(CreateView, NotificationMixin):
 	model = User
 	form_class = RegisterUserForm
 	template_name = 'register_user.html'
@@ -13,9 +13,10 @@ from django.db.models import Q
 from .forms import CourseForm, CategoryForm, SubjectForm,TopicForm
 from .models import Course, Subject, Category,Topic
+from core.mixins import NotificationMixin
-class IndexView(LoginRequiredMixin, generic.ListView):
+class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
@@ -30,7 +31,7 @@ class IndexView(LoginRequiredMixin, generic.ListView):
 		return context
-class CreateView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
+class CreateView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edit.CreateView):
 	allowed_roles = ['professor', 'system_admin']
 	login_url = reverse_lazy("core:home")
@@ -73,7 +74,7 @@ class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
-class View(LoginRequiredMixin, generic.DetailView):
+class View(LoginRequiredMixin, NotificationMixin, generic.DetailView):
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
@@ -89,7 +90,7 @@ class View(LoginRequiredMixin, generic.DetailView):
 		return context
-class DeleteView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
+class DeleteView(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.DeleteView):
 	allowed_roles = ['professor', 'system_admin']
 	login_url = reverse_lazy("core:home")
@@ -220,7 +221,7 @@ class SubjectsView(LoginRequiredMixin, generic.ListView):
 		context['topics'] = subject.topics.all()
 		return context
-class CreateTopicView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
+class CreateTopicView(LoginRequiredMixin, HasRoleMixin, NotificationMixin, generic.edit.CreateView):
 	allowed_roles = ['professor', 'system_admin','student']
 	login_url = reverse_lazy("core:home")
	@@ -28,40 +28,11 @@ class AppIndex(LoginRequiredMixin, LogMixin, TemplateView, NotificationMixin):		@@ -28,40 +28,11 @@ class AppIndex(LoginRequiredMixin, LogMixin, TemplateView, NotificationMixin):
28	context['courses'] = Course.objects.filter(user = self.request.user)	28	context['courses'] = Course.objects.filter(user = self.request.user)
29		29
30	context['title'] = 'Amadeus'	30	context['title'] = 'Amadeus'
31	- self.createNotification("teste")
32	- notifications = Notification.objects.filter(user= self.request.user, read=False)	31	+ #super(AppIndex, self).createNotification("teste", not_resource="home", resource_link="users")
33		32
		33	+ notifications = Notification.objects.filter(user= self.request.user, read=False)
34	context['notifications'] = notifications	34	context['notifications'] = notifications
35	- print(notifications)
36	-	35	+
37	return self.response_class(request = self.request, template = template, context = context, using = self.template_engine, **response_kwargs)	36	return self.response_class(request = self.request, template = template, context = context, using = self.template_engine, **response_kwargs)
38		37
39	- def createNotification(self, mensagem='', actor=None, users = User.objects.all(), not_action = '', not_resource=''): #the default will be a broadcast
40	- action = Action.objects.filter(name = not_action)
41	- resource = Resource.objects.filter(name = self.not_resource)
42	- print(action)
43	- if not action:
44	- action = Action(name = self.not_action)
45	- action.save()
46	- else:
47	- action = action[0]
48	-
49	- if not resource:
50	- resource = Resource(name = self.not_resource)
51	- resource.save()
52	- else:
53	- resource = resource[0]
54	-
55	- action_resource = Action_Resource.objects.filter(action = action, resource = resource)
56	-
57	- if not action_resource:
58	- action_resource = Action_Resource(action = action, resource = resource)
59	- action_resource.save()
60	- else:
61	- action_resource = action_resource[0]
62	-
63	- for user in users:
64	- print(user)
65	- notification = Notification(user=user, actor= actor, message=mensagem, action_resource= action_resource)
66	- notification.save()
67		38
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-09-12 14:36
	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	+ ('core', '0004_auto_20160908_1151'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AddField(
	16	+ model_name='resource',
	17	+ name='link',
	18	+ field=models.CharField(default='', max_length=100, unique=True, verbose_name='URL'),
	19	+ ),
	20	+ ]
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-09-12 14:51
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('core', '0006_auto_20160912_1138'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.RemoveField(
	16	+ model_name='resource',
	17	+ name='link',
	18	+ ),
	19	+ ]
	@@ -59,7 +59,7 @@		@@ -59,7 +59,7 @@
59	{% for notification in notifications %}	59	{% for notification in notifications %}
60	{% if notification.actor %} <!-- if the notification has a user-->	60	{% if notification.actor %} <!-- if the notification has a user-->
61	<li>	61	<li>
62	- <a><div class="list-group-item">	62	+ <a href="{{ notification.action_resource.resource.link }}"><div class="list-group-item">
63	<div class="row-picture">	63	<div class="row-picture">
64	<img class="circle" src="http://lorempixel.com/56/56/people/1" alt="icon">	64	<img class="circle" src="http://lorempixel.com/56/56/people/1" alt="icon">
65	<div class="least-content pull-right">{{ notification.datetime }}</div>	65	<div class="least-content pull-right">{{ notification.datetime }}</div>
	@@ -72,7 +72,7 @@		@@ -72,7 +72,7 @@
72	</li>	72	</li>
73	{% else %}	73	{% else %}
74	<li>	74	<li>
75	- <a>	75	+ <a href="{{ notification.action_resource.resource.link }}">
76	<div class="list-group-item">	76	<div class="list-group-item">
77	<div class="row-action-primary">	77	<div class="row-action-primary">
78	<i class="material-icons">folder</i>	78	<i class="material-icons">folder</i>