edu-rdm-integration 3.16.1__py3-none-any.whl → 3.16.2__py3-none-any.whl

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

@@ -1,6 +1,8 @@
 {% load educommon %}
 {% include "ui-js/validators.js" %}
 
+var win = Ext.getCmp('{{ component.client_id }}');
+
 Ext.onReady(function() {
     // Инициализация валидаторов
     initializeValidators();
@@ -38,6 +40,25 @@ function initializeValidators() {
             this.validate();
         });
     }
+
+    // Устанавливаем текущую дату и время как максимальное значение
+    // и выполняем валидацию каждую секунду
+    var validationInterval = setInterval(function() {
+        var now = new Date();
+
+        logsPeriodStartField.setMaxValue(now);
+        logsPeriodEndField.setMaxValue(now);
+
+        logsPeriodStartField.validate();
+        logsPeriodEndField.validate();
+    }, 1000);
+
+    win.on('destroy', function() {
+        clearInterval(validationInterval);
+    });
+
+    logsPeriodStartField.validator = logsPeriodsValidator;
+    logsPeriodEndField.validator = logsPeriodsValidator;
 }
 
 function initializeBatchSizeSplitByLogic() {

edu_rdm_integration/stages/collect_data/registry/templates/ui-js/validators.js

@@ -49,3 +49,18 @@ var instituteCountValidator = function() {
     this.clearInvalid();
     return true;
 };
+
+var logsPeriodStartField = Ext.getCmp('logs_period_started_at');
+var logsPeriodEndField = Ext.getCmp('logs_period_ended_at');
+
+var logsPeriodsValidator = function () {
+    if (
+        logsPeriodStartField.getValue() &&
+        logsPeriodEndField.getValue() &&
+        logsPeriodStartField.getValue() > logsPeriodEndField.getValue()
+    ) {
+        return 'Дата конца периода не может быть меньше даты начала периода'
+    };
+
+    return true;
+};

edu_rdm_integration/stages/collect_data/registry/ui.py

@@ -41,11 +41,6 @@ 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()
@@ -65,12 +60,14 @@ class CreateCollectCommandWindow(BaseCreateCommandWindow):
             label='Начало периода',
             anchor='100%',
             allow_blank=False,
+            client_id='logs_period_started_at',
         )
         logs_period_ended_at = ExtDateTimeField(
             name='logs_period_ended_at',
             label='Конец периода',
             anchor='100%',
             allow_blank=False,
+            client_id='logs_period_ended_at',
         )
         split_by = ExtComboBox(
             name='split_by',

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

@@ -1,14 +1,41 @@
 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);
+var periodStartField = Ext.getCmp('period_started_at');
+var periodEndField = Ext.getCmp('period_ended_at');
+
+Ext.onReady(function() {
+    // Инициализация валидаторов
+    initializeValidators();
 });
+
+function initializeValidators() {
+    // Устанавливаем текущую дату и время как максимальное значение
+    // и выполняем валидацию каждую секунду
+    var validationInterval = setInterval(function() {
+        var now = new Date();
+
+        periodStartField.setMaxValue(now);
+        periodEndField.setMaxValue(now);
+
+        periodStartField.validate();
+        periodEndField.validate();
+    }, 1000);
+
+    win.on('destroy', function() {
+        clearInterval(validationInterval);
+    });
+
+    var periodsValidator = function () {
+        if (
+            periodStartField.getValue() &&
+            periodEndField.getValue() &&
+            periodStartField.getValue() > periodEndField.getValue()
+        ) {
+            return 'Дата конца периода не может быть меньше даты начала периода'
+        };
+
+        return true;
+    };
+
+    periodStartField.validator = periodsValidator;
+    periodEndField.validator = periodsValidator;
+}

edu_rdm_integration/stages/export_data/registry/ui.py

@@ -44,11 +44,6 @@ 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()
@@ -68,12 +63,14 @@ class CreateExportCommandWindow(BaseCreateCommandWindow):
             label='Начало периода',
             anchor='100%',
             allow_blank=False,
+            client_id='period_started_at',
         )
         period_ended_at = ExtDateTimeField(
             name='period_ended_at',
             label='Конец периода',
             anchor='100%',
             allow_blank=False,
+            client_id='period_ended_at',
         )
         batch_size = ExtNumberField(
             name='batch_size',
@@ -93,6 +90,12 @@ class CreateExportCommandWindow(BaseCreateCommandWindow):
             batch_size,
         )
 
+    def set_params(self, params: Dict[str, Any]) -> None:
+        """Устанавливает параметры окна."""
+        super().set_params(params)
+
+        self.template_globals = 'ui-js/create-export-command-win.js'
+
 
 class DetailExportCommandWindow(BaseEditWindow):
     """Окно просмотра команды экспорта данных сущности РВД."""

{edu_rdm_integration-3.16.1.dist-info → edu_rdm_integration-3.16.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.16.1
+Version: 3.16.2
 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.16.1.dist-info → edu_rdm_integration-3.16.2.dist-info}/RECORD

@@ -153,10 +153,9 @@ 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=mUMGv1FjzjY0G46gTgi_mfL0yUjuCJlA2wQutq3jmPo,9798
 edu_rdm_integration/stages/collect_data/registry/apps.py,sha256=K5f97YXKMmdM7m33qgQYvJjrA8_eGAJ4VWyuRjJ0gwQ,439
-edu_rdm_integration/stages/collect_data/registry/ui.py,sha256=oOghmS49uCOEycOL3Wz-4-NUSy9mp7_pcwXf_VVz8rU,8427
-edu_rdm_integration/stages/collect_data/registry/templates/ui-js/collect-command-window.js,sha256=IWG4CczBG9-Bi6X2Hivod4z63gSBZ6Fd126QVRRFacA,2386
-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/collect_data/registry/templates/ui-js/validators.js,sha256=c0p0ND7i2C-fZrADgiUv9Eekjx_ZlFHBrgd-oXuqXKI,1525
+edu_rdm_integration/stages/collect_data/registry/ui.py,sha256=pw13DAASxqnX_E5D4RG9CywtnQKQeljXHief7mojVgk,8398
+edu_rdm_integration/stages/collect_data/registry/templates/ui-js/collect-command-window.js,sha256=QfxVSAA0282-41K0XGtyPa9WPzpoX_uClke8pHdAzBo,3112
+edu_rdm_integration/stages/collect_data/registry/templates/ui-js/validators.js,sha256=8A07RgqRs71UuyHNc0HA_isGZL5-W9iLm0O-eC2JFT8,2021
 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
@@ -209,8 +208,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=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/ui.py,sha256=0kWWfOmtTyN4SUO9dGUcEz0wgOPA111jHoWw3_LNPqI,6238
+edu_rdm_integration/stages/export_data/registry/templates/ui-js/create-export-command-win.js,sha256=g0dpYsvd_6VfRU4nRv3tNK-0wtMND_VurQRT04ShJjk,1341
 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
@@ -246,8 +245,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.16.1.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.16.1.dist-info/METADATA,sha256=oFZgonV1BYPkEAzdOOQFI-NpB2NNW_FTbtzMzCmjyA8,39780
-edu_rdm_integration-3.16.1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.16.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.16.1.dist-info/RECORD,,
+edu_rdm_integration-3.16.2.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.16.2.dist-info/METADATA,sha256=OH3vRLpk80LhM4oaWAv3eIja9m6A67tjfsV0e1xrLeA,39780
+edu_rdm_integration-3.16.2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.16.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.16.2.dist-info/RECORD,,

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

@@ -1,14 +0,0 @@
-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);
-});