educommon 3.12.0__py3-none-any.whl → 3.13.2__py3-none-any.whl

educommon/report/constructor/editor/actions.py

@@ -106,23 +106,15 @@ class ColumnsAction(BaseAction):
         if context.parent_column_name == '-1':
             context.parent_column_name = None
 
-        data_source = registry.get(
-            context.data_source_name
-        ).get_data_source_descriptor()
+        data_source = registry.get(context.data_source_name).get_data_source_descriptor()
 
         if context.parent_column_name:
-            parent_column = ColumnDescriptor.create(
-                data_source.model, context.parent_column_name, data_source
-            )
+            parent_column = ColumnDescriptor.create(data_source.model, context.parent_column_name, data_source)
             columns = parent_column.get_nested_columns()
         else:
-            columns = tuple(
-                data_source.get_available_columns()
-            )
+            columns = tuple(data_source.get_available_columns())
 
-        return PreJsonResult(tuple(
-            map(ColumnsAction._get_column_params, columns)
-        ))
+        return PreJsonResult(tuple(map(ColumnsAction._get_column_params, columns)))
 
 
 _BUILDERS_PACKAGE = 'educommon.report.constructor.builders'
@@ -132,10 +124,8 @@ class BuildAction(BaseAction):
     """Сборка отчета на основе указанного шаблона."""
 
     _builders = {
-        ReportTemplate.EXCEL_SIMPLE:
-            _BUILDERS_PACKAGE + '.excel.product.ReportBuilder',
-        ReportTemplate.EXCEL_MERGED:
-            _BUILDERS_PACKAGE + '.excel.with_merged_cells.ReportBuilder',
+        ReportTemplate.EXCEL_SIMPLE: f'{_BUILDERS_PACKAGE}.excel.product.ReportBuilder',
+        ReportTemplate.EXCEL_MERGED: f'{_BUILDERS_PACKAGE}.excel.with_merged_cells.ReportBuilder',
     }
 
     def context_declaration(self):
@@ -147,9 +137,7 @@ class BuildAction(BaseAction):
     def _get_report_template(self, request, context):
         # Загрузка шаблона
         try:
-            return ReportTemplate.objects.get(
-                pk=get_id_value(context, self.parent)
-            )
+            return ReportTemplate.objects.get(pk=get_id_value(context, self.parent))
         except ReportTemplate.DoesNotExist:
             raise ApplicationLogicException(self.parent.MSG_DOESNOTEXISTS)
 
@@ -158,41 +146,29 @@ class BuildAction(BaseAction):
         # шаблоне.
         if report_template.data_source_name not in registry:
             raise ApplicationLogicException(
-                'Источник данных {} не существует.'
-                .format(report_template.data_source_name)
+                'Источник данных {} не существует.'.format(report_template.data_source_name)
             )
 
-        data_source = registry.get(
-            report_template.data_source_name
-        ).get_data_source_descriptor()
+        data_source = registry.get(report_template.data_source_name).get_data_source_descriptor()
 
         if ReportInfo(report_template).ignored_columns_ids:
-            raise ApplicationLogicException(
-                'Некоторые колонки шаблона неактуальны, '
-                'требуется редактирование'
-            )
+            raise ApplicationLogicException('Некоторые колонки шаблона неактуальны, требуется редактирование')
 
         # Проверка доступности данных для всех столбцов шаблона отчета.
         try:
-            for col_name in report_template.columns.values_list(
-                    'name', flat=True):
+            for col_name in report_template.columns.values_list('name', flat=True):
                 if data_source.is_column_ignored(col_name):
                     continue
                 data_source.get_column_descriptor(col_name)
         except FieldDoesNotExist as error:
-            raise ApplicationLogicException(
-                'Колонка {} недоступна'.format(str(error))
-            )
+            raise ApplicationLogicException('Колонка {} недоступна'.format(str(error)))
 
     def _check_params(self, request, context, report_template):
         """Возвращает True, если параметры сборки указаны верно."""
         if context.format is None:
             return report_template.format in self._builders
 
-        if (
-            report_template.format == ReportTemplate.USER_DEFINED and
-            context.format in self._builders
-        ):
+        if report_template.format == ReportTemplate.USER_DEFINED and context.format in self._builders:
             return True
 
         return False
@@ -206,15 +182,19 @@ class BuildAction(BaseAction):
             data=ReportTemplate.FORMAT_CHOICES[1:],
         )
 
-        win.form.items.extend(anchor100(
-            win.field__format,
-        ))
+        win.form.items.extend(
+            anchor100(
+                win.field__format,
+            )
+        )
 
-        win.set_params(dict(
-            form_url=self.get_absolute_url(),
-            height=100,
-            title='Параметры сборки',
-        ))
+        win.set_params(
+            dict(
+                form_url=self.get_absolute_url(),
+                height=100,
+                title='Параметры сборки',
+            )
+        )
 
         return ExtUIScriptResult(win, context)
 
@@ -231,13 +211,12 @@ class BuildAction(BaseAction):
             'object_id': user.id,
             'content_type': content_type,
             'report_template_id': report_template_id,
-            'format': context.format or None
+            'format': context.format or None,
         }
         report_constructor_config.async_task.apply_async(None, params)
 
         return OperationResult(
-            message='Внимание! Задача поставлена в очередь! Результаты '
-                    'будут доступны в реестре Асинхронных задач.'
+            message='Внимание! Задача поставлена в очередь! Результаты будут доступны в реестре Асинхронных задач.'
         )
 
     def run(self, request, context):
@@ -262,9 +241,7 @@ class ReportInfo:
         :type report_template:
             educommon.report.constructor.models.ReportTemplate
         """
-        assert isinstance(report_template, ReportTemplate), type(
-            report_template
-        )
+        assert isinstance(report_template, ReportTemplate), type(report_template)
 
         self.report_template = report_template
 
@@ -274,9 +251,7 @@ class ReportInfo:
 
         :rtype: educommon.report.constructor.base.ModelDataSourceDescriptor
         """
-        data_source = registry.get(
-            self.report_template.data_source_name
-        ).get_data_source_descriptor()
+        data_source = registry.get(self.report_template.data_source_name).get_data_source_descriptor()
         return data_source
 
     @cached_property
@@ -288,10 +263,8 @@ class ReportInfo:
         :rtype: set
         """
         ignored_columns = set()
-        for col_id, col_name in self.report_template.columns.values_list(
-                'id', 'name'):
-            if (self._data_source.is_column_ignored(col_name) or
-                    not self._data_source.is_column_exist(col_name)):
+        for col_id, col_name in self.report_template.columns.values_list('id', 'name'):
+            if self._data_source.is_column_ignored(col_name) or not self._data_source.is_column_exist(col_name):
                 ignored_columns.add(col_id)
 
         return ignored_columns
@@ -304,10 +277,7 @@ class ReportInfo:
         """
         columns = self.report_template.columns.order_by('index')
 
-        return OrderedDict(
-            (report_column.id, report_column)
-            for report_column in columns
-        )
+        return OrderedDict((report_column.id, report_column) for report_column in columns)
 
     @cached_property
     def _report_columns_by_name(self):
@@ -315,10 +285,7 @@ class ReportInfo:
 
         :rtype: collections.OrderedDict
         """
-        return OrderedDict(
-            (report_column.name, report_column)
-            for report_column in self._report_columns_by_id.values()
-        )
+        return OrderedDict((report_column.name, report_column) for report_column in self._report_columns_by_id.values())
 
     @cached_property
     def _field_descriptors(self):
@@ -353,9 +320,7 @@ class ReportInfo:
 
         for descriptor in self._field_descriptors.values():
             if not descriptor.is_root():
-                hierarchy[descriptor.parent.full_accessor_name].append(
-                    descriptor
-                )
+                hierarchy[descriptor.parent.full_accessor_name].append(descriptor)
 
         return hierarchy
 
@@ -370,20 +335,13 @@ class ReportInfo:
             full_name=full_accessor_name,
             title=descriptor.title,
             leaf=not descriptor.has_nested_columns(),
-            nested=tuple(
-                self._get_descriptor_data(descriptor)
-                for descriptor in nested_descriptors
-            ),
+            nested=tuple(self._get_descriptor_data(descriptor) for descriptor in nested_descriptors),
         )
         column = self._report_columns_by_name.get(full_accessor_name, None)
         column_id = getattr(column, 'id', 0)
-        result['is_fake'] = (
-            not column_id or column_id in self.ignored_columns_ids
-        )
+        result['is_fake'] = not column_id or column_id in self.ignored_columns_ids
         if full_accessor_name in self._report_columns_by_name:
-            result['visible'] = (
-                self._report_columns_by_name[full_accessor_name].visible
-            )
+            result['visible'] = self._report_columns_by_name[full_accessor_name].visible
             result['visible_title'] = 'Да' if result['visible'] else 'Нет'
 
             # "Количество"
@@ -429,16 +387,11 @@ class ReportInfo:
         """
         tree_manager = getattr(ReportFilterGroup, '_tree_manager')
         filter_groups_query = tree_manager.get_queryset_descendants(
-            self.report_template.filter_groups.exclude(
-                filters__column_id__in=self.ignored_columns_ids
-            ),
-            include_self=True
+            self.report_template.filter_groups.exclude(filters__column_id__in=self.ignored_columns_ids),
+            include_self=True,
         ).prefetch_related('filters')
 
-        return OrderedDict(
-            (filter_group.pk, filter_group)
-            for filter_group in filter_groups_query
-        )
+        return OrderedDict((filter_group.pk, filter_group) for filter_group in filter_groups_query)
 
     def _get_filter_data(self, report_filter):
         """Возвращает параметры фильтра.
@@ -448,13 +401,13 @@ class ReportInfo:
         column = self._report_columns_by_id[report_filter.column_id]
 
         return dict(
-           column=column.name,
-           index=report_filter.index,
-           operator=report_filter.operator,
-           exclude=report_filter.exclude,
-           case_sensitive=report_filter.case_sensitive,
-           values=report_filter.values or [],
-           comment=report_filter.comment,
+            column=column.name,
+            index=report_filter.index,
+            operator=report_filter.operator,
+            exclude=report_filter.exclude,
+            case_sensitive=report_filter.case_sensitive,
+            values=report_filter.values or [],
+            comment=report_filter.comment,
         )
 
     def _get_filter_group_data(self, filter_group):
@@ -463,18 +416,12 @@ class ReportInfo:
         :rtype: dict
         """
         nested_groups = (
-            nested_group
-            for nested_group in self._filter_groups.values()
-            if nested_group.parent_id == filter_group.pk
+            nested_group for nested_group in self._filter_groups.values() if nested_group.parent_id == filter_group.pk
         )
 
         return {
             self._OPERATOR_MAP[filter_group.operator]: tuple(
-                (
-                    self._get_filter_group_data(obj)
-                    if isinstance(obj, ReportFilterGroup) else
-                    self._get_filter_data(obj)
-                )
+                (self._get_filter_group_data(obj) if isinstance(obj, ReportFilterGroup) else self._get_filter_data(obj))
                 for obj in chain(nested_groups, filter_group.filters.all())
             )
         }
@@ -546,11 +493,9 @@ class ReportInfo:
         :rtype: tuple
         """
         result = tuple(
-            ReportSorting.objects.filter(
-                column__report_template=self.report_template
-            ).exclude(
-                column_id__in=self.ignored_columns_ids
-            ).order_by('index')
+            ReportSorting.objects.filter(column__report_template=self.report_template)
+            .exclude(column_id__in=self.ignored_columns_ids)
+            .order_by('index')
         )
 
         for sorting_params in result:
@@ -571,17 +516,13 @@ class ReportInfo:
 
     def get_sorting_data(self):
         """Возвращает параметры сортировки."""
-        return tuple(
-            self._get_sorting_data(sorting_params)
-            for sorting_params in self._sorting_params_by_column_name
-        )
+        return tuple(self._get_sorting_data(sorting_params) for sorting_params in self._sorting_params_by_column_name)
 
 
 class ReportTemplateWriter:
     """Класс, сохраняющий в БД данные шаблона отчета."""
 
-    def __init__(self, report_template, columns_data, filters_data,
-                 sorting_data):
+    def __init__(self, report_template, columns_data, filters_data, sorting_data):
         """Инициализация экземпляра класса.
 
         :param report_template: Шаблон отчета
@@ -619,10 +560,7 @@ class ReportTemplateWriter:
         :rtype: bool
         """
         if report_template.data_source_name not in registry:
-            self.errors.append(
-                'Источник данных "{}" не существует.'
-                .format(report_template.data_source_name)
-            )
+            self.errors.append('Источник данных "{}" не существует.'.format(report_template.data_source_name))
 
         return not self.errors
 
@@ -639,9 +577,7 @@ class ReportTemplateWriter:
         # ---------------------------------------------------------------------
         # Проверка наличия в источнике данных указанных столбцов.
 
-        data_source = registry.get(
-            self._report_template.data_source_name
-        ).get_data_source_descriptor()
+        data_source = registry.get(self._report_template.data_source_name).get_data_source_descriptor()
 
         for column_params in columns_data:
             if 'accessor_name' not in column_params:
@@ -650,29 +586,18 @@ class ReportTemplateWriter:
 
             full_accessor_name = column_params['accessor_name']
             if full_accessor_name in self._column_descriptors:
-                self.errors.append(
-                    'Колонка {} указана более одного раза.'
-                    .format(full_accessor_name)
-                )
+                self.errors.append('Колонка {} указана более одного раза.'.format(full_accessor_name))
             else:
                 try:
-                    column_descriptor = data_source.get_column_descriptor(
-                        full_accessor_name
-                    )
+                    column_descriptor = data_source.get_column_descriptor(full_accessor_name)
                 except FieldDoesNotExist:
                     self.errors.append(
-                        'Колонки "{}" нет в источнике данных "{}".'
-                        .format(full_accessor_name, data_source.title)
+                        'Колонки "{}" нет в источнике данных "{}".'.format(full_accessor_name, data_source.title)
                     )
                 else:
-                    self._column_descriptors[full_accessor_name] = (
-                        column_descriptor
-                    )
+                    self._column_descriptors[full_accessor_name] = column_descriptor
 
-        if not any(
-            column_params.get('visible', False)
-            for column_params in columns_data
-        ):
+        if not any(column_params.get('visible', False) for column_params in columns_data):
             self.errors.append('В отчете нет ни одного видимого столбца.')
         # ---------------------------------------------------------------------
 
@@ -695,12 +620,8 @@ class ReportTemplateWriter:
                     return False
 
                 # Проверка вложенной группы фильтров.
-                if (
-                    'AND' in filter_params and
-                    not self._is_filters_data_valid(filter_params['AND'])
-                ) or (
-                    'OR' in filter_params and
-                    not self._is_filters_data_valid(filter_params['OR'])
+                if ('AND' in filter_params and not self._is_filters_data_valid(filter_params['AND'])) or (
+                    'OR' in filter_params and not self._is_filters_data_valid(filter_params['OR'])
                 ):
                     return False
 
@@ -711,12 +632,9 @@ class ReportTemplateWriter:
                     'values',
                 )
                 if (
-                    'AND' not in filter_params and
-                    'OR' not in filter_params and
-                    any(
-                        param_name not in filter_params
-                        for param_name in param_names
-                    )
+                    'AND' not in filter_params
+                    and 'OR' not in filter_params
+                    and any(param_name not in filter_params for param_name in param_names)
                 ):
                     return False
 
@@ -736,10 +654,7 @@ class ReportTemplateWriter:
                 'column',
                 'direction',
             )
-            if any(
-                param_name not in sorting_params
-                for param_name in param_names
-            ):
+            if any(param_name not in sorting_params for param_name in param_names):
                 return False
 
         return True
@@ -751,21 +666,13 @@ class ReportTemplateWriter:
             найдены ошибки.
         """
         if not self._is_report_template_valid(self._report_template):
-            raise ValidationError(
-                'Параметры шаблона указаны некорректно.'
-            )
+            raise ValidationError('Параметры шаблона указаны некорректно.')
         if not self._is_columns_data_valid(self._columns_data):
-            raise ValidationError(
-                'Параметры столбцов указаны некорректно.'
-            )
+            raise ValidationError('Параметры столбцов указаны некорректно.')
         if not self._is_filters_data_valid(self._filters_data):
-            raise ValidationError(
-                'Параметры фильтров указаны некорректно.'
-            )
+            raise ValidationError('Параметры фильтров указаны некорректно.')
         if not self._is_sorting_data_valid(self._sorting_data):
-            raise ValidationError(
-                'Параметры сортировки указаны некорректно.'
-            )
+            raise ValidationError('Параметры сортировки указаны некорректно.')
 
     def _write_template(self):
         """Сохранение в БД шаблона отчета."""
@@ -774,20 +681,13 @@ class ReportTemplateWriter:
     def _write_columns(self):
         """Сохранение в БД столбцов."""
         column_descriptor_names = set(
-            column_descriptor.full_accessor_name
-            for column_descriptor in self._column_descriptors.values()
+            column_descriptor.full_accessor_name for column_descriptor in self._column_descriptors.values()
         )
 
         columns_query = self._report_template.columns.order_by('index')
-        report_columns = OrderedDict(
-            (report_column.name, report_column)
-            for report_column in columns_query
-        )
+        report_columns = OrderedDict((report_column.name, report_column) for report_column in columns_query)
 
-        columns_data = {
-            column_data['accessor_name']: column_data
-            for column_data in self._columns_data
-        }
+        columns_data = {column_data['accessor_name']: column_data for column_data in self._columns_data}
         # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         # Сначала нужно удалить столбцы, которых нет в запросе.
 
@@ -797,12 +697,8 @@ class ReportTemplateWriter:
         # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
         created_report_columns = []
-        for index, column_descriptor in enumerate(
-            self._column_descriptors.values(), 1
-        ):
-            report_column = report_columns.get(
-                column_descriptor.full_accessor_name
-            )
+        for index, column_descriptor in enumerate(self._column_descriptors.values(), 1):
+            report_column = report_columns.get(column_descriptor.full_accessor_name)
 
             column_data = columns_data[column_descriptor.full_accessor_name]
             visible = column_data.get('visible', False)
@@ -818,17 +714,17 @@ class ReportTemplateWriter:
                         title=column_descriptor.title,
                         visible=visible,
                         by_value=by_value,
-                        total=total
+                        total=total,
                     )
                 )
 
             elif (
-                report_column.name != column_descriptor.full_accessor_name or
-                report_column.index != index or
-                report_column.title != column_descriptor.title or
-                report_column.visible != visible or
-                report_column.by_value != by_value or
-                report_column.total != total
+                report_column.name != column_descriptor.full_accessor_name
+                or report_column.index != index
+                or report_column.title != column_descriptor.title
+                or report_column.visible != visible
+                or report_column.by_value != by_value
+                or report_column.total != total
             ):
                 report_column.name = column_descriptor.full_accessor_name
                 report_column.index = index
@@ -841,8 +737,7 @@ class ReportTemplateWriter:
         # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         # Сохранение столбцов для дальнейшего использования.
 
-        for report_column in chain(report_columns.values(),
-                                   created_report_columns):
+        for report_column in chain(report_columns.values(), created_report_columns):
             self._report_columns[report_column.name] = report_column
         # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -963,26 +858,26 @@ class Pack(PackValidationMixin, ObjectPack):
     add_window = edit_window = EditWindow
 
     def __init__(self):
-        super(Pack, self).__init__()
-        # ---------------------------------------------------------------------
+        super().__init__()
+
         self.columns_action = ColumnsAction()
         self.build_action = BuildAction()
 
-        self.actions.extend((
-            self.columns_action,
-            self.build_action,
-        ))
-        # ---------------------------------------------------------------------
+        self.actions.extend(
+            (
+                self.columns_action,
+                self.build_action,
+            )
+        )
 
     def prepare_row(self, obj, request, context):
-        obj = super(Pack, self).prepare_row(
-            obj, request, context
-        )
+        obj = super().prepare_row(obj, request, context)
+
         obj.valid = not (ReportInfo(obj).ignored_columns_ids)
         return obj
 
     def declare_context(self, action):
-        result = super(Pack, self).declare_context(action)
+        result = super().declare_context(action)
 
         if action is self.save_action:
             result.update(
@@ -996,24 +891,18 @@ class Pack(PackValidationMixin, ObjectPack):
         return result
 
     def get_list_window_params(self, params, request, context):
-        result = super(Pack, self).get_list_window_params(
-            params, request, context
-        )
+        result = super().get_list_window_params(params, request, context)
 
         result['build_action_url'] = self.build_action.get_absolute_url()
 
         return result
 
     def get_edit_window_params(self, params, request, context):
-        result = super(Pack, self).get_edit_window_params(
-            params, request, context
-        )
+        result = super().get_edit_window_params(params, request, context)
 
         result['maximized'] = True
 
-        result['available_columns_action_url'] = (
-            self.columns_action.get_absolute_url()
-        )
+        result['available_columns_action_url'] = self.columns_action.get_absolute_url()
 
         # pylint: disable=dict-iter-method
         result['data_sources_params'] = registry.iteritems()
@@ -1044,10 +933,7 @@ class Pack(PackValidationMixin, ObjectPack):
         try:
             writer.validate()
         except ValidationError as error:
-            raise ValidationError('\n'.join((
-                str(error),
-                '\n'.join(writer.errors)
-            )))
+            raise ValidationError('\n'.join((str(error), '\n'.join(writer.errors))))
 
         writer.write()
 
@@ -1073,7 +959,7 @@ class Pack(PackValidationMixin, ObjectPack):
         ).iterator():
             report_column.safe_delete()
 
-        super(Pack, self).delete_row(obj_id, request, context)
+        super().delete_row(obj_id, request, context)
 
     def extend_menu(self, menu):
         return menu.SubMenu(
@@ -1081,5 +967,5 @@ class Pack(PackValidationMixin, ObjectPack):
             menu.SubMenu(
                 'Конструктор отчетов',
                 menu.Item('Редактор шаблонов', self.list_window_action),
-            )
+            ),
         )