From 971a87d91a90fcf79314d635727411555446c113 Mon Sep 17 00:00:00 2001
From: Gregor Pirgie <gregor.pirgie@oeaw.ac.at>
Date: Fri, 1 Mar 2024 14:04:41 +0100
Subject: [PATCH 1/6] breaking-change: revert app-renaming

---
 apis/settings/apisviecpro_backend_prod.py     |    6 +-
 apis/settings/apisviecpro_backend_test.py     |    6 +-
 apis/settings/dev.py                          |    6 +-
 apis/urls.py                                  |    8 +-
 .../__init__.py                               |    0
 .../admin.py                                  |    0
 .../apps.py                                   |    2 +-
 .../forms.py                                  |   12 +-
 .../logger.py                                 |    0
 .../models.py                                 |    2 +-
 .../pdf_logger.py                             |    0
 .../serializers.py                            |    0
 .../viecpro_import/css/autocomplete.css       |    0
 .../static/viecpro_import/css/main.css        |    0
 .../static/viecpro_import/js/autocomplete.js  |    0
 .../viecpro_import/js/autocomplete.js.map     |    0
 .../static/viecpro_import/js/pdf_tool.js      |    0
 .../tables.py                                 |    0
 .../autoDate_button_generic_ajax_form.html    |    0
 .../custom_ajax_form_generic.html             |    9 +
 .../element_datasource_update.html            |    0
 .../element_datasources_select_template.html  |    0
 .../element_datasources_upload.html           |    0
 .../element_project_create.html               |    0
 .../templates/pages/editor_page.html          |   36 +-
 .../templates/pages/projects_page.html        |   12 +-
 .../section_templates/datasource_browser.html |    0
 .../generic_create_items_section.html         |    0
 .../generic_entity_meta_section.html          |    4 +-
 .../generic_process_section.html              |    0
 .../generic_relations_section.html            |    2 +-
 .../progress_created_template.html            |    0
 .../progress_deleted_template.html            |    0
 .../progress_edited_template.html             |    0
 .../tests.py                                  |    0
 .../upload_helper.py                          |    0
 .../urls.py                                   |    2 +-
 .../views.py                                  |   12 +-
 .../__init__.py                               |    0
 {viecpro_import => dubletten_tool}/admin.py   |    0
 .../apps.py                                   |    2 +-
 .../auto_script.py                            |    0
 .../create_datasets.py                        |    0
 .../detail_view.py                            |    0
 .../helper_functions/helper_functions.py      |    0
 .../helper_functions/loggers.py               |    0
 .../forms.py                                  |    4 +-
 .../grouping_script_1.py                      |    0
 .../helpers.py                                |    0
 .../logger.py                                 |    0
 .../management/__init__.py                    |    0
 .../management/commands/__init__.py           |    0
 .../management/commands/add_access_groups.py  |    4 +-
 .../management/commands/merge_groups.py       |    8 +-
 .../management/commands/setup_groups.py       |    4 +-
 .../merge_filters.py                          |    0
 .../merge_functions.py                        |    8 +-
 .../merge_tables.py                           |    2 +-
 .../merge_views.py                            |    6 +-
 .../models.py                                 |    0
 .../redis_client.py                           |    0
 .../src/classes/ErrorLoggerMixin.py           |    0
 .../src/classes/MergeGroup.py                 |    2 +-
 .../src/classes/PPHelper.py                   |    0
 .../src/classes/PPKind.py                     |    0
 .../src/classes/PersonHelper.py               |    0
 .../src/classes/PersonType.py                 |    2 +-
 .../src/classes/ProcessingTracker.py          |    0
 .../src/classes/RelationWriter.py             |    0
 .../src/classes/RemergeHelper.py              |    0
 .../src/classes/TempRel.py                    |    0
 .../src/classes/__init__.py                   |    4 +-
 .../src/classes/class_notes.md                |    0
 .../src/functions/helper_functions.py         |    2 +-
 .../src/functions/remerge_single_group.py     |    4 +-
 .../css/deduplication.css                     |    0
 .../suggestions.py                            |    0
 .../tasks.py                                  |    4 +-
 .../templates/all_notes.html                  |    0
 .../templates/del/ampel_action_template.html  |  149 ++
 .../templates/del/ampel_note_column.html      |    0
 .../templates/del/ampel_template_column.html  |    0
 .../templates/group_buttons.html              |    0
 .../templates/group_form.html                 |    0
 .../templates/group_list.html                 |    0
 .../templates/group_suggestions.html          |    0
 .../templates/member_list.html                |    0
 .../merge/ampel_action_template.html          |  149 ++
 .../templates/merge/ampel_note_column.html    |    0
 .../merge/ampel_template_column.html          |    0
 .../templates/merge/apis_create_entities.html |    0
 .../templates/merge/compare_base.html         |    0
 .../detail_views/entity_detail_generic.html   |    4 +-
 .../merge_tool_entity_detail_generic.html     |    4 +-
 .../detail_views/person_detail_generic.html   |    0
 .../merge/entity_create_generic.html          |    4 +-
 .../templates/merge/generic_list.html         |    2 +-
 .../merge/mege_tool_generic_list.html         |    4 +-
 .../templates/merge/merge_page.html           |    0
 .../merge_tool_entity_create_generic.html     |    4 +-
 .../templates/merge/person_create.html        |    0
 .../merge/person_create_generic.html          |    0
 .../templates/merge/person_create_new.html    |    0
 .../templates/merge/person_list.html          |    0
 .../templates/merge/person_list_generic.html  |    0
 .../templates/merge/relation_editor.html      |    8 +-
 .../templates/merge/tabbed_texts.html         |    0
 .../templates/note_form.html                  |    0
 .../templates/note_template.html              |    0
 .../templates/person_detail.html              |    0
 .../templates/person_suggestions.html         |    0
 .../templates/singles_list.html               |    0
 dubletten_tool/templates/tool_page.html       | 1827 +++++++++++++++++
 {viecpro_import => dubletten_tool}/tests.py   |    0
 .../tests/__init__.py                         |    0
 .../tests/error_logger_mixin_test.py          |    0
 .../tests/merge_group_test.py                 |    0
 .../tests/person_helper_test.py               |    0
 .../tests/person_type_test.py                 |    0
 .../tests/pphelper_test.py                    |    0
 .../tests/ppkind_test.py                      |    0
 .../tests/relation_writer_test.py             |    0
 .../tests/single_merge_test.py                |    0
 .../tests/temp_rel_test.py                    |    2 +-
 .../urls.py                                   |    4 +-
 .../views.py                                  |    0
 notebooks/Create Sample 3D CHO.ipynb          |    6 +
 .../migrations/0001_initial.py                |  127 --
 viecpro_deduplication/migrations/__init__.py  |    0
 .../templates/del/ampel_action_template.html  |  138 --
 .../merge/ampel_action_template.html          |  138 --
 .../templates/tool_page.html                  | 1636 ---------------
 viecpro_import/migrations/0001_initial.py     |  135 --
 viecpro_import/migrations/__init__.py         |    0
 .../custom_ajax_form_generic.html             |    9 -
 webpage/templates/webpage/base.html           |   13 +-
 136 files changed, 2248 insertions(+), 2290 deletions(-)
 rename {viecpro_import => apis_import_project}/__init__.py (100%)
 rename {viecpro_deduplication => apis_import_project}/admin.py (100%)
 rename {viecpro_import => apis_import_project}/apps.py (69%)
 rename {viecpro_import => apis_import_project}/forms.py (98%)
 rename {viecpro_import => apis_import_project}/logger.py (100%)
 rename {viecpro_import => apis_import_project}/models.py (99%)
 rename {viecpro_import => apis_import_project}/pdf_logger.py (100%)
 rename {viecpro_import => apis_import_project}/serializers.py (100%)
 rename {viecpro_import => apis_import_project}/static/viecpro_import/css/autocomplete.css (100%)
 rename {viecpro_import => apis_import_project}/static/viecpro_import/css/main.css (100%)
 rename {viecpro_import => apis_import_project}/static/viecpro_import/js/autocomplete.js (100%)
 rename {viecpro_import => apis_import_project}/static/viecpro_import/js/autocomplete.js.map (100%)
 rename {viecpro_import => apis_import_project}/static/viecpro_import/js/pdf_tool.js (100%)
 rename {viecpro_import => apis_import_project}/tables.py (100%)
 rename {viecpro_import => apis_import_project}/templates/element_templates/autoDate_button_generic_ajax_form.html (100%)
 create mode 100644 apis_import_project/templates/element_templates/custom_ajax_form_generic.html
 rename {viecpro_import => apis_import_project}/templates/element_templates/element_datasource_update.html (100%)
 rename {viecpro_import => apis_import_project}/templates/element_templates/element_datasources_select_template.html (100%)
 rename {viecpro_import => apis_import_project}/templates/element_templates/element_datasources_upload.html (100%)
 rename {viecpro_import => apis_import_project}/templates/element_templates/element_project_create.html (100%)
 rename {viecpro_import => apis_import_project}/templates/pages/editor_page.html (95%)
 rename {viecpro_import => apis_import_project}/templates/pages/projects_page.html (84%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/datasource_browser.html (100%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/generic_create_items_section.html (100%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/generic_entity_meta_section.html (90%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/generic_process_section.html (100%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/generic_relations_section.html (99%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/progress_created_template.html (100%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/progress_deleted_template.html (100%)
 rename {viecpro_import => apis_import_project}/templates/section_templates/progress_edited_template.html (100%)
 rename {viecpro_deduplication => apis_import_project}/tests.py (100%)
 rename {viecpro_import => apis_import_project}/upload_helper.py (100%)
 rename {viecpro_import => apis_import_project}/urls.py (99%)
 rename {viecpro_import => apis_import_project}/views.py (99%)
 rename {viecpro_deduplication => dubletten_tool}/__init__.py (100%)
 rename {viecpro_import => dubletten_tool}/admin.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/apps.py (69%)
 rename {viecpro_deduplication => dubletten_tool}/auto_script.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/create_datasets.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/detail_view.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/dump_improvements/helper_functions/helper_functions.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/dump_improvements/helper_functions/loggers.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/forms.py (89%)
 rename {viecpro_deduplication => dubletten_tool}/grouping_script_1.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/helpers.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/logger.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/management/__init__.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/management/commands/__init__.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/management/commands/add_access_groups.py (96%)
 rename {viecpro_deduplication => dubletten_tool}/management/commands/merge_groups.py (79%)
 rename {viecpro_deduplication => dubletten_tool}/management/commands/setup_groups.py (96%)
 rename {viecpro_deduplication => dubletten_tool}/merge_filters.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/merge_functions.py (97%)
 rename {viecpro_deduplication => dubletten_tool}/merge_tables.py (99%)
 rename {viecpro_deduplication => dubletten_tool}/merge_views.py (99%)
 rename {viecpro_deduplication => dubletten_tool}/models.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/redis_client.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/ErrorLoggerMixin.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/MergeGroup.py (98%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/PPHelper.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/PPKind.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/PersonHelper.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/PersonType.py (96%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/ProcessingTracker.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/RelationWriter.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/RemergeHelper.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/TempRel.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/__init__.py (94%)
 rename {viecpro_deduplication => dubletten_tool}/src/classes/class_notes.md (100%)
 rename {viecpro_deduplication => dubletten_tool}/src/functions/helper_functions.py (97%)
 rename {viecpro_deduplication => dubletten_tool}/src/functions/remerge_single_group.py (95%)
 rename {viecpro_deduplication => dubletten_tool}/static/viecpro_deduplication/css/deduplication.css (100%)
 rename {viecpro_deduplication => dubletten_tool}/suggestions.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tasks.py (96%)
 rename {viecpro_deduplication => dubletten_tool}/templates/all_notes.html (100%)
 create mode 100644 dubletten_tool/templates/del/ampel_action_template.html
 rename {viecpro_deduplication => dubletten_tool}/templates/del/ampel_note_column.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/del/ampel_template_column.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/group_buttons.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/group_form.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/group_list.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/group_suggestions.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/member_list.html (100%)
 create mode 100644 dubletten_tool/templates/merge/ampel_action_template.html
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/ampel_note_column.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/ampel_template_column.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/apis_create_entities.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/compare_base.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/detail_views/entity_detail_generic.html (98%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/detail_views/merge_tool_entity_detail_generic.html (98%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/detail_views/person_detail_generic.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/entity_create_generic.html (98%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/generic_list.html (99%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/mege_tool_generic_list.html (98%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/merge_page.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/merge_tool_entity_create_generic.html (98%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/person_create.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/person_create_generic.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/person_create_new.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/person_list.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/person_list_generic.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/relation_editor.html (97%)
 rename {viecpro_deduplication => dubletten_tool}/templates/merge/tabbed_texts.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/note_form.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/note_template.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/person_detail.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/person_suggestions.html (100%)
 rename {viecpro_deduplication => dubletten_tool}/templates/singles_list.html (100%)
 create mode 100644 dubletten_tool/templates/tool_page.html
 rename {viecpro_import => dubletten_tool}/tests.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/__init__.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/error_logger_mixin_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/merge_group_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/person_helper_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/person_type_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/pphelper_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/ppkind_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/relation_writer_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/single_merge_test.py (100%)
 rename {viecpro_deduplication => dubletten_tool}/tests/temp_rel_test.py (88%)
 rename {viecpro_deduplication => dubletten_tool}/urls.py (97%)
 rename {viecpro_deduplication => dubletten_tool}/views.py (100%)
 create mode 100644 notebooks/Create Sample 3D CHO.ipynb
 delete mode 100644 viecpro_deduplication/migrations/0001_initial.py
 delete mode 100644 viecpro_deduplication/migrations/__init__.py
 delete mode 100644 viecpro_deduplication/templates/del/ampel_action_template.html
 delete mode 100644 viecpro_deduplication/templates/merge/ampel_action_template.html
 delete mode 100644 viecpro_deduplication/templates/tool_page.html
 delete mode 100644 viecpro_import/migrations/0001_initial.py
 delete mode 100644 viecpro_import/migrations/__init__.py
 delete mode 100644 viecpro_import/templates/element_templates/custom_ajax_form_generic.html

diff --git a/apis/settings/apisviecpro_backend_prod.py b/apis/settings/apisviecpro_backend_prod.py
index c9e92d53..59ae0e9d 100644
--- a/apis/settings/apisviecpro_backend_prod.py
+++ b/apis/settings/apisviecpro_backend_prod.py
@@ -48,8 +48,8 @@
 SPECTACULAR_SETTINGS["COMPONENT_NO_READ_ONLY_REQUIRED"] = True
 
 
-INSTALLED_APPS += ["django_extensions", "viecpro_import", "apis_bibsonomy", "apis_ampel",
-                   "viecpro_deduplication", "viecpro_hierarchy", "viecpro_typesense", "viecpro_typesense_detail", "django_celery_results"]
+INSTALLED_APPS += ["django_extensions", "apis_import_project", "apis_bibsonomy", "apis_ampel",
+                   "dubletten_tool", "viecpro_hierarchy", "viecpro_typesense", "viecpro_typesense_detail", "django_celery_results"]
 
 
 DATABASES = {"default":
@@ -119,7 +119,7 @@
 TEMPLATES[0]["DIRS"] += [ROBOTS_TXT_FOLDER, ]
 
 
-VIECPRO_IMPORT_IIIF_BASE_URL = "https://iiif.acdh-dev.oeaw.ac.at/iiif/images/viecpro/"
+apis_import_project_IIIF_BASE_URL = "https://iiif.acdh-dev.oeaw.ac.at/iiif/images/viecpro/"
 
 
 # Bibsonomy Settings
diff --git a/apis/settings/apisviecpro_backend_test.py b/apis/settings/apisviecpro_backend_test.py
index a72573c3..438e5a77 100644
--- a/apis/settings/apisviecpro_backend_test.py
+++ b/apis/settings/apisviecpro_backend_test.py
@@ -48,8 +48,8 @@
 SPECTACULAR_SETTINGS["COMPONENT_NO_READ_ONLY_REQUIRED"] = True
 
 
-INSTALLED_APPS += ["django_extensions", "viecpro_import","apis_bibsonomy", "apis_ampel",
-                   "viecpro_deduplication", "viecpro_hierarchy", "viecpro_typesense", "viecpro_typesense_detail", "django_celery_results"]
+INSTALLED_APPS += ["django_extensions", "apis_import_project","apis_bibsonomy", "apis_ampel",
+                   "dubletten_tool", "viecpro_hierarchy", "viecpro_typesense", "viecpro_typesense_detail", "django_celery_results"]
 
 
 DATABASES = {"default":
@@ -119,7 +119,7 @@
 TEMPLATES[0]["DIRS"] += [ROBOTS_TXT_FOLDER, ]
 
 
-VIECPRO_IMPORT_IIIF_BASE_URL = "https://iiif.acdh-dev.oeaw.ac.at/iiif/images/viecpro/"
+apis_import_project_IIIF_BASE_URL = "https://iiif.acdh-dev.oeaw.ac.at/iiif/images/viecpro/"
 
 
 # Bibsonomy Settings
diff --git a/apis/settings/dev.py b/apis/settings/dev.py
index 49d32805..be59f17b 100644
--- a/apis/settings/dev.py
+++ b/apis/settings/dev.py
@@ -47,8 +47,8 @@
 SPECTACULAR_SETTINGS["COMPONENT_NO_READ_ONLY_REQUIRED"] = True
 
 
-INSTALLED_APPS += ["django_extensions", "viecpro_import", "debug_toolbar", "apis_bibsonomy", "apis_ampel",
-                   "viecpro_deduplication", "viecpro_hierarchy", "viecpro_typesense", "viecpro_typesense_detail", "django_celery_results"]
+INSTALLED_APPS += ["django_extensions", "apis_import_project", "debug_toolbar", "apis_bibsonomy", "apis_ampel",
+                   "dubletten_tool", "viecpro_hierarchy", "viecpro_typesense", "viecpro_typesense_detail", "django_celery_results"]
 
 
 DATABASES = {"default":
@@ -118,7 +118,7 @@
 TEMPLATES[0]["DIRS"] += [ROBOTS_TXT_FOLDER, ]
 
 
-VIECPRO_IMPORT_IIIF_BASE_URL = "https://iiif.acdh-dev.oeaw.ac.at/iiif/images/viecpro/"
+apis_import_project_IIIF_BASE_URL = "https://iiif.acdh-dev.oeaw.ac.at/iiif/images/viecpro/"
 
 
 # Bibsonomy Settings
diff --git a/apis/urls.py b/apis/urls.py
index ebf83594..305c3791 100644
--- a/apis/urls.py
+++ b/apis/urls.py
@@ -26,13 +26,13 @@
     urlpatterns.insert(0, url(r'^visualisations/', include("viecpro_hierarchy.urls", namespace="viecpro_hierarchy"))
     )
 
-if 'viecpro_import' in settings.INSTALLED_APPS:
+if 'apis_import_project' in settings.INSTALLED_APPS:
     urlpatterns = urlpatterns + [
-         url(r'^viecpro_import/', include("viecpro_import.urls", namespace="viecpro_import"))]
+         url(r'^apis_import_project/', include("apis_import_project.urls", namespace="apis_import_project"))]
 
-if 'viecpro_deduplication' in settings.INSTALLED_APPS:
+if 'dubletten_tool' in settings.INSTALLED_APPS:
     urlpatterns = urlpatterns + [
-        url(r'^dubletten/', include("viecpro_deduplication.urls", namespace="viecpro_deduplication")),
+        url(r'^dubletten/', include("dubletten_tool.urls", namespace="dubletten_tool")),
         ]
 
 if "apis_bibsonomy" in settings.INSTALLED_APPS:
diff --git a/viecpro_import/__init__.py b/apis_import_project/__init__.py
similarity index 100%
rename from viecpro_import/__init__.py
rename to apis_import_project/__init__.py
diff --git a/viecpro_deduplication/admin.py b/apis_import_project/admin.py
similarity index 100%
rename from viecpro_deduplication/admin.py
rename to apis_import_project/admin.py
diff --git a/viecpro_import/apps.py b/apis_import_project/apps.py
similarity index 69%
rename from viecpro_import/apps.py
rename to apis_import_project/apps.py
index 1e8e4842..1896e790 100644
--- a/viecpro_import/apps.py
+++ b/apis_import_project/apps.py
@@ -2,4 +2,4 @@
 
 
 class ViecproImportConfig(AppConfig):
-    name = 'viecpro_import'
+    name = 'apis_import_project'
diff --git a/viecpro_import/forms.py b/apis_import_project/forms.py
similarity index 98%
rename from viecpro_import/forms.py
rename to apis_import_project/forms.py
index 65a4679f..ef5b23cd 100644
--- a/viecpro_import/forms.py
+++ b/apis_import_project/forms.py
@@ -24,7 +24,7 @@
 from apis_core.apis_relations.models import AbstractRelation
 from apis_core.apis_vocabularies.models import VocabsBaseClass, AbstractRelationType
 from apis_core.apis_labels.forms import LabelForm
-from viecpro_import.tables import get_generic_relations_table
+from apis_import_project.tables import get_generic_relations_table
 
 
 from apis_core.helper_functions import DateParser
@@ -94,7 +94,7 @@ def __init__(self, user=None, *args, **kwargs):
         self.helper.add_input(Submit("submit", "Submit"))
         self.helper.add_input(Button('cancel', 'Cancel', css_class='btn-danger',
                                      onclick="window.location.href = '{}';".format(
-                                             reverse('viecpro_import:project_main'))))
+                                             reverse('apis_import_project:project_main'))))
 
 
 class UploadFileForm(forms.Form):
@@ -424,7 +424,7 @@ class GenericLabelForm(LabelForm):
 #         super(GenericLabelForm, self).__init__(*args, **kwargs)
 #         self.helper.form_tag = True
 #         self.helper.form_method = "post"
-#         self.helper.form_action = f"/viecpro_import/create_item/Label"
+#         self.helper.form_action = f"/apis_import_project/create_item/Label"
 
 def get_generic_vocabs_form(model_name):
     module = "apis_core.apis_vocabularies.models"
@@ -444,7 +444,7 @@ def __init__(self, *args, **kwargs):
                 Submit("submit", "save", css_class=f"{model_name}Form"))
             self.helper.form_method = "post"
             self.helper.form_class = "form pdf_tool_itemcreate"
-            self.helper.form_action = reverse("viecpro_import:item_create", kwargs={
+            self.helper.form_action = reverse("apis_import_project:item_create", kwargs={
                                               "model_name": model_name})
             self.helper.layout = Layout(Field("name",
                                               id=f"{model_name}_name_field"))
@@ -470,7 +470,7 @@ def __init__(self, *args, **kwargs):
                 Submit("submit", "save", css_class=f"{model_name}Form"))
             self.helper.form_method = "post"
             self.helper.form_class = "form pdf_tool_itemcreate"
-            self.helper.form_action = reverse("viecpro_import:item_create", kwargs={
+            self.helper.form_action = reverse("apis_import_project:item_create", kwargs={
                                               "model_name": model_name})
             self.helper.layout = Layout(Field("name", id=f"{model_name}Form_name_field"),
                                         Field("name_reverse", id=f"{model_name}Form_name_reverse_field"))
@@ -496,7 +496,7 @@ def __init__(self, *args, **kwargs):
                 Submit("submit", "save", css_class=f"{model_name}Form"))
             self.helper.form_method = "post"
             self.helper.form_class = "form pdf_tool_itemcreate"
-            self.helper.form_action = reverse("viecpro_import:item_create", kwargs={
+            self.helper.form_action = reverse("apis_import_project:item_create", kwargs={
                                               "model_name": model_name})
             self.helper.layout = Layout(Field("name", id=f"{model_name}Form_name_field"),
                                         Field("description", id=f"{model_name}Form_description_field"))
diff --git a/viecpro_import/logger.py b/apis_import_project/logger.py
similarity index 100%
rename from viecpro_import/logger.py
rename to apis_import_project/logger.py
diff --git a/viecpro_import/models.py b/apis_import_project/models.py
similarity index 99%
rename from viecpro_import/models.py
rename to apis_import_project/models.py
index f95dfb60..acebe376 100644
--- a/viecpro_import/models.py
+++ b/apis_import_project/models.py
@@ -54,7 +54,7 @@ def get_page_url(self, page_num):
         :rtype: str
         """
 
-        base_path = settings.VIECPRO_IMPORT_IIIF_BASE_URL
+        base_path = settings.apis_import_project_IIIF_BASE_URL
 
         if not base_path.endswith("/"):
             base_path += "/"
diff --git a/viecpro_import/pdf_logger.py b/apis_import_project/pdf_logger.py
similarity index 100%
rename from viecpro_import/pdf_logger.py
rename to apis_import_project/pdf_logger.py
diff --git a/viecpro_import/serializers.py b/apis_import_project/serializers.py
similarity index 100%
rename from viecpro_import/serializers.py
rename to apis_import_project/serializers.py
diff --git a/viecpro_import/static/viecpro_import/css/autocomplete.css b/apis_import_project/static/viecpro_import/css/autocomplete.css
similarity index 100%
rename from viecpro_import/static/viecpro_import/css/autocomplete.css
rename to apis_import_project/static/viecpro_import/css/autocomplete.css
diff --git a/viecpro_import/static/viecpro_import/css/main.css b/apis_import_project/static/viecpro_import/css/main.css
similarity index 100%
rename from viecpro_import/static/viecpro_import/css/main.css
rename to apis_import_project/static/viecpro_import/css/main.css
diff --git a/viecpro_import/static/viecpro_import/js/autocomplete.js b/apis_import_project/static/viecpro_import/js/autocomplete.js
similarity index 100%
rename from viecpro_import/static/viecpro_import/js/autocomplete.js
rename to apis_import_project/static/viecpro_import/js/autocomplete.js
diff --git a/viecpro_import/static/viecpro_import/js/autocomplete.js.map b/apis_import_project/static/viecpro_import/js/autocomplete.js.map
similarity index 100%
rename from viecpro_import/static/viecpro_import/js/autocomplete.js.map
rename to apis_import_project/static/viecpro_import/js/autocomplete.js.map
diff --git a/viecpro_import/static/viecpro_import/js/pdf_tool.js b/apis_import_project/static/viecpro_import/js/pdf_tool.js
similarity index 100%
rename from viecpro_import/static/viecpro_import/js/pdf_tool.js
rename to apis_import_project/static/viecpro_import/js/pdf_tool.js
diff --git a/viecpro_import/tables.py b/apis_import_project/tables.py
similarity index 100%
rename from viecpro_import/tables.py
rename to apis_import_project/tables.py
diff --git a/viecpro_import/templates/element_templates/autoDate_button_generic_ajax_form.html b/apis_import_project/templates/element_templates/autoDate_button_generic_ajax_form.html
similarity index 100%
rename from viecpro_import/templates/element_templates/autoDate_button_generic_ajax_form.html
rename to apis_import_project/templates/element_templates/autoDate_button_generic_ajax_form.html
diff --git a/apis_import_project/templates/element_templates/custom_ajax_form_generic.html b/apis_import_project/templates/element_templates/custom_ajax_form_generic.html
new file mode 100644
index 00000000..9293481f
--- /dev/null
+++ b/apis_import_project/templates/element_templates/custom_ajax_form_generic.html
@@ -0,0 +1,9 @@
+<div id="div_{{type1}}{{InstanceID}}">
+<form action="{% if ObjectID %}{% url 'apis_import_project:relation_update_or_create' entity_type type1 SiteID ObjectID %}{% else %}{% url 'apis_import_project:relation_update_or_create'  entity_type type1 SiteID %}{% endif %}" enctype="multipart/form-data" method="post" id="form_{{type1}}" class="form pdf_tool_form {{url2}}" data-replace="#message-form">
+    {% load crispy_forms_tags %}
+    {% crispy form form.helper %}
+    <div class="form-actions">
+        <button type="submit" class="btn btn-primary btn-sm">{{button_text}}</button>
+    </div>
+</form>
+</div>
\ No newline at end of file
diff --git a/viecpro_import/templates/element_templates/element_datasource_update.html b/apis_import_project/templates/element_templates/element_datasource_update.html
similarity index 100%
rename from viecpro_import/templates/element_templates/element_datasource_update.html
rename to apis_import_project/templates/element_templates/element_datasource_update.html
diff --git a/viecpro_import/templates/element_templates/element_datasources_select_template.html b/apis_import_project/templates/element_templates/element_datasources_select_template.html
similarity index 100%
rename from viecpro_import/templates/element_templates/element_datasources_select_template.html
rename to apis_import_project/templates/element_templates/element_datasources_select_template.html
diff --git a/viecpro_import/templates/element_templates/element_datasources_upload.html b/apis_import_project/templates/element_templates/element_datasources_upload.html
similarity index 100%
rename from viecpro_import/templates/element_templates/element_datasources_upload.html
rename to apis_import_project/templates/element_templates/element_datasources_upload.html
diff --git a/viecpro_import/templates/element_templates/element_project_create.html b/apis_import_project/templates/element_templates/element_project_create.html
similarity index 100%
rename from viecpro_import/templates/element_templates/element_project_create.html
rename to apis_import_project/templates/element_templates/element_project_create.html
diff --git a/viecpro_import/templates/pages/editor_page.html b/apis_import_project/templates/pages/editor_page.html
similarity index 95%
rename from viecpro_import/templates/pages/editor_page.html
rename to apis_import_project/templates/pages/editor_page.html
index 15624d9d..d6c8554e 100644
--- a/viecpro_import/templates/pages/editor_page.html
+++ b/apis_import_project/templates/pages/editor_page.html
@@ -2,9 +2,9 @@
 {% load static %}
 {% block content %}
 
-<script src="/static/viecpro_import/js/autocomplete.js"></script>
-<link href="/static/viecpro_import/css/autocomplete.css" rel="stylesheet" type="text/css">
-<link href="/static/viecpro_import/css/main.css" rel="stylesheet" type="text/css">
+<script src="/static/apis_import_project/js/autocomplete.js"></script>
+<link href="/static/apis_import_project/css/autocomplete.css" rel="stylesheet" type="text/css">
+<link href="/static/apis_import_project/css/main.css" rel="stylesheet" type="text/css">
 
 
 
@@ -169,7 +169,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
     })
 
     function setPageToken() {
-        let url = "{% url 'viecpro_import:page_set_token' %}";
+        let url = "{% url 'apis_import_project:page_set_token' %}";
         //console.log("called set token")
 
         let token = prompt("New token:");
@@ -242,7 +242,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
             }
 
             $.ajax({
-                url: '{% url "viecpro_import:editor_session_update" %}',
+                url: '{% url "apis_import_project:editor_session_update" %}',
                 type: 'POST',
                 data: { "ent_type": type, "ent_pk": entity_pk },
                 beforeSend: function (request) {
@@ -299,7 +299,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
     function updatePageSection(section) {
         console.log("update page section called, section is:", section);
 
-        let url = `/viecpro_import/editor/section/update/${section}/`;
+        let url = `/apis_import_project/editor/section/update/${section}/`;
         $.ajax({
             type: "GET",
             url: url,
@@ -374,7 +374,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
 
 
     function loadPageSection() {
-        let url = "{% url 'viecpro_import:get_sections' %}"//`/viecpro_import/entity_custom/`;
+        let url = "{% url 'apis_import_project:get_sections' %}"//`/apis_import_project/entity_custom/`;
         $.ajax({
             type: "GET",
             url: url,
@@ -419,7 +419,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
     function AjaxElementRequest(type, target_id = null, entity = null) {
         if (!["LabelType", "Title"].includes(entity) && !entity.endsWith("elation") && !entity.endsWith("ype")) {
 
-            let url = `/viecpro_import/editor/entity/create/${entity}/`;
+            let url = `/apis_import_project/editor/entity/create/${entity}/`;
             $.ajax({
                 type: "GET",
                 url: url,
@@ -460,7 +460,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
 
         $("#input_search").val([]);
         await fetch(
-            `/viecpro_import/editor/autocomplete/${type}/`,
+            `/apis_import_project/editor/autocomplete/${type}/`,
             function (d) {
                 if (!d.ok) {
                     alert(
@@ -518,7 +518,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
         let datasource_pk = $("#input_select").val();
         if (datasource_pk) {
             $.ajax({
-                url: '{% url "viecpro_import:ds_select" %}',
+                url: '{% url "apis_import_project:ds_select" %}',
                 type: 'POST',
                 data: { "ds_pk": datasource_pk, "first_call": first_call },
                 beforeSend: function (request) {
@@ -557,7 +557,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
 
     function updateRelationDate(clicked_el, rel_id) {
         let tab = $(clicked_el).closest(".card-body").attr("id"); // changed this from event.target
-        let url = `/viecpro_import/editor/relation/autodate/${rel_id}/${tab}/`;
+        let url = `/apis_import_project/editor/relation/autodate/${rel_id}/${tab}/`;
         $.ajax({
             type: "POST",
             url: url,
@@ -592,7 +592,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
         let page_token = prompt("Enter new page token for this page\nAll concurrent pages will be updated.");
 
         if (page_token) {
-            let url = "{% url 'viecpro_import:page_set_start' %}"
+            let url = "{% url 'apis_import_project:page_set_start' %}"
 
             $.ajax({
                 type: "POST",
@@ -612,7 +612,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
 
     function updateBrowserPage(page = null, direction = null, refresh_progress = true) {
         let page_num = page
-        let url = "{% url 'viecpro_import:browser_refresh' %}";
+        let url = "{% url 'apis_import_project:browser_refresh' %}";
         $.ajax({
             type: "POST",
             url: url,
@@ -632,7 +632,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
 
     function callUpload() {
 
-        let url = "{% url 'viecpro_import:ds_upload' %}";
+        let url = "{% url 'apis_import_project:ds_upload' %}";
         $.ajax({
             type: "GET",
             url: url,
@@ -655,7 +655,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
 
 
     function updateDataSourceSelect(ds_pk) {
-        let url = '{% url "viecpro_import:ds_list_refresh" %}';
+        let url = '{% url "apis_import_project:ds_list_refresh" %}';
         $.ajax({
             type: "POST",
             url: url,
@@ -677,7 +677,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
     }
 
     async function postUploadData(element) {
-        let url = "{% url 'viecpro_import:ds_upload' %}";
+        let url = "{% url 'apis_import_project:ds_upload' %}";
         $.ajax({
             type: "POST",
             url: url,
@@ -707,7 +707,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
     function editDataSource() {
         $.ajax({
             type: 'GET',
-            url: "{% url 'viecpro_import:ds_update' %}",
+            url: "{% url 'apis_import_project:ds_update' %}",
             beforeSend: function (request) {
                 let csrftoken = getCookie("csrftoken");
                 request.setRequestHeader("X-CSRFToken", csrftoken);
@@ -718,7 +718,7 @@ <h3 class="h3 ml-3 my-2" id="selected_entity_header"> <br></h3>
                     //console.log("reached success");
                     event.preventDefault();
                     event.stopPropagation();
-                    let url = "{% url 'viecpro_import:ds_update' %}";
+                    let url = "{% url 'apis_import_project:ds_update' %}";
                     let formData = $(this).serialize();
 
                     $.ajax({
diff --git a/viecpro_import/templates/pages/projects_page.html b/apis_import_project/templates/pages/projects_page.html
similarity index 84%
rename from viecpro_import/templates/pages/projects_page.html
rename to apis_import_project/templates/pages/projects_page.html
index 4c2d5b5e..9d2b4b56 100644
--- a/viecpro_import/templates/pages/projects_page.html
+++ b/apis_import_project/templates/pages/projects_page.html
@@ -3,9 +3,9 @@
 {% block content %}
 
 
-<script src="/static/viecpro_import/js/autocomplete.js"></script>
-<link href="/static/viecpro_import/css/autocomplete.css" rel="stylesheet" type="text/css">
-<link href="/static/viecpro_import/css/main.css" rel="stylesheet" type="text/css">
+<script src="/static/apis_import_project/js/autocomplete.js"></script>
+<link href="/static/apis_import_project/css/autocomplete.css" rel="stylesheet" type="text/css">
+<link href="/static/apis_import_project/css/main.css" rel="stylesheet" type="text/css">
 
 
 <div class="container-fluid w-auto mx-5 mt3 mb-5">
@@ -38,7 +38,7 @@ <h1 class="h1 my-auto">Projects</h1>
                 </tr>
                 {% for project, role in projects %}
                 <tr>
-                    <td><a href="{% url 'viecpro_import:editor_main' project_pk=project.pk %}">{{project.name}}</a>
+                    <td><a href="{% url 'apis_import_project:editor_main' project_pk=project.pk %}">{{project.name}}</a>
                     </td>
                     <td>{{role}}</td>
                     <td><a href="#" onclick="GetUpdateForm('{{project.pk}}')"><i class="link-dark" data-feather="edit" text="edit" ></i></a></td>
@@ -55,7 +55,7 @@ <h1 class="h1 my-auto">Projects</h1>
 </div>
 <script>
    function GetForm() {
-        let url = "{% url 'viecpro_import:project_create' %}"
+        let url = "{% url 'apis_import_project:project_create' %}"
         $.ajax({
             type: "GET",
             url: url,
@@ -71,7 +71,7 @@ <h1 class="h1 my-auto">Projects</h1>
 
 
     function GetUpdateForm(pk) {
-        let url = `/viecpro_import/project/update/${pk}/`;
+        let url = `/apis_import_project/project/update/${pk}/`;
 
         $.ajax({
             type: "GET",
diff --git a/viecpro_import/templates/section_templates/datasource_browser.html b/apis_import_project/templates/section_templates/datasource_browser.html
similarity index 100%
rename from viecpro_import/templates/section_templates/datasource_browser.html
rename to apis_import_project/templates/section_templates/datasource_browser.html
diff --git a/viecpro_import/templates/section_templates/generic_create_items_section.html b/apis_import_project/templates/section_templates/generic_create_items_section.html
similarity index 100%
rename from viecpro_import/templates/section_templates/generic_create_items_section.html
rename to apis_import_project/templates/section_templates/generic_create_items_section.html
diff --git a/viecpro_import/templates/section_templates/generic_entity_meta_section.html b/apis_import_project/templates/section_templates/generic_entity_meta_section.html
similarity index 90%
rename from viecpro_import/templates/section_templates/generic_entity_meta_section.html
rename to apis_import_project/templates/section_templates/generic_entity_meta_section.html
index a92cfb11..40b97a61 100644
--- a/viecpro_import/templates/section_templates/generic_entity_meta_section.html
+++ b/apis_import_project/templates/section_templates/generic_entity_meta_section.html
@@ -17,11 +17,11 @@ <h2>
     <div class="container-fluid p-5 px-5 mx-2">
         {% if is_create %}
         <!-- todo: __gpirgie__ only the update part is used at the moment, the create part is handled through calling itemcreate now and opening that section -->
-        <form action="/viecpro_import/editor/entity/create/{{entity_type}}/"
+        <form action="/apis_import_project/editor/entity/create/{{entity_type}}/"
               class="form pdf_tool_itemcreate"
               method="post">
         {% else %}
-        <form action="/viecpro_import/editor/entity/update/{{entity_type}}/{{instance.pk}}/"
+        <form action="/apis_import_project/editor/entity/update/{{entity_type}}/{{instance.pk}}/"
               class="form pdf_tool_itemcreate"
               method="post">
 
diff --git a/viecpro_import/templates/section_templates/generic_process_section.html b/apis_import_project/templates/section_templates/generic_process_section.html
similarity index 100%
rename from viecpro_import/templates/section_templates/generic_process_section.html
rename to apis_import_project/templates/section_templates/generic_process_section.html
diff --git a/viecpro_import/templates/section_templates/generic_relations_section.html b/apis_import_project/templates/section_templates/generic_relations_section.html
similarity index 99%
rename from viecpro_import/templates/section_templates/generic_relations_section.html
rename to apis_import_project/templates/section_templates/generic_relations_section.html
index 0ad8db31..ab3c830c 100644
--- a/viecpro_import/templates/section_templates/generic_relations_section.html
+++ b/apis_import_project/templates/section_templates/generic_relations_section.html
@@ -105,7 +105,7 @@ <h4 class="card-title">
         };
         return $.ajax({
                 type: 'POST',
-                url: "{% url 'viecpro_import:relation_get_form' %}",
+                url: "{% url 'apis_import_project:relation_get_form' %}",
             beforeSend: function(request) {
               var csrftoken = getCookie('csrftoken');
     request.setRequestHeader("X-CSRFToken", csrftoken);
diff --git a/viecpro_import/templates/section_templates/progress_created_template.html b/apis_import_project/templates/section_templates/progress_created_template.html
similarity index 100%
rename from viecpro_import/templates/section_templates/progress_created_template.html
rename to apis_import_project/templates/section_templates/progress_created_template.html
diff --git a/viecpro_import/templates/section_templates/progress_deleted_template.html b/apis_import_project/templates/section_templates/progress_deleted_template.html
similarity index 100%
rename from viecpro_import/templates/section_templates/progress_deleted_template.html
rename to apis_import_project/templates/section_templates/progress_deleted_template.html
diff --git a/viecpro_import/templates/section_templates/progress_edited_template.html b/apis_import_project/templates/section_templates/progress_edited_template.html
similarity index 100%
rename from viecpro_import/templates/section_templates/progress_edited_template.html
rename to apis_import_project/templates/section_templates/progress_edited_template.html
diff --git a/viecpro_deduplication/tests.py b/apis_import_project/tests.py
similarity index 100%
rename from viecpro_deduplication/tests.py
rename to apis_import_project/tests.py
diff --git a/viecpro_import/upload_helper.py b/apis_import_project/upload_helper.py
similarity index 100%
rename from viecpro_import/upload_helper.py
rename to apis_import_project/upload_helper.py
diff --git a/viecpro_import/urls.py b/apis_import_project/urls.py
similarity index 99%
rename from viecpro_import/urls.py
rename to apis_import_project/urls.py
index 41b599db..890b4709 100644
--- a/viecpro_import/urls.py
+++ b/apis_import_project/urls.py
@@ -9,7 +9,7 @@
 
 from django.conf.urls import url
 
-app_name = 'viecpro_import'
+app_name = 'apis_import_project'
 
 editor_patterns = [
     url(r'^(?P<project_pk>[0-9]+)/$', EditorPageView.as_view(), name='editor_main'),
diff --git a/viecpro_import/views.py b/apis_import_project/views.py
similarity index 99%
rename from viecpro_import/views.py
rename to apis_import_project/views.py
index 8cfbeea6..a2d7c040 100644
--- a/viecpro_import/views.py
+++ b/apis_import_project/views.py
@@ -262,7 +262,7 @@ def create_import_project(request, **kwargs):
     action = "Create"
     if request.method == "POST":
         form = CreateImportProjectForm(request.user, request.POST)
-        form.helper.form_action = reverse("viecpro_import:project_create")
+        form.helper.form_action = reverse("apis_import_project:project_create")
 
         if form.is_valid():
             user = request.user
@@ -270,11 +270,11 @@ def create_import_project(request, **kwargs):
             pi.Editors.add(user)
             pi.save()
 
-            return redirect(reverse("viecpro_import:project_main"))
+            return redirect(reverse("apis_import_project:project_main"))
 
     else:
         form = CreateImportProjectForm(user=request.user)
-        form.helper.form_action = reverse("viecpro_import:project_create")
+        form.helper.form_action = reverse("apis_import_project:project_create")
         data = {"content": render_to_string(template, {"form": form, "action": action}, request)}
         return JsonResponse(data)
 
@@ -288,7 +288,7 @@ def edit_import_project(request, **kwargs):
 
     if request.method == "POST":
         form = CreateImportProjectForm(request.user, request.POST, instance=instance)
-        form.helper.form_action = reverse("viecpro_import:project_update", kwargs={"project_pk": pk})
+        form.helper.form_action = reverse("apis_import_project:project_update", kwargs={"project_pk": pk})
 
         if form.is_valid():
             user = request.user
@@ -298,12 +298,12 @@ def edit_import_project(request, **kwargs):
 
             pi.save()
 
-            return redirect(reverse("viecpro_import:project_main"))
+            return redirect(reverse("apis_import_project:project_main"))
 
 
     else:
         form = CreateImportProjectForm(user=request.user, instance=instance)
-        form.helper.form_action = reverse("viecpro_import:project_update", kwargs={"project_pk": pk})
+        form.helper.form_action = reverse("apis_import_project:project_update", kwargs={"project_pk": pk})
 
         data = {"content": render_to_string(template, {"form": form, "action": action}, request)}
         return JsonResponse(data)
diff --git a/viecpro_deduplication/__init__.py b/dubletten_tool/__init__.py
similarity index 100%
rename from viecpro_deduplication/__init__.py
rename to dubletten_tool/__init__.py
diff --git a/viecpro_import/admin.py b/dubletten_tool/admin.py
similarity index 100%
rename from viecpro_import/admin.py
rename to dubletten_tool/admin.py
diff --git a/viecpro_deduplication/apps.py b/dubletten_tool/apps.py
similarity index 69%
rename from viecpro_deduplication/apps.py
rename to dubletten_tool/apps.py
index 99c3e539..228f6187 100644
--- a/viecpro_deduplication/apps.py
+++ b/dubletten_tool/apps.py
@@ -2,4 +2,4 @@
 
 
 class ViecproDeduplicationConfig(AppConfig):
-    name = 'viecpro_deduplication'
+    name = 'dubletten_tool'
diff --git a/viecpro_deduplication/auto_script.py b/dubletten_tool/auto_script.py
similarity index 100%
rename from viecpro_deduplication/auto_script.py
rename to dubletten_tool/auto_script.py
diff --git a/viecpro_deduplication/create_datasets.py b/dubletten_tool/create_datasets.py
similarity index 100%
rename from viecpro_deduplication/create_datasets.py
rename to dubletten_tool/create_datasets.py
diff --git a/viecpro_deduplication/detail_view.py b/dubletten_tool/detail_view.py
similarity index 100%
rename from viecpro_deduplication/detail_view.py
rename to dubletten_tool/detail_view.py
diff --git a/viecpro_deduplication/dump_improvements/helper_functions/helper_functions.py b/dubletten_tool/dump_improvements/helper_functions/helper_functions.py
similarity index 100%
rename from viecpro_deduplication/dump_improvements/helper_functions/helper_functions.py
rename to dubletten_tool/dump_improvements/helper_functions/helper_functions.py
diff --git a/viecpro_deduplication/dump_improvements/helper_functions/loggers.py b/dubletten_tool/dump_improvements/helper_functions/loggers.py
similarity index 100%
rename from viecpro_deduplication/dump_improvements/helper_functions/loggers.py
rename to dubletten_tool/dump_improvements/helper_functions/loggers.py
diff --git a/viecpro_deduplication/forms.py b/dubletten_tool/forms.py
similarity index 89%
rename from viecpro_deduplication/forms.py
rename to dubletten_tool/forms.py
index be312440..cb060b23 100644
--- a/viecpro_deduplication/forms.py
+++ b/dubletten_tool/forms.py
@@ -18,7 +18,7 @@ def __init__(self, inst_id, *args, **kwargs):
         self.helper.form_class = "NoteForm"
         self.helper.form_tag = True
         self.helper.help_text_inline = True
-        self.helper.form_action = reverse("viecpro_deduplication:handle_note_form", kwargs={
+        self.helper.form_action = reverse("dubletten_tool:handle_note_form", kwargs={
                                           "g_id": inst_id, "type": "group"})
         self.helper.add_input(
             Submit("submit", "save", css_id=f"post_note_{inst_id}"))
@@ -37,7 +37,7 @@ def __init__(self, inst_id, *args, **kwargs):
         self.helper.form_class = "NoteForm"
         self.helper.form_tag = True
         self.helper.help_text_inline = True
-        self.helper.form_action = reverse("viecpro_deduplication:handle_note_form", kwargs={
+        self.helper.form_action = reverse("dubletten_tool:handle_note_form", kwargs={
                                           "g_id": inst_id, "type": "personproxy"})
         self.helper.add_input(
             Submit("submit", "save", css_id=f"post_note_{inst_id}"))
diff --git a/viecpro_deduplication/grouping_script_1.py b/dubletten_tool/grouping_script_1.py
similarity index 100%
rename from viecpro_deduplication/grouping_script_1.py
rename to dubletten_tool/grouping_script_1.py
diff --git a/viecpro_deduplication/helpers.py b/dubletten_tool/helpers.py
similarity index 100%
rename from viecpro_deduplication/helpers.py
rename to dubletten_tool/helpers.py
diff --git a/viecpro_deduplication/logger.py b/dubletten_tool/logger.py
similarity index 100%
rename from viecpro_deduplication/logger.py
rename to dubletten_tool/logger.py
diff --git a/viecpro_deduplication/management/__init__.py b/dubletten_tool/management/__init__.py
similarity index 100%
rename from viecpro_deduplication/management/__init__.py
rename to dubletten_tool/management/__init__.py
diff --git a/viecpro_deduplication/management/commands/__init__.py b/dubletten_tool/management/commands/__init__.py
similarity index 100%
rename from viecpro_deduplication/management/commands/__init__.py
rename to dubletten_tool/management/commands/__init__.py
diff --git a/viecpro_deduplication/management/commands/add_access_groups.py b/dubletten_tool/management/commands/add_access_groups.py
similarity index 96%
rename from viecpro_deduplication/management/commands/add_access_groups.py
rename to dubletten_tool/management/commands/add_access_groups.py
index 7b41ed84..b11d36d3 100644
--- a/viecpro_deduplication/management/commands/add_access_groups.py
+++ b/dubletten_tool/management/commands/add_access_groups.py
@@ -3,12 +3,12 @@
 import itertools as it
 from collections import defaultdict, Counter
 import json
-from viecpro_deduplication.models import PersonProxy, Group, Suggestions, StatusButtonProxyType, StatusButtonGroupType, StatusButtonGroup, StatusButtonProxyType, StatusButtonProxy
+from dubletten_tool.models import PersonProxy, Group, Suggestions, StatusButtonProxyType, StatusButtonGroupType, StatusButtonGroup, StatusButtonProxyType, StatusButtonProxy
 from apis_core.apis_entities.models import Person
 from apis_core.apis_metainfo.models import Collection
 import logging
 from django.contrib.auth.models import User
-from viecpro_deduplication.logger import init_logger
+from dubletten_tool.logger import init_logger
 
 
 log = logging.getLogger("DBLogger")
diff --git a/viecpro_deduplication/management/commands/merge_groups.py b/dubletten_tool/management/commands/merge_groups.py
similarity index 79%
rename from viecpro_deduplication/management/commands/merge_groups.py
rename to dubletten_tool/management/commands/merge_groups.py
index 49752d85..6b20c857 100644
--- a/viecpro_deduplication/management/commands/merge_groups.py
+++ b/dubletten_tool/management/commands/merge_groups.py
@@ -1,12 +1,12 @@
 from django.core.management.base import BaseCommand
-from viecpro_deduplication.models import Group
+from dubletten_tool.models import Group
 from apis_core.apis_metainfo.models import Collection
 import logging
 from django.contrib.auth.models import User
-from viecpro_deduplication.logger import init_logger
+from dubletten_tool.logger import init_logger
 from apis_core.apis_metainfo.models import Collection
-from viecpro_deduplication.models import Group
-from viecpro_deduplication.merge_functions import write_person_person_rels, MergeGroup
+from dubletten_tool.models import Group
+from dubletten_tool.merge_functions import write_person_person_rels, MergeGroup
 
 log = logging.getLogger("DBLogger")
 
diff --git a/viecpro_deduplication/management/commands/setup_groups.py b/dubletten_tool/management/commands/setup_groups.py
similarity index 96%
rename from viecpro_deduplication/management/commands/setup_groups.py
rename to dubletten_tool/management/commands/setup_groups.py
index 8506ed73..c74b38a8 100644
--- a/viecpro_deduplication/management/commands/setup_groups.py
+++ b/dubletten_tool/management/commands/setup_groups.py
@@ -3,12 +3,12 @@
 import itertools as it
 from collections import defaultdict, Counter
 import json
-from viecpro_deduplication.models import PersonProxy, Group, Suggestions, StatusButtonProxyType, StatusButtonGroupType, StatusButtonGroup, StatusButtonProxyType, StatusButtonProxy
+from dubletten_tool.models import PersonProxy, Group, Suggestions, StatusButtonProxyType, StatusButtonGroupType, StatusButtonGroup, StatusButtonProxyType, StatusButtonProxy
 from apis_core.apis_entities.models import Person
 from apis_core.apis_metainfo.models import Collection
 import logging
 from django.contrib.auth.models import User
-from viecpro_deduplication.logger import init_logger
+from dubletten_tool.logger import init_logger
 
 
 log = logging.getLogger("DBLogger")
diff --git a/viecpro_deduplication/merge_filters.py b/dubletten_tool/merge_filters.py
similarity index 100%
rename from viecpro_deduplication/merge_filters.py
rename to dubletten_tool/merge_filters.py
diff --git a/viecpro_deduplication/merge_functions.py b/dubletten_tool/merge_functions.py
similarity index 97%
rename from viecpro_deduplication/merge_functions.py
rename to dubletten_tool/merge_functions.py
index 87289c71..8d5a3a32 100644
--- a/viecpro_deduplication/merge_functions.py
+++ b/dubletten_tool/merge_functions.py
@@ -1,10 +1,10 @@
 from collections import defaultdict, Counter
 import json
-from viecpro_deduplication.models import Group
+from dubletten_tool.models import Group
 from apis_core.apis_entities.models import Person
 from apis_core.apis_metainfo.models import Collection
 import logging
-from viecpro_deduplication.logger import init_logger
+from dubletten_tool.logger import init_logger
 
 from apis_core.apis_entities.models import Person
 from apis_core.apis_labels.models import LabelType, Label
@@ -12,7 +12,7 @@
 from apis_core.apis_vocabularies.models import PersonPersonRelation
 from apis_core.apis_relations.models import PersonPerson, AbstractRelation
 
-from viecpro_deduplication.models import PersonProxy, Group
+from dubletten_tool.models import PersonProxy, Group
 import json
 
 log = logging.getLogger("DBLogger")
@@ -23,7 +23,7 @@
 
 These functions are used: 
 - in the management command to create the inital merges (merge_groups command)
-- in merge_views.py, in the remergegroupview, that can be called in the viecpro_deduplication frontend section. The template for the button is member_list.html, the callback function resides in tool_page.html
+- in merge_views.py, in the remergegroupview, that can be called in the dubletten_tool frontend section. The template for the button is member_list.html, the callback function resides in tool_page.html
 """
 
 
diff --git a/viecpro_deduplication/merge_tables.py b/dubletten_tool/merge_tables.py
similarity index 99%
rename from viecpro_deduplication/merge_tables.py
rename to dubletten_tool/merge_tables.py
index 99fe675a..ea857210 100644
--- a/viecpro_deduplication/merge_tables.py
+++ b/dubletten_tool/merge_tables.py
@@ -39,7 +39,7 @@ def render_name(self, record, value):
     render_end_date_written = generic_render_end_date_written
 
     name = tables.LinkColumn(
-        'viecpro_deduplication:vorfin_detail',  # todo: change to local detail view
+        'dubletten_tool:vorfin_detail',  # todo: change to local detail view
         args=[entity.lower(), A('pk')],
         empty_values=[]
     )
diff --git a/viecpro_deduplication/merge_views.py b/dubletten_tool/merge_views.py
similarity index 99%
rename from viecpro_deduplication/merge_views.py
rename to dubletten_tool/merge_views.py
index b4f9d70a..352fcfa8 100644
--- a/viecpro_deduplication/merge_views.py
+++ b/dubletten_tool/merge_views.py
@@ -102,8 +102,8 @@
 
 from .merge_tables import get_generic_relations_table
 
-from viecpro_deduplication.src.functions.remerge_single_group import remerge_single_group
-from viecpro_deduplication.tasks import remerge_group_task
+from dubletten_tool.src.functions.remerge_single_group import remerge_single_group
+from dubletten_tool.tasks import remerge_group_task
 
 if "apis_ampel" in settings.INSTALLED_APPS:
     from apis_ampel.helper_functions import is_ampel_active
@@ -609,7 +609,7 @@ def post(self, request, *args, **kwargs):
         if form.is_valid() and form_text.is_valid():
             entity_2 = form.save()
             form_text.save(entity_2)
-            return redirect(reverse('viecpro_deduplication:generic_entities_edit_view', kwargs={
+            return redirect(reverse('dubletten_tool:generic_entities_edit_view', kwargs={
                 'pk': pk, 'entity': entity
             }))
         else:
diff --git a/viecpro_deduplication/models.py b/dubletten_tool/models.py
similarity index 100%
rename from viecpro_deduplication/models.py
rename to dubletten_tool/models.py
diff --git a/viecpro_deduplication/redis_client.py b/dubletten_tool/redis_client.py
similarity index 100%
rename from viecpro_deduplication/redis_client.py
rename to dubletten_tool/redis_client.py
diff --git a/viecpro_deduplication/src/classes/ErrorLoggerMixin.py b/dubletten_tool/src/classes/ErrorLoggerMixin.py
similarity index 100%
rename from viecpro_deduplication/src/classes/ErrorLoggerMixin.py
rename to dubletten_tool/src/classes/ErrorLoggerMixin.py
diff --git a/viecpro_deduplication/src/classes/MergeGroup.py b/dubletten_tool/src/classes/MergeGroup.py
similarity index 98%
rename from viecpro_deduplication/src/classes/MergeGroup.py
rename to dubletten_tool/src/classes/MergeGroup.py
index f91fff3a..249fedb8 100644
--- a/viecpro_deduplication/src/classes/MergeGroup.py
+++ b/dubletten_tool/src/classes/MergeGroup.py
@@ -20,7 +20,7 @@ class MergeGroup:
 
     These functions are used: 
     - in the management command to create the inital merges (merge_groups command)
-    - in merge_views.py, in the remergegroupview, that can be called in the viecpro_deduplication frontend section. The template for the button is member_list.html, the callback function resides in tool_page.html
+    - in merge_views.py, in the remergegroupview, that can be called in the dubletten_tool frontend section. The template for the button is member_list.html, the callback function resides in tool_page.html
     """
 
     merged_col, c = Collection.objects.get_or_create(name="Vorfinale Einträge")
diff --git a/viecpro_deduplication/src/classes/PPHelper.py b/dubletten_tool/src/classes/PPHelper.py
similarity index 100%
rename from viecpro_deduplication/src/classes/PPHelper.py
rename to dubletten_tool/src/classes/PPHelper.py
diff --git a/viecpro_deduplication/src/classes/PPKind.py b/dubletten_tool/src/classes/PPKind.py
similarity index 100%
rename from viecpro_deduplication/src/classes/PPKind.py
rename to dubletten_tool/src/classes/PPKind.py
diff --git a/viecpro_deduplication/src/classes/PersonHelper.py b/dubletten_tool/src/classes/PersonHelper.py
similarity index 100%
rename from viecpro_deduplication/src/classes/PersonHelper.py
rename to dubletten_tool/src/classes/PersonHelper.py
diff --git a/viecpro_deduplication/src/classes/PersonType.py b/dubletten_tool/src/classes/PersonType.py
similarity index 96%
rename from viecpro_deduplication/src/classes/PersonType.py
rename to dubletten_tool/src/classes/PersonType.py
index cad8974d..6a8439a6 100644
--- a/viecpro_deduplication/src/classes/PersonType.py
+++ b/dubletten_tool/src/classes/PersonType.py
@@ -1,5 +1,5 @@
 from . import Enum, PersonHelper
-from viecpro_deduplication.src.functions.helper_functions import is_dublette
+from dubletten_tool.src.functions.helper_functions import is_dublette
 
 
 class PersonType(Enum):
diff --git a/viecpro_deduplication/src/classes/ProcessingTracker.py b/dubletten_tool/src/classes/ProcessingTracker.py
similarity index 100%
rename from viecpro_deduplication/src/classes/ProcessingTracker.py
rename to dubletten_tool/src/classes/ProcessingTracker.py
diff --git a/viecpro_deduplication/src/classes/RelationWriter.py b/dubletten_tool/src/classes/RelationWriter.py
similarity index 100%
rename from viecpro_deduplication/src/classes/RelationWriter.py
rename to dubletten_tool/src/classes/RelationWriter.py
diff --git a/viecpro_deduplication/src/classes/RemergeHelper.py b/dubletten_tool/src/classes/RemergeHelper.py
similarity index 100%
rename from viecpro_deduplication/src/classes/RemergeHelper.py
rename to dubletten_tool/src/classes/RemergeHelper.py
diff --git a/viecpro_deduplication/src/classes/TempRel.py b/dubletten_tool/src/classes/TempRel.py
similarity index 100%
rename from viecpro_deduplication/src/classes/TempRel.py
rename to dubletten_tool/src/classes/TempRel.py
diff --git a/viecpro_deduplication/src/classes/__init__.py b/dubletten_tool/src/classes/__init__.py
similarity index 94%
rename from viecpro_deduplication/src/classes/__init__.py
rename to dubletten_tool/src/classes/__init__.py
index bdf86d07..28bb6ea7 100644
--- a/viecpro_deduplication/src/classes/__init__.py
+++ b/dubletten_tool/src/classes/__init__.py
@@ -9,7 +9,7 @@
 from apis_core.apis_relations.models import AbstractRelation, PersonPerson
 from apis_core.apis_vocabularies.models import PersonPersonRelation, LabelType
 from apis_core.apis_metainfo.models import Collection, Label
-from viecpro_deduplication.models import Group, PersonProxy
+from dubletten_tool.models import Group, PersonProxy
 from apis_ampel.models import AmpelTemp
 import pandas as pd
 
@@ -27,7 +27,7 @@ class LoggerDummy:
 
 
 # helper functions
-from viecpro_deduplication.src.functions.helper_functions import get_group, is_dublette, get_ampel, function_timer
+from dubletten_tool.src.functions.helper_functions import get_group, is_dublette, get_ampel, function_timer
 # ordered imports of dependent classes
 from .ErrorLoggerMixin import ErrorLoggerMixin
 
diff --git a/viecpro_deduplication/src/classes/class_notes.md b/dubletten_tool/src/classes/class_notes.md
similarity index 100%
rename from viecpro_deduplication/src/classes/class_notes.md
rename to dubletten_tool/src/classes/class_notes.md
diff --git a/viecpro_deduplication/src/functions/helper_functions.py b/dubletten_tool/src/functions/helper_functions.py
similarity index 97%
rename from viecpro_deduplication/src/functions/helper_functions.py
rename to dubletten_tool/src/functions/helper_functions.py
index a1519627..3ed43aa1 100644
--- a/viecpro_deduplication/src/functions/helper_functions.py
+++ b/dubletten_tool/src/functions/helper_functions.py
@@ -1,4 +1,4 @@
-from viecpro_deduplication.models import PersonProxy, Group
+from dubletten_tool.models import PersonProxy, Group
 from apis_ampel.models import AmpelTemp
 from apis_core.apis_metainfo.models import Collection
 from time import time
diff --git a/viecpro_deduplication/src/functions/remerge_single_group.py b/dubletten_tool/src/functions/remerge_single_group.py
similarity index 95%
rename from viecpro_deduplication/src/functions/remerge_single_group.py
rename to dubletten_tool/src/functions/remerge_single_group.py
index 70e9320a..f0a9d648 100644
--- a/viecpro_deduplication/src/functions/remerge_single_group.py
+++ b/dubletten_tool/src/functions/remerge_single_group.py
@@ -1,6 +1,6 @@
-from viecpro_deduplication.src.classes import MergeGroup, function_timer, TempRel, ErrorLoggerMixin, PersonHelper, PPHelper, logger, rt_vorfin, time, ProcessingTracker, RelationWriter
+from dubletten_tool.src.classes import MergeGroup, function_timer, TempRel, ErrorLoggerMixin, PersonHelper, PPHelper, logger, rt_vorfin, time, ProcessingTracker, RelationWriter
 from time import time
-from viecpro_deduplication.models import Group
+from dubletten_tool.models import Group
 
 
 def remerge_single_group(group, vorfins=None, use_person_list=False, groups_to_delete=[]):
diff --git a/viecpro_deduplication/static/viecpro_deduplication/css/deduplication.css b/dubletten_tool/static/viecpro_deduplication/css/deduplication.css
similarity index 100%
rename from viecpro_deduplication/static/viecpro_deduplication/css/deduplication.css
rename to dubletten_tool/static/viecpro_deduplication/css/deduplication.css
diff --git a/viecpro_deduplication/suggestions.py b/dubletten_tool/suggestions.py
similarity index 100%
rename from viecpro_deduplication/suggestions.py
rename to dubletten_tool/suggestions.py
diff --git a/viecpro_deduplication/tasks.py b/dubletten_tool/tasks.py
similarity index 96%
rename from viecpro_deduplication/tasks.py
rename to dubletten_tool/tasks.py
index 929a7e65..24226b4e 100644
--- a/viecpro_deduplication/tasks.py
+++ b/dubletten_tool/tasks.py
@@ -1,7 +1,7 @@
 from celery import shared_task
-from viecpro_deduplication.src.functions.remerge_single_group import remerge_single_group
+from dubletten_tool.src.functions.remerge_single_group import remerge_single_group
 from celery.utils.log import get_task_logger
-from viecpro_deduplication.models import Group, StatusButtonGroup, StatusButtonGroupType, PersonProxy
+from dubletten_tool.models import Group, StatusButtonGroup, StatusButtonGroupType, PersonProxy
 from apis_core.apis_entities.models import Person
 from django.http import HttpResponse, JsonResponse
 from time import sleep
diff --git a/viecpro_deduplication/templates/all_notes.html b/dubletten_tool/templates/all_notes.html
similarity index 100%
rename from viecpro_deduplication/templates/all_notes.html
rename to dubletten_tool/templates/all_notes.html
diff --git a/dubletten_tool/templates/del/ampel_action_template.html b/dubletten_tool/templates/del/ampel_action_template.html
new file mode 100644
index 00000000..9910edf3
--- /dev/null
+++ b/dubletten_tool/templates/del/ampel_action_template.html
@@ -0,0 +1,149 @@
+<div class="d-inline-flex">
+  <div class="ampel_circle mx-2" id="ampel_green"></div>
+  <div class="ampel_circle mx-2" id="ampel_yellow"></div>
+  <div class="ampel_circle mx-2" id="ampel_red"></div>
+  {% if instance.ampel.note %}
+  <button
+    class="btn btn-sm btn-primary"
+    onclick="getNoteText()"
+    id="note_button"
+  >
+    Note
+  </button>
+  {% else %}
+  <button
+    class="btn btn-sm btn-secondary"
+    onclick="getNoteText()"
+    id="note_button"
+  >
+    Note
+  </button>
+  {% endif %}
+</div>
+<script>
+  let ampel_status = "{{instance.ampel.status|escapejs}}";
+  let note_text = "{{instance.ampel.note|escapejs}}";
+
+  /**
+    if (ampel_status === ""){
+        ampel_status = "{{instance.ampel.status|escapejs}}"
+    }
+    **/
+
+  const set_selected_color = () => {
+    $(`#ampel_${ampel_status}`).css("background-color", ampel_status);
+  };
+  set_selected_color();
+  $(".ampel_circle").on("mouseenter", (el) => {
+    el_color = el.target.id.split("_")[1];
+    $(el.target).css("background-color", el_color);
+  });
+
+  $(".ampel_circle").on("mouseout", (el) => {
+    el_color = el.target.id.split("_")[1];
+
+    if (ampel_status != el_color) {
+      $(el.target).css("background-color", "darkgrey");
+    }
+  });
+
+  $(".ampel_circle").on("click", updateAmpelResponse);
+
+  function updateAmpelResponse(el) {
+    //console.log(el.target.id)
+    status = el.target.id.split("_")[1];
+    console.log(status);
+    if (ampel_status != status) {
+      ampel_id = "{{instance.id|escapejs}}";
+      /**
+        if (ampel_id === ""){
+            ampel_id = "{{instance.id|escapejs}}"
+        }
+        **/
+      $.ajax({
+        type: "POST",
+        url: "{% url 'dubletten_tool:update_ampel'%}",
+        data: {
+          id: ampel_id,
+          status: status,
+        },
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (result) {
+          console.log(result);
+          $(`#ampel_${ampel_status}`).css(
+            "background-color",
+            "darkgrey"
+          );
+          ampel_status = status;
+          set_selected_color();
+          //todo: alert if success is false
+        },
+        dataType: "json",
+      });
+    }
+  }
+
+  function getNoteText() {
+    ampel_id = "{{instance.id|escapejs}}";
+
+    /**
+        if (ampel_id === ""){
+            ampel_id = "{{instance.id|escapejs}}"
+        }
+        **/
+    /**
+        fetch("{% url 'dubletten_tool:get_note_text' ampel_pk='111122223333'%}".replace("111122223333", ampel_id)).then((res)=> res.json()).then((j)=> { if (j.success){
+            console.log(j);
+            note_text = j.text;
+        }
+        **/
+    new_text = prompt("Update Note", note_text);
+    console.log(new_text);
+    /** if (new_text === ""){
+            new_text = note_text
+        } 
+        **/
+    if (new_text != note_text && new_text != null) {
+      updateNoteResponse(new_text);
+    }
+  }
+
+  function updateNoteResponse(text) {
+    $.ajax({
+      type: "POST",
+      url: "{% url 'dubletten_tool:update_note_text' %}",
+      data: {
+        id: ampel_id,
+        note_text: text,
+      },
+      beforeSend: function (request) {
+        let csrftoken = getCookie("csrftoken");
+        request.setRequestHeader("X-CSRFToken", csrftoken);
+      },
+      success: function (result) {
+        note_text = text;
+        console.log(note_text, note_text != "");
+        if (note_text.trim().length === 0) {
+          $("#note_button").removeClass("btn-primary");
+          $("#note_button").addClass("btn-secondary");
+        } else {
+          $("#note_button").removeClass("btn-secondary");
+          $("#note_button").addClass("btn-primary");
+        }
+      },
+      dataType: "json",
+    });
+  }
+</script>
+<style>
+  .ampel_circle {
+    background-color: darkgrey;
+    border: 2px solid black;
+    width: 20px;
+    height: 20px;
+    border-radius: 30px;
+  }
+</style>
diff --git a/viecpro_deduplication/templates/del/ampel_note_column.html b/dubletten_tool/templates/del/ampel_note_column.html
similarity index 100%
rename from viecpro_deduplication/templates/del/ampel_note_column.html
rename to dubletten_tool/templates/del/ampel_note_column.html
diff --git a/viecpro_deduplication/templates/del/ampel_template_column.html b/dubletten_tool/templates/del/ampel_template_column.html
similarity index 100%
rename from viecpro_deduplication/templates/del/ampel_template_column.html
rename to dubletten_tool/templates/del/ampel_template_column.html
diff --git a/viecpro_deduplication/templates/group_buttons.html b/dubletten_tool/templates/group_buttons.html
similarity index 100%
rename from viecpro_deduplication/templates/group_buttons.html
rename to dubletten_tool/templates/group_buttons.html
diff --git a/viecpro_deduplication/templates/group_form.html b/dubletten_tool/templates/group_form.html
similarity index 100%
rename from viecpro_deduplication/templates/group_form.html
rename to dubletten_tool/templates/group_form.html
diff --git a/viecpro_deduplication/templates/group_list.html b/dubletten_tool/templates/group_list.html
similarity index 100%
rename from viecpro_deduplication/templates/group_list.html
rename to dubletten_tool/templates/group_list.html
diff --git a/viecpro_deduplication/templates/group_suggestions.html b/dubletten_tool/templates/group_suggestions.html
similarity index 100%
rename from viecpro_deduplication/templates/group_suggestions.html
rename to dubletten_tool/templates/group_suggestions.html
diff --git a/viecpro_deduplication/templates/member_list.html b/dubletten_tool/templates/member_list.html
similarity index 100%
rename from viecpro_deduplication/templates/member_list.html
rename to dubletten_tool/templates/member_list.html
diff --git a/dubletten_tool/templates/merge/ampel_action_template.html b/dubletten_tool/templates/merge/ampel_action_template.html
new file mode 100644
index 00000000..9910edf3
--- /dev/null
+++ b/dubletten_tool/templates/merge/ampel_action_template.html
@@ -0,0 +1,149 @@
+<div class="d-inline-flex">
+  <div class="ampel_circle mx-2" id="ampel_green"></div>
+  <div class="ampel_circle mx-2" id="ampel_yellow"></div>
+  <div class="ampel_circle mx-2" id="ampel_red"></div>
+  {% if instance.ampel.note %}
+  <button
+    class="btn btn-sm btn-primary"
+    onclick="getNoteText()"
+    id="note_button"
+  >
+    Note
+  </button>
+  {% else %}
+  <button
+    class="btn btn-sm btn-secondary"
+    onclick="getNoteText()"
+    id="note_button"
+  >
+    Note
+  </button>
+  {% endif %}
+</div>
+<script>
+  let ampel_status = "{{instance.ampel.status|escapejs}}";
+  let note_text = "{{instance.ampel.note|escapejs}}";
+
+  /**
+    if (ampel_status === ""){
+        ampel_status = "{{instance.ampel.status|escapejs}}"
+    }
+    **/
+
+  const set_selected_color = () => {
+    $(`#ampel_${ampel_status}`).css("background-color", ampel_status);
+  };
+  set_selected_color();
+  $(".ampel_circle").on("mouseenter", (el) => {
+    el_color = el.target.id.split("_")[1];
+    $(el.target).css("background-color", el_color);
+  });
+
+  $(".ampel_circle").on("mouseout", (el) => {
+    el_color = el.target.id.split("_")[1];
+
+    if (ampel_status != el_color) {
+      $(el.target).css("background-color", "darkgrey");
+    }
+  });
+
+  $(".ampel_circle").on("click", updateAmpelResponse);
+
+  function updateAmpelResponse(el) {
+    //console.log(el.target.id)
+    status = el.target.id.split("_")[1];
+    console.log(status);
+    if (ampel_status != status) {
+      ampel_id = "{{instance.id|escapejs}}";
+      /**
+        if (ampel_id === ""){
+            ampel_id = "{{instance.id|escapejs}}"
+        }
+        **/
+      $.ajax({
+        type: "POST",
+        url: "{% url 'dubletten_tool:update_ampel'%}",
+        data: {
+          id: ampel_id,
+          status: status,
+        },
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (result) {
+          console.log(result);
+          $(`#ampel_${ampel_status}`).css(
+            "background-color",
+            "darkgrey"
+          );
+          ampel_status = status;
+          set_selected_color();
+          //todo: alert if success is false
+        },
+        dataType: "json",
+      });
+    }
+  }
+
+  function getNoteText() {
+    ampel_id = "{{instance.id|escapejs}}";
+
+    /**
+        if (ampel_id === ""){
+            ampel_id = "{{instance.id|escapejs}}"
+        }
+        **/
+    /**
+        fetch("{% url 'dubletten_tool:get_note_text' ampel_pk='111122223333'%}".replace("111122223333", ampel_id)).then((res)=> res.json()).then((j)=> { if (j.success){
+            console.log(j);
+            note_text = j.text;
+        }
+        **/
+    new_text = prompt("Update Note", note_text);
+    console.log(new_text);
+    /** if (new_text === ""){
+            new_text = note_text
+        } 
+        **/
+    if (new_text != note_text && new_text != null) {
+      updateNoteResponse(new_text);
+    }
+  }
+
+  function updateNoteResponse(text) {
+    $.ajax({
+      type: "POST",
+      url: "{% url 'dubletten_tool:update_note_text' %}",
+      data: {
+        id: ampel_id,
+        note_text: text,
+      },
+      beforeSend: function (request) {
+        let csrftoken = getCookie("csrftoken");
+        request.setRequestHeader("X-CSRFToken", csrftoken);
+      },
+      success: function (result) {
+        note_text = text;
+        console.log(note_text, note_text != "");
+        if (note_text.trim().length === 0) {
+          $("#note_button").removeClass("btn-primary");
+          $("#note_button").addClass("btn-secondary");
+        } else {
+          $("#note_button").removeClass("btn-secondary");
+          $("#note_button").addClass("btn-primary");
+        }
+      },
+      dataType: "json",
+    });
+  }
+</script>
+<style>
+  .ampel_circle {
+    background-color: darkgrey;
+    border: 2px solid black;
+    width: 20px;
+    height: 20px;
+    border-radius: 30px;
+  }
+</style>
diff --git a/viecpro_deduplication/templates/merge/ampel_note_column.html b/dubletten_tool/templates/merge/ampel_note_column.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/ampel_note_column.html
rename to dubletten_tool/templates/merge/ampel_note_column.html
diff --git a/viecpro_deduplication/templates/merge/ampel_template_column.html b/dubletten_tool/templates/merge/ampel_template_column.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/ampel_template_column.html
rename to dubletten_tool/templates/merge/ampel_template_column.html
diff --git a/viecpro_deduplication/templates/merge/apis_create_entities.html b/dubletten_tool/templates/merge/apis_create_entities.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/apis_create_entities.html
rename to dubletten_tool/templates/merge/apis_create_entities.html
diff --git a/viecpro_deduplication/templates/merge/compare_base.html b/dubletten_tool/templates/merge/compare_base.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/compare_base.html
rename to dubletten_tool/templates/merge/compare_base.html
diff --git a/viecpro_deduplication/templates/merge/detail_views/entity_detail_generic.html b/dubletten_tool/templates/merge/detail_views/entity_detail_generic.html
similarity index 98%
rename from viecpro_deduplication/templates/merge/detail_views/entity_detail_generic.html
rename to dubletten_tool/templates/merge/detail_views/entity_detail_generic.html
index a1ed3e8f..da7c65f7 100644
--- a/viecpro_deduplication/templates/merge/detail_views/entity_detail_generic.html
+++ b/dubletten_tool/templates/merge/detail_views/entity_detail_generic.html
@@ -31,7 +31,7 @@ <h2>
                 <div class="col-md-8">
                     <h2 style="text-align: center;">
                         {% if object.get_listview_url %}
-                            <a href="{% url 'viecpro_deduplication:tool_merge' %}">
+                            <a href="{% url 'dubletten_tool:tool_merge' %}">
                                 <small>vorfinal</small>
                             </a>
                         {% else %}
@@ -58,7 +58,7 @@ <h2 style="text-align: center;">
                                     </a>
                             {% endif %}
                             |
-                            <a href={% url 'viecpro_deduplication:relation_editor' pk=object.id %}>Editor</a>
+                            <a href={% url 'dubletten_tool:relation_editor' pk=object.id %}>Editor</a>
 
                         {% endif %}
                         | {% include "ampel/ampel_inline_template.html" with instance=object %}
diff --git a/viecpro_deduplication/templates/merge/detail_views/merge_tool_entity_detail_generic.html b/dubletten_tool/templates/merge/detail_views/merge_tool_entity_detail_generic.html
similarity index 98%
rename from viecpro_deduplication/templates/merge/detail_views/merge_tool_entity_detail_generic.html
rename to dubletten_tool/templates/merge/detail_views/merge_tool_entity_detail_generic.html
index 3234b77c..4e3c1250 100644
--- a/viecpro_deduplication/templates/merge/detail_views/merge_tool_entity_detail_generic.html
+++ b/dubletten_tool/templates/merge/detail_views/merge_tool_entity_detail_generic.html
@@ -31,7 +31,7 @@ <h2>
                 <div class="col-md-8">
                     <h2 style="text-align: center;">
                         {% if object.get_listview_url %}
-                            <a href="{% url 'viecpro_deduplication:tool_merge' %}">
+                            <a href="{% url 'dubletten_tool:tool_merge' %}">
                                 <small>vorfinal</small>
                             </a>
                         {% else %}
@@ -58,7 +58,7 @@ <h2 style="text-align: center;">
                                     </a>
                             {% endif %}
                             |
-                            <a href={% url 'viecpro_deduplication:relation_editor' pk=object.id %}>Editor</a>
+                            <a href={% url 'dubletten_tool:relation_editor' pk=object.id %}>Editor</a>
 
                         {% endif %}
                         | {% include "../ampel_action_template.html" with instance=object %}
diff --git a/viecpro_deduplication/templates/merge/detail_views/person_detail_generic.html b/dubletten_tool/templates/merge/detail_views/person_detail_generic.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/detail_views/person_detail_generic.html
rename to dubletten_tool/templates/merge/detail_views/person_detail_generic.html
diff --git a/viecpro_deduplication/templates/merge/entity_create_generic.html b/dubletten_tool/templates/merge/entity_create_generic.html
similarity index 98%
rename from viecpro_deduplication/templates/merge/entity_create_generic.html
rename to dubletten_tool/templates/merge/entity_create_generic.html
index 96f0ba51..24aed593 100644
--- a/viecpro_deduplication/templates/merge/entity_create_generic.html
+++ b/dubletten_tool/templates/merge/entity_create_generic.html
@@ -20,7 +20,7 @@
 <div class="container-fluid">
     <div class="card">
         <div class="card-header" style="text-align: center;">
-            <h1><a href="{% url 'viecpro_deduplication:tool_merge' %}">
+            <h1><a href="{% url 'dubletten_tool:tool_merge' %}">
                 <small>vorfinal</small>
             </a>
                 <strong>{{ instance }} </strong> <a href="{{ detail_url }}">
@@ -30,7 +30,7 @@ <h1><a href="{% url 'viecpro_deduplication:tool_merge' %}">
                     <i data-feather="database" title="database"></i>
                 </a>
                 |
-                <a href={% url 'viecpro_deduplication:relation_editor' pk=instance.id %}>Editor</a>
+                <a href={% url 'dubletten_tool:relation_editor' pk=instance.id %}>Editor</a>
                 |
                 {% include "ampel/ampel_inline_template.html" with instance=instance %}
             </h1>
diff --git a/viecpro_deduplication/templates/merge/generic_list.html b/dubletten_tool/templates/merge/generic_list.html
similarity index 99%
rename from viecpro_deduplication/templates/merge/generic_list.html
rename to dubletten_tool/templates/merge/generic_list.html
index b6ad5ecf..10284e28 100644
--- a/viecpro_deduplication/templates/merge/generic_list.html
+++ b/dubletten_tool/templates/merge/generic_list.html
@@ -186,7 +186,7 @@ <h4>create new {{ entity }}</h4>
 
 function updateCollections(){
     console.log("update collections clicked")
-    url = "{% url 'viecpro_deduplication:update_collections' %}"
+    url = "{% url 'dubletten_tool:update_collections' %}"
     $.ajax({
             url: url, 
             type: "GET", 
diff --git a/viecpro_deduplication/templates/merge/mege_tool_generic_list.html b/dubletten_tool/templates/merge/mege_tool_generic_list.html
similarity index 98%
rename from viecpro_deduplication/templates/merge/mege_tool_generic_list.html
rename to dubletten_tool/templates/merge/mege_tool_generic_list.html
index 7b161330..f2715d61 100644
--- a/viecpro_deduplication/templates/merge/mege_tool_generic_list.html
+++ b/dubletten_tool/templates/merge/mege_tool_generic_list.html
@@ -188,7 +188,7 @@ <h4>create new {{ entity }}</h4>
         console.log("ampel id in listgetnote", ampel_id)
         let note_text;
     
-        fetch("{% url 'viecpro_deduplication:get_note_text' ampel_pk='111122223333'%}".replace("111122223333", ampel_id))
+        fetch("{% url 'dubletten_tool:get_note_text' ampel_pk='111122223333'%}".replace("111122223333", ampel_id))
         .then((res)=> res.json())
         .then((j) => { if (j.success){
             console.log(j);
@@ -208,7 +208,7 @@ <h4>create new {{ entity }}</h4>
 
         $.ajax({
             type: "POST",
-            url: "{% url 'viecpro_deduplication:update_note_text' %}",
+            url: "{% url 'dubletten_tool:update_note_text' %}",
             data: {
               "id": ampel_id,
               "note_text": text,
diff --git a/viecpro_deduplication/templates/merge/merge_page.html b/dubletten_tool/templates/merge/merge_page.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/merge_page.html
rename to dubletten_tool/templates/merge/merge_page.html
diff --git a/viecpro_deduplication/templates/merge/merge_tool_entity_create_generic.html b/dubletten_tool/templates/merge/merge_tool_entity_create_generic.html
similarity index 98%
rename from viecpro_deduplication/templates/merge/merge_tool_entity_create_generic.html
rename to dubletten_tool/templates/merge/merge_tool_entity_create_generic.html
index 8e9d2dce..5f6b9358 100644
--- a/viecpro_deduplication/templates/merge/merge_tool_entity_create_generic.html
+++ b/dubletten_tool/templates/merge/merge_tool_entity_create_generic.html
@@ -20,7 +20,7 @@
 <div class="container-fluid">
     <div class="card">
         <div class="card-header" style="text-align: center;">
-            <h1><a href="{% url 'viecpro_deduplication:tool_merge' %}">
+            <h1><a href="{% url 'dubletten_tool:tool_merge' %}">
                 <small>vorfinal</small>
             </a>
                 <strong>{{ instance }} </strong> <a href="{{ detail_url }}">
@@ -30,7 +30,7 @@ <h1><a href="{% url 'viecpro_deduplication:tool_merge' %}">
                     <i data-feather="database" title="database"></i>
                 </a>
                 |
-                <a href={% url 'viecpro_deduplication:relation_editor' pk=instance.id %}>Editor</a>
+                <a href={% url 'dubletten_tool:relation_editor' pk=instance.id %}>Editor</a>
                 |
                 {% include "./ampel_action_template.html" with instance=instance %}
             </h1>
diff --git a/viecpro_deduplication/templates/merge/person_create.html b/dubletten_tool/templates/merge/person_create.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/person_create.html
rename to dubletten_tool/templates/merge/person_create.html
diff --git a/viecpro_deduplication/templates/merge/person_create_generic.html b/dubletten_tool/templates/merge/person_create_generic.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/person_create_generic.html
rename to dubletten_tool/templates/merge/person_create_generic.html
diff --git a/viecpro_deduplication/templates/merge/person_create_new.html b/dubletten_tool/templates/merge/person_create_new.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/person_create_new.html
rename to dubletten_tool/templates/merge/person_create_new.html
diff --git a/viecpro_deduplication/templates/merge/person_list.html b/dubletten_tool/templates/merge/person_list.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/person_list.html
rename to dubletten_tool/templates/merge/person_list.html
diff --git a/viecpro_deduplication/templates/merge/person_list_generic.html b/dubletten_tool/templates/merge/person_list_generic.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/person_list_generic.html
rename to dubletten_tool/templates/merge/person_list_generic.html
diff --git a/viecpro_deduplication/templates/merge/relation_editor.html b/dubletten_tool/templates/merge/relation_editor.html
similarity index 97%
rename from viecpro_deduplication/templates/merge/relation_editor.html
rename to dubletten_tool/templates/merge/relation_editor.html
index f848b871..6c58e417 100644
--- a/viecpro_deduplication/templates/merge/relation_editor.html
+++ b/dubletten_tool/templates/merge/relation_editor.html
@@ -7,7 +7,7 @@
   <div class="row w-100 py-4" id="person_header_row">
     <div class="col-md-12">
         <h3 class="text-center">
-          <a href="{% url 'viecpro_deduplication:tool_merge' %}">
+          <a href="{% url 'dubletten_tool:tool_merge' %}">
             <small>vorfinal</small>
           </a>{{object}} 
           {% if user.is_authenticated %}
@@ -161,7 +161,7 @@ <h3 class="mb-4">Texts</h3>
           console.log("new rel",new_rel)
           $.ajax({
             type: "POST",
-            url: "{% url 'viecpro_deduplication:create_relation'%}",
+            url: "{% url 'dubletten_tool:create_relation'%}",
             data: {
               "id": id ,
               "relation": JSON.stringify(new_rel),
@@ -209,7 +209,7 @@ <h3 class="mb-4">Texts</h3>
           const confirmed = confirm(`Are you sure you want to delete\n${el.relation_type__name}`)
           console.log(el, confirmed)
           if (confirmed) {
-            fetch("{% url 'viecpro_deduplication:delete_relation' rel_id='000000000'%}".replace("000000000", el.id)).then((res)=> res.json()).then((j)=> {
+            fetch("{% url 'dubletten_tool:delete_relation' rel_id='000000000'%}".replace("000000000", el.id)).then((res)=> res.json()).then((j)=> {
               if (j.success){
                 if (!tabular.value){
                   console.log("not tabular")
@@ -237,7 +237,7 @@ <h3 class="mb-4">Texts</h3>
           console.log("update field response called")
            $.ajax({
             type:"POST", 
-            url: "{% url 'viecpro_deduplication:update_field'%}",
+            url: "{% url 'dubletten_tool:update_field'%}",
             data: {
               "id": id,
               "field_name":fieldName,
diff --git a/viecpro_deduplication/templates/merge/tabbed_texts.html b/dubletten_tool/templates/merge/tabbed_texts.html
similarity index 100%
rename from viecpro_deduplication/templates/merge/tabbed_texts.html
rename to dubletten_tool/templates/merge/tabbed_texts.html
diff --git a/viecpro_deduplication/templates/note_form.html b/dubletten_tool/templates/note_form.html
similarity index 100%
rename from viecpro_deduplication/templates/note_form.html
rename to dubletten_tool/templates/note_form.html
diff --git a/viecpro_deduplication/templates/note_template.html b/dubletten_tool/templates/note_template.html
similarity index 100%
rename from viecpro_deduplication/templates/note_template.html
rename to dubletten_tool/templates/note_template.html
diff --git a/viecpro_deduplication/templates/person_detail.html b/dubletten_tool/templates/person_detail.html
similarity index 100%
rename from viecpro_deduplication/templates/person_detail.html
rename to dubletten_tool/templates/person_detail.html
diff --git a/viecpro_deduplication/templates/person_suggestions.html b/dubletten_tool/templates/person_suggestions.html
similarity index 100%
rename from viecpro_deduplication/templates/person_suggestions.html
rename to dubletten_tool/templates/person_suggestions.html
diff --git a/viecpro_deduplication/templates/singles_list.html b/dubletten_tool/templates/singles_list.html
similarity index 100%
rename from viecpro_deduplication/templates/singles_list.html
rename to dubletten_tool/templates/singles_list.html
diff --git a/dubletten_tool/templates/tool_page.html b/dubletten_tool/templates/tool_page.html
new file mode 100644
index 00000000..1d975576
--- /dev/null
+++ b/dubletten_tool/templates/tool_page.html
@@ -0,0 +1,1827 @@
+{% extends "webpage/base.html" %} {% load static %} {% load
+stats_extras %} {% load webpage_extras %} {% block content %}
+<link
+  rel="stylesheet"
+  href="/static/dubletten_tool/css/deduplication.css"
+  type="text/css"
+/>
+<link
+  rel="stylesheet"
+  href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
+/>
+
+<div class="container-fluid w-100">
+  <div class="row w-100">
+    <div class="col-md-3 px-2 py-4">
+      <button
+        class="btn btn-sm btn-outline-secondary"
+        onclick="toggleBrowser()"
+        id="toggleBrowserButton"
+      >
+        <i class="fa fa-arrow-left"></i>
+      </button>
+      <button
+        class="btn btn-sm btn-outline-secondary"
+        onclick="hideNavbar()"
+        id="hideNavbarButton"
+      >
+        Hide Navbar
+      </button>
+      <button
+        class="btn btn-sm btn-outline-secondary"
+        onclick="toggleRelationsData()"
+        id="toggleRelationsData"
+      >
+        Relations
+      </button>
+      <button
+        class="btn btn-sm btn-outline-secondary"
+        onclick="togglePersonNames()"
+        id="togglePersonNames"
+      >
+        Names
+      </button>
+    </div>
+  </div>
+  <div class="row w-100 justify-content-center">
+    <div
+      style="
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+      "
+    >
+      <h3 id="loading_anim">Performing manual merge / re-merge...</h3>
+      <button
+        onclick="CloseTable()"
+        id="remove_tables_button"
+        style="visibility: hidden; width: 4rem"
+        class="btn-sm btn-primary mb-3"
+      >
+        Close
+      </button>
+    </div>
+  </div>
+  <div class="row w-100 justify-content-center">
+    <div id="table_test"></div>
+  </div>
+  <div class="row w-100 pt-5 pb-3">
+    <div class="col-md-3" id="browser_header">
+      <div id="manu_navigation">
+        <ul class="nav nav-tabs" id="myTab" role="tablist">
+          <li class="nav-item" role="presentation">
+            <a
+              class="nav-link active"
+              id="groups-tab"
+              data-toggle="tab"
+              href="#groups_section"
+              role="tab"
+              >Groups</a
+            >
+          </li>
+          <li class="nav-item" role="presentation">
+            <a
+              class="nav-link"
+              id="singles-tab"
+              data-toggle="tab"
+              href="#singles_section"
+              role="tab"
+              >Singles</a
+            >
+          </li>
+          <li class="nav-item" role="presentation">
+            <a
+              class="nav-link"
+              id="marked-tab"
+              data-toggle="tab"
+              href="#marked_section"
+              onclick="getAllNotesJson()"
+              role="tab"
+              >Marked</a
+            >
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="col-md-4 pl-4" id="selection_header">
+      <span class="d-flex justify-content-start align-items-center">
+        <h2 class="pl-0">Selected</h2>
+        <button
+          class="btn btn-primary group_action_button m-0 ml-4"
+          onclick="mergeGroups()"
+          id="button_merge"
+        >
+          merge all
+        </button>
+        <button
+          class="btn btn-primary group_action_button m-0 ml-4"
+          onclick="createNewGroup()"
+          id="cross_group_create_button"
+        >
+          group selections
+        </button>
+      </span>
+    </div>
+    <div class="col-md-5 pl-0" id="detail_header">
+      <span class="d-flex">
+        <h2 class="pl-4">Detail / Suggestions</h2>
+        <button
+          class="btn btn-sm btn-outline-secondary ml-4"
+          onclick="clearSuggestions()"
+          id="clearSuggestions"
+        >
+          Clear
+        </button>
+      </span>
+    </div>
+  </div>
+
+  <div class="row w-100">
+    <div class="col-md-3" id="browser_content">
+      <div class="tab-content" id="myTabContent">
+        <div
+          class="tab-pane fade show active"
+          id="groups_section"
+          role="tabpanel"
+        >
+          <label>Gender:</label>
+          <span
+            class="d-flex justify-content-start align-items-center mb-3"
+          >
+            <div class="form-check form-check-inline mx-1">
+              <input
+                checked
+                class="form-check-input"
+                type="radio"
+                name="genderCheckGroup"
+                id="genderCheckboxGROUPMale"
+                value="Male"
+              />
+              <label
+                class="form-check-label mr-2"
+                for="genderCheckboxGROUPMale"
+              >
+                Male
+              </label>
+            </div>
+            <div class="form-check form-check-inline mx-1">
+              <input
+                class="form-check-input"
+                type="radio"
+                name="genderCheckGroup"
+                id="genderCheckboxGROUPFemale"
+                value="Female"
+              />
+              <label
+                class="form-check-label mr-2"
+                for="genderCheckboxGROUPFemale"
+              >
+                Female
+              </label>
+            </div>
+            <div class="form-check form-check-inline mx-1">
+              <input
+                class="form-check-input"
+                type="radio"
+                name="genderCheckGroup"
+                id="genderCheckboxGROUPOther"
+                value="Other"
+              />
+              <label
+                class="form-check-label mr-2"
+                for="genderCheckboxGROUPOther"
+              >
+                Other/None
+              </label>
+            </div>
+          </span>
+          <span
+            class="d-flex justify-content-start align-items-center mb-3"
+          >
+            <label class="m-0 mr-4 p-1 my-2">Status:</label>
+
+            {% for b in Buttons %} {% if forloop.first %}
+            <label
+              class="border border-dark rounded-left m-0 my-2 p-1 my_checkbox"
+              value="undefined"
+              onclick="toggleStatusButton('{{b.id}}')"
+              id="status_button_filter_{{b.id}}"
+              style="background-color: inherit"
+              ><small>{{b.short}}</small></label
+            >
+            {% elif forloop.last %}
+            <label
+              class="border border-dark rounded-right m-0 my-2 p-1 my_checkbox"
+              value="undefined"
+              onclick="toggleStatusButton('{{b.id}}')"
+              id="status_button_filter_{{b.id}}"
+              style="background-color: inherit"
+              ><small>{{b.short}}</small></label
+            >
+
+            {% else %}
+            <label
+              class="border border-dark m-0 my-2 p-1 my_checkbox"
+              value="undefined"
+              onclick="toggleStatusButton('{{b.id}}')"
+              id="status_button_filter_{{b.id}}"
+              style="background-color: inherit"
+              ><small>{{b.short}}</small></label
+            >
+
+            {% endif %} {% endfor %}
+          </span>
+
+          <span
+            class="d-flex justify-content-center align-items-center"
+          >
+            <input
+              class="form-control mr-4 rounded-right"
+              type="search"
+              placeholder="Search for Groups"
+              id="search_groups"
+            />
+          </span>
+          <span
+            class="d-flex px-1 my-2 justify-content-start align-content-center"
+            id="group_label_span"
+            ><label class="mr-2">Count:</label
+            ><label id="group_count_container">0</label></span
+          >
+
+          <div
+            class="container-fluid mt-5"
+            style="overflow-y: scroll; height: 80vh"
+            id="group_list_container"
+          ></div>
+        </div>
+        <div
+          class="tab-pane fade"
+          id="singles_section"
+          role="tabpanel"
+        >
+          <label>Gender:</label>
+          <span
+            class="d-flex justify-content-start align-items-center mb-3"
+          >
+            <div class="form-check form-check-inline mx-1">
+              <input
+                checked
+                class="form-check-input"
+                type="radio"
+                name="genderCheckSingle"
+                id="genderCheckboxSINGLEMale"
+                value="Male"
+              />
+              <label
+                class="form-check-label mr-2"
+                for="genderCheckboxSINGLEMale"
+              >
+                Male
+              </label>
+            </div>
+            <div class="form-check form-check-inline mx-1">
+              <input
+                class="form-check-input"
+                type="radio"
+                name="genderCheckSingle"
+                id="genderCheckboxSINGLEFemale"
+                value="Female"
+              />
+              <label
+                class="form-check-label mr-2"
+                for="genderCheckboxSINGLEFemale"
+              >
+                Female
+              </label>
+            </div>
+            <div class="form-check form-check-inline mx-1">
+              <input
+                class="form-check-input"
+                type="radio"
+                name="genderCheckSingle"
+                id="genderCheckboxSINGLEOther"
+                value="Other"
+              />
+              <label
+                class="form-check-label mr-2"
+                for="genderCheckboxSINGLEOther"
+              >
+                Other/None
+              </label>
+            </div>
+          </span>
+          <span
+            class="d-flex px-1 my-2 justify-content-start align-content-center"
+            ><input
+              aria-label="Search"
+              class="form-control mr-4 rounded-right"
+              id="input_search"
+              placeholder="Name"
+              type="search" />
+            <input
+              aria-label="Search"
+              class="form-control mr-4 rounded-right"
+              id="filter_first_name"
+              placeholder="First Name"
+              type="search"
+          /></span>
+          <span
+            class="d-flex px-1 my-2 justify-content-start align-content-center"
+            ><label class="mr-2">Count:</label
+            ><label id="filtered_count">0</label></span
+          >
+          <div
+            class="container-fluid pt-2"
+            style="overflow-y: scroll; height: 80vh"
+          >
+            <ul class="list-group mt-3" id="singles_container">
+              <!-- <ul class="list-group" id="all_singles_list">
+                    {% for s in singles %}
+                    <li class="list-group-item single-list-item list-group-item-sm d-flex justify-content-between align-items-center" id="single_list_item_{{s.id}}">
+                        {{s.person.name}}, {{s.person.first_name}}
+                    </li>
+                </ul>
+                    {% endfor %} -->
+            </ul>
+          </div>
+        </div>
+        <div
+          class="tab-pane fade"
+          id="marked_section"
+          role="tabpanel"
+        >
+          Not implemented yet
+        </div>
+      </div>
+    </div>
+    <div
+      class="col-md-4 pl-4 pb-5"
+      id="relations_section"
+      style="width: 100%; overflow-y: scroll; height: 80vh"
+    >
+      <div class="w-100 m-0 p-0" id="relations_group_section"></div>
+      <h4 class="h4 pt-5" id="singles_header">Singles</h4>
+
+      <div class="w-100 m-0 p-0" id="relations_single_section"></div>
+    </div>
+    <div
+      class="col-md-5 pl-4 pb-5"
+      id="detail_section"
+      style="width: 100%; overflow-y: scroll; height: 80vh"
+    ></div>
+  </div>
+  <script>
+    let SELECTED_MEMBERS = {};
+    let SELECTED_GROUPS = [];
+    let SELECTED_SINGLES = [];
+    let BTN_MERGE = $("#button_merge");
+    let BROWSER_VISIBLE = true;
+    let NAV_VISIBLE = true;
+    let REL_TOGGLE = false;
+    let NAMES_TOGGLE = true;
+    let LOADING_FLAG = false;
+    let AWAIT_REMERGE_RESULT = false;
+
+    const CELERY_ENDPOINTS_dubletten_tool = {
+      // redundant routes, legacy from when I thought these would be needed to be different.
+      remerge_group: "{% url 'dubletten_tool:get_task_status' %}",
+      merge_groups: "{% url 'dubletten_tool:get_task_status' %}",
+    };
+
+    const pollCeleryStatus = (task_id, url, task_name) => {
+      // this scope preservers key, url  and task name value for re-polling
+      // task_name is not really a name given to the celery task yet,
+      // only needed in frontend atm to distinguish callbacks on success
+      console.log("task name in pollCelery", task_name);
+      return $.ajax({
+        url: url,
+        type: "POST",
+        data: { task_id: task_id },
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (response) {
+          console.log(response.status);
+          if (response.status === "PENDING") {
+            // after initial wait, repoll every 2.5 sec.
+            setTimeout(
+              pollCeleryStatus,
+              2500,
+              task_id,
+              url,
+              task_name
+            );
+          } else {
+            // callbacks handling the rendering of the computations outcome are grouped by task_name
+            // ! task_name is not set in task, only here in frontend, for this purpose only !
+
+            switch (task_name) {
+              case "remerge_group":
+                console.log(response.result);
+                renderRemergeOutcome(response.result);
+                break;
+              case "merge_groups":
+                // add merge groups callback here
+                console.log(
+                  "called MergeGroupsAndRemergeDispatcher in switch"
+                );
+                MergeGroupsAndRemergeDispatcher(response.result);
+                break;
+              default:
+                alert(
+                  "Implementation error. No task matched given task in pollCeleryStatus switch."
+                );
+                break;
+            }
+          }
+        },
+      });
+    };
+
+    function clearSuggestions() {
+      $("#detail_section").empty();
+    }
+
+    function renderRemergeOutcome(response) {
+      // renders the outcome of remerge once celery task finished.
+
+      toggleLoading("hidden");
+
+      function append_to_table_div(element) {
+        //document.getElementById("table_test").insertAdjacentHTML("beforeend", element);
+        document.getElementById("table_test").innerHTML += element;
+      }
+      let vorfin_title = `<h3 class='text-center'> Report after Remerge for: ${response.new_vorfin} (${response.new_vorfin_id})</h3>`;
+      let changed_header = `<h3 class='text-start'>${response.rels_changed.title}</h3>`;
+      let changed_table = response.rels_changed.table;
+      let added_header = `<h3 class='text-start'>${response.rels_added.title}</h3>`;
+      let added_table = response.rels_added.table;
+
+      console.log(response);
+      console.log(response.rels_added.table);
+      element_array = [
+        vorfin_title,
+        changed_header,
+        changed_table,
+        added_header,
+        added_table,
+      ];
+      element_array.forEach((el) => {
+        append_to_table_div(el);
+      });
+
+      $("#remove_tables_button").css("visibility", "visible");
+      alert(response.msg);
+      //alert("attempting redraw of singles and items AND getGroupAjax of new group!")
+      //getGroupAjax(response.new_vorfin_id)
+      //renderItemSelect();
+      //renderSinglesSelect();
+      if (AWAIT_REMERGE_RESULT) {
+        console.log("set await remerge result to False");
+        AWAIT_REMERGE_RESULT = false;
+      }
+    }
+
+    function toggleLoading(set_state = false) {
+      let loading_div = $("#loading_anim");
+      //alert("called toggle")
+
+      if (!set_state) {
+        //alert("set state was false")
+
+        if (loading_div.css("visibility") === "hidden") {
+          loading_div.css("visibility", "visible");
+        } else {
+          loading_div.css("visibility", "hidden");
+        }
+      } else {
+        //alert("set state was: ", set_state)
+        loading_div.css("visibility", set_state);
+      }
+    }
+
+    function remergeGroup(
+      g_id,
+      groups_to_delete = false,
+      ask_for_confirmation = true
+    ) {
+      /** when called from button click, ask for confirmation. When called from merge_groups function,
+       * don't ask for confirmation to remerge.
+       * Also, when called from merge_groups, pass on list of groups_to_delete (because those groups got combined to
+       * a new group in merge_groups and are obsolete.)
+       */
+
+      if (ask_for_confirmation) {
+        proceed = confirm(`Do you want to re-merge group ${g_id}?`);
+      } else {
+        proceed = true;
+      }
+
+      if (proceed) {
+        let url =
+          "{% url 'dubletten_tool:remerge_group' g_id='99999999' %}".replace(
+            "99999999",
+            g_id
+          );
+
+        //$("#loading_anim").toggle(); //css("visibility") = "visible."
+        toggleLoading("visible");
+
+        $.ajax({
+          url: url,
+          type: "POST",
+          data: { data: groups_to_delete ? groups_to_delete : [] },
+          beforeSend: function (request) {
+            let csrftoken = getCookie("csrftoken");
+            request.setRequestHeader("X-CSRFToken", csrftoken);
+          },
+          success: function (response) {
+            //console.log(data.msg);
+            if (response.success) {
+              // get task_id from initial response
+              task_id = response.task_id;
+              // call first poll of celery status, after 20 seconds (min-time computation takes)
+              setTimeout(
+                pollCeleryStatus,
+                9000,
+                (task_id = task_id),
+                (url = CELERY_ENDPOINTS_dubletten_tool.remerge_group),
+                (task_name = "remerge_group")
+              );
+            } else {
+              toggleLoading("hidden");
+              alert(response.msg);
+            }
+          },
+        });
+      } else {
+        alert("aborted");
+        toggleLoading("hidden");
+      }
+    }
+
+    function CloseTable() {
+      document.getElementById("table_test").innerHTML = "";
+      $("#remove_tables_button").css("visibility", "hidden");
+    }
+
+    function hideNavbar() {
+      if (NAV_VISIBLE) {
+        $("#wrapper-navbar").hide();
+        NAV_VISIBLE = false;
+        $("#hideNavbarButton").html("Show Navbar");
+      } else {
+        $("#wrapper-navbar").show();
+        NAV_VISIBLE = true;
+        $("#hideNavbarButton").html("Hide Navbar");
+      }
+    }
+
+    function hideDeatails() {
+      // todo not implemented yet
+      $("#detail_section")
+        .children()
+        .each((el) => {
+          el.hide;
+        });
+    }
+
+    function getStatusButtonStatus() {
+      let values = {};
+      $("[id^=status_button_filter]").each(function () {
+        let el = $(this);
+        let id = $(this).attr("id").split("_");
+        //console.log(typeof(id))
+        id = id[id.length - 1];
+        if ($(this).attr("value") !== "undefined") {
+          values[id] = $(this).attr("value");
+        }
+      });
+      //console.log(values)
+      return values;
+    }
+
+    function toggleStatusButton(b_id) {
+      let el = $(`#status_button_filter_${b_id}`);
+      let curr_val = el.attr("value");
+
+      switch (curr_val) {
+        case "undefined":
+          el.attr("value", "true");
+          el.css("background-color", "lightblue");
+          break;
+        case "true":
+          el.attr("value", "false");
+          el.css("background-color", "lightpink");
+
+          break;
+        case "false":
+          el.attr("value", "undefined");
+          el.css("background-color", "inherit");
+
+          break;
+        default:
+        //console.log("no selection pssibel in toggleStatusButton")
+      }
+
+      //console.log(el.attr("value"), "before:", curr_val)
+      getStatusButtonStatus();
+    }
+
+    function togglePersonNames() {
+      let sel = $(".person_names");
+      // note __g.pirgie__ This toggle doesn't work, as it is overwritten by bootstraps collapse implementation; If this functionality is wanted, it needs a workaround.
+
+      if (!NAMES_TOGGLE) {
+        sel.each(function () {
+          $(this).addClass("d-flex").show(); // __g.pirgie__ not working; overwritten by bootstrap
+          //console.log($(this))
+        });
+        NAMES_TOGGLE = true;
+      } else {
+        sel.each(function () {
+          $(this).removeClass("d-flex").hide(); // __g.pirgie__ not working; overwritten by bootstrap
+        });
+        NAMES_TOGGLE = false;
+      }
+    }
+
+    function toggleRelationsData() {
+      //console.log("Called toggleRelationsData")
+      let test = $('[id^="data_div_"]');
+      //console.log(test)
+      if (!REL_TOGGLE) {
+        test.each(function () {
+          $(this).addClass("show");
+        });
+        REL_TOGGLE = true;
+      } else {
+        test.each(function () {
+          $(this).removeClass("show");
+        });
+        REL_TOGGLE = false;
+      }
+    }
+
+    function toggleBrowser() {
+      //header
+      let b_h = $("#browser_header");
+      let d_h = $("#detail_header");
+      let s_h = $("#selection_header");
+
+      //content
+      let b_c = $("#browser_content");
+      let d_c = $("#detail_section");
+      let s_c = $("#relations_section");
+
+      let elements = [d_h, s_h, d_c, s_c];
+      let col_4 = [s_h, s_c];
+      let col_5 = [d_h, d_c];
+
+      if (BROWSER_VISIBLE) {
+        b_h.hide();
+        b_c.hide();
+        elements.forEach((el) => {
+          //console.log("el:", el)
+          el.removeClass("col-md-4")
+            .removeClass("col-md-5")
+            .addClass("col-md-6");
+        });
+        $("#toggleBrowserButton").html(
+          "<i class='fa fa-arrow-right'>"
+        );
+        BROWSER_VISIBLE = false;
+      } else {
+        b_h.show();
+        b_c.show();
+        col_4.forEach((el) => {
+          el.removeClass("col-md-6").addClass("col-md-4");
+        });
+
+        col_5.forEach((el) => {
+          el.removeClass("col-md-6").addClass("col-md-5");
+        });
+
+        $("#toggleBrowserButton").html(
+          "<i class='fa fa-arrow-left'>"
+        );
+
+        BROWSER_VISIBLE = true;
+      }
+    }
+
+    function unbind_group_form(event) {
+      $(this).find("button").attr("disabled", true);
+      event.preventDefault();
+      event.stopPropagation();
+
+      let url = $(this).attr("action");
+      let formData = $(this).serialize();
+
+      $.ajax({
+        url: url,
+        type: "POST",
+        data: formData,
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (data) {
+          //console.log(data.msg);
+          $("#detail_section").empty();
+          getNoteJson(data.inst_id, data.type);
+        },
+      });
+    }
+
+    function removeFromArray(arr, value) {
+      return arr.filter(function (el) {
+        return el != value;
+      });
+    }
+
+    function abortNoteEdit(inst_id, type) {
+      $("#detail_section").empty();
+      getNoteJson(inst_id, type);
+    }
+
+    function getNoteJson(inst_id, type) {
+      let url =
+        "{% url 'dubletten_tool:get_note_json' inst_id='12345678' type='kkkkkkkk' %}"
+          .replace("12345678", inst_id)
+          .replace("kkkkkkkk", type);
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (res) {
+          //console.log("in done part of getNOtejSon")
+          $("#detail_section").html(res.html);
+        },
+      });
+    }
+
+    function getPersonDetail(per_id) {
+      let url =
+        "{% url 'dubletten_tool:get_person_detail' per_id='66666666' %}".replace(
+          "66666666",
+          per_id
+        );
+
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (res) {
+          $("#detail_section").html(res.html);
+        },
+      });
+    }
+
+    function noteClickHandler(g_id, type, group_id) {
+      getNoteJson(g_id, type);
+      //console.log("in CLickHAndler", group_id)
+
+      if (type === "group") {
+        toggleItemSelect(g_id);
+      } else if (type === "single") {
+        toggleSingleSelect(g_id);
+      } else {
+        //console.log("in else in handler");
+        toggleItemSelect(group_id);
+      }
+    }
+
+    function getAllNotesJson() {
+      let url = "{% url 'dubletten_tool:get_all_notes' %}";
+
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (res) {
+          $("#marked_section").html(res.html);
+        },
+      });
+    }
+    function getPersonSuggestions(per_id) {
+      let url =
+        "{% url 'dubletten_tool:get_person_suggestions' per_id='66666666' %}".replace(
+          "66666666",
+          per_id
+        );
+
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (res) {
+          $("#detail_section").html(res.html);
+          renderItemSelect();
+          renderSinglesSelect();
+        },
+      });
+    }
+
+    function getGroupSuggestions(g_id) {
+      let url =
+        "{% url 'dubletten_tool:get_group_suggestions' group_id='66666666' %}".replace(
+          "66666666",
+          g_id
+        );
+
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (res) {
+          $("#detail_section").html(res.html);
+          renderItemSelect();
+          renderSinglesSelect();
+        },
+      });
+    }
+
+    function checkSinglesHeader() {
+      if (SELECTED_SINGLES.length > 0) {
+        $("#singles_header").show();
+      } else {
+        $("#singles_header").hide();
+      }
+    }
+
+    function isGroupDisplayed(id) {
+      //console.log($(`#group_data_${id}`))
+      if ($(`#group_data_${id}`).length >= 1) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    function checkButtonResponse(btn_id, group_id) {
+      let url =
+        "{%url 'dubletten_tool:update_group_checkboxes' btn_id='123456' group_id='9999999' %}"
+          .replace("123456", btn_id)
+          .replace("9999999", group_id);
+
+      $.ajax({
+        url: url,
+        type: "POST",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (data) {
+          //console.log("data arrived as", data);
+
+          $(`#div_group_status_buttons_${group_id}`).html(data.html);
+        },
+      });
+    }
+
+    function renderItemSelect() {
+      $.merge(
+        $(".suggestions_group_item"),
+        $(".left_group_list_item")
+      ).each(function (d, el) {
+        //console.log(el.id);
+        let id = el.id.split("_").pop();
+        ////console.log("id of element is: ", id, typeof(id), typeof(SELECTED_GROUPS[0]));
+        if (SELECTED_GROUPS.includes(id)) {
+          //console.log("TRUE", id, "is in", SELECTED_GROUPS);
+          el.style.backgroundColor = "lightblue";
+          el.onmouseenter = (event) => {
+            //todo: render the background change on hover
+            //console.log(event.target)
+            //console.log(this);
+            // this.style.backgroundColor = "red"
+          };
+        } else {
+          //console.log("FALSE");
+          el.style.backgroundColor = "white";
+        }
+      });
+    }
+
+    function toggleItemSelect(id) {
+      if (SELECTED_GROUPS.includes(id)) {
+        SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, id);
+        delete SELECTED_MEMBERS[id];
+        $(`#group_data_${id}`).remove();
+      } else {
+        SELECTED_GROUPS.push(id);
+        getGroupAjax(id);
+      }
+
+      renderItemSelect();
+      checkMergeButton();
+    }
+
+    function toggleSingleSelect(id) {
+      //console.log("called toggle Single select")
+      id = id.toString();
+      if (SELECTED_SINGLES.includes(id)) {
+        //console.log("id was in selected singles, TRUE")
+        SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, id);
+        $(`#single_data_${id}`).remove();
+
+        if (SELECTED_MEMBERS["singles"]) {
+          SELECTED_MEMBERS["singles"] = removeFromArray(
+            SELECTED_MEMBERS["singles"],
+            id
+          );
+          if (SELECTED_MEMBERS["singles"].length == 0) {
+            delete SELECTED_MEMBERS["singles"];
+          }
+        }
+      } else {
+        //console.log("id was not in selected singles, FALSE")
+
+        SELECTED_SINGLES.push(id);
+        getSinglesAjax(id);
+      }
+
+      renderSinglesSelect();
+      checkMergeButton();
+      checkGroupButton();
+      checkSinglesHeader();
+    }
+
+    function renderSinglesSelect() {
+      //console.log("called render single select");
+
+      $.merge(
+        $(".suggestions_singles_item"),
+        $(".left_singles_item")
+      ).each(function (d, el) {
+        let id = el.id.split("_").pop();
+        ////console.log("el is:", el)
+        ////console.log("id of element is: ", id, typeof(id), typeof(SELECTED_SINGLES[0]));
+        if (SELECTED_SINGLES.includes(id)) {
+          //console.log("TRUE", id, "is in", SELECTED_SINGLES);
+          el.style.backgroundColor = "lightblue";
+          el.onmouseenter = (event) => {
+            //todo: render the background change on hover
+            //console.log(event.target)
+            //console.log(this);
+            // this.style.backgroundColor = "red"
+          };
+        } else {
+          //console.log("FALSE");
+          el.style.backgroundColor = "white";
+        }
+      });
+    }
+    function toggleItemSelectOLD(id) {
+      //console.log("clicked, id is:", id)
+      let target_item = document.getElementById(`li_group_${id}`);
+      //console.log(target_item);
+
+      if (!target_item && SELECTED_GROUPS.includes(id)) {
+        $(`#group_data_${id}`).remove();
+        SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, id);
+        delete SELECTED_MEMBERS[id];
+      } else if (target_item.style.backgroundColor != "lightblue") {
+        target_item.style.backgroundColor = "lightblue";
+        if (!SELECTED_GROUPS.includes(id)) {
+          SELECTED_GROUPS.push(id);
+        }
+        //console.log("PUSHED ID TO SELECTED_GROUPS", SELECTED_GROUPS);
+
+        //console.log(isGroupDisplayed(id));
+        getGroupAjax(id);
+      } else {
+        $(`#group_data_${id}`).remove();
+        target_item.style.backgroundColor = "white";
+        //console.log(isGroupDisplayed(id));
+        //SELECTED_GROUPS.pop(id); // TODO: CHANGE THIS
+        SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, id);
+        delete SELECTED_MEMBERS[id];
+      }
+      //console.log("clicked: ", id);
+      //SELECTED_MEMBERS[id]=[];
+      checkMergeButton();
+    }
+
+    function checkMergeButton() {
+      //console.log("check merge button called")
+      if (
+        SELECTED_GROUPS.length > 1 ||
+        SELECTED_SINGLES.length > 1 ||
+        (SELECTED_SINGLES.length === 1 &&
+          SELECTED_GROUPS.length === 1)
+      ) {
+        BTN_MERGE.show();
+      } else {
+        BTN_MERGE.hide();
+      }
+    }
+
+    function getGroupAjax(id, update = false) {
+      let url =
+        "{% url 'dubletten_tool:get_group_ajax' g_id='12345' %}".replace(
+          "12345",
+          id
+        );
+      //console.log("Get Group Ajax Called");
+      //console.log(url);
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (data) {
+          if (update) {
+            $(`#group_data_${id}`).replaceWith(data.html);
+          } else {
+            if (!isGroupDisplayed(id)) {
+              $("#relations_group_section").append(data.html);
+            } else {
+              $(`#group_data_${id}`).replaceWith(data.html);
+            }
+          }
+        },
+      });
+    }
+
+    function addGroupToList(id, name, count) {
+      console.log("---->>>", id, name, count);
+      $("#all_groups_list").prepend(
+        `<li class=" left_group_list_item list-group-item group_list_item_ list-group-item-sm d-flex justify-content-between align-items-center" onclick="toggleItemSelect('${id}')" id="li_group_${id}">${id} ${name}
+            <span class="badge badge-primary badge-pill" id="group_count_badge_${id}">${count}</span> </li>`
+      );
+    }
+
+    function editNote(group_id, type) {
+      let url =
+        "{% url 'dubletten_tool:handle_note_form' g_id='55555555' type='abcdefgh'%}"
+          .replace("55555555", group_id)
+          .replace("abcdefgh", type);
+
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (data) {
+          $("#detail_section").empty().html(data.html);
+          $(`.NoteForm `).submit(unbind_group_form);
+        },
+      });
+    }
+
+    function updateGroupCountBadges(id, count) {
+      if (count === 0) {
+        $(`#li_group_${id}`).remove();
+      } else {
+        let badge = $(`#group_count_badge_${id}`);
+        badge.html(count);
+      }
+    }
+
+    function suggestGroupName(merge = true) {
+      //console.log("called suggestGroupName")
+      let name;
+      if (merge) {
+        name = $(".group_id_name :first-child").first().text();
+      } else {
+        let values = Object.values(SELECTED_MEMBERS).flat();
+        name = $('[data-target^="#data_div_"]')
+          .filter(function () {
+            let id = $(this).text().split("[");
+            id = id[1].trim().slice(0, -1);
+            if (values.includes(id)) {
+              return true;
+            } else {
+              return false;
+            }
+          })
+          .first()
+          .text()
+          .split("[");
+
+        //let name = $('[data-target^="#data_div_"]').first().text().split("[");
+        //console.log(name)
+
+        name = name[0];
+        // todo filter by id against selected members (keys in SM are group ids or the key singles, values is an array of string ids for all)
+        // select name by selection on merge == false
+
+        //name = $('[data-target^="#data_div_"]').filter(function(){let id = $(this).text().split("["); id = id[1].trim().slice(0,-1);//console.log(id);})
+
+        //console.log(name)
+      }
+
+      return name;
+    }
+
+    function createNewGroup() {
+      let url = "{% url 'dubletten_tool:create_new_group' %}";
+      let sug = suggestGroupName(false);
+
+      let name = prompt("Please Enter Name for New Group", sug);
+      //console.log("create new group called", name)
+
+      let data = JSON.stringify({
+        data: SELECTED_MEMBERS,
+        singles: SELECTED_SINGLES,
+        new_name: name,
+      });
+
+      if (name === null || name == "") {
+        //console.log("prompt was null");
+      } else {
+        $.ajax({
+          url: url,
+          type: "POST",
+          beforeSend: function (request) {
+            let csrftoken = getCookie("csrftoken");
+            request.setRequestHeader("X-CSRFToken", csrftoken);
+          },
+          dataType: "json",
+          data: { DATA: data },
+          success: function (response) {
+            res = response.data;
+            addGroupToList(
+              res.new_group_id,
+              res.new_group,
+              res.new_group_count
+            );
+            let cross_btn = $("#cross_group_create_button");
+
+            //console.log("in response of create new group");
+            //console.log("response data is: ", res)
+
+            for ([k, v] of Object.entries(res.group_updates)) {
+              //console.log("TEST for group updates afer creat", k,v);
+              updateGroupCountBadges(k, v);
+              if (v > 0) {
+                getGroupAjax(k, true);
+              } else {
+                $(`#group_data_${k}`).remove();
+                //SELECTED_GROUPS.pop(k); // TODO: CHANGE THIS
+                SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, k);
+              }
+            }
+            //console.log("former singles")
+            //console.log(response.data.former_singles)
+            response.data.former_singles.forEach((s) => {
+              ////console.log("for each called for: ", s, "section:", `single_data_${s}`);
+              $(`#single_data_${s}`).remove();
+              $(`#single_list_item_${s}`).remove();
+              // SELECTED_SINGLES.pop(s); // TODO: CHANGE THIS
+              SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, s);
+            });
+
+            SELECTED_MEMBERS = {};
+            cross_btn.hide();
+            checkGroupButton();
+            checkSinglesHeader();
+          },
+        });
+      }
+    }
+  </script>
+
+  <script>
+    function removeMember(group_id, per_id) {
+      let url =
+        "{% url 'dubletten_tool:remove_member' group_id='111111' per_id='222222' %}"
+          .replace("111111", group_id)
+          .replace("222222", per_id);
+
+      //console.log("in remove Member");
+      //console.log(url);
+
+      let test = confirm(
+        `do you really want to delete: Member ${per_id} from group: ${group_id} ?`
+      );
+
+      if (test) {
+        $.ajax({
+          url: url,
+          type: "GET",
+          beforeSend: function (request) {
+            let csrftoken = getCookie("csrftoken");
+            request.setRequestHeader("X-CSRFToken", csrftoken);
+          },
+          success: function (data) {
+            //console.log(JSON.stringify(data));
+            updates = data.data;
+            for ([k, v] of Object.entries(updates)) {
+              if (v != 0) {
+                //getGroupAjax(group_id, true);
+                $(`#group_member_item_${per_id}`).remove();
+              } else {
+                $(`#group_data_${k}`).remove();
+                //SELECTED_GROUPS.pop(group_id);  // TODO: CHANGE THIS
+                SELECTED_GROUPS = removeFromArray(
+                  SELECTED_GROUPS,
+                  group_id
+                );
+              }
+              updateGroupCountBadges(k, v);
+            }
+
+            if (SELECTED_MEMBERS[group_id].length == 1) {
+              delete SELECTED_MEMBERS[group_id];
+            } else {
+              //SELECTED_MEMBERS[group_id].pop(per_id); // TODO: CHANGE THIS
+              //console.log("in remove member, before selected members set")
+              SELECTED_MEMBERS[group_id] = removeFromArray(
+                SELECTED_MEMBERS[group_id],
+                per_id
+              );
+              // let keep = [...SELECTED_MEMBERS[group_id]];
+              // delete SELECTED_MEMBERS[group_id];
+              // SELECTED_MEMBERS[group_id].forEach((id) => {
+              //     document.getElementById(`select_toggle_button_${id}`).style.backgroundColor="lightblue";
+
+              // })
+            }
+
+            checkGroupButton();
+          },
+        });
+      }
+    }
+  </script>
+
+  <script>
+    function MergeGroupsAndRemergeDispatcher(response) {
+      merge_groups_data = response.group_data;
+      new_group_id = merge_groups_data.add[0];
+      console.log(
+        "in MergeGroups Dispatcher, new_group_id: ",
+        new_group_id,
+        typeof new_group_id
+      );
+
+      console.log(merge_groups_data);
+      groups_to_delete = merge_groups_data.groups_to_delete;
+      RenderMergeGroupsOutcome(merge_groups_data);
+      AWAIT_REMERGE_RESULT = true;
+      remergeGroup(
+        new_group_id,
+        (groups_to_delete = groups_to_delete),
+        (ask_for_confirmation = false)
+      );
+
+      function PingRemergeResult(merge_groups_data) {
+        if (AWAIT_REMERGE_RESULT) {
+          console.log("waiting for result....");
+          setTimeout(
+            PingRemergeResult,
+            1000,
+            (merge_groups_data = merge_groups_data)
+          );
+        } else {
+          RenderMergeGroupsOutcome(merge_groups_data);
+        }
+      }
+      console.log("set initial timeout to ping for remerge result");
+      setTimeout(
+        PingRemergeResult,
+        10000,
+        (merge_groups_data = merge_groups_data)
+      );
+    }
+
+    function RenderMergeGroupsOutcome(data) {
+      addGroupToList(data.add[0], data.add[1], data.add[2]);
+      $("#relations_group_section").empty();
+      $("#relations_single_section").empty();
+      $("#detail_section").empty();
+
+      SELECTED_GROUPS = [];
+      SELECTED_MEMBERS = {};
+      SELECTED_SINGLES = [];
+      data.remove_groups.forEach((el) => {
+        $(`#li_group_${el}`).remove();
+      });
+
+      data.remove_singles.forEach((el) => {
+        $(`#single_list_item_${el}`).remove();
+      });
+      checkMergeButton();
+      checkSinglesHeader();
+
+      //console.log("data.add zero is: ", data.add[0])
+      toggleItemSelect(`${data.add[0]}`);
+      renderItemSelect();
+      renderSinglesSelect();
+    }
+
+    function mergeGroups() {
+      let url = "{% url 'dubletten_tool:merge_groups' %}";
+      //console.log("Selected Groups is:", SELECTED_GROUPS);
+      //console.log("SELECTED_GROUPS after adding singles is:", SELECTED_GROUPS)
+      let sug = suggestGroupName();
+
+      let name = prompt(
+        "INFO: this will create a new group from all visible groups and singles.\nThe new group will also be merged into a new vorfin. Existing vorfin-rels will be preserved. But all old vorfins of groups in this merge will be deleted after the new vorfin is created.\n\nEnter new name for merged Group (Note: this is not the name of the resulting vorfin):",
+        sug
+      );
+      data = JSON.stringify({
+        groups: SELECTED_GROUPS,
+        singles: SELECTED_SINGLES,
+        new_name: name,
+      });
+      if (name === null || name == "") {
+        //console.log("prompt was null");
+      } else {
+        toggleLoading("visible");
+        $.ajax({
+          url: url,
+          type: "POST",
+          dataType: "json",
+          data: { DATA: data },
+          beforeSend: function (request) {
+            let csrftoken = getCookie("csrftoken");
+            request.setRequestHeader("X-CSRFToken", csrftoken);
+          },
+          success: function (response) {
+            setTimeout(
+              pollCeleryStatus,
+              2000,
+              (task_id = response.task_id),
+              (url = CELERY_ENDPOINTS_dubletten_tool.merge_groups),
+              (task_name = "merge_groups")
+            );
+          },
+        });
+      }
+    }
+
+    // function mergeGroupsOLD() {
+    //     let url = "{% url 'dubletten_tool:merge_groups' %}";
+    //     //console.log("Selected Groups is:", SELECTED_GROUPS);
+    //     //console.log("SELECTED_GROUPS after adding singles is:", SELECTED_GROUPS)
+    //     let sug = suggestGroupName();
+
+    //     let name = prompt("INFO: this will create a new group from all visible groups and singles.\nThe new group will also be merged into a new vorfin. Existing vorfin-rels will be preserved. But all old vorfins of groups in this merge will be deleted after the new vorfin is created.\n\nEnter new name for merged Group (Note: this is not the name of the resulting vorfin):", sug);
+    //     data = JSON.stringify({ "groups": SELECTED_GROUPS, "singles": SELECTED_SINGLES, "new_name": name })
+    //     if (name === null || name == "") {
+    //         //console.log("prompt was null");
+    //     } else {
+    //         toggleLoading("visible");
+    //         $.ajax({
+    //             url: url,
+    //             type: "POST",
+    //             dataType: "json",
+    //             data: { "DATA": data },
+    //             beforeSend: function (request) {
+    //                 let csrftoken = getCookie("csrftoken");
+    //                 request.setRequestHeader("X-CSRFToken", csrftoken);
+    //             },
+    //             success: function (response_dict) {
+    //                 // TODO: add polling here to
+
+    //                 // THIS LINE IS NEW, to map to the subdict
+    //                 data = response_dict.group_data
+
+    //                 addGroupToList(data.add[0], data.add[1], data.add[2]);
+    //                 $("#relations_group_section").empty();
+    //                 $("#relations_single_section").empty();
+    //                 $("#detail_section").empty();
+
+    //                 SELECTED_GROUPS = [];
+    //                 SELECTED_MEMBERS = {};
+    //                 SELECTED_SINGLES = [];
+    //                 data.remove_groups.forEach(el => { $(`#li_group_${el}`).remove(); })
+
+    //                 data.remove_singles.forEach(el => { $(`#single_list_item_${el}`).remove(); })
+    //                 checkMergeButton();
+    //                 checkSinglesHeader();
+
+    //                 //console.log("data.add zero is: ", data.add[0])
+    //                 toggleItemSelect(`${data.add[0]}`);
+    //                 renderItemSelect();
+    //                 renderSinglesSelect();
+
+    //                 // THIS LINE IS NEW, to map to subdict of remerge data
+    //                 remerge_data = response_dict.remerge_data
+
+    //                 // THIS LINE IS NEW; to render remerge outcume
+    //                 renderRemergeOutcome(rem_data)
+    //                 //todo: create listspan; empty selection_section, request newly created group
+    //             }
+    //         })
+    //     }
+    // }
+  </script>
+
+  <script>
+    function manageSelection(group_id, member_id) {
+      if (SELECTED_MEMBERS[group_id]) {
+        //console.log("group existed in selected members");
+        SELECTED_MEMBERS[group_id].push(member_id);
+      } else {
+        //console.log("group didn't exist in selected members");
+        SELECTED_MEMBERS[group_id] = [member_id];
+      }
+    }
+
+    // function toggleSingleSelectOLD(id){
+    //     //console.log("clicked Toggle Single Select for id: ", id);
+
+    //     let target_item = document.getElementById(`single_list_item_${id}`);
+    //     //console.log("target item is:", target_item);
+    //     //console.log("element is in selected Singles", SELECTED_SINGLES.includes(parseInt(id)));
+
+    //     if (!target_item && SELECTED_SINGLES.includes(parseInt(id))){
+    //         $(`#single_data_${id}`).remove();
+    //         SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, id);
+
+    //         //SELECTED_MEMBERS["singles"].pop(id); // TODO: CHANGE THIS
+    //         if (SELECTED_MEMBERS["singles"]){
+    //         SELECTED_MEMBERS["singles"] = removeFromArray(SELECTED_MEMBERS["singles"], id);
+    //         if (SELECTED_MEMBERS["singles"].length == 0) {
+    //             delete SELECTED_MEMBERS["singles"];
+
+    //     }
+    //     }
+    // }
+    //     else if (target_item.style.backgroundColor != "lightblue") {
+    //         target_item.style.backgroundColor = "lightblue";
+
+    //         if (!SELECTED_SINGLES.includes(id)){
+    //         SELECTED_SINGLES.push(id);
+
+    //     getSinglesAjax(id);
+    //         }
+    //     } else {
+    //         $(`#single_data_${id}`).remove();
+    //         target_item.style.backgroundColor = "white";
+    //         //SELECTED_SINGLES.pop(id); // TODO CHANGE THIS!!!!
+    //         SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, id);
+
+    //         //SELECTED_MEMBERS["singles"].pop(id); // TODO: CHANGE THIS
+    //         if (SELECTED_MEMBERS["singles"]){
+    //         SELECTED_MEMBERS["singles"] = removeFromArray(SELECTED_MEMBERS["singles"], id);
+    //         if (SELECTED_MEMBERS["singles"].length == 0) {
+    //             delete SELECTED_MEMBERS["singles"];
+    //         }
+    //     }
+
+    //     }
+    //     //console.log("clicked: ", id);
+    //     checkMergeButton();
+    //     checkGroupButton();
+    //     checkSinglesHeader();
+
+    // }
+
+    function renameGroup(group_id, group_name) {
+      let new_name = prompt("Rename Group to:", group_name);
+      let url = "{% url 'dubletten_tool:rename_group' %}";
+      let data = JSON.stringify({
+        new_name: new_name,
+        g_id: group_id,
+      });
+      if (new_name) {
+        $.ajax({
+          url: url,
+          type: "POST",
+          data: { data: data },
+          beforeSend: function (request) {
+            let csrftoken = getCookie("csrftoken");
+            request.setRequestHeader("X-CSRFToken", csrftoken);
+          },
+          success: function (res) {
+            getGroupAjax(group_id, (update = true));
+            $(`#li_group_${group_id}`)
+              .replaceWith(`<li class="left_group_list_item list-group-item group_list_item_ list-group-item-sm d-flex justify-content-between align-items-center" onclick="toggleItemSelect('${group_id}')" id="li_group_${group_id}">${group_id} ${res.data.new_name}
+            <span class="badge badge-primary badge-pill" id="group_count_badge_${group_id}">${res.data.count}</span> </li>`);
+            renderItemSelect();
+            // todo: implement callback on renaming Groups
+          },
+        });
+      } else {
+      }
+    }
+
+    $(".member_list_class").mouseenter(function (el) {
+      //console.log("el:", el)
+      el.children().each((d) => {
+        d.hide();
+      });
+    });
+    function getSinglesAjax(single_id) {
+      let url =
+        "{% url 'dubletten_tool:get_single_ajax' s_id='123456' %}".replace(
+          "123456",
+          single_id
+        );
+
+      $.ajax({
+        url: url,
+        type: "GET",
+        beforeSend: function (request) {
+          let csrftoken = getCookie("csrftoken");
+          request.setRequestHeader("X-CSRFToken", csrftoken);
+        },
+        success: function (data) {
+          $("#relations_single_section").append(data.html);
+        },
+      });
+    }
+
+    function checkGroupButton() {
+      let cross_btn = $("#cross_group_create_button");
+
+      let select_count = 0;
+      Object.entries(SELECTED_MEMBERS).forEach(function ([
+        key,
+        value,
+      ]) {
+        select_count += value.length;
+      });
+
+      if (select_count > 1) {
+        //console.log("checkGroup Button is True")
+        cross_btn.show();
+      } else {
+        //console.log("checkGroup Button is False")
+        cross_btn.hide();
+      }
+    }
+
+    function toggleMemberSelect(group_id, member_id) {
+      let el = event.target;
+
+      //let action_span = $(`#span_group_actions_${group_id}`);
+      let cross_btn = $("#cross_group_create_button");
+      if (el.style.backgroundColor != "lightblue") {
+        manageSelection(group_id, member_id);
+
+        el.style.backgroundColor = "lightblue";
+        //let test = action_span.children(".group_action_button").show();
+        //cross_btn.show();
+      } else {
+        el.style.backgroundColor = "inherit";
+        //SELECTED_MEMBERS[group_id].pop(member_id); // TODO: CHANGE THIS
+        SELECTED_MEMBERS[group_id] = removeFromArray(
+          SELECTED_MEMBERS[group_id],
+          member_id
+        );
+
+        if (SELECTED_MEMBERS[group_id].length == 0) {
+          delete SELECTED_MEMBERS[group_id];
+          //let test = action_span.children(".group_action_button").hide();
+          //     if (Object.keys(SELECTED_MEMBERS).length <= 1){
+          //     cross_btn.hide();}
+        }
+      }
+      checkGroupButton();
+
+      //console.log(SELECTED_MEMBERS);
+    }
+  </script>
+
+  <script>
+    let singlesData = "{{singles|escapejs}}";
+
+    function filterSingles() {
+      let text = $("#input_search").val();
+      text = text.toLowerCase();
+      let filteredData = singlesData.filter((n) =>
+        n[1].toLowerCase().startsWith(text)
+      );
+
+      renderSingles(filteredData);
+    }
+  </script>
+
+  <script>
+    // function getSinglesData(){
+    //     let url= "{% url 'dubletten_tool:get_singles' %}";
+    //     $.ajax({
+    //         url: url,
+    //         type:"GET",
+    //         beforeSend: function (request){
+    //             let csrftoken = getCookie("csrftoken");
+    //             request.setRequestHeader("X-CSRFToken", csrftoken);
+    //         },
+    //         success: function(data){
+    //             singlesData = data.singles;
+    //             //console.log("singlesData set");
+    //             renderSingles(singlesData);
+    //         }
+    //     })
+    // }
+
+    function renderSingles(data) {
+      let container = $("#singles_container");
+      let count = data.length;
+
+      $("#filtered_count").text(count);
+
+      container.empty();
+
+      data.forEach((el) => {
+        container.append(`<li class="left_singles_item list-group-item group_list_item_ single-list-item list-group-item-sm d-flex justify-content-between align-items-center" id="single_list_item_${el[0]}" onclick="toggleSingleSelect(${el[0]})">
+                         ${el[1]}, ${el[2]}</li>`);
+      });
+
+      // todo: check if this is still needed
+
+      // SELECTED_SINGLES.forEach((id) => {
+      //     let target_item = document.getElementById(`single_list_item_${id}`);
+      //     if (target_item){
+      //     target_item.style.backgroundColor = "lightblue";
+      //     } else{
+      //         //console.log("in render singles, target item was false for: ", id);
+      //     }
+
+      // }
+      //     );
+
+      // for ([k, v] of Object.entries(data)){
+      //     container.append(`<li class="list-group-item single-list-item list-group-item-sm d-flex justify-content-between align-items-center" id="single_list_item_${k}">
+      //                 ${v.name}, ${v.first_name}
+      //             </li>`)
+      // }
+    }
+
+    $("#input_search").on("keyup", function (e) {
+      // if ($("#input_search").val().length >= 2){
+      // filterSingles();
+      // }
+      if (e.key === "Enter" || e.keyCode === 13) {
+        //filterSingles();
+        //let text = $("#input_search").val();
+
+        requestSingles();
+      }
+    });
+
+    $("#search_groups").on("keyup", function (e) {
+      // if ($("#input_search").val().length >= 2){
+      // filterSingles();
+      // }
+      if (e.key === "Enter" || e.keyCode === 13) {
+        //filterSingles();
+        //let text = $("#input_search").val();
+
+        requestGroups();
+      }
+    });
+
+    function getInputVal() {
+      let name = $("#input_search").val();
+      let first_name = $("#filter_first_name").val();
+
+      name = name ? name : false;
+      first_name = first_name ? first_name : false;
+
+      if (name) {
+        name = name.replaceAll(" ", "__");
+      }
+      if (first_name) {
+        first_name = first_name.replaceAll(" ", "__");
+      }
+      return [name, first_name];
+    }
+
+    $("#filter_first_name").on("keyup", function (e) {
+      // if ($("#input_search").val().length >= 2){
+      // filterSingles();
+      // }
+      if (e.key === "Enter" || e.keyCode === 13) {
+        //filterSingles();
+        //let text = $("#filter_first_name").val();
+
+        requestSingles();
+      }
+    });
+
+    function requestSingles() {
+      let values = getInputVal();
+      let gender = $("input[name=genderCheckSingle]:checked").val();
+
+      if (true) {
+        let url =
+          "{% url 'dubletten_tool:get_singles' val_name='xxxxx' val_first='yyyyy' gender='ffffffff'%}"
+            .replace("xxxxx", values[0])
+            .replace("yyyyy", values[1])
+            .replace("ffffffff", gender);
+        $.ajax({
+          url: url,
+          type: "GET",
+          beforeSend: function (request) {
+            let csrftoken = getCookie("csrftoken");
+            request.setRequestHeader("X-CSRFToken", csrftoken);
+          },
+          success: function (response) {
+            renderSingles(response.singles);
+            renderSinglesSelect();
+          },
+        });
+      }
+    }
+
+    function requestGroups() {
+      let value = $("#search_groups").val();
+      value = value.replaceAll(" ", "__");
+
+      let gender = $("input[name=genderCheckGroup]:checked").val();
+      //console.log("request Groups called")
+
+      let status_values = JSON.stringify(getStatusButtonStatus());
+
+      if (value.length === 0 || value === "") {
+        value = "get_all_groups";
+        //console.log("value was: ", value)
+      }
+
+      if (true) {
+        let url =
+          "{% url 'dubletten_tool:get_groups' val='xxxxx' gender='ffffffff' %}"
+            .replace("xxxxx", value)
+            .replace("ffffffff", gender);
+
+        $.ajax({
+          url: url,
+          type: "GET",
+          data: { data: status_values },
+          beforeSend: function (request) {
+            let csrftoken = getCookie("csrftoken");
+            request.setRequestHeader("X-CSRFToken", csrftoken);
+          },
+          success: function (response) {
+            let container = $("#group_list_container");
+            container.html(response.html);
+            $("#group_count_container").html(response.group_count);
+            renderItemSelect();
+            checkMergeButton();
+            // SELECTED_GROUPS.forEach((id) => {
+            //     let target_item = document.getElementById(`li_group_${id}`);
+
+            //     if (target_item){
+            //     target_item.style.backgroundColor = "lightblue";
+            //     }
+            //toggleItemSelect(id)
+          },
+          //             );
+          //    }
+        });
+      }
+    }
+  </script>
+
+  <style>
+    #table_test {
+      font-size: 13px !important;
+      padding-left: 2rem;
+      padding-right: 2rem;
+    }
+
+    #loading_anim {
+      visibility: hidden;
+      /* -webkit-animation: fadeInFromNone 0.5s ease-out;
+            -moz-animation: fadeInFromNone 0.5s ease-out;
+            -o-animation: fadeInFromNone 0.5s ease-out; */
+      animation: fadeInFadeOut 2s linear alternate infinite;
+    }
+
+    @keyframes fadeInFadeOut {
+      0% {
+        opacity: 0.1;
+      }
+
+      50% {
+        opacity: 0.5;
+      }
+
+      100% {
+        opacity: 1;
+      }
+    }
+  </style>
+
+  {% endblock %}
+</div>
diff --git a/viecpro_import/tests.py b/dubletten_tool/tests.py
similarity index 100%
rename from viecpro_import/tests.py
rename to dubletten_tool/tests.py
diff --git a/viecpro_deduplication/tests/__init__.py b/dubletten_tool/tests/__init__.py
similarity index 100%
rename from viecpro_deduplication/tests/__init__.py
rename to dubletten_tool/tests/__init__.py
diff --git a/viecpro_deduplication/tests/error_logger_mixin_test.py b/dubletten_tool/tests/error_logger_mixin_test.py
similarity index 100%
rename from viecpro_deduplication/tests/error_logger_mixin_test.py
rename to dubletten_tool/tests/error_logger_mixin_test.py
diff --git a/viecpro_deduplication/tests/merge_group_test.py b/dubletten_tool/tests/merge_group_test.py
similarity index 100%
rename from viecpro_deduplication/tests/merge_group_test.py
rename to dubletten_tool/tests/merge_group_test.py
diff --git a/viecpro_deduplication/tests/person_helper_test.py b/dubletten_tool/tests/person_helper_test.py
similarity index 100%
rename from viecpro_deduplication/tests/person_helper_test.py
rename to dubletten_tool/tests/person_helper_test.py
diff --git a/viecpro_deduplication/tests/person_type_test.py b/dubletten_tool/tests/person_type_test.py
similarity index 100%
rename from viecpro_deduplication/tests/person_type_test.py
rename to dubletten_tool/tests/person_type_test.py
diff --git a/viecpro_deduplication/tests/pphelper_test.py b/dubletten_tool/tests/pphelper_test.py
similarity index 100%
rename from viecpro_deduplication/tests/pphelper_test.py
rename to dubletten_tool/tests/pphelper_test.py
diff --git a/viecpro_deduplication/tests/ppkind_test.py b/dubletten_tool/tests/ppkind_test.py
similarity index 100%
rename from viecpro_deduplication/tests/ppkind_test.py
rename to dubletten_tool/tests/ppkind_test.py
diff --git a/viecpro_deduplication/tests/relation_writer_test.py b/dubletten_tool/tests/relation_writer_test.py
similarity index 100%
rename from viecpro_deduplication/tests/relation_writer_test.py
rename to dubletten_tool/tests/relation_writer_test.py
diff --git a/viecpro_deduplication/tests/single_merge_test.py b/dubletten_tool/tests/single_merge_test.py
similarity index 100%
rename from viecpro_deduplication/tests/single_merge_test.py
rename to dubletten_tool/tests/single_merge_test.py
diff --git a/viecpro_deduplication/tests/temp_rel_test.py b/dubletten_tool/tests/temp_rel_test.py
similarity index 88%
rename from viecpro_deduplication/tests/temp_rel_test.py
rename to dubletten_tool/tests/temp_rel_test.py
index 62b9b851..fb8d0e6a 100644
--- a/viecpro_deduplication/tests/temp_rel_test.py
+++ b/dubletten_tool/tests/temp_rel_test.py
@@ -1,5 +1,5 @@
 from django.test import TestCase
-from viecpro_deduplication.src.classes import TempRel
+from dubletten_tool.src.classes import TempRel
 
 
 class TempRelTest(TestCase):
diff --git a/viecpro_deduplication/urls.py b/dubletten_tool/urls.py
similarity index 97%
rename from viecpro_deduplication/urls.py
rename to dubletten_tool/urls.py
index c761c58a..1f2601a0 100644
--- a/viecpro_deduplication/urls.py
+++ b/dubletten_tool/urls.py
@@ -3,7 +3,7 @@
 from .views import MergeGroupsView, get_all_notes, getToolPage, getNoteJSON, HandleNoteForm, get_group_suggestions, get_group_ajax, rename_group, update_group_checkboxes, create_new_group, remove_member, get_singles, get_groups, get_single_ajax, get_person_suggestions
 from .detail_view import OverwrittenGenericEntitiesDetailView
 from .merge_views import GenericCeleryTaskStatusView, DeleteRelation,  GenericEntitiesEditView, GenericEntitiesDetailView, GenericListViewNew, GetRelationEditor, UpdateFieldView, CreateRelationView, RemergeGroupView, UpdateCollectionsView
-app_name = "viecpro_deduplication"
+app_name = "dubletten_tool"
 
 urlpatterns = [
     url(r"entity/update_collections",
@@ -11,7 +11,7 @@
 
     # handles field updates in tables in relation_editor
     url(r"entity/update_field", UpdateFieldView.as_view(), name="update_field"),
-    # Handles re run of merge in viecpro_deduplication
+    # Handles re run of merge in dubletten_tool
     url(r"run_remerge/(?P<g_id>[0-9]+)/",
         RemergeGroupView.as_view(), name="remerge_group"),
     # handles creating new relation in dubletten view in relation_editor
diff --git a/viecpro_deduplication/views.py b/dubletten_tool/views.py
similarity index 100%
rename from viecpro_deduplication/views.py
rename to dubletten_tool/views.py
diff --git a/notebooks/Create Sample 3D CHO.ipynb b/notebooks/Create Sample 3D CHO.ipynb
new file mode 100644
index 00000000..363fcab7
--- /dev/null
+++ b/notebooks/Create Sample 3D CHO.ipynb	
@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/viecpro_deduplication/migrations/0001_initial.py b/viecpro_deduplication/migrations/0001_initial.py
deleted file mode 100644
index 18347746..00000000
--- a/viecpro_deduplication/migrations/0001_initial.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Generated by Django 3.2.18 on 2023-12-04 11:06
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('apis_entities', '0004_auto_20200722_1231'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Group',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(blank=True, max_length=600)),
-                ('status', models.CharField(choices=[('unchecked', 'unchecked'), ('checked group', 'checked group'), ('checked for other groups', 'checked for other groups'), ('checked all members', 'checked all members'), ('ready to merge', 'ready to merge'), ('merged', 'merged')], default='unchecked', max_length=300)),
-                ('_gender', models.CharField(blank=True, max_length=255, null=True)),
-                ('marked', models.BooleanField(default=False)),
-                ('note', models.TextField(blank=True, max_length=2000, null=True)),
-            ],
-            options={
-                'db_table': 'dubletten_tool_group',
-                'ordering': ['name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='PersonProxy',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('status', models.CharField(choices=[('candidate', 'Candidate'), ('single', 'Single'), ('merged', 'Merged')], default='single', max_length=300)),
-                ('marked', models.BooleanField(default=False)),
-                ('note', models.TextField(blank=True, max_length=2000, null=True)),
-                ('_names', models.JSONField(null=True)),
-                ('_first_names', models.JSONField(null=True)),
-                ('person', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='apis_entities.person')),
-            ],
-            options={
-                'db_table': 'dubletten_tool_personproxy',
-                'ordering': ['person__name'],
-            },
-        ),
-        migrations.CreateModel(
-            name='StatusButtonGroupType',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=600)),
-                ('short', models.CharField(default='BT', max_length=4)),
-            ],
-            options={
-                'db_table': 'dubletten_tool_statusbuttongrouptype',
-            },
-        ),
-        migrations.CreateModel(
-            name='StatusButtonProxyType',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=600)),
-            ],
-            options={
-                'db_table': 'dubletten_tool_statusbuttonproxytype',
-            },
-        ),
-        migrations.CreateModel(
-            name='Suggestions',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('data', models.JSONField(blank=True, null=True)),
-            ],
-            options={
-                'db_table': 'dubletten_tool_suggestions',
-            },
-        ),
-        migrations.CreateModel(
-            name='StatusButtonProxy',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('value', models.BooleanField(default=False)),
-                ('kind', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_deduplication.statusbuttonproxytype')),
-                ('related_instance', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_deduplication.personproxy')),
-            ],
-            options={
-                'db_table': 'dubletten_tool_statusbuttonproxy',
-            },
-        ),
-        migrations.CreateModel(
-            name='StatusButtonGroup',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('value', models.BooleanField(default=False)),
-                ('kind', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_deduplication.statusbuttongrouptype')),
-                ('related_instance', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_deduplication.group')),
-            ],
-            options={
-                'db_table': 'dubletten_tool_statusbuttongroup',
-            },
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='members',
-            field=models.ManyToManyField(blank=True, to='viecpro_deduplication.PersonProxy'),
-        ),
-        migrations.AddField(
-            model_name='group',
-            name='vorfin',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='merged_group', to='apis_entities.person'),
-        ),
-        migrations.CreateModel(
-            name='DublettenLOG',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('msg', models.TextField(max_length=600)),
-                ('action', models.CharField(max_length=255)),
-                ('timestamp', models.DateTimeField(auto_now_add=True)),
-                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'db_table': 'dubletten_tool_dublettenlog',
-            },
-        ),
-    ]
diff --git a/viecpro_deduplication/migrations/__init__.py b/viecpro_deduplication/migrations/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/viecpro_deduplication/templates/del/ampel_action_template.html b/viecpro_deduplication/templates/del/ampel_action_template.html
deleted file mode 100644
index baf2e3cf..00000000
--- a/viecpro_deduplication/templates/del/ampel_action_template.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<div class="d-inline-flex">
-    <div class="ampel_circle mx-2" id="ampel_green"></div>
-    <div class="ampel_circle mx-2" id="ampel_yellow"></div>
-    <div class="ampel_circle mx-2" id="ampel_red"></div>
-    {% if instance.ampel.note %}
-    <button class="btn btn-sm btn-primary" onclick="getNoteText()" id="note_button">Note</button>
-    {% else %}
-    <button class="btn btn-sm btn-secondary" onclick="getNoteText()" id="note_button">Note</button>
-    {% endif %}
-</div>
-<script>
-    let ampel_status = "{{instance.ampel.status|escapejs}}";
-    let note_text = "{{instance.ampel.note|escapejs}}";
-
-  /**
-    if (ampel_status === ""){
-        ampel_status = "{{instance.ampel.status|escapejs}}"
-    }
-    **/
-
-    const set_selected_color = ()=> {$(`#ampel_${ampel_status}`).css("background-color", ampel_status);};
-    set_selected_color();
-    $(".ampel_circle").on("mouseenter", (el)=>{
-        el_color = el.target.id.split("_")[1];
-        $(el.target).css("background-color", el_color)
-    });
-    
-    $(".ampel_circle").on("mouseout", (el)=> {
-        el_color = el.target.id.split("_")[1];
-
-        if (ampel_status != el_color){
-        $(el.target).css("background-color", "darkgrey");
-        }
-    });
-
-    $(".ampel_circle").on("click", updateAmpelResponse)
-    
-    function updateAmpelResponse(el){
-        //console.log(el.target.id)
-        status = el.target.id.split("_")[1];
-        console.log(status)
-        if (ampel_status != status){
-        
-        ampel_id = "{{instance.id|escapejs}}";
-            /**
-        if (ampel_id === ""){
-            ampel_id = "{{instance.id|escapejs}}"
-        }
-        **/
-        $.ajax({
-            type: "POST",
-            url: "{% url 'viecpro_deduplication:update_ampel'%}",
-            data: {
-              "id": ampel_id,
-              "status": status,
-            },
-            beforeSend: function (request) {
-              let csrftoken = getCookie("csrftoken");
-              request.setRequestHeader("X-CSRFToken", csrftoken);
-          },
-            success: function (result) {
-               console.log(result);
-               $(`#ampel_${ampel_status}`).css("background-color", "darkgrey");
-               ampel_status = status;
-               set_selected_color();
-               //todo: alert if success is false
-            },
-            dataType: "json"
-          });
-        }
-    }
-
-    function getNoteText(){
-        ampel_id = "{{instance.id|escapejs}}";
-
-        /**
-        if (ampel_id === ""){
-            ampel_id = "{{instance.id|escapejs}}"
-        }
-        **/
-        /**
-        fetch("{% url 'viecpro_deduplication:get_note_text' ampel_pk='111122223333'%}".replace("111122223333", ampel_id)).then((res)=> res.json()).then((j)=> { if (j.success){
-            console.log(j);
-            note_text = j.text;
-        }
-        **/
-        new_text = prompt("Update Note", note_text);
-        console.log(new_text)
-        /** if (new_text === ""){
-            new_text = note_text
-        } 
-        **/
-        if (new_text != note_text && new_text != null){
-            updateNoteResponse(new_text)
-        }
-        }
-
-    
-    function updateNoteResponse(text){
-        $.ajax({
-            type: "POST",
-            url: "{% url 'viecpro_deduplication:update_note_text' %}",
-            data: {
-              "id": ampel_id,
-              "note_text": text,
-            },
-            beforeSend: function (request) {
-              let csrftoken = getCookie("csrftoken");
-              request.setRequestHeader("X-CSRFToken", csrftoken);
-          },
-            success: function (result) {
-             note_text = text;
-             console.log(note_text, note_text != "")
-             if (note_text.trim().length === 0){
-                $("#note_button").removeClass("btn-primary");
-                $("#note_button").addClass("btn-secondary");
-             } else {
-                $("#note_button").removeClass("btn-secondary");
-                $("#note_button").addClass("btn-primary");
-             }
-            },
-            dataType: "json"
-          });
-
-    }
-    
-  
-    
-</script>
-<style> 
-    .ampel_circle{
-        background-color:darkgrey;
-        border: 2px solid black;
-        width: 20px;
-        height: 20px;
-        border-radius: 30px;
-    }
-</style>
\ No newline at end of file
diff --git a/viecpro_deduplication/templates/merge/ampel_action_template.html b/viecpro_deduplication/templates/merge/ampel_action_template.html
deleted file mode 100644
index baf2e3cf..00000000
--- a/viecpro_deduplication/templates/merge/ampel_action_template.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<div class="d-inline-flex">
-    <div class="ampel_circle mx-2" id="ampel_green"></div>
-    <div class="ampel_circle mx-2" id="ampel_yellow"></div>
-    <div class="ampel_circle mx-2" id="ampel_red"></div>
-    {% if instance.ampel.note %}
-    <button class="btn btn-sm btn-primary" onclick="getNoteText()" id="note_button">Note</button>
-    {% else %}
-    <button class="btn btn-sm btn-secondary" onclick="getNoteText()" id="note_button">Note</button>
-    {% endif %}
-</div>
-<script>
-    let ampel_status = "{{instance.ampel.status|escapejs}}";
-    let note_text = "{{instance.ampel.note|escapejs}}";
-
-  /**
-    if (ampel_status === ""){
-        ampel_status = "{{instance.ampel.status|escapejs}}"
-    }
-    **/
-
-    const set_selected_color = ()=> {$(`#ampel_${ampel_status}`).css("background-color", ampel_status);};
-    set_selected_color();
-    $(".ampel_circle").on("mouseenter", (el)=>{
-        el_color = el.target.id.split("_")[1];
-        $(el.target).css("background-color", el_color)
-    });
-    
-    $(".ampel_circle").on("mouseout", (el)=> {
-        el_color = el.target.id.split("_")[1];
-
-        if (ampel_status != el_color){
-        $(el.target).css("background-color", "darkgrey");
-        }
-    });
-
-    $(".ampel_circle").on("click", updateAmpelResponse)
-    
-    function updateAmpelResponse(el){
-        //console.log(el.target.id)
-        status = el.target.id.split("_")[1];
-        console.log(status)
-        if (ampel_status != status){
-        
-        ampel_id = "{{instance.id|escapejs}}";
-            /**
-        if (ampel_id === ""){
-            ampel_id = "{{instance.id|escapejs}}"
-        }
-        **/
-        $.ajax({
-            type: "POST",
-            url: "{% url 'viecpro_deduplication:update_ampel'%}",
-            data: {
-              "id": ampel_id,
-              "status": status,
-            },
-            beforeSend: function (request) {
-              let csrftoken = getCookie("csrftoken");
-              request.setRequestHeader("X-CSRFToken", csrftoken);
-          },
-            success: function (result) {
-               console.log(result);
-               $(`#ampel_${ampel_status}`).css("background-color", "darkgrey");
-               ampel_status = status;
-               set_selected_color();
-               //todo: alert if success is false
-            },
-            dataType: "json"
-          });
-        }
-    }
-
-    function getNoteText(){
-        ampel_id = "{{instance.id|escapejs}}";
-
-        /**
-        if (ampel_id === ""){
-            ampel_id = "{{instance.id|escapejs}}"
-        }
-        **/
-        /**
-        fetch("{% url 'viecpro_deduplication:get_note_text' ampel_pk='111122223333'%}".replace("111122223333", ampel_id)).then((res)=> res.json()).then((j)=> { if (j.success){
-            console.log(j);
-            note_text = j.text;
-        }
-        **/
-        new_text = prompt("Update Note", note_text);
-        console.log(new_text)
-        /** if (new_text === ""){
-            new_text = note_text
-        } 
-        **/
-        if (new_text != note_text && new_text != null){
-            updateNoteResponse(new_text)
-        }
-        }
-
-    
-    function updateNoteResponse(text){
-        $.ajax({
-            type: "POST",
-            url: "{% url 'viecpro_deduplication:update_note_text' %}",
-            data: {
-              "id": ampel_id,
-              "note_text": text,
-            },
-            beforeSend: function (request) {
-              let csrftoken = getCookie("csrftoken");
-              request.setRequestHeader("X-CSRFToken", csrftoken);
-          },
-            success: function (result) {
-             note_text = text;
-             console.log(note_text, note_text != "")
-             if (note_text.trim().length === 0){
-                $("#note_button").removeClass("btn-primary");
-                $("#note_button").addClass("btn-secondary");
-             } else {
-                $("#note_button").removeClass("btn-secondary");
-                $("#note_button").addClass("btn-primary");
-             }
-            },
-            dataType: "json"
-          });
-
-    }
-    
-  
-    
-</script>
-<style> 
-    .ampel_circle{
-        background-color:darkgrey;
-        border: 2px solid black;
-        width: 20px;
-        height: 20px;
-        border-radius: 30px;
-    }
-</style>
\ No newline at end of file
diff --git a/viecpro_deduplication/templates/tool_page.html b/viecpro_deduplication/templates/tool_page.html
deleted file mode 100644
index edf83548..00000000
--- a/viecpro_deduplication/templates/tool_page.html
+++ /dev/null
@@ -1,1636 +0,0 @@
-{% extends "webpage/base.html" %}
-{% load static %}
-{% load stats_extras %}
-{% load webpage_extras %}
-
-{% block content %}
-<link rel="stylesheet" href="/static/viecpro_deduplication/css/deduplication.css" type="text/css">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-
-<div class="container-fluid w-100">
-    <div class="row w-100">
-        <div class="col-md-3 px-2 py-4">
-            <button class="btn btn-sm btn-outline-secondary" onclick="toggleBrowser()" id="toggleBrowserButton"><i
-                    class="fa fa-arrow-left"></i></button>
-            <button class="btn btn-sm btn-outline-secondary" onclick="hideNavbar()" id="hideNavbarButton">Hide
-                Navbar</button>
-            <button class="btn btn-sm btn-outline-secondary" onclick="toggleRelationsData()"
-                id="toggleRelationsData">Relations</button>
-            <button class="btn btn-sm btn-outline-secondary" onclick="togglePersonNames()"
-                id="togglePersonNames">Names</button>
-
-
-        </div>
-    </div>
-    <div class="row w-100 justify-content-center">
-        <div style="display:flex; flex-direction:column;   align-items: center;
-        justify-content: center;">
-            <h3 id="loading_anim">Performing manual merge / re-merge...</h3>
-            <button onclick="CloseTable()" id="remove_tables_button" style="visibility:hidden; width: 4rem;"
-                class="btn-sm btn-primary mb-3">Close</button>
-        </div>
-
-    </div>
-    <div class="row w-100 justify-content-center">
-
-        <div id="table_test">
-
-
-        </div>
-    </div>
-    <div class="row w-100 pt-5 pb-3">
-        <div class="col-md-3" id="browser_header">
-
-            <div id="manu_navigation">
-                <ul class="nav nav-tabs" id="myTab" role="tablist">
-                    <li class="nav-item" role="presentation">
-                        <a class="nav-link active" id="groups-tab" data-toggle="tab" href="#groups_section"
-                            role="tab">Groups</a>
-                    </li>
-                    <li class="nav-item" role="presentation">
-                        <a class="nav-link" id="singles-tab" data-toggle="tab" href="#singles_section"
-                            role="tab">Singles</a>
-                    </li>
-                    <li class="nav-item" role="presentation">
-                        <a class="nav-link" id="marked-tab" data-toggle="tab" href="#marked_section"
-                            onclick="getAllNotesJson()" role="tab">Marked</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="col-md-4 pl-4" id="selection_header">
-            <span class="d-flex justify-content-start align-items-center">
-                <h2 class="pl-0">Selected</h2>
-                <button class="btn btn-primary group_action_button m-0 ml-4" onclick="mergeGroups()"
-                    id="button_merge">merge all</button>
-                <button class="btn btn-primary group_action_button m-0 ml-4" onclick="createNewGroup()"
-                    id="cross_group_create_button">group selections</button>
-            </span>
-        </div>
-        <div class="col-md-5 pl-0" id="detail_header">
-            <span class="d-flex ">
-                <h2 class="pl-4">Detail / Suggestions</h2>
-                <button class="btn btn-sm btn-outline-secondary ml-4" onclick="clearSuggestions()"
-                    id="clearSuggestions">Clear</button>
-            </span>
-
-
-        </div>
-    </div>
-
-    <div class="row w-100">
-        <div class="col-md-3" id="browser_content">
-            <div class="tab-content" id="myTabContent">
-                <div class="tab-pane fade show active" id="groups_section" role="tabpanel">
-                    <label>Gender:</label>
-                    <span class="d-flex justify-content-start align-items-center mb-3">
-
-                        <div class="form-check form-check-inline mx-1">
-                            <input checked class="form-check-input" type="radio" name="genderCheckGroup"
-                                id="genderCheckboxGROUPMale" value="Male">
-                            <label class="form-check-label mr-2" for="genderCheckboxGROUPMale">
-                                Male
-                            </label>
-                        </div>
-                        <div class="form-check form-check-inline mx-1">
-                            <input class="form-check-input" type="radio" name="genderCheckGroup"
-                                id="genderCheckboxGROUPFemale" value="Female">
-                            <label class="form-check-label mr-2" for="genderCheckboxGROUPFemale">
-                                Female
-                            </label>
-                        </div>
-                        <div class="form-check form-check-inline mx-1">
-                            <input class="form-check-input" type="radio" name="genderCheckGroup"
-                                id="genderCheckboxGROUPOther" value="Other">
-                            <label class="form-check-label mr-2" for="genderCheckboxGROUPOther">
-                                Other/None
-                            </label>
-                        </div>
-                    </span>
-                    <span class="d-flex justify-content-start align-items-center mb-3"> <label
-                            class="m-0 mr-4 p-1 my-2">Status:</label>
-
-                        {% for b in Buttons %}
-                        {% if forloop.first %}
-                        <label class="border border-dark rounded-left m-0 my-2 p-1 my_checkbox" value="undefined"
-                            onclick="toggleStatusButton('{{b.id}}')" id="status_button_filter_{{b.id}}"
-                            style="background-color:inherit;"><small>{{b.short}}</small></label>
-                        {% elif forloop.last %}
-                        <label class="border border-dark rounded-right m-0 my-2 p-1 my_checkbox" value="undefined"
-                            onclick="toggleStatusButton('{{b.id}}')" id="status_button_filter_{{b.id}}"
-                            style="background-color:inherit;"><small>{{b.short}}</small></label>
-
-                        {% else %}
-                        <label class="border border-dark m-0 my-2 p-1 my_checkbox" value="undefined"
-                            onclick="toggleStatusButton('{{b.id}}')" id="status_button_filter_{{b.id}}"
-                            style="background-color:inherit;"><small>{{b.short}}</small></label>
-
-                        {% endif %}
-
-                        {% endfor %}
-                    </span>
-
-                    <span class="d-flex justify-content-center align-items-center">
-                        <input class="form-control mr-4 rounded-right" type="search" placeholder="Search for Groups"
-                            id="search_groups">
-                    </span>
-                    <span class="d-flex px-1 my-2 justify-content-start align-content-center"
-                        id="group_label_span"><label class="mr-2">Count:</label><label
-                            id="group_count_container">0</label></span>
-
-                    <div class="container-fluid mt-5" style="overflow-y: scroll; height: 80vh;"
-                        id="group_list_container">
-
-                    </div>
-                </div>
-                <div class="tab-pane fade" id="singles_section" role="tabpanel">
-                    <label>Gender:</label>
-                    <span class="d-flex justify-content-start align-items-center mb-3">
-
-                        <div class="form-check form-check-inline mx-1">
-                            <input checked class="form-check-input" type="radio" name="genderCheckSingle"
-                                id="genderCheckboxSINGLEMale" value="Male">
-                            <label class="form-check-label mr-2" for="genderCheckboxSINGLEMale">
-                                Male
-                            </label>
-                        </div>
-                        <div class="form-check form-check-inline mx-1">
-                            <input class="form-check-input" type="radio" name="genderCheckSingle"
-                                id="genderCheckboxSINGLEFemale" value="Female">
-                            <label class="form-check-label mr-2" for="genderCheckboxSINGLEFemale">
-                                Female
-                            </label>
-                        </div>
-                        <div class="form-check form-check-inline mx-1">
-                            <input class="form-check-input" type="radio" name="genderCheckSingle"
-                                id="genderCheckboxSINGLEOther" value="Other">
-                            <label class="form-check-label mr-2" for="genderCheckboxSINGLEOther">
-                                Other/None
-                            </label>
-                        </div>
-                    </span>
-                    <span class="d-flex px-1 my-2 justify-content-start align-content-center"><input aria-label="Search"
-                            class="form-control mr-4 rounded-right" id="input_search" placeholder="Name" type="search">
-                        <input aria-label="Search" class="form-control mr-4 rounded-right" id="filter_first_name"
-                            placeholder="First Name" type="search"></span>
-                    <span class="d-flex px-1 my-2 justify-content-start align-content-center"><label
-                            class="mr-2">Count:</label><label id="filtered_count">0</label></span>
-                    <div class="container-fluid pt-2" style="overflow-y: scroll; height: 80vh;">
-
-                        <ul class="list-group mt-3" id="singles_container">
-                            <!-- <ul class="list-group" id="all_singles_list">
-                    {% for s in singles %}
-                    <li class="list-group-item single-list-item list-group-item-sm d-flex justify-content-between align-items-center" id="single_list_item_{{s.id}}">
-                        {{s.person.name}}, {{s.person.first_name}}
-                    </li>
-                </ul>
-                    {% endfor %} -->
-                        </ul>
-                    </div>
-                </div>
-                <div class="tab-pane fade" id="marked_section" role="tabpanel">
-                    Not implemented yet
-                </div>
-
-            </div>
-        </div>
-        <div class="col-md-4 pl-4 pb-5" id="relations_section" style="width: 100%; overflow-y: scroll; height: 80vh;">
-            <div class="w-100 m-0 p-0" id="relations_group_section"></div>
-            <h4 class="h4 pt-5" id="singles_header">Singles</h4>
-
-            <div class="w-100 m-0 p-0" id="relations_single_section"></div>
-
-
-        </div>
-        <div class="col-md-5 pl-4 pb-5" id="detail_section" style="width: 100%; overflow-y: scroll; height: 80vh;">
-
-        </div>
-    </div>
-    <script>
-        let SELECTED_MEMBERS = {};
-        let SELECTED_GROUPS = [];
-        let SELECTED_SINGLES = [];
-        let BTN_MERGE = $("#button_merge");
-        let BROWSER_VISIBLE = true;
-        let NAV_VISIBLE = true;
-        let REL_TOGGLE = false;
-        let NAMES_TOGGLE = true;
-        let LOADING_FLAG = false;
-        let AWAIT_REMERGE_RESULT = false;
-
-        const CELERY_ENDPOINTS_viecpro_deduplication = {
-            // redundant routes, legacy from when I thought these would be needed to be different.
-            "remerge_group": "{% url 'viecpro_deduplication:get_task_status' %}",
-            "merge_groups": "{% url 'viecpro_deduplication:get_task_status' %}"
-
-        }
-
-        const pollCeleryStatus = (task_id, url, task_name) => {
-            // this scope preservers key, url  and task name value for re-polling
-            // task_name is not really a name given to the celery task yet, 
-            // only needed in frontend atm to distinguish callbacks on success
-            console.log("task name in pollCelery", task_name)
-            return $.ajax({
-                url: url,
-                type: "POST",
-                data: { "task_id": task_id },
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (response) {
-                    console.log(response.status)
-                    if (response.status === "PENDING") {
-                        // after initial wait, repoll every 2.5 sec.
-                        setTimeout(pollCeleryStatus, 2500, task_id, url, task_name);
-
-                    } else {
-                        // callbacks handling the rendering of the computations outcome are grouped by task_name 
-                        // ! task_name is not set in task, only here in frontend, for this purpose only !
-
-                        switch (task_name) {
-                            case "remerge_group":
-                                console.log(response.result)
-                                renderRemergeOutcome(response.result)
-                                break
-                            case "merge_groups":
-                                // add merge groups callback here
-                                console.log("called MergeGroupsAndRemergeDispatcher in switch")
-                                MergeGroupsAndRemergeDispatcher(response.result)
-                                break
-                            default:
-                                alert("Implementation error. No task matched given task in pollCeleryStatus switch.")
-                                break
-                        }
-
-                    }
-
-                }
-            })
-        }
-
-
-
-
-        function clearSuggestions() {
-            $("#detail_section").empty()
-        }
-
-
-        function renderRemergeOutcome(response) {
-            // renders the outcome of remerge once celery task finished.
-
-            toggleLoading("hidden");
-
-            function append_to_table_div(element) {
-                //document.getElementById("table_test").insertAdjacentHTML("beforeend", element);
-                document.getElementById("table_test").innerHTML += element;
-            };
-            let vorfin_title = `<h3 class='text-center'> Report after Remerge for: ${response.new_vorfin} (${response.new_vorfin_id})</h3>`
-            let changed_header = `<h3 class='text-start'>${response.rels_changed.title}</h3>`;
-            let changed_table = response.rels_changed.table;
-            let added_header = `<h3 class='text-start'>${response.rels_added.title}</h3>`;
-            let added_table = response.rels_added.table;
-
-            console.log(response)
-            console.log(response.rels_added.table)
-            element_array = [vorfin_title, changed_header, changed_table, added_header, added_table];
-            element_array.forEach((el) => {
-                append_to_table_div(el)
-            });
-
-
-            $("#remove_tables_button").css("visibility", "visible");
-            alert(response.msg);
-            //alert("attempting redraw of singles and items AND getGroupAjax of new group!")
-            //getGroupAjax(response.new_vorfin_id)
-            //renderItemSelect();
-            //renderSinglesSelect();
-            if (AWAIT_REMERGE_RESULT) {
-                console.log("set await remerge result to False")
-                AWAIT_REMERGE_RESULT = false;
-            }
-
-        }
-
-        function toggleLoading(set_state = false) {
-            let loading_div = $("#loading_anim");
-            //alert("called toggle")
-
-            if (!set_state) {
-                //alert("set state was false")
-
-                if (loading_div.css("visibility") === "hidden") {
-                    loading_div.css("visibility", "visible")
-                } else {
-                    loading_div.css("visibility", "hidden")
-
-                }
-            } else {
-                //alert("set state was: ", set_state)
-                loading_div.css("visibility", set_state)
-            }
-
-        }
-
-        function remergeGroup(g_id, groups_to_delete = false, ask_for_confirmation = true) {
-            /** when called from button click, ask for confirmation. When called from merge_groups function, 
-             * don't ask for confirmation to remerge.
-             * Also, when called from merge_groups, pass on list of groups_to_delete (because those groups got combined to 
-             * a new group in merge_groups and are obsolete.)
-            */
-
-            if (ask_for_confirmation) {
-                proceed = confirm(`Do you want to re-merge group ${g_id}?`)
-            } else {
-                proceed = true
-            }
-
-            if (proceed) {
-                let url = "{% url 'viecpro_deduplication:remerge_group' g_id='99999999' %}".replace('99999999', g_id);
-
-
-
-                //$("#loading_anim").toggle(); //css("visibility") = "visible."
-                toggleLoading("visible")
-
-                $.ajax({
-                    url: url,
-                    type: "POST",
-                    data: { "data": groups_to_delete ? groups_to_delete : [] },
-                    beforeSend: function (request) {
-                        let csrftoken = getCookie("csrftoken");
-                        request.setRequestHeader("X-CSRFToken", csrftoken);
-                    },
-                    success: function (response) {
-                        //console.log(data.msg);
-                        if (response.success) {
-                            // get task_id from initial response
-                            task_id = response.task_id;
-                            // call first poll of celery status, after 20 seconds (min-time computation takes)
-                            setTimeout(pollCeleryStatus, 9000, task_id = task_id, url = CELERY_ENDPOINTS_viecpro_deduplication.remerge_group, task_name = "remerge_group");
-                        } else {
-                            toggleLoading("hidden");
-                            alert(response.msg)
-                        }
-
-
-                    }
-                })
-
-            } else {
-                alert("aborted")
-                toggleLoading("hidden");
-            }
-        }
-
-        function CloseTable() {
-            document.getElementById("table_test").innerHTML = ""
-            $("#remove_tables_button").css("visibility", "hidden");
-        }
-
-        function hideNavbar() {
-
-            if (NAV_VISIBLE) {
-                $("#wrapper-navbar").hide();
-                NAV_VISIBLE = false;
-                $("#hideNavbarButton").html("Show Navbar");
-
-            } else {
-                $("#wrapper-navbar").show();
-                NAV_VISIBLE = true;
-                $("#hideNavbarButton").html("Hide Navbar");
-
-
-            }
-        }
-
-        function hideDeatails() {
-            // todo not implemented yet
-            $("#detail_section").children().each((el) => { el.hide });
-        }
-
-        function getStatusButtonStatus() {
-            let values = {};
-            $("[id^=status_button_filter]").each(function () {
-                let el = $(this);
-                let id = $(this).attr("id").split("_");
-                //console.log(typeof(id))
-                id = id[id.length - 1]
-                if ($(this).attr("value") !== "undefined") {
-                    values[id] = $(this).attr("value");
-                }
-            })
-            //console.log(values)
-            return values
-        }
-
-        function toggleStatusButton(b_id) {
-            let el = $(`#status_button_filter_${b_id}`);
-            let curr_val = el.attr("value");
-
-            switch (curr_val) {
-                case "undefined":
-                    el.attr("value", "true");
-                    el.css("background-color", "lightblue")
-                    break;
-                case "true":
-                    el.attr("value", "false");
-                    el.css("background-color", "lightpink")
-
-                    break;
-                case "false":
-                    el.attr("value", "undefined");
-                    el.css("background-color", "inherit")
-
-                    break
-                default:
-                //console.log("no selection pssibel in toggleStatusButton")
-            }
-
-            //console.log(el.attr("value"), "before:", curr_val)
-            getStatusButtonStatus();
-
-        }
-
-        function togglePersonNames() {
-            let sel = $('.person_names');
-            // note __g.pirgie__ This toggle doesn't work, as it is overwritten by bootstraps collapse implementation; If this functionality is wanted, it needs a workaround.
-
-            if (!NAMES_TOGGLE) {
-                sel.each(function () {
-                    $(this).addClass("d-flex").show(); // __g.pirgie__ not working; overwritten by bootstrap
-                    //console.log($(this))
-                })
-                NAMES_TOGGLE = true;
-            } else {
-                sel.each(function () {
-                    $(this).removeClass("d-flex").hide(); // __g.pirgie__ not working; overwritten by bootstrap
-                })
-                NAMES_TOGGLE = false;
-            }
-        }
-
-        function toggleRelationsData() {
-            //console.log("Called toggleRelationsData")
-            let test = $('[id^="data_div_"]');
-            //console.log(test)
-            if (!REL_TOGGLE) {
-                test.each(function () {
-                    $(this).addClass("show");
-
-                })
-                REL_TOGGLE = true;
-            } else {
-                test.each(function () {
-                    $(this).removeClass("show");
-
-                })
-                REL_TOGGLE = false;
-
-            }
-        }
-
-        function toggleBrowser() {
-
-            //header
-            let b_h = $("#browser_header");
-            let d_h = $("#detail_header");
-            let s_h = $("#selection_header");
-
-            //content
-            let b_c = $("#browser_content");
-            let d_c = $("#detail_section");
-            let s_c = $("#relations_section");
-
-            let elements = [d_h, s_h, d_c, s_c];
-            let col_4 = [s_h, s_c];
-            let col_5 = [d_h, d_c];
-
-            if (BROWSER_VISIBLE) {
-                b_h.hide();
-                b_c.hide();
-                elements.forEach((el) => {
-                    //console.log("el:", el)
-                    el.removeClass("col-md-4").removeClass("col-md-5").addClass("col-md-6");
-                })
-                $("#toggleBrowserButton").html("<i class='fa fa-arrow-right'>")
-                BROWSER_VISIBLE = false;
-
-
-            } else {
-                b_h.show();
-                b_c.show();
-                col_4.forEach((el) => {
-                    el.removeClass("col-md-6").addClass("col-md-4");
-
-                })
-
-                col_5.forEach((el) => {
-                    el.removeClass("col-md-6").addClass("col-md-5");
-                })
-
-
-                $("#toggleBrowserButton").html("<i class='fa fa-arrow-left'>")
-
-
-                BROWSER_VISIBLE = true
-
-
-
-            }
-
-        }
-
-        function unbind_group_form(event) {
-            $(this).find('button').attr("disabled", true);
-            event.preventDefault();
-            event.stopPropagation();
-
-            let url = $(this).attr("action");
-            let formData = $(this).serialize();
-
-            $.ajax({
-                url: url,
-                type: "POST",
-                data: formData,
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (data) {
-                    //console.log(data.msg);
-                    $("#detail_section").empty();
-                    getNoteJson(data.inst_id, data.type)
-                }
-            }
-            )
-
-        }
-
-
-        function removeFromArray(arr, value) {
-
-            return arr.filter(function (el) {
-                return el != value;
-            });
-        }
-
-        function abortNoteEdit(inst_id, type) {
-            $("#detail_section").empty();
-            getNoteJson(inst_id, type);
-
-        }
-
-        function getNoteJson(inst_id, type) {
-
-            let url = "{% url 'viecpro_deduplication:get_note_json' inst_id='12345678' type='kkkkkkkk' %}".replace("12345678", inst_id).replace("kkkkkkkk", type)
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (res) {
-
-                    //console.log("in done part of getNOtejSon")
-                    $("#detail_section").html(res.html);
-                }
-            })
-
-        }
-
-        function getPersonDetail(per_id) {
-            let url = "{% url 'viecpro_deduplication:get_person_detail' per_id='66666666' %}".replace("66666666", per_id);
-
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (res) {
-                    $("#detail_section").html(res.html);
-                }
-            })
-        }
-
-
-        function noteClickHandler(g_id, type, group_id) {
-            getNoteJson(g_id, type);
-            //console.log("in CLickHAndler", group_id)
-
-            if (type === "group") {
-                toggleItemSelect(g_id);
-            } else if (type === "single") {
-                toggleSingleSelect(g_id);
-            } else {
-                //console.log("in else in handler");
-                toggleItemSelect(group_id);
-            }
-        }
-
-        function getAllNotesJson() {
-            let url = "{% url 'viecpro_deduplication:get_all_notes' %}"
-
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (res) {
-                    $("#marked_section").html(res.html);
-                }
-
-            })
-        }
-        function getPersonSuggestions(per_id) {
-            let url = "{% url 'viecpro_deduplication:get_person_suggestions' per_id='66666666' %}".replace("66666666", per_id);
-
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (res) {
-                    $("#detail_section").html(res.html);
-                    renderItemSelect();
-                    renderSinglesSelect();
-                }
-            })
-        }
-
-        function getGroupSuggestions(g_id) {
-            let url = "{% url 'viecpro_deduplication:get_group_suggestions' group_id='66666666' %}".replace("66666666", g_id);
-
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (res) {
-                    $("#detail_section").html(res.html);
-                    renderItemSelect();
-                    renderSinglesSelect();
-                }
-            })
-        }
-
-        function checkSinglesHeader() {
-            if (SELECTED_SINGLES.length > 0) {
-                $("#singles_header").show();
-
-            } else {
-                $("#singles_header").hide();
-
-            }
-        }
-
-        function isGroupDisplayed(id) {
-            //console.log($(`#group_data_${id}`))
-            if ($(`#group_data_${id}`).length >= 1) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        function checkButtonResponse(btn_id, group_id) {
-            let url = "{%url 'viecpro_deduplication:update_group_checkboxes' btn_id='123456' group_id='9999999' %}".replace("123456", btn_id).replace("9999999", group_id);
-
-            $.ajax({
-                url: url,
-                type: "POST",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (data) {
-                    //console.log("data arrived as", data);
-
-                    $(`#div_group_status_buttons_${group_id}`).html(data.html);
-                }
-
-
-            })
-        }
-
-        function renderItemSelect() {
-            $.merge($(".suggestions_group_item"), $(".left_group_list_item")).each(function (d, el) {
-                //console.log(el.id);
-                let id = el.id.split("_").pop();
-                ////console.log("id of element is: ", id, typeof(id), typeof(SELECTED_GROUPS[0]));
-                if (SELECTED_GROUPS.includes(id)) {
-                    //console.log("TRUE", id, "is in", SELECTED_GROUPS);
-                    el.style.backgroundColor = "lightblue";
-                    el.onmouseenter = (event) => {
-
-                        //todo: render the background change on hover
-                        //console.log(event.target)
-                        //console.log(this);
-                        // this.style.backgroundColor = "red"
-                    };
-                } else {
-                    //console.log("FALSE");
-                    el.style.backgroundColor = "white";
-
-                }
-            })
-
-
-        }
-
-        function toggleItemSelect(id) {
-
-            if (SELECTED_GROUPS.includes(id)) {
-                SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, id);
-                delete SELECTED_MEMBERS[id];
-                $(`#group_data_${id}`).remove();
-
-            } else {
-                SELECTED_GROUPS.push(id);
-                getGroupAjax(id);
-
-            }
-
-            renderItemSelect();
-            checkMergeButton();
-        }
-
-        function toggleSingleSelect(id) {
-            //console.log("called toggle Single select")
-            id = id.toString()
-            if (SELECTED_SINGLES.includes(id)) {
-                //console.log("id was in selected singles, TRUE")
-                SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, id);
-                $(`#single_data_${id}`).remove();
-
-                if (SELECTED_MEMBERS["singles"]) {
-                    SELECTED_MEMBERS["singles"] = removeFromArray(SELECTED_MEMBERS["singles"], id);
-                    if (SELECTED_MEMBERS["singles"].length == 0) {
-                        delete SELECTED_MEMBERS["singles"];
-
-                    }
-
-                }
-
-            } else {
-                //console.log("id was not in selected singles, FALSE")
-
-                SELECTED_SINGLES.push(id);
-                getSinglesAjax(id);
-
-            }
-
-            renderSinglesSelect();
-            checkMergeButton();
-            checkGroupButton();
-            checkSinglesHeader();
-
-        }
-
-        function renderSinglesSelect() {
-            //console.log("called render single select");
-
-            $.merge($(".suggestions_singles_item"), $(".left_singles_item")).each(function (d, el) {
-                let id = el.id.split("_").pop();
-                ////console.log("el is:", el)
-                ////console.log("id of element is: ", id, typeof(id), typeof(SELECTED_SINGLES[0]));
-                if (SELECTED_SINGLES.includes(id)) {
-                    //console.log("TRUE", id, "is in", SELECTED_SINGLES);
-                    el.style.backgroundColor = "lightblue";
-                    el.onmouseenter = (event) => {
-
-                        //todo: render the background change on hover
-                        //console.log(event.target)
-                        //console.log(this);
-                        // this.style.backgroundColor = "red"
-                    };
-                } else {
-                    //console.log("FALSE");
-                    el.style.backgroundColor = "white";
-
-                }
-            })
-
-        }
-        function toggleItemSelectOLD(id) {
-            //console.log("clicked, id is:", id)
-            let target_item = document.getElementById(`li_group_${id}`);
-            //console.log(target_item);
-
-            if (!target_item && SELECTED_GROUPS.includes(id)) {
-                $(`#group_data_${id}`).remove();
-                SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, id);
-                delete SELECTED_MEMBERS[id];
-
-            }
-
-            else if (target_item.style.backgroundColor != "lightblue") {
-                target_item.style.backgroundColor = "lightblue";
-                if (!SELECTED_GROUPS.includes(id)) {
-                    SELECTED_GROUPS.push(id);
-                }
-                //console.log("PUSHED ID TO SELECTED_GROUPS", SELECTED_GROUPS);
-
-
-                //console.log(isGroupDisplayed(id));
-                getGroupAjax(id);
-            } else {
-                $(`#group_data_${id}`).remove();
-                target_item.style.backgroundColor = "white";
-                //console.log(isGroupDisplayed(id));
-                //SELECTED_GROUPS.pop(id); // TODO: CHANGE THIS
-                SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, id);
-                delete SELECTED_MEMBERS[id];
-
-            }
-            //console.log("clicked: ", id);
-            //SELECTED_MEMBERS[id]=[];
-            checkMergeButton();
-
-        }
-
-        function checkMergeButton() {
-            //console.log("check merge button called")
-            if (SELECTED_GROUPS.length > 1 || SELECTED_SINGLES.length > 1 || (SELECTED_SINGLES.length === 1 && SELECTED_GROUPS.length === 1)) {
-                BTN_MERGE.show();
-            } else {
-                BTN_MERGE.hide();
-            }
-        }
-
-        function getGroupAjax(id, update = false) {
-            let url = "{% url 'viecpro_deduplication:get_group_ajax' g_id='12345' %}".replace("12345", id);
-            //console.log("Get Group Ajax Called");
-            //console.log(url);
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (data) {
-                    if (update) {
-                        $(`#group_data_${id}`).replaceWith(data.html);
-                    } else {
-                        if (!isGroupDisplayed(id)) {
-                            $("#relations_group_section").append(data.html);
-                        } else {
-                            $(`#group_data_${id}`).replaceWith(data.html);
-                        }
-
-                    }
-                }
-
-            })
-        }
-
-        function addGroupToList(id, name, count) {
-            console.log("---->>>", id, name, count)
-            $("#all_groups_list").prepend(
-                `<li class=" left_group_list_item list-group-item group_list_item_ list-group-item-sm d-flex justify-content-between align-items-center" onclick="toggleItemSelect('${id}')" id="li_group_${id}">${id} ${name}
-            <span class="badge badge-primary badge-pill" id="group_count_badge_${id}">${count}</span> </li>`
-            )
-
-        }
-
-
-        function editNote(group_id, type) {
-
-            let url = "{% url 'viecpro_deduplication:handle_note_form' g_id='55555555' type='abcdefgh'%}".replace("55555555", group_id).replace("abcdefgh", type);
-
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (data) {
-                    $("#detail_section").empty().html(data.html);
-                    $(`.NoteForm `).submit(unbind_group_form);
-
-                }
-            })
-
-        }
-
-        function updateGroupCountBadges(id, count) {
-
-            if (count === 0) {
-                $(`#li_group_${id}`).remove();
-            }
-            else {
-                let badge = $(`#group_count_badge_${id}`)
-                badge.html(count)
-            }
-        }
-
-        function suggestGroupName(merge = true) {
-            //console.log("called suggestGroupName")
-            let name;
-            if (merge) {
-                name = $(".group_id_name :first-child").first().text();
-
-            } else {
-                let values = Object.values(SELECTED_MEMBERS).flat()
-                name = $('[data-target^="#data_div_"]')
-                    .filter(function () {
-                        let id = $(this).text().split("["); id = id[1].trim().slice(0, -1);
-                        if (values.includes(id)) {
-                            return true
-                        } else {
-                            return false
-                        }
-                    }).first().text().split("[")
-
-
-                //let name = $('[data-target^="#data_div_"]').first().text().split("[");
-                //console.log(name)
-
-                name = name[0]
-                // todo filter by id against selected members (keys in SM are group ids or the key singles, values is an array of string ids for all)
-                // select name by selection on merge == false
-
-                //name = $('[data-target^="#data_div_"]').filter(function(){let id = $(this).text().split("["); id = id[1].trim().slice(0,-1);//console.log(id);})
-
-                //console.log(name)
-            }
-
-            return name
-        }
-
-
-        function createNewGroup() {
-            let url = "{% url 'viecpro_deduplication:create_new_group' %}";
-            let sug = suggestGroupName(false);
-
-            let name = prompt("Please Enter Name for New Group", sug);
-            //console.log("create new group called", name)
-
-
-            let data = JSON.stringify({ "data": SELECTED_MEMBERS, "singles": SELECTED_SINGLES, "new_name": name });
-
-            if (name === null || name == "") {
-                //console.log("prompt was null");
-            } else {
-                $.ajax({
-                    url: url,
-                    type: "POST",
-                    beforeSend: function (request) {
-                        let csrftoken = getCookie("csrftoken");
-                        request.setRequestHeader("X-CSRFToken", csrftoken);
-                    },
-                    dataType: "json",
-                    data: { "DATA": data },
-                    success: function (response) {
-                        res = response.data;
-                        addGroupToList(res.new_group_id, res.new_group, res.new_group_count)
-                        let cross_btn = $("#cross_group_create_button");
-
-                        //console.log("in response of create new group");
-                        //console.log("response data is: ", res)
-
-                        for ([k, v] of Object.entries(res.group_updates)) {
-                            //console.log("TEST for group updates afer creat", k,v);
-                            updateGroupCountBadges(k, v);
-                            if (v > 0) {
-                                getGroupAjax(k, true);
-                            } else {
-                                $(`#group_data_${k}`).remove();
-                                //SELECTED_GROUPS.pop(k); // TODO: CHANGE THIS
-                                SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, k)
-
-                            }
-                        }
-                        //console.log("former singles")
-                        //console.log(response.data.former_singles)
-                        response.data.former_singles.forEach((s) => {
-                            ////console.log("for each called for: ", s, "section:", `single_data_${s}`);
-                            $(`#single_data_${s}`).remove();
-                            $(`#single_list_item_${s}`).remove();
-                            // SELECTED_SINGLES.pop(s); // TODO: CHANGE THIS
-                            SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, s);
-
-                        })
-
-                        SELECTED_MEMBERS = {};
-                        cross_btn.hide();
-                        checkGroupButton();
-                        checkSinglesHeader();
-
-
-                    }
-                })
-
-            }
-        }
-    </script>
-
-    <script>
-        function removeMember(group_id, per_id) {
-            let url = "{% url 'viecpro_deduplication:remove_member' group_id='111111' per_id='222222' %}".replace("111111", group_id).replace("222222", per_id);
-
-            //console.log("in remove Member");
-            //console.log(url);
-
-            let test = confirm(`do you really want to delete: Member ${per_id} from group: ${group_id} ?`);
-
-            if (test) {
-                $.ajax({
-                    url: url,
-                    type: "GET",
-                    beforeSend: function (request) {
-                        let csrftoken = getCookie("csrftoken");
-                        request.setRequestHeader("X-CSRFToken", csrftoken);
-                    }, success: function (data) {
-                        //console.log(JSON.stringify(data));
-                        updates = data.data;
-                        for ([k, v] of Object.entries(updates)) {
-                            if (v != 0) {
-                                //getGroupAjax(group_id, true);
-                                $(`#group_member_item_${per_id}`).remove();
-                            } else {
-                                $(`#group_data_${k}`).remove();
-                                //SELECTED_GROUPS.pop(group_id);  // TODO: CHANGE THIS
-                                SELECTED_GROUPS = removeFromArray(SELECTED_GROUPS, group_id);
-
-                            }
-                            updateGroupCountBadges(k, v);
-                        }
-
-                        if (SELECTED_MEMBERS[group_id].length == 1) {
-                            delete SELECTED_MEMBERS[group_id];
-                        } else {
-                            //SELECTED_MEMBERS[group_id].pop(per_id); // TODO: CHANGE THIS
-                            //console.log("in remove member, before selected members set")
-                            SELECTED_MEMBERS[group_id] = removeFromArray(SELECTED_MEMBERS[group_id], per_id);
-                            // let keep = [...SELECTED_MEMBERS[group_id]];
-                            // delete SELECTED_MEMBERS[group_id];
-                            // SELECTED_MEMBERS[group_id].forEach((id) => {
-                            //     document.getElementById(`select_toggle_button_${id}`).style.backgroundColor="lightblue";
-
-                            // })
-                        }
-
-                        checkGroupButton();
-
-                    }
-                })
-            }
-        }
-    </script>
-
-    <script>
-
-        function MergeGroupsAndRemergeDispatcher(response) {
-            merge_groups_data = response.group_data
-            new_group_id = merge_groups_data.add[0]
-            console.log("in MergeGroups Dispatcher, new_group_id: ", new_group_id, typeof (new_group_id))
-
-            console.log(merge_groups_data)
-            groups_to_delete = merge_groups_data.groups_to_delete
-            RenderMergeGroupsOutcome(merge_groups_data)
-            AWAIT_REMERGE_RESULT = true
-            remergeGroup(new_group_id, groups_to_delete = groups_to_delete, ask_for_confirmation = false)
-
-            function PingRemergeResult(merge_groups_data) {
-                if (AWAIT_REMERGE_RESULT) {
-                    console.log("waiting for result....")
-                    setTimeout(PingRemergeResult, 1000, merge_groups_data = merge_groups_data)
-
-                } else {
-                    RenderMergeGroupsOutcome(merge_groups_data)
-                }
-            }
-            console.log("set initial timeout to ping for remerge result")
-            setTimeout(PingRemergeResult, 10000, merge_groups_data = merge_groups_data)
-        }
-
-        function RenderMergeGroupsOutcome(data) {
-            addGroupToList(data.add[0], data.add[1], data.add[2]);
-            $("#relations_group_section").empty();
-            $("#relations_single_section").empty();
-            $("#detail_section").empty();
-
-            SELECTED_GROUPS = [];
-            SELECTED_MEMBERS = {};
-            SELECTED_SINGLES = [];
-            data.remove_groups.forEach(el => { $(`#li_group_${el}`).remove(); })
-
-            data.remove_singles.forEach(el => { $(`#single_list_item_${el}`).remove(); })
-            checkMergeButton();
-            checkSinglesHeader();
-
-            //console.log("data.add zero is: ", data.add[0])
-            toggleItemSelect(`${data.add[0]}`);
-            renderItemSelect();
-            renderSinglesSelect();
-        }
-
-
-
-
-        function mergeGroups() {
-            let url = "{% url 'viecpro_deduplication:merge_groups' %}";
-            //console.log("Selected Groups is:", SELECTED_GROUPS);
-            //console.log("SELECTED_GROUPS after adding singles is:", SELECTED_GROUPS)
-            let sug = suggestGroupName();
-
-            let name = prompt("INFO: this will create a new group from all visible groups and singles.\nThe new group will also be merged into a new vorfin. Existing vorfin-rels will be preserved. But all old vorfins of groups in this merge will be deleted after the new vorfin is created.\n\nEnter new name for merged Group (Note: this is not the name of the resulting vorfin):", sug);
-            data = JSON.stringify({ "groups": SELECTED_GROUPS, "singles": SELECTED_SINGLES, "new_name": name })
-            if (name === null || name == "") {
-                //console.log("prompt was null");
-            } else {
-                toggleLoading("visible");
-                $.ajax({
-                    url: url,
-                    type: "POST",
-                    dataType: "json",
-                    data: { "DATA": data },
-                    beforeSend: function (request) {
-                        let csrftoken = getCookie("csrftoken");
-                        request.setRequestHeader("X-CSRFToken", csrftoken);
-                    },
-                    success: function (response) {
-
-                        setTimeout(pollCeleryStatus, 2000, task_id = response.task_id, url = CELERY_ENDPOINTS_viecpro_deduplication.merge_groups, task_name = "merge_groups")
-                    }
-                })
-            }
-        }
-
-        // function mergeGroupsOLD() {
-        //     let url = "{% url 'viecpro_deduplication:merge_groups' %}";
-        //     //console.log("Selected Groups is:", SELECTED_GROUPS);
-        //     //console.log("SELECTED_GROUPS after adding singles is:", SELECTED_GROUPS)
-        //     let sug = suggestGroupName();
-
-        //     let name = prompt("INFO: this will create a new group from all visible groups and singles.\nThe new group will also be merged into a new vorfin. Existing vorfin-rels will be preserved. But all old vorfins of groups in this merge will be deleted after the new vorfin is created.\n\nEnter new name for merged Group (Note: this is not the name of the resulting vorfin):", sug);
-        //     data = JSON.stringify({ "groups": SELECTED_GROUPS, "singles": SELECTED_SINGLES, "new_name": name })
-        //     if (name === null || name == "") {
-        //         //console.log("prompt was null");
-        //     } else {
-        //         toggleLoading("visible");
-        //         $.ajax({
-        //             url: url,
-        //             type: "POST",
-        //             dataType: "json",
-        //             data: { "DATA": data },
-        //             beforeSend: function (request) {
-        //                 let csrftoken = getCookie("csrftoken");
-        //                 request.setRequestHeader("X-CSRFToken", csrftoken);
-        //             },
-        //             success: function (response_dict) {
-        //                 // TODO: add polling here to
-
-        //                 // THIS LINE IS NEW, to map to the subdict
-        //                 data = response_dict.group_data
-
-        //                 addGroupToList(data.add[0], data.add[1], data.add[2]);
-        //                 $("#relations_group_section").empty();
-        //                 $("#relations_single_section").empty();
-        //                 $("#detail_section").empty();
-
-        //                 SELECTED_GROUPS = [];
-        //                 SELECTED_MEMBERS = {};
-        //                 SELECTED_SINGLES = [];
-        //                 data.remove_groups.forEach(el => { $(`#li_group_${el}`).remove(); })
-
-        //                 data.remove_singles.forEach(el => { $(`#single_list_item_${el}`).remove(); })
-        //                 checkMergeButton();
-        //                 checkSinglesHeader();
-
-        //                 //console.log("data.add zero is: ", data.add[0])
-        //                 toggleItemSelect(`${data.add[0]}`);
-        //                 renderItemSelect();
-        //                 renderSinglesSelect();
-
-        //                 // THIS LINE IS NEW, to map to subdict of remerge data
-        //                 remerge_data = response_dict.remerge_data
-
-
-        //                 // THIS LINE IS NEW; to render remerge outcume
-        //                 renderRemergeOutcome(rem_data)
-        //                 //todo: create listspan; empty selection_section, request newly created group
-        //             }
-        //         })
-        //     }
-        // }
-    </script>
-
-    <script>
-        function manageSelection(group_id, member_id) {
-
-            if (SELECTED_MEMBERS[group_id]) {
-                //console.log("group existed in selected members");
-                SELECTED_MEMBERS[group_id].push(member_id);
-            } else {
-                //console.log("group didn't exist in selected members");
-                SELECTED_MEMBERS[group_id] = [member_id];
-            }
-        }
-
-
-
-
-        // function toggleSingleSelectOLD(id){
-        //     //console.log("clicked Toggle Single Select for id: ", id);
-
-        //     let target_item = document.getElementById(`single_list_item_${id}`);
-        //     //console.log("target item is:", target_item);
-        //     //console.log("element is in selected Singles", SELECTED_SINGLES.includes(parseInt(id)));
-
-        //     if (!target_item && SELECTED_SINGLES.includes(parseInt(id))){
-        //         $(`#single_data_${id}`).remove();
-        //         SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, id);
-
-        //         //SELECTED_MEMBERS["singles"].pop(id); // TODO: CHANGE THIS
-        //         if (SELECTED_MEMBERS["singles"]){
-        //         SELECTED_MEMBERS["singles"] = removeFromArray(SELECTED_MEMBERS["singles"], id);
-        //         if (SELECTED_MEMBERS["singles"].length == 0) {
-        //             delete SELECTED_MEMBERS["singles"];
-
-
-        //     }
-        //     }
-        // }
-        //     else if (target_item.style.backgroundColor != "lightblue") {
-        //         target_item.style.backgroundColor = "lightblue";
-
-        //         if (!SELECTED_SINGLES.includes(id)){
-        //         SELECTED_SINGLES.push(id);
-
-        //     getSinglesAjax(id);
-        //         }
-        //     } else {
-        //         $(`#single_data_${id}`).remove();
-        //         target_item.style.backgroundColor = "white";
-        //         //SELECTED_SINGLES.pop(id); // TODO CHANGE THIS!!!!
-        //         SELECTED_SINGLES = removeFromArray(SELECTED_SINGLES, id);
-
-        //         //SELECTED_MEMBERS["singles"].pop(id); // TODO: CHANGE THIS
-        //         if (SELECTED_MEMBERS["singles"]){
-        //         SELECTED_MEMBERS["singles"] = removeFromArray(SELECTED_MEMBERS["singles"], id);
-        //         if (SELECTED_MEMBERS["singles"].length == 0) {
-        //             delete SELECTED_MEMBERS["singles"];
-        //         }
-        //     }
-
-        //     }
-        //     //console.log("clicked: ", id);
-        //     checkMergeButton();
-        //     checkGroupButton();
-        //     checkSinglesHeader();
-
-
-        // }
-
-
-        function renameGroup(group_id, group_name) {
-            let new_name = prompt("Rename Group to:", group_name);
-            let url = "{% url 'viecpro_deduplication:rename_group' %}";
-            let data = JSON.stringify({ "new_name": new_name, "g_id": group_id });
-            if (new_name) {
-                $.ajax({
-                    url: url,
-                    type: "POST",
-                    data: { "data": data },
-                    beforeSend: function (request) {
-                        let csrftoken = getCookie("csrftoken");
-                        request.setRequestHeader("X-CSRFToken", csrftoken);
-                    },
-                    success: function (res) {
-
-                        getGroupAjax(group_id, update = true);
-                        $(`#li_group_${group_id}`).replaceWith(`<li class="left_group_list_item list-group-item group_list_item_ list-group-item-sm d-flex justify-content-between align-items-center" onclick="toggleItemSelect('${group_id}')" id="li_group_${group_id}">${group_id} ${res.data.new_name}
-            <span class="badge badge-primary badge-pill" id="group_count_badge_${group_id}">${res.data.count}</span> </li>`)
-                        renderItemSelect();
-                        // todo: implement callback on renaming Groups 
-
-                    }
-
-                })
-            } else {
-            }
-
-        }
-
-        $(".member_list_class").mouseenter(function (el) {
-            //console.log("el:", el)
-            el.children().each((d) => {
-                d.hide();
-            })
-        })
-        function getSinglesAjax(single_id) {
-            let url = "{% url 'viecpro_deduplication:get_single_ajax' s_id='123456' %}".replace("123456", single_id);
-
-            $.ajax({
-                url: url,
-                type: "GET",
-                beforeSend: function (request) {
-                    let csrftoken = getCookie("csrftoken");
-                    request.setRequestHeader("X-CSRFToken", csrftoken);
-                },
-                success: function (data) {
-                    $("#relations_single_section").append(data.html);
-
-                }
-            })
-        }
-
-
-        function checkGroupButton() {
-            let cross_btn = $("#cross_group_create_button");
-
-            let select_count = 0;
-            Object.entries(SELECTED_MEMBERS).forEach(function ([key, value]) {
-                select_count += value.length;
-            })
-
-            if (select_count > 1) {
-                //console.log("checkGroup Button is True")
-                cross_btn.show();
-
-            } else {
-                //console.log("checkGroup Button is False")
-                cross_btn.hide();
-            }
-        }
-
-        function toggleMemberSelect(group_id, member_id) {
-            let el = event.target;
-
-            //let action_span = $(`#span_group_actions_${group_id}`);
-            let cross_btn = $("#cross_group_create_button");
-            if (el.style.backgroundColor != "lightblue") {
-                manageSelection(group_id, member_id);
-
-                el.style.backgroundColor = "lightblue";
-                //let test = action_span.children(".group_action_button").show();
-                //cross_btn.show();
-            }
-            else {
-                el.style.backgroundColor = "inherit";
-                //SELECTED_MEMBERS[group_id].pop(member_id); // TODO: CHANGE THIS
-                SELECTED_MEMBERS[group_id] = removeFromArray(SELECTED_MEMBERS[group_id], member_id);
-
-                if (SELECTED_MEMBERS[group_id].length == 0) {
-                    delete SELECTED_MEMBERS[group_id];
-                    //let test = action_span.children(".group_action_button").hide();
-                    //     if (Object.keys(SELECTED_MEMBERS).length <= 1){
-                    //     cross_btn.hide();}
-
-
-                }
-            }
-            checkGroupButton();
-
-            //console.log(SELECTED_MEMBERS);
-        }
-    </script>
-
-
-    <script>
-
-        let singlesData = "{{singles|escapejs}}";
-
-        function filterSingles() {
-            let text = $("#input_search").val();
-            text = text.toLowerCase();
-            let filteredData = singlesData.filter((n) =>
-                n[1].toLowerCase().startsWith(text)
-            );
-
-            renderSingles(filteredData);
-        }
-
-    </script>
-
-    <script>
-        // function getSinglesData(){
-        //     let url= "{% url 'viecpro_deduplication:get_singles' %}";
-        //     $.ajax({
-        //         url: url,
-        //         type:"GET",
-        //         beforeSend: function (request){
-        //             let csrftoken = getCookie("csrftoken");
-        //             request.setRequestHeader("X-CSRFToken", csrftoken);
-        //         },
-        //         success: function(data){
-        //             singlesData = data.singles;
-        //             //console.log("singlesData set");
-        //             renderSingles(singlesData);
-        //         }
-        //     })
-        // }
-
-        function renderSingles(data) {
-            let container = $("#singles_container");
-            let count = data.length
-
-            $("#filtered_count").text(count);
-
-            container.empty();
-
-            data.forEach((el) => {
-                container.append(`<li class="left_singles_item list-group-item group_list_item_ single-list-item list-group-item-sm d-flex justify-content-between align-items-center" id="single_list_item_${el[0]}" onclick="toggleSingleSelect(${el[0]})">
-                         ${el[1]}, ${el[2]}</li>`)
-            })
-
-            // todo: check if this is still needed
-
-            // SELECTED_SINGLES.forEach((id) => {
-            //     let target_item = document.getElementById(`single_list_item_${id}`);
-            //     if (target_item){
-            //     target_item.style.backgroundColor = "lightblue";
-            //     } else{
-            //         //console.log("in render singles, target item was false for: ", id);
-            //     }
-
-
-            // }
-            //     );
-
-            // for ([k, v] of Object.entries(data)){
-            //     container.append(`<li class="list-group-item single-list-item list-group-item-sm d-flex justify-content-between align-items-center" id="single_list_item_${k}">
-            //                 ${v.name}, ${v.first_name}
-            //             </li>`)
-            // }
-        }
-
-        $("#input_search").on("keyup", function (e) {
-            // if ($("#input_search").val().length >= 2){
-            // filterSingles();
-            // }
-            if (e.key === "Enter" || e.keyCode === 13) {
-                //filterSingles();
-                //let text = $("#input_search").val();
-
-                requestSingles();
-            }
-        })
-
-        $("#search_groups").on("keyup", function (e) {
-            // if ($("#input_search").val().length >= 2){
-            // filterSingles();
-            // }
-            if (e.key === "Enter" || e.keyCode === 13) {
-                //filterSingles();
-                //let text = $("#input_search").val();
-
-                requestGroups();
-            }
-        })
-
-        function getInputVal() {
-            let name = $("#input_search").val();
-            let first_name = $("#filter_first_name").val();
-
-            name = name ? name : false;
-            first_name = first_name ? first_name : false;
-
-            if (name) {
-                name = name.replaceAll(" ", "__");
-            }
-            if (first_name) {
-                first_name = first_name.replaceAll(" ", "__");
-            }
-            return [name, first_name]
-
-        }
-
-        $("#filter_first_name").on("keyup", function (e) {
-            // if ($("#input_search").val().length >= 2){
-            // filterSingles();
-            // }
-            if (e.key === "Enter" || e.keyCode === 13) {
-                //filterSingles();
-                //let text = $("#filter_first_name").val();
-
-                requestSingles();
-            }
-        })
-
-        function requestSingles() {
-            let values = getInputVal();
-            let gender = $('input[name=genderCheckSingle]:checked').val()
-
-
-            if (true) {
-                let url = "{% url 'viecpro_deduplication:get_singles' val_name='xxxxx' val_first='yyyyy' gender='ffffffff'%}".replace("xxxxx", values[0]).replace("yyyyy", values[1]).replace('ffffffff', gender);
-                $.ajax({
-                    url: url,
-                    type: "GET",
-                    beforeSend: function (request) {
-                        let csrftoken = getCookie("csrftoken");
-                        request.setRequestHeader("X-CSRFToken", csrftoken);
-                    },
-                    success: function (response) {
-                        renderSingles(response.singles);
-                        renderSinglesSelect();
-                    }
-
-                })
-            }
-
-        }
-
-        function requestGroups() {
-            let value = $("#search_groups").val();
-            value = value.replaceAll(" ", "__");
-
-
-            let gender = $('input[name=genderCheckGroup]:checked').val()
-            //console.log("request Groups called")
-
-            let status_values = JSON.stringify(getStatusButtonStatus())
-
-
-            if (value.length === 0 || value === "") {
-                value = "get_all_groups"
-                //console.log("value was: ", value)
-
-            }
-
-            if (true) {
-                let url = "{% url 'viecpro_deduplication:get_groups' val='xxxxx' gender='ffffffff' %}".replace("xxxxx", value).replace("ffffffff", gender);
-
-                $.ajax({
-                    url: url,
-                    type: "GET",
-                    data: { "data": status_values },
-                    beforeSend: function (request) {
-                        let csrftoken = getCookie("csrftoken");
-                        request.setRequestHeader("X-CSRFToken", csrftoken);
-                    },
-                    success: function (response) {
-                        let container = $("#group_list_container");
-                        container.html(response.html);
-                        $("#group_count_container").html(response.group_count)
-                        renderItemSelect();
-                        checkMergeButton();
-                        // SELECTED_GROUPS.forEach((id) => {
-                        //     let target_item = document.getElementById(`li_group_${id}`);
-
-                        //     if (target_item){
-                        //     target_item.style.backgroundColor = "lightblue";
-                        //     }
-                        //toggleItemSelect(id)
-                    }
-                    //             );
-                    //    }
-
-                })
-            }
-        }
-
-
-
-
-
-    </script>
-
-    <style>
-        #table_test {
-            font-size: 13px !important;
-            padding-left: 2rem;
-            padding-right: 2rem;
-        }
-
-        #loading_anim {
-            visibility: hidden;
-            /* -webkit-animation: fadeInFromNone 0.5s ease-out;
-            -moz-animation: fadeInFromNone 0.5s ease-out;
-            -o-animation: fadeInFromNone 0.5s ease-out; */
-            animation: fadeInFadeOut 2s linear alternate infinite;
-        }
-
-
-
-        @keyframes fadeInFadeOut {
-            0% {
-                opacity: .1;
-            }
-
-            50% {
-                opacity: 0.5;
-            }
-
-            100% {
-                opacity: 1;
-            }
-        }
-    </style>
-
-    {% endblock %}
\ No newline at end of file
diff --git a/viecpro_import/migrations/0001_initial.py b/viecpro_import/migrations/0001_initial.py
deleted file mode 100644
index 1d901445..00000000
--- a/viecpro_import/migrations/0001_initial.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# Generated by Django 3.2.18 on 2023-12-04 11:00
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('apis_vocabularies', '0002_texttype_lang'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('apis_entities', '0004_auto_20200722_1231'),
-        ('apis_metainfo', '0006_remove_text_lang'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='DataSource',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255)),
-                ('server_directory', models.CharField(max_length=255)),
-                ('page_count', models.IntegerField(blank=True, null=True)),
-                ('citation', models.TextField(blank=True, max_length=600, null=True)),
-                ('year', models.CharField(max_length=10)),
-                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'db_table': 'apis_import_project_datasource',
-            },
-        ),
-        migrations.CreateModel(
-            name='DataSourcePage',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('page_index', models.IntegerField()),
-                ('page_token', models.CharField(blank=True, max_length=20, null=True)),
-                ('DataSource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_import.datasource')),
-            ],
-            options={
-                'db_table': 'apis_import_project_datasourcepage',
-            },
-        ),
-        migrations.CreateModel(
-            name='GenericCollectionEntry',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
-            ],
-            options={
-                'db_table': 'apis_import_project_genericcollectionentry',
-            },
-        ),
-        migrations.CreateModel(
-            name='ImportProject',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255)),
-                ('description', models.TextField(blank=True, help_text='Describe your project here.', max_length=2000, null=True)),
-                ('DataSources', models.ManyToManyField(blank=True, help_text='Consider adding existing Datasources uploaded by you to this Project. Or upload/add additional Datasources later.', to='viecpro_import.DataSource')),
-                ('Editors', models.ManyToManyField(blank=True, help_text='Add users that should be able to edit this project.', related_name='Editors', to=settings.AUTH_USER_MODEL)),
-                ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_metainfo.collection')),
-                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='owner', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'db_table': 'apis_import_project_importproject',
-            },
-        ),
-        migrations.CreateModel(
-            name='PageCollection',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_in', models.ManyToManyField(related_name='created', to='viecpro_import.GenericCollectionEntry')),
-                ('edited_in', models.ManyToManyField(related_name='edited', to='viecpro_import.GenericCollectionEntry')),
-            ],
-            options={
-                'db_table': 'apis_import_project_pagecollection',
-            },
-        ),
-        migrations.CreateModel(
-            name='ProjectState',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('last_datasource', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='viecpro_import.datasource')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_import.importproject')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'db_table': 'apis_import_project_projectstate',
-            },
-        ),
-        migrations.CreateModel(
-            name='ProjectCollectionEntry',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('json', models.TextField(blank=True)),
-                ('entry', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='last_json', to='viecpro_import.genericcollectionentry')),
-                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='viecpro_import.importproject')),
-            ],
-            options={
-                'db_table': 'apis_import_project_projectcollectionentry',
-            },
-        ),
-        migrations.CreateModel(
-            name='PageData',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('collection', models.OneToOneField(auto_created=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='viecpro_import.pagecollection')),
-                ('function', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_vocabularies.personinstitutionrelation')),
-                ('institution', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_entities.institution')),
-                ('page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_import.datasourcepage')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='viecpro_import.importproject')),
-            ],
-            options={
-                'db_table': 'apis_import_project_pagedata',
-            },
-        ),
-        migrations.CreateModel(
-            name='DataSourceProjectState',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('datasource', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='viecpro_import.datasource')),
-                ('last_page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='viecpro_import.datasourcepage')),
-                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='viecpro_import.importproject')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'db_table': 'apis_import_project_datasourceprojectstate',
-            },
-        ),
-    ]
diff --git a/viecpro_import/migrations/__init__.py b/viecpro_import/migrations/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/viecpro_import/templates/element_templates/custom_ajax_form_generic.html b/viecpro_import/templates/element_templates/custom_ajax_form_generic.html
deleted file mode 100644
index b674a87f..00000000
--- a/viecpro_import/templates/element_templates/custom_ajax_form_generic.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="div_{{type1}}{{InstanceID}}">
-<form action="{% if ObjectID %}{% url 'viecpro_import:relation_update_or_create' entity_type type1 SiteID ObjectID %}{% else %}{% url 'viecpro_import:relation_update_or_create'  entity_type type1 SiteID %}{% endif %}" enctype="multipart/form-data" method="post" id="form_{{type1}}" class="form pdf_tool_form {{url2}}" data-replace="#message-form">
-    {% load crispy_forms_tags %}
-    {% crispy form form.helper %}
-    <div class="form-actions">
-        <button type="submit" class="btn btn-primary btn-sm">{{button_text}}</button>
-    </div>
-</form>
-</div>
\ No newline at end of file
diff --git a/webpage/templates/webpage/base.html b/webpage/templates/webpage/base.html
index fa3276d9..132d5a10 100644
--- a/webpage/templates/webpage/base.html
+++ b/webpage/templates/webpage/base.html
@@ -247,7 +247,7 @@
                     >
                   </div>
                 </li>
-                {% endif %} {% if "viecpro_import" in APPS%}
+                {% endif %} {% if "apis_import_project" in APPS%}
                 <li class="nav-item dropdown">
                   <a
                     href="#"
@@ -265,12 +265,12 @@
                   >
                     <a
                       class="dropdown-item"
-                      href="{% url 'viecpro_import:project_main' %}"
+                      href="{% url 'apis_import_project:project_main' %}"
                       >Projects</a
                     >
                   </div>
                 </li>
-                {% endif %} {% if "viecpro_deduplication" in APPS%}
+                {% endif %} {% if "dubletten_tool" in APPS%}
                 <li class="nav-item dropdown">
                   <a
                     href="#"
@@ -288,12 +288,12 @@
                   >
                     <a
                       class="nav-link"
-                      href="{% url 'viecpro_deduplication:tool_page' %}"
+                      href="{% url 'dubletten_tool:tool_page' %}"
                       >Dubletten Tool</a
                     >
                     <a
                       class="nav-link"
-                      href="{% url 'viecpro_deduplication:tool_merge' %}"
+                      href="{% url 'dubletten_tool:tool_merge' %}"
                       >Edit Merges</a
                     >
                   </div>
@@ -324,7 +324,8 @@
                     {% endfor %}
                   </div>
                 </li>
-                {% if user.is_authenticated and "apis_ampel" in APPS %}
+                {% if user.is_authenticated and "apis_ampel" in APPS
+                %}
 
                 <li class="nav-item dropdown">
                   <a

From f88ad060f8e5a9e2d9de6ae89cdb66cd7d531884 Mon Sep 17 00:00:00 2001
From: Gregor Pirgie <gregor.pirgie@oeaw.ac.at>
Date: Fri, 1 Mar 2024 14:05:31 +0100
Subject: [PATCH 2/6] breaking-change: restore correct migrations

---
 .../migrations/0001_initial.py                | 108 ++++++++++++++++++
 apis_import_project/migrations/__init__.py    |   0
 dubletten_tool/migrations/0001_initial.py     |  90 +++++++++++++++
 .../migrations/0002_dublettenlog.py           |  26 +++++
 dubletten_tool/migrations/0003_ampel.py       |  23 ++++
 .../migrations/0004_auto_20221026_1855.py     |  29 +++++
 .../migrations/0005_alter_ampel_status.py     |  18 +++
 .../migrations/0006_delete_ampel.py           |  16 +++
 .../migrations/0007_group_vorfin.py           |  20 ++++
 .../migrations/0008_alter_group_vorfin.py     |  20 ++++
 dubletten_tool/migrations/__init__.py         |   0
 11 files changed, 350 insertions(+)
 create mode 100644 apis_import_project/migrations/0001_initial.py
 create mode 100644 apis_import_project/migrations/__init__.py
 create mode 100644 dubletten_tool/migrations/0001_initial.py
 create mode 100644 dubletten_tool/migrations/0002_dublettenlog.py
 create mode 100644 dubletten_tool/migrations/0003_ampel.py
 create mode 100644 dubletten_tool/migrations/0004_auto_20221026_1855.py
 create mode 100644 dubletten_tool/migrations/0005_alter_ampel_status.py
 create mode 100644 dubletten_tool/migrations/0006_delete_ampel.py
 create mode 100644 dubletten_tool/migrations/0007_group_vorfin.py
 create mode 100644 dubletten_tool/migrations/0008_alter_group_vorfin.py
 create mode 100644 dubletten_tool/migrations/__init__.py

diff --git a/apis_import_project/migrations/0001_initial.py b/apis_import_project/migrations/0001_initial.py
new file mode 100644
index 00000000..12836c08
--- /dev/null
+++ b/apis_import_project/migrations/0001_initial.py
@@ -0,0 +1,108 @@
+# Generated by Django 2.2.11 on 2022-03-09 20:12
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('apis_vocabularies', '0002_texttype_lang'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('apis_metainfo', '0006_remove_text_lang'),
+        ('apis_entities', '0004_auto_20200722_1231'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DataSource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('server_directory', models.CharField(max_length=255)),
+                ('page_count', models.IntegerField(blank=True, null=True)),
+                ('citation', models.TextField(blank=True, max_length=600, null=True)),
+                ('year', models.CharField(max_length=10)),
+                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DataSourcePage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('page_index', models.IntegerField()),
+                ('page_token', models.CharField(blank=True, max_length=20, null=True)),
+                ('DataSource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='apis_import_project.DataSource')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='GenericCollectionEntry',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ImportProject',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True, help_text='Describe your project here.', max_length=2000, null=True)),
+                ('DataSources', models.ManyToManyField(blank=True, help_text='Consider adding existing Datasources uploaded by you to this Project. Or upload/add additional Datasources later.', to='apis_import_project.DataSource')),
+                ('Editors', models.ManyToManyField(blank=True, help_text='Add users that should be able to edit this project.', related_name='Editors', to=settings.AUTH_USER_MODEL)),
+                ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_metainfo.Collection')),
+                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='owner', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PageCollection',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_in', models.ManyToManyField(related_name='created', to='apis_import_project.GenericCollectionEntry')),
+                ('edited_in', models.ManyToManyField(related_name='edited', to='apis_import_project.GenericCollectionEntry')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProjectState',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('last_datasource', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_import_project.DataSource')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='apis_import_project.ImportProject')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProjectCollectionEntry',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('json', models.TextField(blank=True)),
+                ('entry', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='last_json', to='apis_import_project.GenericCollectionEntry')),
+                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='apis_import_project.ImportProject')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PageData',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('collection', models.OneToOneField(auto_created=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_import_project.PageCollection')),
+                ('function', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_vocabularies.PersonInstitutionRelation')),
+                ('institution', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_entities.Institution')),
+                ('page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='apis_import_project.DataSourcePage')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='apis_import_project.ImportProject')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DataSourceProjectState',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('datasource', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='apis_import_project.DataSource')),
+                ('last_page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_import_project.DataSourcePage')),
+                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='apis_import_project.ImportProject')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/apis_import_project/migrations/__init__.py b/apis_import_project/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/dubletten_tool/migrations/0001_initial.py b/dubletten_tool/migrations/0001_initial.py
new file mode 100644
index 00000000..a2a5d22d
--- /dev/null
+++ b/dubletten_tool/migrations/0001_initial.py
@@ -0,0 +1,90 @@
+# Generated by Django 3.1.14 on 2022-05-17 06:03
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('apis_entities', '0004_auto_20200722_1231'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Group',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=600)),
+                ('status', models.CharField(choices=[('unchecked', 'unchecked'), ('checked group', 'checked group'), ('checked for other groups', 'checked for other groups'), ('checked all members', 'checked all members'), ('ready to merge', 'ready to merge'), ('merged', 'merged')], default='unchecked', max_length=300)),
+                ('_gender', models.CharField(blank=True, max_length=255, null=True)),
+                ('marked', models.BooleanField(default=False)),
+                ('note', models.TextField(blank=True, max_length=2000, null=True)),
+            ],
+            options={
+                'ordering': ['name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='PersonProxy',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('status', models.CharField(choices=[('candidate', 'Candidate'), ('single', 'Single'), ('merged', 'Merged')], default='single', max_length=300)),
+                ('marked', models.BooleanField(default=False)),
+                ('note', models.TextField(blank=True, max_length=2000, null=True)),
+                ('_names', models.JSONField(null=True)),
+                ('_first_names', models.JSONField(null=True)),
+                ('person', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='apis_entities.person')),
+            ],
+            options={
+                'ordering': ['person__name'],
+            },
+        ),
+        migrations.CreateModel(
+            name='StatusButtonGroupType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=600)),
+                ('short', models.CharField(default='BT', max_length=4)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='StatusButtonProxyType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=600)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Suggestions',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('data', models.JSONField(blank=True, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='StatusButtonProxy',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('value', models.BooleanField(default=False)),
+                ('kind', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dubletten_tool.statusbuttonproxytype')),
+                ('related_instance', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dubletten_tool.personproxy')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='StatusButtonGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('value', models.BooleanField(default=False)),
+                ('kind', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dubletten_tool.statusbuttongrouptype')),
+                ('related_instance', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dubletten_tool.group')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='group',
+            name='members',
+            field=models.ManyToManyField(blank=True, to='dubletten_tool.PersonProxy'),
+        ),
+    ]
diff --git a/dubletten_tool/migrations/0002_dublettenlog.py b/dubletten_tool/migrations/0002_dublettenlog.py
new file mode 100644
index 00000000..cd9fc439
--- /dev/null
+++ b/dubletten_tool/migrations/0002_dublettenlog.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.1.14 on 2022-06-01 14:14
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('dubletten_tool', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DublettenLOG',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('msg', models.TextField(max_length=600)),
+                ('action', models.CharField(max_length=255)),
+                ('timestamp', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/dubletten_tool/migrations/0003_ampel.py b/dubletten_tool/migrations/0003_ampel.py
new file mode 100644
index 00000000..d672c0cd
--- /dev/null
+++ b/dubletten_tool/migrations/0003_ampel.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2 on 2022-10-26 18:49
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apis_entities', '0004_auto_20200722_1231'),
+        ('dubletten_tool', '0002_dublettenlog'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Ampel',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('note', models.TextField(blank=True, max_length=2000, null=True)),
+                ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='apis_entities.person')),
+            ],
+        ),
+    ]
diff --git a/dubletten_tool/migrations/0004_auto_20221026_1855.py b/dubletten_tool/migrations/0004_auto_20221026_1855.py
new file mode 100644
index 00000000..dc33aee8
--- /dev/null
+++ b/dubletten_tool/migrations/0004_auto_20221026_1855.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2 on 2022-10-26 18:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apis_entities', '0004_auto_20200722_1231'),
+        ('dubletten_tool', '0003_ampel'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ampel',
+            name='id',
+        ),
+        migrations.AddField(
+            model_name='ampel',
+            name='status',
+            field=models.CharField(choices=[('red', 'red'), ('yellow', 'yelow'), ('green', 'green')], default='red', max_length=300),
+        ),
+        migrations.AlterField(
+            model_name='ampel',
+            name='person',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='apis_entities.person'),
+        ),
+    ]
diff --git a/dubletten_tool/migrations/0005_alter_ampel_status.py b/dubletten_tool/migrations/0005_alter_ampel_status.py
new file mode 100644
index 00000000..75334707
--- /dev/null
+++ b/dubletten_tool/migrations/0005_alter_ampel_status.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2022-10-26 21:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dubletten_tool', '0004_auto_20221026_1855'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ampel',
+            name='status',
+            field=models.CharField(choices=[('red', 'red'), ('yellow', 'yellow'), ('green', 'green')], default='red', max_length=300),
+        ),
+    ]
diff --git a/dubletten_tool/migrations/0006_delete_ampel.py b/dubletten_tool/migrations/0006_delete_ampel.py
new file mode 100644
index 00000000..8766b241
--- /dev/null
+++ b/dubletten_tool/migrations/0006_delete_ampel.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.2 on 2022-11-22 08:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dubletten_tool', '0005_alter_ampel_status'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Ampel',
+        ),
+    ]
diff --git a/dubletten_tool/migrations/0007_group_vorfin.py b/dubletten_tool/migrations/0007_group_vorfin.py
new file mode 100644
index 00000000..790d758c
--- /dev/null
+++ b/dubletten_tool/migrations/0007_group_vorfin.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2 on 2022-11-23 11:21
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apis_entities', '0004_auto_20200722_1231'),
+        ('dubletten_tool', '0006_delete_ampel'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='vorfin',
+            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='apis_entities.person'),
+        ),
+    ]
diff --git a/dubletten_tool/migrations/0008_alter_group_vorfin.py b/dubletten_tool/migrations/0008_alter_group_vorfin.py
new file mode 100644
index 00000000..5fc2a279
--- /dev/null
+++ b/dubletten_tool/migrations/0008_alter_group_vorfin.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2 on 2022-11-23 11:24
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('apis_entities', '0004_auto_20200722_1231'),
+        ('dubletten_tool', '0007_group_vorfin'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='group',
+            name='vorfin',
+            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='merged_group', to='apis_entities.person'),
+        ),
+    ]
diff --git a/dubletten_tool/migrations/__init__.py b/dubletten_tool/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b

From 34eba630b6848fa56ade42a07f5d370a9cf58e55 Mon Sep 17 00:00:00 2001
From: Gregor Pirgie <gregor.pirgie@oeaw.ac.at>
Date: Fri, 1 Mar 2024 14:06:04 +0100
Subject: [PATCH 3/6] fix: fix broken dependencies

---
 poetry.lock    | 645 ++++++++++++++++++++++++++++---------------------
 pyproject.toml |  10 +-
 2 files changed, 372 insertions(+), 283 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index c99cd805..670efe26 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -19,7 +19,7 @@ vine = ">=5.0.0,<6.0.0"
 
 [[package]]
 name = "anyio"
-version = "4.2.0"
+version = "4.3.0"
 description = "High level compatibility layer for multiple asynchronous event loop implementations"
 category = "main"
 optional = false
@@ -65,11 +65,11 @@ python-versions = ">=3.6,<3.12"
 
 [[package]]
 name = "appnope"
-version = "0.1.3"
+version = "0.1.4"
 description = "Disable App Nap on macOS >= 10.9"
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "argon2-cffi"
@@ -103,6 +103,22 @@ cffi = ">=1.0.1"
 dev = ["pytest", "cogapp", "pre-commit", "wheel"]
 tests = ["pytest"]
 
+[[package]]
+name = "arrow"
+version = "1.3.0"
+description = "Better dates & times for Python"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+python-dateutil = ">=2.7.0"
+types-python-dateutil = ">=2.8.10"
+
+[package.extras]
+doc = ["doc8", "sphinx (>=7.0.0)", "sphinx-autobuild", "sphinx-autodoc-typehints", "sphinx_rtd_theme (>=1.3.0)"]
+test = ["dateparser (>=1.0.0,<2.0.0)", "pre-commit", "pytest", "pytest-cov", "pytest-mock", "pytz (==2021.1)", "simplejson (>=3.0.0,<4.0.0)"]
+
 [[package]]
 name = "asgiref"
 version = "3.7.2"
@@ -148,6 +164,17 @@ six = ">=1.12.0"
 astroid = ["astroid (>=1,<2)", "astroid (>=2,<4)"]
 test = ["pytest", "astroid (>=1,<2)", "astroid (>=2,<4)"]
 
+[[package]]
+name = "async-lru"
+version = "2.0.4"
+description = "Simple LRU cache for asyncio"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.11\""}
+
 [[package]]
 name = "async-timeout"
 version = "4.0.3"
@@ -172,6 +199,17 @@ tests = ["attrs", "zope-interface"]
 tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
 tests-no-zope = ["attrs", "cloudpickle", "hypothesis", "pympler", "pytest-xdist", "pytest (>=4.3.0)"]
 
+[[package]]
+name = "babel"
+version = "2.14.0"
+description = "Internationalization utilities"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+dev = ["pytest (>=6.0)", "pytest-cov", "freezegun (>=1.0,<2.0)"]
+
 [[package]]
 name = "beautifulsoup4"
 version = "4.12.3"
@@ -288,7 +326,7 @@ zstd = ["zstandard (==0.22.0)"]
 
 [[package]]
 name = "certifi"
-version = "2023.11.17"
+version = "2024.2.2"
 description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
@@ -404,7 +442,7 @@ tests = ["coverage"]
 
 [[package]]
 name = "debugpy"
-version = "1.8.0"
+version = "1.8.1"
 description = "An implementation of the Debug Adapter Protocol for Python"
 category = "main"
 optional = false
@@ -428,14 +466,15 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "dill"
-version = "0.3.7"
+version = "0.3.8"
 description = "serialize all of Python"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 
 [package.extras]
 graph = ["objgraph (>=1.7.2)"]
+profile = ["gprof2dot (>=2022.7.29)"]
 
 [[package]]
 name = "dj-database-url"
@@ -562,7 +601,7 @@ tests = ["pytest (<4.0)", "pytest-django", "pytest-flakes (==1.0.1)", "pytest-pe
 
 [[package]]
 name = "django-debug-toolbar"
-version = "4.2.0"
+version = "4.3.0"
 description = "A configurable set of panels that display various debug information about the current request/response."
 category = "main"
 optional = false
@@ -632,11 +671,11 @@ docs = ["sphinx", "sphinx-autobuild"]
 
 [[package]]
 name = "django-model-utils"
-version = "4.3.1"
+version = "4.4.0"
 description = "Django model mixins and utilities"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 
 [package.dependencies]
 Django = ">=3.2"
@@ -750,6 +789,14 @@ uritemplate = ">=2.0.0"
 offline = ["drf-spectacular-sidecar"]
 sidecar = ["drf-spectacular-sidecar"]
 
+[[package]]
+name = "et-xmlfile"
+version = "1.1.0"
+description = "An implementation of lxml.xmlfile for the standard library"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "exceptiongroup"
 version = "1.2.0"
@@ -796,6 +843,14 @@ mccabe = ">=0.7.0,<0.8.0"
 pycodestyle = ">=2.11.0,<2.12.0"
 pyflakes = ">=3.1.0,<3.2.0"
 
+[[package]]
+name = "fqdn"
+version = "1.5.1"
+description = "Validates fully-qualified domain names against RFC 1123, so that they are acceptable to modern bowsers"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0, !=3.1, !=3.2, !=3.3, !=3.4, <4"
+
 [[package]]
 name = "gunicorn"
 version = "20.1.0"
@@ -810,6 +865,53 @@ gevent = ["gevent (>=1.4.0)"]
 setproctitle = ["setproctitle"]
 tornado = ["tornado (>=0.2)"]
 
+[[package]]
+name = "h11"
+version = "0.14.0"
+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[[package]]
+name = "httpcore"
+version = "1.0.4"
+description = "A minimal low-level HTTP client."
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+certifi = "*"
+h11 = ">=0.13,<0.15"
+
+[package.extras]
+asyncio = ["anyio (>=4.0,<5.0)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (>=1.0.0,<2.0.0)"]
+trio = ["trio (>=0.22.0,<0.25.0)"]
+
+[[package]]
+name = "httpx"
+version = "0.27.0"
+description = "The next generation HTTP client."
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+anyio = "*"
+certifi = "*"
+httpcore = ">=1.0.0,<2.0.0"
+idna = "*"
+sniffio = "*"
+
+[package.extras]
+brotli = ["brotli", "brotlicffi"]
+cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10,<14)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (>=1.0.0,<2.0.0)"]
+
 [[package]]
 name = "idna"
 version = "3.6"
@@ -828,7 +930,7 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "ipykernel"
-version = "6.29.0"
+version = "6.29.3"
 description = "IPython Kernel for Jupyter"
 category = "main"
 optional = false
@@ -854,11 +956,11 @@ cov = ["coverage", "curio", "matplotlib", "pytest-cov", "trio"]
 docs = ["myst-parser", "pydata-sphinx-theme", "sphinx", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-spelling", "trio"]
 pyqt5 = ["pyqt5"]
 pyside6 = ["pyside6"]
-test = ["flaky", "ipyparallel", "pre-commit", "pytest-asyncio (==0.23.2)", "pytest-cov", "pytest-timeout", "pytest (>=7.0)"]
+test = ["flaky", "ipyparallel", "pre-commit", "pytest-asyncio (>=0.23.5)", "pytest-cov", "pytest-timeout", "pytest (>=7.0)"]
 
 [[package]]
 name = "ipython"
-version = "8.20.0"
+version = "8.22.1"
 description = "IPython: Productive Interactive Computing"
 category = "main"
 optional = false
@@ -870,61 +972,46 @@ decorator = "*"
 exceptiongroup = {version = "*", markers = "python_version < \"3.11\""}
 jedi = ">=0.16"
 matplotlib-inline = "*"
-pexpect = {version = ">4.3", markers = "sys_platform != \"win32\""}
+pexpect = {version = ">4.3", markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""}
 prompt-toolkit = ">=3.0.41,<3.1.0"
 pygments = ">=2.4.0"
 stack-data = "*"
-traitlets = ">=5"
+traitlets = ">=5.13.0"
 
 [package.extras]
-all = ["black", "ipykernel", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "docrepr", "matplotlib", "stack-data", "pytest", "typing-extensions", "exceptiongroup", "pytest-asyncio (<0.22)", "testpath", "pickleshare", "nbconvert", "nbformat", "ipywidgets", "notebook", "ipyparallel", "qtconsole", "curio", "matplotlib (!=3.2.0)", "numpy (>=1.23)", "pandas", "trio"]
+all = ["ipython", "ipython"]
 black = ["black"]
-doc = ["ipykernel", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "docrepr", "matplotlib", "stack-data", "pytest", "typing-extensions", "exceptiongroup", "pytest-asyncio (<0.22)", "testpath", "pickleshare"]
+doc = ["ipykernel", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinxcontrib-jquery", "docrepr", "matplotlib", "stack-data", "typing-extensions", "exceptiongroup", "ipython"]
 kernel = ["ipykernel"]
 nbconvert = ["nbconvert"]
 nbformat = ["nbformat"]
 notebook = ["ipywidgets", "notebook"]
 parallel = ["ipyparallel"]
 qtconsole = ["qtconsole"]
-test = ["pytest", "pytest-asyncio (<0.22)", "testpath", "pickleshare"]
-test_extra = ["pytest", "pytest-asyncio (<0.22)", "testpath", "pickleshare", "curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.23)", "pandas", "trio"]
+test = ["pytest (<8)", "pytest-asyncio (<0.22)", "testpath", "pickleshare"]
+test_extra = ["ipython", "curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.23)", "pandas", "trio"]
 
 [[package]]
-name = "ipython-genutils"
-version = "0.2.0"
-description = "Vestigial utilities from IPython"
+name = "isodate"
+version = "0.6.1"
+description = "An ISO 8601 date/time/duration parser and formatter"
 category = "main"
 optional = false
 python-versions = "*"
 
-[[package]]
-name = "ipywidgets"
-version = "8.1.1"
-description = "Jupyter interactive widgets"
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
 [package.dependencies]
-comm = ">=0.1.3"
-ipython = ">=6.1.0"
-jupyterlab-widgets = ">=3.0.9,<3.1.0"
-traitlets = ">=4.3.1"
-widgetsnbextension = ">=4.0.9,<4.1.0"
-
-[package.extras]
-test = ["jsonschema", "ipykernel", "pytest (>=3.6.0)", "pytest-cov", "pytz"]
+six = "*"
 
 [[package]]
-name = "isodate"
-version = "0.6.1"
-description = "An ISO 8601 date/time/duration parser and formatter"
+name = "isoduration"
+version = "20.11.0"
+description = "Operations with ISO 8601 durations"
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
 
 [package.dependencies]
-six = "*"
+arrow = ">=0.15.0"
 
 [[package]]
 name = "isort"
@@ -969,44 +1056,67 @@ i18n = ["Babel (>=2.7)"]
 
 [[package]]
 name = "jmespath"
-version = "0.10.0"
+version = "1.0.1"
 description = "JSON Matching Expressions"
 category = "main"
 optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+python-versions = ">=3.7"
+
+[[package]]
+name = "json5"
+version = "0.9.17"
+description = "A Python implementation of the JSON5 data format."
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.extras]
+dev = ["hypothesis"]
+
+[[package]]
+name = "jsonpointer"
+version = "2.4"
+description = "Identify specific nodes in a JSON document (RFC 6901)"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*"
 
 [[package]]
 name = "jsonschema"
-version = "3.2.0"
+version = "4.21.1"
 description = "An implementation of JSON Schema validation for Python"
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
 
 [package.dependencies]
-attrs = ">=17.4.0"
-pyrsistent = ">=0.14.0"
-six = ">=1.11.0"
+attrs = ">=22.2.0"
+fqdn = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+idna = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+isoduration = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+jsonpointer = {version = ">1.13", optional = true, markers = "extra == \"format-nongpl\""}
+jsonschema-specifications = ">=2023.03.6"
+referencing = ">=0.28.4"
+rfc3339-validator = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+rfc3986-validator = {version = ">0.1.0", optional = true, markers = "extra == \"format-nongpl\""}
+rpds-py = ">=0.7.1"
+uri-template = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+webcolors = {version = ">=1.11", optional = true, markers = "extra == \"format-nongpl\""}
 
 [package.extras]
-format = ["idna", "jsonpointer (>1.13)", "rfc3987", "strict-rfc3339", "webcolors"]
-format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator (>0.1.0)", "rfc3339-validator"]
+format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"]
+format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"]
 
 [[package]]
-name = "jupyter"
-version = "1.0.0"
-description = "Jupyter metapackage. Install all the Jupyter components in one go."
+name = "jsonschema-specifications"
+version = "2023.12.1"
+description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
 
 [package.dependencies]
-ipykernel = "*"
-ipywidgets = "*"
-jupyter-console = "*"
-nbconvert = "*"
-notebook = "*"
-qtconsole = "*"
+referencing = ">=0.31.0"
 
 [[package]]
 name = "jupyter-client"
@@ -1027,27 +1137,6 @@ traitlets = ">=5.3"
 docs = ["ipykernel", "myst-parser", "pydata-sphinx-theme", "sphinx-autodoc-typehints", "sphinx (>=4)", "sphinxcontrib-github-alt", "sphinxcontrib-spelling"]
 test = ["coverage", "ipykernel (>=6.14)", "mypy", "paramiko", "pre-commit", "pytest", "pytest-cov", "pytest-jupyter[client] (>=0.4.1)", "pytest-timeout"]
 
-[[package]]
-name = "jupyter-console"
-version = "6.6.3"
-description = "Jupyter terminal console"
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-ipykernel = ">=6.14"
-ipython = "*"
-jupyter-client = ">=7.0.0"
-jupyter-core = ">=4.12,<5.0.0 || >=5.1.0"
-prompt-toolkit = ">=3.0.30"
-pygments = "*"
-pyzmq = ">=17"
-traitlets = ">=5.4"
-
-[package.extras]
-test = ["flaky", "pexpect", "pytest"]
-
 [[package]]
 name = "jupyter-core"
 version = "5.7.1"
@@ -1067,16 +1156,17 @@ test = ["ipykernel", "pre-commit", "pytest", "pytest-cov", "pytest-timeout"]
 
 [[package]]
 name = "jupyter-events"
-version = "0.6.3"
+version = "0.9.0"
 description = "Jupyter Event System library"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 
 [package.dependencies]
-jsonschema = {version = ">=3.2.0", extras = ["format-nongpl"]}
+jsonschema = {version = ">=4.18.0", extras = ["format-nongpl"]}
 python-json-logger = ">=2.0.4"
 pyyaml = ">=5.3"
+referencing = "*"
 rfc3339-validator = "*"
 rfc3986-validator = ">=0.1.1"
 traitlets = ">=5.3"
@@ -1084,11 +1174,22 @@ traitlets = ">=5.3"
 [package.extras]
 cli = ["click", "rich"]
 docs = ["jupyterlite-sphinx", "myst-parser", "pydata-sphinx-theme", "sphinxcontrib-spelling"]
-test = ["click", "coverage", "pre-commit", "pytest-asyncio (>=0.19.0)", "pytest-console-scripts", "pytest-cov", "pytest (>=7.0)", "rich"]
+test = ["click", "pre-commit", "pytest-asyncio (>=0.19.0)", "pytest-console-scripts", "pytest (>=7.0)", "rich"]
+
+[[package]]
+name = "jupyter-lsp"
+version = "2.2.3"
+description = "Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab server"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+jupyter-server = ">=1.1.2"
 
 [[package]]
 name = "jupyter-server"
-version = "2.10.0"
+version = "2.12.5"
 description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications."
 category = "main"
 optional = false
@@ -1100,7 +1201,7 @@ argon2-cffi = "*"
 jinja2 = "*"
 jupyter-client = ">=7.4.4"
 jupyter-core = ">=4.12,<5.0.0 || >=5.1.0"
-jupyter-events = ">=0.6.0"
+jupyter-events = ">=0.9.0"
 jupyter-server-terminals = "*"
 nbconvert = ">=6.4.4"
 nbformat = ">=5.3.0"
@@ -1121,7 +1222,7 @@ test = ["flaky", "ipykernel", "pre-commit", "pytest-console-scripts", "pytest-ju
 
 [[package]]
 name = "jupyter-server-terminals"
-version = "0.5.1"
+version = "0.5.2"
 description = "A Jupyter Server Extension Providing Terminals."
 category = "main"
 optional = false
@@ -1136,18 +1237,33 @@ docs = ["jinja2", "jupyter-server", "mistune (<4.0)", "myst-parser", "nbformat",
 test = ["jupyter-server (>=2.0.0)", "pytest-jupyter[server] (>=0.5.3)", "pytest-timeout", "pytest (>=7.0)"]
 
 [[package]]
-name = "jupyter-tabnine"
-version = "1.2.3"
-description = "Jupyter notebook extension which support coding auto-completion based on Deep Learning"
+name = "jupyterlab"
+version = "4.1.2"
+description = "JupyterLab computational environment"
 category = "main"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.8"
 
 [package.dependencies]
-ipython = "*"
+async-lru = ">=1.0.0"
+httpx = ">=0.25.0"
+ipykernel = "*"
+jinja2 = ">=3.0.3"
 jupyter-core = "*"
-nbconvert = "*"
-notebook = ">=4.2"
+jupyter-lsp = ">=2.0.0"
+jupyter-server = ">=2.4.0,<3"
+jupyterlab-server = ">=2.19.0,<3"
+notebook-shim = ">=0.2"
+packaging = "*"
+tomli = {version = "*", markers = "python_version < \"3.11\""}
+tornado = ">=6.2.0"
+traitlets = "*"
+
+[package.extras]
+dev = ["build", "bump2version", "coverage", "hatch", "pre-commit", "pytest-cov", "ruff (==0.2.0)"]
+docs = ["jsx-lexer", "myst-parser", "pydata-sphinx-theme (>=0.13.0)", "pytest", "pytest-check-links", "pytest-jupyter", "sphinx-copybutton", "sphinx (>=1.8,<7.3.0)"]
+docs-screenshots = ["altair (==5.2.0)", "ipython (==8.16.1)", "ipywidgets (==8.1.1)", "jupyterlab-geojson (==3.4.0)", "jupyterlab-language-pack-zh-cn (==4.0.post6)", "matplotlib (==3.8.2)", "nbconvert (>=7.0.0)", "pandas (==2.2.0)", "scipy (==1.12.0)", "vega-datasets (==0.9.0)"]
+test = ["coverage", "pytest-check-links (>=0.7)", "pytest-console-scripts", "pytest-cov", "pytest-jupyter (>=0.5.3)", "pytest-timeout", "pytest-tornasync", "pytest (>=7.0)", "requests", "requests-cache", "virtualenv"]
 
 [[package]]
 name = "jupyterlab-pygments"
@@ -1158,12 +1274,26 @@ optional = false
 python-versions = ">=3.8"
 
 [[package]]
-name = "jupyterlab-widgets"
-version = "3.0.9"
-description = "Jupyter interactive widgets for JupyterLab"
+name = "jupyterlab-server"
+version = "2.25.3"
+description = "A set of server components for JupyterLab and JupyterLab like applications."
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+
+[package.dependencies]
+babel = ">=2.10"
+jinja2 = ">=3.0.3"
+json5 = ">=0.9.0"
+jsonschema = ">=4.18.0"
+jupyter-server = ">=1.21,<3"
+packaging = ">=21.3"
+requests = ">=2.31"
+
+[package.extras]
+docs = ["autodoc-traits", "jinja2 (<3.2.0)", "mistune (<4)", "myst-parser", "pydata-sphinx-theme", "sphinx", "sphinx-copybutton", "sphinxcontrib-openapi (>0.8)"]
+openapi = ["openapi-core (>=0.18.0,<0.19.0)", "ruamel-yaml"]
+test = ["hatch", "ipykernel", "openapi-core (>=0.18.0,<0.19.0)", "openapi-spec-validator (>=0.6.0,<0.8.0)", "pytest-console-scripts", "pytest-cov", "pytest-jupyter[server] (>=0.6.2)", "pytest-timeout", "pytest (>=7.0)", "requests-mock", "ruamel-yaml", "sphinxcontrib-spelling", "strict-rfc3339", "werkzeug"]
 
 [[package]]
 name = "kombu"
@@ -1229,7 +1359,7 @@ source = ["Cython (==0.29.37)"]
 
 [[package]]
 name = "markupsafe"
-version = "2.1.3"
+version = "2.1.5"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "main"
 optional = false
@@ -1272,44 +1402,12 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "mysqlclient"
-version = "2.2.1"
+version = "2.2.4"
 description = "Python interface to MySQL"
 category = "main"
 optional = false
 python-versions = ">=3.8"
 
-[[package]]
-name = "nbclassic"
-version = "1.0.0"
-description = "Jupyter Notebook as a Jupyter Server extension."
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-argon2-cffi = "*"
-ipykernel = "*"
-ipython-genutils = "*"
-jinja2 = "*"
-jupyter-client = ">=6.1.1"
-jupyter-core = ">=4.6.1"
-jupyter-server = ">=1.8"
-nbconvert = ">=5"
-nbformat = "*"
-nest-asyncio = ">=1.5"
-notebook-shim = ">=0.2.3"
-prometheus-client = "*"
-pyzmq = ">=17"
-Send2Trash = ">=1.8.0"
-terminado = ">=0.8.3"
-tornado = ">=6.1"
-traitlets = ">=4.2.1"
-
-[package.extras]
-docs = ["sphinx", "nbsphinx", "sphinxcontrib-github-alt", "sphinx-rtd-theme", "myst-parser"]
-json-logging = ["json-logging"]
-test = ["pytest", "coverage", "requests", "testpath", "nbval", "pytest-playwright", "pytest-cov", "pytest-jupyter", "pytest-tornasync", "requests-unixsocket"]
-
 [[package]]
 name = "nbclient"
 version = "0.9.0"
@@ -1331,8 +1429,8 @@ test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>=
 
 [[package]]
 name = "nbconvert"
-version = "7.14.2"
-description = "Converting Jupyter Notebooks"
+version = "7.16.1"
+description = "Converting Jupyter Notebooks (.ipynb files) to other formats.  Output formats include asciidoc, html, latex, markdown, pdf, py, rst, script.  nbconvert can be used both as a Python library (`import nbconvert`) or as a command line tool (invoked as `jupyter nbconvert ...`)."
 category = "main"
 optional = false
 python-versions = ">=3.8"
@@ -1383,7 +1481,7 @@ test = ["pep440", "pre-commit", "pytest", "testpath"]
 
 [[package]]
 name = "nest-asyncio"
-version = "1.5.9"
+version = "1.6.0"
 description = "Patch asyncio to allow nested event loops"
 category = "main"
 optional = false
@@ -1391,46 +1489,18 @@ python-versions = ">=3.5"
 
 [[package]]
 name = "netaddr"
-version = "0.10.1"
+version = "1.2.1"
 description = "A network address manipulation library for Python"
 category = "main"
 optional = false
-python-versions = "*"
-
-[[package]]
-name = "notebook"
-version = "6.5.4"
-description = "A web-based notebook environment for interactive computing"
-category = "main"
-optional = false
 python-versions = ">=3.7"
 
-[package.dependencies]
-argon2-cffi = "*"
-ipykernel = "*"
-ipython-genutils = "*"
-jinja2 = "*"
-jupyter-client = ">=5.3.4"
-jupyter-core = ">=4.6.1"
-nbclassic = ">=0.4.7"
-nbconvert = ">=5"
-nbformat = "*"
-nest-asyncio = ">=1.5"
-prometheus-client = "*"
-pyzmq = ">=17"
-Send2Trash = ">=1.8.0"
-terminado = ">=0.8.3"
-tornado = ">=6.1"
-traitlets = ">=4.2.1"
-
 [package.extras]
-docs = ["sphinx", "nbsphinx", "sphinxcontrib-github-alt", "sphinx-rtd-theme", "myst-parser"]
-json-logging = ["json-logging"]
-test = ["pytest", "coverage", "requests", "testpath", "nbval", "selenium (==4.1.5)", "pytest-cov", "requests-unixsocket"]
+nicer-shell = ["ipython"]
 
 [[package]]
 name = "notebook-shim"
-version = "0.2.3"
+version = "0.2.4"
 description = "A shim layer for notebook traits and config"
 category = "main"
 optional = false
@@ -1444,15 +1514,26 @@ test = ["pytest", "pytest-console-scripts", "pytest-jupyter", "pytest-tornasync"
 
 [[package]]
 name = "numpy"
-version = "1.26.3"
+version = "1.26.4"
 description = "Fundamental package for array computing in Python"
 category = "main"
 optional = false
 python-versions = ">=3.9"
 
+[[package]]
+name = "openpyxl"
+version = "3.1.2"
+description = "A Python library to read/write Excel 2010 xlsx/xlsm files"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+et-xmlfile = "*"
+
 [[package]]
 name = "overrides"
-version = "7.4.0"
+version = "7.7.0"
 description = "A decorator to automatically detect mismatch when overriding a method."
 category = "main"
 optional = false
@@ -1468,7 +1549,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "pandas"
-version = "2.1.4"
+version = "2.2.1"
 description = "Powerful data structures for data analysis, time series, and statistics"
 category = "main"
 optional = false
@@ -1481,31 +1562,32 @@ numpy = [
 ]
 python-dateutil = ">=2.8.2"
 pytz = ">=2020.1"
-tzdata = ">=2022.1"
+tzdata = ">=2022.7"
 
 [package.extras]
 test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-xdist (>=2.2.0)"]
-performance = ["bottleneck (>=1.3.4)", "numba (>=0.55.2)", "numexpr (>=2.8.0)"]
-computation = ["scipy (>=1.8.1)", "xarray (>=2022.03.0)"]
-fss = ["fsspec (>=2022.05.0)"]
-aws = ["s3fs (>=2022.05.0)"]
-gcp = ["gcsfs (>=2022.05.0)", "pandas-gbq (>=0.17.5)"]
-excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pyxlsb (>=1.0.9)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)"]
-parquet = ["pyarrow (>=7.0.0)"]
-feather = ["pyarrow (>=7.0.0)"]
-hdf5 = ["tables (>=3.7.0)"]
-spss = ["pyreadstat (>=1.1.5)"]
-postgresql = ["SQLAlchemy (>=1.4.36)", "psycopg2 (>=2.9.3)"]
-mysql = ["SQLAlchemy (>=1.4.36)", "pymysql (>=1.0.2)"]
-sql-other = ["SQLAlchemy (>=1.4.36)"]
-html = ["beautifulsoup4 (>=4.11.1)", "html5lib (>=1.1)", "lxml (>=4.8.0)"]
-xml = ["lxml (>=4.8.0)"]
-plot = ["matplotlib (>=3.6.1)"]
-output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.8.10)"]
-clipboard = ["PyQt5 (>=5.15.6)", "qtpy (>=2.2.0)"]
-compression = ["zstandard (>=0.17.0)"]
+pyarrow = ["pyarrow (>=10.0.1)"]
+performance = ["bottleneck (>=1.3.6)", "numba (>=0.56.4)", "numexpr (>=2.8.4)"]
+computation = ["scipy (>=1.10.0)", "xarray (>=2022.12.0)"]
+fss = ["fsspec (>=2022.11.0)"]
+aws = ["s3fs (>=2022.11.0)"]
+gcp = ["gcsfs (>=2022.11.0)", "pandas-gbq (>=0.19.0)"]
+excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.1.0)", "python-calamine (>=0.1.7)", "pyxlsb (>=1.0.10)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.5)"]
+parquet = ["pyarrow (>=10.0.1)"]
+feather = ["pyarrow (>=10.0.1)"]
+hdf5 = ["tables (>=3.8.0)"]
+spss = ["pyreadstat (>=1.2.0)"]
+postgresql = ["SQLAlchemy (>=2.0.0)", "psycopg2 (>=2.9.6)", "adbc-driver-postgresql (>=0.8.0)"]
+mysql = ["SQLAlchemy (>=2.0.0)", "pymysql (>=1.0.2)"]
+sql-other = ["SQLAlchemy (>=2.0.0)", "adbc-driver-postgresql (>=0.8.0)", "adbc-driver-sqlite (>=0.8.0)"]
+html = ["beautifulsoup4 (>=4.11.2)", "html5lib (>=1.1)", "lxml (>=4.9.2)"]
+xml = ["lxml (>=4.9.2)"]
+plot = ["matplotlib (>=3.6.3)"]
+output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.9.0)"]
+clipboard = ["PyQt5 (>=5.15.9)", "qtpy (>=2.3.0)"]
+compression = ["zstandard (>=0.19.0)"]
 consortium-standard = ["dataframe-api-compat (>=0.1.7)"]
-all = ["beautifulsoup4 (>=4.11.1)", "bottleneck (>=1.3.4)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=0.8.1)", "fsspec (>=2022.05.0)", "gcsfs (>=2022.05.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.8.0)", "matplotlib (>=3.6.1)", "numba (>=0.55.2)", "numexpr (>=2.8.0)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pandas-gbq (>=0.17.5)", "psycopg2 (>=2.9.3)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "PyQt5 (>=5.15.6)", "pyreadstat (>=1.1.5)", "pytest (>=7.3.2)", "pytest-xdist (>=2.2.0)", "pyxlsb (>=1.0.9)", "qtpy (>=2.2.0)", "scipy (>=1.8.1)", "s3fs (>=2022.05.0)", "SQLAlchemy (>=1.4.36)", "tables (>=3.7.0)", "tabulate (>=0.8.10)", "xarray (>=2022.03.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)", "zstandard (>=0.17.0)"]
+all = ["adbc-driver-postgresql (>=0.8.0)", "adbc-driver-sqlite (>=0.8.0)", "beautifulsoup4 (>=4.11.2)", "bottleneck (>=1.3.6)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=2022.12.0)", "fsspec (>=2022.11.0)", "gcsfs (>=2022.11.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.9.2)", "matplotlib (>=3.6.3)", "numba (>=0.56.4)", "numexpr (>=2.8.4)", "odfpy (>=1.4.1)", "openpyxl (>=3.1.0)", "pandas-gbq (>=0.19.0)", "psycopg2 (>=2.9.6)", "pyarrow (>=10.0.1)", "pymysql (>=1.0.2)", "PyQt5 (>=5.15.9)", "pyreadstat (>=1.2.0)", "pytest (>=7.3.2)", "pytest-xdist (>=2.2.0)", "python-calamine (>=0.1.7)", "pyxlsb (>=1.0.10)", "qtpy (>=2.3.0)", "scipy (>=1.10.0)", "s3fs (>=2022.11.0)", "SQLAlchemy (>=2.0.0)", "tables (>=3.8.0)", "tabulate (>=0.9.0)", "xarray (>=2022.12.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.5)", "zstandard (>=0.19.0)"]
 
 [[package]]
 name = "pandocfilters"
@@ -1548,19 +1630,19 @@ ptyprocess = ">=0.5"
 
 [[package]]
 name = "platformdirs"
-version = "4.1.0"
+version = "4.2.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "main"
 optional = false
 python-versions = ">=3.8"
 
 [package.extras]
-docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.24)", "sphinx (>=7.1.1)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest (>=7.4)"]
+docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.25.2)", "sphinx (>=7.2.6)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest (>=7.4.3)"]
 
 [[package]]
 name = "prometheus-client"
-version = "0.19.0"
+version = "0.20.0"
 description = "Python client for the Prometheus monitoring system."
 category = "main"
 optional = false
@@ -1582,7 +1664,7 @@ wcwidth = "*"
 
 [[package]]
 name = "psutil"
-version = "5.9.7"
+version = "5.9.8"
 description = "Cross-platform lib for process and system monitoring in Python."
 category = "main"
 optional = false
@@ -1698,14 +1780,6 @@ python-versions = ">=3.6.8"
 [package.extras]
 diagrams = ["railroad-diagrams", "jinja2"]
 
-[[package]]
-name = "pyrsistent"
-version = "0.20.0"
-description = "Persistent/Functional/Immutable data structures"
-category = "main"
-optional = false
-python-versions = ">=3.8"
-
 [[package]]
 name = "python-dateutil"
 version = "2.8.2"
@@ -1738,7 +1812,7 @@ Levenshtein = "0.23.0"
 
 [[package]]
 name = "pytz"
-version = "2023.3.post1"
+version = "2024.1"
 description = "World timezone definitions, modern and historical"
 category = "main"
 optional = false
@@ -1754,7 +1828,7 @@ python-versions = "*"
 
 [[package]]
 name = "pywinpty"
-version = "2.0.12"
+version = "2.0.13"
 description = "Pseudo terminal support for Windows from Python."
 category = "main"
 optional = false
@@ -1779,42 +1853,6 @@ python-versions = ">=3.6"
 [package.dependencies]
 cffi = {version = "*", markers = "implementation_name == \"pypy\""}
 
-[[package]]
-name = "qtconsole"
-version = "5.5.1"
-description = "Jupyter Qt console"
-category = "main"
-optional = false
-python-versions = ">= 3.8"
-
-[package.dependencies]
-ipykernel = ">=4.1"
-jupyter-client = ">=4.1"
-jupyter-core = "*"
-packaging = "*"
-pygments = "*"
-pyzmq = ">=17.1"
-qtpy = ">=2.4.0"
-traitlets = "<5.2.1 || >5.2.1,<5.2.2 || >5.2.2"
-
-[package.extras]
-doc = ["Sphinx (>=1.3)"]
-test = ["flaky", "pytest", "pytest-qt"]
-
-[[package]]
-name = "qtpy"
-version = "2.4.1"
-description = "Provides an abstraction layer on top of the various Qt bindings (PyQt5/6 and PySide2/6)."
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-packaging = "*"
-
-[package.extras]
-test = ["pytest (>=6,!=7.0.0,!=7.0.1)", "pytest-cov (>=3.0.0)", "pytest-qt"]
-
 [[package]]
 name = "rapidfuzz"
 version = "3.6.1"
@@ -1845,19 +1883,31 @@ tests = ["berkeleydb", "html5lib", "networkx", "pytest", "pytest-cov", "pytest-s
 
 [[package]]
 name = "redis"
-version = "5.0.1"
+version = "5.0.2"
 description = "Python client for Redis database and key-value store"
 category = "main"
 optional = false
 python-versions = ">=3.7"
 
 [package.dependencies]
-async-timeout = {version = ">=4.0.2", markers = "python_full_version <= \"3.11.2\""}
+async-timeout = ">=4.0.3"
 
 [package.extras]
 hiredis = ["hiredis (>=1.0.0)"]
 ocsp = ["cryptography (>=36.0.1)", "pyopenssl (==20.0.1)", "requests (>=2.26.0)"]
 
+[[package]]
+name = "referencing"
+version = "0.33.0"
+description = "JSON Referencing + Python"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+attrs = ">=22.2.0"
+rpds-py = ">=0.7.0"
+
 [[package]]
 name = "regex"
 version = "2020.11.13"
@@ -1903,6 +1953,14 @@ category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
+[[package]]
+name = "rpds-py"
+version = "0.18.0"
+description = "Python bindings to Rust's persistent data structures (rpds)"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
 [[package]]
 name = "send2trash"
 version = "1.8.2"
@@ -1918,7 +1976,7 @@ win32 = ["pywin32"]
 
 [[package]]
 name = "sentry-sdk"
-version = "1.39.2"
+version = "1.40.6"
 description = "Python client for Sentry (https://sentry.io)"
 category = "main"
 optional = false
@@ -1968,7 +2026,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "sniffio"
-version = "1.3.0"
+version = "1.3.1"
 description = "Sniff out which async library your code is running under"
 category = "main"
 optional = false
@@ -2086,7 +2144,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tomlkit"
-version = "0.12.3"
+version = "0.12.4"
 description = "Style preserving TOML library"
 category = "main"
 optional = false
@@ -2102,7 +2160,7 @@ python-versions = ">= 3.8"
 
 [[package]]
 name = "tqdm"
-version = "4.66.1"
+version = "4.66.2"
 description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
@@ -2119,15 +2177,23 @@ telegram = ["requests"]
 
 [[package]]
 name = "traitlets"
-version = "5.9.0"
+version = "5.14.1"
 description = "Traitlets Python configuration system"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 
 [package.extras]
 docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"]
-test = ["argcomplete (>=2.0)", "pre-commit", "pytest", "pytest-mock"]
+test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest-mock", "pytest-mypy-testing", "pytest (>=7.0,<7.5)"]
+
+[[package]]
+name = "types-python-dateutil"
+version = "2.8.19.20240106"
+description = "Typing stubs for python-dateutil"
+category = "main"
+optional = false
+python-versions = ">=3.8"
 
 [[package]]
 name = "typesense"
@@ -2142,7 +2208,7 @@ requests = "*"
 
 [[package]]
 name = "typing-extensions"
-version = "4.9.0"
+version = "4.10.0"
 description = "Backported and Experimental Type Hints for Python 3.8+"
 category = "main"
 optional = false
@@ -2150,7 +2216,7 @@ python-versions = ">=3.8"
 
 [[package]]
 name = "tzdata"
-version = "2023.4"
+version = "2024.1"
 description = "Provider of IANA time zone data"
 category = "main"
 optional = false
@@ -2164,6 +2230,17 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "uri-template"
+version = "1.3.0"
+description = "RFC 6570 URI Template Processor"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+dev = ["types-pyyaml", "mypy", "flake8", "flake8-annotations", "flake8-bandit", "flake8-bugbear", "flake8-commas", "flake8-comprehensions", "flake8-continuation", "flake8-datetimez", "flake8-docstrings", "flake8-import-order", "flake8-literal", "flake8-modern-annotations", "flake8-noqa", "flake8-pyproject", "flake8-requirements", "flake8-typechecking-import", "flake8-use-fstring", "pep8-naming"]
+
 [[package]]
 name = "uritemplate"
 version = "4.1.1"
@@ -2174,7 +2251,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "urllib3"
-version = "2.1.0"
+version = "2.2.1"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
 optional = false
@@ -2182,6 +2259,7 @@ python-versions = ">=3.8"
 
 [package.extras]
 brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"]
+h2 = ["h2 (>=4,<5)"]
 socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
 zstd = ["zstandard (>=0.18.0)"]
 
@@ -2201,6 +2279,18 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "webcolors"
+version = "1.13"
+description = "A library for working with the color formats defined by HTML and CSS."
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo", "sphinx", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-notfound-page", "sphinxext-opengraph"]
+tests = ["pytest", "pytest-cov"]
+
 [[package]]
 name = "webencodings"
 version = "0.5.1"
@@ -2233,14 +2323,6 @@ python-versions = ">=3.5, <4"
 [package.extras]
 brotli = ["brotli"]
 
-[[package]]
-name = "widgetsnbextension"
-version = "4.0.9"
-description = "Jupyter interactive widgets for Jupyter Notebook"
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
 [[package]]
 name = "wrapt"
 version = "1.16.0"
@@ -2252,7 +2334,7 @@ python-versions = ">=3.6"
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.10,<3.12"
-content-hash = "24abcc5489b28c1c675f5d19c071856f0ae2559f9b6f9142ad020a2cbc2587b8"
+content-hash = "d4254cbefffd22b2e2f52aa5a0d1deac45c7be8e39b2739647cf9cb88852a7ea"
 
 [metadata.files]
 acdh-django-charts = []
@@ -2264,11 +2346,14 @@ apis-bibsonomy = []
 appnope = []
 argon2-cffi = []
 argon2-cffi-bindings = []
+arrow = []
 asgiref = []
 astroid = []
 asttokens = []
+async-lru = []
 async-timeout = []
 attrs = []
+babel = []
 beautifulsoup4 = []
 billiard = []
 black = []
@@ -2313,33 +2398,39 @@ djangorestframework-csv = []
 djangorestframework-jsonschema = []
 djangorestframework-xml = []
 drf-spectacular = []
+et-xmlfile = []
 exceptiongroup = []
 executing = []
 fastjsonschema = []
 flake8 = []
+fqdn = []
 gunicorn = []
+h11 = []
+httpcore = []
+httpx = []
 idna = []
 inflection = []
 ipykernel = []
 ipython = []
-ipython-genutils = []
-ipywidgets = []
 isodate = []
+isoduration = []
 isort = []
 jedi = []
 jinja2 = []
 jmespath = []
+json5 = []
+jsonpointer = []
 jsonschema = []
-jupyter = []
+jsonschema-specifications = []
 jupyter-client = []
-jupyter-console = []
 jupyter-core = []
 jupyter-events = []
+jupyter-lsp = []
 jupyter-server = []
 jupyter-server-terminals = []
-jupyter-tabnine = []
+jupyterlab = []
 jupyterlab-pygments = []
-jupyterlab-widgets = []
+jupyterlab-server = []
 kombu = []
 lazy-object-proxy = []
 levenshtein = []
@@ -2350,15 +2441,14 @@ mccabe = []
 mistune = []
 mypy-extensions = []
 mysqlclient = []
-nbclassic = []
 nbclient = []
 nbconvert = []
 nbformat = []
 nest-asyncio = []
 netaddr = []
-notebook = []
 notebook-shim = []
 numpy = []
+openpyxl = []
 overrides = []
 packaging = []
 pandas = []
@@ -2380,7 +2470,6 @@ pygments = []
 pylint = []
 pymeeus = []
 pyparsing = []
-pyrsistent = []
 python-dateutil = []
 python-json-logger = []
 python-levenshtein = []
@@ -2389,15 +2478,15 @@ pywin32 = []
 pywinpty = []
 pyyaml = []
 pyzmq = []
-qtconsole = []
-qtpy = []
 rapidfuzz = []
 rdflib = []
 redis = []
+referencing = []
 regex = []
 requests = []
 rfc3339-validator = []
 rfc3986-validator = []
+rpds-py = []
 send2trash = []
 sentry-sdk = []
 six = []
@@ -2414,16 +2503,18 @@ tomlkit = []
 tornado = []
 tqdm = []
 traitlets = []
+types-python-dateutil = []
 typesense = []
 typing-extensions = []
 tzdata = []
 unicodecsv = []
+uri-template = []
 uritemplate = []
 urllib3 = []
 vine = []
 wcwidth = []
+webcolors = []
 webencodings = []
 websocket-client = []
 whitenoise = []
-widgetsnbextension = []
 wrapt = []
diff --git a/pyproject.toml b/pyproject.toml
index 4c3df91c..a33b996e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,8 +20,6 @@ django-csp = "^3.7"
 apis-bibsonomy = "0.4.1"
 apis-ampel = "^0.2.0"
 pylint = "^2.6.0"
-jupyter = "^1.0.0"
-jupyter-tabnine = "^1.2.3"
 black = "^22.12.0"
 flake8 = "^6.0.0"
 celery = "^5.3.4"
@@ -30,8 +28,6 @@ django-celery-results = "^2.5.1"
 django-debug-toolbar = "^4.2.0"
 Django = "3.2.18"
 psycopg2 = "^2.9.7"
-traitlets = "<=5.9.0"
-jupyter-server = "^2.7.3"
 typesense = "^0.17.0"
 redis = "^5.0.1"
 pandas = "^2.0"
@@ -48,8 +44,6 @@ django-reversion = "^3.0.8"
 django-tables2 = "^2.3.3"
 djangorestframework-csv = "^2.1.0"
 djangorestframework-xml = "^2.0.0"
-jmespath = "^0.10.0"
-jsonschema = "^3.2.0"
 lxml = "^4.6.2"
 convertdate = "^2.3.0"
 rdflib = "~6.1.1"
@@ -64,6 +58,10 @@ django-summernote = "^0.8.11"
 djangorestframework-jsonschema = "^0.1.1"
 django-admin-csvexport = "^1.9"
 tqdm = "*"
+jupyterlab = "^4.1.2"
+openpyxl = "^3.1.2"
+jmespath = "^1.0.1"
+
 
 
 [build-system]

From e2523bb7da2d4c70d047869552b65d73b60299cf Mon Sep 17 00:00:00 2001
From: Gregor Pirgie <gregor.pirgie@oeaw.ac.at>
Date: Fri, 1 Mar 2024 14:21:21 +0100
Subject: [PATCH 4/6] docs: update readme

- update section on table and app names  to reflect latest changes
---
 README.md | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 70b5246e..3bdabfeb 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,8 @@ VieCPro specific django-apps are added in the root directory, separate from apis
 
 ### Table names vs. app names:
 
-For compatibility with prior versions of this repository, where some apps had different names, all table-names of VieCPro specific apps are hardcoded
-in all confliciting models via the 'meta.db_table' attribute; i.e. django app names and the prefix of the table names in your database do not exactly match. The mapping is as follows:
-
-- `viecpro_import` == `apis_import_project`
-- `viecpro_deduplication` == `dubletten_tool`
-
-So the db-table for f.e. `viecpro_deduplication.models.group` is named `dubletten_tool_group` not `viecpro_deduplication_group`.
-
-See the [Table Names](https://docs.djangoproject.com/en/4.2/ref/models/options/#table-names) - section of the django docs on how django handles model names and table names.
+In prior version of this repo, app-names had been changed. This change had no benefits atm and was potential cause for issues. 
+So it was reverted. 
 
 ## Development Container
 

From b682cbf920d422b260b78b08da65b1df642dfa96 Mon Sep 17 00:00:00 2001
From: Gregor Pirgie <gregor.pirgie@oeaw.ac.at>
Date: Fri, 1 Mar 2024 13:27:30 +0000
Subject: [PATCH 5/6] breaking-change: remove table_name in models

- remove table_name attr. from class Meta in all models in renamed-apps.
---
 apis_import_project/models.py | 26 +++++++-------------------
 dubletten_tool/models.py      | 21 +++------------------
 2 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/apis_import_project/models.py b/apis_import_project/models.py
index acebe376..d1490dac 100644
--- a/apis_import_project/models.py
+++ b/apis_import_project/models.py
@@ -19,7 +19,6 @@
 
 log = logging.getLogger("mylogger")
 
-table_base_name = "apis_import_project"
 
 class DataSource(models.Model):
     """
@@ -34,8 +33,6 @@ class DataSource(models.Model):
     Accessor functions allow traversing related DataSourcePage-objects and to get or set their metadata.
     """
 
-    class Meta: 
-        db_table = table_base_name + "_datasource"
 
     name = models.CharField(max_length=255, blank=False, null=False)
     server_directory = models.CharField(max_length=255, blank=False, null=False)
@@ -170,8 +167,7 @@ class DataSourcePage(models.Model):
     """
 
 
-    class Meta: 
-        db_table = table_base_name + "_datasourcepage"
+
 
     DataSource = models.ForeignKey(DataSource, null=False, blank=False, on_delete=models.CASCADE)
     page_index = models.IntegerField(blank=False, null=False)
@@ -209,8 +205,7 @@ class ImportProject(models.Model):
 
     # todo: consider adding last edited page here
 
-    class Meta: 
-        db_table = table_base_name + "_importproject"
+
 
     def save(self, *args, **kwargs):
         if not self.collection:
@@ -258,8 +253,7 @@ class GenericCollectionEntry(models.Model):
     todo: connect this with the revision-library. Save the state before the editing process and allow to reset the
     changed fields.
     """
-    class Meta: 
-        db_table = table_base_name + "_genericcollectionentry"
+
 
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
     content_object = GenericForeignKey("content_type", "id")
@@ -308,8 +302,7 @@ def create(cls, obj):
 
 class ProjectCollectionEntry(models.Model):
 
-    class Meta: 
-        db_table = table_base_name + "_projectcollectionentry"
+
 
     json = models.TextField(blank=True)
     project = models.ForeignKey(ImportProject, null=True, on_delete=models.CASCADE)
@@ -321,8 +314,6 @@ class PageCollection(models.Model):
     See GenericCollectionEntry docstring for more information.
     """
 
-    class Meta: 
-        db_table = table_base_name + "_pagecollection"
 
     created_in = models.ManyToManyField(GenericCollectionEntry, related_name="created")
     edited_in = models.ManyToManyField(GenericCollectionEntry, related_name="edited")
@@ -345,8 +336,7 @@ class PageData(models.Model):
     todo: could be refactored to make this specific behaviour managed via some sort of settings-file. And to make
         some sort of generic solution for implementing other specific, but similiar functionality.
     """
-    class Meta: 
-        db_table = table_base_name + "_pagedata"
+
 
     project = models.ForeignKey(ImportProject, blank=False, null=False, on_delete=models.CASCADE)
     page = models.ForeignKey(DataSourcePage, blank=False, null=False, on_delete=models.CASCADE)
@@ -575,8 +565,7 @@ class DataSourceProjectState(models.Model):
     last_page that was edited, to reload it when continuing an edit.
     """
 
-    class Meta: 
-        db_table = table_base_name + "_datasourceprojectstate"
+
 
     datasource = models.ForeignKey(DataSource, blank=False, null=True, on_delete=models.CASCADE)
     project = models.ForeignKey(ImportProject, blank=False, null=True, on_delete=models.CASCADE)
@@ -589,8 +578,7 @@ class ProjectState(models.Model):
     Stores the state a Project is in during the editing process, on per-user basis. For now it only keeps the last
     DataSource to reload it when continuing an edit.
     """
-    class Meta: 
-        db_table = table_base_name + "_projectstate"
+
 
     project = models.ForeignKey(ImportProject, blank=False, null=False, on_delete=models.CASCADE)
     user = models.ForeignKey(User, blank=False, null=False, on_delete=models.CASCADE)
diff --git a/dubletten_tool/models.py b/dubletten_tool/models.py
index ee4259c6..783766de 100644
--- a/dubletten_tool/models.py
+++ b/dubletten_tool/models.py
@@ -6,7 +6,6 @@
 #     text = models.TextField(max_length=2000, null=True, blank=True)
 
 
-table_base_name = "dubletten_tool"
 
 class PersonProxy(models.Model):
     """
@@ -17,7 +16,6 @@ class PersonProxy(models.Model):
 
     class Meta:
         ordering = ['person__name']
-        db_table = table_base_name + "_personproxy"
 
     status_choices = [
         ("candidate", "Candidate"),
@@ -100,7 +98,6 @@ class Group(models.Model):
 
     class Meta:
         ordering = ["name"]
-        db_table = table_base_name + "_group"
 
     status_choices_group = [
         ("unchecked", "unchecked"),
@@ -182,8 +179,7 @@ def __repr__(self):
 
 class Suggestions(models.Model):
     # todo __g.pirgie__ add name field and query Suggestions by name rather than by index!
-    class Meta: 
-        db_table = table_base_name + "_suggestions"
+
 
     data = models.JSONField(null=True, blank=True)
 
@@ -191,8 +187,7 @@ class Meta:
 
 class StatusButtonGroupType(models.Model):
 
-    class Meta: 
-        db_table = table_base_name + "_statusbuttongrouptype"
+
 
     name = models.CharField(max_length=600, null=False, blank=False)
     short = models.CharField(max_length=4, null=False,
@@ -207,8 +202,7 @@ def add_to_all_groups(self):
 
 
 class StatusButtonGroup(models.Model):
-    class Meta: 
-        db_table = table_base_name + "_statusbuttongroup"
+
 
     kind = models.ForeignKey(StatusButtonGroupType, on_delete=models.CASCADE)
     related_instance = models.ForeignKey(Group, on_delete=models.CASCADE)
@@ -220,10 +214,7 @@ def toggle_status(self):
 
 
 class StatusButtonProxyType(models.Model):
-    # not used at the moment
     
-    class Meta: 
-        db_table = table_base_name + "_statusbuttonproxytype"
 
     name = models.CharField(max_length=600, null=False, blank=False)
 
@@ -237,9 +228,6 @@ def add_to_all_groups(self):
 
 class StatusButtonProxy(models.Model):
     
-    class Meta: 
-        db_table = table_base_name + "_statusbuttonproxy"
-    # not used at the moment
     kind = models.ForeignKey(StatusButtonProxyType, on_delete=models.CASCADE)
     related_instance = models.ForeignKey(PersonProxy, on_delete=models.CASCADE)
     value = models.BooleanField(default=False)
@@ -247,9 +235,6 @@ class Meta:
 
 class DublettenLOG(models.Model):
 
-    class Meta: 
-        db_table = table_base_name + "_dublettenlog"
-
     msg = models.TextField(max_length=600, null=False, blank=False)
     user = models.ForeignKey(User, null=True, on_delete=models.SET_NULL)
     action = models.CharField(max_length=255)

From 96fa35c69e8ae278406bdbfd86d295024a54ea16 Mon Sep 17 00:00:00 2001
From: Gregor Pirgie <gregor.pirgie@oeaw.ac.at>
Date: Fri, 1 Mar 2024 13:29:54 +0000
Subject: [PATCH 6/6] fix: fix formatting error in base.html

---
 webpage/templates/webpage/base.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webpage/templates/webpage/base.html b/webpage/templates/webpage/base.html
index 132d5a10..48d3d854 100644
--- a/webpage/templates/webpage/base.html
+++ b/webpage/templates/webpage/base.html
@@ -324,8 +324,7 @@
                     {% endfor %}
                   </div>
                 </li>
-                {% if user.is_authenticated and "apis_ampel" in APPS
-                %}
+                {% if user.is_authenticated and "apis_ampel" in APPS %}
 
                 <li class="nav-item dropdown">
                   <a