diff --git a/courses/views.py b/courses/views.py index b571bf5..554317d 100644 --- a/courses/views.py +++ b/courses/views.py @@ -17,13 +17,14 @@ from .forms import CourseForm, UpdateCourseForm, CategoryCourseForm, SubjectForm from .models import Course, Subject, CourseCategory,Topic, SubjectCategory,Activity, CategorySubject from core.decorators import log_decorator from core.mixins import LogMixin, NotificationMixin +from core.models import Log from users.models import User from files.forms import FileForm from files.models import TopicFile from courses.models import Material from django.urls import reverse -from datetime import date +from datetime import date, datetime class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): @@ -343,6 +344,9 @@ class CourseView(LogMixin, NotificationMixin, generic.DetailView): super(CourseView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) + self.request.session['time_spent'] = str(datetime.now()) + self.request.session['log_id'] = Log.objects.latest('id').id + category_sub = self.kwargs.get('category', None) if has_role(self.request.user,'system_admin'): @@ -547,6 +551,9 @@ class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView): super(SubjectsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) + self.request.session['time_spent'] = str(datetime.now()) + self.request.session['log_id'] = Log.objects.latest('id').id + return super(SubjectsView, self).dispatch(*args, **kwargs) def get_queryset(self): @@ -620,6 +627,9 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView): super(TopicsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) + self.request.session['time_spent'] = str(datetime.now()) + self.request.session['log_id'] = Log.objects.latest('id').id + return super(TopicsView, self).dispatch(*args, **kwargs) def get_queryset(self): @@ -635,7 +645,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView): activitys = Activity.objects.filter(topic__name = topic.name) students_activit = User.objects.filter(activities__in = Activity.objects.all()) materials = Material.objects.filter(topic = topic) - print(materials) + context['topic'] = topic context['subject'] = topic.subject context['activitys'] = activitys diff --git a/forum/views.py b/forum/views.py index c792bd0..49f28dc 100644 --- a/forum/views.py +++ b/forum/views.py @@ -14,12 +14,14 @@ from rolepermissions.verifications import has_object_permission from .models import Forum, Post, PostAnswer from courses.models import Topic -from core.models import Action, Resource +from core.models import Action, Resource, Log from .forms import ForumForm, PostForm, PostAnswerForm from core.mixins import LogMixin, NotificationMixin +import datetime + """ Forum Section """ @@ -230,6 +232,9 @@ class ForumDetailView(LoginRequiredMixin, LogMixin, generic.DetailView): super(ForumDetailView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) + self.request.session['time_spent'] = str(datetime.datetime.now()) + self.request.session['log_id'] = Log.objects.latest('id').id + return super(ForumDetailView, self).dispatch(*args, **kwargs) def get_context_data(self, **kwargs): diff --git a/poll/views.py b/poll/views.py index e217582..0d1b6fb 100644 --- a/poll/views.py +++ b/poll/views.py @@ -15,6 +15,7 @@ from .forms import PollForm from .models import Poll, Answer, AnswersStudent from core.mixins import LogMixin, NotificationMixin from users.models import User +from core.models import Log from courses.models import Course, Topic import datetime @@ -48,6 +49,9 @@ class ViewPoll(LoginRequiredMixin, LogMixin, generic.DetailView): super(ViewPoll, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) + self.request.session['time_spent'] = str(datetime.datetime.now()) + self.request.session['log_id'] = Log.objects.latest('id').id + return poll def get_context_data(self, **kwargs): @@ -62,6 +66,7 @@ class ViewPoll(LoginRequiredMixin, LogMixin, generic.DetailView): context['status'] = False else: context['status'] = answered[0].status + return context -- libgit2 0.21.2