educommon 3.9.8__py3-none-any.whl → 3.9.10__py3-none-any.whl

educommon/async_task/tasks.py

@@ -184,6 +184,8 @@ class AsyncTask(Task):
             'description': '',
             # прогресс выполнения задачи
             'progress': 'Неизвестно',
+            'exc_type': '',
+            'exc_message': '',
         }
         self.update_state(
             state=AsyncTaskStatus.to_state(AsyncTaskStatus.STARTED),
@@ -280,6 +282,9 @@ class AsyncTask(Task):
 
         Запускается, если во время выполнения задачи возникла ошибка.
         """
+        self.state['exc_type'] = type(exc).__name__
+        self.state['exc_message'] = exc.__str__()
+
         self._update_running_task(
             task_id,
             status=AsyncTaskStatus.FAILURE,

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.8^0
-VERSION = 3.9.8
-REVISION = f87b19df49230862f46efc66045849429797b4a4
-VERSION_DATE = 04.06.2024
-REVISION_DATE = 04.06.2024
+BRANCH = tags/3.9.10^0
+VERSION = 3.9.10
+REVISION = 1112116de9c8a0d9e1c4ebafd722a54099e01d24
+VERSION_DATE = 16.08.2024
+REVISION_DATE = 16.08.2024

{educommon-3.9.8.dist-info → educommon-3.9.10.dist-info}/METADATA

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

{educommon-3.9.8.dist-info → educommon-3.9.10.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=3CBF_KiYDEDO446tKaYHM4VfqJU8f-dh1u-IJ8mBDYg,450
+educommon/version.conf,sha256=OAKPc5vYfi5eE4S1nGWXVq-cTiRTJaacnpZIbC1pQUI,452
 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
@@ -21,7 +21,7 @@ educommon/async_task/exceptions.py,sha256=PaaG2nqP0G2eZ-p0yssca2hhxIccil6MYKH6Zt
 educommon/async_task/helpers.py,sha256=HihuIHrszhVQAb-Cs6-l4npnlNAgctItGBJ-oIPQX74,2706
 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/tasks.py,sha256=nPtCJjEu3NyiKj2Vq-mIegmcMiXSPDPaXeF3RpiwzP8,11699
 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
@@ -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.8.dist-info/METADATA,sha256=h-skqLGDNSTS3LMd7AX90T-N_R0NUJYwfs73kkoBCKE,1562
-educommon-3.9.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-educommon-3.9.8.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.9.8.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.9.8.dist-info/RECORD,,
+educommon-3.9.10.dist-info/METADATA,sha256=ZHwPfiqOXR5xzI0YJNHoy79paWEA8pGjDSjJSyKtPik,1563
+educommon-3.9.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+educommon-3.9.10.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.9.10.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.9.10.dist-info/RECORD,,

{educommon-3.9.8.dist-info → educommon-3.9.10.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