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

Merge branch 'versions/micro'

Browse Source
This commit is contained in:
Roberto Rosario
2019-11-30 23:16:14 -04:00
parent 8d55e7d6e9 124d46c9bb
commit 75d98221b4
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HISTORY.rst
+4
View File
@@ -1,3 +1,7 @@
3.2.12 (2019-XX-XX)
===================
- Fix off-by-one error in document statistics.
3.2.11 (2019-11-28) 3.2.11 (2019-11-28)
=================== ===================
- Backport transaction handling to document model events. - Backport transaction handling to document model events.
mayan/apps/documents/statistics.py
+10 -12
View File
@@ -20,6 +20,10 @@ MONTH_NAMES = [
] ]
def get_month_name(month_number):
return force_text(MONTH_NAMES[month_number - 1])
def new_documents_per_month(): def new_documents_per_month():
Document = apps.get_model(app_label='documents', model_name='Document') Document = apps.get_model(app_label='documents', model_name='Document')
@@ -31,7 +35,7 @@ def new_documents_per_month():
return { return {
'series': { 'series': {
'Documents': map( 'Documents': map(
lambda x: {force_text(MONTH_NAMES[x[0].month]): x[1]}, lambda x: {get_month_name(month_number=x[0].month): x[1]},
qss.time_series(start=start, end=now, interval='months') qss.time_series(start=start, end=now, interval='months')
) )
} }
@@ -53,7 +57,7 @@ def new_document_pages_per_month():
return { return {
'series': { 'series': {
'Pages': map( 'Pages': map(
lambda x: {force_text(MONTH_NAMES[x[0].month]): x[1]}, lambda x: {get_month_name(month_number=x[0].month): x[1]},
qss.time_series(start=start, end=now, interval='months') qss.time_series(start=start, end=now, interval='months')
) )
} }
@@ -93,7 +97,7 @@ def new_document_versions_per_month():
return { return {
'series': { 'series': {
'Versions': map( 'Versions': map(
lambda x: {force_text(MONTH_NAMES[x[0].month]): x[1]}, lambda x: {get_month_name(month_number=x[0].month): x[1]},
qss.time_series(start=start, end=now, interval='months') qss.time_series(start=start, end=now, interval='months')
) )
} }
@@ -142,9 +146,7 @@ def total_document_per_month():
result.append( result.append(
{ {
force_text( get_month_name(month_number=month): qss.until(
MONTH_NAMES[month]
): qss.until(
timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo) timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo)
) )
} }
@@ -181,9 +183,7 @@ def total_document_version_per_month():
result.append( result.append(
{ {
force_text( get_month_name(month_number=month): qss.until(
MONTH_NAMES[month]
): qss.until(
timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo) timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo)
) )
} }
@@ -220,9 +220,7 @@ def total_document_page_per_month():
result.append( result.append(
{ {
force_text( get_month_name(month_number=month): qss.until(
MONTH_NAMES[month]
): qss.until(
timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo) timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo)
) )
} }