Adding mural post notifications badge

Zambom
1 parent 91e85324
Showing 9 changed files with 56 additions and 10 deletions Show diff stats
amadeus/context_processors.py
amadeus/settings.py
amadeus/static/css/base/amadeus.css
amadeus/static/css/base/amadeus_responsive.css
amadeus/static/css/themes/green.css
amadeus/static/js/socket.js
amadeus/templates/base.html
mural/templates/mural/_view.html
mural/views.py
@@ -2,6 +2,7 @@ from datetime import datetime
 from themes.models import Themes
 from notifications.models import Notification
+from mural.models import MuralVisualizations
 def theme(request):
 	context = {}
@@ -22,4 +23,16 @@ def notifies(request):
 	context['notifications_count'] = notifications
+	return context
+
+def mural_notifies(request):
+	context = {}
+
+	notifications = 0
+
+	if request.user.is_authenticated:
+		notifications = MuralVisualizations.objects.filter(viewed = False, user = request.user).count()
+
+	context['mural_notifications_count'] = notifications
+
 	return context
 \ No newline at end of file
@@ -109,6 +109,7 @@ TEMPLATES = [
                 'django.contrib.messages.context_processors.messages',
                 'amadeus.context_processors.theme',
                 'amadeus.context_processors.notifies',
+                'amadeus.context_processors.mural_notifies',
             ],
         },
     },
@@ -1043,7 +1043,7 @@ li.item .notify_badge {
     padding: 10px 0px 8px 0px;
 }
-.post .post-comment .user-img {
+.post .post-comment .user-img div {
     display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */
     display: -moz-box;         /* OLD - Firefox 19- (buggy but mostly works) */
     display: -ms-flexbox;      /* TWEENER - IE 10 */
 @media(min-width: 1200px) {
-	.mural .post_make .user-img {
+	.mural .post_make .user-img, .post .post-img {
 		height: 70px;
 	}
+	.post .post-comment .user-img div {
+		height: 38px;
+	}
+
 	.mural .post_make .user-img img {
 	    max-width: 70px;
 	    max-height: 70px;
@@ -18,10 +22,14 @@
 		padding: 15px;
 	}
-	.mural .post_make .user-img {
+	.mural .post_make .user-img, .post .post-img {
 		height: 65px;
 	}
+	.post .post-comment .user-img div {
+		height: 38px;
+	}
+
 	.mural .post_make .user-img img {
 	    max-width: 65px;
 	    max-height: 65px;
@@ -87,7 +95,7 @@
         display:none;
     }
-    .mural .post_make .user-img {
+    .mural .post_make .user-img, .post .post-img {
 		height: 60px;
 	}
@@ -161,7 +169,7 @@
 }
 @media(max-width: 680px) {
-	.mural .post_make .user-img {
+	.mural .post_make .user-img, .post .post-img {
 		height: 50px;
 	}
@@ -496,7 +496,7 @@ a.add-row {
     background: #FFFFFF;
 }
-.mural .post_make .user-img {
+.mural .post_make .user-img, .post .post-img, .post .post-comment .user-img div {
     background: #CCCCCC;
 }
@@ -15,6 +15,22 @@ socket.onmessage = function(e) {
 			$('.posts').prepend(content.complete);
 	        $('.no-subjects').attr('style', 'display:none');
+		} else {
+			$('.mural_badge').each(function () {
+				var actual = $(this).text();
+
+				if (actual != "+99") {
+					actual = parseInt(actual, 10) + 1;
+
+					if (actual > 99) {
+						actual = "+99";
+					}
+
+					$(this).text(actual);
+				}
+
+				$(this).show();
+			});
 		}
 		if (("Notification" in window)) {
@@ -190,9 +190,10 @@
                                 <i class="fa fa-graduation-cap" aria-hidden="true"></i>
                             </a>
                         </li>
-                        <li class="item {{ mural_menu_active }}" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
+                        <li class="item {{ mural_menu_active }} action_icon" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
                             <a href="{% url 'mural:manage_general' %}">
                                 <i class="fa fa-list" aria-hidden="true" ></i>
+                                <span class="badge notify_badge mural_badge" {% if mural_notifications_count == 0 %} style="display:none" {% endif %}>{% if mural_notifications_count > 99 %} +99 {% else %} {{ mural_notifications_count }} {% endif %}</span>
                             </a>
                         </li>
                         <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
@@ -241,9 +242,10 @@
                                 <i class="fa fa-graduation-cap" aria-hidden="true"></i>
                             </a>
                         </li>
-                        <li class="item  {{ mural_menu_active }}" data-toggle="tooltip" data-placement="top" title="{% trans "Timeline" %}">
+                        <li class="item {{ mural_menu_active }} action_icon" data-toggle="tooltip" data-placement="top" title="{% trans "Timeline" %}">
                             <a href="{% url 'mural:manage_general' %}"
                                 <i class="fa fa-list" aria-hidden="true" ></i>
+                                <span class="badge notify_badge mural_badge" {% if mural_notifications_count == 0 %} style="display:none" {% endif %}>{% if mural_notifications_count > 99 %} +99 {% else %} {{ mural_notifications_count }} {% endif %}</span>
                             </a>
                         </li>
                         <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Messages" %}">
@@ -45,7 +45,9 @@
 		</div>
 		<div class="col-md-12 post-comment">
 			<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 user-img">
-				<img src="{{ request.user.image_url }}" class="img-responsive" />
+				<div>
+					<img src="{{ request.user.image_url }}" class="img-responsive" />
+				</div>
 			</div>
 			<div class="col-lg-11 col-md-11 col-sm-11 col-xs-11 comment-field">
 				<div>
@@ -33,10 +33,14 @@ class GeneralIndex(LoginRequiredMixin, generic.ListView):
 		general = GeneralPost.objects.extra(select={"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_generalpost.mural_ptr_id))"}).order_by("-most_recent")
-		self.totals['general'] = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__generalpost__isnull = False) | Q(comment__post__generalpost__isnull = False))).distinct().count()
+		general_visualizations = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__generalpost__isnull = False) | Q(comment__post__generalpost__isnull = False))).distinct()
+
+		self.totals['general'] = general_visualizations.count()
 		self.totals['category'] = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__categorypost__space__coordinators = user) | Q(comment__post__categorypost__space__coordinators = user) | Q(post__categorypost__space__subject_category__professor = user) | Q(post__categorypost__space__subject_category__students = user) | Q(comment__post__categorypost__space__subject_category__professor = user) | Q(comment__post__categorypost__space__subject_category__students = user))).distinct().count()
 		self.totals['subject'] = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__subjectpost__space__professor = user) | Q(comment__post__subjectpost__space__professor = user) | Q(post__subjectpost__space__students = user) | Q(comment__post__subjectpost__space__students = user))).distinct().count()
+		general_visualizations.update(viewed = True)
+
 		return general
 	def get_context_data(self, **kwargs):
	@@ -2,6 +2,7 @@ from datetime import datetime		@@ -2,6 +2,7 @@ from datetime import datetime
2		2
3	from themes.models import Themes	3	from themes.models import Themes
4	from notifications.models import Notification	4	from notifications.models import Notification
		5	+from mural.models import MuralVisualizations
5		6
6	def theme(request):	7	def theme(request):
7	context = {}	8	context = {}
	@@ -22,4 +23,16 @@ def notifies(request):		@@ -22,4 +23,16 @@ def notifies(request):
22		23
23	context['notifications_count'] = notifications	24	context['notifications_count'] = notifications
24		25
		26	+ return context
		27	+
		28	+def mural_notifies(request):
		29	+ context = {}
		30	+
		31	+ notifications = 0
		32	+
		33	+ if request.user.is_authenticated:
		34	+ notifications = MuralVisualizations.objects.filter(viewed = False, user = request.user).count()
		35	+
		36	+ context['mural_notifications_count'] = notifications
		37	+
25	return context	38	return context
26	\ No newline at end of file	39	\ No newline at end of file
	@@ -1043,7 +1043,7 @@ li.item .notify_badge {		@@ -1043,7 +1043,7 @@ li.item .notify_badge {
1043	padding: 10px 0px 8px 0px;	1043	padding: 10px 0px 8px 0px;
1044	}	1044	}
1045		1045
1046	-.post .post-comment .user-img {	1046	+.post .post-comment .user-img div {
1047	display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */	1047	display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
1048	display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */	1048	display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
1049	display: -ms-flexbox; /* TWEENER - IE 10 */	1049	display: -ms-flexbox; /* TWEENER - IE 10 */
	@@ -496,7 +496,7 @@ a.add-row {		@@ -496,7 +496,7 @@ a.add-row {
496	background: #FFFFFF;	496	background: #FFFFFF;
497	}	497	}
498		498
499	-.mural .post_make .user-img {	499	+.mural .post_make .user-img, .post .post-img, .post .post-comment .user-img div {
500	background: #CCCCCC;	500	background: #CCCCCC;
501	}	501	}
502		502
	@@ -15,6 +15,22 @@ socket.onmessage = function(e) {		@@ -15,6 +15,22 @@ socket.onmessage = function(e) {
15	$('.posts').prepend(content.complete);	15	$('.posts').prepend(content.complete);
16		16
17	$('.no-subjects').attr('style', 'display:none');	17	$('.no-subjects').attr('style', 'display:none');
		18	+ } else {
		19	+ $('.mural_badge').each(function () {
		20	+ var actual = $(this).text();
		21	+
		22	+ if (actual != "+99") {
		23	+ actual = parseInt(actual, 10) + 1;
		24	+
		25	+ if (actual > 99) {
		26	+ actual = "+99";
		27	+ }
		28	+
		29	+ $(this).text(actual);
		30	+ }
		31	+
		32	+ $(this).show();
		33	+ });
18	}	34	}
19		35
20	if (("Notification" in window)) {	36	if (("Notification" in window)) {