From 6acc69b519422171eb661edbe192bf2074ce6d8f Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Wed, 2 Apr 2014 17:25:00 +0200 Subject: Added more views for content. --- meetingtools/apps/content/views.py | 64 +++++++++++++++++++++++++++++++++++-- templates/apps/content/cluster.html | 59 ++++++++++++++++++++++++++++++++++ templates/apps/content/domain.html | 50 +++++++++++++++++++++++++++++ templates/apps/content/user.html | 27 +++++++++++----- templates/base.html | 6 +++- 5 files changed, 194 insertions(+), 12 deletions(-) create mode 100644 templates/apps/content/cluster.html create mode 100644 templates/apps/content/domain.html diff --git a/meetingtools/apps/content/views.py b/meetingtools/apps/content/views.py index c830af0..7bc0792 100644 --- a/meetingtools/apps/content/views.py +++ b/meetingtools/apps/content/views.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- __author__ = 'lundberg' -from django.contrib.auth.decorators import login_required -from django.db.models import Sum +from django.contrib.auth.decorators import login_required, permission_required +from django.db.models import Sum, Count +from django.contrib.auth.models import User from django.contrib.humanize.templatetags.humanize import naturalday from django.http import HttpResponseForbidden, HttpResponseBadRequest from meetingtools.apps.stats.models import UserMeetingTransaction @@ -11,7 +12,9 @@ from time import mktime from meetingtools.multiresponse import json_response, respond_to from meetingtools.apps.stats.forms import StatCaledarForm from django.shortcuts import get_object_or_404 +from tagging.models import Tag, TaggedItem from meetingtools.apps.content.models import Content +from meetingtools.apps.cluster.models import ACCluster @login_required @@ -21,4 +24,59 @@ def user(request, username=None): content = Content.objects.filter(creator__username=username) total_bytecount = content.aggregate(Sum('bytecount')) return respond_to(request,{'text/html': 'apps/content/user.html'}, - {'username': username, 'content': content, 'total_bytecount': total_bytecount}) \ No newline at end of file + {'username': username, 'content': content, 'total_bytecount': total_bytecount}) + + +@login_required +def cluster(request, cluster_name=None): + + if not request.user.is_staff: + return HttpResponseForbidden + + clusters = ACCluster.objects.all().values('name') + if cluster_name: + total_bytecount = 0 + domains = [] + acc = get_object_or_404(ACCluster, name=cluster_name) + tags = Tag.objects.usage_for_model(Content, filters={'sco__acc': acc}) + for tag in sorted(tags): + if tag.name.startswith('domain:'): + qs = TaggedItem.objects.get_by_model(Content, tag) + d = { + 'domain': tag.name.split('domain:')[1], + 'domain_bytes': qs.aggregate(Sum('bytecount'))['bytecount__sum'], + 'number_of_files': len(qs) + } + total_bytecount += d['domain_bytes'] + domains.append(d) + return respond_to(request, {'text/html': 'apps/content/cluster.html'}, + {'clusters': clusters, 'cluster_name': cluster_name, 'domains': domains, + 'total_bytecount': total_bytecount}) + + return respond_to(request, {'text/html': 'apps/content/cluster.html'}, + {'clusters': clusters}) + + +@login_required +def domain(request, domain_name): + + if not request.user.is_staff: + return HttpResponseForbidden + + users = [] + tag = get_object_or_404(Tag, name='domain:%s' % domain_name) + qs = TaggedItem.objects.get_by_model(Content, tag) + total_files = len(qs) + total_bytecount = qs.aggregate(Sum('bytecount'))['bytecount__sum'] + creators = qs.values('creator').annotate(num_files=Count('creator')) + for creator in creators: + domain_user = get_object_or_404(User, pk=creator['creator']) + d = { + 'username': domain_user.username, + 'number_of_files': creator['num_files'], + 'bytecount': Content.objects.filter(creator=domain_user).aggregate(Sum('bytecount'))['bytecount__sum'] + } + users.append(d) + return respond_to(request, {'text/html': 'apps/content/domain.html'}, + {'domain': domain_name, 'total_bytecount': total_bytecount, 'total_files': total_files, + 'users': users}) diff --git a/templates/apps/content/cluster.html b/templates/apps/content/cluster.html new file mode 100644 index 0000000..6d30690 --- /dev/null +++ b/templates/apps/content/cluster.html @@ -0,0 +1,59 @@ +{% extends "base.html" %} +{% block js %} + + + + + +{% endblock %} +{% block content %} + +{% if cluster_name %} +

Storage for {{cluster_name}}

+
+ Total storage: {{ total_bytecount|filesizeformat }} +
+
+
+
+ + + + + + + + {% for domain in domains %} + + + + + + + {% endfor %} + +
DomainNumber of filesStorage usedPercent
{{ domain.domain }}{{ domain.number_of_files }}{{ domain.domain_bytes|filesizeformat}}{% widthratio domain.domain_bytes total_bytecount 100 %}%
+
+{% endif %} +{% endblock %} + +{% block widgets %} + +{% endblock %} \ No newline at end of file diff --git a/templates/apps/content/domain.html b/templates/apps/content/domain.html new file mode 100644 index 0000000..5efd236 --- /dev/null +++ b/templates/apps/content/domain.html @@ -0,0 +1,50 @@ +{% extends "base.html" %} +{% block js %} + + + + + +{% endblock %} +{% block content %} +

Content for {{domain}}

+
+ Number of files: {{ total_files }} | Total storage: {{ total_bytecount|filesizeformat }} +
+
+
+
+ + + + + + + + {% for user in users %} + + + + + + + {% endfor %} + +
UsernameNumber of filesStorage usedPercent
{{ user.username }}{{ user.number_of_files }}{{ user.bytecount|filesizeformat }}{% widthratio user.bytecount total_bytecount 100 %}%
+
+{% endblock %} + +{% block widgets %} + +{% endblock %} \ No newline at end of file diff --git a/templates/apps/content/user.html b/templates/apps/content/user.html index b02ad77..697bba7 100644 --- a/templates/apps/content/user.html +++ b/templates/apps/content/user.html @@ -2,17 +2,28 @@ {% block js %} + + {% endblock %} -{% load content_tags %} {% block content %}

Content for {{username}}

- Number of files: {{ content|length }} | Total storage: {{ total_bytecount.bytecount__sum|humanize_bytes }} + Number of files: {{ content|length }} | Total storage: {{ total_bytecount.bytecount__sum|filesizeformat }}


@@ -26,14 +37,14 @@ {% for item in content %} - {{ item.created }} - {{ item.name }} + {{ item.created|date:"d/m/Y H:i:s" }} + {{ item.name }} {{ item.type }} - {{ item.bytecount|humanize_bytes }} - {{ item.modified }} + {{ item.bytecount|filesizeformat }} + {{ item.modified|date:"d/m/Y H:i:s" }} {{ item.views }} - {{ item.lastviewed }} + {{ item.lastviewed|date:"d/m/Y H:i:s" }} {% endfor %} diff --git a/templates/base.html b/templates/base.html index 90d516e..e0c4695 100644 --- a/templates/base.html +++ b/templates/base.html @@ -87,8 +87,12 @@
-- cgit v1.1