educommon 3.9.7__py3-none-any.whl → 3.9.9__py3-none-any.whl

educommon/async_task/ui.py

@@ -84,14 +84,14 @@ class AsyncTaskResultViewWindow(BaseWindow):
         super()._init_components()
 
         self.top_region = ExtContainer(
-            region='north', layout='form', height=60, style={'padding': '5px'}
+            region='north', layout='form', height=80, style={'padding': '5px'}
         )
-        self.center_region = ExtContainer(region='center', layout='fit')
+        self.center_region = ExtContainer(region='center', layout='fit', style={'padding': '5px'})
         self.bottom_region = ExtContainer(
             region='south',
             layout='form',
             height=150,
-            style={'padding': '5px 5px 5px 5px'}
+            style={'padding': '5px'}
         )
         self.task_type_fld = ExtStringField(
             anchor='100%', label='Тип', read_only=True)
@@ -107,6 +107,13 @@ class AsyncTaskResultViewWindow(BaseWindow):
             title='Результаты',
             layout='fit',
         )
+        self.close_btn = ExtButton(
+            text='Закрыть',
+            handler='function() {win.close()}'
+        )
+
+        # Кнопка "Отмена" не блокируется в режиме "только для чтения"
+        self._mro_exclude_list.append(self.close_btn)
 
     def _do_layout(self):
         """Размещение элементов окна."""
@@ -123,6 +130,9 @@ class AsyncTaskResultViewWindow(BaseWindow):
             self.progress_fld, self.state_fld, self.error_fld])
         self.top_region.items.extend([
             self.task_type_fld, self.description_fld])
+        self.buttons.extend([
+            self.close_btn,
+        ])
 
     def _configure_results_grid(self, data: dict):
         """Конфигурирование грида с результатами задачи."""

educommon/report/constructor/builders/excel/_base.py

@@ -1042,9 +1042,15 @@ class DataLoader:
         ).exclude(
             column_id__in=self._ignored_columns_ids
         ).exists():
-            result = result.filter(
-                self._data_filterer.get_orm_filters()
-            ).distinct('pk')
+            # Является ли модель древовидной(mptt - Modified Preorder Tree Traversal)
+            if hasattr(self._data_source.model, '_mptt_meta'):
+                result = result.filter(
+                    self._data_filterer.get_orm_filters()
+                ).distinct(self._data_source.model._mptt_meta.tree_id_attr)
+            else:
+                result = result.filter(
+                    self._data_filterer.get_orm_filters()
+                ).distinct('pk')
         # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         # Добавление параметров включения вложенных учреждений.
 

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.9.7^0
-VERSION = 3.9.7
-REVISION = 2150c3554f1cdb0dbe1969c67642543d95993b43
-VERSION_DATE = 14.05.2024
-REVISION_DATE = 14.05.2024
+BRANCH = tags/3.9.9^0
+VERSION = 3.9.9
+REVISION = 2d3b71332d666fd04710cba539889684db787d3b
+VERSION_DATE = 02.07.2024
+REVISION_DATE = 02.07.2024

{educommon-3.9.7.dist-info → educommon-3.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.9.7
+Version: 3.9.9
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group

{educommon-3.9.7.dist-info → educommon-3.9.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 educommon/__init__.py,sha256=fvsBDL7g8HgOTd-JHOh7TSvMcnUauvGVgPuyA2Z9hUI,419
 educommon/thread_data.py,sha256=n0XtdesP9H92O3rJ8K6fVnJLiHqyJEfh2xpuT36wzxs,61
-educommon/version.conf,sha256=m_HlJ1eU43zFeo-7ziC0ih-q3zcO04s_WELvd1sWObM,450
+educommon/version.conf,sha256=q0D3hPkCDlx0wZTT80WA8kCxLNImlP4GI6vr_-h8jfs,450
 educommon/about/README.rst,sha256=U48UW5jv-8qHyaV56atzzkNMvzHKXVcWSb_NR06PnMo,2685
 educommon/about/__init__.py,sha256=H1W0IgW-qX9LCZ49GOJzHdmQGHhh-MA6U1xmNx7WnfM,132
 educommon/about/apps.py,sha256=GrpJAOE2sF0ukWsqugP_WJS88DO4aL-T3kTLprrJrcA,259
@@ -22,7 +22,7 @@ educommon/async_task/helpers.py,sha256=HihuIHrszhVQAb-Cs6-l4npnlNAgctItGBJ-oIPQX
 educommon/async_task/locker.py,sha256=TwVFhuEGsK0JHPXsWuqx7t2Op2mUKETY5EvHSeuKjc8,3844
 educommon/async_task/models.py,sha256=pICrDFr4Vq6KWpa28NIALP45aLs0lqP7YC2p1IQDFSc,7430
 educommon/async_task/tasks.py,sha256=A6tIuDyqMo9pPEezluyO8_Gs_XerMvWdFmluZ6VjFwI,11537
-educommon/async_task/ui.py,sha256=x7SeQZ_JXCy7gbUtVTcDXqmS-mCWKH_BgJc2gK1i_hw,5446
+educommon/async_task/ui.py,sha256=LD7RwM4-6M_6ZO3Ulwy6_lK7rDPcddg-gB6EOV65494,5829
 educommon/async_task/migrations/0001_initial.py,sha256=W0HfBmhatmQ7Dy4giGeqaZNtLHiEVAvJqx0AvHaxGZ0,3677
 educommon/async_task/migrations/0002_task_type_and_status_data.py,sha256=rDGxKnbwu4OqfcodFwA_TR-kfDGRKJhivEBFKuurM30,3359
 educommon/async_task/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -252,7 +252,7 @@ educommon/report/constructor/utils.py,sha256=lXfKGlqPhmlnSLg4O0FTxRd3kLQtx3WlLQ7
 educommon/report/constructor/validators.py,sha256=E_VKNz0Z3YqJOJTjd7OdZXFMDnW8UUiVUIH9Jk6Irtw,524
 educommon/report/constructor/builders/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 educommon/report/constructor/builders/excel/__init__.py,sha256=ZjiilnR4FRJm0DM06G3yKHBEDAPXs5JvuPO3JOg2FB8,104
-educommon/report/constructor/builders/excel/_base.py,sha256=e3wTeUStC9eLn23afQGjG1Kp7jr4kjuyRt7dUkJMYVI,55789
+educommon/report/constructor/builders/excel/_base.py,sha256=JHfPgyQjaOhuOI9MpZ4k2_K_tR8AzQTEoNCVnli8lbo,56169
 educommon/report/constructor/builders/excel/_header.py,sha256=JUHHlBgkENPatp34csKrefteHsdbeCdJzqzSdTtof8M,4758
 educommon/report/constructor/builders/excel/constants.py,sha256=SM5OEkd7CMrGhuCpMWIdZGy-R1NAUB06973QnECayR0,28
 educommon/report/constructor/builders/excel/product.py,sha256=NsfjhUViZyi_XpDjiUJDwfgHVRlE98v40RMAa6mpAzk,6229
@@ -344,8 +344,8 @@ educommon/ws_log/smev/exceptions.py,sha256=lmy7o2T3dJkqgIhG07qyh5yPqO3qZAYABuT4J
 educommon/ws_log/templates/report/smev_logs.xlsx,sha256=nnYgB0Z_ix8HoxsRICjsZfFRQBdra-5Gd8nWhCxTjYg,10439
 educommon/ws_log/templates/ui-js/smev-logs-list-window.js,sha256=AGup3D8GTJSY9WdDPj0zBJeYQBFOmGgcbxPOJbKK-nY,513
 educommon/ws_log/templates/ui-js/smev-logs-report-setting-window.js,sha256=nQ7QYK9frJcE7g7kIt6INg9TlEEJAPPayBJgRaoTePA,1103
-educommon-3.9.7.dist-info/METADATA,sha256=Na6dokHStlFYA89oTQFQsWs1pBNs7YYjsoQTYGOyuUA,1562
-educommon-3.9.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-educommon-3.9.7.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.9.7.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.9.7.dist-info/RECORD,,
+educommon-3.9.9.dist-info/METADATA,sha256=3pTRDtYLzRZF949mWKXop0DcwX8K0Qf3kFlj8X_0xeQ,1562
+educommon-3.9.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+educommon-3.9.9.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.9.9.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.9.9.dist-info/RECORD,,

{educommon-3.9.7.dist-info → educommon-3.9.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any