From 124d46c9bbc1fb376a43385cdd61fec8901068f0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 30 Nov 2019 23:15:33 -0400 Subject: [PATCH 1/2] Fix off-by-one error in document statistics Signed-off-by: Roberto Rosario --- HISTORY.rst | 4 ++++ mayan/apps/documents/statistics.py | 22 ++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 891493492b..f3ae065dcd 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,3 +1,7 @@ +3.2.12 (2019-XX-XX) +=================== +- Fix off-by-one error in document statistics. + 3.2.11 (2019-11-28) =================== - Backport transaction handling to document model events. diff --git a/mayan/apps/documents/statistics.py b/mayan/apps/documents/statistics.py index 7bceb98f86..a97616f192 100644 --- a/mayan/apps/documents/statistics.py +++ b/mayan/apps/documents/statistics.py @@ -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(): Document = apps.get_model(app_label='documents', model_name='Document') @@ -31,7 +35,7 @@ def new_documents_per_month(): return { 'series': { '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') ) } @@ -53,7 +57,7 @@ def new_document_pages_per_month(): return { 'series': { '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') ) } @@ -93,7 +97,7 @@ def new_document_versions_per_month(): return { 'series': { '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') ) } @@ -142,9 +146,7 @@ def total_document_per_month(): result.append( { - force_text( - MONTH_NAMES[month] - ): qss.until( + get_month_name(month_number=month): qss.until( timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo) ) } @@ -181,9 +183,7 @@ def total_document_version_per_month(): result.append( { - force_text( - MONTH_NAMES[month] - ): qss.until( + get_month_name(month_number=month): qss.until( timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo) ) } @@ -220,9 +220,7 @@ def total_document_page_per_month(): result.append( { - force_text( - MONTH_NAMES[month] - ): qss.until( + get_month_name(month_number=month): qss.until( timezone.datetime(year, next_month, 1, tzinfo=now.tzinfo) ) } From 266551c9f3de3e8ac748f19e0dfd13e8f8695994 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 30 Nov 2019 23:17:28 -0400 Subject: [PATCH 2/2] Update changelog Signed-off-by: Roberto Rosario --- HISTORY.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index f3ae065dcd..49c533ec1d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,5 +1,7 @@ 3.2.12 (2019-XX-XX) =================== +- Add Mayan container port environment variable to the + docker installer. Thanks to Sergios Kefalas for the patch. - Fix off-by-one error in document statistics. 3.2.11 (2019-11-28)