edu-rdm-integration 3.2.2__py3-none-any.whl → 3.2.7__py3-none-any.whl

edu_rdm_integration/collect_data/collect.py

@@ -300,6 +300,13 @@ class BaseCollectLatestModelsData(BaseCollectModelsData):
     Сбор данных моделей РВД на основе логов за период с последней сборки до указанной даты.
     """
 
+    def __init__(self, *args,  use_times_limit: bool = False, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Если этот параметр не указан - то высчитываем временные рамки по менеджеру, не учитывая переданные
+        # logs_period_started_at и  logs_period_ended_at
+        self.use_times_limit = use_times_limit
+
     def _has_stage_created_or_in_progress(self, manager_id: str, model: str) -> bool:
         """Проверяет есть ли готовый к работе stage или в работе для данной модели."""
         stage_created_or_in_progress = CollectingExportedDataStage.objects.filter(
@@ -318,22 +325,17 @@ class BaseCollectLatestModelsData(BaseCollectModelsData):
         """
         logger.info('collect models data..')
 
-        managers_max_period_ended_dates = get_collecting_managers_max_period_ended_dates(
+        managers_last_period_ended_at = get_collecting_managers_max_period_ended_dates(
             self._collecting_data_managers.values()
         )
 
         for model_key, manager_class in self._collecting_data_managers.items():
             model_logs = logs.get(model_key) if logs else None
-            manager_max_dates = managers_max_period_ended_dates.get(manager_class.uuid, {})
-
-            kwargs['logs_period_started_at'] = (
-                manager_max_dates.get('max_period_ended_at')
-                or get_today_min_datetime()
-            )
-            kwargs['logs_period_ended_at'] = timezone.now()
+            manager_last_period_ended_at = managers_last_period_ended_at.get(manager_class.uuid)
 
-            if kwargs['logs_period_started_at'] > kwargs['logs_period_ended_at']:
-                kwargs['logs_period_started_at'] = manager_max_dates['max_started_at']
+            kwargs['logs_period_started_at'] = self.logs_period_started_at if self.use_times_limit else (
+                    manager_last_period_ended_at or get_today_min_datetime())
+            kwargs['logs_period_ended_at'] = self.logs_period_ended_at if self.use_times_limit else timezone.now()
 
             manager = manager_class(*args, logs=model_logs, **kwargs)
 

edu_rdm_integration/export_data/export.py

@@ -367,19 +367,16 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
         # Массив с выгружаемыми сущностями для поля "Описание" в асинхронной задаче
         exported_entities = []
 
-        managers_max_period_ended_dates = get_exporting_managers_max_period_ended_dates(
+        managers_max_period_ended = get_exporting_managers_max_period_ended_dates(
             self._exporting_data_managers
         )
 
         for manager_class in self._exporting_data_managers:
-            manager_max_dates = managers_max_period_ended_dates.get(manager_class.uuid, {})
+            manager_last_exported = managers_max_period_ended.get(manager_class.uuid)
 
-            kwargs['period_started_at'] = manager_max_dates.get('max_period_ended_at') or timezone.now()
+            kwargs['period_started_at'] = manager_last_exported or timezone.now()
             kwargs['period_ended_at'] = get_today_max_datetime()
 
-            if kwargs['period_started_at'] > kwargs['period_ended_at']:
-                kwargs['period_started_at'] = manager_max_dates['max_started_at']
-
             # Обновить поля modified у модели сущности:
             self._update_model_modified_field(
                 manager_id=manager_class.uuid,

edu_rdm_integration/helpers.py

@@ -25,11 +25,13 @@ from django.db import (
 )
 from django.db.models import (
     CharField,
-    Max,
+    OuterRef,
     QuerySet,
+    Subquery,
 )
 from django.db.models.functions import (
     Cast,
+    Least,
 )
 
 from educommon import (
@@ -304,51 +306,49 @@ def save_command_log_link(
 
 def get_collecting_managers_max_period_ended_dates(
     collecting_managers: Iterable['BaseCollectingExportedDataRunnerManager'],
-) -> Dict[str, Dict[str, 'datetime']]:
-    """Возвращает даты и времени последнего успешного этапа сбора для менеджеров Функций сбора."""
-    managers_max_period_ended_dates = CollectingExportedDataStage.objects.filter(
-        status_id=CollectingDataStageStatus.FINISHED.key,
+) -> Dict[str, 'datetime']:
+    """Возвращает дату и время завершения последнего успешного этапа сбора для менеджеров Функций сбора."""
+    managers_last_period_ended = CollectingExportedDataStage.objects.filter(
         manager_id__in=[manager.uuid for manager in collecting_managers],
-    ).values(
-        'manager_id',
+        id=Subquery(
+            CollectingExportedDataStage.objects.filter(
+                manager_id=OuterRef('manager_id'),
+                status_id=CollectingDataStageStatus.FINISHED.key,
+            ).order_by('-id').values('id')[:1]
+        ),
     ).annotate(
         str_manager_id=Cast('manager_id', output_field=CharField()),
-        max_period_ended_at=Max('logs_period_ended_at'),
-        max_started_at=Max('started_at'),
+        last_period_ended_at=Least('logs_period_ended_at', 'started_at'),
     ).values_list(
-        'str_manager_id', 'max_period_ended_at', 'max_started_at',
+        'str_manager_id', 'last_period_ended_at',
     )
 
     return {
-        manager_id: {
-            'max_period_ended_at': max_period_ended_at,
-            'max_started_at': max_started_at,
-        }
-        for manager_id, max_period_ended_at, max_started_at in managers_max_period_ended_dates
+        manager_id: last_period_ended_at
+        for manager_id, last_period_ended_at in managers_last_period_ended
     }
 
 
 def get_exporting_managers_max_period_ended_dates(
     exporting_managers: Iterable['BaseExportDataRunnerManager'],
-) -> Dict[str, Dict[str, 'datetime']]:
-    """Возвращает даты и времени последнего успешного этапа экспорта для менеджеров Функций экспорта."""
-    managers_max_period_ended_dates = ExportingDataStage.objects.filter(
-        status_id=ExportingDataStageStatus.FINISHED.key,
+) -> Dict[str, 'datetime']:
+    """Возвращает дату и время последнего успешного этапа экспорта для менеджеров Функций экспорта."""
+    managers_last_period_ended = ExportingDataStage.objects.filter(
         manager_id__in=[manager.uuid for manager in exporting_managers],
-    ).values(
-        'manager_id',
+        id=Subquery(
+            ExportingDataStage.objects.filter(
+                manager_id=OuterRef('manager_id'),
+                status_id=ExportingDataStageStatus.FINISHED.key,
+            ).order_by('-id').values('id')[:1]
+        ),
     ).annotate(
         str_manager_id=Cast('manager_id', output_field=CharField()),
-        max_period_ended_at=Max('period_ended_at'),
-        max_started_at=Max('started_at'),
+        last_period_ended_at=Least('period_ended_at', 'started_at'),
     ).values_list(
-        'str_manager_id', 'max_period_ended_at', 'max_started_at',
+        'str_manager_id', 'last_period_ended_at',
     )
 
     return {
-        manager_id: {
-            'max_period_ended_at': max_period_ended_at,
-            'max_started_at': max_started_at,
-        }
-        for manager_id, max_period_ended_at, max_started_at in managers_max_period_ended_dates
+        manager_id: last_period_ended_at
+        for manager_id, last_period_ended_at in managers_last_period_ended
     }

edu_rdm_integration/migrations/0009_transferredentity_export_enabled.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.1.14 on 2024-07-24 09:14
+
+from django.db import (
+    migrations,
+    models,
+)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('edu_rdm_integration', '0008_transferredentity'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transferredentity',
+            name='export_enabled',
+            field=models.BooleanField(default=True, verbose_name='Включение экспорта для сущности'),
+        ),
+    ]

edu_rdm_integration/models.py

@@ -34,6 +34,9 @@ from django.utils import (
 from django.utils.functional import (
     cached_property,
 )
+from m3 import (
+    json_encode,
+)
 from m3.db import (
     BaseObjectModel,
 )
@@ -906,8 +909,16 @@ class TransferredEntity(BaseObjectModel):
         verbose_name='Сущность',
         on_delete=CASCADE,
     )
+    export_enabled = BooleanField(
+        verbose_name='Включение экспорта для сущности',
+        default=True,
+    )
 
     class Meta:
         db_table = 'rdm_transferred_entity'
         verbose_name = 'Сущность, по которой должен быть произведен сбор и экспорт данных'
         verbose_name_plural = 'Сущности, по которым должен быть произведен сбор и экспорт данных'
+
+    @json_encode
+    def no_export(self):
+        return 'Нет' if self.export_enabled else 'Да'

edu_rdm_integration/registry/actions.py

@@ -17,6 +17,9 @@ from edu_rdm_integration.models import (
     RegionalDataMartEntityEnum,
     TransferredEntity,
 )
+from edu_rdm_integration.registry.ui import (
+    TransferredEntityListWindow,
+)
 
 
 class EntitySelectPack(ObjectPack):
@@ -65,6 +68,25 @@ class TransferredEntityAddWindowAction(SelectorWindowAction):
         return win
 
 
+class TransferredEntityExportChangeAction(BaseAction):
+    """Экшен смены статуса экспорта выбранных сущностей."""
+
+    def context_declaration(self):
+        """Объявляет контекст экшна."""
+        return {
+            'ids': {'type': 'int_list', 'default': []},
+            'export_enabled': {'type': 'boolean', 'default': True}
+        }
+
+    def run(self, request, context):
+        """Обеспечивает выполнение запроса."""
+        self.parent.model.objects.filter(
+            id__in=context.ids
+        ).update(export_enabled=context.export_enabled)
+
+        return OperationResult(success=True)
+
+
 class TransferredEntitySaveAction(BaseAction):
     """Экшн сохранения выбранных сущностей для сбора и экспорта данных."""
 
@@ -95,6 +117,7 @@ class TransferredEntityPack(ObjectPack):
     list_sort_order = ('entity__order_number', )
 
     need_check_permission = True
+    list_window = TransferredEntityListWindow
 
     columns = [
         {
@@ -105,6 +128,10 @@ class TransferredEntityPack(ObjectPack):
             'data_index': 'entity.title',
             'header': 'Описание',
         },
+        {
+            'data_index': 'no_export',
+            'header': 'Отключение экспорта',
+        }
     ]
 
     def __init__(self):
@@ -116,6 +143,10 @@ class TransferredEntityPack(ObjectPack):
         self.save_entity_action = TransferredEntitySaveAction()
         self.replace_action('save_action', self.save_entity_action)
 
+        self.export_change_action = TransferredEntityExportChangeAction()
+
+        self.actions.append(self.export_change_action)
+
     def configure_grid(self, grid, *args, **kwargs):
         """Конфигурирует грид."""
         super().configure_grid(grid, *args, **kwargs)

edu_rdm_integration/registry/ui.py

@@ -0,0 +1,39 @@
+from objectpack.ui import (
+    BaseListWindow,
+)
+from m3_ext.ui.all_components import (
+    ExtButton,
+)
+from educommon.utils.ui import (
+    append_template_globals,
+)
+
+class TransferredEntityListWindow(BaseListWindow):
+    """Окно реестра сущностей для сбора и экспорта данных."""
+
+    def _init_components(self):
+        """Инициализация компонентов окна."""
+        super()._init_components()
+
+        self.export_off_button = ExtButton(
+            text='Отключить экспорт', handler='offExport'
+        )
+        self.export_on_button = ExtButton(
+            text='Включить экспорт', handler='onExport'
+        )
+
+    def _do_layout(self):
+        """Размещение компонентов окна на форме."""
+        super()._do_layout()
+
+        self.grid.top_bar.items.extend((self.export_off_button, self.export_on_button))
+
+    def set_params(self, params, *args, **kwargs):
+        """Настройка окна."""
+        super().set_params(params, *args, **kwargs)
+
+        append_template_globals(self, 'ui-js/transferred-entity-list.js')
+        self.export_change_action_url = (
+            params['pack'].export_change_action.get_absolute_url()
+        )
+        self.pack = params['pack']

edu_rdm_integration/tasks.py

@@ -1,6 +1,3 @@
-from itertools import (
-    chain,
-)
 from typing import (
     TYPE_CHECKING,
     Dict,
@@ -18,16 +15,10 @@ from celery.schedules import (
 from django.conf import (
     settings,
 )
-from django.db.models import (
-    CharField,
-    Max,
-)
-from django.db.models.functions import (
-    Cast,
-)
 from django.utils import (
     timezone,
 )
+
 from educommon.async_task.locker import (
     TaskLocker,
 )
@@ -71,9 +62,9 @@ from edu_rdm_integration.export_data.helpers import (
     set_failed_status_suspended_exporting_data_stages,
 )
 from edu_rdm_integration.helpers import (
+    UploadStatusHelper,
     get_collecting_managers_max_period_ended_dates,
     get_exporting_managers_max_period_ended_dates,
-    UploadStatusHelper,
     save_command_log_link,
 )
 from edu_rdm_integration.models import (
@@ -85,6 +76,7 @@ from edu_rdm_integration.storages import (
     RegionalDataMartEntityStorage,
 )
 
+
 if TYPE_CHECKING:
     from datetime import (
         datetime,
@@ -230,17 +222,17 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
             pk=self.request.id,
         ).values_list('pk', flat=True).first()
 
-        model_enum_values = RegionalDataMartEntityEnum.get_entities_model_enums(
-            entity_enums=self._transferred_entities,
-            is_sorted=True,
-        )
-
-        filtered_model_enum_values = filter(lambda model: model.order_number != DEFAULT_ORDER_NUMBER, model_enum_values)
-        for model_enum_value in filtered_model_enum_values:
-            self._run_collect_model_data(model_enum_value.key, task_id)
+        for entity_data in self._transferred_entities:
+            for model_enum_value in entity_data['collected_models']:
+                self._run_collect_model_data(model_enum_value.key, task_id)
 
-        for entity_enum_value in sorted(self._transferred_entities, key=lambda entity: entity.order_number):
-            self._run_export_entity_data(entity_enum_value.key, task_id)
+            # Перехватывем ошибку экспорта для того, чтобы не останавливать сборку и экспорт остальных сущностей
+            try:
+                entity_enum_value = entity_data['exported_entity']
+                if entity_enum_value:
+                    self._run_export_entity_data(entity_enum_value.key, task_id)
+            except Exception:
+                continue
 
     def _run_collect_model_data(self, model: str, task_id: str) -> None:
         """Запускает сбор данных модели РВД."""
@@ -263,10 +255,24 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
 
     def _collect_transferred_entities(self) -> None:
         """Собирает сущности РВД, по которым будет произведен сбор и экспорт данных."""
-        self._transferred_entities = [
-            RegionalDataMartEntityEnum.get_model_enum_value(key=entity)
-            for entity in TransferredEntity.objects.values_list('entity', flat=True)
+        entities = [
+            (RegionalDataMartEntityEnum.get_model_enum_value(key=entity), export_enabled)
+            for entity, export_enabled in TransferredEntity.objects.values_list('entity', 'export_enabled')
         ]
+        collected_entity_models = set()
+        # Собираем словарь по сущностям с учетом порядка выгрузки
+        for entity_enum, export_enabled in sorted(
+                entities, key=lambda entity: entity[0].order_number):
+            model_enums = [
+                model_enum for model_enum in (entity_enum.main_model_enum, *entity_enum.additional_model_enums)
+                if (model_enum not in collected_entity_models and model_enum.order_number != DEFAULT_ORDER_NUMBER)
+            ]
+            entity_data = {
+                'collected_models': model_enums,
+                'exported_entity': entity_enum if export_enabled else None,
+            }
+            self._transferred_entities.append(entity_data)
+            collected_entity_models.update(model_enums)
 
     def _collect_managers(self) -> None:
         """Собирает менеджеры Функций для сбора и выгрузки данных."""
@@ -281,14 +287,16 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
         )
 
         for transferred_entity in self._transferred_entities:
-            for model in chain((transferred_entity.main_model_enum, ), transferred_entity.additional_model_enums):
+            for model in transferred_entity['collected_models']:
                 collect_manager_class = collecting_models_data_managers_map.get(model.key)
                 if collect_manager_class:
                     self._collecting_data_managers[model.key] = collect_manager_class
 
-            export_manager_class = exporting_entities_data_managers_map.get(transferred_entity.key)
-            if export_manager_class:
-                self._exporting_data_managers[transferred_entity.key] = export_manager_class
+            entity = transferred_entity['exported_entity']
+            if entity:
+                export_manager_class = exporting_entities_data_managers_map.get(entity.key)
+                if export_manager_class:
+                    self._exporting_data_managers[entity.key] = export_manager_class
 
     def _calculate_collecting_managers_logs_period_ended_at(self) -> None:
         """Определяет дату последнего успешного этапа сбора у менеджеров Функций сбора."""
@@ -310,12 +318,9 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
             or get_today_min_datetime()
         )
 
-        period_started_at = manager_last_collected['max_period_ended_at']
+        period_started_at = manager_last_collected
         period_ended_at = timezone.now()
 
-        if period_started_at >= period_ended_at:
-            period_started_at = manager_last_collected['max_started_at']
-
         return EduRdmCollectDataCommandProgress.objects.create(
             model_id=model,
             logs_period_started_at=period_started_at,
@@ -330,12 +335,9 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
         manager_last_exported = self._exporting_data_manager_to_period_end.get(manager.uuid)
 
         if manager_last_exported:
-            period_started_at = manager_last_exported['max_period_ended_at']
+            period_started_at = manager_last_exported
             period_ended_at = timezone.now()
 
-            if period_started_at >= period_ended_at:
-                period_started_at = manager_last_exported['max_started_at']
-
             return EduRdmExportDataCommandProgress.objects.create(
                 entity_id=entity,
                 period_started_at=period_started_at,
@@ -354,6 +356,7 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
             logs_period_started_at=command.logs_period_started_at,
             logs_period_ended_at=command.logs_period_ended_at,
             command_id=command.id,
+            use_times_limit=True,
         )
 
     def _prepare_export_entity_data_class(self, command: EduRdmExportDataCommandProgress) -> ExportLatestEntitiesData:

edu_rdm_integration/templates/ui-js/transferred-entity-list.js

@@ -0,0 +1,37 @@
+var grid = Ext.getCmp('{{component.grid.client_id}}');
+
+function changeExport(bool_value){
+    var selections = grid.selModel.getSelections();
+    var selections_len = selections.length;
+
+    if (selections_len){
+        var selected_ids = [];
+        for (var i = 0; i < selections_len; i += 1) {
+            selected_ids.push(selections[i].id);
+        }
+        var params =  {'export_enabled': bool_value};
+        params['ids'] = selected_ids.join(',');
+        Ext.Ajax.request({
+            url: '{{component.export_change_action_url}}',
+            method: 'POST',
+            params: params,
+            success: function(res, opt){
+                if (Ext.util.JSON.decode(res.responseText).success) {
+                   grid.refreshStore();
+                }
+                smart_eval(res.responseText);
+        },
+            failure: Ext.emptyFn
+        });
+    } else {
+         Ext.Msg.alert('Внимание!', 'Выберите Сущность для выключения экспорта!');
+    }
+}
+
+function offExport(){
+    changeExport(false)
+}
+
+function onExport(){
+    changeExport(true)
+}

edu_rdm_integration/uploader_log/templates/ui-js/object-grid-buttons.js

@@ -0,0 +1,185 @@
+function onObjGridAction(grid, actionUrl) {
+    assert(grid, 'grid is not define');
+    assert(actionUrl, 'actionUrl is not define');
+    var mask = new Ext.LoadMask(grid.body),
+        params = grid.getMainContext();
+    params[grid.rowIdName] = '';
+    params = Ext.apply(params, getGridParams(grid));
+
+    grid.getStore()
+
+    var req = {
+        url: actionUrl,
+        params: params,
+        success: function(res, opt){
+            if (scope.fireEvent('afternewrequest', scope, res, opt)) {
+                try {
+                    var child_win = scope.onNewRecordWindowOpenHandler(res, opt);
+                } finally {
+                    mask.hide();
+                }
+                return child_win;
+            }
+            mask.hide();
+        }
+       ,failure: function(){
+           uiAjaxFailMessage.apply(this, arguments);
+           mask.hide();
+
+       }
+    };
+
+    if (grid.fireEvent('beforenewrequest', grid, req)) {
+        var scope = grid;
+
+        mask.show();
+        Ext.Ajax.request(req);
+    }
+}
+
+function onObjGridOneRecordAction(grid, actionName, actionUrl) {
+    assert(grid, 'grid is not define');
+    assert(actionName, 'actionName is not define');
+    assert(actionUrl, 'actionUrl is not define');
+    assert(grid.rowIdName, 'rowIdName is not define');
+
+    if (grid.getSelectionModel().hasSelection()) {
+        // при локальном редактировании запросим также текущую строку
+        var baseConf = grid.getSelectionContext(grid.localEdit);
+        // грязный хак
+        if (String(baseConf[grid.rowIdName]).indexOf(",") != -1) {
+            Ext.Msg.show({
+                title: actionName,
+                msg: 'Для выполнения действия должен быть выбран только один элемент.',
+                buttons: Ext.Msg.OK,
+                icon: Ext.MessageBox.INFO
+                });
+        } else {
+            var mask = new Ext.LoadMask(grid.body);
+            var req = {
+                url: actionUrl,
+                params: baseConf,
+                success: function(res, opt){
+                    if (scope.fireEvent('aftereditrequest', scope, res, opt)) {
+                        try {
+                            var child_win = scope.onEditRecordWindowOpenHandler(res, opt);
+                        } finally {
+                            mask.hide();
+                        }
+                        return child_win;
+                    }
+                    mask.hide();
+                }
+               ,failure: function(){
+                   uiAjaxFailMessage.apply(this, arguments);
+                   mask.hide();
+               }
+            };
+
+            if (grid.fireEvent('beforeeditrequest', grid, req)) {
+                var scope = grid;
+
+                mask.show();
+                Ext.Ajax.request(req);
+            }
+        }
+    } else {
+    Ext.Msg.show({
+        title: actionName,
+        msg: 'Элемент не выбран',
+        buttons: Ext.Msg.OK,
+        icon: Ext.MessageBox.INFO
+        });
+    }
+}
+
+function onObjGridMultiRecordAction(
+    grid, actionName, actionUrl, isConfirmRequired
+) {
+    assert(grid, 'grid is not define');
+    assert(actionName, 'actionName is not define');
+    assert(actionUrl, 'actionUrl is not define');
+    assert(grid.rowIdName, 'rowIdName is not define');
+
+    var scope = grid;
+    if (scope.getSelectionModel().hasSelection()) {
+        var request = function(btn, text, opt){
+            if (btn === 'yes') {
+                var baseConf = scope.getSelectionContext(scope.localEdit);
+                var mask = new Ext.LoadMask(scope.body);
+                var req = {
+                   url: actionUrl,
+                   params: baseConf,
+                   success: function(res, opt){
+                       if (scope.fireEvent('afterdeleterequest', scope, res, opt)) {
+                           try {
+                               var child_win =  scope.deleteOkHandler(res, opt);
+                           } finally {
+                               mask.hide();
+                           }
+                           return child_win;
+                       }
+                       mask.hide();
+                   }
+                   ,failure: function(){
+                       uiAjaxFailMessage.apply(this, arguments);
+                       mask.hide();
+                   }
+                };
+                if (scope.fireEvent('beforedeleterequest', scope, req)) {
+
+                    mask.show();
+                    Ext.Ajax.request(req);
+                }
+            }
+        }
+        if (isConfirmRequired) {
+            Ext.Msg.show({
+                title: actionName,
+                msg: 'Вы действительно хотите выполнить '
+                    + actionName + 'для выбранной записи?',
+                icon: Ext.Msg.QUESTION,
+                buttons: Ext.Msg.YESNO,
+                fn: request
+            });
+        }
+        else {
+            request('yes');
+        }
+    } else {
+        Ext.Msg.show({
+            title: actionName,
+            msg: 'Элемент не выбран',
+            buttons: Ext.Msg.OK,
+            icon: Ext.MessageBox.INFO
+        });
+    }
+}
+
+function getGridParams(grid) {
+    var options = {};
+    if (grid.allowPaging) {
+        var pagingBar = grid.getBottomToolbar();
+        if(pagingBar &&  pagingBar instanceof Ext.PagingToolbar){
+            var o = {}, pp = pagingBar.getParams();
+            o[pp.start] = (
+                (Math.ceil((
+                    pagingBar.cursor + pagingBar.pageSize
+                ) / pagingBar.pageSize) - 1) * pagingBar.pageSize
+            ).constrain(0, pagingBar.store.getTotalCount());
+            o[pp.limit] = pagingBar.pageSize;
+            options = Ext.apply(options, o);
+        }
+    }
+
+    var store = grid.getStore();
+    options = Ext.apply(options, store.baseParams);
+
+    if (store.sortInfo && store.remoteSort) {
+        var sp = store.paramNames;
+        options[sp.sort] = store.sortInfo.field;
+        options[sp.dir] = store.sortInfo.direction;
+    }
+
+    return options;
+}

{edu_rdm_integration-3.2.2.dist-info → edu_rdm_integration-3.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 3.2.2
+Version: 3.2.7
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -301,6 +301,48 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## 3.2.7 - 2024-07-31
+Исправлен файл MANIFEST.in для включения в сборку js-шаблонов.
+
+### Изменено
+- [EDUSCHL-21965](https://jira.bars.group/browse/EDUSCHL-21965)
+  PATCH Добавлено включение js-шаблонов в сборку в файл MANIFEST.in
+
+## 3.2.6 - 2024-07-23
+Добавлен параметр export_off (Отключение экспорта для сущности) в модель TransferredEntity
+Изменен порядок запуска сбора и экспорта по сущностям в периодической задаче TransferLatestEntitiesDataPeriodicTask
+
+### Изменено
+- [EDUSCHL-21965](https://jira.bars.group/browse/EDUSCHL-21965)
+  PATCH Добавлен параметр export_off в модель TransferredEntity и изменен порядок запуска сбора и экспорта в
+  TransferLatestEntitiesDataPeriodicTask.
+
+
+## 3.2.5  - 2024-07-16
+Добавлен параметр use_times_limit в BaseCollectLatestModelsData для использования переданных параметров logs_period_started_at и logs_period_ended_at
+
+### Изменено
+- [EDUSCHL-22070](https://jira.bars.group/browse/EDUSCHL-22070)
+  PATCH Добавлен параметр use_times_limit в BaseCollectLatestModelsData для использования переданных параметров logs_period_started_at и  logs_period_ended_at
+
+## 3.2.4 - 2024-07-16
+Внесены корректировки в запросы используемые в функциях get_collecting_managers_max_period_ended_dates и get_exporting_managers_max_period_ended_dates.
+
+### Изменено
+- [EDUSCHL-22217](https://jira.bars.group/browse/EDUSCHL-22217)
+  PATCH Внесены корректировки в запросы используемые в функциях get_collecting_managers_max_period_ended_dates и get_exporting_managers_max_period_ended_dates.
+  В подзапросах отсутствовало условие фильтрации по статусу.
+
+
+## 3.2.3 - 2024-06-06
+Внесены корректировки в запросы используемые в функциях get_collecting_managers_max_period_ended_dates и get_exporting_managers_max_period_ended_dates.
+
+### Изменено
+- [EDUSCHL-21804](https://jira.bars.group/browse/EDUSCHL-21804)
+  PATCH Внесены корректировки в запросы используемые в функциях get_collecting_managers_max_period_ended_dates и get_exporting_managers_max_period_ended_dates.
+  Дата и время окончания предыдущего сбора/экспорта могла быть не корректно определена.
+
+
 ## 3.2.2 - 2024-05-21
 Изменения в переодической задаче TransferLatestEntitiesDataPeriodicTask,
 Изменено определение даты последнего успешного этапа сбора у менеджеров Функций сбора и экспорта.

{edu_rdm_integration-3.2.2.dist-info → edu_rdm_integration-3.2.7.dist-info}/RECORD

@@ -6,12 +6,12 @@ edu_rdm_integration/base.py,sha256=_G0qPTAXe6bXfgDHNiZMSsYt3sMuUhLKnHuQCWSFttU,1
 edu_rdm_integration/consts.py,sha256=FFwcMHNsfjP_s9LfkccLAHjJMEMp7ppPmrRlJcgV88k,1104
 edu_rdm_integration/entities.py,sha256=qNVWUhjwvX298Ak86_AKmqBZioP0czGwBcAz_4dtUUE,14552
 edu_rdm_integration/enums.py,sha256=T3Mu5D-CbKO3BSg16MPPnIPlcc_YGLYR-ThS8dzl9gg,4246
-edu_rdm_integration/helpers.py,sha256=pGgefbVCsi4-qb4KTy8ONV3gVNKx-FiJibFkK6hKzMM,13725
+edu_rdm_integration/helpers.py,sha256=EGufjIdrww3w2QjVn6ufM9mjruxNkHNu_KCzXct7Fa4,13733
 edu_rdm_integration/mapping.py,sha256=bwa2fJCbV4YjQcAgRrgT3hgM6dJhr_uBtQgx3L3F2Ck,473
-edu_rdm_integration/models.py,sha256=Wg8NYj4C6Xqw-15AsQGU0TWNzUjdwBW_YZDzmPqx3GY,29327
+edu_rdm_integration/models.py,sha256=Q6BxMUlKmqLBwoJFB0aefD9uE4F3D2fncFqTEKBsOSA,29612
 edu_rdm_integration/signals.py,sha256=3eRlpkDcFCF6TN80-QM8yBYLcyozzcmoPjz6r4_ApWg,73
 edu_rdm_integration/storages.py,sha256=o5WqUG7SnkeuMt-z8spUi-IraivST-7KHzfY-M3v7FA,6807
-edu_rdm_integration/tasks.py,sha256=LPbEbfRtEwYlfneLrMvE3EnyN0B52qwnwMUEAIFgQDs,14998
+edu_rdm_integration/tasks.py,sha256=fK4aRyYHexkgEzEd7_r0522EM8vYqh0KKzkmhRjcqmc,15505
 edu_rdm_integration/utils.py,sha256=-my8q9fude6Nc9r_qUDww-8QaU2tcv-xOexewYqOPJw,10369
 edu_rdm_integration/adapters/__init__.py,sha256=cU0swn4Ny5ZQz5buWRcWsT1mpWuUFJaUlHf2l7TtEBo,83
 edu_rdm_integration/adapters/apps.py,sha256=TyJTkSPs2qAHJ11fqbwLGk3Ea7ujtqWwbxqmvYNQxG8,363
@@ -37,7 +37,7 @@ edu_rdm_integration/collect_and_export_data/utils.py,sha256=lBWqqhLgMyz2IQN7r9zu
 edu_rdm_integration/collect_and_export_data/migrations/0001_initial.py,sha256=UkoaXzh3tokZ8QdCdB09v3rRZfcHhvEwNMuj3mQIB74,4714
 edu_rdm_integration/collect_and_export_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/collect_data/collect.py,sha256=i5kf__jrlBOIZC2rRD-CHXn2HeAKWpQXrqxQg-fk94M,13596
+edu_rdm_integration/collect_data/collect.py,sha256=Qcg0zL3a5MIFuuwW4k5gTD9r_m19ZCmihwwJdt0gPyc,13913
 edu_rdm_integration/collect_data/generators.py,sha256=f34AAwdEcQNIokX0ypqYgjRD1XolwBVLER_HYv9ibNw,9075
 edu_rdm_integration/collect_data/helpers.py,sha256=gAFZAm9YhMtQhvlwSF3LMthPPa8LsqG_zbVe7vnW_Ag,2995
 edu_rdm_integration/collect_data/tests.py,sha256=-UNX3-GL0H9i89GXRfICT0ABltn_9aN_I_cmn1gQcDA,5367
@@ -85,7 +85,7 @@ edu_rdm_integration/enum_register/mixins.py,sha256=nmHue9-9bqKZn9_MFiL0E-5wBUBIZ
 edu_rdm_integration/enum_register/register.py,sha256=5OWOjK-M0Erd_5CENpBaXhVtfL0pEaDl3Bev5QKNDJc,2218
 edu_rdm_integration/export_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/export_data/consts.py,sha256=Z6Uho8oViMc0t1tyQFZfrPFBwPx6KnhUf_iZ0qgob8o,16
-edu_rdm_integration/export_data/export.py,sha256=AAN_DqOAPENKEtlbnMF2j4CPmkoy57vJQ8t2yQRZtrM,16595
+edu_rdm_integration/export_data/export.py,sha256=3d1POl4xzyh4GVXJYdkXkcyfiUIqsrlPKPO-apw30Uk,16405
 edu_rdm_integration/export_data/generators.py,sha256=yLDOcHB1PoilJwXtKGxZQhDjpeKBzEWoosahbJJ4Ba4,4020
 edu_rdm_integration/export_data/helpers.py,sha256=hU346RmQ17Ra2etFvxXI7JQlLyp_0KxH1jm-eeCqejc,2933
 edu_rdm_integration/export_data/strategies.py,sha256=ocHskG-x54U-ESX56OlZPgOibkGkuv7VKmK7hVmqj_0,6725
@@ -153,18 +153,22 @@ edu_rdm_integration/migrations/0005_auto_20231204_1224.py,sha256=YXWiwTImGg8FAO_
 edu_rdm_integration/migrations/0006_request_status_data.py,sha256=g5JZtP0q0fOrbKCooGmCeGgtcqd9ZLIBP56h-ZH8IS8,3448
 edu_rdm_integration/migrations/0007_delete_upload_status.py,sha256=GAQKX6N1vDDWiCTXLGg--0gzLQr7VveAPFYzC9QpUpU,457
 edu_rdm_integration/migrations/0008_transferredentity.py,sha256=rE5av85AIYKGDy7nuFKLrHAhj0uaeUTRsFfIsXPtaxo,1427
+edu_rdm_integration/migrations/0009_transferredentity_export_enabled.py,sha256=xCCtmkl3PQ0o-AgiZEK3UUOvNnzcuTpSp8ViRm3KpnI,506
 edu_rdm_integration/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/registry/actions.py,sha256=y84gsGz-ZpkOdG85dNwk-J3zmPeEqp894K55puJNDiI,4146
+edu_rdm_integration/registry/actions.py,sha256=YUtCkpcc3DedM_x8rwJ6Aos-8HKkDCrOUdKnGhztfUU,5223
+edu_rdm_integration/registry/ui.py,sha256=9iYHVyl3bvrbyQV4nFmSW4qo2HAVGHHmFOl9s0qLSWY,1327
+edu_rdm_integration/templates/ui-js/transferred-entity-list.js,sha256=IWEZ9JoTxD5-CLic5v07XHWW0iGRWk-cjeGVSzU4yKg,1117
 edu_rdm_integration/uploader_log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/uploader_log/actions.py,sha256=SGYYYNL4MdST1FYCZBCYAxj3_-PsJ8IcXBYwxpZqucg,6755
 edu_rdm_integration/uploader_log/apps.py,sha256=tYJj4-sDlq8fLOSvw18L_yys7SILpTKWNmE2Qug6GnE,265
 edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJLdsGmr3SXwH_U,266
 edu_rdm_integration/uploader_log/managers.py,sha256=y5wTSMzF9hpOpIU_A7nIafL_LBU3QEie6LAYWoB-pBQ,3203
 edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
-edu_rdm_integration-3.2.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.2.2.dist-info/METADATA,sha256=pf2mWm6W814a7FE1IGxpN0bhvun_2q7Zm0dmi1k6SHQ,65013
-edu_rdm_integration-3.2.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-3.2.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-3.2.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.2.2.dist-info/RECORD,,
+edu_rdm_integration/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
+edu_rdm_integration-3.2.7.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.2.7.dist-info/METADATA,sha256=g7Cff01IboSXv0-TVs9LvL_ZYnzGHYhVDy5iVivshSM,67821
+edu_rdm_integration-3.2.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-3.2.7.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-3.2.7.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.2.7.dist-info/RECORD,,