Adding notifications count badge

Zambom
1 parent 6f82ec2d
Showing 11 changed files with 126 additions and 32 deletions Show diff stats
amadeus/context_processors.py
amadeus/settings.py
amadeus/static/css/base/amadeus.css
amadeus/static/css/themes/green.css
amadeus/templates/base.html
categories/templatetags/category_counters.py
notifications/cron.py
subjects/templates/subjects/badge.html
subjects/templates/subjects/list.html
subjects/templates/subjects/subject_card.html
subjects/templatetags/subject_counter.py
+from datetime import datetime
+
 from themes.models import Themes
+from notifications.models import Notification
 def theme(request):
 	context = {}
@@ -7,4 +10,13 @@ def theme(request):
 	context['theme'] = theme
+	return context
+
+def notifies(request):
+	context = {}
+
+	notifications = Notification.objects.filter(creation_date = datetime.now()).count()
+
+	context['notifications_count'] = notifications
+
 	return context
 \ No newline at end of file
@@ -103,6 +103,7 @@ TEMPLATES = [
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
                 'amadeus.context_processors.theme',
+                'amadeus.context_processors.notifies',
             ],
         },
     },
@@ -171,7 +172,7 @@ STATICFILES_DIRS = [
 ]
 CRON_CLASSES = [
-    'notifications.cron.Test'
+    'notifications.cron.Notify'
 ]
 #SECURITY
@@ -30,36 +30,28 @@ a:focus {
 .users-cloud  .small a {
     font-size: 1.25em;
-    color: #2E8B57;
 }
 .users-cloud  .big a {
     font-size: 2.25em;
-    color: #6B8E23;
 }
 .users-cloud .medium a {
     font-size: 1.75em;
-    color:  #66CDAA;
 }
 .users-cloud  .tiny a {
     font-size: 0.75em;
-    color: #654321;
 }
 .users-cloud a {
     text-decoration: none;
 }
-#search-results-title{
-    color: #BDBDBD;
-}
-
 .div-users-cloud{
-  height: 100%;
-  margin-left: -10px;
-  width: 100%;
+    height: 100%;
+    margin-left: -10px;
+    width: 100%;
 }
 .my-subjects-title {
@@ -590,11 +582,6 @@ a:focus {
 .subscribe-subject {
     border:none;
 }
-
-.no-subscribe-btn{
-    background-color: #BDBDBD !important;
-    color: #F5F5F5 !important;
-}
 /* subjects app ends */
 /* Themes */
@@ -827,4 +814,24 @@ a.add-row {
 .add_resource ul {
     width: 100%;
+}
+
+.action_icon {
+    position: relative;
+}
+
+li.item .notify_badge {
+    top: 0px;
+    right: 0px;
+}
+
+.notify_badge {
+    position: absolute;
+    right: 4px;
+    top: -5px;
+    width: 1.9rem;
+    line-height: 1.9rem;
+    font-size: 0.9rem;
+    border-radius: 50%;
+    padding: 0px;
 }
 \ No newline at end of file
@@ -397,6 +397,35 @@ a.add-row {
     background-color: initial !important;
 }
+.notify_badge {
+    background-color: #FF0000 !important;
+}
+
+#search-results-title{
+    color: #BDBDBD;
+}
+
+.users-cloud  .small a {
+    color: #2E8B57;
+}
+
+.users-cloud  .big a {
+    color: #6B8E23;
+}
+
+.users-cloud .medium a {
+    color:  #66CDAA;
+}
+
+.users-cloud  .tiny a {
+    color: #654321;
+}
+
+.no-subscribe-btn{
+    background-color: #BDBDBD !important;
+    color: #F5F5F5 !important;
+}
+
 @media(max-width: 768px) {
     .navbar .navbar-nav .dropdown .dropdown-menu li > a {
         color: #333333 !important;
@@ -160,8 +160,13 @@
                         <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
                             <i class="fa fa-envelope-o" aria-hidden="true"></i>
                         </li>
-                        <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
-                            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                        <li class="item action_icon" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
+                            <a href="">
+                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                                {% if notifications_count > 0 %}
+                                    <span class="badge notify_badge">{% if notifications_count > 99 %} +99 {% else %} {{ notifications_count }} {% endif %}</span>
+                                {% endif %}
+                            </a>
                         </li>
                         <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
                             <i class="fa fa-bar-chart" aria-hidden="true"></i>
@@ -204,8 +209,13 @@
                         <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Messages" %}">
                             <i class="fa fa-envelope-o" aria-hidden="true"></i>
                         </li>
-                        <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Pendencias" %}">
-                            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                        <li class="item action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Pendencias" %}">
+                            <a href="">
+                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                                {% if notifications_count > 0 %}
+                                    <span class="badge notify_badge">{% if notifications_count > 99 %} +99 {% else %} {{ notifications_count }} {% endif %}</span>
+                                {% endif %}
+                            </a>
                         </li>
                         <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Analytics" %}">
                             <i class="fa fa-bar-chart" aria-hidden="true"></i>
@@ -0,0 +1,14 @@
+from django import template
+from datetime import datetime
+
+from notifications.models import Notification
+
+register = template.Library()
+
+@register.inclusion_tag('subjects/badge.html')
+def notifies_cat_number(category):
+	context = {}
+
+	context['number'] = Notification.objects.filter(task__resource__topic__subject__category = category, creation_date = datetime.now()).count()
+	
+	return context
 \ No newline at end of file
@@ -3,7 +3,7 @@ from django_cron import CronJobBase, Schedule
 from .utils import set_notifications
-class Test(CronJobBase):
+class Notify(CronJobBase):
 	RUN_EVERY_MINS = 1 # every minute
 	schedule = Schedule(run_every_mins=RUN_EVERY_MINS)
@@ -0,0 +1,3 @@
+{% if number > 0 %}
+	<span class="badge notify_badge">{% if number > 99 %} +99 {% else %} {{ number }} {% endif %}</span>
+{% endif %}
 \ No newline at end of file
 {% extends 'categories/home.html' %}
 {% load static i18n pagination %}
-{% load django_bootstrap_breadcrumbs subject_counter %}
+{% load django_bootstrap_breadcrumbs subject_counter category_counters %}
 {% block javascript%}
     {{ block.super }}
@@ -79,10 +79,14 @@
                                                     <a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')" aria-hidden="true"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
                                                 </ul>
                                             {% endif %}
-                                            <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
-                                            <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
-                                            <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
-                                            <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
+                                            
+                                            <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
+                                            <a href="" class="pull-right action_icon">
+                                                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                                                {% notifies_cat_number category %}
+                                            </a>
+                                            <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+                                            <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a>
                                         </div>
                                     </div>
                                 </div>
@@ -36,10 +36,13 @@
-                        <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
-                        <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
-                        <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
-                        <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
+                        <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
+                        <a href="" class="pull-right action_icon">
+                            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                            {% notifies_number subject %}
+                        </a>
+                        <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+                        <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a>
                     </div>
                 </div>
             </div>
-from django import template
 import datetime
+from django import template
+from django.db.models import Q
+
+from notifications.models import Notification
+
 register = template.Library()
 @register.filter(name = 'subject_count')
@@ -15,6 +19,13 @@ def subject_count(category, user):
 	return total
+@register.inclusion_tag('subjects/badge.html')
+def notifies_number(subject):
+	context = {}
+
+	context['number'] = Notification.objects.filter(task__resource__topic__subject = subject, creation_date = datetime.datetime.now()).count()
+	
+	return context
 @register.filter(name = 'aftertoday')
 def after_today(date):
		1	+from datetime import datetime
		2	+
1	from themes.models import Themes	3	from themes.models import Themes
		4	+from notifications.models import Notification
2		5
3	def theme(request):	6	def theme(request):
4	context = {}	7	context = {}
	@@ -7,4 +10,13 @@ def theme(request):		@@ -7,4 +10,13 @@ def theme(request):
7		10
8	context['theme'] = theme	11	context['theme'] = theme
9		12
		13	+ return context
		14	+
		15	+def notifies(request):
		16	+ context = {}
		17	+
		18	+ notifications = Notification.objects.filter(creation_date = datetime.now()).count()
		19	+
		20	+ context['notifications_count'] = notifications
		21	+
10	return context	22	return context
11	\ No newline at end of file	23	\ No newline at end of file
	@@ -397,6 +397,35 @@ a.add-row {		@@ -397,6 +397,35 @@ a.add-row {
397	background-color: initial !important;	397	background-color: initial !important;
398	}	398	}
399		399
		400	+.notify_badge {
		401	+ background-color: #FF0000 !important;
		402	+}
		403	+
		404	+#search-results-title{
		405	+ color: #BDBDBD;
		406	+}
		407	+
		408	+.users-cloud .small a {
		409	+ color: #2E8B57;
		410	+}
		411	+
		412	+.users-cloud .big a {
		413	+ color: #6B8E23;
		414	+}
		415	+
		416	+.users-cloud .medium a {
		417	+ color: #66CDAA;
		418	+}
		419	+
		420	+.users-cloud .tiny a {
		421	+ color: #654321;
		422	+}
		423	+
		424	+.no-subscribe-btn{
		425	+ background-color: #BDBDBD !important;
		426	+ color: #F5F5F5 !important;
		427	+}
		428	+
400	@media(max-width: 768px) {	429	@media(max-width: 768px) {
401	.navbar .navbar-nav .dropdown .dropdown-menu li > a {	430	.navbar .navbar-nav .dropdown .dropdown-menu li > a {
402	color: #333333 !important;	431	color: #333333 !important;
	@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
		1	+from django import template
		2	+from datetime import datetime
		3	+
		4	+from notifications.models import Notification
		5	+
		6	+register = template.Library()
		7	+
		8	+@register.inclusion_tag('subjects/badge.html')
		9	+def notifies_cat_number(category):
		10	+ context = {}
		11	+
		12	+ context['number'] = Notification.objects.filter(task__resource__topic__subject__category = category, creation_date = datetime.now()).count()
		13	+
		14	+ return context
0	\ No newline at end of file	15	\ No newline at end of file
	@@ -3,7 +3,7 @@ from django_cron import CronJobBase, Schedule		@@ -3,7 +3,7 @@ from django_cron import CronJobBase, Schedule
3		3
4	from .utils import set_notifications	4	from .utils import set_notifications
5		5
6	-class Test(CronJobBase):	6	+class Notify(CronJobBase):
7	RUN_EVERY_MINS = 1 # every minute	7	RUN_EVERY_MINS = 1 # every minute
8		8
9	schedule = Schedule(run_every_mins=RUN_EVERY_MINS)	9	schedule = Schedule(run_every_mins=RUN_EVERY_MINS)
	@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
		1	+{% if number > 0 %}
		2	+ <span class="badge notify_badge">{% if number > 99 %} +99 {% else %} {{ number }} {% endif %}</span>
		3	+{% endif %}
0	\ No newline at end of file	4	\ No newline at end of file
1	-from django import template
2	import datetime	1	import datetime
		2	+from django import template
		3	+from django.db.models import Q
		4	+
		5	+from notifications.models import Notification
		6	+
3	register = template.Library()	7	register = template.Library()
4		8
5	@register.filter(name = 'subject_count')	9	@register.filter(name = 'subject_count')
	@@ -15,6 +19,13 @@ def subject_count(category, user):		@@ -15,6 +19,13 @@ def subject_count(category, user):
15		19
16	return total	20	return total
17		21
		22	+@register.inclusion_tag('subjects/badge.html')
		23	+def notifies_number(subject):
		24	+ context = {}
		25	+
		26	+ context['number'] = Notification.objects.filter(task__resource__topic__subject = subject, creation_date = datetime.datetime.now()).count()
		27	+
		28	+ return context
18		29
19	@register.filter(name = 'aftertoday')	30	@register.filter(name = 'aftertoday')
20	def after_today(date):	31	def after_today(date):