From 46caa77047566dc0e34a8febb7a843859fb594b6 Mon Sep 17 00:00:00 2001 From: Berry den Hartog <38954346+berrydenhartog@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:54:57 +0000 Subject: [PATCH] Rename algorithm-system to algorithm --- amt/api/main.py | 4 +- amt/api/navigation.py | 40 ++++----- amt/api/routes/algorithm.py | 44 +++------- amt/api/routes/algorithms.py | 4 +- amt/api/routes/auth.py | 2 +- amt/locale/base.pot | 54 ++++++------ amt/locale/en_US/LC_MESSAGES/messages.mo | Bin 733 -> 733 bytes amt/locale/en_US/LC_MESSAGES/messages.po | 53 ++++++----- amt/locale/nl_NL/LC_MESSAGES/messages.mo | Bin 11958 -> 11716 bytes amt/locale/nl_NL/LC_MESSAGES/messages.po | 82 ++++++++---------- .../f6da4d6dd867_remove_project_table.py | 21 ++--- .../templates/algorithms/details_base.html.j2 | 8 +- .../templates/algorithms/details_info.html.j2 | 2 +- .../algorithms/details_measure_modal.html.j2 | 2 +- .../algorithms/details_requirements.html.j2 | 2 +- amt/site/templates/algorithms/new.html.j2 | 12 +-- amt/site/templates/algorithms/tasks.html.j2 | 2 +- amt/site/templates/macros/table_row.html.j2 | 4 +- amt/site/templates/pages/system_card.html.j2 | 4 +- .../templates/parts/algorithm_search.html.j2 | 17 ++-- amt/site/templates/parts/filter_list.html.j2 | 14 +-- tests/api/routes/test_algorithm.py | 60 +++++++------ tests/api/routes/test_algorithms.py | 24 +++-- tests/api/test_navigation.py | 6 +- tests/core/test_exception_handlers.py | 12 +-- tests/e2e/test_create_algorithm.py | 6 +- tests/e2e/test_move_task.py | 4 +- tests/e2e/test_scroll_algorithm.py | 4 +- tests/e2e/test_search_algorithm.py | 16 ++-- .../regression/e2e/test_duplicate_task_bug.py | 2 +- .../templates/test_template_new_algorithm.py | 2 +- 31 files changed, 232 insertions(+), 275 deletions(-) diff --git a/amt/api/main.py b/amt/api/main.py index ec4321ec..f381b234 100644 --- a/amt/api/main.py +++ b/amt/api/main.py @@ -6,6 +6,6 @@ api_router.include_router(root.router) api_router.include_router(health.router, prefix="/health", tags=["health"]) api_router.include_router(pages.router, prefix="/pages", tags=["pages"]) -api_router.include_router(algorithms.router, prefix="/algorithm-systems", tags=["algorithm-systems"]) -api_router.include_router(algorithm.router, prefix="/algorithm-system", tags=["algorithm-system"]) +api_router.include_router(algorithms.router, prefix="/algorithms", tags=["algorithms"]) +api_router.include_router(algorithm.router, prefix="/algorithm", tags=["algorithm"]) api_router.include_router(auth.router, prefix="/auth", tags=["auth"]) diff --git a/amt/api/navigation.py b/amt/api/navigation.py index 088f6c0f..d1516168 100644 --- a/amt/api/navigation.py +++ b/amt/api/navigation.py @@ -22,7 +22,7 @@ class DisplayText(Enum): ALGORITHM_DETAILS = "algorithm_details" INFO = "info" HOME = "home" - ALGORITHMS = "algorithm systems" + ALGORITHMS = "algorithms" OVERVIEW = "overview" TASKS = "tasks" NEW = "new" @@ -43,7 +43,7 @@ def get_translation(key: DisplayText, translations: NullTranslations) -> str: # translations are determined at runtime, which is why we use the dictionary below keys = { DisplayText.HOME: _("Home"), - DisplayText.ALGORITHMS: _("Algorithm systems"), + DisplayText.ALGORITHMS: _("Algorithms"), DisplayText.OVERVIEW: _("Overview"), DisplayText.TASKS: _("Tasks"), DisplayText.NEW: _("New"), @@ -92,45 +92,41 @@ def get_display_text(self, translations: NullTranslations | None = None) -> str: class Navigation: ALGORITHMS_ROOT = BaseNavigationItem( display_text=DisplayText.ALGORITHMS, - url=["/algorithm-systems/", "/algorithm-system/"], + url=["/algorithms/", "/algorithm/"], icon="rvo-icon-publicatie", ) - ALGORITHMS_OVERVIEW = BaseNavigationItem(display_text=DisplayText.OVERVIEW, url="/algorithm-systems/") - ALGORITHM_TASKS = BaseNavigationItem( - display_text=DisplayText.TASKS, url="/algorithm-system/{algorithm_id}/details/tasks" - ) + ALGORITHMS_OVERVIEW = BaseNavigationItem(display_text=DisplayText.OVERVIEW, url="/algorithms/") + ALGORITHM_TASKS = BaseNavigationItem(display_text=DisplayText.TASKS, url="/algorithm/{algorithm_id}/details/tasks") ALGORITHM_DETAILS = BaseNavigationItem( - display_text=DisplayText.DETAILS, url="/algorithm-system/{algorithm_id}/details/system_card" + display_text=DisplayText.DETAILS, url="/algorithm/{algorithm_id}/details/system_card" ) ALGORITHM_MODEL = BaseNavigationItem( - display_text=DisplayText.MODEL, url="/algorithm-system/{algorithm_id}/details/model/inference" - ) - ALGORITHM_NEW = BaseNavigationItem(display_text=DisplayText.NEW, url="/algorithm-systems/new") - ALGORITHM_SYSTEM_INFO = BaseNavigationItem( - display_text=DisplayText.INFO, url="/algorithm-system/{algorithm_id}/details" + display_text=DisplayText.MODEL, url="/algorithm/{algorithm_id}/details/model/inference" ) - ALGORITHM_SYSTEM_ALGORITHM_DETAILS = BaseNavigationItem( - display_text=DisplayText.ALGORITHM_DETAILS, url="/algorithm-system/{algorithm_id}/details/system_card" + ALGORITHM_NEW = BaseNavigationItem(display_text=DisplayText.NEW, url="/algorithms/new") + ALGORITHM_INFO = BaseNavigationItem(display_text=DisplayText.INFO, url="/algorithm/{algorithm_id}/details") + ALGORITHM_ALGORITHM_DETAILS = BaseNavigationItem( + display_text=DisplayText.ALGORITHM_DETAILS, url="/algorithm/{algorithm_id}/details/system_card" ) ALGORITHM_SYSTEM_CARD = BaseNavigationItem( - display_text=DisplayText.SYSTEMCARD, url="/algorithm-system/{algorithm_id}/details/system_card" + display_text=DisplayText.SYSTEMCARD, url="/algorithm/{algorithm_id}/details/system_card" ) ALGORITHM_DATA_CARD = BaseNavigationItem( - display_text=DisplayText.DATA, url="/algorithm-system/{algorithm_id}/details/system_card/data" + display_text=DisplayText.DATA, url="/algorithm/{algorithm_id}/details/system_card/data" ) ALGORITHM_MODEL_CARD = BaseNavigationItem( display_text=DisplayText.MODELCARD, - url="/algorithm-system/{algorithm_id}/details/system_card/models/{model_card}", + url="/algorithm/{algorithm_id}/details/system_card/models/{model_card}", ) ALGORITHM_ASSESSMENT_CARD = BaseNavigationItem( display_text=DisplayText.ASSESSMENTCARD, - url="/algorithm-system/{algorithm_id}/details/system_card/assessment/{assessment_card}", + url="/algorithm/{algorithm_id}/details/system_card/assessment/{assessment_card}", ) ALGORITHM_REQUIREMENTS = BaseNavigationItem( - display_text=DisplayText.REQUIREMENTS, url="/algorithm-system/{algorithm_id}/details/system_card/requirements" + display_text=DisplayText.REQUIREMENTS, url="/algorithm/{algorithm_id}/details/system_card/requirements" ) - ALGORITHM_SYSTEM_INSTRUMENTS = BaseNavigationItem( - display_text=DisplayText.INSTRUMENTS, url="/algorithm-system/{algorithm_id}/details/system_card/instruments" + ALGORITHM_INSTRUMENTS = BaseNavigationItem( + display_text=DisplayText.INSTRUMENTS, url="/algorithm/{algorithm_id}/details/system_card/instruments" ) diff --git a/amt/api/routes/algorithm.py b/amt/api/routes/algorithm.py index 8f79914f..423e453f 100644 --- a/amt/api/routes/algorithm.py +++ b/amt/api/routes/algorithm.py @@ -70,13 +70,13 @@ async def get_algorithm_or_error( def get_algorithm_details_tabs(request: Request) -> list[NavigationItem]: return resolve_navigation_items( [ - Navigation.ALGORITHM_SYSTEM_INFO, - Navigation.ALGORITHM_SYSTEM_ALGORITHM_DETAILS, + Navigation.ALGORITHM_INFO, + Navigation.ALGORITHM_ALGORITHM_DETAILS, Navigation.ALGORITHM_MODEL, Navigation.ALGORITHM_REQUIREMENTS, Navigation.ALGORITHM_DATA_CARD, Navigation.ALGORITHM_TASKS, - Navigation.ALGORITHM_SYSTEM_INSTRUMENTS, + Navigation.ALGORITHM_INSTRUMENTS, ], request, ) @@ -114,9 +114,7 @@ async def get_tasks( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_TASKS, ], request, @@ -193,9 +191,7 @@ async def get_algorithm_details( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_DETAILS, ], request, @@ -287,9 +283,7 @@ async def get_system_card( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_SYSTEM_CARD, ], request, @@ -319,7 +313,7 @@ async def get_algorithm_inference( [ Navigation.ALGORITHMS_ROOT, BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/model/inference" + custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/model/inference" ), Navigation.ALGORITHM_MODEL, ], @@ -359,9 +353,7 @@ async def get_system_card_requirements( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_SYSTEM_CARD, ], request, @@ -440,7 +432,7 @@ async def delete_algorithm( algorithms_service: Annotated[AlgorithmsService, Depends(AlgorithmsService)], ) -> HTMLResponse: await algorithms_service.delete(algorithm_id) - return templates.Redirect(request, "/algorithm-systems/") + return templates.Redirect(request, "/algorithms/") @router.get("/{algorithm_id}/measure/{measure_urn}") @@ -505,7 +497,7 @@ async def update_measure_value( await algorithms_service.update(algorithm) # TODO: FIX THIS!! The page now reloads at the top, which is annoying - return templates.Redirect(request, f"/algorithm-system/{algorithm_id}/details/system_card/requirements") + return templates.Redirect(request, f"/algorithm/{algorithm_id}/details/system_card/requirements") # !!! @@ -528,9 +520,7 @@ async def get_system_card_data_page( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_SYSTEM_CARD, ], request, @@ -568,9 +558,7 @@ async def get_system_card_instruments( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_SYSTEM_CARD, ], request, @@ -606,9 +594,7 @@ async def get_assessment_card( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_ASSESSMENT_CARD, ], request, @@ -657,9 +643,7 @@ async def get_model_card( breadcrumbs = resolve_base_navigation_items( [ Navigation.ALGORITHMS_ROOT, - BaseNavigationItem( - custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card" - ), + BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"), Navigation.ALGORITHM_MODEL_CARD, ], request, diff --git a/amt/api/routes/algorithms.py b/amt/api/routes/algorithms.py index c8920b28..3191d78f 100644 --- a/amt/api/routes/algorithms.py +++ b/amt/api/routes/algorithms.py @@ -69,7 +69,7 @@ async def get_root( if display_type == "LIFECYCLE": algorithms: dict[str, list[Algorithm]] = {} - # When the lifecycle filter is active, only show these algorithm systems + # When the lifecycle filter is active, only show these algorithms if "lifecycle" in filters: for lifecycle in Lifecycles: algorithms[lifecycle.name] = [] @@ -154,5 +154,5 @@ async def post_new( algorithms_service: Annotated[AlgorithmsService, Depends(AlgorithmsService)], ) -> HTMLResponse: algorithm = await algorithms_service.create(algorithm_new) - response = templates.Redirect(request, f"/algorithm-system/{algorithm.id}/details/tasks") + response = templates.Redirect(request, f"/algorithm/{algorithm.id}/details/tasks") return response diff --git a/amt/api/routes/auth.py b/amt/api/routes/auth.py index d8b71908..9e7d4ee5 100644 --- a/amt/api/routes/auth.py +++ b/amt/api/routes/auth.py @@ -72,7 +72,7 @@ async def auth_callback( if user: request.session["user"] = dict(user) # type: ignore request.session["id_token"] = token["id_token"] # type: ignore - return RedirectResponse(url="/algorithm-systems/") + return RedirectResponse(url="/algorithms/") @router.get("/profile", response_class=Response) diff --git a/amt/locale/base.pot b/amt/locale/base.pot index 5b8f1a86..e23d34b6 100644 --- a/amt/locale/base.pot +++ b/amt/locale/base.pot @@ -3,7 +3,6 @@ # This file is distributed under the same license as the PROJECT project. # FIRST AUTHOR , 2024. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" @@ -44,7 +43,7 @@ msgstr "" #: amt/api/group_by_category.py:15 #: amt/site/templates/algorithms/details_info.html.j2:24 #: amt/site/templates/algorithms/new.html.j2:40 -#: amt/site/templates/parts/algorithm_search.html.j2:49 +#: amt/site/templates/parts/algorithm_search.html.j2:48 #: amt/site/templates/parts/filter_list.html.j2:94 msgid "Lifecycle" msgstr "" @@ -90,7 +89,7 @@ msgid "Home" msgstr "" #: amt/api/navigation.py:46 -msgid "Algorithm systems" +msgid "Algorithms" msgstr "" #: amt/api/navigation.py:47 amt/site/templates/auth/profile.html.j2:10 @@ -250,7 +249,7 @@ msgid "No" msgstr "" #: amt/site/templates/algorithms/details_base.html.j2:57 -msgid "Delete algorithm system" +msgid "Delete algorithm" msgstr "" #: amt/site/templates/algorithms/details_base.html.j2:71 @@ -362,7 +361,7 @@ msgid "Repository" msgstr "" #: amt/site/templates/algorithms/details_info.html.j2:20 -msgid "Algorithm system code" +msgid "Algorithm code" msgstr "" #: amt/site/templates/algorithms/details_info.html.j2:28 @@ -436,19 +435,21 @@ msgid "Edit" msgstr "" #: amt/site/templates/algorithms/new.html.j2:7 -msgid "Create a Algorithm System" +msgid "Create a Algorithm" msgstr "" #: amt/site/templates/algorithms/new.html.j2:25 -msgid "Algorithm System name" +#: amt/site/templates/parts/filter_list.html.j2:90 +#: amt/site/templates/parts/filter_list.html.j2:116 +msgid "Algorithm name" msgstr "" #: amt/site/templates/algorithms/new.html.j2:29 -msgid "Name of the algorithm system" +msgid "Name of the algorithm" msgstr "" #: amt/site/templates/algorithms/new.html.j2:43 -msgid "Select the lifecycle your algorithm system is currently in." +msgid "Select the lifecycle your algorithm is currently in." msgstr "" #: amt/site/templates/algorithms/new.html.j2:44 @@ -487,7 +488,7 @@ msgid "Choose one or more instruments" msgstr "" #: amt/site/templates/algorithms/new.html.j2:183 -msgid "Create Algorithm System" +msgid "Create Algorithm" msgstr "" #: amt/site/templates/algorithms/new.html.j2:200 @@ -655,38 +656,38 @@ msgid "Model cards" msgstr "" #: amt/site/templates/parts/algorithm_search.html.j2:9 -msgid "Algorithm Systems" +msgid "algorithms" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:15 -msgid "New algorithm system" +#: amt/site/templates/parts/algorithm_search.html.j2:14 +msgid "New algorithm" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:25 +#: amt/site/templates/parts/algorithm_search.html.j2:24 msgid "Search" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:32 -msgid "Find algorithm system..." +#: amt/site/templates/parts/algorithm_search.html.j2:31 +msgid "Find algorithm..." msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:54 +#: amt/site/templates/parts/algorithm_search.html.j2:53 msgid "Select lifecycle" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:63 +#: amt/site/templates/parts/algorithm_search.html.j2:62 msgid "Category" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:68 +#: amt/site/templates/parts/algorithm_search.html.j2:67 msgid "Select publication category" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:86 +#: amt/site/templates/parts/algorithm_search.html.j2:85 msgid "Group by" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:96 +#: amt/site/templates/parts/algorithm_search.html.j2:95 msgid "Select group by" msgstr "" @@ -709,15 +710,10 @@ msgstr "" #: amt/site/templates/parts/filter_list.html.j2:70 msgid "" -"No Algorithm system match your selected filters. Try adjusting your " -"filters or clearing them to\n" +"No Algorithm match your selected filters. Try adjusting your filters or " +"clearing them to\n" " see more\n" -" algorithm systems." -msgstr "" - -#: amt/site/templates/parts/filter_list.html.j2:90 -#: amt/site/templates/parts/filter_list.html.j2:116 -msgid "Algorithm system name" +" algorithms." msgstr "" #: amt/site/templates/parts/header.html.j2:7 diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo index cffc12f4fef3bdc9bc2b0550a7c31ed936b00ab5..83f4ad01dbe7a7d74a4e8c91f9b2a2636920f6a9 100644 GIT binary patch delta 16 Xcmcc1dY5&BEaPNXMzPJtjH?&{F^mNi delta 28 jcmcc1dY5&BEF-^>fsu)>p`os!v4WwAmGNdB#*K^sZnFmt diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po index 82c01db5..a4557055 100644 --- a/amt/locale/en_US/LC_MESSAGES/messages.po +++ b/amt/locale/en_US/LC_MESSAGES/messages.po @@ -45,7 +45,7 @@ msgstr "" #: amt/api/group_by_category.py:15 #: amt/site/templates/algorithms/details_info.html.j2:24 #: amt/site/templates/algorithms/new.html.j2:40 -#: amt/site/templates/parts/algorithm_search.html.j2:49 +#: amt/site/templates/parts/algorithm_search.html.j2:48 #: amt/site/templates/parts/filter_list.html.j2:94 msgid "Lifecycle" msgstr "" @@ -91,7 +91,7 @@ msgid "Home" msgstr "" #: amt/api/navigation.py:46 -msgid "Algorithm systems" +msgid "Algorithms" msgstr "" #: amt/api/navigation.py:47 amt/site/templates/auth/profile.html.j2:10 @@ -251,7 +251,7 @@ msgid "No" msgstr "" #: amt/site/templates/algorithms/details_base.html.j2:57 -msgid "Delete algorithm system" +msgid "Delete algorithm" msgstr "" #: amt/site/templates/algorithms/details_base.html.j2:71 @@ -363,7 +363,7 @@ msgid "Repository" msgstr "" #: amt/site/templates/algorithms/details_info.html.j2:20 -msgid "Algorithm system code" +msgid "Algorithm code" msgstr "" #: amt/site/templates/algorithms/details_info.html.j2:28 @@ -437,19 +437,21 @@ msgid "Edit" msgstr "" #: amt/site/templates/algorithms/new.html.j2:7 -msgid "Create a Algorithm System" +msgid "Create a Algorithm" msgstr "" #: amt/site/templates/algorithms/new.html.j2:25 -msgid "Algorithm System name" +#: amt/site/templates/parts/filter_list.html.j2:90 +#: amt/site/templates/parts/filter_list.html.j2:116 +msgid "Algorithm name" msgstr "" #: amt/site/templates/algorithms/new.html.j2:29 -msgid "Name of the algorithm system" +msgid "Name of the algorithm" msgstr "" #: amt/site/templates/algorithms/new.html.j2:43 -msgid "Select the lifecycle your algorithm system is currently in." +msgid "Select the lifecycle your algorithm is currently in." msgstr "" #: amt/site/templates/algorithms/new.html.j2:44 @@ -488,7 +490,7 @@ msgid "Choose one or more instruments" msgstr "" #: amt/site/templates/algorithms/new.html.j2:183 -msgid "Create Algorithm System" +msgid "Create Algorithm" msgstr "" #: amt/site/templates/algorithms/new.html.j2:200 @@ -656,38 +658,38 @@ msgid "Model cards" msgstr "" #: amt/site/templates/parts/algorithm_search.html.j2:9 -msgid "Algorithm Systems" +msgid "algorithms" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:15 -msgid "New algorithm system" +#: amt/site/templates/parts/algorithm_search.html.j2:14 +msgid "New algorithm" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:25 +#: amt/site/templates/parts/algorithm_search.html.j2:24 msgid "Search" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:32 -msgid "Find algorithm system..." +#: amt/site/templates/parts/algorithm_search.html.j2:31 +msgid "Find algorithm..." msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:54 +#: amt/site/templates/parts/algorithm_search.html.j2:53 msgid "Select lifecycle" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:63 +#: amt/site/templates/parts/algorithm_search.html.j2:62 msgid "Category" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:68 +#: amt/site/templates/parts/algorithm_search.html.j2:67 msgid "Select publication category" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:86 +#: amt/site/templates/parts/algorithm_search.html.j2:85 msgid "Group by" msgstr "" -#: amt/site/templates/parts/algorithm_search.html.j2:96 +#: amt/site/templates/parts/algorithm_search.html.j2:95 msgid "Select group by" msgstr "" @@ -710,15 +712,10 @@ msgstr "" #: amt/site/templates/parts/filter_list.html.j2:70 msgid "" -"No Algorithm system match your selected filters. Try adjusting your " -"filters or clearing them to\n" +"No Algorithm match your selected filters. Try adjusting your filters or " +"clearing them to\n" " see more\n" -" algorithm systems." -msgstr "" - -#: amt/site/templates/parts/filter_list.html.j2:90 -#: amt/site/templates/parts/filter_list.html.j2:116 -msgid "Algorithm system name" +" algorithms." msgstr "" #: amt/site/templates/parts/header.html.j2:7 diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo index b7198fa603ca923c5fc1c679fe4ace94239e5345..e389e6726ada5d406305ca1683f160e2d47a337d 100644 GIT binary patch delta 2900 zcmYM$4NR3)9LMqF-*!Lp}X)o=RD^*=l}md=egLq z`12=1XH%nh8UF3#XAD1yG3wp=_fNbr8|nUw3-GxFW1{g4Rtz%cEGE-0Ni-%0=VBT* zqSo7jy8Z?Z#dmH080H!iGN)*;hPh!U#3V%~X5ezh^KmBbzrkm{b9XOHxZaaPyv*>?|Bk?lota#I?zalGSHI?XL)P{3V8QM8V zQ5D;4`>n{w?6l+UsLCBg1@=B_%kVgFp#@t{a3X_KMgG14SS-2jvk;iKG zV+I~V&HDm%|M#eXe@7o)MP;19E=s5fpTX&&U$(f#;wNvrr2Z zq86Nn%B;*@8E&$+peptvYQ5do1E_sNois+%=)o!Y3(mq3q^TRLa5An$ zMc#(}hZS>p{|_U#m{UB*rFap^!OW)K6xCE9$H}Zg-M0l5;I@b%>KV6MU&Z8Q&2PyzXI98Sq0 zPYskapp2?fhi*0MEm(_sB(128Ts!_I>P&RuUHAj$V_I&c#KoutW}`A*f}B&+ggWG{ zsC_@prOx^SI$*f^jqgEiREo-|0u|Ug)S(QaHflpH)PeEXY5U!%z>i}b zoA}u zJ+?n-LgW$7Ky6%x3Mgo8LjBEHkIC$Bw$m7lZK#dgQ5nC3I<+T}18(}zgWfwL3nrt^ zN;;~7e$+bCP??wDBRB)SxE+=G%cx3)afl`!p`i%7&@D}v8ZJqA))QS>SLL|9iJ8&0 zfuQ3~NE#QvYI$9KO=ESiAv`Z>mM7KRU+)AO9bdp#Vz0PeDOz!b&#S%*{abDUb=z^HpNduQfA&n$52pQ>3= z#jJs`@V1--gTi;`g+1<-abw*~{}^|=e_8l#f4e7KUhuIer6dx4&}mrL(C7r+jEQak E1Jk5sOaK4? delta 3225 zcmaLY4NR3)9LMp))S%53h$}TTwe%`iM7h@jd@J)tbF&rY z>f%eqa`SCAomyAzW$IRHb0e#*n%1Va=~~VrmyMcM_Wf}W%4myS?&mq@dCoci|Noo^ zPR%>|WZ+_Q)Mmrac78|k>yB3I?$3~TV>ZxCz&d;bqwp#&iZG@dhths*h%s5X5L0ji zYQAka43A(Ec3Cfk`vc}z`#^L;_<@m_&4Y!uJ;Pd$4fL6M zOvG!bg>PXTCeX=}CKZR80E=;vOh*Z7f~hzNYjHHz;c#4uso0M9;x1GrPN0J)aVB0t zJy(8@F(dF%oPmuv7>}XWIfJpRZ@#oQ&Y?28jM{|+!qx&Q))7dxO*-m+9xCu6RLLt* z3qFqH(T_@CJCeLPVeg-{{)hp7&27F4Fp1eznhMmORiiRrh~>B%RhdJm=RQIO_!%mI zF4RJoP?>hy`!}(O_HEl=#KU7~Pfnr!D&<@{ba+}(8Eiw9=snbeAEFlg1ht1>AVo6g zQO{jPRph#D_aGnhx9v}Ihbxzg3M><~Zjqb%D}#sW&}pqjf;7u85}!vtrj0KbZoyaZ zO=O!*4rS6_Pejh6sYQ*ShYHw_4nBv;gSB22T6K}DX8u~>v! zpbYt#`}tCUvr!djL2Xsgx)oKCw^8%%vHkmSD(!=)z|adP#I?sjSg`+>MfX$I#bJ06?h4i`8(D_>JQNIsV?xmz0r-C zv~_Z*mdUbKpq`(NPvJS7h-DdJn^0$C2Ug%d)Ph%0dwmO4*}+V%3Jk-5Ix@IW1_h{g zm30~_qdFue^DOH1d<&IX2vy>*(7|tU5%wU}HBT^Dw&G0OggTs;QR`gKA|LJXO*#~j zE8Cb{9Exg}p)#sM9ljdW+b{#QMGdG!<+J^5$ZnY}I2qr^eEbEqC8;^#1jeEgelUl6 za*$0O9i`|;Exgk{c+ft02FvKbgvwy}*zkl|7)^TuDv)y2-+^hUdFEmiE31*=d^q?xV(z+g1+Ks3TUq=PF7ZuO} z)Z6hfs*-`zTxfysQ3Ed72YOHgBl5!iu^35vGaV~3 z$>?AuD!@g!QRlgd3q|xhsuH(RZ$r+w@Tr}GTBrsU-~v=&t5An>9crOYjK{qghauZO zjtcw?#^UFwgug+z-ly+uM>lGL8>qdBFJK=r52xcw)Rvq={d?^~ZN*=xfa2~mW;Z6H z5;%fOvCFng3&UGjjVk?o?EU}$j4tR{i~8r$hB~bsI0$#57T%A_ID|U1Un4J$xrQ!G zq|TZr8TG!Wp~jCxWn6-fU^x!P7tvA1uW_Lg?M6NLE^49!7TmSkc_ry42@{dt3VT)O%Y!jZOV~TEZh2uc+@o()JFRFWlR2bmL;D*5mgy z1h)=Jh;i~NYiH$$q7rIcj$PV3)a>=NdL555AgG`xu|3A=oiFrr;;RvT*K3m6T=qKn zXUf?0@FPAmeFdL>lk|=Z7P_DA8`$Yy?uri27o8d(8B9z2A#uX^38jU_#f8NsPI2kv zl2F{pe$Ny*{u1ZjUpdW_L&Sui4#Rzvutv3udPej}8~Ae#{H5 z!hzwaVkh@`n;oy$-dxQRi)5-MFltF#~Uf4rlI(h_#7^=4OXneT`s3 mZpNMKqTErjy{EwI4_4AMac%H4ZsKxodm6Ru!hVduXJ|IX None: - # ### commands auto generated by Alembic - please adjust! ### op.drop_table("project") - # ### end Alembic commands ### - def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### + lifecycle_enum = postgresql.ENUM(name='lifecycle', create_type=False) + op.create_table( "project", - sa.Column("id", sa.INTEGER(), nullable=False), - sa.Column("name", sa.VARCHAR(length=255), nullable=False), - sa.Column("lifecycle", sa.VARCHAR(length=32), nullable=True), - sa.Column("last_edited", sa.DATETIME(), server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False), - sa.Column("system_card_json", sqlite.JSON(), nullable=True), - sa.Column("deleted_at", sa.DATETIME(), nullable=True), + sa.Column("id", sa.Integer(), nullable=False), + sa.Column("name", sa.String(length=255), nullable=False), + sa.Column("lifecycle", lifecycle_enum, nullable=True), + sa.Column("last_edited", sa.DateTime(), server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False), + sa.Column("system_card_json", sa.JSON(), nullable=False), + sa.Column("deleted_at", sa.DateTime(), nullable=True), sa.PrimaryKeyConstraint("id", name="pk_project"), ) - # ### end Alembic commands ### diff --git a/amt/site/templates/algorithms/details_base.html.j2 b/amt/site/templates/algorithms/details_base.html.j2 index ded6d297..0fde8c53 100644 --- a/amt/site/templates/algorithms/details_base.html.j2 +++ b/amt/site/templates/algorithms/details_base.html.j2 @@ -33,7 +33,7 @@

diff --git a/amt/site/templates/algorithms/tasks.html.j2 b/amt/site/templates/algorithms/tasks.html.j2 index f29e9f6f..6e248c05 100644 --- a/amt/site/templates/algorithms/tasks.html.j2 +++ b/amt/site/templates/algorithms/tasks.html.j2 @@ -4,7 +4,7 @@ {% block detail_content %}
+ {% if loop.last and algorithms|length == limit %} data-marker="last-element" hx-get="/algorithms/?skip={{ next }}" hx-swap="beforeend" hx-trigger="revealed" {% endif %}> {% if show_lifecycles %} {% else %} {% endif %} {{ algorithm.name }} + href="/algorithm/{{ algorithm.id }}/details/">{{ algorithm.name }} {% if show_lifecycles %} diff --git a/amt/site/templates/pages/system_card.html.j2 b/amt/site/templates/pages/system_card.html.j2 index 39e1d4e2..12344ace 100644 --- a/amt/site/templates/pages/system_card.html.j2 +++ b/amt/site/templates/pages/system_card.html.j2 @@ -11,7 +11,7 @@ {% for assessment in system_card.assessments %}
  • + href="/algorithm/{{ algorithm_id }}/details/system_card/assessments/{{ assessment["name"].lower() }}"> @@ -29,7 +29,7 @@ {% for model in system_card.models %}
  • + href="/algorithm/{{ algorithm_id }}/details/system_card/models/{{ model["name"].lower() }}"> diff --git a/amt/site/templates/parts/algorithm_search.html.j2 b/amt/site/templates/parts/algorithm_search.html.j2 index fd9489fc..90252ece 100644 --- a/amt/site/templates/parts/algorithm_search.html.j2 +++ b/amt/site/templates/parts/algorithm_search.html.j2 @@ -1,18 +1,17 @@
    -

    {% trans %}Algorithm Systems{% endtrans %}

    +

    {% trans %}algorithms{% endtrans %}
    @@ -29,9 +28,9 @@ class="utrecht-textbox utrecht-textbox--html-input" dir="auto" value="{{ search }}" - placeholder="{% trans %}Find algorithm system...{% endtrans %}" + placeholder="{% trans %}Find algorithm...{% endtrans %}" name="search" - hx-get="/algorithm-systems/?skip=0" + hx-get="/algorithms/?skip=0" hx-trigger="input changed delay:500ms, search" autocomplete="off" onfocus="this.value=''" /> @@ -39,7 +38,7 @@ role="img" aria-label="Kruis" hx-trigger="click" - hx-get="/algorithm-systems/?skip=0" + hx-get="/algorithms/?skip=0" hx-indicator=".htmx-indicator" hx-swap="innerHTML" onclick="document.getElementById('algorithm-search-input').value = ''"> @@ -88,7 +87,7 @@