Adding datetime for mural viewed

Zambom
1 parent 12a840b7
Showing 4 changed files with 48 additions and 6 deletions Show diff stats
goals/migrations/0003_auto_20170227_2014.py
mural/migrations/0009_muralvisualizations_date_viewed.py
mural/models.py
mural/views.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-02-27 23:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('goals', '0002_auto_20170224_1721'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='goalitem',
+            name='description',
+            field=models.CharField(blank=True, max_length=255, verbose_name='Description'),
+        ),
+    ]
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-02-27 23:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mural', '0008_auto_20170224_0023'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='muralvisualizations',
+            name='date_viewed',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Date/Time Viewed'),
+        ),
+    ]
@@ -118,6 +118,7 @@ class MuralVisualizations(models.Model):
 	post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'visualization_post', null = True)
 	comment = models.ForeignKey(Comment, verbose_name = _('Comment'), related_name = 'visualization_comment', null = True)
 	user = models.ForeignKey(User, verbose_name = _('User'), related_name = "visualization_user", null = True)
+	date_viewed = models.DateTimeField(_('Date/Time Viewed'), null = True, blank = True)
 """
 	Model to handle users favorite posts
@@ -23,6 +23,7 @@ from log.models import Log
 from log.mixins import LogMixin
 from log.decorators import log_decorator, log_decorator_ajax
 import time
+from datetime import datetime
 from .models import Mural, GeneralPost, CategoryPost, SubjectPost, MuralVisualizations, MuralFavorites, Comment
 from .forms import GeneralPostForm, CategoryPostForm, SubjectPostForm, ResourcePostForm, CommentForm
@@ -77,9 +78,9 @@ class GeneralIndex(LoginRequiredMixin, LogMixin, generic.ListView):
 			self.totals['category'] = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & ((Q(user__is_staff = True) & (Q(post__categorypost__isnull = False) | Q(comment__post__categorypost__isnull = False))) | Q(post__categorypost__space__coordinators = user) | Q(comment__post__categorypost__space__coordinators = user) | Q(post__categorypost__space__subject_category__students = user) | Q(comment__post__categorypost__space__subject_category__students = user) | Q(post__categorypost__space__subject_category__professor = user) | Q(comment__post__categorypost__space__subject_category__professor = user))).distinct().count()
 			self.totals['subject'] = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & ((Q(user__is_staff = True) & (Q(post__subjectpost__isnull = False) | Q(comment__post__subjectpost__isnull = 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)
+			general_visualizations.update(viewed = True, date_viewed = datetime.now())
-			MuralVisualizations.objects.filter(user = user, viewed = False, comment__post__generalpost__isnull = False).update(viewed = True)
+			MuralVisualizations.objects.filter(user = user, viewed = False, comment__post__generalpost__isnull = False).update(viewed = True, date_viewed = datetime.now())
 		return general.order_by("-most_recent")
@@ -315,7 +316,7 @@ def load_category_posts(request, category):
 	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)
+		views.update(viewed = True, date_viewed = datetime.now())
 	paginator = Paginator(posts.order_by("-most_recent"), 10)
@@ -604,7 +605,7 @@ def load_subject_posts(request, subject):
 	if has_page is None:
 		views = MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(comment__post__subjectpost__space__id = subject) | Q(post__subjectpost__space__id = subject)))
 		n_views = views.count()
-		views.update(viewed = True)
+		views.update(viewed = True, date_viewed = datetime.now())
 	paginator = Paginator(posts.order_by("-most_recent"), 10)
@@ -941,7 +942,7 @@ class SubjectView(LoginRequiredMixin, LogMixin, generic.ListView):
 			posts = posts.exclude(id__in = showing)
 		if not page: #Don't need this if is pagination
-			MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__subjectpost__space = subject) | Q(comment__post__subjectpost__space = subject))).update(viewed = True)
+			MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__subjectpost__space = subject) | Q(comment__post__subjectpost__space = subject))).update(viewed = True, date_viewed = datetime.now())
 		return posts.order_by("-most_recent")
@@ -1054,7 +1055,7 @@ class ResourceView(LoginRequiredMixin, LogMixin, generic.ListView):
 			posts = posts.exclude(id__in = showing)
 		if not page: #Don't need this if is pagination
-			MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__subjectpost__resource = resource) | Q(comment__post__subjectpost__resource = resource))).update(viewed = True)
+			MuralVisualizations.objects.filter(Q(user = user) & Q(viewed = False) & (Q(post__subjectpost__resource = resource) | Q(comment__post__subjectpost__resource = resource))).update(viewed = True, date_viewed = datetime.now())
 		return posts.order_by("-most_recent")
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-02-27 23:14
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('goals', '0002_auto_20170224_1721'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AlterField(
	16	+ model_name='goalitem',
	17	+ name='description',
	18	+ field=models.CharField(blank=True, max_length=255, verbose_name='Description'),
	19	+ ),
	20	+ ]
	@@ -118,6 +118,7 @@ class MuralVisualizations(models.Model):		@@ -118,6 +118,7 @@ class MuralVisualizations(models.Model):
118	post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'visualization_post', null = True)	118	post = models.ForeignKey(Mural, verbose_name = _('Post'), related_name = 'visualization_post', null = True)
119	comment = models.ForeignKey(Comment, verbose_name = _('Comment'), related_name = 'visualization_comment', null = True)	119	comment = models.ForeignKey(Comment, verbose_name = _('Comment'), related_name = 'visualization_comment', null = True)
120	user = models.ForeignKey(User, verbose_name = _('User'), related_name = "visualization_user", null = True)	120	user = models.ForeignKey(User, verbose_name = _('User'), related_name = "visualization_user", null = True)
		121	+ date_viewed = models.DateTimeField(_('Date/Time Viewed'), null = True, blank = True)
121		122
122	"""	123	"""
123	Model to handle users favorite posts	124	Model to handle users favorite posts