educommon 3.9.3__py3-none-any.whl → 3.9.4__py3-none-any.whl

educommon/report/constructor/base.py

@@ -231,6 +231,11 @@ class ColumnDescriptor:
             )
             if skip_field(descriptor.parent.model, field, accessor_name):
                 return True
+            # проверка, что связанная модель поля, не связана с родительскими моделями полей
+            if (getattr(field, 'related_model', None) and
+                field.related_model in descriptor.parent.related_field_models
+            ):
+                return True
 
             descriptor = descriptor.parent
         # проверка модели источника данных
@@ -251,6 +256,25 @@ class ColumnDescriptor:
 
         return model
 
+    @cached_property
+    def related_field_models(self):
+        """Связанные модели полей."""
+        fields_models = set()
+        # Для первых в корне добавляем модели источника данных.
+        if self.parent is None:
+            data_source_columns = tuple(self.data_source.get_available_columns())
+            fields_models.update({column.model for column in data_source_columns if column.model})
+            fields_models.add(self.data_source.model)
+
+        # получаем поля текущего экземпляра
+        if self.model:
+            fields = self.model._meta.get_fields()
+            fields_models.update({field.related_model for field in fields if field.related_model})
+            # добавляем саму модель экземпляра, если она есть
+            fields_models.add(self.model)
+
+        return fields_models
+
     @property
     def accessor_name(self):
         return force_str(_get_accessor_name(self.field))

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.9.3
-VERSION = 3.9.3
-REVISION = 9c15127d6248360b22215f4eb89ffb05a8ab16b5
-VERSION_DATE = 18.03.2024
-REVISION_DATE = 18.03.2024
+BRANCH = tags/3.9.4^0
+VERSION = 3.9.4
+REVISION = b525751553abee2f4deac7b1783499fb00ef29f5
+VERSION_DATE = 03.04.2024
+REVISION_DATE = 03.04.2024

{educommon-3.9.3.dist-info → educommon-3.9.4.dist-info}/METADATA

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

{educommon-3.9.3.dist-info → educommon-3.9.4.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=5CkFUgZOxukm1Z-0yB-4x4DvTz3QyPlrPnBIBgcSno0,448
+educommon/version.conf,sha256=45BReSu8CR7Bw853URhL6tptlqRIL7Bo_BbW3NJj4VY,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
@@ -238,7 +238,7 @@ educommon/report/constructor/README.rst,sha256=M6bnt3eAdRMUSIbRXdbuleron11RajRmT
 educommon/report/constructor/__init__.py,sha256=sMDEr17Etf69p4NKRelFv9ySrNT6JulFO1IByVfZA1w,1252
 educommon/report/constructor/app_meta.py,sha256=4hFKVlGCO4Mlu46fCw5k7iD9kSse8b9MQt3tRV5WyfE,200
 educommon/report/constructor/apps.py,sha256=NUp1dCkzHduZFXT6XPDQPasAei3Bs3TYdEQzXhqn1J8,371
-educommon/report/constructor/base.py,sha256=63y99_aS-y08EqXCDLF7oD80oHDEGjDoEWL8AZnFpek,26007
+educommon/report/constructor/base.py,sha256=QUwT-hksW-ho0t-fEXslJ6cpTVRrjLFAU6guCDcqc7Y,27289
 educommon/report/constructor/config.py,sha256=6PjPv4A3zww_DnZqE-aj72zduW7cZqbzVwuCP8JDsYg,1058
 educommon/report/constructor/constants.py,sha256=VF3tu6vEWrN37oPyipD3LGCElbaY2JHGaKy7AxUbQIU,3381
 educommon/report/constructor/exceptions.py,sha256=NL2mQggBHbkHaQFKpr9mTj7R5IVtxtCRKzJ00dgfTqM,1287
@@ -342,8 +342,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.3.dist-info/METADATA,sha256=MQm6ZohbMiKGqXCeX8Rjew7ijtm2FNoO-p4el5Y_6Lk,1486
-educommon-3.9.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-educommon-3.9.3.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.9.3.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.9.3.dist-info/RECORD,,
+educommon-3.9.4.dist-info/METADATA,sha256=2hmH1DlhM909yL-K__dPJVJVZr_yCDrhO9HBNGZsXu8,1486
+educommon-3.9.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+educommon-3.9.4.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.9.4.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.9.4.dist-info/RECORD,,