diff --git a/core/middleware.py b/core/middleware.py index 78a7fea..9d43747 100644 --- a/core/middleware.py +++ b/core/middleware.py @@ -15,15 +15,15 @@ class TimeSpentMiddleware(object): if not log_id is None: log = get_object_or_404(Log, id = log_id) - date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f") - _now = datetime.now() + #date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f") + #_now = datetime.now() - time_spent = _now - date_time_click + #time_spent = _now - date_time_click - secs = time_spent.total_seconds() - hours = int(secs / 3600) - minutes = int(secs / 60) % 60 - secs = secs % 60 + #secs = time_spent.total_seconds() + #hours = int(secs / 3600) + #minutes = int(secs / 60) % 60 + #secs = secs % 60 if type(log.context) == dict: @@ -31,12 +31,12 @@ class TimeSpentMiddleware(object): else: log_context = json.loads(log.context) - time = {} - time['hours'] = hours - time['minutes'] = minutes - time['seconds'] = secs + #time = {} + #time['hours'] = hours + #time['minutes'] = minutes + #time['seconds'] = secs - log_context['time_spent'] = time + log_context['timestamp_end'] = str(datetime.now()) log.context = log_context diff --git a/courses/views.py b/courses/views.py index 1dbc2ad..4bfa9e0 100644 --- a/courses/views.py +++ b/courses/views.py @@ -345,10 +345,10 @@ class CourseView(LogMixin, NotificationMixin, generic.DetailView): self.log_context['course_slug'] = course.slug self.log_context['course_category_id'] = course.category.id self.log_context['course_category_name'] = course.category.name + self.log_context['timestamp_start'] = str(datetime.now()) 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) @@ -552,10 +552,10 @@ class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView): self.log_context['course_slug'] = subject.course.slug self.log_context['course_category_id'] = subject.course.category.id self.log_context['course_category_name'] = subject.course.category.name + self.log_context['timestamp_start'] = str(datetime.now()) 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) @@ -657,10 +657,10 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView): self.log_context['course_slug'] = topic.subject.course.slug self.log_context['course_category_id'] = topic.subject.course.category.id self.log_context['course_category_name'] = topic.subject.course.category.name + self.log_context['timestamp_start'] = str(datetime.now()) 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) @@ -1003,10 +1003,10 @@ class FileMaterialView(LoginRequiredMixin, LogMixin, generic.DetailView): self.log_context['course_slug'] = file.topic.subject.course.slug self.log_context['course_category_id'] = file.topic.subject.course.category.id self.log_context['course_category_name'] = file.topic.subject.course.category.name + self.log_context['timestamp_start'] = str(datetime.now()) super(FileMaterialView, 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(FileMaterialView, self).dispatch(*args, **kwargs) diff --git a/exam/views.py b/exam/views.py index 00e9787..ae4c172 100644 --- a/exam/views.py +++ b/exam/views.py @@ -59,10 +59,10 @@ class ViewExam(LoginRequiredMixin, LogMixin, generic.DetailView): self.log_context['course_slug'] = exam.topic.subject.course.slug self.log_context['course_category_id'] = exam.topic.subject.course.category.id self.log_context['course_category_name'] = exam.topic.subject.course.category.name + self.request.session['time_spent'] = str(datetime.now()) super(ViewExam, 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 context @@ -318,6 +318,7 @@ class AnswerStudentExam(LoginRequiredMixin, LogMixin, generic.CreateView): minutes = int(secs / 60) % 60 secs = secs % 60 + self.log_context['timestamp_end'] = str(datetime.now()) self.log_context['time_spent'] = {} self.log_context['time_spent']['hours'] = hours self.log_context['time_spent']['minutes'] = minutes @@ -346,6 +347,7 @@ class AnswerStudentExam(LoginRequiredMixin, LogMixin, generic.CreateView): context['answers'] = answers context['keys'] = keys + self.log_context['timestamp_start'] = str(datetime.now()) self.request.session['time_spent'] = str(datetime.now()) return context diff --git a/forum/views.py b/forum/views.py index 49f28dc..1a08cf3 100644 --- a/forum/views.py +++ b/forum/views.py @@ -229,10 +229,10 @@ class ForumDetailView(LoginRequiredMixin, LogMixin, generic.DetailView): self.log_context['course_slug'] = forum.topic.subject.course.slug self.log_context['course_category_id'] = forum.topic.subject.course.category.id self.log_context['course_category_name'] = forum.topic.subject.course.category.name + self.log_context['timestamp_start'] = str(datetime.now()) 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) diff --git a/links/views.py b/links/views.py index 3ef694f..b61e524 100644 --- a/links/views.py +++ b/links/views.py @@ -244,6 +244,7 @@ class ViewLink(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.DetailView): self.log_context['course_slug'] = link.topic.subject.course.slug self.log_context['course_category_id'] = link.topic.subject.course.category.id self.log_context['course_category_name'] = link.topic.subject.course.category.name + self.log_context['timestamp_start'] = str(datetime.now()) super(ViewLink, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) diff --git a/poll/views.py b/poll/views.py index efb936d..d475b32 100644 --- a/poll/views.py +++ b/poll/views.py @@ -48,10 +48,10 @@ class ViewPoll(LoginRequiredMixin, LogMixin, generic.DetailView): self.log_context['course_slug'] = poll.topic.subject.course.slug self.log_context['course_category_id'] = poll.topic.subject.course.category.id self.log_context['course_category_name'] = poll.topic.subject.course.category.name + self.log_context['timestamp_start'] = str(datetime.now()) 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 @@ -315,6 +315,7 @@ class AnswerStudentPoll(LoginRequiredMixin, LogMixin, generic.CreateView): def dispatch(self, *args, **kwargs): if self.request.method == 'GET': self.request.session['time_spent'] = str(datetime.datetime.now()) + self.log_context['timestamp_start'] = str(datetime.now()) return super(AnswerStudentPoll, self).dispatch(*args, **kwargs) @@ -344,6 +345,7 @@ class AnswerStudentPoll(LoginRequiredMixin, LogMixin, generic.CreateView): self.log_context['course_slug'] = poll.topic.subject.course.slug self.log_context['course_category_id'] = poll.topic.subject.course.category.id self.log_context['course_category_name'] = poll.topic.subject.course.category.name + self.log_context['timestamp_end'] = str(datetime.now()) date_time_click = datetime.datetime.strptime(self.request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f") _now = datetime.datetime.now() -- libgit2 0.21.2