From c0a57a89207e5c1e1b34ac06e8f9aa5aa1467a3d Mon Sep 17 00:00:00 2001 From: denis defolie Date: Sat, 11 Jul 2026 10:55:30 +0200 Subject: [PATCH] scanner-correction --- test_tube_scanner/home/settings.py | 3 --- test_tube_scanner/scanner/models.py | 8 ++++---- test_tube_scanner/scanner/views.py | 14 +++++++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/test_tube_scanner/home/settings.py b/test_tube_scanner/home/settings.py index d0d6626..6a69567 100644 --- a/test_tube_scanner/home/settings.py +++ b/test_tube_scanner/home/settings.py @@ -365,9 +365,6 @@ CELERY_BEAT_SCHEDULE = { }, } - - - ## reductstore # REDUCTSTORE_TOKEN = config('REDUCTSTORE_TOKEN') diff --git a/test_tube_scanner/scanner/models.py b/test_tube_scanner/scanner/models.py index 58274d6..4bd8287 100644 --- a/test_tube_scanner/scanner/models.py +++ b/test_tube_scanner/scanner/models.py @@ -14,10 +14,10 @@ from django.contrib.auth.models import User MULTIWELL_POSITION = [ - ('HG', _("MP 6x24: HG-Haut gauche")), - ('HD', _("MP 6x24: HD-Haut droit")), - ('BG', _("MP 6x24: BG-Bas gauche")), - ('BD', _("MP 6x24: BD-Bas droit")), + ('HG', _("MP 4x6: HG-Haut gauche")), + ('HD', _("MP 4x6: HD-Haut droit")), + ('BG', _("MP 4x6: BG-Bas gauche")), + ('BD', _("MP 4x6: BD-Bas droit")), ('HG_6', _("MP 2x3: HG-Haut gauche")), ('HD_6', _("MP 2x3: HD-Haut droit")), ('BG_6', _("MP 2x3: BG-Bas gauche")), diff --git a/test_tube_scanner/scanner/views.py b/test_tube_scanner/scanner/views.py index 458e70c..5c1488e 100644 --- a/test_tube_scanner/scanner/views.py +++ b/test_tube_scanner/scanner/views.py @@ -82,36 +82,36 @@ def admin_periodictask_view(request): @login_required @user_passes_test(is_staff_or_admin) def reductstore_view(request): - return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.LOCAL_IP_SERVER}:8383/')) + return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:8383/')) @login_required @user_passes_test(is_staff_or_admin) def adminer_view(request): - return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.LOCAL_IP_SERVER}/adminer/')) + return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}/adminer/')) @login_required @user_passes_test(is_staff_or_admin) def portainer_view(request): - return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.LOCAL_IP_SERVER}:9000/')) + return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9000/')) @login_required @user_passes_test(is_staff_or_admin) def supervisor_view(request): - return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.LOCAL_IP_SERVER}:9001/')) + return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9001/')) @login_required @user_passes_test(is_staff_or_admin) def supervisor_worker(request): - return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.LOCAL_IP_SERVER}:9001/logtail/test_tube:services')) + return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9001/logtail/test_tube:services')) @login_required @user_passes_test(is_staff_or_admin) def supervisor_scheduler(request): - return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.LOCAL_IP_SERVER}:9001/logtail/test_tube:planification')) + return render(request, "scanner/redirection.html", context=global_context(request, link=f'http://{settings.DOMAIN_SERVER}:9001/logtail/test_tube:planification')) def documentation(request, template=None): @@ -245,7 +245,7 @@ def export_medias(request): choice_title=_("Exporter les fichiers médias"), sessions=models.Session.objects.filter(active=False).all(), current_session=current_session, - url=f'http://{settings.LOCAL_IP_SERVER}:9001/logtail/test_tube:services', + url=f'http://{settings.DOMAIN_SERVER}:9001/logtail/test_tube:services', ) return render(request, "scanner/export_medias.html", context=global_context(request, **ctx))