diff --git a/.tx/config b/.tx/config index 31e58afa79..f2d91534ce 100644 --- a/.tx/config +++ b/.tx/config @@ -164,9 +164,9 @@ source_file = mayan/apps/sources/locale/en/LC_MESSAGES/django.po type = PO [mayan-edms.statistics-2-0] -file_filter = mayan/apps/statistics/locale//LC_MESSAGES/django.po +file_filter = mayan/apps/mayan_statistics/locale//LC_MESSAGES/django.po source_lang = en -source_file = mayan/apps/statistics/locale/en/LC_MESSAGES/django.po +source_file = mayan/apps/mayan_statistics/locale/en/LC_MESSAGES/django.po type = PO [mayan-edms.storage-2-0] diff --git a/contrib/scripts/process_messages.py b/contrib/scripts/process_messages.py index 1664b53fe1..313aae1e83 100755 --- a/contrib/scripts/process_messages.py +++ b/contrib/scripts/process_messages.py @@ -9,10 +9,10 @@ APP_LIST = ( 'acls', 'appearance', 'authentication', 'cabinets', 'checkouts', 'common', 'converter', 'django_gpg', 'document_comments', 'document_indexing', 'document_parsing', 'document_signatures', 'document_states', 'documents', - 'dynamic_search', 'events', 'linking', 'lock_manager', 'mailer', - 'metadata', 'mirroring', 'motd', 'navigation', 'ocr', 'permissions', - 'rest_api', 'smart_settings', 'sources', 'statistics', 'storage', 'tags', - 'task_manager', 'user_management' + 'dynamic_search', 'events', 'linking', 'lock_manager', 'mayan_statistics', + 'mailer', 'metadata', 'mirroring', 'motd', 'navigation', 'ocr', 'permissions', + 'rest_api', 'smart_settings', 'sources', 'storage', 'tags', 'task_manager', + 'user_management' ) LANGUAGE_LIST = ( diff --git a/mayan/apps/mayan_statistics/__init__.py b/mayan/apps/mayan_statistics/__init__.py new file mode 100644 index 0000000000..1bf03c670e --- /dev/null +++ b/mayan/apps/mayan_statistics/__init__.py @@ -0,0 +1,3 @@ +from __future__ import unicode_literals + +default_app_config = 'mayan_statistics.apps.StatisticsApp' diff --git a/mayan/apps/statistics/admin.py b/mayan/apps/mayan_statistics/admin.py similarity index 100% rename from mayan/apps/statistics/admin.py rename to mayan/apps/mayan_statistics/admin.py diff --git a/mayan/apps/statistics/apps.py b/mayan/apps/mayan_statistics/apps.py similarity index 93% rename from mayan/apps/statistics/apps.py rename to mayan/apps/mayan_statistics/apps.py index 103a190ed1..f1284a1ba6 100644 --- a/mayan/apps/statistics/apps.py +++ b/mayan/apps/mayan_statistics/apps.py @@ -20,8 +20,9 @@ from .tasks import task_execute_statistic # NOQA - Force registration of task class StatisticsApp(MayanAppConfig): + app_namespace = 'statistics' has_tests = True - name = 'statistics' + name = 'mayan_statistics' verbose_name = _('Statistics') def ready(self): @@ -46,7 +47,7 @@ class StatisticsApp(MayanAppConfig): app.conf.CELERY_ROUTES.update( { - 'statistics.tasks.task_execute_statistic': { + 'mayan_statistics.tasks.task_execute_statistic': { 'queue': 'statistics' }, } diff --git a/mayan/apps/statistics/classes.py b/mayan/apps/mayan_statistics/classes.py similarity index 93% rename from mayan/apps/statistics/classes.py rename to mayan/apps/mayan_statistics/classes.py index 6c66e231b4..4432a6634d 100644 --- a/mayan/apps/statistics/classes.py +++ b/mayan/apps/mayan_statistics/classes.py @@ -51,10 +51,12 @@ class Statistic(object): app_label='djcelery', model_name='PeriodicTask' ) StatisticResult = apps.get_model( - app_label='statistics', model_name='StatisticResult' + app_label='mayan_statistics', model_name='StatisticResult' ) - queryset = PeriodicTask.objects.filter(name__startswith='statistics.').exclude(name__in=Statistic.get_task_names()) + queryset = PeriodicTask.objects.filter( + name__startswith='mayan_statistics.' + ).exclude(name__in=Statistic.get_task_names()) for periodic_task in queryset: crontab_instance = periodic_task.crontab @@ -94,7 +96,7 @@ class Statistic(object): app.conf.CELERYBEAT_SCHEDULE.update( { self.get_task_name(): { - 'task': 'statistics.tasks.task_execute_statistic', + 'task': 'mayan_statistics.tasks.task_execute_statistic', 'schedule': self.schedule, 'args': (self.slug,) }, @@ -118,7 +120,7 @@ class Statistic(object): self.store_results(results=self.func()) def get_task_name(self): - return 'statistics.task_execute_statistic_{}'.format(self.slug) + return 'mayan_statistics.task_execute_statistic_{}'.format(self.slug) def store_results(self, results): from .models import StatisticResult diff --git a/mayan/apps/statistics/licenses.py b/mayan/apps/mayan_statistics/licenses.py similarity index 100% rename from mayan/apps/statistics/licenses.py rename to mayan/apps/mayan_statistics/licenses.py diff --git a/mayan/apps/statistics/links.py b/mayan/apps/mayan_statistics/links.py similarity index 100% rename from mayan/apps/statistics/links.py rename to mayan/apps/mayan_statistics/links.py diff --git a/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/ar/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/ar/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/ar/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/ar/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/ar/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/bg/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/bg/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/bg/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/bg/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/bg/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/bs_BA/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/bs_BA/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/bs_BA/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/bs_BA/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/bs_BA/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/da/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/da/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/da/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/da/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/da/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/da/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/da/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/da/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/de_DE/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/de_DE/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/de_DE/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/de_DE/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/de_DE/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/en/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/en/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/en/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/en/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/en/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/en/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/en/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/es/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/es/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/es/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/es/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/es/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/es/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/es/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/fa/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/fa/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/fa/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/fa/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/fa/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/fr/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/fr/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/fr/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/fr/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/fr/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/hu/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/hu/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/hu/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/hu/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/hu/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/id/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/id/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/id/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/id/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/id/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/id/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/id/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/id/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/it/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/it/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/it/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/it/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/it/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/it/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/it/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/nl_NL/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/nl_NL/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/pl/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/pl/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/pl/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/pl/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/pl/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/pt/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/pt/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/pt/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/pt/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/pt/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/pt/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/pt/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/pt_BR/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/pt_BR/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/ro_RO/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/ro_RO/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/ro_RO/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/ro_RO/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/ro_RO/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/ru/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/ru/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/ru/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/ru/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/ru/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/sl_SI/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/sl_SI/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/sl_SI/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/sl_SI/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/sl_SI/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/tr_TR/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/tr_TR/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/tr_TR/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/tr_TR/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/tr_TR/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/tr_TR/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/tr_TR/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/tr_TR/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/vi_VN/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/vi_VN/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/vi_VN/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/vi_VN/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/vi_VN/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.mo b/mayan/apps/mayan_statistics/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.mo rename to mayan/apps/mayan_statistics/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.po b/mayan/apps/mayan_statistics/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from mayan/apps/statistics/locale/zh_CN/LC_MESSAGES/django.po rename to mayan/apps/mayan_statistics/locale/zh_CN/LC_MESSAGES/django.po diff --git a/mayan/apps/statistics/management/__init__.py b/mayan/apps/mayan_statistics/management/__init__.py similarity index 100% rename from mayan/apps/statistics/management/__init__.py rename to mayan/apps/mayan_statistics/management/__init__.py diff --git a/mayan/apps/statistics/management/commands/__init__.py b/mayan/apps/mayan_statistics/management/commands/__init__.py similarity index 100% rename from mayan/apps/statistics/management/commands/__init__.py rename to mayan/apps/mayan_statistics/management/commands/__init__.py diff --git a/mayan/apps/statistics/management/commands/purgestatistics.py b/mayan/apps/mayan_statistics/management/commands/purgestatistics.py similarity index 100% rename from mayan/apps/statistics/management/commands/purgestatistics.py rename to mayan/apps/mayan_statistics/management/commands/purgestatistics.py diff --git a/mayan/apps/statistics/migrations/0001_initial.py b/mayan/apps/mayan_statistics/migrations/0001_initial.py similarity index 100% rename from mayan/apps/statistics/migrations/0001_initial.py rename to mayan/apps/mayan_statistics/migrations/0001_initial.py diff --git a/mayan/apps/statistics/migrations/__init__.py b/mayan/apps/mayan_statistics/migrations/__init__.py similarity index 100% rename from mayan/apps/statistics/migrations/__init__.py rename to mayan/apps/mayan_statistics/migrations/__init__.py diff --git a/mayan/apps/statistics/models.py b/mayan/apps/mayan_statistics/models.py similarity index 100% rename from mayan/apps/statistics/models.py rename to mayan/apps/mayan_statistics/models.py diff --git a/mayan/apps/statistics/permissions.py b/mayan/apps/mayan_statistics/permissions.py similarity index 100% rename from mayan/apps/statistics/permissions.py rename to mayan/apps/mayan_statistics/permissions.py diff --git a/mayan/apps/statistics/queues.py b/mayan/apps/mayan_statistics/queues.py similarity index 84% rename from mayan/apps/statistics/queues.py rename to mayan/apps/mayan_statistics/queues.py index 962c81af17..0bc0267473 100644 --- a/mayan/apps/statistics/queues.py +++ b/mayan/apps/mayan_statistics/queues.py @@ -9,6 +9,6 @@ queue_statistics = CeleryQueue( ) queue_statistics.add_task_type( - name='statistics.tasks.task_execute_statistic', + name='mayan_statistics.tasks.task_execute_statistic', label=_('Execute statistic') ) diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/.gitignore b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/.gitignore similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/.gitignore rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/.gitignore diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/.travis.yml b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/.travis.yml similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/.travis.yml rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/.travis.yml diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/CONTRIBUTING.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/CONTRIBUTING.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/CONTRIBUTING.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/CONTRIBUTING.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/Chart.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/Chart.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/Chart.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/Chart.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/Chart.min.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/Chart.min.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/Chart.min.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/Chart.min.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/LICENSE.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/LICENSE.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/LICENSE.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/LICENSE.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/README.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/README.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/README.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/README.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/bower.json b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/bower.json similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/bower.json rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/bower.json diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/00-Getting-Started.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/00-Getting-Started.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/00-Getting-Started.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/00-Getting-Started.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/01-Line-Chart.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/01-Line-Chart.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/01-Line-Chart.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/01-Line-Chart.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/02-Bar-Chart.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/02-Bar-Chart.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/02-Bar-Chart.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/02-Bar-Chart.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/03-Radar-Chart.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/03-Radar-Chart.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/03-Radar-Chart.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/03-Radar-Chart.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/04-Polar-Area-Chart.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/04-Polar-Area-Chart.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/04-Polar-Area-Chart.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/04-Polar-Area-Chart.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/05-Pie-Doughnut-Chart.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/05-Pie-Doughnut-Chart.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/05-Pie-Doughnut-Chart.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/05-Pie-Doughnut-Chart.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/06-Advanced.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/06-Advanced.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/06-Advanced.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/06-Advanced.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/07-Notes.md b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/07-Notes.md similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/docs/07-Notes.md rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/docs/07-Notes.md diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/gulpfile.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/gulpfile.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/gulpfile.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/gulpfile.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/package.json b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/package.json similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/package.json rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/package.json diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/bar.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/bar.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/bar.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/bar.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/doughnut.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/doughnut.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/doughnut.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/doughnut.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/line-customTooltips.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/line-customTooltips.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/line-customTooltips.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/line-customTooltips.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/line.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/line.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/line.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/line.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie-customTooltips.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie-customTooltips.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie-customTooltips.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie-customTooltips.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/pie.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/polar-area.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/polar-area.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/polar-area.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/polar-area.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/radar.html b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/radar.html similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/samples/radar.html rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/samples/radar.html diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Bar.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Bar.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Bar.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Bar.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Core.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Core.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Core.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Core.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Doughnut.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Doughnut.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Doughnut.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Doughnut.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Line.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Line.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Line.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Line.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.PolarArea.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.PolarArea.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.PolarArea.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.PolarArea.js diff --git a/mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Radar.js b/mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Radar.js similarity index 100% rename from mayan/apps/statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Radar.js rename to mayan/apps/mayan_statistics/static/statistics/packages/Chart.js-1.0.2/src/Chart.Radar.js diff --git a/mayan/apps/statistics/tasks.py b/mayan/apps/mayan_statistics/tasks.py similarity index 100% rename from mayan/apps/statistics/tasks.py rename to mayan/apps/mayan_statistics/tasks.py diff --git a/mayan/apps/statistics/templates/statistics/backends/chartjs/line.html b/mayan/apps/mayan_statistics/templates/statistics/backends/chartjs/line.html similarity index 100% rename from mayan/apps/statistics/templates/statistics/backends/chartjs/line.html rename to mayan/apps/mayan_statistics/templates/statistics/backends/chartjs/line.html diff --git a/mayan/apps/statistics/tests/__init__.py b/mayan/apps/mayan_statistics/tests/__init__.py similarity index 100% rename from mayan/apps/statistics/tests/__init__.py rename to mayan/apps/mayan_statistics/tests/__init__.py diff --git a/mayan/apps/statistics/tests/test_views.py b/mayan/apps/mayan_statistics/tests/test_views.py similarity index 100% rename from mayan/apps/statistics/tests/test_views.py rename to mayan/apps/mayan_statistics/tests/test_views.py diff --git a/mayan/apps/statistics/urls.py b/mayan/apps/mayan_statistics/urls.py similarity index 100% rename from mayan/apps/statistics/urls.py rename to mayan/apps/mayan_statistics/urls.py diff --git a/mayan/apps/statistics/views.py b/mayan/apps/mayan_statistics/views.py similarity index 100% rename from mayan/apps/statistics/views.py rename to mayan/apps/mayan_statistics/views.py diff --git a/mayan/apps/statistics/__init__.py b/mayan/apps/statistics/__init__.py deleted file mode 100644 index 78d68f10fd..0000000000 --- a/mayan/apps/statistics/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from __future__ import unicode_literals - -default_app_config = 'statistics.apps.StatisticsApp' diff --git a/mayan/settings/base.py b/mayan/settings/base.py index a2ef68b050..d6286abeb3 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -94,13 +94,13 @@ INSTALLED_APPS = ( # 'folders', 'linking', 'mailer', + 'mayan_statistics', 'metadata', 'mirroring', 'motd', 'ocr', 'rest_api', 'sources', - 'statistics', 'storage', 'tags', 'task_manager',