edu-rdm-integration 3.15.2__py3-none-any.whl → 3.15.3__py3-none-any.whl

edu_rdm_integration/stages/collect_data/generators.py

@@ -167,15 +167,15 @@ class BaseFirstCollectModelsDataCommandsGenerator:
                     period_ended_at=self.logs_period_ended_at,
                 )
 
-                for start_datetime, end_datetime in intervals:
-                    params_for_commands.append(
-                        {
-                            'period_started_at': start_datetime,
-                            'period_ended_at': end_datetime,
-                            'model': rdm_model.key,
-                            'generation_id': self.generation_id,
-                        }
-                    )
+                params_for_model = [
+                    {
+                        'period_started_at': start_datetime,
+                        'period_ended_at': end_datetime,
+                        'model': rdm_model.key,
+                        'generation_id': self.generation_id,
+                    }
+                    for start_datetime, end_datetime in intervals
+                ]
 
             # Если подпериод не указан, то формируется список с разбиением по batch_size
             else:
@@ -213,15 +213,32 @@ class BaseFirstCollectModelsDataCommandsGenerator:
                     cursor.execute(temp_get_logs_periods_sql)
                     rows = cursor.fetchall()
 
-                for period_started_at, period_ended_at, batch_number in rows:
-                    params_for_commands.append(
-                        {
-                            'period_started_at': period_started_at,
-                            'period_ended_at': period_ended_at,
-                            'model': rdm_model.key,
-                            'generation_id': self.generation_id,
-                        }
-                    )
+                params_for_model = [
+                    {
+                        'period_started_at': period_started_at,
+                        'period_ended_at': period_ended_at,
+                        'model': rdm_model.key,
+                        'generation_id': self.generation_id,
+                    }
+                    for period_started_at, period_ended_at, _ in rows
+                ]
+
+            if params_for_model:
+                # Корректируем границы начала и конца сбора данных под значения введенные пользователем
+                params_for_model[0]['period_started_at'] = self.logs_period_started_at
+                params_for_model[-1]['period_ended_at'] = self.logs_period_ended_at
+            else:
+                # Создаем команду для отображения в UI, даже если не нашлось данных для обработки
+                params_for_model.append(
+                    {
+                        'period_started_at': self.logs_period_started_at,
+                        'period_ended_at': self.logs_period_ended_at,
+                        'model': rdm_model.key,
+                        'generation_id': self.generation_id,
+                    }
+                )
+
+            params_for_commands.extend(params_for_model)
 
         return params_for_commands
 

edu_rdm_integration/stages/collect_data/registry/templates/ui-js/create-collect-command-win.js

@@ -0,0 +1,14 @@
+var win = Ext.getCmp('{{ component.client_id }}');
+var form = win.getForm();
+var logsPeriodEndField = form.findField('logs_period_ended_at');
+
+// Устанавливаем текущую дату и время как максимальное значение
+// и выполняем валидацию каждую секунду
+var validationInterval = setInterval(function() {
+    logsPeriodEndField.setMaxValue(new Date())
+    logsPeriodEndField.validate();
+}, 1000);
+
+win.on('destroy', function() {
+    clearInterval(validationInterval);
+});

edu_rdm_integration/stages/collect_data/registry/ui.py

@@ -39,6 +39,11 @@ from edu_rdm_integration.stages.collect_data.consts import (
 class CreateCollectCommandWindow(BaseCreateCommandWindow):
     """Окно создания команды сбора данных модели РВД."""
 
+    def __init__(self):
+        super().__init__()
+
+        self.template_globals = 'ui-js/create-collect-command-win.js'
+
     def _init_components(self):
         """Инициализация компонентов."""
         super()._init_components()

edu_rdm_integration/stages/export_data/registry/templates/ui-js/create-export-command-win.js

@@ -0,0 +1,14 @@
+var win = Ext.getCmp('{{ component.client_id }}');
+var form = win.getForm();
+var periodEndField = form.findField('period_ended_at');
+
+// Устанавливаем текущую дату и время как максимальное значение
+// и выполняем валидацию каждую секунду
+var validationInterval = setInterval(function() {
+    periodEndField.setMaxValue(new Date())
+    periodEndField.validate();
+}, 1000);
+
+win.on('destroy', function() {
+    clearInterval(validationInterval);
+});

edu_rdm_integration/stages/export_data/registry/ui.py

@@ -44,6 +44,11 @@ from edu_rdm_integration.rdm_entities.models import (
 class CreateExportCommandWindow(BaseCreateCommandWindow):
     """Окно создания команды экспорта данных сущности РВД."""
 
+    def __init__(self):
+        super().__init__()
+
+        self.template_globals = 'ui-js/create-export-command-win.js'
+
     def _init_components(self):
         """Инициализация компонентов."""
         super()._init_components()

{edu_rdm_integration-3.15.2.dist-info → edu_rdm_integration-3.15.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.15.2
+Version: 3.15.3
 Summary: Интеграция с Региональной витриной данных
 Author-email: BARS Group <education_dev@bars.group>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu-rdm-integration/browse

{edu_rdm_integration-3.15.2.dist-info → edu_rdm_integration-3.15.3.dist-info}/RECORD

@@ -77,7 +77,7 @@ edu_rdm_integration/stages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 edu_rdm_integration/stages/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/collect_data/apps.py,sha256=PhrxzAMXvzXajSlgwLudAgasVjh9IFS5M7a7pGbEKC0,339
 edu_rdm_integration/stages/collect_data/consts.py,sha256=tzaK9oxzdMRq3oTEocPz4umoXSJWUtFc7YhyXucCNbs,127
-edu_rdm_integration/stages/collect_data/generators.py,sha256=k6An9y3_3mzopYkoudmhspHB6sIUSDdLv6JPdMdMwWo,12075
+edu_rdm_integration/stages/collect_data/generators.py,sha256=OM5KsInz_as8K2TX4XLJ-AWTnul-VR4v6oS5ORdU0fI,12970
 edu_rdm_integration/stages/collect_data/helpers.py,sha256=xy8z9yJKEMjNUPNhrsRRtnYy6RVbwDoD5zSDAX7y_6U,5260
 edu_rdm_integration/stages/collect_data/mixins.py,sha256=izioaiPC26BDODgi_Lhy33IaH207945tGjFnbFLMQyI,2072
 edu_rdm_integration/stages/collect_data/models.py,sha256=hxB2JUF0U0d7Gr8UcPDEhONLACTuqA63SFPEK5qn2Mo,8916
@@ -153,7 +153,8 @@ edu_rdm_integration/stages/collect_data/migrations/__init__.py,sha256=47DEQpj8HB
 edu_rdm_integration/stages/collect_data/registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/collect_data/registry/actions.py,sha256=5eT6nw4xYuJlfVrFxoqn0SF4PqSgHIbMc7rlx8dWypE,9769
 edu_rdm_integration/stages/collect_data/registry/apps.py,sha256=K5f97YXKMmdM7m33qgQYvJjrA8_eGAJ4VWyuRjJ0gwQ,439
-edu_rdm_integration/stages/collect_data/registry/ui.py,sha256=zmWZ0qgdu83V2MxRDIPyvDrgRcQKaeEzvMZ2CuvDE1M,7613
+edu_rdm_integration/stages/collect_data/registry/ui.py,sha256=5qG5M2sw1qvrt3g_2ZOoJJw9YKmrmk7Hlt_VEnWCRhY,7736
+edu_rdm_integration/stages/collect_data/registry/templates/ui-js/create-collect-command-win.js,sha256=BypYLy6-xKjmQucGy_uVEx2830jh5f7VFvUaAaqL_AY,549
 edu_rdm_integration/stages/export_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/apps.py,sha256=TU6AaMZGQE2oHVwKgtUDzFplaVasb2tMIurhkhwkxZo,406
 edu_rdm_integration/stages/export_data/consts.py,sha256=ZEi1kXMs-54KFKxkyGIQVwZ4d8OrOF_vLFQIjjWdSPQ,441
@@ -206,7 +207,8 @@ edu_rdm_integration/stages/export_data/migrations/__init__.py,sha256=47DEQpj8HBS
 edu_rdm_integration/stages/export_data/registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/registry/actions.py,sha256=r-NAPs4pYVectt_J38UzMsnKrWfYkjy2rhx3LUGKQWk,10423
 edu_rdm_integration/stages/export_data/registry/apps.py,sha256=71DtJQ2ULt8_3CnTu2VAfT5ABBrDNY1nKTmZ6UtvIpw,448
-edu_rdm_integration/stages/export_data/registry/ui.py,sha256=W5hFTBBgIPc7q0PAK8ObENxOYb5iq1SnV0-DZbiL4-U,5920
+edu_rdm_integration/stages/export_data/registry/ui.py,sha256=GPp52ziV_xb0cnveprqIYmrx4kv0zgvrhMg-PHqUFeE,6042
+edu_rdm_integration/stages/export_data/registry/templates/ui-js/create-export-command-win.js,sha256=ADE04kltbx1e0spaFK_ycBmtxBQPz6pqfaNY_czo9z8,532
 edu_rdm_integration/stages/export_data/registry/templates/ui-js/stage_for_export.js,sha256=329OZIpiKHlQ-i8JStjBLXtouIMKuJHbycArUGSskfk,737
 edu_rdm_integration/stages/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/service/apps.py,sha256=lgCG4_kpwgfDWh6y-GNuUwz5SOjkP7oS8kkUyVUcNRg,648
@@ -242,8 +244,8 @@ edu_rdm_integration/stages/upload_data/uploader_log/ui.py,sha256=mU3XA9zVKHGqzNk
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/0001_initial.py,sha256=r5oOB7DBK9-mfuqPAgjXUJY5-hEcmMdILCwDTpaLnBc,753
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.15.2.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.15.2.dist-info/METADATA,sha256=IPzmLm3bBn0vH34ibUeQuYNwOHfq1vYACpPlE4mFKDg,39741
-edu_rdm_integration-3.15.2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.15.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.15.2.dist-info/RECORD,,
+edu_rdm_integration-3.15.3.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.15.3.dist-info/METADATA,sha256=vkV8qNF7vynwb7_ZOPokDcEXK0htHfU1hkfxktyjsPA,39741
+edu_rdm_integration-3.15.3.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.15.3.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.15.3.dist-info/RECORD,,