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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. educommon/version.conf +5 -5
  2. educommon/ws_log/models.py +4 -2
  3. {educommon-3.9.6.dist-info → educommon-3.9.7.dist-info}/METADATA +1 -1
  4. {educommon-3.9.6.dist-info → educommon-3.9.7.dist-info}/RECORD +7 -7
  5. {educommon-3.9.6.dist-info → educommon-3.9.7.dist-info}/WHEEL +0 -0
  6. {educommon-3.9.6.dist-info → educommon-3.9.7.dist-info}/dependency_links.txt +0 -0
  7. {educommon-3.9.6.dist-info → educommon-3.9.7.dist-info}/top_level.txt +0 -0
educommon/version.conf CHANGED
@@ -4,8 +4,8 @@
4
4
  # нормальной установки обновлений.
5
5
 
6
6
  [version]
7
- BRANCH = tags/3.9.6
8
- VERSION = 3.9.6
9
- REVISION = 1db60d8567b7d574828c7217b421726deb3ab035
10
- VERSION_DATE = 12.04.2024
11
- REVISION_DATE = 12.04.2024
7
+ BRANCH = tags/3.9.7^0
8
+ VERSION = 3.9.7
9
+ REVISION = 2150c3554f1cdb0dbe1969c67642543d95993b43
10
+ VERSION_DATE = 14.05.2024
11
+ REVISION_DATE = 14.05.2024
educommon/ws_log/models.py CHANGED
@@ -12,6 +12,7 @@ from django.db.models.expressions import (
12
12
  Value,
13
13
  When,
14
14
  )
15
+
15
16
  from m3.db import (
16
17
  BaseEnumerate,
17
18
  BaseObjectModel,
@@ -47,7 +48,7 @@ class ExtendedSmevLogManager(models.Manager):
47
48
  """
48
49
 
49
50
  def get_queryset(self):
50
- query = super(ExtendedSmevLogManager, self).get_queryset()
51
+ query = super().get_queryset()
51
52
  return query.annotate(
52
53
  # Пустые и null значения приведем к значению по умолчанию "Успешно"
53
54
  # для использования в фильтрации
@@ -56,7 +57,8 @@ class ExtendedSmevLogManager(models.Manager):
56
57
  Q(result__isnull=True) | Q(result=''),
57
58
  then=Value(SmevLog.RESULT_DEFAULT_VALUE)
58
59
  ),
59
- default='result'
60
+ default='result',
61
+ output_field=models.CharField()
60
62
  ),
61
63
  )
62
64
 
{educommon-3.9.6.dist-info → educommon-3.9.7.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: educommon
3
- Version: 3.9.6
3
+ Version: 3.9.7
4
4
  Summary: Общая кодовая база для проектов БЦ Образование
5
5
  Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
6
6
  Author: BARS Group
{educommon-3.9.6.dist-info → educommon-3.9.7.dist-info}/RECORD RENAMED
@@ -1,6 +1,6 @@
1
1
  educommon/__init__.py,sha256=fvsBDL7g8HgOTd-JHOh7TSvMcnUauvGVgPuyA2Z9hUI,419
2
2
  educommon/thread_data.py,sha256=n0XtdesP9H92O3rJ8K6fVnJLiHqyJEfh2xpuT36wzxs,61
3
- educommon/version.conf,sha256=l7UfRQw8wmcaWx-1EAAFDaIke-pX2sbG3vJcPUn4CEA,448
3
+ educommon/version.conf,sha256=m_HlJ1eU43zFeo-7ziC0ih-q3zcO04s_WELvd1sWObM,450
4
4
  educommon/about/README.rst,sha256=U48UW5jv-8qHyaV56atzzkNMvzHKXVcWSb_NR06PnMo,2685
5
5
  educommon/about/__init__.py,sha256=H1W0IgW-qX9LCZ49GOJzHdmQGHhh-MA6U1xmNx7WnfM,132
6
6
  educommon/about/apps.py,sha256=GrpJAOE2sF0ukWsqugP_WJS88DO4aL-T3kTLprrJrcA,259
@@ -323,7 +323,7 @@ educommon/ws_log/__init__.py,sha256=9VzXIVt7xpcgQBW6QWWc8np2PJpJfrkPqi5OmVG_Jo4,
323
323
  educommon/ws_log/actions.py,sha256=pnG1m5fkpcQq0fg06KC8cLp-TryxILEOELx8985SpFY,9153
324
324
  educommon/ws_log/app_meta.py,sha256=JG1hyk9JQwxL-CY7Z3gDhoZA1M9DtD6Z0jcXCQ9vNt8,94
325
325
  educommon/ws_log/base.py,sha256=PhihS8qDJ_y9GITlmJ2lXoHbTBzQmiaLO6ojXrt-nCk,7138
326
- educommon/ws_log/models.py,sha256=F2y0AWFHjkr6eH4Nkr10IbZ-teHL0Wn2YnhDt7kpJA8,5634
326
+ educommon/ws_log/models.py,sha256=bBknFBRyjJsDMQiLy5h7twJwOVAHbWTf92gSOZxLYyw,5656
327
327
  educommon/ws_log/provider.py,sha256=qRFo6zfdtNY-PtH9OpECZ_ioSncQpV6IwzCP_XPaOaw,885
328
328
  educommon/ws_log/report.py,sha256=uHotDZbRrDc_nLwn06kcvn9i5QLM_gpVMcWu1qTZdOA,3487
329
329
  educommon/ws_log/ui.py,sha256=DlqrBj-hV4bbTaiLWmRvTXA7TQO_vOiYHhE-fEq7Yxk,4038
@@ -344,8 +344,8 @@ educommon/ws_log/smev/exceptions.py,sha256=lmy7o2T3dJkqgIhG07qyh5yPqO3qZAYABuT4J
344
344
  educommon/ws_log/templates/report/smev_logs.xlsx,sha256=nnYgB0Z_ix8HoxsRICjsZfFRQBdra-5Gd8nWhCxTjYg,10439
345
345
  educommon/ws_log/templates/ui-js/smev-logs-list-window.js,sha256=AGup3D8GTJSY9WdDPj0zBJeYQBFOmGgcbxPOJbKK-nY,513
346
346
  educommon/ws_log/templates/ui-js/smev-logs-report-setting-window.js,sha256=nQ7QYK9frJcE7g7kIt6INg9TlEEJAPPayBJgRaoTePA,1103
347
- educommon-3.9.6.dist-info/METADATA,sha256=S0A8Y2rjK_IgCSYD5Gs3bpq3RSLUYzUioswDSuDlANs,1562
348
- educommon-3.9.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
349
- educommon-3.9.6.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
350
- educommon-3.9.6.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
351
- educommon-3.9.6.dist-info/RECORD,,
347
+ educommon-3.9.7.dist-info/METADATA,sha256=Na6dokHStlFYA89oTQFQsWs1pBNs7YYjsoQTYGOyuUA,1562
348
+ educommon-3.9.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
349
+ educommon-3.9.7.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
350
+ educommon-3.9.7.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
351
+ educommon-3.9.7.dist-info/RECORD,,