ajax call is working and notifications html are coming, I've separated notificat…

…ions into a template: notifications.html #158 #80

ajax call is working and notifications html are coming, I've separated notificat…
…ions into a template: notifications.html #158 #80
fbormann
1 parent c62b0571
Showing 7 changed files with 61 additions and 39 deletions Show diff stats
core/context_processors.py
core/static/js/base/amadeus.js
core/static/js/base/header.js
core/templates/base.html
core/templates/notifications.html
core/urls.py
core/views.py
@@ -5,6 +5,6 @@ def notifications(request):
 	context['notifications'] = None
 	if request.user.is_authenticated:
 		return {
-		   'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')
+		   'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')[0:5]
 		}
 	return context
@@ -126,4 +126,14 @@ function validarCpfSemAlert(campo,nome,idElementoMensagemErro){
 		return true;
 	}
 	return retorno;
-}
 \ No newline at end of file
+}
+
+/*
+This functions get the next 5 notifications from the user given a "step"(an amount) of previous notifications
+*/
+function getNotifications(step){
+	$.get('/getNotifications',
+		{'steps':step, 'amount': 5}, function(data){
+			console.log(data);
+		});
+}
@@ -6,8 +6,8 @@ $(document).ready(function(){
 /*
 */
-function loadNotifications(step){
-	$.ajax('/loadNotifications',{
+function getNotifications(step){
+	$.ajax('/getNotifications',{
 		steps: step,
 		amount: 5,
 		sucess: function(response){
@@ -64,7 +64,7 @@
 						                     		{% include "notifications.html" %}
 						                     		<li>
-						                     		 <a>
+						                     		 <a onclick="getNotifications(5)">
 						                     			<div class="list-group-item">
 								                                  <div class="row-content">
 								                                    <p class="list-group-item-text">See More</p>
 {% for notification in notifications  %}
-						                     		{% if notification.actor %} <!-- if the notification has a user-->
-						                     			<li>
-								                          <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>
-								                          <div class="row-content">
-								                            <p class="list-group-item-text">{{ notification.message }}</p>
-								                          </div>
-								                          </div>
-								                          </a>
-								                        </li>
-						                     		{% else %}
-						                     			 <li>
-								                            <a href="{% url 'core:notification_read' notification.id %}">
-								                                <div class="list-group-item">
-								                                  <div class="row-action-primary">
-								                                    <i class="material-icons">folder</i>
-								                                  </div>
-								                                  <div class="row-content">
+	{% if notification.actor %} <!-- if the notification has a user-->
+		<li>
+	  <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>
+	  <div class="row-content">
+	    <p class="list-group-item-text">{{ notification.message }}</p>
+	  </div>
+	  </div>
+	  </a>
+	</li>
+	{% else %}
+		 <li>
+	    <a href="{% url 'core:notification_read' notification.id %}">
+	        <div class="list-group-item">
+	          <div class="row-action-primary">
+	            <i class="material-icons">folder</i>
+	          </div>
+	          <div class="row-content">
-								                                    <div class="least-content pull-right">{{ notification.datetime }}</div>
+	            <div class="least-content pull-right">{{ notification.datetime }}</div>
-								                                    <p class="list-group-item-text">{{ notification.message }}</p>
-								                                </div>
-								                             </a>
-						                        		</li>
-						                     		{% endif %}
-						                     	{% endfor %}
 \ No newline at end of file
+	            <p class="list-group-item-text">{{ notification.message }}</p>
+	        </div>
+	     </a>
+	</li>
+	{% endif %}
+{% endfor %}
 \ No newline at end of file
@@ -9,5 +9,6 @@ urlpatterns = [
 	url(r'^register/$', views.RegisterUser.as_view(), name='register'),
 	url(r'^remember_password/$', views.remember_password, name='remember_password'),
     url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
-    url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read')
+    url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
+    url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
 ]
@@ -5,6 +5,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from .decorators import log_decorator
 from django.contrib import messages
 from django.shortcuts import render, redirect
+from django.template.loader import render_to_string
 from django.views.generic import CreateView, UpdateView
 from django.http import HttpResponse, JsonResponse
 from django.core.mail import send_mail,BadHeaderError
@@ -97,13 +98,23 @@ def processNotification(self, notificationId):
-def getNotifications(self, amount, step=0):
-	if self.request.is_ajax and self.request.user.is_authenticated:
-		notifications = Notification.objects.filter(user= self.request.user, read=False).orderby('-datetime')[step:amount]
+
+def getNotifications(request):
+	context = {}
+	if request.user.is_authenticated:
+		
+		steps = int(request.GET['steps'])
+		amount = int(request.GET['amount'])
+		notifications = Notification.objects.filter(user= request.user, read=False).order_by('-datetime')[steps:steps+amount]
+		context['notifications'] = notifications
 	else: #go to login page
-		return response('teste')
+		return HttpResponse('teste')
-	return JsonResponse(notifications)
+	
+	html = render_to_string("notifications.html", context)
+	print(html)
+	return HttpResponse(html)
+
	@@ -5,6 +5,6 @@ def notifications(request):		@@ -5,6 +5,6 @@ def notifications(request):
5	context['notifications'] = None	5	context['notifications'] = None
6	if request.user.is_authenticated:	6	if request.user.is_authenticated:
7	return {	7	return {
8	- 'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')	8	+ 'notifications': Notification.objects.filter(user= request.user, read=False).order_by('-datetime')[0:5]
9	}	9	}
10	return context	10	return context
	@@ -126,4 +126,14 @@ function validarCpfSemAlert(campo,nome,idElementoMensagemErro){		@@ -126,4 +126,14 @@ function validarCpfSemAlert(campo,nome,idElementoMensagemErro){
126	return true;	126	return true;
127	}	127	}
128	return retorno;	128	return retorno;
129	-}
130	\ No newline at end of file	129	\ No newline at end of file
		130	+}
		131	+
		132	+/*
		133	+This functions get the next 5 notifications from the user given a "step"(an amount) of previous notifications
		134	+*/
		135	+function getNotifications(step){
		136	+ $.get('/getNotifications',
		137	+ {'steps':step, 'amount': 5}, function(data){
		138	+ console.log(data);
		139	+ });
		140	+}
	@@ -64,7 +64,7 @@		@@ -64,7 +64,7 @@
64	{% include "notifications.html" %}	64	{% include "notifications.html" %}
65		65
66	<li>	66	<li>
67	- <a>	67	+ <a onclick="getNotifications(5)">
68	<div class="list-group-item">	68	<div class="list-group-item">
69	<div class="row-content">	69	<div class="row-content">
70	<p class="list-group-item-text">See More</p>	70	<p class="list-group-item-text">See More</p>
	@@ -9,5 +9,6 @@ urlpatterns = [		@@ -9,5 +9,6 @@ urlpatterns = [
9	url(r'^register/$', views.RegisterUser.as_view(), name='register'),	9	url(r'^register/$', views.RegisterUser.as_view(), name='register'),
10	url(r'^remember_password/$', views.remember_password, name='remember_password'),	10	url(r'^remember_password/$', views.remember_password, name='remember_password'),
11	url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),	11	url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
12	- url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read')	12	+ url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
		13	+ url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
13	]	14	]