Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

felipebormann
2 parents d5a407b8 ac4841d3
Showing 5 changed files with 172 additions and 9 deletions Show diff stats
amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/black.sassc
amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/red.sassc
amadeus/static/js/mural_category.js
mural/templates/mural/list_category.html
mural/views.py
@@ -14,7 +14,10 @@ $(&#39;.mural-category&#39;).on(&#39;shown.bs.collapse&#39;, function(e) {
 		var post_section = $(this).find('.posts'),
 			without = $(this).find('.no-subjects'),
-			loading = $(this).find('.loading-posts');
+			loading = $(this).find('.loading-posts'),
+			more = $(this).find('.more-posts'),
+			filters = $(this).find('.post-filters'),
+			mural = post_section.parent().parent();
 		if (post_section.children().length == 0) {
 			var url = $(this).find('.mural').data('url');
@@ -28,13 +31,139 @@ $(&#39;.mural-category&#39;).on(&#39;shown.bs.collapse&#39;, function(e) {
                     if (data.count > 0) {
                     	post_section.append(data.posts);
+                    	mural.data('pages', data.num_pages);
+                    	mural.data('page', data.num_page);
+
+                    	setTimeout(function () { postHeightLimits() }, 100);
+
+                    	if (data.num_page < data.num_pages) {
+                    		more.show();
+                    	} else {
+                    		more.hide();
+                    	}
+
+                    	$('.mural_badge').each(function () {
+							var actual = $(this).text();
+
+							if (actual != "+99") {
+								actual = parseInt(actual, 10) - data.unviewed;
+
+								if (actual <= 0) {
+									$(this).hide();
+								} else {
+									$(this).text(actual);
+								}
+							}
+						});
+
+						$('.cat_badge').each(function () {
+							var actual = $(this).text();
+
+							if (actual != "+99") {
+								actual = parseInt(actual, 10) - data.unviewed;
+
+								if (actual < 0) {
+									actual = 0;
+								}
+								
+								$(this).text(actual);
+							}
+						});
+
                     	without.hide();
                     } else {
+                    	more.hide();
+
                     	without.show();
                     }
                 }
             });
 		}
+
+		more.click(function () {
+			var url = mural.data('url'),
+				pageNum = mural.data('page'),
+		        numberPages = mural.data('pages'),
+		        favorites = mural.data('fav'),
+		        mine = mural.data('mine'),
+		        showing = new_posts.join(',');
+
+		    if (pageNum == numberPages) {
+		        return false
+		    }
+
+		    pageNum = pageNum + 1;
+
+		    more.hide();
+
+		    loading.show();
+
+		    $.ajax({
+		    	url: url,
+		    	data: {'page': pageNum, 'favorite': favorites, 'mine': mine, 'showing': showing},
+		    	dataType: 'json',
+		    	success: function (data) {
+		    		loading.hide();
+
+		    		post_section.append(data.posts);
+
+                	mural.data('pages', data.num_pages);
+                	mural.data('page', data.num_page);
+
+                	setTimeout(function () { postHeightLimits() }, 100);
+
+                	if (data.num_page < data.num_pages) {
+                		more.show();
+                	} else {
+                		more.hide();
+                	}
+		    	}
+		    });
+		});
+
+		filters.submit(function () {
+			var favorite = $(this).find("input[name='favorite']").is(':checked') ? "True" : "",
+				mine = $(this).find("input[name='mine']").is(':checked') ? "True" : "",
+				url = mural.data('url');
+
+			post_section.html('');
+
+			more.hide();
+			loading.show();
+
+			$.ajax({
+				url: url,
+				data: {'favorite': favorite, 'mine': mine},
+				dataType: 'json',
+				success: function (data) {
+					loading.hide();
+
+					if (data.count > 0) {
+                    	post_section.append(data.posts);
+
+                    	mural.data('pages', data.num_pages);
+                    	mural.data('page', data.num_page);
+
+                    	if (data.num_page < data.num_pages) {
+                    		more.show();
+                    	} else {
+                    		more.hide();
+                    	}
+
+                    	setTimeout(function () { postHeightLimits() }, 100);
+
+                    	without.hide();
+                    } else {
+                    	without.show();
+                    }
+
+                    mural.data('fav', favorite);
+                    mural.data('mine', mine);
+				}
+			});
+
+			return false;
+		});
     }
 });
@@ -17,7 +17,7 @@
     <div id="core-subjects-options-div">
         <ul class="core-subjects-options">
             <a href="{% url 'mural:manage_general' %}"><li>{% trans "General" %} ({{ totals.general }})</li></a>
-            <a href="{% url 'mural:manage_category' %}"><li class="active">{% trans "Per Category" %} ({{ totals.category }})</li></a>
+            <a href="{% url 'mural:manage_category' %}"><li class="active">{% trans "Per Category" %} (<span class="cat_badge">{{ totals.category }}</span>)</li></a>
             <a href=""><li>{% trans "Per Subject" %} ({{ totals.subject }})</li></a>
         </ul>
     </div>
@@ -80,9 +80,19 @@
                                         </div>
                                     </div>
-                                    <button type="button" class="btn btn-block btn-default btn-sm loading-posts"><span class="fa fa-spin fa-circle-o-notch"></span></button>
                                     <div class="posts">
                                     </div>
+
+                                    <button type="button" class="btn btn-block btn-success btn-raised more-posts" style="display:none">
+                                        {% trans 'See more posts' %}
+                                    </button>
+
+                                    <div class="alert alert-success loading-posts" role="alert">
+                                        <center>
+                                            <span class="fa fa-spin fa-circle-o-notch"></span>
+                                        </center>
+                                    </div>
+
                                     <div class="text-center no-subjects" style="display:none">
                                         <i class="fa fa-list"></i>
                                         <h4>{% trans 'There are no posts in this mural yet.' %}</h4>
@@ -91,7 +101,7 @@
                                 <div class="col-md-3 col-sm-3 col-xs-3 post-filter">
                                     <h4>{% trans 'Filter' %}</h4>
-                                    <form id="post-filters" action="" method="GET">
+                                    <form class="post-filters" action="" method="GET">
                                         <div class="checkbox">
                                             <label>
                                                 <input name="favorite" type="checkbox"> {% trans 'Favorite posts' %} <i class="fa fa-thumb-tack"></i>
@@ -103,7 +113,7 @@
                                             </label>
                                         </div>
                                         <button type="submit" class="btn btn-success btn-raised btn-block">{% trans 'Filter' %}</button>
-                                        <button type="button" id="clear_filter" class="btn btn-default btn-raised btn-block">{% trans 'Clean Filters' %}</button>
+                                        <button type="button" class="clear_filter btn btn-default btn-raised btn-block">{% trans 'Clean Filters' %}</button>
                                     </form>
                                 </div>
                             </div>
@@ -219,11 +219,35 @@ def load_category_posts(request, category):
 		'request': request,
 	}
+	user = request.user
+	favorites = request.GET.get('favorite', False)
+	mines = request.GET.get('mine', False)
 	showing = request.GET.get('showing', '')
-
-	posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category).order_by("-most_recent")
+	n_views = 0
-	paginator = Paginator(posts, 10)
+	if not favorites:
+		if mines:
+			posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category, mural_ptr__user = user)
+		else:
+			posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category)
+	else:
+		if mines:
+			posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category, favorites_post__isnull = False, favorites_post__user = user, mural_ptr__user = user)
+		else:
+			posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category, favorites_post__isnull = False, favorites_post__user = user)
+	
+	if showing: #Exclude ajax creation posts results
+		showing = showing.split(',')
+		posts = posts.exclude(id__in = showing)
+
+	has_page = request.GET.get('page', None)
+
+	if has_page is None:
+		views = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(comment__post__categorypost__space__id = category) | Q(post__categorypost__space__id = category)))
+		n_views = views.count()
+		views.update(viewed = True)
+
+	paginator = Paginator(posts.order_by("-most_recent"), 10)
 	try:
 		page_number = int(request.GET.get('page', 1))
@@ -239,7 +263,7 @@ def load_category_posts(request, category):
 	response = render_to_string("mural/_list_view.html", context, request)
-	return JsonResponse({"posts": response, "count": posts.count(), "num_pages": paginator.num_pages, "num_page": page_obj.number})
+	return JsonResponse({"posts": response, "unviewed": n_views, "count": posts.count(), "num_pages": paginator.num_pages, "num_page": page_obj.number})
 class CategoryIndex(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("users:login")
	@@ -14,7 +14,10 @@ $('.mural-category').on('shown.bs.collapse', function(e) {		@@ -14,7 +14,10 @@ $('.mural-category').on('shown.bs.collapse', function(e) {
14		14
15	var post_section = $(this).find('.posts'),	15	var post_section = $(this).find('.posts'),
16	without = $(this).find('.no-subjects'),	16	without = $(this).find('.no-subjects'),
17	- loading = $(this).find('.loading-posts');	17	+ loading = $(this).find('.loading-posts'),
		18	+ more = $(this).find('.more-posts'),
		19	+ filters = $(this).find('.post-filters'),
		20	+ mural = post_section.parent().parent();
18		21
19	if (post_section.children().length == 0) {	22	if (post_section.children().length == 0) {
20	var url = $(this).find('.mural').data('url');	23	var url = $(this).find('.mural').data('url');
	@@ -28,13 +31,139 @@ $('.mural-category').on('shown.bs.collapse', function(e) {		@@ -28,13 +31,139 @@ $('.mural-category').on('shown.bs.collapse', function(e) {
28	if (data.count > 0) {	31	if (data.count > 0) {
29	post_section.append(data.posts);	32	post_section.append(data.posts);
30		33
		34	+ mural.data('pages', data.num_pages);
		35	+ mural.data('page', data.num_page);
		36	+
		37	+ setTimeout(function () { postHeightLimits() }, 100);
		38	+
		39	+ if (data.num_page < data.num_pages) {
		40	+ more.show();
		41	+ } else {
		42	+ more.hide();
		43	+ }
		44	+
		45	+ $('.mural_badge').each(function () {
		46	+ var actual = $(this).text();
		47	+
		48	+ if (actual != "+99") {
		49	+ actual = parseInt(actual, 10) - data.unviewed;
		50	+
		51	+ if (actual <= 0) {
		52	+ $(this).hide();
		53	+ } else {
		54	+ $(this).text(actual);
		55	+ }
		56	+ }
		57	+ });
		58	+
		59	+ $('.cat_badge').each(function () {
		60	+ var actual = $(this).text();
		61	+
		62	+ if (actual != "+99") {
		63	+ actual = parseInt(actual, 10) - data.unviewed;
		64	+
		65	+ if (actual < 0) {
		66	+ actual = 0;
		67	+ }
		68	+
		69	+ $(this).text(actual);
		70	+ }
		71	+ });
		72	+
31	without.hide();	73	without.hide();
32	} else {	74	} else {
		75	+ more.hide();
		76	+
33	without.show();	77	without.show();
34	}	78	}
35	}	79	}
36	});	80	});
37	}	81	}
		82	+
		83	+ more.click(function () {
		84	+ var url = mural.data('url'),
		85	+ pageNum = mural.data('page'),
		86	+ numberPages = mural.data('pages'),
		87	+ favorites = mural.data('fav'),
		88	+ mine = mural.data('mine'),
		89	+ showing = new_posts.join(',');
		90	+
		91	+ if (pageNum == numberPages) {
		92	+ return false
		93	+ }
		94	+
		95	+ pageNum = pageNum + 1;
		96	+
		97	+ more.hide();
		98	+
		99	+ loading.show();
		100	+
		101	+ $.ajax({
		102	+ url: url,
		103	+ data: {'page': pageNum, 'favorite': favorites, 'mine': mine, 'showing': showing},
		104	+ dataType: 'json',
		105	+ success: function (data) {
		106	+ loading.hide();
		107	+
		108	+ post_section.append(data.posts);
		109	+
		110	+ mural.data('pages', data.num_pages);
		111	+ mural.data('page', data.num_page);
		112	+
		113	+ setTimeout(function () { postHeightLimits() }, 100);
		114	+
		115	+ if (data.num_page < data.num_pages) {
		116	+ more.show();
		117	+ } else {
		118	+ more.hide();
		119	+ }
		120	+ }
		121	+ });
		122	+ });
		123	+
		124	+ filters.submit(function () {
		125	+ var favorite = $(this).find("input[name='favorite']").is(':checked') ? "True" : "",
		126	+ mine = $(this).find("input[name='mine']").is(':checked') ? "True" : "",
		127	+ url = mural.data('url');
		128	+
		129	+ post_section.html('');
		130	+
		131	+ more.hide();
		132	+ loading.show();
		133	+
		134	+ $.ajax({
		135	+ url: url,
		136	+ data: {'favorite': favorite, 'mine': mine},
		137	+ dataType: 'json',
		138	+ success: function (data) {
		139	+ loading.hide();
		140	+
		141	+ if (data.count > 0) {
		142	+ post_section.append(data.posts);
		143	+
		144	+ mural.data('pages', data.num_pages);
		145	+ mural.data('page', data.num_page);
		146	+
		147	+ if (data.num_page < data.num_pages) {
		148	+ more.show();
		149	+ } else {
		150	+ more.hide();
		151	+ }
		152	+
		153	+ setTimeout(function () { postHeightLimits() }, 100);
		154	+
		155	+ without.hide();
		156	+ } else {
		157	+ without.show();
		158	+ }
		159	+
		160	+ mural.data('fav', favorite);
		161	+ mural.data('mine', mine);
		162	+ }
		163	+ });
		164	+
		165	+ return false;
		166	+ });
38	}	167	}
39	});	168	});
40		169
	@@ -219,11 +219,35 @@ def load_category_posts(request, category):		@@ -219,11 +219,35 @@ def load_category_posts(request, category):
219	'request': request,	219	'request': request,
220	}	220	}
221		221
		222	+ user = request.user
		223	+ favorites = request.GET.get('favorite', False)
		224	+ mines = request.GET.get('mine', False)
222	showing = request.GET.get('showing', '')	225	showing = request.GET.get('showing', '')
223	-
224	- posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category).order_by("-most_recent")	226	+ n_views = 0
225		227
226	- paginator = Paginator(posts, 10)	228	+ if not favorites:
		229	+ if mines:
		230	+ posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category, mural_ptr__user = user)
		231	+ else:
		232	+ posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category)
		233	+ else:
		234	+ if mines:
		235	+ posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category, favorites_post__isnull = False, favorites_post__user = user, mural_ptr__user = user)
		236	+ else:
		237	+ posts = CategoryPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_categorypost.mural_ptr_id))"}).filter(space__id = category, favorites_post__isnull = False, favorites_post__user = user)
		238	+
		239	+ if showing: #Exclude ajax creation posts results
		240	+ showing = showing.split(',')
		241	+ posts = posts.exclude(id__in = showing)
		242	+
		243	+ has_page = request.GET.get('page', None)
		244	+
		245	+ if has_page is None:
		246	+ views = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(comment__post__categorypost__space__id = category) \| Q(post__categorypost__space__id = category)))
		247	+ n_views = views.count()
		248	+ views.update(viewed = True)
		249	+
		250	+ paginator = Paginator(posts.order_by("-most_recent"), 10)
227		251
228	try:	252	try:
229	page_number = int(request.GET.get('page', 1))	253	page_number = int(request.GET.get('page', 1))
	@@ -239,7 +263,7 @@ def load_category_posts(request, category):		@@ -239,7 +263,7 @@ def load_category_posts(request, category):
239		263
240	response = render_to_string("mural/_list_view.html", context, request)	264	response = render_to_string("mural/_list_view.html", context, request)
241		265
242	- return JsonResponse({"posts": response, "count": posts.count(), "num_pages": paginator.num_pages, "num_page": page_obj.number})	266	+ return JsonResponse({"posts": response, "unviewed": n_views, "count": posts.count(), "num_pages": paginator.num_pages, "num_page": page_obj.number})
243		267
244	class CategoryIndex(LoginRequiredMixin, generic.ListView):	268	class CategoryIndex(LoginRequiredMixin, generic.ListView):
245	login_url = reverse_lazy("users:login")	269	login_url = reverse_lazy("users:login")