abra at Thu Dec 27 13:44:21 +04 2018
This commit is contained in:
20
web/views.py
20
web/views.py
@@ -1,6 +1,8 @@
|
||||
import numpy as np
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView
|
||||
|
||||
from web.forms import ActivityLogCreateForm
|
||||
from web.models import ActivityLog, User, Activity
|
||||
|
||||
|
||||
@@ -23,12 +25,26 @@ class UserDetailView(DetailView):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['activity_logs'] = ActivityLog.objects.filter(user=self.object).order_by('start_time')
|
||||
context['activities'] = set(i.activity for i in ActivityLog.objects.filter(user=self.object))
|
||||
|
||||
total_times = {i: 0 for i in context['activities']}
|
||||
total = 0
|
||||
for i in context['activity_logs']:
|
||||
total_times[i.activity] += (i.end_time - i.start_time).total_seconds()
|
||||
total += (i.end_time - i.start_time).total_seconds()
|
||||
|
||||
keys = list(total_times.keys())
|
||||
context['activities_and_pcts'] = [
|
||||
(keys[i], total_times[keys[i]] / total * 100)
|
||||
for i in reversed(np.argsort(list(total_times.values())))
|
||||
]
|
||||
|
||||
return context
|
||||
|
||||
|
||||
class ActivityLogCreateView(CreateView):
|
||||
model = ActivityLog
|
||||
fields = ['activity', 'user', 'start_time', 'end_time']
|
||||
# fields = ['activity', 'user', 'start_time', 'end_time']
|
||||
form_class = ActivityLogCreateForm
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse('user', kwargs={
|
||||
@@ -66,5 +82,3 @@ class UserChartsActivity(DetailView):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['activity'] = Activity.objects.filter(id=self.kwargs['activity_id']).first()
|
||||
return context
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user