track more stuff

pull/1/head
eric 2014-11-19 16:03:21 -05:00
parent 9e4c6b9a77
commit 31ca43de55
2 changed files with 40 additions and 2 deletions

View File

@ -36,6 +36,7 @@
<li> {{ users.lt.count }} ungluers are connected to LibraryThing.</li> <li> {{ users.lt.count }} ungluers are connected to LibraryThing.</li>
<li> {{ users.fb.count }} ungluers are connected to FaceBook.</li> <li> {{ users.fb.count }} ungluers are connected to FaceBook.</li>
<li> {{ users.tw.count }} ungluers are connected to Twitter.</li> <li> {{ users.tw.count }} ungluers are connected to Twitter.</li>
<li> {{ users.libtools.count }} ungluers have enabled Librarian Tools.</li>
</ul> </ul>
</dd> </dd>
</dl> </dl>
@ -95,6 +96,13 @@
</li> </li>
<li>{{ ebooks.all.count }} have been added in total. <li>{{ ebooks.all.count }} have been added in total.
</li> </li>
<li>{{ ebooks.downloads }} ebooks have been downloaded in total.
<ul>
<li>{{ ebooks.pdfdownloads }} pdf
<li>{{ ebooks.epubdownloads }} epub
<li>{{ ebooks.mobidownloads }} mobi
</ul>
</li>
</ul> </ul>
</dd> </dd>
</dl> </dl>
@ -133,5 +141,24 @@
</ul> </ul>
</dd> </dd>
</dl> </dl>
<h2>MARC Records</h2>
<dl>
<dt> How many MARC Records have been added to Unglue.it?</dt>
<dd>
<ul class="terms">
<li>{{ marc.today.count }} have been added today.
</li>
<li>{{ marc.yesterday.count }} were added yesterday.
</li>
<li>{{ marc.days7.count }} have been added in the past 7 days.
</li>
<li>{{ marc.month.count }} have been added in this month.
</li>
<li>{{ marc.all.count }} have been added in total.
</li>
</ul>
</dd>
</dl>
{% endblock %} {% endblock %}

View File

@ -38,7 +38,7 @@ from django.core.files.temp import NamedTemporaryFile
from django.core.mail import EmailMessage from django.core.mail import EmailMessage
from django.core.urlresolvers import reverse, reverse_lazy from django.core.urlresolvers import reverse, reverse_lazy
from django.core.validators import validate_email from django.core.validators import validate_email
from django.db.models import Q, Count, Sum from django.db.models import Q, Count, Sum, get_model
from django.forms import Select from django.forms import Select
from django.forms.models import modelformset_factory, inlineformset_factory from django.forms.models import modelformset_factory, inlineformset_factory
from django.http import ( from django.http import (
@ -2160,6 +2160,7 @@ class InfoPageView(TemplateView):
users.lt = users.exclude(profile__librarything_id = '') users.lt = users.exclude(profile__librarything_id = '')
users.fb = users.filter(profile__facebook_id__isnull = False) users.fb = users.filter(profile__facebook_id__isnull = False)
users.tw = users.exclude(profile__twitter_id = '') users.tw = users.exclude(profile__twitter_id = '')
users.libtools = users.filter(libpref__isnull = False)
works = models.Work.objects works = models.Work.objects
works.today = works.filter(created__range = (date_today(), now())) works.today = works.filter(created__range = (date_today(), now()))
works.days7 = works.filter(created__range = (date_today()-timedelta(days=7), now())) works.days7 = works.filter(created__range = (date_today()-timedelta(days=7), now()))
@ -2178,6 +2179,10 @@ class InfoPageView(TemplateView):
ebooks.year = ebooks.filter(created__year = date_today().year) ebooks.year = ebooks.filter(created__year = date_today().year)
ebooks.month = ebooks.year.filter(created__month = date_today().month) ebooks.month = ebooks.year.filter(created__month = date_today().month)
ebooks.yesterday = ebooks.filter(created__range = (date_today()-timedelta(days=1), date_today())) ebooks.yesterday = ebooks.filter(created__range = (date_today()-timedelta(days=1), date_today()))
ebooks.downloads = ebooks.aggregate(total=Sum('download_count'))['total']
ebooks.pdfdownloads = ebooks.filter(format='pdf').aggregate(total=Sum('download_count'))['total']
ebooks.epubdownloads = ebooks.filter(format='epub').aggregate(total=Sum('download_count'))['total']
ebooks.mobidownloads = ebooks.filter(format='mobi').aggregate(total=Sum('download_count'))['total']
ebookfiles = models.EbookFile.objects ebookfiles = models.EbookFile.objects
ebookfiles.today = ebookfiles.filter(created__range = (date_today(), now())) ebookfiles.today = ebookfiles.filter(created__range = (date_today(), now()))
ebookfiles.days7 = ebookfiles.filter(created__range = (date_today()-timedelta(days=7), now())) ebookfiles.days7 = ebookfiles.filter(created__range = (date_today()-timedelta(days=7), now()))
@ -2206,7 +2211,12 @@ class InfoPageView(TemplateView):
transactions.month.sum = transactions.month.aggregate(Sum('amount'))['amount__sum'] transactions.month.sum = transactions.month.aggregate(Sum('amount'))['amount__sum']
transactions.yesterday = transactions.filter(date_created__range = (date_today()-timedelta(days=1), date_today())) transactions.yesterday = transactions.filter(date_created__range = (date_today()-timedelta(days=1), date_today()))
transactions.yesterday.sum = transactions.yesterday.aggregate(Sum('amount'))['amount__sum'] transactions.yesterday.sum = transactions.yesterday.aggregate(Sum('amount'))['amount__sum']
marc = get_model('marc','MARCRecord').objects
marc.today = marc.filter(created__range = (date_today(), now()))
marc.days7 = marc.filter(created__range = (date_today()-timedelta(days=7), now()))
marc.year = marc.filter(created__year = date_today().year)
marc.month = marc.year.filter(created__month = date_today().month)
marc.yesterday = marc.filter(created__range = (date_today()-timedelta(days=1),date_today()))
return { return {
'users': users, 'users': users,
'works': works, 'works': works,
@ -2214,6 +2224,7 @@ class InfoPageView(TemplateView):
'ebookfiles': ebookfiles, 'ebookfiles': ebookfiles,
'wishlists': wishlists, 'wishlists': wishlists,
'transactions': transactions, 'transactions': transactions,
'marc': marc,
} }
class InfoLangView(TemplateView): class InfoLangView(TemplateView):