educommon 3.9.6__py3-none-any.whl → 3.9.8__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/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.9.6
-VERSION = 3.9.6
-REVISION = 1db60d8567b7d574828c7217b421726deb3ab035
-VERSION_DATE = 12.04.2024
-REVISION_DATE = 12.04.2024
+BRANCH = tags/3.9.8^0
+VERSION = 3.9.8
+REVISION = f87b19df49230862f46efc66045849429797b4a4
+VERSION_DATE = 04.06.2024
+REVISION_DATE = 04.06.2024

educommon/ws_log/models.py

@@ -12,6 +12,7 @@ from django.db.models.expressions import (
     Value,
     When,
 )
+
 from m3.db import (
     BaseEnumerate,
     BaseObjectModel,
@@ -47,7 +48,7 @@ class ExtendedSmevLogManager(models.Manager):
     """
 
     def get_queryset(self):
-        query = super(ExtendedSmevLogManager, self).get_queryset()
+        query = super().get_queryset()
         return query.annotate(
             # Пустые и null значения приведем к значению по умолчанию "Успешно"
             # для использования в фильтрации
@@ -56,7 +57,8 @@ class ExtendedSmevLogManager(models.Manager):
                     Q(result__isnull=True) | Q(result=''),
                     then=Value(SmevLog.RESULT_DEFAULT_VALUE)
                 ),
-                default='result'
+                default='result',
+                output_field=models.CharField()
             ),
         )
 

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

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

{educommon-3.9.6.dist-info → educommon-3.9.8.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=l7UfRQw8wmcaWx-1EAAFDaIke-pX2sbG3vJcPUn4CEA,448
+educommon/version.conf,sha256=3CBF_KiYDEDO446tKaYHM4VfqJU8f-dh1u-IJ8mBDYg,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
@@ -323,7 +323,7 @@ educommon/ws_log/__init__.py,sha256=9VzXIVt7xpcgQBW6QWWc8np2PJpJfrkPqi5OmVG_Jo4,
 educommon/ws_log/actions.py,sha256=pnG1m5fkpcQq0fg06KC8cLp-TryxILEOELx8985SpFY,9153
 educommon/ws_log/app_meta.py,sha256=JG1hyk9JQwxL-CY7Z3gDhoZA1M9DtD6Z0jcXCQ9vNt8,94
 educommon/ws_log/base.py,sha256=PhihS8qDJ_y9GITlmJ2lXoHbTBzQmiaLO6ojXrt-nCk,7138
-educommon/ws_log/models.py,sha256=F2y0AWFHjkr6eH4Nkr10IbZ-teHL0Wn2YnhDt7kpJA8,5634
+educommon/ws_log/models.py,sha256=bBknFBRyjJsDMQiLy5h7twJwOVAHbWTf92gSOZxLYyw,5656
 educommon/ws_log/provider.py,sha256=qRFo6zfdtNY-PtH9OpECZ_ioSncQpV6IwzCP_XPaOaw,885
 educommon/ws_log/report.py,sha256=uHotDZbRrDc_nLwn06kcvn9i5QLM_gpVMcWu1qTZdOA,3487
 educommon/ws_log/ui.py,sha256=DlqrBj-hV4bbTaiLWmRvTXA7TQO_vOiYHhE-fEq7Yxk,4038
@@ -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.6.dist-info/METADATA,sha256=S0A8Y2rjK_IgCSYD5Gs3bpq3RSLUYzUioswDSuDlANs,1562
-educommon-3.9.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-educommon-3.9.6.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.9.6.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.9.6.dist-info/RECORD,,
+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,,