matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add from __future__ import unicode_literals, issue #37

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-19 04:06:40 -04:00
parent efbac7300c
commit d59ea3ede2
334 changed files with 2452 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mayan/apps/documents/statistics.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
from django.db.models import Avg, Count, Min, Max
@@ -21,7 +21,7 @@ def get_used_size(path, file_list):
return total_size
def storage_count(path=u'.'):
def storage_count(path='.'):
try:
directories, files = storage_backend.listdir(path)
except OSError:
@@ -43,13 +43,13 @@ class DocumentStatistics(Statistic):
results = []
results.extend([
_(u'Document types: %d') % DocumentType.objects.count(),
_('Document types: %d') % DocumentType.objects.count(),
])
document_stats = DocumentVersion.objects.annotate(page_count=Count('pages')).aggregate(Min('page_count'), Max('page_count'), Avg('page_count'))
results.extend([
_(u'Minimum amount of pages per document: %d') % (document_stats['page_count__min'] or 0),
_(u'Maximum amount of pages per document: %d') % (document_stats['page_count__max'] or 0),
_(u'Average amount of pages per document: %f') % (document_stats['page_count__avg'] or 0),
_('Minimum amount of pages per document: %d') % (document_stats['page_count__min'] or 0),
_('Maximum amount of pages per document: %d') % (document_stats['page_count__max'] or 0),
_('Average amount of pages per document: %f') % (document_stats['page_count__avg'] or 0),
])
return results
@@ -62,14 +62,14 @@ class DocumentUsageStatistics(Statistic):
total_db_documents = Document.objects.only('pk',).count()
results.extend([
_(u'Documents in database: %d') % total_db_documents,
_('Documents in database: %d') % total_db_documents,
])
try:
total_storage_documents, storage_used_space = storage_count()
results.append(_(u'Documents in storage: %d') %
results.append(_('Documents in storage: %d') %
total_storage_documents)
results.append(_(u'Space used in storage: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d bytes') % {
results.append(_('Space used in storage: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d bytes') % {
'base_2': pretty_size(storage_used_space),
'base_10': pretty_size_10(storage_used_space),
'bytes': storage_used_space
@@ -78,7 +78,7 @@ class DocumentUsageStatistics(Statistic):
pass
results.extend([
_(u'Document pages in database: %d') % DocumentPage.objects.only('pk',).count(),
_('Document pages in database: %d') % DocumentPage.objects.only('pk',).count(),
])
return results