modified template to support notifications from users with images, added new not…

…ifications for testing purposes, such as creating forum and topic #207

modified template to support notifications from users with images, added new not…
…ifications for testing purposes, such as creating forum and topic #207
fbormann
1 parent 8d54d0a4
Showing 12 changed files with 52 additions and 16 deletions Show diff stats
app/templates/home_teacher_student_content.html
core/decorators.py
core/migrations/0002_auto_20161022_0158.py
core/mixins.py
core/models.py
core/static/css/base/amadeus.css
core/templates/notifications.html
core/views.py
courses/models.py
courses/templates/subject/form_view_teacher.html
courses/views.py
forum/views.py
@@ -15,8 +15,8 @@
         </div>
         <div class="col-xs-10 col-md-11">
             <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
-            <a href=""><h4 class="resource_inline"><b>{{ notification.user }}</b></h4></a>
-            <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id  %}">Recurso</a></p>
+            <h4 class="resource_inline"><b>{{ notification.actor }}</b></h4>
+            <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id  %}">{{ notification.action_resource.resource.name }}</a></p>
             <p class="timePost"><i> {{ notification.datetime|timesince }} {% trans "ago" %}  </i></p>
         </div>
     </div>
@@ -60,7 +60,7 @@ def notification_decorator(read = False, message = &#39;&#39;, actor = None, users = [],
 			if action.exists():
 				action = action[0]
 			else:
-				action = Action(name = not_action)
+				action = Action(name = not_action)		
 				action.save()
  
 			if resource.exists():
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-22 04:58
+from __future__ import unicode_literals
+
+import autoslug.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='action',
+            name='slug',
+            field=autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug'),
+        ),
+    ]
@@ -41,16 +41,16 @@ class LogMixin(object):
 class NotificationMixin(object):
 	message = ""
 	read = False
-	action_name = ''
+	action_slug = ''
 	resource_name = ''
  
-	def createNotification(self, message='', actor=None, users = User.objects.all(), resource_slug='' ,action_name = '', resource_name='', resource_link=''): #the default will be a broadcast
-		action = Action.objects.filter(name = action_name)
+	def createNotification(self, message='', actor=None, users = User.objects.all(), resource_slug='' ,action_slug = '', resource_name='', resource_link=''): #the default will be a broadcast
+		action = Action.objects.filter(slug = action_slug)
 		resource = Resource.objects.filter(slug = resource_slug)
 		if action.exists():
 			action = action[0]
 		else:
-			action = Action(name = self.action_name)
+			action = Action(name = self.action_slug)
 			action.save()
  
 		if resource.exists():
@@ -76,3 +76,9 @@ class NotificationMixin(object):
 		"""
 		Not quite sure how to do about it"""
 		return super(NotificationMixin, self).dispatch(request, *args, **kwargs)
+
+	def createorRetrieveAction(self, action_name):
+		action = Action.objects.filter(name=action_name)
+		if action is None:
+			action = Action(name=action_name)
+		return action
 \ No newline at end of file
@@ -25,6 +25,7 @@ class Action(models.Model):
     """
  
     name = models.CharField(_('Name'), max_length = 100)
+    slug = AutoSlugField(_("Slug"), populate_from=('name'), unique=True)
     created_date = models.DateField(_('Created Date'), auto_now_add=True)
  
     class Meta:
@@ -84,7 +85,7 @@ class Notification(models.Model):
         @action_resource: The Object that holds the information about which action was perfomed on the Resource
         @actor: The user who applied the action
     """
-
+    
     message = models.TextField(_('Message'))
     user = models.ForeignKey(User, related_name = _('%(class)s_Actor'), verbose_name= _('User'))
     read = models.BooleanField(_('Read'), default = False)
@@ -12,7 +12,7 @@
 #notification-dropdown{
   max-height: 500%;
   overflow: auto;
-  width: 200px;
+  width: 300px;
 }
  
 /* HEADER */
@@ -6,7 +6,7 @@
 	  <a href="{% url 'core:notification_read' notification.id %}"><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>
+	    <div class="least-content ">{{ notification.datetime }}</div>
 	  </div>
 	  <div class="row-content">
 	    <p class="list-group-item-text">{{ notification.message }}</p>
@@ -68,7 +68,7 @@ def remember_password(request):
 			context['danger'] = 'E-mail does not send'
 	return render(request, "remember_password.html",context)
  
-@notification_decorator(message='just connected')
+@notification_decorator(message='just connected', not_action="logged in", not_resource="")
 @log_decorator('Acessar', 'Sistema')
 def login(request):
 	context = {}
@@ -7,6 +7,7 @@ from core.models import Resource, MimeType
 from s3direct.fields import S3DirectField
  
 from django.core.urlresolvers import reverse
+from core.models import Resource
  
 class CourseCategory(models.Model):
  
@@ -178,7 +178,7 @@
           </div>
           <div class="modal-footer">
  
-            <a href="http://localhost:8080/html/screens/users/profile_user.html" target="_self"><button type="button" class="btn btn-primary">Confirm</button></a>
+            <a href="" target="_self"><button type="button" class="btn btn-primary">Confirm</button></a>
  
           </div>
         </div>
@@ -429,7 +429,11 @@ class CreateTopicView(LoginRequiredMixin, HasRoleMixin, NotificationMixin, gener
 		self.object.subject = subject
 		self.object.owner = self.request.user
 		self.object.save()
-
+		action = super(CreateTopicView, self).createorRetrieveAction("create Topic")
+		super(CreateTopicView, self).createNotification("Topic "+ self.object.name + " was created", 
+			resource_name=self.object.name, resource_link= 'topics/'+self.object.slug,
+			 actor=self.request.user, users = self.object.subject.course.students.all() )
+		
 		return super(CreateTopicView, self).form_valid(form)
  
 class UpdateTopicView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
@@ -10,6 +10,7 @@ from django.http import Http404
 from .models import Forum, Post, PostAnswer
 from courses.models import Topic
 from core.mixins import NotificationMixin
+from core.models import Action, Resource
  
 from .forms import ForumForm, PostForm, PostAnswerForm
  
@@ -52,10 +53,12 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView, NotificationM
  
 	def get_success_url(self):
 		self.success_url = reverse('course:forum:render_forum', args = (self.object.id, ))
-		print(self.object)
-		print(self)
-		#super(CreateForumView, self).createNotification(message="The Forum",action_name="create forum", )
+		
  
+		action = super(CreateForumView, self).createorRetrieveAction("create Topic")
+		super(CreateForumView, self).createNotification("Forum "+ self.object.name + " was created", 
+			resource_name=self.object.name, resource_link= 'topics/'+self.object.slug,
+			 actor=self.request.user, users = self.object.topic.subject.course.students.all() )
 		return self.success_url
  
 def render_forum(request, forum):
...	...	@@ -15,8 +15,8 @@
15	15	</div>
16	16	<div class="col-xs-10 col-md-11">
17	17	<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
18		- <a href=""><h4 class="resource_inline"><b>{{ notification.user }}</b></h4></a>
19		- <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id %}">Recurso</a></p>
	18	+ <h4 class="resource_inline"><b>{{ notification.actor }}</b></h4>
	19	+ <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id %}">{{ notification.action_resource.resource.name }}</a></p>
20	20	<p class="timePost"><i> {{ notification.datetime\|timesince }} {% trans "ago" %} </i></p>
21	21	</div>
22	22	</div>
...	...
...	...	@@ -60,7 +60,7 @@ def notification_decorator(read = False, message = '', actor = None, users = [],
60	60	if action.exists():
61	61	action = action[0]
62	62	else:
63		- action = Action(name = not_action)
	63	+ action = Action(name = not_action)
64	64	action.save()
65	65
66	66	if resource.exists():
...	...
...	...	@@ -0,0 +1,21 @@
	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	+ ]
...	...
...	...	@@ -41,16 +41,16 @@ class LogMixin(object):
41	41	class NotificationMixin(object):
42	42	message = ""
43	43	read = False
44		- action_name = ''
	44	+ action_slug = ''
45	45	resource_name = ''
46	46
47		- def createNotification(self, message='', actor=None, users = User.objects.all(), resource_slug='' ,action_name = '', resource_name='', resource_link=''): #the default will be a broadcast
48		- action = Action.objects.filter(name = action_name)
	47	+ def createNotification(self, message='', actor=None, users = User.objects.all(), resource_slug='' ,action_slug = '', resource_name='', resource_link=''): #the default will be a broadcast
	48	+ action = Action.objects.filter(slug = action_slug)
49	49	resource = Resource.objects.filter(slug = resource_slug)
50	50	if action.exists():
51	51	action = action[0]
52	52	else:
53		- action = Action(name = self.action_name)
	53	+ action = Action(name = self.action_slug)
54	54	action.save()
55	55
56	56	if resource.exists():
...	...	@@ -76,3 +76,9 @@ class NotificationMixin(object):
76	76	"""
77	77	Not quite sure how to do about it"""
78	78	return super(NotificationMixin, self).dispatch(request, args, *kwargs)
	79	+
	80	+ def createorRetrieveAction(self, action_name):
	81	+ action = Action.objects.filter(name=action_name)
	82	+ if action is None:
	83	+ action = Action(name=action_name)
	84	+ return action
79	85	\ No newline at end of file
...	...
...	...	@@ -25,6 +25,7 @@ class Action(models.Model):
25	25	"""
26	26
27	27	name = models.CharField(_('Name'), max_length = 100)
	28	+ slug = AutoSlugField(_("Slug"), populate_from=('name'), unique=True)
28	29	created_date = models.DateField(_('Created Date'), auto_now_add=True)
29	30
30	31	class Meta:
...	...	@@ -84,7 +85,7 @@ class Notification(models.Model):
84	85	@action_resource: The Object that holds the information about which action was perfomed on the Resource
85	86	@actor: The user who applied the action
86	87	"""
87		-
	88	+
88	89	message = models.TextField(_('Message'))
89	90	user = models.ForeignKey(User, related_name = _('%(class)s_Actor'), verbose_name= _('User'))
90	91	read = models.BooleanField(_('Read'), default = False)
...	...
...	...	@@ -12,7 +12,7 @@
12	12	#notification-dropdown{
13	13	max-height: 500%;
14	14	overflow: auto;
15		- width: 200px;
	15	+ width: 300px;
16	16	}
17	17
18	18	/* HEADER */
...	...
...	...	@@ -6,7 +6,7 @@
6	6	<a href="{% url 'core:notification_read' notification.id %}"><div class="list-group-item">
7	7	<div class="row-picture">
8	8	<img class="circle" src="http://lorempixel.com/56/56/people/1" alt="icon">
9		- <div class="least-content pull-right">{{ notification.datetime }}</div>
	9	+ <div class="least-content ">{{ notification.datetime }}</div>
10	10	</div>
11	11	<div class="row-content">
12	12	<p class="list-group-item-text">{{ notification.message }}</p>
...	...
...	...	@@ -68,7 +68,7 @@ def remember_password(request):
68	68	context['danger'] = 'E-mail does not send'
69	69	return render(request, "remember_password.html",context)
70	70
71		-@notification_decorator(message='just connected')
	71	+@notification_decorator(message='just connected', not_action="logged in", not_resource="")
72	72	@log_decorator('Acessar', 'Sistema')
73	73	def login(request):
74	74	context = {}
...	...
...	...	@@ -7,6 +7,7 @@ from core.models import Resource, MimeType
7	7	from s3direct.fields import S3DirectField
8	8
9	9	from django.core.urlresolvers import reverse
	10	+from core.models import Resource
10	11
11	12	class CourseCategory(models.Model):
12	13
...	...
...	...	@@ -178,7 +178,7 @@
178	178	</div>
179	179	<div class="modal-footer">
180	180
181		- <a href="http://localhost:8080/html/screens/users/profile_user.html" target="_self"><button type="button" class="btn btn-primary">Confirm</button></a>
	181	+ <a href="" target="_self"><button type="button" class="btn btn-primary">Confirm</button></a>
182	182
183	183	</div>
184	184	</div>
...	...