Merge branch 'release/v202410.1140'

iplweb · Oct 6, 2024 · 0daceba · 0daceba
2 parents 364f535 + 629364e
commit 0daceba
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 54 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -4,6 +4,24 @@ Historia zmian
 
 .. towncrier release notes start
 
+Bpp 202410.1140 (2024-10-07)
+============================
+
+Naprawione
+----------
+
+- usuń błąd który nie wyświetlał nie-obcych autorów w sytuacji gdy byli przypisani do obcej jednostki + błędnej jednostki (ale mieli dodatkowe przypisania, właściwe dla uczelni) w sytuacji wyłączonej opcji "pokazuj obcych autorów w przeglądaniu danych" (#1445)
+- podpowiadaj dyscyplinę dla wpisywania autorów przez "zakładkę" (powyżej 25 autorów)
+- szybsze generowanie XLSa w raport slotów - ewaluacja
+
+
+Usprawnienie
+------------
+
+- maksymalny rok dla PBN ustawiony na 2025 (#1409)
+- wyswietlaj ID systemu kadrowego w raport slotów - uczelnia (#1412)
+
+
 Bpp 202410.1138 (2024-10-02)
 ============================
 

diff --git a/Makefile b/Makefile
@@ -165,8 +165,13 @@ loc: clean
 	pygount -N ... -F "...,staticroot,migrations,fixtures" src --format=summary
 
 
-DOCKER_VERSION="202410.1139"
-DOCKER_BUILD=build --platform linux/amd64,linux/arm64 --push
+DOCKER_VERSION="202410.1140"
+
+# Kiedyś było tak: 2 platformy + --push
+# DOCKER_BUILD=build --platform linux/amd64,linux/arm64 --push
+
+# Teraz jest Docker BuildCloud, budujemy lokalnie bez push
+DOCKER_BUILD=build --platform linux/arm64
 
 build-dbserver:
 	docker buildx ${DOCKER_BUILD} -t iplweb/bpp_dbserver:${DOCKER_VERSION} -t iplweb/bpp_dbserver:latest -f deploy/dbserver/Dockerfile deploy/dbserver/

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bpp-iplweb",
-    "version": "v202410.1139",
+    "version": "v202410.1140",
     "license": "MIT",
     "devDependencies": {
         "grunt": ">=1.6.1",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bpp_iplweb"
-version = "202410.1139"
+version = "202410.1140"
 description = ""
 authors = ["Michał Pasternak <michal.dtz@gmail.com>"]
 license = "MIT"
@@ -113,7 +113,7 @@ pytest-rerunfailures = "^14.0"
 django-debug-toolbar = "^4.4.6"
 
 [tool.bumpver]
-current_version = "v202410.1139"
+current_version = "v202410.1140"
 version_pattern = "vYYYY0M.BUILD[-TAGNUM][GITHASH]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true
@@ -144,7 +144,6 @@ channels = { version = "~4", extras = ["daphne"] }
 uvicorn = { version = "0.18.2", extras = ["standard"] }
 channels-redis = "~4"
 django-flexible-reports = ">0.2.9"
-psycopg2 = "2.9.5"
 django-group-by = "0.3.1"
 django-columns = "0.1.0"
 tablib = "3.5.0"
@@ -205,7 +204,7 @@ pymed-iplweb = "0.8.10"
 django-taggit = "4.0.0"
 weasyprint = "55.0"
 requests-oauthlib = "1.3.0"
-django-cacheops = "6.1"
+django-cacheops = "7.0.2"
 djangoql = "0.17.1"
 django-weasyprint = "^2.1.0"
 django-templated-email = "^3.0.0"
@@ -222,6 +221,7 @@ django-tinymce = "^3.6.1"
 crispy-bootstrap5 = "^0.7"
 crispy-bootstrap3 = "^2022.1"
 twisted = {extras = ["http2", "tls"], version = "^24.3.0"}
+psycopg = "^3.2.3"
 
 [tool.poetry.dev-dependencies]
 model-bakery = ">=1.5.1"
@@ -265,7 +265,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.towncrier]
 package = "bpp"
-version = "202410.1139"
+version = "202410.1140"
 package_dir = "src"
 filename = "HISTORY.rst"
 

diff --git a/setup.py b/setup.py
@@ -60,7 +60,7 @@ def requirements(fn="requirements.txt"):
 
 setup(
     name="bpp-iplweb",
-    version="202410.1139",
+    version="202410.1140",
     description="System informatyczny do zarządzania bibliografią publikacji pracowników naukowych",
     long_description=readme,
     long_description_content_type="text/x-rst",

diff --git a/src/bpp/newsfragments/+faa6dfa4.bugfix.rst b/src/bpp/newsfragments/+faa6dfa4.bugfix.rst
diff --git a/src/bpp/newsfragments/1409.feature.rst b/src/bpp/newsfragments/1409.feature.rst
diff --git a/src/bpp/newsfragments/1412.feature.rst b/src/bpp/newsfragments/1412.feature.rst
diff --git a/src/bpp/newsfragments/1445.bugfix.rst b/src/bpp/newsfragments/1445.bugfix.rst
diff --git a/src/bpp/tests/test_models/test_struktura/test_autor_jednostka.py b/src/bpp/tests/test_models/test_struktura/test_autor_jednostka.py
@@ -1,7 +1,7 @@
 from datetime import date, datetime, timedelta
 
 import pytest
-from django.db.utils import IntegrityError, InternalError
+from django.db import IntegrityError, OperationalError
 from model_bakery import baker
 
 from bpp.models.autor import Autor_Jednostka
@@ -13,7 +13,7 @@ def test_autor_jednostka_trigger_nie_mozna_zmienic_id_autora(
 ):
     aj = baker.make(Autor_Jednostka, autor=autor_jan_kowalski, jednostka=jednostka)
     aj.autor = autor_jan_nowak
-    with pytest.raises(InternalError):
+    with pytest.raises(OperationalError):
         aj.save()
 
 

diff --git a/src/bpp/tests/test_models/test_struktura/test_jednostka_wydzial_jednostka.py b/src/bpp/tests/test_models/test_struktura/test_jednostka_wydzial_jednostka.py
@@ -2,7 +2,8 @@
 
 import pytest
 from django.core.exceptions import ValidationError
-from django.db.utils import IntegrityError, InternalError
+from django.db import OperationalError
+from django.db.utils import IntegrityError
 from model_bakery import baker
 
 from bpp.models.struktura import Jednostka, Jednostka_Wydzial, Uczelnia, Wydzial
@@ -49,7 +50,7 @@ def test_jednostka_before_insert():
     w1 = baker.make(Wydzial, uczelnia=u1)
     w2 = baker.make(Wydzial, uczelnia=u2)
 
-    with pytest.raises(InternalError):
+    with pytest.raises(OperationalError):
         j = baker.make(Jednostka, uczelnia=u2, wydzial=w1)
 
     j = baker.make(Jednostka, uczelnia=u2, wydzial=w2)
@@ -73,7 +74,7 @@ def test_jednostka_wydzial_before_insert():
     assert j1.wydzial is None
 
     jw = Jednostka_Wydzial(jednostka=j1, wydzial=w2)
-    with pytest.raises(InternalError):
+    with pytest.raises(OperationalError):
         jw.save()
 
     jw = Jednostka_Wydzial.objects.create(jednostka=j1, wydzial=w1)
@@ -144,7 +145,7 @@ def test_jednostka_wydzial_time_trigger_delete_1():
 
     jw1.jednostka = j2
 
-    with pytest.raises(InternalError):
+    with pytest.raises(OperationalError):
         jw1.save()
 
     for elem in u1, w1, j1, j2, jw1:

diff --git a/src/django_bpp/settings/base.py b/src/django_bpp/settings/base.py
@@ -502,7 +502,7 @@ def autoslug_gen():
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
         "NAME": env("DJANGO_BPP_DB_NAME"),
         "USER": env("DJANGO_BPP_DB_USER"),
         "PASSWORD": env("DJANGO_BPP_DB_PASSWORD"),

diff --git a/src/django_bpp/templates/admin/bpp/wydawnictwo_ciagle_autor/change_form.html b/src/django_bpp/templates/admin/bpp/wydawnictwo_ciagle_autor/change_form.html
@@ -2,7 +2,7 @@
 
 {% block object-tools %}
     {% if rok %}
-        <input type="hidden" name="rok" value="{{ rok }}"/>
+        <input type="hidden" name="rok" value="{{ rok }}" id="id_rok"/>
     {% endif %}
     {{ block.super }}
 {% endblock %}

diff --git a/src/django_bpp/templates/admin/bpp/wydawnictwo_zwarte_autor/change_form.html b/src/django_bpp/templates/admin/bpp/wydawnictwo_zwarte_autor/change_form.html
@@ -2,7 +2,7 @@
 
 {% block object-tools %}
     {% if rok %}
-        <input type="hidden" name="rok" value="{{ rok }}"/>
+        <input type="hidden" name="rok" value="{{ rok }}" id="id_rok"/>
     {% endif %}
     {{ block.super }}
 {% endblock %}

diff --git a/src/django_bpp/version.py b/src/django_bpp/version.py
@@ -1,4 +1,4 @@
-VERSION = "202410.1139"
+VERSION = "202410.1140"
 
 if __name__ == "__main__":
     import sys