From a05c640248df47d6df0da9d48e4c88ba724d6fab Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Mon, 23 Dec 2024 14:05:12 +0100
Subject: [PATCH 01/20] Added unique IDs to various elements for improved
 accessibility and interaction across multiple templates, including bundle,
 clinic, questionnaire, and user components.

---
 src/main/webapp/WEB-INF/bundle/edit.html                  | 5 +++++
 src/main/webapp/WEB-INF/bundle/list.html                  | 1 +
 src/main/webapp/WEB-INF/clinic/edit.html                  | 8 ++++++++
 src/main/webapp/WEB-INF/clinic/list.html                  | 1 +
 src/main/webapp/WEB-INF/fragments/header.html             | 1 +
 src/main/webapp/WEB-INF/fragments/mobileHeader.html       | 1 +
 .../WEB-INF/fragments/processClinicConfigurations.html    | 1 +
 src/main/webapp/WEB-INF/mobile/survey/bundles.html        | 2 ++
 src/main/webapp/WEB-INF/mobile/survey/check.html          | 2 ++
 src/main/webapp/WEB-INF/mobile/user/login.html            | 2 ++
 src/main/webapp/WEB-INF/navigation/admin.html             | 6 ++++++
 src/main/webapp/WEB-INF/question/list.html                | 1 +
 src/main/webapp/WEB-INF/questionnaire/list.html           | 1 +
 src/main/webapp/WEB-INF/user/mailtoall.html               | 5 +++--
 14 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/bundle/edit.html b/src/main/webapp/WEB-INF/bundle/edit.html
index 77f14ee3..35f5527b 100644
--- a/src/main/webapp/WEB-INF/bundle/edit.html
+++ b/src/main/webapp/WEB-INF/bundle/edit.html
@@ -71,6 +71,7 @@
 				</div>
 				<div class="form-group">
 					<textarea
+						id="description"
 						layout:replace="~{fragments/forms :: textareaWithLabel(
                         for='description', required=true, path='description',
                         clazz='wysiwyg', showErrors=true,
@@ -413,6 +414,7 @@
 												</div>
 												<div class="col-1">
 													<a
+															th:id="|move_${bundleQuestionnaireDTO.questionnaireDTO.id}|"
 															data-bs-toggle="collapse"
 															onClick="moveItem($(this))"
 													>
@@ -433,6 +435,7 @@
 												</div>
 												<input
 													type="hidden"
+													th:id="|questionnaire_${bundleQuestionnaireDTO.questionnaireDTO.id}|"
 													th:name="|bundleQuestionnaireDTOs[${counter.get()}].questionnaireDTO.id|"
 													th:value="${bundleQuestionnaireDTO.questionnaireDTO.id}"
 												/>
@@ -587,6 +590,7 @@
 												 th:style="			${index.index == 0 || availableQuestionnaireDTO.getQuestionnaireVersionGroupId() != availableQuestionnaireDTOs[index.index - 1].getQuestionnaireVersionGroupId()} ? '' : 'display:none;'">
 												<div class="col-1">
 													<a
+														th:id="|move_${availableQuestionnaireDTO.id}|"
 														data-bs-toggle="collapse"
 														onClick="moveItem($(this))"
 													>
@@ -664,6 +668,7 @@
 												</div>
 												<input
 													type="hidden"
+													th:id="|questionnaire_${availableQuestionnaireDTO.id}|"
 													disabled="true"
 													th:name="|bundleQuestionnaireDTOs[${counter.get()}].questionnaireDTO.id|"
 													th:value="${availableQuestionnaireDTO.id}"
diff --git a/src/main/webapp/WEB-INF/bundle/list.html b/src/main/webapp/WEB-INF/bundle/list.html
index ab29ac73..ce3e3c7b 100644
--- a/src/main/webapp/WEB-INF/bundle/list.html
+++ b/src/main/webapp/WEB-INF/bundle/list.html
@@ -160,6 +160,7 @@
 										</i>
 									</a>
 									<a
+										th:id="'removeBundle_' + ${item.id}"
 										class="link removeBundleLink"
 										th:attr="data-hasConditions=${item.isHasConditions()}, data-usedInClinics=${item.usedInClinics()}"
 										th:href="@{remove?id=__${item.id}__}"
diff --git a/src/main/webapp/WEB-INF/clinic/edit.html b/src/main/webapp/WEB-INF/clinic/edit.html
index 4d7314c3..fc5cd78f 100644
--- a/src/main/webapp/WEB-INF/clinic/edit.html
+++ b/src/main/webapp/WEB-INF/clinic/edit.html
@@ -220,6 +220,7 @@
                                                     th:classappend="${#strings.replace(bundleClinicDTO.bundleDTO.name, ' ', '')}"
                                                 >
                                                     <input
+                                                        th:id="|bundle_${bundleClinicDTO.bundleDTO.id}|"
                                                         type="hidden"
                                                         th:name="|bundleClinicDTOs[${counter.get()}].bundleDTO.id|"
                                                         th:value="${bundleClinicDTO.bundleDTO.id}"
@@ -256,6 +257,7 @@
                                                     </div>
                                                     <div class="col-1">
                                                         <a
+                                                            th:id="|move_${bundleClinicDTO.bundleDTO.id}|"
                                                             data-bs-toggle="collapse"
                                                             onClick="move($(this), $('#assignedBundlesTable'), $('#availableBundlesTable'))"
                                                         >
@@ -424,6 +426,7 @@
                                                     th:classappend="${#strings.replace(bundleDTO.name, ' ', '')}"
                                                 >
                                                     <input
+                                                        th:id="|bundle_${bundleDTO.id}|"
                                                         disabled="true"
                                                         type="hidden"
                                                         th:name="|bundleClinicDTOs[${counter.get()}].bundleDTO.id|"
@@ -431,6 +434,7 @@
                                                     />
                                                     <div class="col-1">
                                                         <a
+                                                            th:id="|move_${bundleDTO.id}|"
                                                             data-bs-toggle="collapse"
                                                             onClick="move($(this), $('#availableBundlesTable'), $('#assignedBundlesTable'))"
                                                         >
@@ -604,6 +608,7 @@
                                                     </div>
                                                     <div class="col-1">
                                                         <a
+                                                            th:id="|move_${user.username}|"
                                                             data-bs-toggle="collapse"
                                                             onClick="move($(this), $('#assignedUsersTable'), $('#availableUsersTable'))"
                                                         >
@@ -613,6 +618,7 @@
                                                         </a>
                                                     </div>
                                                     <input
+                                                        th:id="|user_${user.username}|"
                                                         type="hidden"
                                                         th:name="|assignedUserDTOs[${counter.get()}].id|"
                                                         th:value="${user.id}"
@@ -753,6 +759,7 @@
                                                 >
                                                     <div class="col-1">
                                                         <a
+                                                            th:id="|move_${item.username}|"
                                                             data-bs-toggle="collapse"
                                                             onClick="move($(this), $('#availableUsersTable'), $('#assignedUsersTable'))"
                                                             ><span class="bi bi-chevron-left"
@@ -764,6 +771,7 @@
                                                         </span>
                                                     </div>
                                                     <input
+                                                        th:id="|user_${item.username}|"
                                                         disabled="true"
                                                         type="hidden"
                                                         th:name="|assignedUserDTOs[${counter.get()}].id|"
diff --git a/src/main/webapp/WEB-INF/clinic/list.html b/src/main/webapp/WEB-INF/clinic/list.html
index 80da5162..5716b2a9 100644
--- a/src/main/webapp/WEB-INF/clinic/list.html
+++ b/src/main/webapp/WEB-INF/clinic/list.html
@@ -77,6 +77,7 @@
 											></i>
 										</a>
 										<a
+											th:id="'removeClinic_' + ${clinic.id}"
 											class="link"
 											th:href="@{remove?id=__${clinic.id}__}"
 										>
diff --git a/src/main/webapp/WEB-INF/fragments/header.html b/src/main/webapp/WEB-INF/fragments/header.html
index 0b314b9b..98f780eb 100644
--- a/src/main/webapp/WEB-INF/fragments/header.html
+++ b/src/main/webapp/WEB-INF/fragments/header.html
@@ -129,6 +129,7 @@
 					</li>
 					<li class="nav-item">
 						<a
+							id="adminLogoutButton"
 							th:href="@{/mobile/user/login?lang=__${configurationDao.defaultLanguage?.toString()}__}"
 							class="nav-link"
 						>
diff --git a/src/main/webapp/WEB-INF/fragments/mobileHeader.html b/src/main/webapp/WEB-INF/fragments/mobileHeader.html
index d1473bf8..1ed3f4a7 100644
--- a/src/main/webapp/WEB-INF/fragments/mobileHeader.html
+++ b/src/main/webapp/WEB-INF/fragments/mobileHeader.html
@@ -301,6 +301,7 @@
 				</th:block>
 
 				<a
+					id="logoutButton"
 					class="btn-lowEmphasis"
 					data-ajax="true"
 					onclick="initLogin();"
diff --git a/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html b/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html
index 98cad111..c90c9986 100644
--- a/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html
+++ b/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html
@@ -3,6 +3,7 @@
 >
     <th:block th:each="configurationDTO, configurationIndex: ${configurationList}">
         <li
+            th:id="${configurationDTO.attribute}"
             class="list-group-item"
             th:classappend="${parent != null} ? |children| : ''"
             th:attr="configurationId=${configurationDTO.id},parentId=${parent != null} ? ${parent.clinicConfigurationId} : ''"
diff --git a/src/main/webapp/WEB-INF/mobile/survey/bundles.html b/src/main/webapp/WEB-INF/mobile/survey/bundles.html
index 8b568327..8f64cca2 100644
--- a/src/main/webapp/WEB-INF/mobile/survey/bundles.html
+++ b/src/main/webapp/WEB-INF/mobile/survey/bundles.html
@@ -85,6 +85,7 @@ <h4>
 					</div>
 					<div class="select-wrapper w-100">
 						<select
+							id="bundle-selection"
 							name="bundleId"
 							class="btn select-mobile w-100"
 						>
@@ -130,6 +131,7 @@ <h4>
 
 							<div class="select-wrapper w-100">
 								<select
+									id="bundle-language-selection"
 									name="bundleLanguage"
 									class="btn select-mobile w-100"
 								>
diff --git a/src/main/webapp/WEB-INF/mobile/survey/check.html b/src/main/webapp/WEB-INF/mobile/survey/check.html
index 21f7e85e..a9c4b28d 100644
--- a/src/main/webapp/WEB-INF/mobile/survey/check.html
+++ b/src/main/webapp/WEB-INF/mobile/survey/check.html
@@ -20,6 +20,7 @@
 		>
 			<div class="select-wrapper w-100">
 				<select
+					id="clinic-selection"
 					th:field="*{id}"
 					class="btn select-mobile w-100"
 					onchange="this.form.submit()"
@@ -197,6 +198,7 @@
 								value=""
 								th:type="${not #strings.isEmpty(caseNumberType)} ? ${caseNumberType} : 'text'"
 								autocomplete="off"
+								id="caseNumber"
 								autocorrect="off"
 								autocapitalize="off"
 								spellcheck="false"
diff --git a/src/main/webapp/WEB-INF/mobile/user/login.html b/src/main/webapp/WEB-INF/mobile/user/login.html
index 2d5c14a9..8797c3cd 100644
--- a/src/main/webapp/WEB-INF/mobile/user/login.html
+++ b/src/main/webapp/WEB-INF/mobile/user/login.html
@@ -54,6 +54,7 @@
 						th:text="${message}"
 					></th:block>
 					<a
+						id="forgotPasswordLink"
 						class="btn-link mobile-link"
 						data-ajax="true"
 						onclick="initUser();"
@@ -63,6 +64,7 @@
 					</a>
 
 					<button
+						id="loginButton"
 						class="btn btn-white btn-mobile"
 						index="3"
 						type="submit"
diff --git a/src/main/webapp/WEB-INF/navigation/admin.html b/src/main/webapp/WEB-INF/navigation/admin.html
index f100f921..ce1aa56b 100644
--- a/src/main/webapp/WEB-INF/navigation/admin.html
+++ b/src/main/webapp/WEB-INF/navigation/admin.html
@@ -17,6 +17,7 @@
 					<th:block sec:authorize="hasRole('ROLE_EDITOR')">
 						<li class="nav-item dropdown">
 							<a
+								id="questionnaireDropdownLink"
 								class="nav-link d-flex align-items-center"
 								role="button"
 								data-bs-toggle="dropdown"
@@ -35,6 +36,7 @@
 							>
 								<li>
 									<a
+										id="manageQuestionnaireLink"
 										class="dropdown-item"
 										th:href="@{/questionnaire/list}"
 										th:text="${messages.get(#locale, 'admin.navigation.questionnaire', 'Manage questionnaires')}"
@@ -53,6 +55,7 @@
 						</li>
 						<li class="nav-item">
 							<a
+								id="bundleLink"
 								class="nav-link"
 								th:href="@{/bundle/list}"
 								th:text="#{admin.navigation.header.bundle}"
@@ -63,6 +66,7 @@
 					<th:block sec:authorize="hasRole('ROLE_ADMIN')">
 						<li class="nav-item">
 							<a
+								id="clinicLink"
 								class="nav-link"
 								th:href="@{/clinic/list}"
 								th:text="#{admin.navigation.header.clinic}"
@@ -72,6 +76,7 @@
 
 						<li class="nav-item dropdown">
 							<a
+								id="userDropdownLink"
 								class="nav-link d-flex align-items-center"
 								data-bs-toggle="dropdown"
 								role="button"
@@ -95,6 +100,7 @@
 								</li>
 								<li>
 									<a
+										id="mailToAllLink"
 										class="dropdown-item"
 										th:href="@{/user/mailtoall}"
 										th:text="#{admin.navigation.user.mailToAll}"
diff --git a/src/main/webapp/WEB-INF/question/list.html b/src/main/webapp/WEB-INF/question/list.html
index cb0fa226..8b555835 100644
--- a/src/main/webapp/WEB-INF/question/list.html
+++ b/src/main/webapp/WEB-INF/question/list.html
@@ -51,6 +51,7 @@
 
 		<div class="table-responsive">
 			<table
+				id="questionTable"
 				class="sortable table table-hover responsive"
 				style="width: 100%"
 			>
diff --git a/src/main/webapp/WEB-INF/questionnaire/list.html b/src/main/webapp/WEB-INF/questionnaire/list.html
index fdb52b59..5c378da8 100644
--- a/src/main/webapp/WEB-INF/questionnaire/list.html
+++ b/src/main/webapp/WEB-INF/questionnaire/list.html
@@ -204,6 +204,7 @@
 												</div>
 											</div>
 											<a
+												th:id="'removeQuestionnaire_' + ${item.id}"
 												class="link removeQuestionnaireLink"
 												th:attr="data-hasConditions=${item.isHasConditions()}"
 												th:href="@{remove?id=__${item.id}__}"
diff --git a/src/main/webapp/WEB-INF/user/mailtoall.html b/src/main/webapp/WEB-INF/user/mailtoall.html
index cf4ae0e1..912a71a2 100644
--- a/src/main/webapp/WEB-INF/user/mailtoall.html
+++ b/src/main/webapp/WEB-INF/user/mailtoall.html
@@ -33,10 +33,11 @@
 				<div class="form-group">
 					<label
 						class="required"
-						for="content"
+						for="mailContent"
 						th:text="${messages.get(#locale, 'user.label.message', 'Message')}"
 					></label>
 					<textarea
+						id="mailContent"
 						class="form-control"
 						cols="40"
 						rows="10"
@@ -104,7 +105,7 @@
 					type="submit"
 					class="btn btn-primary"
 					value="preview"
-					id="mailButton"
+					id="mailPreviewButton"
 					name="action"
 					th:text="${messages.get(#locale, 'user.button.preview', 'Preview')}"
 				>

From a4bad1866444db142335b0520e868b9e28dcd81c Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Mon, 23 Dec 2024 14:20:42 +0100
Subject: [PATCH 02/20] Add helper classes and utilities for Selenium tests

- Introduced AuthenticationHelper, BundleHelper, ClinicHelper, QuestionHelper, QuestionnaireHelper, and supporting classes.
- Added utility functions for managing and interacting with Selenium elements, such as click, fill, and scroll.
- Implemented specific selectors for various test cases.
- Enhanced navigation and element interaction for streamlined testing.
---
 selenium/helper/Authentication.py   |  74 +++
 selenium/helper/Bundle.py           | 148 ++++++
 selenium/helper/Clinic.py           | 223 +++++++++
 selenium/helper/Navigation.py       |  99 ++++
 selenium/helper/Question.py         | 589 ++++++++++++++++++++++++
 selenium/helper/Questionnaire.py    | 119 +++++
 selenium/helper/SeleniumUtils.py    | 194 ++++++++
 selenium/helper/Survey.py           | 274 +++++++++++
 selenium/localhost8080.py           | 680 ++++++++++++++++++++++++++++
 selenium/secrets/localhost8080.json |   2 +
 selenium/utils/imiseleniumtest.py   | 200 ++++++++
 11 files changed, 2602 insertions(+)
 create mode 100644 selenium/helper/Authentication.py
 create mode 100644 selenium/helper/Bundle.py
 create mode 100644 selenium/helper/Clinic.py
 create mode 100644 selenium/helper/Navigation.py
 create mode 100644 selenium/helper/Question.py
 create mode 100644 selenium/helper/Questionnaire.py
 create mode 100644 selenium/helper/SeleniumUtils.py
 create mode 100644 selenium/helper/Survey.py
 create mode 100644 selenium/localhost8080.py
 create mode 100644 selenium/secrets/localhost8080.json
 create mode 100644 selenium/utils/imiseleniumtest.py

diff --git a/selenium/helper/Authentication.py b/selenium/helper/Authentication.py
new file mode 100644
index 00000000..fe2358c5
--- /dev/null
+++ b/selenium/helper/Authentication.py
@@ -0,0 +1,74 @@
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
+
+class URLPathsAuthentication:
+    MOBILE_USER_LOGIN = "/mobile/user/login"
+
+
+class AuthenticationSelectors:
+
+    class Login:
+        BUTTON = (By.ID, "loginButton")
+        USERNAME = (By.ID, "username")
+        PASSWORD = (By.ID, "password")
+
+    class Logout:
+        ADMIN_BUTTON = (By.ID, "adminLogoutButton")
+        MOBILE_BUTTON = (By.ID, "logoutButton")
+
+class AuthenticationHelper:
+
+    def __init__(self, driver):
+        self.driver = driver
+
+    def login(self, username, password):
+        """
+        :param username: The username for login.
+        :param password: The password for login.
+        """
+        username_input = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(AuthenticationSelectors.Login.USERNAME)
+        )
+        username_input.clear()
+        username_input.send_keys(username)
+
+        password_input = self.driver.find_element(*AuthenticationSelectors.Login.PASSWORD)
+        password_input.clear()
+        password_input.send_keys(password)
+
+        submit_button = WebDriverWait(self.driver, 10).until(
+            EC.element_to_be_clickable(AuthenticationSelectors.Login.BUTTON)
+        )
+        submit_button.click()
+
+    def admin_login(self, username=None, password=None):
+        username = username or ""
+        password = password or ""
+        self.login(username, password)
+
+    def user_login(self, username=None, password=None):
+        username = username or ""
+        password = password or ""
+        self.login(username, password)
+
+    def logout(self):
+        current_url = self.driver.current_url
+        # Check if already logged out
+        if URLPathsAuthentication.MOBILE_USER_LOGIN in current_url:
+            return
+
+        logout_selectors = [
+            AuthenticationSelectors.Logout.ADMIN_BUTTON,
+            AuthenticationSelectors.Logout.MOBILE_BUTTON
+        ]
+        for selector in logout_selectors:
+            try:
+                logout_button = WebDriverWait(self.driver, 5).until(
+                    EC.element_to_be_clickable(selector)
+                )
+                logout_button.click()
+                return
+            except:
+                continue
\ No newline at end of file
diff --git a/selenium/helper/Bundle.py b/selenium/helper/Bundle.py
new file mode 100644
index 00000000..aac7c918
--- /dev/null
+++ b/selenium/helper/Bundle.py
@@ -0,0 +1,148 @@
+import time
+
+from selenium.common import TimeoutException, ElementClickInterceptedException, NoSuchElementException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from helper.SeleniumUtils import SearchBoxSelectors
+from helper.SeleniumUtils import SeleniumUtils
+
+
+class BundleSelectors:
+    BUTTON_ADD_BUNDLE = (By.ID, "addBundle")
+    BUTTON_SAVE = (By.ID, "saveButton")
+    BUTTON_MOVE_ITEM = lambda questionnaire_id: (By.ID, f"move_{questionnaire_id}")
+
+    CHECKBOX_PUBLISH = (By.ID, "isPublished1")
+
+    INPUT_NAME = (By.ID, "name")
+    INPUT_EDITABLE_DESCRIPTION = (By.CSS_SELECTOR, "div.note-editable")
+    INPUT_BUNDLE_SEARCH = (By.ID, "bundleTable_filter")
+    INPUT_QUESTIONNAIRE = lambda questionnaire_id: (By.ID, f"questionnaire_{questionnaire_id}")
+    INPUT_QUESTIONNAIRE_AVAILABLE_SEARCH = (By.ID, "availableQuestionnairesFilter")
+
+
+class BundleHelper:
+    def __init__(self, driver, fragebogen_helper, navigation_helper):
+        self.driver = driver
+        self.fragebogen_helper = fragebogen_helper
+        self.navigation_helper = navigation_helper
+        self.utils = SeleniumUtils(driver)
+
+    def bundle_exists(self, bundle_name):
+        """
+        :param bundle_name: Name of the bundle to search for.
+        :return: True if the bundle exists, False otherwise.
+        """
+        try:
+            # Fill the search box with the bundle name
+            self.utils.fill_text_field(SearchBoxSelectors.BUNDLE, bundle_name)
+
+            # Wait until the table rows are present (or timeout if none are found)
+            rows = WebDriverWait(self.driver, 2).until(
+                EC.presence_of_all_elements_located((By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr"))
+            )
+
+            # Check if the first row has more than one <td> (indicating a valid result)
+            first_row_columns = rows[0].find_elements(By.TAG_NAME, "td") if rows else []
+            return len(first_row_columns) > 1
+        except TimeoutException:
+            # No rows found within the timeout
+            return False
+        except Exception as e:
+            raise Exception(f"Error while checking if bundle '{bundle_name}' exists: {e}")
+
+    def search_and_open_bundle(self, bundle_name):
+        """
+        :param bundle_name: Name of the bundle to search for.
+        """
+        try:
+            self.utils.fill_text_field(SearchBoxSelectors.BUNDLE, bundle_name)
+            row_hyperlink = WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable((By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr td a"))
+            )
+            self.utils.click_element((By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr td a"))
+        except TimeoutException:
+            raise Exception(f"Timeout while searching for bundle '{bundle_name}' to open.")
+        except Exception as e:
+            raise Exception(f"Error while opening bundle '{bundle_name}': {e}")
+
+    def create_bundle(self, bundle_name, publish_bundle, questionnaires=None):
+        """
+        :param bundle_name: Name of the bundle to create.
+        :param publish_bundle: Whether to publish the bundle.
+        :param questionnaires: List of questionnaires to assign to the bundle (optional).
+        """
+        try:
+            self.utils.click_element(BundleSelectors.BUTTON_ADD_BUNDLE)
+
+            # Add name
+            self.utils.fill_text_field(BundleSelectors.INPUT_NAME, bundle_name)
+
+            # Add description
+            description_field = WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.INPUT_EDITABLE_DESCRIPTION)
+            )
+            self.utils.scroll_to_element(BundleSelectors.INPUT_EDITABLE_DESCRIPTION)
+            description_field.click()
+            description_field.send_keys("This bundle contains questionnaires.")
+
+            # Assign questionnaires if provided
+            if questionnaires:
+                self.assign_multiple_questionnaires_to_bundle(questionnaires)
+
+            # Publish the bundle if requested
+            if publish_bundle:
+                self.utils.toggle_checkbox(BundleSelectors.CHECKBOX_PUBLISH, enable=True)
+
+        except Exception as e:
+            raise Exception(f"Error while creating bundle '{bundle_name}': {e}")
+
+    def save_bundle(self, bundle_name):
+        """
+        :param bundle_name: Name of the bundle to locate after saving.
+        :return: The extracted bundle ID.
+        """
+        try:
+            # Save the bundle
+            self.utils.click_element(BundleSelectors.BUTTON_SAVE)
+
+            # Wait for redirection to the bundle list
+            WebDriverWait(self.driver, 15).until(EC.url_contains("/bundle/list"))
+
+            # Search for the bundle by name
+            self.utils.fill_text_field(SearchBoxSelectors.BUNDLE, bundle_name)
+
+            # Extract the bundle ID from the link
+            bundle_link = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located((By.LINK_TEXT, bundle_name))
+            )
+            return bundle_link.get_attribute("href").split("id=")[1]
+        except Exception as e:
+            raise Exception(f"Error while saving bundle '{bundle_name}': {e}")
+
+    def assign_multiple_questionnaires_to_bundle(self, questionnaires, bundle_id=None):
+        """
+        :param questionnaires: List of dictionaries containing questionnaire details (e.g., {'id': str, 'name': str}).
+        :param bundle_id: ID of the bundle to which the questionnaires will be assigned (optional).
+        """
+        try:
+            if bundle_id:
+                self.search_and_open_bundle(bundle_id)
+
+            for questionnaire in questionnaires:
+                try:
+                    self.utils.fill_text_field(BundleSelectors.INPUT_QUESTIONNAIRE_AVAILABLE_SEARCH, questionnaire['name'])
+
+                    questionnaire_selector = BundleSelectors.INPUT_QUESTIONNAIRE(questionnaire['id'])
+                    WebDriverWait(self.driver, 10).until(
+                        EC.presence_of_element_located(questionnaire_selector)
+                    )
+                    self.utils.scroll_to_element(BundleSelectors.BUTTON_MOVE_ITEM(questionnaire['id']))
+                    self.utils.click_element(BundleSelectors.BUTTON_MOVE_ITEM(questionnaire['id']))
+                except TimeoutException:
+                    raise Exception(f"Timeout while assigning questionnaire '{questionnaire['name']}'.")
+                except Exception as e:
+                    raise Exception(f"Error while assigning questionnaire '{questionnaire['name']}': {e}")
+        except Exception as e:
+            raise Exception(f"Error while assigning multiple questionnaires: {e}")
\ No newline at end of file
diff --git a/selenium/helper/Clinic.py b/selenium/helper/Clinic.py
new file mode 100644
index 00000000..c636ddb1
--- /dev/null
+++ b/selenium/helper/Clinic.py
@@ -0,0 +1,223 @@
+from selenium.common import TimeoutException, ElementClickInterceptedException, NoSuchElementException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from helper.SeleniumUtils import SearchBoxSelectors
+from helper.SeleniumUtils import SeleniumUtils
+
+class URLPathsClinic:
+    CLINIC_LIST = "/clinic/list"
+
+class ClinicSelectors:
+    BUTTON_ADD_CLINIC = (By.ID, "addClinic")
+    BUTTON_SAVE = (By.ID, "saveButton")
+
+    INPUT_CLINIC_NAME = (By.ID, "name")
+    INPUT_EDITABLE_DESCRIPTION = (By.CSS_SELECTOR, "div.note-editable")
+
+    # Configuration selectors
+    CONFIG_USE_PATIENT_DATA_LOOKUP = (By.CSS_SELECTOR, "li#usePatientDataLookup input[type='checkbox']")
+    CONFIG_USE_PSEUDONYMIZATION_SERVICE = (By.CSS_SELECTOR, "li#usePseudonymizationService input[type='checkbox']")
+    CONFIG_REGISTER_PATIENT_DATA = (By.CSS_SELECTOR, "li#registerPatientData input[type='checkbox']")
+
+    INPUT_BUNDLE_AVAILABLE_SEARCH = (By.ID, "availableBundlesFilter")
+    INPUT_BUNDLE = lambda bundle_id: (By.ID, f"bundle_{bundle_id}")
+    BUTTON_MOVE_ITEM = lambda bundle_id: (By.ID, f"move_{bundle_id}")
+
+    INPUT_USER_AVAILABLE_SEARCH = (By.ID, "availableUsersFilter")
+    INPUT_USER = lambda username: (By.ID, f"user_{username}")
+
+    TABLE_ROW_LINK = (By.CSS_SELECTOR, "#clinicTable > tbody > tr > td.dtr-control > a")
+
+class ClinicHelper:
+    def __init__(self, driver, navigation_helper):
+        self.driver = driver
+        self.navigation_helper = navigation_helper
+        self.utils = SeleniumUtils(driver)
+
+    def create_clinic(self, clinic_name, clinic_description, configurations=None, bundles=None, users=None):
+        """
+        :param clinic_name: Name of the clinic to be created.
+        :param clinic_description: Description of the clinic.
+        :param configurations: List of configurations to enable. Each configuration is a dict with:
+        - 'selector': The selector for the configuration checkbox.
+        - 'dropdown_value': Optional dropdown value to select for the configuration (default: None).
+        :param bundles: List of bundles to be associated with the clinic (optional).
+        """
+        try:
+            # Click "Add Clinic" button
+            self.utils.click_element(ClinicSelectors.BUTTON_ADD_CLINIC)
+
+            # Fill in the clinic name
+            self.utils.fill_text_field(ClinicSelectors.INPUT_CLINIC_NAME, clinic_name)
+
+            # Add description
+            description_field = WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION)
+            )
+            description_field.click()          #  self.utils.click_element(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION)
+            description_field.send_keys(clinic_description)
+
+            # Configure settings if provided
+            if configurations:
+                for config in configurations:
+                    selector = config.get('selector')
+                    dropdown_value = config.get('dropdown_value')
+                    if selector:
+                        self.configure_clinic_setting(selector, dropdown_value)
+
+            # Assign bundles if provided
+            if bundles:
+                self.assign_multiple_bundes_to_clinic(bundles)
+
+            # Assign users if provided
+            if users:
+                self.assign_multiple_users_to_clinic(users)
+
+        except Exception as e:
+            raise Exception(f"Error while creating clinic '{clinic_name}': {e}")
+
+    def save_clinic(self, clinic_name):
+        """
+        :param clinic_name: Name of the clinic being saved.
+        """
+        try:
+            # Save the clinic
+            self.utils.click_element(ClinicSelectors.BUTTON_SAVE)
+
+            # Search for the bundle by name
+            self.utils.fill_text_field(SearchBoxSelectors.CLINIC, clinic_name)
+
+            # Extract the bundle ID from the link
+            clinic_link = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located((By.LINK_TEXT, clinic_name))
+            )
+            return clinic_link.get_attribute("href").split("id=")[1]
+        except Exception as e:
+            raise Exception(f"Error while saving clinic '{clinic_name}': {e}")
+
+    def delete_clinic(self, clinic_name):
+        """
+        :param clinic_name: Name of the clinic to be deleted.
+        :return: True if the clinic was successfully deleted, False if it does not exist.
+        """
+        try:
+            # Navigate to "Manage Clinics"
+            self.navigation_helper.navigate_to_manage_clinics(self.driver)
+
+            # Search for the clinic
+            self.utils.fill_text_field(SearchBoxSelectors.CLINIC, clinic_name)
+
+            # Find and click the delete button
+            delete_button = WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable((By.XPATH, f'//a[contains(text(), "{clinic_name}")]/../..//button'))
+            )
+            self.utils.click_element((By.XPATH, f'//a[contains(text(), "{clinic_name}")]/../..//button'))
+            return True
+        except TimeoutException:
+            # Clinic not found
+            return False
+        except Exception as e:
+            raise Exception(f"Error while deleting clinic '{clinic_name}': {e}")
+
+    def configure_clinic_setting(self, config_selector, config_dropdown_value=None):
+        """
+        :param config_selector: The selector for the configuration element (e.g., ClinicSelectors.CONFIG_USE_PATIENT_DATA_LOOKUP).
+        :param config_dropdown_value: Optional dropdown value to select for the configuration.
+        """
+        try:
+            # Enable the checkbox for the configuration
+            checkbox = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(config_selector)
+            )
+            self.utils.scroll_to_element(config_selector)
+            self.utils.toggle_checkbox(config_selector, enable=True)
+
+            # Select the value from the dropdown if specified
+            if config_dropdown_value:
+                parent_id = checkbox.get_attribute("triggerid")
+                dropdown = WebDriverWait(self.driver, 10).until(
+                    EC.presence_of_element_located((By.CSS_SELECTOR, f"li[parentid='{parent_id}'] select"))
+                )
+                self.utils.scroll_to_element((By.CSS_SELECTOR, f"li[parentid='{parent_id}'] select"))
+                dropdown.click()
+
+                # Locate the <option> by value instead of text
+                option = WebDriverWait(self.driver, 10).until(
+                    EC.presence_of_element_located((By.CSS_SELECTOR, f"option[value='{config_dropdown_value}']"))
+                )
+                option.click()
+        except Exception as e:
+            raise Exception(
+                f"Error configuring setting '{config_selector}' with dropdown value '{config_dropdown_value}': {e}")
+
+    def assign_multiple_bundes_to_clinic(self, bundles, clinic_id=None):
+        """
+        :param bundles: List of dictionaries containing bundle details (e.g., {'id': str, 'name': str}).
+        :param clinic_id: ID of the clinic to which the bundles will be assigned (optional).
+        """
+        try:
+            if clinic_id:
+                self.search_and_open_clinic(clinic_id)
+
+            for bundle in bundles:
+                try:
+                    self.utils.fill_text_field(ClinicSelectors.INPUT_BUNDLE_AVAILABLE_SEARCH, bundle['name'])
+
+                    bundle_selector = ClinicSelectors.INPUT_BUNDLE(bundle['id'])
+                    WebDriverWait(self.driver, 10).until(
+                        EC.presence_of_element_located(bundle_selector)
+                    )
+                    self.utils.scroll_to_element(ClinicSelectors.BUTTON_MOVE_ITEM(bundle['id']))
+                    self.utils.click_element(ClinicSelectors.BUTTON_MOVE_ITEM(bundle['id']))
+                except TimeoutException:
+                    raise Exception(f"Timeout while assigning bundle '{bundle['name']}'.")
+                except Exception as e:
+                    raise Exception(f"Error while assigning bundle '{bundle['name']}': {e}")
+        except Exception as e:
+            raise Exception(f"Error while assigning multiple bundles: {e}")
+
+    def assign_multiple_users_to_clinic(self, usernames, clinic_id=None):
+        """
+        :param usernames: List of usernames.
+        :param clinic_id: ID of the clinic to which the bundles will be assigned (optional).
+        """
+        try:
+            if clinic_id:
+                self.search_and_open_clinic(clinic_id)
+
+            for username in usernames:
+                try:
+                    self.utils.fill_text_field(ClinicSelectors.INPUT_USER_AVAILABLE_SEARCH, username)
+
+                    user_selector = ClinicSelectors.INPUT_USER(username)
+                    WebDriverWait(self.driver, 10).until(
+                        EC.presence_of_element_located(user_selector)
+                    )
+                    self.utils.scroll_to_element(ClinicSelectors.BUTTON_MOVE_ITEM(username))
+                    self.utils.click_element(ClinicSelectors.BUTTON_MOVE_ITEM(username))
+                except TimeoutException:
+                    raise Exception(f"Timeout while assigning user '{username}'.")
+                except Exception as e:
+                    raise Exception(f"Error while assigning user '{username}': {e}")
+        except Exception as e:
+            raise Exception(f"Error while assigning multiple users: {e}")
+
+    def search_and_open_clinic(self, clinic_name):
+        """
+        :param clinic_name: Name of the clinic to search for.
+        """
+        # Navigate to the clinic management page if not already there
+        if URLPathsClinic.CLINIC_LIST not in self.driver.current_url:
+            self.navigation_helper.navigate_to_manage_clinics()
+
+        try:
+            self.utils.fill_text_field(SearchBoxSelectors.CLINIC, clinic_name)
+            row_hyperlink = WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(ClinicSelectors.TABLE_ROW_LINK)
+            )
+            self.utils.click_element(ClinicSelectors.TABLE_ROW_LINK)
+        except TimeoutException:
+            raise Exception(f"Timeout while searching for clinic '{clinic_name}' to open.")
+        except Exception as e:
+            raise Exception(f"Error while opening clinic '{clinic_name}': {e}")
\ No newline at end of file
diff --git a/selenium/helper/Navigation.py b/selenium/helper/Navigation.py
new file mode 100644
index 00000000..98fde4e8
--- /dev/null
+++ b/selenium/helper/Navigation.py
@@ -0,0 +1,99 @@
+from selenium.common import TimeoutException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
+from helper.SeleniumUtils import SeleniumUtils
+
+
+class NavigationBarSelectors:
+    class UserMenu:
+        BUTTON = (By.ID, "userDropdownLink")
+        MAIL_TO_ALL_LINK = (By.ID, "mailToAllLink")
+
+    class QuestionnaireMenu:
+        BUTTON = (By.ID, "questionnaireDropdownLink")
+        MANAGE_LINK = (By.ID, "manageQuestionnaireLink")
+        IMPORT_LINK = (By.ID, "importQuestionnaireLink")
+
+    class BundleMenu:
+        LINK = (By.ID, "bundleLink")
+
+    class ClinicMenu:
+        LINK = (By.ID, "clinicLink")
+
+class QuestionnaireTableSelectors:
+    FILTER_INPUT = (By.CSS_SELECTOR, "#questionnaireTable_filter input[type='search']")
+    FIRST_RESULT_LINK = (By.CSS_SELECTOR, "#questionnaireTable tbody tr td a")
+
+class NavigationHelper:
+    def __init__(self, driver):
+        self.driver = driver
+        self.utils = SeleniumUtils(self.driver)
+
+    def navigate_to_manage_questionnaires(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.QuestionnaireMenu.BUTTON)
+            self.utils.click_element(NavigationBarSelectors.QuestionnaireMenu.MANAGE_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Manage Questionnaires': {e}")
+
+    def navigate_to_manage_bundles(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.BundleMenu.LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Manage Bundles': {e}")
+
+    def navigate_to_manage_clinics(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.ClinicMenu.LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Manage Clinics': {e}")
+
+    def navigate_to_email_to_all_users(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.UserMenu.BUTTON)
+            self.utils.click_element(NavigationBarSelectors.UserMenu.MAIL_TO_ALL_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'E-Mail to All Users': {e}")
+
+    def search_and_open_questionnaire(self, questionnaire_name):
+        try:
+            self.navigate_to_manage_questionnaires()
+            self.utils.fill_text_field(QuestionnaireTableSelectors.FILTER_INPUT, questionnaire_name)
+
+            # Click the first result
+            first_result_link = WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(QuestionnaireTableSelectors.FIRST_RESULT_LINK)
+            )
+            first_result_link.click()
+        except TimeoutException:
+            raise Exception(f"Failed to search and open questionnaire '{questionnaire_name}'.")
+
+    # def search_and_delete_item(self, item_name, item_id, item_type):
+    #     try:
+    #         # Initialize variables based on the item type
+    #         if item_type == "questionnaire":
+    #             self.navigate_to_manage_questionnaires()
+    #             search_box_selector = SearchBoxSelectors.QUESTIONNAIRE
+    #             button_id = RemoveButtonSelectors.QUESTIONNAIRE.format(item_id)
+    #         elif item_type == "bundle":
+    #             self.navigate_to_manage_bundles()
+    #             search_box_selector = SearchBoxSelectors.BUNDLE
+    #             button_id = RemoveButtonSelectors.BUNDLE.format(item_id)
+    #         elif item_type == "clinic":
+    #             self.navigate_to_manage_clinics()
+    #             search_box_selector = SearchBoxSelectors.CLINIC
+    #             button_id = RemoveButtonSelectors.CLINIC.format(item_id)
+    #         else:
+    #             raise ValueError(f"Unknown item type: {item_type}")
+    #
+    #         # Search for the element using the appropriate search box
+    #         self.utils.fill_text_field(search_box_selector, item_name)
+    #
+    #         # click the remove button
+    #         self.utils.click_element((By.ID, button_id))
+    #     except TimeoutException:
+    #         raise Exception(f"Failed to delete {item_type} '{item_name}' with ID {item_id}'.")
+    #     except Exception as e:
+    #         raise Exception(f"An error occurred while deleting {item_type} '{item_name}': {e}")
\ No newline at end of file
diff --git a/selenium/helper/Question.py b/selenium/helper/Question.py
new file mode 100644
index 00000000..091fdd81
--- /dev/null
+++ b/selenium/helper/Question.py
@@ -0,0 +1,589 @@
+import time
+from functools import partial
+
+from selenium import webdriver
+from selenium.common import TimeoutException, ElementClickInterceptedException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+
+from helper.SeleniumUtils import SeleniumUtils
+
+
+class QuestionSelectors:
+    BUTTON_SAVE = (By.ID, "saveButton")
+    BUTTON_ADD_ANSWER = (By.ID, "addAnswerButton")
+
+    DROPDOWN_QUESTION_TYPE = (By.ID, "questionTypeDropDown")
+    CHECKBOX_IS_REQUIRED = (By.ID, 'isRequired1')
+    INPUT_MIN_NUMBER_ANSWERS = (By.ID, "minNumberAnswers")
+    INPUT_MAX_NUMBER_ANSWERS = (By.ID, "maxNumberAnswers")
+
+    INPUT_QUESTION_TEXT_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedQuestionTextCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_SLIDER_MIN_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_SLIDER_MAX_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_NUMERIC_CHECKBOX_MIN_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_NUMERIC_CHECKBOX_MAX_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_NUMERIC_CHECKBOX_FREETEXT_MIN_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_NUMERIC_CHECKBOX_FREETEXT_MAX_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
+
+    TABLE_ROW_QUESTION = (By.XPATH, "/html/body/div/div/div[1]/div/div[2]/div[2]/table/tbody/tr")
+    TABLE_QUESTION = (By.ID, "questionTable")
+
+    class QuestionTypes:
+        INFO_TEXT = "INFO_TEXT"
+        MULTIPLE_CHOICE = "MULTIPLE_CHOICE"
+        SLIDER = "SLIDER"
+        NUMBER_CHECKBOX = "NUMBER_CHECKBOX"
+        NUMBER_CHECKBOX_TEXT = "NUMBER_CHECKBOX_TEXT"
+        DROP_DOWN = "DROP_DOWN"
+        FREE_TEXT = "FREE_TEXT"
+        NUMBER_INPUT = "NUMBER_INPUT"
+        DATE = "DATE"
+        IMAGE = "IMAGE"
+        BODY_PART = "BODY_PART"
+        BARCODE = "BARCODE"
+
+
+class QuestionHelper:
+
+    # Default values for questions
+    DEFAULT_LANGUAGE_CODE = "de_DE"
+    DEFAULT_LABELS = ("Low", "High")
+    DEFAULT_MIN_VALUE = 0
+    DEFAULT_MAX_VALUE = 10
+    DEFAULT_OPTIONS = ["Option 1", "Option 2", "Option 3"]
+    DEFAULT_QUESTION_TEXT = "Default Question Text"
+    DEFAULT_STEP_SIZE = 1
+
+    DEFAULT_MC_OPTIONS =["Option 1", "Option 2", "Option 3"]
+    DEFAULT_MC_MIN_VALUE = 0
+    DEFAULT_MC_MAX_VALUE = len(DEFAULT_MC_OPTIONS)
+    DEFAULT_FREE_TEXT_LABEL = "Freetext Label"
+
+    def __init__(self, driver):
+        self.driver = driver
+        self.utils = SeleniumUtils(driver)
+        self.QUESTION_TYPES = [
+            partial(self.add_question_info_text),
+            partial(self.add_question_multiple_choice),
+            partial(self.add_question_slider_question),
+            partial(self.add_question_numeric_checkbox),
+            partial(self.add_question_numeric_checkbox_freetext),
+            partial(self.add_question_date_question),
+            partial(self.add_question_dropdown),
+            partial(self.add_question_numeric_question),
+            partial(self.add_question_freetext),
+        ]
+
+    def save_question(self):
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+
+    def add_question_info_text(self, language_code=None, question_text=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param question_text: The text content for the info text question.
+        :return: A dictionary containing the question type and text for validation.
+        """
+        question_type = "it"
+        if not question_text:
+            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+
+        # Wait for the dropdown to be visible
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+
+        # Select the "Info-Text" option by its value
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.INFO_TEXT)
+
+        # Wait until the page is fully loaded
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill the editable div for the question text
+        info_text_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+
+        self.utils.fill_editable_div(info_text_div, question_text)
+
+        # Return the question information for later validation
+        return {"type": QuestionSelectors.QuestionTypes.INFO_TEXT, "text": question_text}
+
+    def add_question_multiple_choice(self, language_code=None, is_required=False, question_text=None, options=None, min_answers=None, max_answers=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param question_text: The text content for the multiple-choice question.
+        :param is_required: Indicates if the question is required (default: False).
+        :param options: A list of answer options for the question.
+        :param min_answers: The minimum number of answers required.
+        :param max_answers: The maximum number of answers allowed.
+        :return: A dictionary containing the question type, text, and options for validation.
+        """
+        question_type = "mc"
+        if not question_text:
+            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        options = options or self.DEFAULT_OPTIONS
+        min_answers = min_answers or self.DEFAULT_MC_MIN_VALUE
+        max_answers = max_answers or self.DEFAULT_MC_MAX_VALUE
+
+        # Wait for the dropdown to be visible and select "Mehrfachauswahl"
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value \
+            (QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE)
+
+        # Wait until the page is fully loaded
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill the editable div for the question text
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+        # Set min and max answers
+        self.driver.find_element(*QuestionSelectors.INPUT_MIN_NUMBER_ANSWERS).send_keys(str(min_answers))
+        self.driver.find_element(*QuestionSelectors.INPUT_MAX_NUMBER_ANSWERS).send_keys(str(max_answers))
+
+        # Add options
+        clear_and_send_keys_js = """document.querySelector('textarea[name="{name}"]').value=arguments[0];"""
+        clear_and_send_keys_js2 = """document.querySelector('input[name="{name}"]').value=arguments[0];"""
+
+        for i, option in enumerate(options):
+            self.driver.execute_script(clear_and_send_keys_js.format(name=f"answers[{i}].localizedLabel[{language_code}]"), option)
+            self.driver.execute_script(clear_and_send_keys_js2.format(name=f"answers[{i}].codedValue"), option)
+
+            # Add new answer field except for the last option
+            if i < len(options) - 1:
+                add_button = self.driver.find_element(By.ID, 'addAnswerButton')
+                self.driver.execute_script("arguments[0].click();", add_button)
+
+        # Return the question information for later validation
+        return {
+            "type": QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE,
+            "text": question_text,
+            "options": options,
+            "min_answers": min_answers,
+            "max_answers": max_answers,
+        }
+
+    def add_question_slider_question(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None, labels=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param question_text: The text content for the slider question.
+        :param is_required: Indicates if the question is required (default: False).
+        :param min_value: The minimum value for the slider.
+        :param max_value: The maximum value for the slider.
+        :param step_size: The step size for the slider.
+        :param labels: A tuple containing two labels (min label, max label) for the slider.
+        :return: A dictionary containing the question type, text, and slider configuration for validation.
+        """
+        question_type = "sq"
+        if not question_text:
+            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        min_value = min_value or self.DEFAULT_MIN_VALUE
+        max_value = max_value or self.DEFAULT_MAX_VALUE
+        step_size = step_size or self.DEFAULT_STEP_SIZE
+        labels = labels or self.DEFAULT_LABELS
+
+        # Wait for the dropdown to be visible
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+
+        # Select the "Slider" option by its value
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(
+            QuestionSelectors.QuestionTypes.SLIDER
+        )
+
+        # Wait until the page is fully loaded
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill the editable div for the question text
+        question_text_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_text_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+        # Set slider configuration
+        self.driver.find_element(By.NAME, "answers[0].minValue").send_keys(str(min_value))
+        self.driver.find_element(By.NAME, "answers[0].maxValue").send_keys(str(max_value))
+        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys(str(step_size))
+
+        # Set labels for the slider
+        slider_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_SLIDER_MIN_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(slider_text_min_div, labels[0])
+        slider_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_SLIDER_MAX_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(slider_text_max_div, labels[1])
+
+        # Return the question information for later validation
+        return {
+            "type": QuestionSelectors.QuestionTypes.SLIDER,
+            "text": question_text,
+            "min_value": min_value,
+            "max_value": max_value,
+            "step_size": step_size,
+            "labels": labels,
+        }
+
+    def add_question_numeric_checkbox(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None, labels=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param question_text: The text content for the numeric checkbox question.
+        :param is_required: Indicates if the question is required (default: False).
+        :param min_value: The minimum value for the numeric checkboxes.
+        :param max_value: The maximum value for the numeric checkboxes.
+        :param step_size: The step size between numeric checkbox values.
+        :param labels: A tuple containing two labels (min label, max label) for the numeric checkboxes.
+        :return: A dictionary containing the question type, text, and numeric checkbox configuration for validation.
+        """
+        question_type = "nc"
+        if not question_text:
+            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        min_value = min_value if min_value is not None else self.DEFAULT_MIN_VALUE
+        max_value = max_value if max_value is not None else self.DEFAULT_MAX_VALUE
+        step_size = step_size if step_size is not None else self.DEFAULT_STEP_SIZE
+        labels = labels or self.DEFAULT_LABELS
+
+        # Wait for the dropdown to be visible and select "Nummerierte Checkboxen"
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(
+            QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX
+        )
+
+        # Wait until the page is fully loaded
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill the editable div for the question text
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+        # Set numeric values
+        self.driver.find_element(By.NAME, "answers[0].minValue").send_keys(str(min_value))
+        self.driver.find_element(By.NAME, "answers[0].maxValue").send_keys(str(max_value))
+        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys(str(step_size))
+
+        # Set labels
+        nc_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_MIN_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(nc_text_min_div, labels[0])
+        nc_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_MAX_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(nc_text_max_div, labels[1])
+
+        # Return the question information for later validation
+        return {
+            "type": QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX,
+            "text": question_text,
+            "min_value": min_value,
+            "max_value": max_value,
+            "step_size": step_size,
+            "labels": labels,
+        }
+
+    def add_question_numeric_checkbox_freetext(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None, freetext_label=None, labels=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param is_required: Indicates if the question is required (default: False).
+        :param question_text: The text content for the numeric checkbox question.
+        :param min_value: The minimum value for the numeric checkboxes.
+        :param max_value: The maximum value for the numeric checkboxes.
+        :param step_size: The step size between numeric checkbox values.
+        :param freetext_label: Label for the freetext field.
+        :param labels: A tuple containing two labels (min label, max label) for the numeric checkboxes + freetext.
+        :return: A dictionary containing the question type and configuration for validation.
+        """
+        question_type = "ncf"
+        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        min_value = min_value or self.DEFAULT_MIN_VALUE
+        max_value = max_value or self.DEFAULT_MAX_VALUE
+        step_size = step_size or self.DEFAULT_STEP_SIZE
+        freetext_label = freetext_label or self.DEFAULT_FREE_TEXT_LABEL
+        labels = labels or self.DEFAULT_LABELS
+
+        # Select the question type
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX_TEXT)
+
+        # Wait for page to load
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill question text
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+        # Set numeric values
+        self.driver.find_element(By.CSS_SELECTOR, "#sliderFreeTextField input[name='answers[0].minValue']").send_keys(str(min_value))
+        self.driver.find_element(By.CSS_SELECTOR, "#sliderFreeTextField input[name='answers[0].maxValue']").send_keys(str(max_value))
+        self.driver.find_element(By.CSS_SELECTOR, "#sliderFreeTextField input[name='answers[0].stepsize']").send_keys(str(step_size))
+
+        # Set labels
+        ncf_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_FREETEXT_MIN_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(ncf_text_min_div, labels[0])
+        ncf_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_FREETEXT_MAX_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(ncf_text_max_div, labels[1])
+
+        # Set freetext label
+        self.driver.find_element(By.NAME, f"answers[0].localizedFreetextLabel[{language_code}]").send_keys(freetext_label)
+
+        # Return question information
+        return {
+            "type": QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX_TEXT,
+            "text": question_text,
+            "min_value": min_value,
+            "max_value": max_value,
+            "step_size": step_size,
+            "freetext_label": freetext_label,
+        }
+
+    def add_question_date_question(self, language_code=None, is_required=False, question_text=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param is_required: Indicates if the question is required (default: False).
+        :param question_text: The text content for the date question.
+        :return: A dictionary containing the question type and text for validation.
+        """
+        question_type = "dq"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+
+        # Select the question type
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.DATE)
+
+        # Wait for page to load
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill question text
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+
+        # Return question information
+        return {
+            "type": QuestionSelectors.QuestionTypes.DATE,
+            "text": question_text,
+        }
+
+    def add_question_dropdown(self, language_code=None, is_required=False, question_text=None, options=None):
+        """
+        :param is_required: Indicates if the question is required (default: False).
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param question_text: The text content for the dropdown question.
+        :param options: A list of dropdown options.
+        :return: A dictionary containing the question type, text, and options for validation.
+        """
+        question_type = "dd"
+        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        options = options or self.DEFAULT_OPTIONS
+
+        # Select the question type
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.DROP_DOWN)
+
+        # Wait for page to load
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill question text
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+        # Add dropdown options
+        clear_and_send_keys_js = """document.querySelector('textarea[name="{name}"]').value=arguments[0];"""
+        clear_and_send_keys_js2 = """document.querySelector('input[name="{name}"]').value=arguments[0];"""
+
+        for i, option in enumerate(options):
+            self.driver.execute_script(clear_and_send_keys_js.format(name=f"answers[{i}].localizedLabel[{language_code}]"), option)
+            self.driver.execute_script(clear_and_send_keys_js2.format(name=f"answers[{i}].codedValue"), option)
+
+            # Add new option field
+            if i < len(options) - 1:
+                self.driver.find_element(*QuestionSelectors.BUTTON_ADD_ANSWER).click()
+
+        # Return question information
+        return {
+            "type": QuestionSelectors.QuestionTypes.DROP_DOWN,
+            "text": question_text,
+            "options": options,
+        }
+
+    def add_question_numeric_question(self,  language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None):
+        """
+        :param is_required: Indicates if the question is required (default: False).
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param question_text: The text content for the numeric question.
+        :param min_value: The minimum value for the numeric input.
+        :param max_value: The maximum value for the numeric input.
+        :param step_size: The step size for the numeric input.
+        :return: A dictionary containing the question type and configuration for validation.
+        """
+        question_type = "nq"
+        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        min_value = min_value or self.DEFAULT_MIN_VALUE
+        max_value = max_value or self.DEFAULT_MAX_VALUE
+        step_size = step_size or self.DEFAULT_STEP_SIZE
+
+        # Select the question type
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.NUMBER_INPUT)
+
+        # Wait for page to load
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill question text
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+        # Set numeric values
+        self.driver.find_element(By.CSS_SELECTOR, "#numberInputField input[name='answers[0].minValue']").send_keys(str(min_value))
+        self.driver.find_element(By.CSS_SELECTOR, "#numberInputField input[name='answers[0].maxValue']").send_keys(str(max_value))
+        self.driver.find_element(By.CSS_SELECTOR, "#numberInputField input[name='answers[0].stepsize']").send_keys(str(step_size))
+
+        # Return question information
+        return {
+            "type": QuestionSelectors.QuestionTypes.NUMBER_INPUT,
+            "text": question_text,
+            "min_value": min_value,
+            "max_value": max_value,
+            "step_size": step_size,
+        }
+
+    def add_question_freetext(self, language_code=None, is_required=False, question_text=None):
+        """
+        :param is_required: Indicates if the question is required (default: False).
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param question_text: The text content for the freetext question.
+        :return: A dictionary containing the question type and text for validation.
+        """
+        question_type = "ft"
+        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+
+        # Select the question type
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(
+            QuestionSelectors.QuestionTypes.FREE_TEXT
+        )
+
+        # Wait for the page to load
+        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+
+        # Fill question text
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        self.utils.fill_editable_div(question_div, question_text)
+
+        # Set required checkbox
+        if is_required:
+            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
+            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+
+        # Return question information
+        return {
+            "type": QuestionSelectors.QuestionTypes.FREE_TEXT,
+            "text": question_text,
+        }
+
+class QuestionErrorHelper(QuestionHelper):
+
+    # TODO [LJ] refactor
+    def add_numeric_checkbox_with_failed_cases(self):
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located((By.ID, "questionTypeDropDown")))
+        Select(self.driver.find_element(By.ID, "questionTypeDropDown")).select_by_visible_text("Nummerierte Checkboxen")
+        WebDriverWait(self.driver, 30).until(
+                lambda driver: driver.execute_script("return document.readyState") == "complete"
+        )
+        self.driver.find_element(By.XPATH,'/html/body/div/div/div[1]/div/div[2]/div/form/div[1]/div/div[4]/div/div/div[2]/div[2]').send_keys("Diese Frage zeigt einen sog. \'Slider\' vertikal an. Sie haben die Möglichkeit, durch Berühren des Schiebereglers einen Wert festzulegen, den Punkt zu verschieben und sich durch erneutes Antippen des Punkts dazu zu entscheiden, doch keine Antwort zu geben. Wie groß sind Sie (ca.)?")
+        self.driver.find_element(By.ID, "isRequired1").click()
+        self.driver.find_element(By.NAME, "answers[0].minValue").send_keys("0")
+        self.driver.find_element(By.NAME, "answers[0].maxValue").send_keys("100")
+
+        # # Attempt to save with invalid step size
+        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys("30")
+        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys(Keys.TAB)
+        WebDriverWait(self.driver, 10).until(EC.presence_of_element_located((By.ID, "sliderErrors")))
+        error_message_element = self.driver.execute_script("return document.getElementById('sliderErrors')")
+        error_message_text = self.driver.execute_script("return arguments[0].innerText;", error_message_element).strip()
+        assert "Der Abstand zwischen Minimum und Maximum ist nicht restlos durch die Schrittweite teilbar" in error_message_text
+
+        # # # Attempt to save with step size greater than range
+        self.driver.find_element(By.NAME, "answers[0].stepsize").clear()
+        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys("210")
+        self.save_question()
+        WebDriverWait(self.driver, 30).until(
+                lambda driver: driver.execute_script("return document.readyState") == "complete"
+        )
+        WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located((By.ID, "sliderErrors")))
+        time.sleep(2)
+        error_message_element1 = self.driver.execute_script("return document.getElementById('sliderErrors')")
+        error_message_text1 = self.driver.execute_script("return arguments[0].innerText;", error_message_element1)
+        assert "Die Schrittweite der Frage war größer als der Abstand zwischen Minimum und Maximum" in error_message_text1
+
+
+        # # Attempt to save with invalid step size format
+
+        # # Correct the step size and clear min and max values
+        self.driver.execute_script("document.getElementsByName('answers[0].stepsize')[0].value = '';")
+        self.driver.execute_script("document.getElementsByName('answers[0].stepsize')[0].value = '1';")
+        self.driver.execute_script("document.getElementsByName('answers[0].minValue')[0].value = '';")
+        self.driver.execute_script("document.getElementsByName('answers[0].maxValue')[0].value = '';")
+        self.save_question()
+        WebDriverWait(self.driver, 30).until(
+                        lambda driver: driver.execute_script("return document.readyState") == "complete"
+        )
+        # # Check for errors related to min and max values
+        WebDriverWait(self.driver, 10).until(EC.presence_of_element_located((By.ID, "sliderErrors")))
+        time.sleep(2)
+        error_message_element = self.driver.execute_script("return document.getElementById('sliderErrors')")
+        error_message_text = self.driver.execute_script("return arguments[0].innerText;", error_message_element)
+        assert "Die Frage benötigt einen Minimalwert" in error_message_text
+        assert "Die Frage benötigt einen Maximalwert" in error_message_text
+
+        # # Correct the min and max values
+        self.driver.execute_script("document.getElementsByName('answers[0].minValue')[0].value = '1';")
+        self.driver.execute_script("document.getElementsByName('answers[0].maxValue')[0].value = '200';")
+        self.driver.execute_script("document.getElementsByName('answers[0].stepsize')[0].value = '1';")
+
+        time.sleep(1)
+
+    def verify_number_of_questions(self, expected_count):
+        """
+        :param expected_count: The expected number of questions.
+        :raises AssertionError: If the number of questions does not match the expected count.
+        """
+        rows = [
+            row for row in self.driver.find_element(*QuestionSelectors.TABLE_QUESTION)
+            .find_element(By.TAG_NAME, "tbody")
+            .find_elements(By.TAG_NAME, "tr") if row.is_displayed()
+        ]
+        assert len(rows) == expected_count, f"Expected {expected_count} questions, but found {len(rows)}."
diff --git a/selenium/helper/Questionnaire.py b/selenium/helper/Questionnaire.py
new file mode 100644
index 00000000..5f0f000e
--- /dev/null
+++ b/selenium/helper/Questionnaire.py
@@ -0,0 +1,119 @@
+import time
+from functools import partial
+
+from selenium import webdriver
+from selenium.common import TimeoutException, ElementClickInterceptedException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+
+from helper.SeleniumUtils import SeleniumUtils
+
+
+class QuestionnaireSelectors:
+    BUTTON_ADD_QUESTIONNAIRE = (By.ID, "addQuestionnaire")
+    BUTTON_ADD_QUESTION = (By.ID, "addQuestion")
+    BUTTON_SAVE = (By.ID, "saveButton")
+    BUTTON_SAVE_AND_EDIT = (By.ID, "saveEditButton")
+
+    INPUT_NAME = (By.ID, "name")
+    INPUT_LOCALIZED_DISPLAY_NAME = lambda language_code: (By.ID, f"localizedDisplayName{language_code}")
+    INPUT_EDITABLE_DESCRIPTION = (By.CSS_SELECTOR, "div.note-editable")
+    INPUT_WELCOME_TEXT_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedWelcomeTextCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_FINAL_TEXT_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedFinalTextCollapsableText_{language_code}"]/div/div[2]/div[2]')
+
+    class QuestionTypes:
+        INFO_TEXT = "INFO_TEXT"
+        MULTIPLE_CHOICE = "MULTIPLE_CHOICE"
+        SLIDER = "SLIDER"
+        NUMBER_CHECKBOX = "NUMBER_CHECKBOX"
+        NUMBER_CHECKBOX_TEXT = "NUMBER_CHECKBOX_TEXT"
+        DROP_DOWN = "DROP_DOWN"
+        FREE_TEXT = "FREE_TEXT"
+        NUMBER_INPUT = "NUMBER_INPUT"
+        DATE = "DATE"
+        IMAGE = "IMAGE"
+        BODY_PART = "BODY_PART"
+        BARCODE = "BARCODE"
+
+
+class QuestionnaireHelper:
+
+    def __init__(self, driver):
+        self.driver = driver
+        self.utils = SeleniumUtils(driver)
+
+    def click_add_questionnaire_button(self):
+        """Clicks the 'Add Questionnaire' button."""
+        self.utils.click_element(QuestionnaireSelectors.BUTTON_ADD_QUESTIONNAIRE)
+
+    def fill_questionnaire_details(self, questionnaire_name, description, language_code, localized_display_name,
+                                   localized_welcome_text=None, localized_final_text=None):
+        """
+        :param questionnaire_name: Name of the questionnaire.
+        :param description: Description of the questionnaire.
+        :param language_code: Language code for localized fields (e.g., 'de_DE').
+        :param localized_display_name: Localized display name for the questionnaire.
+        :param localized_welcome_text: Localized welcome text (optional).
+        :param localized_final_text: Localized final text (optional).
+        """
+        # Fill in the questionnaire name
+        self.utils.fill_text_field(QuestionnaireSelectors.INPUT_NAME, questionnaire_name)
+
+        # Fill in the description
+        WebDriverWait(self.driver, 30).until(
+            EC.visibility_of_element_located(QuestionnaireSelectors.INPUT_EDITABLE_DESCRIPTION)
+        )
+        self.utils.fill_text_field(QuestionnaireSelectors.INPUT_EDITABLE_DESCRIPTION, description)
+
+        # Fill in the localized display name
+        self.utils.fill_text_field(QuestionnaireSelectors.INPUT_LOCALIZED_DISPLAY_NAME(language_code), localized_display_name)
+
+        # Fill Welcome Text
+        if localized_welcome_text:
+            welcome_text_div = WebDriverWait(self.driver, 30).until(
+                EC.visibility_of_element_located(QuestionnaireSelectors.INPUT_WELCOME_TEXT_EDITABLE_DIV(language_code))
+            )
+            self.utils.fill_editable_div(welcome_text_div, localized_welcome_text)
+
+        # Fill Final Text
+        if localized_final_text:
+            final_text_div = WebDriverWait(self.driver, 30).until(
+                EC.visibility_of_element_located(QuestionnaireSelectors.INPUT_FINAL_TEXT_EDITABLE_DIV(language_code))
+            )
+            self.utils.fill_editable_div(final_text_div, localized_final_text)
+
+    def save_questionnaire_edit_question(self):
+        """
+        :return: The ID of the newly created questionnaire.
+        """
+        current_url = self.driver.current_url
+        self.utils.click_element(QuestionnaireSelectors.BUTTON_SAVE_AND_EDIT)
+
+        # Wait for redirection and extract questionnaire ID
+        WebDriverWait(self.driver, 15).until(EC.url_changes(current_url))
+        new_url = self.driver.current_url
+        try:
+            questionnaire_id = new_url.split("id=")[1]
+            return questionnaire_id
+        except IndexError:
+            raise Exception(f"Failed to extract questionnaire ID from URL: {new_url}")
+
+    def click_add_question_button(self):
+        self.utils.click_element(QuestionnaireSelectors.BUTTON_ADD_QUESTION)
+
+# TODO [] The helper functions for asserting questionnaires should be implemented here
+class QuestionnaireAssertHelper(QuestionnaireHelper):
+    pass
+
+# TODO [] Implement ConditionHelper
+class ConditionHelper(QuestionnaireHelper):
+    def add_condition_to_questionnaire(self, condition_name, condition_type, target_question):
+        pass
+
+# TODO [] Implement ScoreHelper
+class ScoreHelper(QuestionnaireHelper):
+    def add_score_to_questionnaire(self, score_name, calculation_formula, target_questions):
+        pass
\ No newline at end of file
diff --git a/selenium/helper/SeleniumUtils.py b/selenium/helper/SeleniumUtils.py
new file mode 100644
index 00000000..2246481a
--- /dev/null
+++ b/selenium/helper/SeleniumUtils.py
@@ -0,0 +1,194 @@
+import time
+
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.common.exceptions import TimeoutException, ElementClickInterceptedException
+from selenium.webdriver.support.ui import Select
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.common.action_chains import ActionChains
+
+class RemoveButtonSelectors:
+    QUESTIONNAIRE = "removeQuestionnaire_{}"
+    BUNDLE = "removeBundle_{}"
+    CLINIC = "removeClinic_{}"
+
+class SearchBoxSelectors:
+    QUESTIONNAIRE = (By.CSS_SELECTOR, "#questionnaireTable_filter input[type='search']")
+    BUNDLE = (By.CSS_SELECTOR, "#bundleTable_filter input[type='search']")
+    CLINIC = (By.CSS_SELECTOR, "#clinicTable_filter input[type='search']")
+
+class SeleniumUtils:
+    def __init__(self, driver, navigator=None):
+        self.driver = driver
+        self.navigator = navigator
+
+    def click_element(self, selector):
+        """
+        :param selector: A tuple representing the element locator (e.g., (By.ID, "element_id")).
+        """
+        try:
+            element = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(selector))
+            element.click()
+        except ElementClickInterceptedException:
+            try:
+                element = self.driver.find_element(*selector)
+                self.driver.execute_script("arguments[0].click();", element)
+            except Exception as e:
+                raise Exception(f"Failed to click element {selector} using JavaScript: {e}")
+        except TimeoutException:
+            raise Exception(f"Timeout while waiting for element {selector} to be clickable.")
+
+    def fill_text_field(self, selector, text):
+        """
+        :param selector: A tuple representing the element locator (e.g., (By.ID, "text_field_id")).
+        :param text: The text to input into the text field.
+        """
+        try:
+            text_field = WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(selector)
+            )
+
+            text_field.clear()
+            text_field.send_keys(text)
+        except TimeoutException:
+            raise Exception(f"Timeout while waiting for text field {selector} to be visible.")
+        except Exception as e:
+            raise Exception(f"Failed to fill text field {selector}: {e}")
+
+    def fill_editable_div(self, editable_div, text):
+        """
+        Fills an editable div element (e.g., a WYSIWYG editor) with the specified text.
+        :param editable_div: WebElement representing the editable div to be filled.
+        :param text: The text to insert into the editable div.
+        """
+        try:
+            # Scroll to the visible area
+            self.driver.execute_script("arguments[0].scrollIntoView(true);", editable_div)
+
+            # Wait until the element is clickable
+            WebDriverWait(self.driver, 10).until(EC.visibility_of(editable_div))
+            WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(editable_div))
+
+            ActionChains(self.driver).move_to_element(editable_div).click().perform()
+
+            # Select all text and delete
+            try:
+                editable_div.send_keys(Keys.CONTROL + "a")  # Select all (CTRL + A)
+                editable_div.send_keys(Keys.DELETE)  # Delete selected text
+            except Exception:
+                # Fallback: Clear content using JavaScript
+                self.driver.execute_script("arguments[0].innerHTML = '';", editable_div)
+
+            # Enter new text
+            editable_div.send_keys(text)
+
+        except Exception as e:
+            raise Exception(f"Error while filling the editable div: {e}")
+
+    def scroll_to_element(self, selector):
+        """
+        :param selector: A tuple representing the element locator (e.g., (By.ID, "element_id")).
+        """
+        try:
+            element = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(selector))
+            self.driver.execute_script("arguments[0].scrollIntoView({block: 'center'});", element)
+        except TimeoutException:
+            raise Exception(f"Timeout while trying to scroll to element {selector}.")
+        except Exception as e:
+            raise Exception(f"Failed to scroll to element {selector}: {e}")
+
+    def toggle_checkbox(self, selector, enable=True):
+        """
+        :param selector: Locator of the checkbox element.
+        :param enable: True to enable the checkbox, False to disable it.
+        """
+        try:
+            checkbox = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(selector)
+            )
+            self.scroll_to_element(selector)
+            if checkbox.is_selected() != enable:
+                self.click_element(selector)
+        except TimeoutException:
+            raise Exception(f"Timeout while waiting for checkbox {selector} to be present.")
+        except Exception as e:
+            raise Exception(f"Error while toggling checkbox {selector}: {e}")
+
+    def select_dropdown(self, selector, value, method="visible_text"):
+        """
+        :param selector: The locator tuple for the dropdown element.
+        :param value: The value or visible text of the option to select.
+        :param method: The selection method, either "visible_text" or "value".
+        """
+        try:
+            dropdowns = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_all_elements_located(selector)
+            )
+
+            # Filter visible dropdowns
+            visible_dropdown = next(el for el in dropdowns if el.is_displayed())
+
+            # Initialize the Select object with the visible dropdown
+            select = Select(visible_dropdown)
+
+            if method == "visible_text":
+                select.select_by_visible_text(value)
+            elif method == "value":
+                select.select_by_value(value)
+            else:
+                raise ValueError(f"Invalid method '{method}'. Use 'visible_text' or 'value'.")
+        except TimeoutException:
+            raise Exception(f"Timeout while selecting '{value}' in dropdown {selector}.")
+        except Exception as e:
+            raise Exception(f"Error while selecting '{value}' in dropdown {selector} using method '{method}': {e}")
+
+    def get_visible_table_rows(self, by, value):
+        """
+        Returns a list of visible rows from a table located by the given selector.
+        :param by: Selenium locator strategy (e.g., By.ID).
+        :param value: Locator value (e.g., "table_id").
+        :return: List of WebElement rows.
+        """
+        try:
+            table = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located((by, value)))
+            tbody = table.find_element(By.TAG_NAME, "tbody")
+            rows = [row for row in tbody.find_elements(By.TAG_NAME, "tr") if row.is_displayed()]
+            return rows
+        except TimeoutException:
+            raise Exception(f"Timeout while locating table rows in table '{value}'.")
+
+
+    def search_and_delete_item(self, item_name, item_id, item_type):
+        """
+        :param item_name: The name of the item to search for.
+        :param item_id: The unique ID of the item to delete.
+        :param item_type: The type of the item to delete (e.g., "questionnaire", "bundle", "clinic").
+        """
+        try:
+            # Initialize variables based on the item type
+            if item_type == "questionnaire":
+                self.navigator.navigate_to_manage_questionnaires()
+                search_box_selector = SearchBoxSelectors.QUESTIONNAIRE
+                button_id = RemoveButtonSelectors.QUESTIONNAIRE.format(item_id)
+            elif item_type == "bundle":
+                self.navigator.navigate_to_manage_bundles()
+                search_box_selector = SearchBoxSelectors.BUNDLE
+                button_id = RemoveButtonSelectors.BUNDLE.format(item_id)
+            elif item_type == "clinic":
+                self.navigator.navigate_to_manage_clinics()
+                search_box_selector = SearchBoxSelectors.CLINIC
+                button_id = RemoveButtonSelectors.CLINIC.format(item_id)
+            else:
+                raise ValueError(f"Unknown item type: {item_type}")
+
+            # Search for the element using the appropriate search box
+            self.fill_text_field(search_box_selector, item_name)
+
+            # click the remove button
+            self.click_element((By.ID, button_id))
+        except TimeoutException:
+            raise Exception(f"Failed to delete {item_type} '{item_name}' with ID {item_id}'.")
+        except Exception as e:
+            raise Exception(f"An error occurred while deleting {item_type} '{item_name}': {e}")
+
diff --git a/selenium/helper/Survey.py b/selenium/helper/Survey.py
new file mode 100644
index 00000000..3b98b327
--- /dev/null
+++ b/selenium/helper/Survey.py
@@ -0,0 +1,274 @@
+import time
+
+from selenium.common import TimeoutException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+
+from helper.Question import QuestionSelectors
+from helper.SeleniumUtils import SeleniumUtils
+
+class SurveySelectors:
+    BUTTON_SHOW_BUNDLES = (By.ID, "showBundles")
+    BUTTON_START_SURVEY = (By.ID, "startSurveyButton")
+    BUTTON_NEXT_QUESTION = (By.ID, "buttonNext")
+    BUTTON_CHECK_CASE = (By.ID, "checkButton")
+
+    DROPDOWN_CLINIC_SELECTION = (By.ID, "clinic-selection")
+    DROPDOWN_BUNDLE_SELECTION = (By.ID, "bundle-selection")
+    DROPDOWN_LANGUAGE_SELECTION = (By.ID, "bundle-language-selection")
+    DROPDOWN_GENERIC = (By.ID, "dropDown")
+
+    INPUT_CASE_NUMBER = (By.ID, "caseNumber")
+    INPUT_NUMBER = (By.ID, "numberInput")
+    INPUT_DATE = (By.ID, "dateInput")
+    INPUT_TEXTAREA = (By.ID, "textarea")
+
+    RADIO_REGISTER = (By.ID, "register")
+    RADIO_SEARCH_HIS = (By.ID, "isHIS")
+    RADIO_PSEUDONYMIZATION = (By.ID, "pseudonym")
+
+    SLIDER = (By.ID, "range")
+
+    TEXT_QUESTION_CONTENT = (By.ID, "questionContent")
+
+    LABEL_FOR_CHECKBOX = lambda selected_value: (By.CSS_SELECTOR, f"label[for='numberedCheckbox_{selected_value}']")
+    LABEL_BY_OPTION_TEXT = lambda option_text: (By.XPATH, f"//div[@class='right' and text()='{option_text}']/..")
+
+
+class SurveyHelper:
+
+    # Default values for survey interactions
+    DEFAULT_LANGUAGE_CODE = "de_DE"
+    DEFAULT_FREETEXT = "Default answer for freetext questions"
+    DEFAULT_SLIDER_POSITION = 0.5
+    DEFAULT_DATE = "1970-01-01"
+
+    def __init__(self, driver, login_helper):
+        self.driver = driver
+        self.login_helper = login_helper
+        self.utils = SeleniumUtils(driver)
+
+    def click_next_button(self):
+        self.utils.click_element(SurveySelectors.BUTTON_NEXT_QUESTION)
+
+    def start_survey(self, configuration, clinic_name, case_number):
+        """
+        Starts a survey as a user by interacting with the clinic selection,
+        configuration options, and case number input.
+
+        :param configuration: The configuration to select (e.g., "searchHIS" or "pseudonym").
+        :param clinic_name: The name of the clinic to select.
+        :param case_number: The case number to input.
+        """
+        try:
+            # Select clinic
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(SurveySelectors.DROPDOWN_CLINIC_SELECTION)
+            )
+            self.utils.select_dropdown(SurveySelectors.DROPDOWN_CLINIC_SELECTION, clinic_name, "visible_text")
+
+            # Select configuration
+            config_selector = configuration['config_selector']
+            self.utils.click_element(config_selector)
+
+            # Input case number
+            self.utils.fill_text_field(SurveySelectors.INPUT_CASE_NUMBER, case_number)
+
+            # Click check button
+            self.utils.click_element(SurveySelectors.BUTTON_CHECK_CASE)
+
+        except TimeoutException:
+            raise Exception("Timeout while starting the survey process.")
+        except Exception as e:
+            raise Exception(f"Error while starting survey: {e}")
+
+    def complete_survey(self):
+        self.click_next_button()
+
+        # Wait for the survey completion message to appear
+        WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(SurveySelectors.TEXT_QUESTION_CONTENT)
+        )
+
+        # Validate that the survey completion page is displayed
+        completion_content = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_CONTENT).text
+
+        # Optional: Return the completion content for further validation or logging
+        return completion_content
+
+    def proceed_to_bundle_selection(self, bundle_name, language_code=None):
+        """
+        :param bundle_name: The name of the bundle to select.
+        :param language_code: The code of the language to select (e.g., "de_DE") (optional).
+        """
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        try:
+            # Click "Show Bundles" button to proceed
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(SurveySelectors.BUTTON_SHOW_BUNDLES)
+            )
+            self.utils.click_element(SurveySelectors.BUTTON_SHOW_BUNDLES)
+
+            # Select bundle
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(SurveySelectors.DROPDOWN_BUNDLE_SELECTION)
+            )
+            self.utils.select_dropdown(SurveySelectors.DROPDOWN_BUNDLE_SELECTION, bundle_name, "visible_text")
+
+            # Select language if provided
+            if language_code:
+                self.utils.select_dropdown(SurveySelectors.DROPDOWN_LANGUAGE_SELECTION, language_code, "value")
+
+            # Start the survey
+            self.utils.click_element(SurveySelectors.BUTTON_START_SURVEY)
+
+        except TimeoutException:
+            raise Exception("Timeout while proceeding to bundle selection.")
+        except Exception as e:
+            raise Exception(f"Error while proceeding to bundle selection: {e}")
+
+    def answer_multiple_choice_question(self, question):
+        """
+        :param question: A dictionary containing the question details.
+        """
+        options = question.get("options")
+        min_answers = question.get("min_answers")
+        max_answers = question.get("max_answers")
+
+        # Validate min_answers and max_answers
+        if min_answers < 0 or max_answers > len(options) or min_answers > max_answers:
+            raise ValueError("Invalid min_answers or max_answers values.")
+
+        # Select at least min_answers options, but not more than max_answers
+        for i, option_text in enumerate(options[:max_answers]):
+            label = self.driver.find_element(*SurveySelectors.LABEL_BY_OPTION_TEXT(option_text))
+            label.click()
+
+    def answer_slider_question(self, question, slider_position=None):
+        """
+        :param question: The question dictionary containing slider configuration.
+        :param slider_position: A float value between 0 and 1 that determines the slider position.
+        """
+        slider_position = slider_position or self.DEFAULT_SLIDER_POSITION
+
+        # Ensure slider_position is between 0 and 1
+        if not (0 <= slider_position <= 1):
+            raise ValueError("slider_position must be a value between 0 and 1.")
+
+        # Extract slider properties from the question
+        min_value = question.get("min_value")
+        max_value = question.get("max_value")
+
+        # Calculate the target value for the slider
+        target_value = min_value + (slider_position * (max_value - min_value))
+
+        # Set the slider value in the DOM
+        self.driver.execute_script("document.getElementById('range').value=arguments[0];", target_value)
+
+        # Trigger events to simulate user interaction with the slider
+        slider_element = self.driver.find_element(*SurveySelectors.SLIDER)
+        self.driver.execute_script("arguments[0].dispatchEvent(new Event('mousedown'));", slider_element)
+        self.driver.execute_script("arguments[0].dispatchEvent(new Event('mouseup'));", slider_element)
+
+    def answer_number_checkbox_question(self, question, selected_value=None):
+        """
+        :param question: The question dictionary containing numeric checkbox configuration.
+        :param selected_value: A numeric value to select, between min_value and max_value.
+        """
+        # Extract the min, max, and step values from the question
+        min_value = question.get("min_value")
+        max_value = question.get("max_value")
+        step_size = question.get("step_size")
+        selected_value = selected_value or min_value
+
+        if not (min_value <= selected_value <= max_value):
+            raise ValueError(f"Value {selected_value} is not within the allowed range {min_value} to {max_value}.")
+        if (selected_value - min_value) % step_size != 0:
+            raise ValueError(f"Value {selected_value} does not match the step size {step_size}.")
+
+        # Find and select the checkbox
+        label_element = self.driver.find_element(*SurveySelectors.LABEL_FOR_CHECKBOX(selected_value))
+        label_element.click()
+
+    def answer_text_question(self, text=None):
+        """
+        :param text: The text to input. Defaults to `DEFAULT_FREETEXT`.
+        """
+        text = text or self.DEFAULT_FREETEXT
+        self.driver.find_element(*SurveySelectors.INPUT_TEXTAREA).send_keys(text)
+
+    def answer_number_checkbox_text_question(self, question, selected_value=None, text=None):
+        """
+        :param question: A dictionary containing numeric checkbox configuration (min/max/step values).
+        :param selected_value: The numeric value to select. Defaults to the minimum value.
+        :param text: The text to input in the associated text field. Defaults to `DEFAULT_FREETEXT`.
+        """
+        self.answer_number_checkbox_question(question, selected_value)
+        self.answer_text_question(text)
+
+    def answer_date_question(self, question, date=None):
+        """
+        :param question: A dictionary containing question details. The function uses a default date if none is specified.
+        :param date: A string representing the date to set (e.g., "2024-12-20").
+        """
+        date = date or self.DEFAULT_DATE
+        self.driver.execute_script("document.getElementById('dateInput').valueAsDate = new Date(arguments[0]);", date)
+        self.driver.execute_script("document.getElementById('dateInput').dispatchEvent(new Event('blur'));")
+
+    def select_dropdown_option(self, question, option_text=None):
+        """
+        :param question: A dictionary containing the dropdown question details, including available options.
+        :param option_text: The visible text of the dropdown option to select. If not provided,
+            the first option from the "options" list in the question will be selected.
+        """
+        options = question.get("options")
+        option_text = option_text or options[0]
+
+        Select(self.driver.find_element(*SurveySelectors.DROPDOWN_GENERIC)).select_by_visible_text(option_text)
+
+    def answer_numbered_input_question(self, question, value=None):
+        """
+        :param question: The question dictionary containing the numbered input configuration.
+        :param value: The numeric value to input. Defaults to the minimum value from the question configuration.
+        """
+        # Extract constraints from the question
+        min_value = question.get("min_value", 0)
+        max_value = question.get("max_value", 10)
+        step_size = question.get("step_size", 1)
+
+        # Use default value if not explicitly provided
+        if value is None:
+            value = min_value
+
+
+        # Locate the input element and set the value
+        input_element = self.driver.find_element(*SurveySelectors.INPUT_NUMBER)
+        input_element.clear()
+        input_element.send_keys(str(value))
+
+        # Trigger the `onchange` event if necessary
+        self.driver.execute_script("arguments[0].dispatchEvent(new Event('change'));", input_element)
+
+    def end_survey(self):
+        # Get the current URL before clicking the "Next" button
+        current_url = self.driver.current_url
+
+        # Click the "Next" button
+        self.click_next_button()
+
+        # Wait until the URL changes
+        WebDriverWait(self.driver, 15).until(
+            lambda driver: driver.current_url != current_url,
+            message="URL did not change after clicking 'Next' button."
+        )
+
+class SurveyAssertHelper(SurveyHelper):
+
+    def assertion_for_welcome_text(self, text):
+        WebDriverWait(self.driver, 10).until(
+            EC.text_to_be_present_in_element(SurveySelectors.TEXT_QUESTION_CONTENT, text)
+        )
+        welcome_text = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_CONTENT).text
+        assert text in welcome_text, "Welcome text not found!"
\ No newline at end of file
diff --git a/selenium/localhost8080.py b/selenium/localhost8080.py
new file mode 100644
index 00000000..a9a05740
--- /dev/null
+++ b/selenium/localhost8080.py
@@ -0,0 +1,680 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import random
+import string
+import unittest
+import datetime
+
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+
+from helper.Authentication import AuthenticationHelper
+from helper.Bundle import BundleHelper
+from helper.Clinic import ClinicHelper, ClinicSelectors
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper, QuestionErrorHelper, QuestionSelectors
+from helper.Questionnaire import QuestionnaireHelper, ConditionHelper, ScoreHelper
+from helper.SeleniumUtils import SeleniumUtils
+from helper.Survey import SurveyHelper, SurveySelectors, SurveyAssertHelper
+from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
+from selenium.common.exceptions import TimeoutException
+
+
+class URLPaths:
+    ADMIN_INDEX = "/admin/index"
+    ADMIN_INDEX_DE = "/admin/index?lang=de_DE"
+    MOBILE_USER_LOGIN = "/mobile/user/login"
+    MOBILE_USER_LOGIN_DE = "/mobile/user/login?lang=de_DE"
+    MOBILE_SURVEY_INDEX = "/mobile/survey/index"
+    LOGIN_BAD_CREDENTIALS = "/mobile/user/login?message=BadCredentialsException"
+    LOGIN_DISABLED_EXCEPTION = "/mobile/user/login?message=DisabledException"
+    PASSWORD_FORGOT = "/mobile/user/password"
+
+
+class EmailSelectors:
+    SUBJECT_INPUT = (By.ID, "subject")
+    CONTENT_INPUT = (By.ID, "mailContent")
+    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
+    SEND_BUTTON = (By.ID, "mailButton")
+
+
+class PasswordResetSelectors:
+    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+    USERNAME_INPUT = (By.ID, "username")
+    ERROR_MESSAGE = (By.CLASS_NAME, "error")
+
+
+class CustomTest(IMISeleniumChromeTest, unittest.TestCase):
+    seleniumMode: IMISeleniumBaseTest.SeleniumMode = IMISeleniumBaseTest.SeleniumMode.LOCAL
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.base_url = "localhost:8080"
+        cls.https_base_url = "http://localhost:8080"
+
+    def setUp(self):
+        # Initialize the WebDriver
+        self.driver = webdriver.Chrome()
+
+        # Initialize Navigation and Utils
+        self.navigation_helper = NavigationHelper(self.driver)
+        self.utils = SeleniumUtils(self.driver, navigator=self.navigation_helper)
+        self.navigation_helper.utils = self.utils
+
+        # Initialize other helpers
+        self.authentication_helper = AuthenticationHelper(self.driver)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver)
+        self.question_helper = QuestionHelper(self.driver)
+        self.condition_helper = ConditionHelper(self.driver)
+        self.score_helper = ScoreHelper(self.driver)
+        self.questionnaire_error_helper = QuestionErrorHelper(self.driver)
+
+        self.bundle_helper = BundleHelper(self.driver, self.questionnaire_helper, self.navigation_helper)
+        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.authentication_helper)
+
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.authentication_helper)
+
+    def test_login_ad_admin(self):
+        # Arrange
+        if not self.secret.get('admin-username-ad') or not self.secret.get('admin-password-ad'):
+            self.skipTest("Admin login data is missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+
+        # Act
+        self.authentication_helper.login(self.secret['admin-username-ad'], self.secret['admin-password-ad'])
+
+        # Assert - Verify login
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.ADMIN_INDEX)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Login failed: Expected URL '{self.https_base_url + URLPaths.ADMIN_INDEX}', but got '{current_url}'")
+
+        self.authentication_helper.logout()
+
+        # Assert - Verify logout
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
+
+    def test_login_local_admin(self):
+        # Arrange
+        if not self.secret.get('admin-username-local') or not self.secret.get('admin-password-ad'):
+            self.skipTest("Admin login data is missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+
+        self.authentication_helper.login(self.secret['admin-username-local'], self.secret['admin-password-ad'])
+
+        # Assert - Verify login
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.ADMIN_INDEX)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Login failed: Expected URL '{self.https_base_url + URLPaths.ADMIN_INDEX}', but got '{current_url}'")
+
+        # Logout
+        self.authentication_helper.logout()
+
+        # Assert - Verify logout
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
+
+    def test_login_ad_user(self):
+        # Arrange
+        if not self.secret.get('user-username-ad') or not self.secret.get('user-password-ad'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+
+        # Act
+        self.authentication_helper.login(self.secret['user-username-ad'], self.secret['user-password-ad'])
+
+        # Assert - Verify login
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Login failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX}', but got '{current_url}'")
+
+        # Logout
+        self.authentication_helper.logout()
+
+        # Assert - Verify logout
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
+
+    def test_login_local_user(self):
+        # Arrange
+        if not self.secret.get('user-username-local') or not self.secret.get('user-password-local'):
+            self.skipTest("Local user credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+
+        # Act
+        self.authentication_helper.login(self.secret['user-username-local'], self.secret['user-password-local'])
+
+        # Assert - Verify login
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Login failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX}', but got '{current_url}'")
+
+        # Logout
+        self.authentication_helper.logout()
+
+        # Assert - Verify logout
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(
+                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
+
+    def test_login_unknown_user(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+
+        # Generate random login username and password
+        username = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
+        password = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
+
+        # Act
+        self.authentication_helper.login(username, password)
+
+        # Assert - Verify bad credentials URL
+        expected_url = self.https_base_url + URLPaths.LOGIN_BAD_CREDENTIALS
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(expected_url)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(f"URL mismatch. Expected '{expected_url}', got '{current_url}'")
+
+    def test_login_ad_user_wrong_password(self):
+        # Arrange
+        if not self.secret.get('user-username-local'):
+            self.skipTest("User login data is missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+
+        # Generate random login password
+        username = self.secret['user-username-local']
+        password = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
+
+        # Act
+        self.authentication_helper.login(username, password)
+
+        # Check expected URL
+        expected_url = self.https_base_url + URLPaths.LOGIN_BAD_CREDENTIALS
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.url_to_be(expected_url)
+            )
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(f"URL mismatch. Expected part of URL '{expected_url}', but got '{current_url}'")
+
+    def test_login_local_user_wrong_password(self):
+        # Arrange
+        if not self.secret.get('user-username-local'):
+            self.skipTest("Local user login data is missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+
+        # Generate random login password
+        username = self.secret['user-username-local']
+        password = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
+
+        # Act
+        self.authentication_helper.login(username, password)
+
+        # Check expected URL
+        expected_url = self.https_base_url + URLPaths.LOGIN_BAD_CREDENTIALS
+        try:
+            WebDriverWait(self.driver, 10).until(EC.url_to_be(expected_url))
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(f"URL mismatch. Expected '{expected_url}', but got '{current_url}'")
+
+    def test_login_disabled_ad_user(self):
+        # Arrange
+        if not self.secret.get('user-username-disabled-ad') or not self.secret.get('user-password-disabled-ad'):
+            self.skipTest("Disabled user login data is missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        username = self.secret['user-username-disabled-ad']
+        password = self.secret['user-password-disabled-ad']
+
+        # Act
+        self.authentication_helper.login(username, password)
+
+        # Assert
+        expected_url = self.https_base_url + URLPaths.LOGIN_DISABLED_EXCEPTION
+        try:
+            WebDriverWait(self.driver, 10).until(EC.url_to_be(expected_url))
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(f"URL mismatch. Expected URL '{expected_url}', but got '{current_url}'")
+
+    def test_password_reset_unknown_user(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+
+        # Act
+        # Click on “Forgot your password?” Link
+        try:
+            forgot_password_link = WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(PasswordResetSelectors.FORGOT_PASSWORD_LINK)
+            )
+            forgot_password_link.click()
+        except TimeoutException:
+            self.fail("Failed to locate or click the 'Forgot your password?' link.")
+
+        # Assert - Verify navigation to password reset page
+        expected_url = self.https_base_url + URLPaths.PASSWORD_FORGOT
+        try:
+            WebDriverWait(self.driver, 10).until(EC.url_to_be(expected_url))
+        except TimeoutException:
+            current_url = self.driver.current_url
+            self.fail(f"URL mismatch: Expected '{expected_url}', but got '{current_url}'")
+
+        # Act - Input random username
+        random_username = ''.join(random.choice(string.ascii_lowercase) for _ in range(7))
+        try:
+            username_input = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(PasswordResetSelectors.USERNAME_INPUT)
+            )
+            username_input.clear()
+            username_input.send_keys(random_username)
+            username_input.send_keys(Keys.ENTER)
+        except TimeoutException:
+            self.fail("Failed to locate or fill the username input field.")
+
+        # Assert - Verify error message
+        try:
+            error_message_element = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(PasswordResetSelectors.ERROR_MESSAGE)
+            )
+            error_message_text = error_message_element.text.strip()
+            assert "Der Nutzername ist nicht vergeben oder es ist diesem keine E-Mail Adresse zugeordnet." in error_message_text, \
+                f"Error message mismatch. Expected text not found. Got: '{error_message_text}'"
+        except TimeoutException:
+            self.fail("Error message not displayed after entering invalid username.")
+
+    def test_rundmail(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.admin_login()
+
+        try:
+            self.navigation_helper.navigate_to_email_to_all_users()
+        except Exception as e:
+            self.fail(f"Failed to navigate to 'Email to All Users' page: {e}")
+
+        try:
+            # Act
+            # Input subject
+            self.utils.fill_text_field(EmailSelectors.SUBJECT_INPUT, "[MoPat3] Selenium Test")
+
+            # Input email content
+            email_content = (
+                "Sehr geehrte Damen und Herren,\n\n"
+                "diese E-Mail dient dem Test der Rundmailfunktion von MoPat3. "
+                "Diese E-Mail sollte an Nutzer mit identischer E-Mail Adresse nur genau einmal versandt werden. "
+                "Zusätzlich wird diese E-Mail an die konfigurierte Absenderadresse verschickt und sollte auch an diese Adresse nur genau einmal versandt werden.\n\n"
+                "Viele Grüße,\n\nMoPat3"
+            )
+            self.utils.fill_text_field(EmailSelectors.CONTENT_INPUT, email_content)
+
+            # Assert / Confirm the email sending
+            self.utils.click_element(EmailSelectors.SEND_BUTTON)
+        except TimeoutException as e:
+            self.fail(f"Test failed due to timeout: {e}")
+        except Exception as e:
+            self.fail(f"Unexpected error occurred: {e}")
+        finally:
+            # Logout to clean up
+            self.authentication_helper.logout()
+
+    def test_questionnaire_create_all_types(self):
+        # Arrange
+        questionnaire_name = f"Fragebogen alle Typen - Conditions - Scores - Bundles - Clinics {datetime.datetime.now()}"
+        description = questionnaire_name
+        language_code = "de_DE"
+        localized_display_name = questionnaire_name
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.admin_login()
+
+        questionnaire_id = None
+        try:
+            # Act
+            # Navigate to 'Manage Questionnaires', add a new questionnaire, and fill in its name
+            self.navigation_helper.navigate_to_manage_questionnaires()
+            self.questionnaire_helper.click_add_questionnaire_button()
+            self.questionnaire_helper.fill_questionnaire_details(questionnaire_name, description, language_code,
+                                                                 localized_display_name)
+
+            # Save the questionnaire and extract its ID
+            self.questionnaire_helper.save_questionnaire_edit_question()
+            WebDriverWait(self.driver, 15).until(EC.url_contains("id="))
+            current_url = self.driver.current_url
+            questionnaire_id = current_url.split("id=")[1]
+
+            # Add all question types to the questionnaire
+            for add_question_method in self.question_helper.QUESTION_TYPES:
+                try:
+                    self.questionnaire_helper.click_add_question_button()
+                    add_question_method()
+                    self.question_helper.save_question()
+                except TimeoutException:
+                    self.fail(f"Failed to add a question of type {add_question_method.__name__}.")
+
+            # Assert
+            # Verify the correct number of questions were added
+            WebDriverWait(self.driver, 30).until(
+                EC.presence_of_element_located(QuestionSelectors.TABLE_QUESTION)
+            )
+            rows = self.utils.get_visible_table_rows(*QuestionSelectors.TABLE_QUESTION)
+            expected_count = len(self.question_helper.QUESTION_TYPES)
+            assert len(rows) == expected_count, f"Expected {expected_count} questions, found {len(rows)}."
+
+        finally:
+            # Cleanup
+            if questionnaire_id:
+                self.utils.search_and_delete_item(questionnaire_name, questionnaire_id, "questionnaire")
+            self.authentication_helper.logout()
+
+    def test_questionnaire_create_all_types_with_error(self):
+        # Arrange
+        questionnaire_id = None
+        questionnaire_name = f"Fragebogen alle Typen Selenium Test Mit Fehlertest {datetime.datetime.now()}"
+        questionnaire_description = "Dieser Fragebogen enthält alle bisher implementierten Fragetypen"
+        language_code = "de_DE"
+        questionnaire_display_name = questionnaire_name
+
+        # Login as Admin
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.admin_login()
+
+        try:
+            # Act
+            # Create Questionnaire
+            self.navigation_helper.navigate_to_manage_questionnaires()
+            self.questionnaire_helper.click_add_questionnaire_button()
+            self.questionnaire_helper.fill_questionnaire_details(
+                questionnaire_name, questionnaire_description, language_code, questionnaire_display_name)
+            questionnaire_id = self.questionnaire_helper.save_questionnaire_edit_question()
+
+            # Define question-adding methods with error cases
+            question_methods = [
+                self.questionnaire_error_helper.add_question_info_text,
+                self.questionnaire_error_helper.add_question_multiple_choice,
+                self.questionnaire_error_helper.add_numeric_checkbox_with_failed_cases,
+                self.questionnaire_error_helper.add_question_slider_question,
+                self.questionnaire_error_helper.add_question_numeric_checkbox,
+                self.questionnaire_error_helper.add_question_numeric_checkbox_freetext,
+                self.questionnaire_error_helper.add_question_date_question,
+                self.questionnaire_error_helper.add_question_freetext,
+            ]
+
+            # Add Questions to questionnaire (all question types)
+            for add_question_method in question_methods:
+                try:
+                    self.questionnaire_helper.click_add_question_button()
+                    add_question_method()
+                    self.question_helper.save_question()
+                except Exception as e:
+                    self.fail(f"Failed to add question using method {add_question_method.__name__}: {e}")
+
+            # Assert
+            # Verify the correct number of questions are added
+            WebDriverWait(self.driver, 30).until(
+                EC.visibility_of_element_located(QuestionSelectors.TABLE_QUESTION)
+            )
+            WebDriverWait(self.driver, 30).until(
+                lambda driver: driver.execute_script("return document.readyState") == "complete"
+            )
+            rows = [
+                row for row in self.driver.find_element(*QuestionSelectors.TABLE_QUESTION)
+                .find_element(By.TAG_NAME, "tbody")
+                .find_elements(By.TAG_NAME, "tr") if row.is_displayed()
+            ]
+            assert len(rows) == len(
+                question_methods
+            ), f"Expected {len(question_methods)} questions, found {len(rows)}."
+
+        finally:
+            # Cleanup
+            if questionnaire_id:
+                self.utils.search_and_delete_item(questionnaire_name, questionnaire_id, "questionnaire")
+            self.authentication_helper.logout()
+
+    # TODO [] Add assertions to survey execution (add to class SurveyAssertHelper)
+    def test_complete_workflow(self):
+        # Arrange
+        timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+        username_creator = "admin"
+        username_survey_executor = "user"
+
+        questionnaire_id = None
+        questionnaire_name = f"Fragebogen alle Typen {timestamp}"
+        questionnaire_description = "Dieser Fragebogen enthält alle bisher implementierten Fragetypen"
+        questionnaire_language_code = "de_DE"
+        questionnaire_welcome_text = 'Ein Willkommenstext für das Paket "Selenium-Paket". Nichts besonderes zu sehen. 2'
+        questionnaire_final_text = 'Dieser Text wird am Ende des Fragebogens gezeigt.'
+        questionnaire_display_name = questionnaire_name
+        added_questions = []
+
+        bundle_id = None
+        bundle_name = f"Test Bundle {random.randint(1, 999999)}"
+
+        clinic_id = None
+        clinic_name = f"Test Klinik {timestamp}"
+        clinic_description = "Diese Klinik enthält das Fragebogenpaket \'Fragebogenpaket Alle Typen CBSC\'"
+        configurations = [
+            {'selector': ClinicSelectors.CONFIG_REGISTER_PATIENT_DATA,
+             'config_selector': SurveySelectors.RADIO_REGISTER},
+            {'selector': ClinicSelectors.CONFIG_USE_PATIENT_DATA_LOOKUP, 'dropdown_value': "patient lookup 1",
+             'config_selector': SurveySelectors.RADIO_SEARCH_HIS},
+            {'selector': ClinicSelectors.CONFIG_USE_PSEUDONYMIZATION_SERVICE, 'dropdown_value': "pseudonymization 1",
+             'config_selector': SurveySelectors.RADIO_PSEUDONYMIZATION}
+        ]
+
+        # Login as Admin
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.admin_login(username=username_creator)
+
+        try:
+            # Act
+            # Step 1: Create Questionnaire
+            self.navigation_helper.navigate_to_manage_questionnaires()
+            self.questionnaire_helper.click_add_questionnaire_button()
+            self.questionnaire_helper.fill_questionnaire_details(questionnaire_name, questionnaire_description,
+                                                                 questionnaire_language_code,
+                                                                 questionnaire_display_name, questionnaire_welcome_text,
+                                                                 questionnaire_final_text)
+            questionnaire_id = self.questionnaire_helper.save_questionnaire_edit_question()
+            questionnaires = [{"id": questionnaire_id, "name": questionnaire_name}]
+
+            # Step 2: Add Questions to questionnaire (all question types)
+            for add_question_method in self.question_helper.QUESTION_TYPES:
+                self.questionnaire_helper.click_add_question_button()
+                question_info = add_question_method()
+                added_questions.append(question_info)
+                self.question_helper.save_question()
+
+            # Assert
+            # Verify the number of questions added
+            self.questionnaire_error_helper.verify_number_of_questions(len(self.question_helper.QUESTION_TYPES))
+
+            # Act
+            # Step 3: Add Bundle
+            self.navigation_helper.navigate_to_manage_bundles()
+            bundle_id = None
+            if not self.bundle_helper.bundle_exists(bundle_name):
+                self.bundle_helper.create_bundle(bundle_name, True, questionnaires)
+                bundle_id = self.bundle_helper.save_bundle(bundle_name)
+            bundles = [{"id": bundle_id, "name": bundle_name}]
+
+            # Step 4: Add Clinic
+            self.navigation_helper.navigate_to_manage_clinics()
+            self.clinic_helper.create_clinic(clinic_name, clinic_description, configurations, bundles,
+                                             [username_creator, username_survey_executor])
+            clinic_id = self.clinic_helper.save_clinic(clinic_name)
+
+        finally:
+            # Logout
+            try:
+                self.authentication_helper.logout()
+            except Exception as e:
+                print(f"Logout failed: {e}")
+
+        # Step 5: Execute survey
+
+        # Arrange
+        case_number = "55755388"
+        language_value = "de_DE"
+        welcome_text = 'Ein Willkommenstext für das Paket "Selenium-Paket". Nichts besonderes zu sehen.'
+
+        # Login as User
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.user_login(username=username_survey_executor)
+
+        try:
+            # Act
+            self.survey_helper.start_survey(configurations[0], clinic_name, case_number)
+            self.survey_helper.proceed_to_bundle_selection(bundle_name, language_value)
+            self.survey_helper.click_next_button()
+            # Assert
+            self.survey_assert_helper.assertion_for_welcome_text(welcome_text)
+            # Act
+            self.survey_helper.click_next_button()
+
+            for question in added_questions:
+                if question["type"] == QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE:
+                    self.survey_helper.answer_multiple_choice_question(question)
+                elif question["type"] == QuestionSelectors.QuestionTypes.SLIDER:
+                    self.survey_helper.answer_slider_question(question)
+                elif question["type"] == QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX:
+                    self.survey_helper.answer_number_checkbox_question(question)
+                elif question["type"] == QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX_TEXT:
+                    self.survey_helper.answer_number_checkbox_text_question(question)
+                elif question["type"] == QuestionSelectors.QuestionTypes.FREE_TEXT:
+                    self.survey_helper.answer_text_question()
+                elif question["type"] == QuestionSelectors.QuestionTypes.DATE:
+                    self.survey_helper.answer_date_question(question)
+                elif question["type"] == QuestionSelectors.QuestionTypes.DROP_DOWN:
+                    self.survey_helper.select_dropdown_option(question)
+                elif question["type"] == QuestionSelectors.QuestionTypes.NUMBER_INPUT:
+                    self.survey_helper.answer_numbered_input_question(question)
+
+                self.survey_helper.click_next_button()
+
+            # Complete the survey
+            self.survey_helper.complete_survey()
+            # End survey
+            self.survey_helper.end_survey()
+
+        finally:
+            # Cleanup (teardown)
+            # Logout
+            try:
+                self.authentication_helper.logout()
+            except Exception as e:
+                print(f"Logout failed: {e}")
+
+    # TODO [] complete creation of the test 'test_TestCase_Questionnaire_Create_and_Remove_All_Types_with_Bundle_Clinic_Conditions'
+    def test_case_questionnaire_Create_and_Remove_All_Types_with_Bundle_Clinic_Conditions(self):
+
+        questionnaire_id = None
+        questionnaire_name = ""
+        bundle_id = None
+        bundle_name = ""
+        clinic_id = None
+        clinic_name = ""
+
+        try:
+            pass
+            # Step 1: Create Questionnaire
+            # Step 2: Add Questions to questionnaire (all question types)
+            # Step 3: Add Bundle
+            # Step 4: Add Clinic
+            # Step 5: Add Conditions
+            # TODO [] implement methods
+            # self.condition_helper.add_condition_to_questionnaire()
+            # Step 6: Add Scores
+            # TODO [] implement methods
+            # self.score_helper.add_score_to_questionnaire()
+
+        finally:
+            # Cleanup (teardown): Logout and clean up created test data (questionnaire, bundle, clinic)
+            # Delete clinic
+            try:
+                if clinic_id:
+                    self.utils.search_and_delete_item(clinic_name, clinic_id, "clinic")
+            except Exception as e:
+                print(f"Cleanup failed for clinic '{clinic_name}': {e}")
+            # Delete bundle
+            try:
+                if bundle_id:
+                    self.utils.search_and_delete_item(bundle_name, bundle_id, "bundle")
+            except Exception as e:
+                print(f"Cleanup failed for bundle '{bundle_name}': {e}")
+            # Delete questionnaire
+            try:
+                if questionnaire_id:
+                    self.utils.search_and_delete_item(questionnaire_name, questionnaire_id, "questionnaire")
+            except Exception as e:
+                print(f"Cleanup failed for questionnaire '{questionnaire_name}': {e}")
+            # Logout
+            try:
+                self.authentication_helper.logout()
+            except Exception as e:
+                print(f"Logout failed: {e}")
+
+    # TODO [] complete creation of the test 'test_TestCase_Questionnaire_All_Types_with_Bundle_Clinic_Conditions_Create_and_Remove_Scores'
+    def test_case_questionnaire_all_types_with_bundle_clinic_conditions_create_and_remove_scores(self):
+        pass
+
+
+    def tearDown(self):
+        if self.driver:
+            self.driver.quit()
+
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/selenium/secrets/localhost8080.json b/selenium/secrets/localhost8080.json
new file mode 100644
index 00000000..7a73a41b
--- /dev/null
+++ b/selenium/secrets/localhost8080.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/selenium/utils/imiseleniumtest.py b/selenium/utils/imiseleniumtest.py
new file mode 100644
index 00000000..f7db0e62
--- /dev/null
+++ b/selenium/utils/imiseleniumtest.py
@@ -0,0 +1,200 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Script containing the base class of selenium tests.
+Handles driver initialization and server/local switches.
+"""
+import json
+import os
+from abc import ABC, abstractmethod
+import requests
+import unittest
+import inspect
+from selenium import webdriver
+import enum
+from time import gmtime, strftime
+
+
+# noinspection PyStatementEffect
+class IMISeleniumBaseTest(ABC):
+    """
+        Base class of all IMI selenium tests.
+        * Handles the initialization of the driver.
+        * Switches between server and local mode
+    """
+
+
+    class SeleniumMode(enum.Enum):
+        """
+            Helper to configure if selenium should run on server or locally
+            Default mode is AUTO
+        """
+        SERVER = 1 # run on server
+        LOCAL  = 2 # run local
+        AUTO   = 3 # try server and if an error occurs switch to local
+
+
+    currentResult = None
+    """ Attribute used to set a cookie for validation purposes. """
+    driver = None
+    """ Selenium driver used in the tests. """
+    seleniumMode: SeleniumMode = SeleniumMode.AUTO
+    """ Use selenium on the server or locally? """
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        """
+            Used to initialize constants.
+        """
+        # get filename of calling script (url)
+        url = os.path.basename(inspect.getouterframes(inspect.currentframe())[-1].filename)[:-3]
+        cls.base_url = url
+        cls.https_base_url = f"https://{url}"
+        # secret used in the subclass
+        cls.secret = cls._loadSecretFile(cls, url)
+        cls.basic_auth = cls._loadSecretFile(cls, "basic-auth")
+        if cls.basic_auth is not None:
+            cls.selenium_grid_url = f"https://{cls.basic_auth['user']}:{cls.basic_auth['passwd']}@selenoid.uni-muenster.de/wd/hub/"
+        else:
+            cls.selenium_grid_url = None
+
+    def setUp(self) -> None:
+        """
+            Start a new driver for each test.
+            Checks, if the script is called on the server or locally.
+        """
+        if (self.seleniumMode == self.SeleniumMode.SERVER):
+                try:
+                    self._setServerDriver()
+                except Exception as e:
+                    print(e)
+        elif self.seleniumMode == self.SeleniumMode.LOCAL:
+                try:
+                    # create folder for driver
+                    directory = os.path.join(os.getcwd(), "driver")
+                    if not os.path.exists(directory):
+                        os.makedirs(directory)
+                    # init driver
+                    self._setLocalDriver(directory)
+                except Exception as e:
+                    print(e)
+        elif self.seleniumMode == self.SeleniumMode.AUTO:
+                # check if script runs on server or local
+                try:
+                    # if this call fails, we are local
+                    requests.get(self.selenium_grid_url)
+                    # init driver
+                    self._setServerDriver()
+                except Exception as e:
+                    # create folder for driver
+                    directory = os.path.join(os.getcwd(), "driver")
+                    if not os.path.exists(directory):
+                        os.makedirs(directory)
+                    # init driver
+                    self._setLocalDriver(directory)
+
+        # maximize window to full-screen
+        self.driver.maximize_window()
+
+    def run(self, result=None) -> None:
+        """
+            Main function of the unit test.
+        """
+        self.currentResult = result
+        unittest.TestCase.run(self, result)
+
+    def tearDown(self) -> None:
+        """
+            Sets the cookie to validate, if the test was successful or not.
+        """
+        if self.currentResult.wasSuccessful():
+            cookie = {'name': 'zaleniumTestPassed', 'value': 'true'}
+        else:
+            cookie = {'name': 'zaleniumTestPassed', 'value': 'false'}
+        self.driver.add_cookie(cookie)
+        self.driver.quit()
+
+    def _loadSecretFile(self, filename):
+        """
+        Used to try loading file from server or locally.
+
+        :param filename: file to be loaded without .json
+        :return: The loaded json object or None
+        """
+        secret_server = f"/etc/selenium/{filename}.json"
+        if os.path.exists(secret_server):
+            with open(secret_server) as f:
+                return json.load(f)
+        else:
+            secret_local = os.path.join(os.getcwd(), "secrets", f"{filename}.json")
+            if os.path.exists(secret_local):
+                with open(secret_local) as f:
+                    return json.load(f)
+        return None
+
+    @abstractmethod
+    def _setServerDriver(self):
+        self.driver = None
+
+    @abstractmethod
+    def _setLocalDriver(self, directory):
+        self.driver = None
+
+
+class IMISeleniumChromeTest(IMISeleniumBaseTest):
+    """
+        Test class for Chrome tests.
+    """
+    def _setServerDriver(self):
+        name: str = f"{strftime('%Y-%m-%d-%H-%M-%S', gmtime())}_{self.base_url}_chrome"
+        options = webdriver.ChromeOptions()
+        options.set_capability("acceptInsecureCerts", True)
+        options.set_capability("selenoid:options", {
+                                                    "enableVNC": True,
+                                                    "enableVideo": True,
+                                                    "enableLog": True,
+                                                    "name": name,
+                                                    "videoName": f"{name}.mp4",
+                                                    "logName": f"{name}.log"
+                                                    })
+        self.driver = webdriver.Remote(options=options,
+                                       command_executor=self.selenium_grid_url)
+
+
+    def _setLocalDriver(self, directory):
+        # download latest driver
+        from selenium.webdriver.chrome.service import Service
+        from webdriver_manager.chrome import ChromeDriverManager
+        from webdriver_manager.core.driver_cache import DriverCacheManager
+        # init driver
+        self.driver = webdriver.Chrome(service=Service(ChromeDriverManager(cache_manager=DriverCacheManager(directory)).install()))
+
+
+
+class IMISeleniumFirefoxTest(IMISeleniumBaseTest):
+    """
+        Test class for Firefox tests.
+    """
+    def _setServerDriver(self):
+        name: str = f"{strftime('%Y-%m-%d-%H-%M-%S', gmtime())}_{self.base_url}_firefox"
+        options = webdriver.FirefoxOptions()
+        options.set_capability("acceptInsecureCerts", True)
+        options.set_capability("selenoid:options", {
+                                                    "enableVNC": True,
+                                                    "enableVideo": True,
+                                                    "enableLog": True,
+                                                    "name": name,
+                                                    "videoName": f"{name}.mp4",
+                                                    "logName": f"{name}.log"
+                                                    })
+        self.driver = webdriver.Remote(options=options,
+                                       command_executor=self.selenium_grid_url)
+
+    def _setLocalDriver(self, directory):
+        # download latest driver
+        from webdriver_manager.firefox import GeckoDriverManager
+        from selenium.webdriver.chrome.service import Service
+        from webdriver_manager.core.driver_cache import DriverCacheManager
+        # init driver
+        self.driver = webdriver.Firefox(service=Service(GeckoDriverManager(cache_manager=DriverCacheManager(directory)).install()))
+

From 28f5e7ae94d4c34c338f24ff06743429da97c06b Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Thu, 2 Jan 2025 14:19:15 +0100
Subject: [PATCH 03/20] **Enhance Selenium Helpers**

- Add type annotations and modularize helpers (Scores, Conditions, Bundles, etc.).
- Extend  with , , and .
- Add navigation for questionnaire questions and scores.
- Update HTML with missing element IDs.
---
 selenium/helper/Authentication.py             |   1 +
 selenium/helper/Bundle.py                     |   6 +-
 selenium/helper/Clinic.py                     |   5 +-
 selenium/helper/Condition.py                  | 197 ++++++++++++++++++
 selenium/helper/Navigation.py                 |  18 ++
 selenium/helper/Question.py                   |  30 ++-
 selenium/helper/Questionnaire.py              | 124 +++++++++--
 selenium/helper/Score.py                      | 123 +++++++++++
 selenium/helper/SeleniumUtils.py              |  37 +++-
 selenium/helper/Survey.py                     |  37 +++-
 selenium/localhost8080.py                     | 153 +++++++++-----
 .../webapp/WEB-INF/mobile/user/login.html     |   2 +-
 src/main/webapp/WEB-INF/score/edit.html       |   2 +
 13 files changed, 650 insertions(+), 85 deletions(-)
 create mode 100644 selenium/helper/Condition.py
 create mode 100644 selenium/helper/Score.py

diff --git a/selenium/helper/Authentication.py b/selenium/helper/Authentication.py
index fe2358c5..dd6d3932 100644
--- a/selenium/helper/Authentication.py
+++ b/selenium/helper/Authentication.py
@@ -1,3 +1,4 @@
+from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
diff --git a/selenium/helper/Bundle.py b/selenium/helper/Bundle.py
index aac7c918..da19608f 100644
--- a/selenium/helper/Bundle.py
+++ b/selenium/helper/Bundle.py
@@ -1,9 +1,12 @@
 import time
 
 from selenium.common import TimeoutException, ElementClickInterceptedException, NoSuchElementException
+from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
+
+from helper.Navigation import NavigationHelper
 from helper.SeleniumUtils import SearchBoxSelectors
 from helper.SeleniumUtils import SeleniumUtils
 
@@ -23,9 +26,8 @@ class BundleSelectors:
 
 
 class BundleHelper:
-    def __init__(self, driver, fragebogen_helper, navigation_helper):
+    def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
-        self.fragebogen_helper = fragebogen_helper
         self.navigation_helper = navigation_helper
         self.utils = SeleniumUtils(driver)
 
diff --git a/selenium/helper/Clinic.py b/selenium/helper/Clinic.py
index c636ddb1..209a645d 100644
--- a/selenium/helper/Clinic.py
+++ b/selenium/helper/Clinic.py
@@ -1,7 +1,10 @@
 from selenium.common import TimeoutException, ElementClickInterceptedException, NoSuchElementException
+from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
+
+from helper.Navigation import NavigationHelper
 from helper.SeleniumUtils import SearchBoxSelectors
 from helper.SeleniumUtils import SeleniumUtils
 
@@ -30,7 +33,7 @@ class ClinicSelectors:
     TABLE_ROW_LINK = (By.CSS_SELECTOR, "#clinicTable > tbody > tr > td.dtr-control > a")
 
 class ClinicHelper:
-    def __init__(self, driver, navigation_helper):
+    def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
         self.navigation_helper = navigation_helper
         self.utils = SeleniumUtils(driver)
diff --git a/selenium/helper/Condition.py b/selenium/helper/Condition.py
new file mode 100644
index 00000000..3dc35d4a
--- /dev/null
+++ b/selenium/helper/Condition.py
@@ -0,0 +1,197 @@
+from selenium.common import NoSuchElementException, TimeoutException
+from selenium.webdriver import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.select import Select
+from selenium.webdriver.support.wait import WebDriverWait
+
+from helper.Questionnaire import QuestionnaireHelper, ConditionSelectors
+
+
+class ConditionHelper(QuestionnaireHelper):
+
+    def can_add_condition(self, question_id):
+        """
+        :param question_id: The ID of the question.
+        :return: True if a condition can be added, False otherwise.
+        """
+        try:
+            self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id))
+            return True
+        except NoSuchElementException:
+            return False
+
+    def set_target_and_action(self, target_class, target_option_index, answer_target_index, action):
+        """
+        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
+        :param target_option_index: The index of the target question/answer in the dropdown.
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER'.
+        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        """
+        Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TARGET_CLASS)).select_by_value(target_class)
+
+        if target_option_index > 0:
+            if target_class == ConditionSelectors.TargetType.ANSWER:
+                Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TARGET_ANSWER)).select_by_index(target_option_index)
+            else:
+                Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TARGET_QUESTION)).select_by_index(target_option_index)
+            self.utils.handle_popup_alert(True)
+
+        if target_class == ConditionSelectors.TargetType.ANSWER:
+            Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_ANSWER_TARGET)).select_by_index(answer_target_index)
+
+        Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_ACTION)).select_by_value(action)
+
+    def add_condition_for_multiple_choice(self, question_id, trigger_index=0,
+                                          target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+                                          answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
+        """
+        :param question_id: The ID of the question to which the condition is being added.
+        :param trigger_index: The index of the trigger option in the dropdown (default is 0, which means no trigger is selected).
+        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
+        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
+        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        """
+        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
+        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
+
+        # Set the trigger option
+        if trigger_index > 0:
+            Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TRIGGER)).select_by_index(trigger_index)
+            self.utils.handle_popup_alert(True)
+
+        # Set the target and action
+        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+
+        # Save the condition
+        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
+
+    def add_condition_for_slider(self, question, threshold_type=ConditionSelectors.ThresholdType.BIGGER_THAN_EQUALS,
+                                 target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+                                 answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
+        """
+        :param question: A dictionary containing question details (must include 'id').
+        :param threshold_type: The type of threshold to use (e.g., 'BIGGER_THAN_EQUALS').
+        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
+        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
+        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        """
+        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question['id'])).click()
+        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
+
+        # Set the threshold type and value
+        Select(self.driver.find_element(*ConditionSelectors.THRESHOLD_TYPE)).select_by_value(threshold_type)
+        if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
+            self.utils.handle_popup_alert(True)
+
+        # Increment the threshold value using the arrow key
+        threshold_input = self.driver.find_element(*ConditionSelectors.INPUT_THRESHOLD)
+        threshold_input.click()
+        threshold_input.send_keys(Keys.ARROW_UP)
+        self.utils.handle_popup_alert(True)
+
+        # Set the target and action
+        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+
+        # Save the condition
+        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
+
+    def add_condition_for_number_input(self, question_id, threshold_type=ConditionSelectors.ThresholdType.EQUALS,
+                                       target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+                                       answer_target_index=2, action=ConditionSelectors.ActionType.DISABLE):
+        """
+        :param question_id: The ID of the question to which the condition is being added.
+        :param threshold_type: The type of threshold to use (e.g., 'EQUALS').
+        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
+        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 2).
+        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        """
+        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
+        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
+
+        # Set the threshold type and value
+        Select(self.driver.find_element(*ConditionSelectors.THRESHOLD_TYPE)).select_by_value(threshold_type)
+        if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
+            self.utils.handle_popup_alert(True)
+
+        threshold_input = self.driver.find_element(*ConditionSelectors.INPUT_THRESHOLD)
+        threshold_input.click()
+        threshold_input.send_keys(Keys.ARROW_UP)
+        self.utils.handle_popup_alert(True)
+
+        # Set the target and action
+        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+
+        # Save the condition
+        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
+
+
+    def add_condition_for_numbered_checkbox(self, question, threshold_type=ConditionSelectors.ThresholdType.BIGGER_THAN_EQUALS,
+                                 target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+                                 answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
+        """
+        :param question: A dictionary containing question details (must include 'id').
+        :param threshold_type: The type of threshold to use (e.g., 'BIGGER_THAN_EQUALS').
+        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
+        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
+        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        """
+        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question['id'])).click()
+        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
+
+        # Set the threshold type and value
+        Select(self.driver.find_element(*ConditionSelectors.THRESHOLD_TYPE)).select_by_value(threshold_type)
+        if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
+            self.utils.handle_popup_alert(True)
+
+        # Increment the threshold value using the arrow key
+        threshold_input = self.driver.find_element(*ConditionSelectors.INPUT_THRESHOLD)
+        threshold_input.click()
+        threshold_input.send_keys(Keys.ARROW_UP)
+        self.utils.handle_popup_alert(True)
+
+        # Set the target and action
+        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+
+        # Save the condition
+        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
+
+    def add_condition_for_drop_down(self, question_id, trigger_index=1,
+                                    target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+                                    answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
+        """
+        :param question_id: The ID of the question to which the condition is being added.
+        :param trigger_index: The index of the trigger option in the dropdown (default is 1).
+        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
+        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
+        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        """
+        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
+        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
+
+        # Set the trigger option
+        if trigger_index > 0:
+            Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TRIGGER)).select_by_index(trigger_index)
+            self.utils.handle_popup_alert(True)
+
+        # Set the target and action
+        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+
+        # Save the condition
+        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
+
+    def navigate_back_to_questionnaire(self):
+        """
+        Navigates back to the questionnaire overview by clicking the 'Back to Questionnaire' button.
+        """
+        try:
+            back_button = WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(ConditionSelectors.BUTTON_BACK_TO_QUESTIONNAIRE)
+            )
+            back_button.click()
+        except TimeoutException:
+            print("Failed to find the 'Back to Questionnaire' button.")
diff --git a/selenium/helper/Navigation.py b/selenium/helper/Navigation.py
index 98fde4e8..fe694690 100644
--- a/selenium/helper/Navigation.py
+++ b/selenium/helper/Navigation.py
@@ -25,6 +25,8 @@ class ClinicMenu:
 class QuestionnaireTableSelectors:
     FILTER_INPUT = (By.CSS_SELECTOR, "#questionnaireTable_filter input[type='search']")
     FIRST_RESULT_LINK = (By.CSS_SELECTOR, "#questionnaireTable tbody tr td a")
+    EDIT_QUESTIONS_LINK = lambda questionnaire_id: (By.XPATH, f'//a[@href="/question/list?id={questionnaire_id}"]')
+    EDIT_SCORES_LINK = lambda questionnaire_id: (By.XPATH, f'//a[@href="/score/list?id={questionnaire_id}"]')
 
 class NavigationHelper:
     def __init__(self, driver):
@@ -38,6 +40,22 @@ def navigate_to_manage_questionnaires(self):
         except Exception as e:
             raise Exception(f"Failed to navigate to 'Manage Questionnaires': {e}")
 
+    def navigate_to_questions_of_questionnaire(self, questionnaire_id, questionnaire_name):
+        self.navigate_to_manage_questionnaires()
+        self.utils.fill_text_field(QuestionnaireTableSelectors.FILTER_INPUT, questionnaire_name)
+        link = WebDriverWait(self.driver, 10).until(
+            EC.element_to_be_clickable(QuestionnaireTableSelectors.EDIT_QUESTIONS_LINK(questionnaire_id))
+        )
+        link.click()
+
+    def navigate_to_scores_of_questionnaire(self, questionnaire_id, questionnaire_name):
+        self.navigate_to_manage_questionnaires()
+        self.utils.fill_text_field(QuestionnaireTableSelectors.FILTER_INPUT, questionnaire_name)
+        scores_link = WebDriverWait(self.driver, 10).until(
+            EC.element_to_be_clickable(QuestionnaireTableSelectors.EDIT_SCORES_LINK(questionnaire_id))
+        )
+        scores_link.click()
+
     def navigate_to_manage_bundles(self):
         try:
             self.utils.click_element(NavigationBarSelectors.BundleMenu.LINK)
diff --git a/selenium/helper/Question.py b/selenium/helper/Question.py
index 091fdd81..1408f6f2 100644
--- a/selenium/helper/Question.py
+++ b/selenium/helper/Question.py
@@ -3,12 +3,14 @@
 
 from selenium import webdriver
 from selenium.common import TimeoutException, ElementClickInterceptedException
+from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 
+from helper.Navigation import NavigationHelper
 from helper.SeleniumUtils import SeleniumUtils
 
 
@@ -29,8 +31,9 @@ class QuestionSelectors:
     INPUT_NUMERIC_CHECKBOX_FREETEXT_MIN_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
     INPUT_NUMERIC_CHECKBOX_FREETEXT_MAX_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
 
-    TABLE_ROW_QUESTION = (By.XPATH, "/html/body/div/div/div[1]/div/div[2]/div[2]/table/tbody/tr")
     TABLE_QUESTION = (By.ID, "questionTable")
+    TABLE_LAST_ROW = (By.XPATH, "//tbody/tr[last()]")
+    TABLE_ROWS = (By.XPATH, "//tbody/tr")
 
     class QuestionTypes:
         INFO_TEXT = "INFO_TEXT"
@@ -63,9 +66,10 @@ class QuestionHelper:
     DEFAULT_MC_MAX_VALUE = len(DEFAULT_MC_OPTIONS)
     DEFAULT_FREE_TEXT_LABEL = "Freetext Label"
 
-    def __init__(self, driver):
+    def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
         self.utils = SeleniumUtils(driver)
+        self.navigation_helper = navigation_helper
         self.QUESTION_TYPES = [
             partial(self.add_question_info_text),
             partial(self.add_question_multiple_choice),
@@ -80,6 +84,28 @@ def __init__(self, driver):
 
     def save_question(self):
         self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        return self.get_last_added_question_id()
+
+    def get_last_added_question_id(self):
+        """
+        :return: ID of the question as a string.
+        """
+        # Wait until the table rows are loaded
+        WebDriverWait(self.driver, 30).until(
+            EC.presence_of_element_located(QuestionSelectors.TABLE_LAST_ROW)
+        )
+
+        # Find the last row in the table
+        last_row = self.driver.find_element(*QuestionSelectors.TABLE_LAST_ROW)
+
+        # Extract the ID from the `id` attribute of the last row
+        question_id = last_row.get_attribute("id")
+
+        # Ensure the ID is found
+        if not question_id:
+            raise Exception("The ID of the last question could not be found.")
+
+        return question_id
 
     def add_question_info_text(self, language_code=None, question_text=None):
         """
diff --git a/selenium/helper/Questionnaire.py b/selenium/helper/Questionnaire.py
index 5f0f000e..3be9dec4 100644
--- a/selenium/helper/Questionnaire.py
+++ b/selenium/helper/Questionnaire.py
@@ -1,14 +1,12 @@
-import time
-from functools import partial
+import datetime
 
-from selenium import webdriver
-from selenium.common import TimeoutException, ElementClickInterceptedException
+from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import Select
 
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper
 from helper.SeleniumUtils import SeleniumUtils
 
 
@@ -38,27 +36,77 @@ class QuestionTypes:
         BODY_PART = "BODY_PART"
         BARCODE = "BARCODE"
 
+class ConditionSelectors:
+    BUTTON_ADD_CONDITION = (By.ID, 'addCondition')
+    BUTTON_ADD_TARGET = (By.ID, 'addTargetButton')
+    BUTTON_SAVE_CONDITION = (By.ID, 'saveCondition')
+    BUTTON_BACK_TO_QUESTIONNAIRE = (By.ID, 'backToQuestionnaire')
+
+    CONDITION_LINK = lambda question_id: (By.XPATH, f'//a[contains(@href, "/condition/listQuestionConditions?questionId={question_id}")]')
+
+    DROPDOWN_TRIGGER = (By.ID, "triggerId")
+    DROPDOWN_QUESTION = (By.ID, 'questionDropDown0')
+
+    INPUT_THRESHOLD = (By.ID, 'conditionDTOs0.thresholdValue')
+
+    THRESHOLD_TYPE = (By.ID, "conditionDTOs0.thresholdType")
+    class ThresholdType:
+        SMALLER_THAN = "SMALLER_THAN"
+        SMALLER_THAN_EQUALS = "SMALLER_THAN_EQUALS"
+        EQUALS = "EQUALS"
+        BIGGER_THAN_EQUALS = "BIGGER_THAN_EQUALS"
+        BIGGER_THAN = "BIGGER_THAN"
+        NOT_EQUALS = "NOT_EQUALS"
+
+    DROPDOWN_TARGET_CLASS = (By.ID, "targetClass0")
+    class TargetType:
+        QUESTION = "de.imi.mopat.model.Question"
+        ANSWER = "de.imi.mopat.model.SelectAnswer"
+
+    DROPDOWN_TARGET_QUESTION = (By.ID, 'targetAnswerQuestionDropDown0')
+    DROPDOWN_TARGET_ANSWER = (By.ID, 'questionDropDown0')
+    DROPDOWN_ANSWER_TARGET = (By.ID, 'answerDropDown0')
+
+    DROPDOWN_ACTION = (By.ID, 'action0')
+    class ActionType:
+        DISABLE = "DISABLE"
+        ENABLE = "ENABLE"
 
 class QuestionnaireHelper:
 
-    def __init__(self, driver):
+    DEFAULT_DESCRIPTION = "Dieser Fragebogen enthält alle bisher implementierten Fragetypen"
+    DEFAULT_LANGUAGE_CODE = "de_DE"
+    DEFAULT_LOCALIZED_WELCOME_TEXT = 'Ein Willkommenstext für den Fragebogen. Nichts besonderes zu sehen.'
+    DEFAULT_LOCALIZED_FINAL_TEXT = 'Dieser Text wird am Ende des Fragebogens gezeigt.'
+
+    def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
         self.utils = SeleniumUtils(driver)
+        self.navigation_helper = navigation_helper
+        self.question_helper = QuestionHelper(driver, navigation_helper)
 
     def click_add_questionnaire_button(self):
         """Clicks the 'Add Questionnaire' button."""
         self.utils.click_element(QuestionnaireSelectors.BUTTON_ADD_QUESTIONNAIRE)
 
-    def fill_questionnaire_details(self, questionnaire_name, description, language_code, localized_display_name,
+    def fill_questionnaire_details(self, questionnaire_name=None, description=None, language_code=None, localized_display_name=None,
                                    localized_welcome_text=None, localized_final_text=None):
         """
-        :param questionnaire_name: Name of the questionnaire.
-        :param description: Description of the questionnaire.
-        :param language_code: Language code for localized fields (e.g., 'de_DE').
-        :param localized_display_name: Localized display name for the questionnaire.
+        :param questionnaire_name: Name of the questionnaire (optional).
+        :param description: Description of the questionnaire (optional).
+        :param language_code: Language code for localized fields (e.g., 'de_DE') (optional).
+        :param localized_display_name: Localized display name for the questionnaire (optional).
         :param localized_welcome_text: Localized welcome text (optional).
         :param localized_final_text: Localized final text (optional).
         """
+        timestamp: str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        questionnaire_name = questionnaire_name or f"Fragebogen alle Typen {timestamp}"
+        description = description or self.DEFAULT_DESCRIPTION
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        localized_display_name = localized_display_name or questionnaire_name
+        localized_welcome_text = localized_welcome_text or self.DEFAULT_LOCALIZED_WELCOME_TEXT
+        localized_final_text = localized_final_text or self.DEFAULT_LOCALIZED_FINAL_TEXT
+
         # Fill in the questionnaire name
         self.utils.fill_text_field(QuestionnaireSelectors.INPUT_NAME, questionnaire_name)
 
@@ -85,6 +133,8 @@ def fill_questionnaire_details(self, questionnaire_name, description, language_c
             )
             self.utils.fill_editable_div(final_text_div, localized_final_text)
 
+        return questionnaire_name
+
     def save_questionnaire_edit_question(self):
         """
         :return: The ID of the newly created questionnaire.
@@ -104,16 +154,44 @@ def save_questionnaire_edit_question(self):
     def click_add_question_button(self):
         self.utils.click_element(QuestionnaireSelectors.BUTTON_ADD_QUESTION)
 
-# TODO [] The helper functions for asserting questionnaires should be implemented here
-class QuestionnaireAssertHelper(QuestionnaireHelper):
-    pass
+    def create_questionnaire_with_questions(self, questionnaire_name=None, questionnaire_description=None,
+                                            questionnaire_language_code=None, questionnaire_display_name=None,
+                                            questionnaire_welcome_text=None, questionnaire_final_text=None, question_types=None):
+        """
+        Creates a questionnaire and adds all specified question types.
+
+        :param questionnaire_name: Name of the questionnaire.
+        :param questionnaire_description: Description of the questionnaire.
+        :param questionnaire_language_code: Language code (e.g., 'de_DE').
+        :param questionnaire_display_name: Localized display name of the questionnaire.
+        :param questionnaire_welcome_text: Welcome text for the questionnaire.
+        :param questionnaire_final_text: Final text for the questionnaire.
+        :param question_types: A list of methods to add question types.
+        :return: A dictionary containing the questionnaire ID and a list of added questions.
+        """
+        question_types = question_types or self.question_helper.QUESTION_TYPES
+
+        # Navigate to "Manage Questionnaires"
+        self.navigation_helper.navigate_to_manage_questionnaires()
 
-# TODO [] Implement ConditionHelper
-class ConditionHelper(QuestionnaireHelper):
-    def add_condition_to_questionnaire(self, condition_name, condition_type, target_question):
-        pass
+        # Create the questionnaire
+        self.click_add_questionnaire_button()
+        questionnaire_name = self.fill_questionnaire_details(questionnaire_name, questionnaire_description,
+                                                  questionnaire_language_code, questionnaire_display_name,
+                                                  questionnaire_welcome_text, questionnaire_final_text)
+        questionnaire_id = self.save_questionnaire_edit_question()
 
-# TODO [] Implement ScoreHelper
-class ScoreHelper(QuestionnaireHelper):
-    def add_score_to_questionnaire(self, score_name, calculation_formula, target_questions):
-        pass
\ No newline at end of file
+        # Add questions to the questionnaire
+        added_questions = []
+        for add_question_method in question_types:
+            self.click_add_question_button()
+            question_info = add_question_method()  # Add question
+            question_info["id"] = self.question_helper.save_question()  # Save the question and retrieve ID
+            added_questions.append(question_info)
+
+        return {"id": questionnaire_id, "name": questionnaire_name, "questions": added_questions}
+
+
+# TODO [] The helper functions for asserting questionnaires should be implemented here
+class QuestionnaireAssertHelper(QuestionnaireHelper):
+    pass
\ No newline at end of file
diff --git a/selenium/helper/Score.py b/selenium/helper/Score.py
new file mode 100644
index 00000000..bcda6796
--- /dev/null
+++ b/selenium/helper/Score.py
@@ -0,0 +1,123 @@
+from selenium.webdriver import Keys
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.select import Select
+from selenium.webdriver.support.wait import WebDriverWait
+
+from helper.Questionnaire import QuestionnaireHelper
+
+class ScoreSelectors:
+    BUTTON_ADD_SCORE = (By.ID, "addScore")
+    BUTTON_SAVE = (By.ID, "saveButton")
+
+    DROPDOWN_OPERATOR = lambda index: (By.NAME, f"expression.expressions[{index}].operatorId")
+    DROPDOWN_EXPRESSION = (By.ID, "expression")
+    DROPDOWN_QUESTION = (By.NAME, "expression.questionId")
+    DROPDOWN_SCORE = (By.NAME, "expression.scoreId")
+
+    INPUT_NAME = (By.ID, "name")
+    INPUT_VALUE = lambda index: (By.NAME, f"expression.expressions[{index}].value")
+
+    # Specific score types
+    class ExpressionType:
+        ADDITION = "1"
+        SUBTRACTION = "2"
+        MULTIPLICATION = "3"
+        DIVISION = "4"
+        QUESTION_VALUE = "5"
+        VALUE = "6"
+        SUM = "7"
+        GREATER_THAN = "8"
+        GREATER_THAN_EQUALS = "9"
+        LESS_THAN = "10"
+        LESS_THAN_EQUALS = "11"
+        EQUALS = "12"
+        NOT_EQUALS = "13"
+        COUNTER = "14"
+        AVERAGE = "15"
+        VALUE_OF_SCORE = "16"
+        MAXIMUM = "17"
+        MINIMUM = "18"
+
+
+class ScoreHelper(QuestionnaireHelper):
+
+    def click_add_score_button(self):
+        self.utils.click_element(ScoreSelectors.BUTTON_ADD_SCORE)
+
+    def save_score(self):
+        self.utils.click_element(ScoreSelectors.BUTTON_SAVE)
+
+    def add_basic_score(self, name, expression_type, steps=1):
+        """
+        :param name: Name of the score.
+        :param expression_type: The type of expression (e.g., '1' for addition, '5' for question value, etc.).
+        :param steps: Number of times to press ARROW_UP for value fields (default is 1).
+        """
+        self.utils.fill_text_field(ScoreSelectors.INPUT_NAME, name)
+        self.utils.select_dropdown(ScoreSelectors.DROPDOWN_EXPRESSION, expression_type, "value")
+
+        # Dispatch logic based on expression type
+        if expression_type in [ScoreSelectors.ExpressionType.ADDITION, ScoreSelectors.ExpressionType.SUBTRACTION, ScoreSelectors.ExpressionType.MULTIPLICATION, ScoreSelectors.ExpressionType.DIVISION]:
+            self._binary_score(steps)
+        elif expression_type == ScoreSelectors.ExpressionType.QUESTION_VALUE:
+            self._question_value_score()
+        elif expression_type == ScoreSelectors.ExpressionType.VALUE:
+            self._value_score(steps)
+        elif expression_type == ScoreSelectors.ExpressionType.SUM:
+            self._sum_score(steps)
+        elif expression_type in [ScoreSelectors.ExpressionType.GREATER_THAN, ScoreSelectors.ExpressionType.GREATER_THAN_EQUALS, ScoreSelectors.ExpressionType.LESS_THAN, ScoreSelectors.ExpressionType.LESS_THAN_EQUALS, ScoreSelectors.ExpressionType.EQUALS, ScoreSelectors.ExpressionType.NOT_EQUALS]:
+            self._binary_score(steps)
+        elif expression_type == ScoreSelectors.ExpressionType.COUNTER:
+            self._counter_score(steps)
+        elif expression_type == ScoreSelectors.ExpressionType.AVERAGE:
+            self._average_score(steps)
+        elif expression_type == ScoreSelectors.ExpressionType.VALUE_OF_SCORE:
+            self._value_of_score()
+        elif expression_type in [ScoreSelectors.ExpressionType.MAXIMUM, ScoreSelectors.ExpressionType.MINIMUM]:
+            self._min_or_max_score(steps)
+
+    # Score Logic
+    def _binary_score(self, steps):
+        """binary scores (e.g., +, -, *, /)."""
+        self._set_operator_and_value(0, steps=steps)
+        self._set_operator_and_value(1, steps=steps)
+
+    def _question_value_score(self):
+        self.utils.select_dropdown(ScoreSelectors.DROPDOWN_QUESTION, 2, "index")
+
+    def _value_score(self, steps):
+        self.utils.set_value("expression.value", steps)
+
+    def _sum_score(self, steps):
+        self._set_operator_and_value(0, steps=steps)
+
+    def _counter_score(self, steps):
+        self._set_operator_and_value(0, nested=True, steps=steps)
+        self.utils.select_dropdown((By.NAME, "expression.expressions[0].operatorId"), ScoreSelectors.ExpressionType.LESS_THAN_EQUALS, "value")
+        self._set_operator_and_value(1, nested=True, steps=steps)
+
+    def _average_score(self, steps):
+        self._set_operator_and_value(0, steps=steps)
+
+    def _value_of_score(self):
+        self.utils.select_dropdown(ScoreSelectors.DROPDOWN_SCORE, 1, "index")
+
+    def _min_or_max_score(self, steps):
+        self._set_operator_and_value(0, steps=steps)
+
+    # Helpers
+    def _set_operator_and_value(self, index, steps=1, nested=False):
+        """
+        :param index: The index of the operator and value to set.
+        :param steps: Number of times to press ARROW_UP for the value (default is 1).
+        :param nested: Whether the value is nested in another structure.
+        """
+        # Adjust the base name for nested structures
+        base_name = f"expression.expressions[0]." if nested else ""
+
+        operator_selector = (By.NAME, f"{base_name}expression.expressions[{index}].operatorId")
+        value_selector = (By.NAME, f"{base_name}expression.expressions[{index}].value")
+
+        self.utils.select_dropdown(operator_selector, ScoreSelectors.ExpressionType.VALUE, "value")
+        self.utils.set_value(value_selector[1], steps=steps)
\ No newline at end of file
diff --git a/selenium/helper/SeleniumUtils.py b/selenium/helper/SeleniumUtils.py
index 2246481a..06649f89 100644
--- a/selenium/helper/SeleniumUtils.py
+++ b/selenium/helper/SeleniumUtils.py
@@ -18,10 +18,11 @@ class SearchBoxSelectors:
     BUNDLE = (By.CSS_SELECTOR, "#bundleTable_filter input[type='search']")
     CLINIC = (By.CSS_SELECTOR, "#clinicTable_filter input[type='search']")
 
+
 class SeleniumUtils:
-    def __init__(self, driver, navigator=None):
+    def __init__(self, driver, navigation_helper = None):
         self.driver = driver
-        self.navigator = navigator
+        self.navigator = navigation_helper
 
     def click_element(self, selector):
         """
@@ -136,6 +137,8 @@ def select_dropdown(self, selector, value, method="visible_text"):
                 select.select_by_visible_text(value)
             elif method == "value":
                 select.select_by_value(value)
+            elif method == "index":
+                select.select_by_index(value)
             else:
                 raise ValueError(f"Invalid method '{method}'. Use 'visible_text' or 'value'.")
         except TimeoutException:
@@ -192,3 +195,33 @@ def search_and_delete_item(self, item_name, item_id, item_type):
         except Exception as e:
             raise Exception(f"An error occurred while deleting {item_type} '{item_name}': {e}")
 
+
+    def handle_popup_alert(self, accept=True, timeout=2):
+        """
+        :param accept: Boolean indicating whether to accept (True) or dismiss (False) the alert.
+        :param timeout: Time to wait for the alert to appear.
+        """
+        try:
+            WebDriverWait(self.driver, timeout).until(EC.alert_is_present())
+            alert = self.driver.switch_to.alert
+            if accept:
+                alert.accept()
+            else:
+                alert.dismiss()
+        except TimeoutException:
+            pass  # No alert appeared
+
+
+    def set_value(self, field_name, steps=1):
+        """
+        :param field_name: The name of the input field.
+        :param steps: Number of times to press the ARROW_UP key (default is 1).
+        """
+        value_input = WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located((By.NAME, field_name))
+        )
+        value_input.click()
+        for _ in range(steps):
+            value_input.send_keys(Keys.ARROW_UP)
+
+
diff --git a/selenium/helper/Survey.py b/selenium/helper/Survey.py
index 3b98b327..182bc2be 100644
--- a/selenium/helper/Survey.py
+++ b/selenium/helper/Survey.py
@@ -1,11 +1,13 @@
 import time
 
 from selenium.common import TimeoutException
+from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 
+from helper.Navigation import NavigationHelper
 from helper.Question import QuestionSelectors
 from helper.SeleniumUtils import SeleniumUtils
 
@@ -32,6 +34,7 @@ class SurveySelectors:
     SLIDER = (By.ID, "range")
 
     TEXT_QUESTION_CONTENT = (By.ID, "questionContent")
+    TEXT_QUESTION_TITLE = (By.ID, "questionTitle")
 
     LABEL_FOR_CHECKBOX = lambda selected_value: (By.CSS_SELECTOR, f"label[for='numberedCheckbox_{selected_value}']")
     LABEL_BY_OPTION_TEXT = lambda option_text: (By.XPATH, f"//div[@class='right' and text()='{option_text}']/..")
@@ -45,10 +48,10 @@ class SurveyHelper:
     DEFAULT_SLIDER_POSITION = 0.5
     DEFAULT_DATE = "1970-01-01"
 
-    def __init__(self, driver, login_helper):
+    def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
-        self.login_helper = login_helper
         self.utils = SeleniumUtils(driver)
+        self.navigation_helper = navigation_helper
 
     def click_next_button(self):
         self.utils.click_element(SurveySelectors.BUTTON_NEXT_QUESTION)
@@ -64,10 +67,20 @@ def start_survey(self, configuration, clinic_name, case_number):
         """
         try:
             # Select clinic
-            WebDriverWait(self.driver, 10).until(
+            clinic_dropdown = WebDriverWait(self.driver, 10).until(
                 EC.presence_of_element_located(SurveySelectors.DROPDOWN_CLINIC_SELECTION)
             )
-            self.utils.select_dropdown(SurveySelectors.DROPDOWN_CLINIC_SELECTION, clinic_name, "visible_text")
+
+            # Check if the dropdown is disabled
+            is_disabled = clinic_dropdown.get_attribute("disabled")
+            if is_disabled:
+                # Validate that the preselected clinic matches the expected clinic
+                selected_option = clinic_dropdown.find_element(By.CSS_SELECTOR, "option[selected]")
+                selected_clinic = selected_option.text
+                assert selected_clinic == clinic_name, f"Expected clinic '{clinic_name}', but got '{selected_clinic}'"
+            else:
+                # Select the clinic from the dropdown
+                self.utils.select_dropdown(SurveySelectors.DROPDOWN_CLINIC_SELECTION, clinic_name, "visible_text")
 
             # Select configuration
             config_selector = configuration['config_selector']
@@ -271,4 +284,18 @@ def assertion_for_welcome_text(self, text):
             EC.text_to_be_present_in_element(SurveySelectors.TEXT_QUESTION_CONTENT, text)
         )
         welcome_text = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_CONTENT).text
-        assert text in welcome_text, "Welcome text not found!"
\ No newline at end of file
+        assert text in welcome_text, "Welcome text not found!"
+
+    def assertion_for_question_title(self, question):
+        if question["type"] == QuestionSelectors.QuestionTypes.INFO_TEXT:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(SurveySelectors.TEXT_QUESTION_CONTENT)
+            )
+            question_text = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_CONTENT).text
+            assert question['text'] in question_text, "Question text not found!"
+        else:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(SurveySelectors.TEXT_QUESTION_TITLE)
+            )
+            question_text = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_TITLE).text
+            assert question['text'] in question_text, "Question title not found!"
diff --git a/selenium/localhost8080.py b/selenium/localhost8080.py
index a9a05740..1b957f05 100644
--- a/selenium/localhost8080.py
+++ b/selenium/localhost8080.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import json
 import random
 import string
 import unittest
@@ -16,7 +17,9 @@
 from helper.Clinic import ClinicHelper, ClinicSelectors
 from helper.Navigation import NavigationHelper
 from helper.Question import QuestionHelper, QuestionErrorHelper, QuestionSelectors
-from helper.Questionnaire import QuestionnaireHelper, ConditionHelper, ScoreHelper
+from helper.Questionnaire import QuestionnaireHelper
+from helper.Condition import ConditionHelper
+from helper.Score import ScoreHelper
 from helper.SeleniumUtils import SeleniumUtils
 from helper.Survey import SurveyHelper, SurveySelectors, SurveyAssertHelper
 from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
@@ -62,22 +65,21 @@ def setUp(self):
 
         # Initialize Navigation and Utils
         self.navigation_helper = NavigationHelper(self.driver)
-        self.utils = SeleniumUtils(self.driver, navigator=self.navigation_helper)
+        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
         self.navigation_helper.utils = self.utils
 
         # Initialize other helpers
         self.authentication_helper = AuthenticationHelper(self.driver)
-        self.questionnaire_helper = QuestionnaireHelper(self.driver)
-        self.question_helper = QuestionHelper(self.driver)
-        self.condition_helper = ConditionHelper(self.driver)
-        self.score_helper = ScoreHelper(self.driver)
-        self.questionnaire_error_helper = QuestionErrorHelper(self.driver)
-
-        self.bundle_helper = BundleHelper(self.driver, self.questionnaire_helper, self.navigation_helper)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver, self.navigation_helper)
+        self.question_helper = QuestionHelper(self.driver, self.navigation_helper)
+        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
         self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
-        self.survey_helper = SurveyHelper(self.driver, self.authentication_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
 
-        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.authentication_helper)
+        self.condition_helper = ConditionHelper(self.driver, self.navigation_helper)
+        self.score_helper = ScoreHelper(self.driver, self.navigation_helper)
+        self.questionnaire_error_helper = QuestionErrorHelper(self.driver, self.navigation_helper)
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
 
     def test_login_ad_admin(self):
         # Arrange
@@ -482,7 +484,6 @@ def test_questionnaire_create_all_types_with_error(self):
                 self.utils.search_and_delete_item(questionnaire_name, questionnaire_id, "questionnaire")
             self.authentication_helper.logout()
 
-    # TODO [] Add assertions to survey execution (add to class SurveyAssertHelper)
     def test_complete_workflow(self):
         # Arrange
         timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -490,13 +491,7 @@ def test_complete_workflow(self):
         username_creator = "admin"
         username_survey_executor = "user"
 
-        questionnaire_id = None
-        questionnaire_name = f"Fragebogen alle Typen {timestamp}"
-        questionnaire_description = "Dieser Fragebogen enthält alle bisher implementierten Fragetypen"
-        questionnaire_language_code = "de_DE"
-        questionnaire_welcome_text = 'Ein Willkommenstext für das Paket "Selenium-Paket". Nichts besonderes zu sehen. 2'
-        questionnaire_final_text = 'Dieser Text wird am Ende des Fragebogens gezeigt.'
-        questionnaire_display_name = questionnaire_name
+        questionnaire = None
         added_questions = []
 
         bundle_id = None
@@ -520,33 +515,17 @@ def test_complete_workflow(self):
 
         try:
             # Act
-            # Step 1: Create Questionnaire
-            self.navigation_helper.navigate_to_manage_questionnaires()
-            self.questionnaire_helper.click_add_questionnaire_button()
-            self.questionnaire_helper.fill_questionnaire_details(questionnaire_name, questionnaire_description,
-                                                                 questionnaire_language_code,
-                                                                 questionnaire_display_name, questionnaire_welcome_text,
-                                                                 questionnaire_final_text)
-            questionnaire_id = self.questionnaire_helper.save_questionnaire_edit_question()
-            questionnaires = [{"id": questionnaire_id, "name": questionnaire_name}]
-
-            # Step 2: Add Questions to questionnaire (all question types)
-            for add_question_method in self.question_helper.QUESTION_TYPES:
-                self.questionnaire_helper.click_add_question_button()
-                question_info = add_question_method()
-                added_questions.append(question_info)
-                self.question_helper.save_question()
-
-            # Assert
-            # Verify the number of questions added
-            self.questionnaire_error_helper.verify_number_of_questions(len(self.question_helper.QUESTION_TYPES))
+            # Step 1: Create Questionnaire with questions (all question types)
+            questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
+            added_questions = questionnaire['questions']
 
             # Act
             # Step 3: Add Bundle
             self.navigation_helper.navigate_to_manage_bundles()
             bundle_id = None
             if not self.bundle_helper.bundle_exists(bundle_name):
-                self.bundle_helper.create_bundle(bundle_name, True, questionnaires)
+                self.bundle_helper.create_bundle(bundle_name, True,
+                                                 [{"id": questionnaire['id'], "name": questionnaire['name']}])
                 bundle_id = self.bundle_helper.save_bundle(bundle_name)
             bundles = [{"id": bundle_id, "name": bundle_name}]
 
@@ -567,8 +546,8 @@ def test_complete_workflow(self):
 
         # Arrange
         case_number = "55755388"
-        language_value = "de_DE"
-        welcome_text = 'Ein Willkommenstext für das Paket "Selenium-Paket". Nichts besonderes zu sehen.'
+        language_value = QuestionnaireHelper.DEFAULT_LANGUAGE_CODE
+        welcome_text = QuestionnaireHelper.DEFAULT_LOCALIZED_WELCOME_TEXT
 
         # Login as User
         self.driver.get(self.https_base_url)
@@ -585,6 +564,7 @@ def test_complete_workflow(self):
             self.survey_helper.click_next_button()
 
             for question in added_questions:
+                self.survey_assert_helper.assertion_for_question_title(question)
                 if question["type"] == QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE:
                     self.survey_helper.answer_multiple_choice_question(question)
                 elif question["type"] == QuestionSelectors.QuestionTypes.SLIDER:
@@ -618,24 +598,99 @@ def test_complete_workflow(self):
                 print(f"Logout failed: {e}")
 
     # TODO [] complete creation of the test 'test_TestCase_Questionnaire_Create_and_Remove_All_Types_with_Bundle_Clinic_Conditions'
-    def test_case_questionnaire_Create_and_Remove_All_Types_with_Bundle_Clinic_Conditions(self):
+    def test_case_questionnaire_create_and_remove_all_Types_with_Bundle_Clinic_Conditions(self):
+
+        # Arrange
+        timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+        username_creator = "admin"
+        username_survey_executor = "user"
 
         questionnaire_id = None
-        questionnaire_name = ""
+        questionnaire_name = f"Fragebogen - Alle Fragetypen - Conditions - Scores - Bundles - Clinics {timestamp}"
+        questionnaire_description = "Dieser Fragebogen enthält sämtliche derzeit verfügbaren Fragetypen und dient der vollständigen Funktionsprüfung."
+        questionnaire_language_code = "de_DE"
+        questionnaire_welcome_text = 'Willkommen! Dieser Fragebogen ist ein Testbogen. Sie können alle Fragetypen ausprobieren.'
+        questionnaire_final_text = 'Vielen Dank für Ihre Teilnahme! Dieser Text erscheint am Ende des Fragebogens.'
+        questionnaire_display_name = questionnaire_name
+        added_questions = []
+
         bundle_id = None
-        bundle_name = ""
+        bundle_name = f"Fragebogenpaket Fragebogen Alle Fragetypen - Conditions - Scores - Bundles - Clinics {random.randint(1, 999999)}"
+
         clinic_id = None
-        clinic_name = ""
+        clinic_name = f"Testklinik für Fragebogenpaket {timestamp}"
+        clinic_description = 'Diese Klinik enthält das Fragebogenpaket "Fragebogenpaket Fragebogen Alle Fragetypen ...", um verschiedene Konfigurationsmöglichkeiten und Szenarien zu testen.'
+        configurations = [
+            {'selector': ClinicSelectors.CONFIG_REGISTER_PATIENT_DATA,
+             'config_selector': SurveySelectors.RADIO_REGISTER},
+            {'selector': ClinicSelectors.CONFIG_USE_PATIENT_DATA_LOOKUP, 'dropdown_value': "patient lookup 1",
+             'config_selector': SurveySelectors.RADIO_SEARCH_HIS},
+            {'selector': ClinicSelectors.CONFIG_USE_PSEUDONYMIZATION_SERVICE, 'dropdown_value': "pseudonymization 1",
+             'config_selector': SurveySelectors.RADIO_PSEUDONYMIZATION}
+        ]
+
+        # Login as Admin
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.admin_login(username=username_creator)
 
         try:
-            pass
             # Step 1: Create Questionnaire
+            # Act
+            self.navigation_helper.navigate_to_manage_questionnaires()
+            self.questionnaire_helper.click_add_questionnaire_button()
+            self.questionnaire_helper.fill_questionnaire_details(questionnaire_name, questionnaire_description,
+                                                                 questionnaire_language_code,
+                                                                 questionnaire_display_name,
+                                                                 questionnaire_welcome_text,
+                                                                 questionnaire_final_text)
+            questionnaire_id = self.questionnaire_helper.save_questionnaire_edit_question()
+            questionnaires = [{"id": questionnaire_id, "name": questionnaire_name}]
+
             # Step 2: Add Questions to questionnaire (all question types)
+            for add_question_method in self.question_helper.QUESTION_TYPES:
+                self.questionnaire_helper.click_add_question_button()
+                question_info = add_question_method()
+                added_questions.append(question_info)
+                self.question_helper.save_question()
+            # Assert
+            # Verify the number of questions added
+            self.questionnaire_error_helper.verify_number_of_questions(len(self.question_helper.QUESTION_TYPES))
+
             # Step 3: Add Bundle
+            # Act
+            self.navigation_helper.navigate_to_manage_bundles()
+            bundle_id = None
+            if not self.bundle_helper.bundle_exists(bundle_name):
+                self.bundle_helper.create_bundle(bundle_name, True, questionnaires)
+                bundle_id = self.bundle_helper.save_bundle(bundle_name)
+            bundles = [{"id": bundle_id, "name": bundle_name}]
+
             # Step 4: Add Clinic
+            self.navigation_helper.navigate_to_manage_clinics()
+            self.clinic_helper.create_clinic(clinic_name, clinic_description, configurations, bundles,
+                                             [username_creator, username_survey_executor])
+            clinic_id = self.clinic_helper.save_clinic(clinic_name)
+
             # Step 5: Add Conditions
-            # TODO [] implement methods
-            # self.condition_helper.add_condition_to_questionnaire()
+            self.navigation_helper.navigate_to_questions_of_questionnaire(questionnaire_id, questionnaire_name)
+            for question in added_questions:
+                if question['type'] == QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE:
+                    self.condition_helper.add_condition_for_multiple_choice(question['id'])
+                    self.condition_helper.navigate_back_to_questionnaire()
+                elif question['type'] == QuestionSelectors.QuestionTypes.SLIDER:
+                    self.condition_helper.add_condition_for_slider(question)
+                    self.condition_helper.navigate_back_to_questionnaire()
+                elif question['type'] == QuestionSelectors.QuestionTypes.NUMBER_INPUT:
+                    self.condition_helper.add_condition_for_number_input(question['id'])
+                    self.condition_helper.navigate_back_to_questionnaire()
+                elif question['type'] == QuestionSelectors.QuestionTypes.DROP_DOWN:
+                    self.condition_helper.add_condition_for_drop_down(question['id'])
+                    self.condition_helper.navigate_back_to_questionnaire()
+                elif question['type'] == QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX:
+                    self.condition_helper.add_condition_for_numbered_checkbox(question)
+                    self.condition_helper.navigate_back_to_questionnaire()
+
             # Step 6: Add Scores
             # TODO [] implement methods
             # self.score_helper.add_score_to_questionnaire()
diff --git a/src/main/webapp/WEB-INF/mobile/user/login.html b/src/main/webapp/WEB-INF/mobile/user/login.html
index 8797c3cd..97a5c5cb 100644
--- a/src/main/webapp/WEB-INF/mobile/user/login.html
+++ b/src/main/webapp/WEB-INF/mobile/user/login.html
@@ -64,7 +64,7 @@
 					</a>
 
 					<button
-						id="loginButton"
+						th:id="'loginButton'"
 						class="btn btn-white btn-mobile"
 						index="3"
 						type="submit"
diff --git a/src/main/webapp/WEB-INF/score/edit.html b/src/main/webapp/WEB-INF/score/edit.html
index 4152b1b4..4cecfa68 100644
--- a/src/main/webapp/WEB-INF/score/edit.html
+++ b/src/main/webapp/WEB-INF/score/edit.html
@@ -79,6 +79,7 @@
 						type="submit"
 						class="btn btn-primary"
 						value="save"
+						id="saveButton"
 						name="postAction"
 						th:text="${messages.get(#locale, 'button.save', 'Save')}"
 					>
@@ -87,6 +88,7 @@
 						type="submit"
 						class="btn btn-primary"
 						value="cancel"
+						id="cancelButton"
 						name="postAction"
 						th:text="${messages.get(#locale, 'button.cancel', 'Cancel')}"
 					>

From 13b23bc0ebc9034aadae13badda25c058b2bfe24 Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Thu, 2 Jan 2025 14:36:25 +0100
Subject: [PATCH 04/20] Fix: using navigate_to_manage_questionnaires in
 QuestionnaireHelper

---
 selenium/helper/Questionnaire.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selenium/helper/Questionnaire.py b/selenium/helper/Questionnaire.py
index 3be9dec4..ad3b40cb 100644
--- a/selenium/helper/Questionnaire.py
+++ b/selenium/helper/Questionnaire.py
@@ -81,7 +81,7 @@ class QuestionnaireHelper:
 
     def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
-        self.utils = SeleniumUtils(driver)
+        self.utils = SeleniumUtils(driver, navigation_helper)
         self.navigation_helper = navigation_helper
         self.question_helper = QuestionHelper(driver, navigation_helper)
 

From f501a6ae0b68c2a776b50e1d3c4a5da14013603c Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Mon, 20 Jan 2025 14:37:14 +0100
Subject: [PATCH 05/20] Feat: Add unique IDs and fix message typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Added unique IDs for better element targeting:
  - Bundle links, login link, body part buttons, questionnaire rows, and score table.
- Fixed typo in German message: 'Anworten' → 'Antworten'.
---
 src/main/resources/message/messages_de_DE.properties | 2 +-
 src/main/webapp/WEB-INF/bundle/list.html             | 1 +
 src/main/webapp/WEB-INF/mobile/user/password.html    | 2 ++
 src/main/webapp/WEB-INF/question/edit.html           | 2 ++
 src/main/webapp/WEB-INF/question/list.html           | 2 +-
 src/main/webapp/WEB-INF/questionnaire/list.html      | 2 +-
 src/main/webapp/WEB-INF/score/list.html              | 4 +++-
 src/test/resources/message/messages_de_DE.properties | 2 +-
 8 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/message/messages_de_DE.properties b/src/main/resources/message/messages_de_DE.properties
index 460b03f8..4f7ab896 100644
--- a/src/main/resources/message/messages_de_DE.properties
+++ b/src/main/resources/message/messages_de_DE.properties
@@ -693,7 +693,7 @@ question.error.duplicateQuestionMissing=Frage konnte nicht dupliziert werden. Er
 question.error.infoTextIsNull=Die Frage ben\u00f6tigt einen lokalisierten Info-Text
 question.error.isConditionTarget=Die Frage ist Ziel einer Bedingung. Folgende Elemente verhindern ihre Aktion, da sie Bedingungen ausl\u00f6sen, die diese Frage betreffen:
 question.error.maxNumberAnswersMissing=Maximale Anzahl von zu beantwortenden Antworten muss vergeben werden
-question.error.maxNumberBiggerThanAmountOfAnswers=Maximale Anzahl von zu beantwortenden Anworten ist gr\u00f6\u00dfer als die Anzahl der vorhandenen Antworten
+question.error.maxNumberBiggerThanAmountOfAnswers=Maximale Anzahl von zu beantwortenden Antworten ist gr\u00f6\u00dfer als die Anzahl der vorhandenen Antworten
 question.error.maxNumberSmallerThanMinNumber=Maximale Anzahl von zu beantwortenden Antworten muss mindestens so gro\u00df wie die minimale Anzahl sein
 question.error.minNumberAnswersMissing=Minimale Anzahl von zu beantwortenden Antworten muss vergeben werden
 question.error.minNumberBiggerThanAmountOfAnswers=Minimale Anzahl von zu beantwortenden Antworten ist gr\u00f6\u00dfer als die Anzahl der vorhandenen Antworten
diff --git a/src/main/webapp/WEB-INF/bundle/list.html b/src/main/webapp/WEB-INF/bundle/list.html
index ce3e3c7b..91e3c829 100644
--- a/src/main/webapp/WEB-INF/bundle/list.html
+++ b/src/main/webapp/WEB-INF/bundle/list.html
@@ -128,6 +128,7 @@
 							<td class="actionColumn">
 								<div class="d-none d-xl-block">
 									<a
+										id="bundleLink__${item.id}__"
 										class="link"
 										th:href="@{fill?id=__${item.id}__}"
 									>
diff --git a/src/main/webapp/WEB-INF/mobile/user/password.html b/src/main/webapp/WEB-INF/mobile/user/password.html
index 539288aa..9a65a308 100644
--- a/src/main/webapp/WEB-INF/mobile/user/password.html
+++ b/src/main/webapp/WEB-INF/mobile/user/password.html
@@ -41,6 +41,7 @@
 					/>
 					</div>
 					<a
+						id="loginLink"
 						class="btn-link mobile-link"
 						index="2"
 						data-ajax="true"
@@ -51,6 +52,7 @@
 					</a>
 
 					<button
+						id="submitRequest"
 						class="btn btn-white btn-mobile"
 						index="3"
 						type="submit"
diff --git a/src/main/webapp/WEB-INF/question/edit.html b/src/main/webapp/WEB-INF/question/edit.html
index 06ae27a5..abcbc87a 100644
--- a/src/main/webapp/WEB-INF/question/edit.html
+++ b/src/main/webapp/WEB-INF/question/edit.html
@@ -1193,6 +1193,7 @@
 												</div>
 											</div>
 											<button
+												th:id="|selectAllBodyPartsButton-${vars['imageType']}|"
 												type="button"
 												class="btn btn-primary"
 												onclick="selectAllBodyPartAnswers($(this));"
@@ -1200,6 +1201,7 @@
 											>
 											</button>
 											<button
+												th:id="|deleteAllBodyPartsButton-${vars['imageType']}|"
 												type="button"
 												class="btn btn-primary"
 												onclick="deleteAllBodyPartAnswers($(this));"
diff --git a/src/main/webapp/WEB-INF/question/list.html b/src/main/webapp/WEB-INF/question/list.html
index 8b555835..4685b625 100644
--- a/src/main/webapp/WEB-INF/question/list.html
+++ b/src/main/webapp/WEB-INF/question/list.html
@@ -104,7 +104,7 @@
 					<th:block th:each="item, questionCounter: ${questionnaire.questions}">
 						<tr th:id="${item.id}">
 							<td>
-								<i class="bi bi-large bi-grip-vertical bi-action"></i>
+								<i th:id="|grip-${item.id}|" class="bi bi-large bi-grip-vertical bi-action"></i>
 							</td>
 							<td>
 								<th:block th:text="|${item.position}.|" />
diff --git a/src/main/webapp/WEB-INF/questionnaire/list.html b/src/main/webapp/WEB-INF/questionnaire/list.html
index 5c378da8..4b9e6d18 100644
--- a/src/main/webapp/WEB-INF/questionnaire/list.html
+++ b/src/main/webapp/WEB-INF/questionnaire/list.html
@@ -73,7 +73,7 @@
 				<tbody>
 					<th:block th:if="not ${#lists.isEmpty(allQuestionnaires)}">
 						<th:block th:each="item: ${allQuestionnaires}">
-							<tr>
+							<tr th:id="${item.id}">
 								<td>
 									<th:block th:if="not ${#strings.isEmpty(item.name)}">
 										<a
diff --git a/src/main/webapp/WEB-INF/score/list.html b/src/main/webapp/WEB-INF/score/list.html
index f9141043..8d2ae932 100644
--- a/src/main/webapp/WEB-INF/score/list.html
+++ b/src/main/webapp/WEB-INF/score/list.html
@@ -9,7 +9,9 @@
 >
 	<th:block layout:fragment="content">
 		<div class="table-responsive">
-			<table class="table table-hover pagedTable">
+			<table
+				id="scoreTable"
+		   		class="table table-hover pagedTable">
 				<colgroup>
 					<col width="82%" />
 					<col width="18%" />
diff --git a/src/test/resources/message/messages_de_DE.properties b/src/test/resources/message/messages_de_DE.properties
index d18a6967..25eb78c8 100644
--- a/src/test/resources/message/messages_de_DE.properties
+++ b/src/test/resources/message/messages_de_DE.properties
@@ -688,7 +688,7 @@ question.error.duplicateQuestionMissing=Frage konnte nicht dupliziert werden. Er
 question.error.infoTextIsNull=Die Frage ben\u00f6tigt einen lokalisierten Info-Text
 question.error.isConditionTarget=Die Frage ist Ziel einer Bedingung. Folgende Elemente verhindern ihre Aktion, da sie Bedingungen ausl\u00f6sen, die diese Frage betreffen:
 question.error.maxNumberAnswersMissing=Maximale Anzahl von zu beantwortenden Antworten muss vergeben werden
-question.error.maxNumberBiggerThanAmountOfAnswers=Maximale Anzahl von zu beantwortenden Anworten ist gr\u00f6\u00dfer als die Anzahl der vorhandenen Antworten
+question.error.maxNumberBiggerThanAmountOfAnswers=Maximale Anzahl von zu beantwortenden Antworten ist gr\u00f6\u00dfer als die Anzahl der vorhandenen Antworten
 question.error.maxNumberSmallerThanMinNumber=Maximale Anzahl von zu beantwortenden Antworten muss mindestens so gro\u00df wie die minimale Anzahl sein
 question.error.minNumberAnswersMissing=Minimale Anzahl von zu beantwortenden Antworten muss vergeben werden
 question.error.minNumberBiggerThanAmountOfAnswers=Minimale Anzahl von zu beantwortenden Antworten ist gr\u00f6\u00dfer als die Anzahl der vorhandenen Antworten

From 871fb868e5e2d3376dc9cd5f391e819b6726358c Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Mon, 20 Jan 2025 14:58:04 +0100
Subject: [PATCH 06/20] Add new selenium tests, refactor selenium helpers, and
 improve selenium utility functions

- AuthenticationAssertHelper: Introduced new helper for authentication-related tests with additional selectors.
- BundleHelper: Refactoring for cleaner code structure.
- ClinicHelper: Added new selectors and refactored existing methods for better maintainability.
- ConditionHelper: Updated functions to enable actual condition creation, with new tests in the ConditionAssertHelper.
- QuestionsHelper: Added new selectors, refactored to remove redundancy, and introduced new functions. Created tests for all question types in QuestionAssertHelper along with other question-related tests.
- QuestionnaireHelper: Refactored code and added new selectors. Introduced QuestionnaireAssertHelper with initial tests.
- ScoreHelper: Implemented functionality to create scores, supported by new tests in ScoreAssertHelper.
- SeleniumUtils: Added utility functions like `drag_and_drop`, `fill_number_field`, and `scroll_to_bottom`.
---
 selenium/helper/Authentication.py             |  218 ++-
 selenium/helper/Bundle.py                     |   63 +-
 selenium/helper/Clinic.py                     |   94 +-
 selenium/helper/Condition.py                  |  182 +-
 selenium/helper/Navigation.py                 |   51 +-
 selenium/helper/Question.py                   | 1627 +++++++++++++----
 selenium/helper/Questionnaire.py              |  311 +++-
 selenium/helper/Score.py                      |  323 +++-
 selenium/helper/SeleniumUtils.py              |  164 +-
 selenium/helper/Survey.py                     |   43 +-
 .../helper/test_images/test_upload_image.png  |  Bin 0 -> 83 bytes
 selenium/localhost8080.py                     |  735 --------
 selenium/selenium_tests.py                    |  104 +-
 13 files changed, 2494 insertions(+), 1421 deletions(-)
 create mode 100644 selenium/helper/test_images/test_upload_image.png
 delete mode 100644 selenium/localhost8080.py

diff --git a/selenium/helper/Authentication.py b/selenium/helper/Authentication.py
index dd6d3932..755e857c 100644
--- a/selenium/helper/Authentication.py
+++ b/selenium/helper/Authentication.py
@@ -1,12 +1,11 @@
-from selenium.webdriver.chrome.webdriver import WebDriver
+from selenium.common import TimeoutException, NoSuchElementException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 
-
 class URLPathsAuthentication:
     MOBILE_USER_LOGIN = "/mobile/user/login"
-
+    FORGOT_PASSWORD_PATH = "/mobile/user/password"
 
 class AuthenticationSelectors:
 
@@ -14,11 +13,47 @@ class Login:
         BUTTON = (By.ID, "loginButton")
         USERNAME = (By.ID, "username")
         PASSWORD = (By.ID, "password")
+        LANGUAGE_SELECT = (By.ID, "localeChanger")
+        LOGO = (By.CSS_SELECTOR, "img.mopatImage")
+        FOOTER_TEXT = (By.CSS_SELECTOR, ".footer-text")
+        FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+        LANGUAGE_OPTIONS = (By.TAG_NAME, "option")
 
     class Logout:
         ADMIN_BUTTON = (By.ID, "adminLogoutButton")
         MOBILE_BUTTON = (By.ID, "logoutButton")
 
+class PasswordResetSelectors:
+    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+    USERNAME_INPUT = (By.ID, "username")
+    ERROR_MESSAGE = (By.CLASS_NAME, "error")
+    SUBMIT_BUTTON = (By.ID, "submitRequest")
+    LOGIN_LINK = (By.ID, "loginLink")
+
+class AdminIndexSelectors:
+    HEADER = (By.ID, "header")
+    NAVIGATION_BAR = (By.ID, "adminNav")
+    FOOTER_WRAPPER = (By.CSS_SELECTOR, ".footer-wrapper")
+    MOPAT_LOGO = (By.ID, "mopatImageFooter")
+    CLINIC_LOGO = (By.CSS_SELECTOR, "footer img.clinicLogo")
+    WELCOME_TEXT = (By.CSS_SELECTOR, ".panel-body")
+    PHONE_NUMBER = (By.CSS_SELECTOR, ".contact-phone")
+    EMAIL = (By.CSS_SELECTOR, ".contact-email")
+    IMPRESSUM_MODAL = (By.ID, "imprintDialog")
+    MODAL_BODY = (By.CSS_SELECTOR, ".modal-body")
+    BUTTON_CLOSE_MODAL = (By.CSS_SELECTOR, "button.btn-close")
+    IMPRESSUM_LINK = (By.ID, "imprintLink")
+
+class AdminIndexExpectedContent:
+    LOGO_SRC = "/images/logo.svg"
+    FOOTER_TEXT = "© 2024 Institut für Medizinische Informatik,\nUniversität Münster"
+    EXPECTED_LANGUAGES = ["Deutsch (Deutschland)", "Englisch (Vereinigtes Königreich)", "Spanisch (Spanien)"]
+    FORGOT_PASSWORD_TEXT = "Passwort vergessen?"
+    PHONE_NUMBER = "+49 (251) 83-55262"
+    EMAIL = "imi@uni-muenster.de"
+    WELCOME_TEXT_DE = "Willkommen zur Mobilen Patientenbefragung (MoPat)!"
+
+
 class AuthenticationHelper:
 
     def __init__(self, driver):
@@ -29,9 +64,9 @@ def login(self, username, password):
         :param username: The username for login.
         :param password: The password for login.
         """
-        username_input = WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(AuthenticationSelectors.Login.USERNAME)
-        )
+        username_input = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            AuthenticationSelectors.Login.USERNAME))
+
         username_input.clear()
         username_input.send_keys(username)
 
@@ -39,9 +74,9 @@ def login(self, username, password):
         password_input.clear()
         password_input.send_keys(password)
 
-        submit_button = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable(AuthenticationSelectors.Login.BUTTON)
-        )
+        submit_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            AuthenticationSelectors.Login.BUTTON))
+
         submit_button.click()
 
     def admin_login(self, username=None, password=None):
@@ -66,10 +101,167 @@ def logout(self):
         ]
         for selector in logout_selectors:
             try:
-                logout_button = WebDriverWait(self.driver, 5).until(
-                    EC.element_to_be_clickable(selector)
-                )
+                logout_button = WebDriverWait(self.driver, 5).until(EC.element_to_be_clickable(
+                    selector))
+
                 logout_button.click()
                 return
             except:
-                continue
\ No newline at end of file
+                continue
+
+    def back_to_login(self):
+        back_to_login = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            PasswordResetSelectors.LOGIN_LINK))
+
+        back_to_login.click()
+
+class AuthenticationAssertHelper(AuthenticationHelper):
+
+    def assert_mobile_user_login(self):
+        # Validate username field
+        username_input = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            AuthenticationSelectors.Login.USERNAME))
+        assert username_input.is_displayed(), "Username input field is not visible."
+
+        # Validate password field
+        password_input = self.driver.find_element(*AuthenticationSelectors.Login.PASSWORD)
+        assert password_input.is_displayed(), "Password input field is not visible."
+
+        # Validate login button
+        submit_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            AuthenticationSelectors.Login.BUTTON))
+        assert submit_button.is_displayed(), "Login button is not visible."
+
+        # Validate language select dropdown
+        try:
+            language_select = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                AuthenticationSelectors.Login.LANGUAGE_SELECT))
+            assert language_select.is_displayed(), "Language select dropdown is not visible."
+        except TimeoutException:
+            raise AssertionError("Language select dropdown was not found or is not visible.")
+
+        # Check available languages
+        options = language_select.find_elements(*AuthenticationSelectors.Login.LANGUAGE_OPTIONS)
+        available_languages = [option.text.strip() for option in options if option.is_displayed()]
+        assert set(available_languages) == set(AdminIndexExpectedContent.EXPECTED_LANGUAGES), (
+            f"Languages mismatch. Expected: {AdminIndexExpectedContent.EXPECTED_LANGUAGES}, Found: {available_languages}"
+        )
+
+        # Validate MoPat logo
+        logo = self.driver.find_element(*AuthenticationSelectors.Login.LOGO)
+        assert logo.is_displayed(), "MoPat logo is not visible."
+        assert logo.get_attribute("src").endswith(AdminIndexExpectedContent.LOGO_SRC), "Logo source is incorrect."
+
+        # Validate footer text
+        footer_text = self.driver.find_element(*AuthenticationSelectors.Login.FOOTER_TEXT).text.strip()
+
+        # Normalize spaces and newlines for comparison
+        normalized_footer_text = " ".join(footer_text.split())
+        normalized_expected_footer_text = " ".join(AdminIndexExpectedContent.FOOTER_TEXT.split())
+
+        assert normalized_footer_text == normalized_expected_footer_text, (
+            f"Footer text is incorrect. Expected: '{AdminIndexExpectedContent.FOOTER_TEXT}', Found: '{footer_text}'"
+        )
+
+        # Validate 'Forgot password' link
+        forget_password_link = self.driver.find_element(*AuthenticationSelectors.Login.FORGOT_PASSWORD_LINK)
+        assert forget_password_link.is_displayed(), "'Forgot password' link is not visible."
+        assert forget_password_link.get_attribute("href").endswith(URLPathsAuthentication.FORGOT_PASSWORD_PATH), (
+            "'Forgot password' link URL is incorrect."
+        )
+        assert forget_password_link.text.strip() == AdminIndexExpectedContent.FORGOT_PASSWORD_TEXT, (
+            "'Forgot password' link text is incorrect."
+        )
+
+    def assert_mobile_user_password(self):
+        try:
+            forgot_password_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                PasswordResetSelectors.FORGOT_PASSWORD_LINK))
+            forgot_password_link.click()
+
+            username_input = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                PasswordResetSelectors.USERNAME_INPUT))
+            assert username_input.is_displayed(), "Username input field is not displayed."
+
+            submit_button = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                PasswordResetSelectors.SUBMIT_BUTTON))
+            assert submit_button.is_displayed(), "Submit button is not displayed."
+
+            login_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                PasswordResetSelectors.LOGIN_LINK))
+            assert login_link.is_displayed(), "Link to switch back to login is not displayed."
+
+        except TimeoutException as e:
+            raise AssertionError(f"Timeout while asserting elements in '/mobile/user/password' view: {e}")
+
+    def assert_admin_index(self):
+        try:
+            header = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                AdminIndexSelectors.HEADER))
+            assert header.is_displayed(), "Header is not displayed."
+
+            nav_bar = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                AdminIndexSelectors.NAVIGATION_BAR))
+            assert nav_bar.is_displayed(), "Navigation bar is not displayed."
+
+            footer = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                AdminIndexSelectors.FOOTER_WRAPPER))
+            assert footer.is_displayed(), "Footer wrapper is not displayed."
+            self.assert_footer_logo()
+
+            try:
+                clinic_logo = self.driver.find_element(*AdminIndexSelectors.CLINIC_LOGO)
+                assert clinic_logo.is_displayed(), "Clinic logo is not displayed in the footer."
+            except NoSuchElementException:
+                pass
+
+            welcome_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                AdminIndexSelectors.WELCOME_TEXT))
+            assert AdminIndexExpectedContent.WELCOME_TEXT_DE in welcome_text.text, "Welcome text is incorrect or not displayed."
+
+            self.assert_contact_information()
+
+        except TimeoutException as e:
+            raise AssertionError(f"Timeout while asserting elements in '/admin/index': {e}")
+
+    def assert_footer_logo(self):
+        try:
+            mopat_logo = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                AdminIndexSelectors.MOPAT_LOGO))
+
+            # CSS-Validation
+            logo_visibility = self.driver.execute_script("return window.getComputedStyle(arguments[0]).visibility;", mopat_logo)
+            logo_display = self.driver.execute_script("return window.getComputedStyle(arguments[0]).display;", mopat_logo)
+
+            assert logo_visibility == "visible", "MoPat logo is not visible (visibility is not 'visible')."
+            assert logo_display != "none", "MoPat logo is not displayed (display is 'none')."
+
+        except TimeoutException:
+            raise AssertionError("MoPat logo not found in the footer.")
+        except AssertionError as e:
+            raise e
+
+    def assert_contact_information(self):
+        try:
+            # Open the imprint modal
+            imprint_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                AdminIndexSelectors.IMPRESSUM_LINK))
+            imprint_link.click()
+
+            imprint_modal = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                AdminIndexSelectors.IMPRESSUM_MODAL))
+
+            modal_body = imprint_modal.find_element(*AdminIndexSelectors.MODAL_BODY)
+            modal_text = modal_body.text
+
+            # Verify phone number and email address
+            assert AdminIndexExpectedContent.PHONE_NUMBER in modal_text, f"Expected phone number '{AdminIndexExpectedContent.PHONE_NUMBER}' is not in the modal."
+            assert AdminIndexExpectedContent.EMAIL in modal_text, f"Expected email address '{AdminIndexExpectedContent.EMAIL}' is not in the modal."
+
+            close_button = imprint_modal.find_element(*AdminIndexSelectors.BUTTON_CLOSE_MODAL)
+            close_button.click()
+
+        except TimeoutException:
+            raise AssertionError("Failed to open the imprint modal.")
+        except AssertionError as e:
+            raise e
\ No newline at end of file
diff --git a/selenium/helper/Bundle.py b/selenium/helper/Bundle.py
index da19608f..870d13bb 100644
--- a/selenium/helper/Bundle.py
+++ b/selenium/helper/Bundle.py
@@ -1,6 +1,6 @@
-import time
+import datetime
 
-from selenium.common import TimeoutException, ElementClickInterceptedException, NoSuchElementException
+from selenium.common import TimeoutException
 from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
@@ -24,6 +24,11 @@ class BundleSelectors:
     INPUT_QUESTIONNAIRE = lambda questionnaire_id: (By.ID, f"questionnaire_{questionnaire_id}")
     INPUT_QUESTIONNAIRE_AVAILABLE_SEARCH = (By.ID, "availableQuestionnairesFilter")
 
+    BUNDLE_LINK = lambda bundle_id: (By.ID, f"bundleLink_{bundle_id}")
+    BUNDLE_LINK_BY_NAME = lambda bundle_name: (By.XPATH, f"//table[@id='bundleTable']//a[text()='{bundle_name}']")
+
+    TABLE_ROWS = (By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr")
+
 
 class BundleHelper:
     def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
@@ -38,16 +43,13 @@ def bundle_exists(self, bundle_name):
         """
         try:
             # Fill the search box with the bundle name
-            self.utils.fill_text_field(SearchBoxSelectors.BUNDLE, bundle_name)
+            self.utils.fill_text_field(BundleSelectors.INPUT_BUNDLE_SEARCH, bundle_name)
 
-            # Wait until the table rows are present (or timeout if none are found)
-            rows = WebDriverWait(self.driver, 2).until(
-                EC.presence_of_all_elements_located((By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr"))
+            # Check if the bundle link with the specified name exists
+            WebDriverWait(self.driver, 2).until(
+                EC.presence_of_element_located(BundleSelectors.BUNDLE_LINK_BY_NAME(bundle_name))
             )
-
-            # Check if the first row has more than one <td> (indicating a valid result)
-            first_row_columns = rows[0].find_elements(By.TAG_NAME, "td") if rows else []
-            return len(first_row_columns) > 1
+            return True
         except TimeoutException:
             # No rows found within the timeout
             return False
@@ -60,31 +62,37 @@ def search_and_open_bundle(self, bundle_name):
         """
         try:
             self.utils.fill_text_field(SearchBoxSelectors.BUNDLE, bundle_name)
-            row_hyperlink = WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable((By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr td a"))
-            )
-            self.utils.click_element((By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr td a"))
+
+            bundle_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                BundleSelectors.BUNDLE_LINK_BY_NAME(bundle_name)))
+            bundle_link.click()
+
         except TimeoutException:
             raise Exception(f"Timeout while searching for bundle '{bundle_name}' to open.")
         except Exception as e:
             raise Exception(f"Error while opening bundle '{bundle_name}': {e}")
 
-    def create_bundle(self, bundle_name, publish_bundle, questionnaires=None):
+    def create_bundle(self, bundle_name=None, publish_bundle=False, questionnaires=None):
         """
         :param bundle_name: Name of the bundle to create.
         :param publish_bundle: Whether to publish the bundle.
         :param questionnaires: List of questionnaires to assign to the bundle (optional).
         """
+        timestamp: str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        bundle_name = bundle_name or f"Bundle {timestamp}"
+
         try:
+            self.navigation_helper.navigate_to_manage_bundles()
+
             self.utils.click_element(BundleSelectors.BUTTON_ADD_BUNDLE)
 
             # Add name
             self.utils.fill_text_field(BundleSelectors.INPUT_NAME, bundle_name)
 
             # Add description
-            description_field = WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.INPUT_EDITABLE_DESCRIPTION)
-            )
+            description_field = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                BundleSelectors.INPUT_EDITABLE_DESCRIPTION))
+
             self.utils.scroll_to_element(BundleSelectors.INPUT_EDITABLE_DESCRIPTION)
             description_field.click()
             description_field.send_keys("This bundle contains questionnaires.")
@@ -97,6 +105,13 @@ def create_bundle(self, bundle_name, publish_bundle, questionnaires=None):
             if publish_bundle:
                 self.utils.toggle_checkbox(BundleSelectors.CHECKBOX_PUBLISH, enable=True)
 
+            bundle_id = self.save_bundle(bundle_name)
+
+            return {
+                "id": bundle_id,
+                "name": bundle_name
+            }
+
         except Exception as e:
             raise Exception(f"Error while creating bundle '{bundle_name}': {e}")
 
@@ -116,9 +131,9 @@ def save_bundle(self, bundle_name):
             self.utils.fill_text_field(SearchBoxSelectors.BUNDLE, bundle_name)
 
             # Extract the bundle ID from the link
-            bundle_link = WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located((By.LINK_TEXT, bundle_name))
-            )
+            bundle_link = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                (By.LINK_TEXT, bundle_name)))
+
             return bundle_link.get_attribute("href").split("id=")[1]
         except Exception as e:
             raise Exception(f"Error while saving bundle '{bundle_name}': {e}")
@@ -137,9 +152,9 @@ def assign_multiple_questionnaires_to_bundle(self, questionnaires, bundle_id=Non
                     self.utils.fill_text_field(BundleSelectors.INPUT_QUESTIONNAIRE_AVAILABLE_SEARCH, questionnaire['name'])
 
                     questionnaire_selector = BundleSelectors.INPUT_QUESTIONNAIRE(questionnaire['id'])
-                    WebDriverWait(self.driver, 10).until(
-                        EC.presence_of_element_located(questionnaire_selector)
-                    )
+                    WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                        questionnaire_selector))
+
                     self.utils.scroll_to_element(BundleSelectors.BUTTON_MOVE_ITEM(questionnaire['id']))
                     self.utils.click_element(BundleSelectors.BUTTON_MOVE_ITEM(questionnaire['id']))
                 except TimeoutException:
diff --git a/selenium/helper/Clinic.py b/selenium/helper/Clinic.py
index 209a645d..a5c1f668 100644
--- a/selenium/helper/Clinic.py
+++ b/selenium/helper/Clinic.py
@@ -1,11 +1,11 @@
-from selenium.common import TimeoutException, ElementClickInterceptedException, NoSuchElementException
+from selenium.common import TimeoutException
 from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 
 from helper.Navigation import NavigationHelper
-from helper.SeleniumUtils import SearchBoxSelectors
+from helper.SeleniumUtils import SearchBoxSelectors, DropdownMethod
 from helper.SeleniumUtils import SeleniumUtils
 
 class URLPathsClinic:
@@ -14,22 +14,23 @@ class URLPathsClinic:
 class ClinicSelectors:
     BUTTON_ADD_CLINIC = (By.ID, "addClinic")
     BUTTON_SAVE = (By.ID, "saveButton")
+    BUTTON_DELETE_CLINIC = lambda clinic_id: (By.ID, f"removeClinic_{clinic_id}")
+    BUTTON_MOVE_ITEM = lambda bundle_id: (By.ID, f"move_{bundle_id}")
+
+    DROPDOWN_CONFIG = lambda parent_id: (By.CSS_SELECTOR, f"li[parentid='{parent_id}'] select")
 
     INPUT_CLINIC_NAME = (By.ID, "name")
     INPUT_EDITABLE_DESCRIPTION = (By.CSS_SELECTOR, "div.note-editable")
+    INPUT_USER_AVAILABLE_SEARCH = (By.ID, "availableUsersFilter")
+    INPUT_USER = lambda username: (By.ID, f"user_{username}")
+    INPUT_BUNDLE_AVAILABLE_SEARCH = (By.ID, "availableBundlesFilter")
+    INPUT_BUNDLE = lambda bundle_id: (By.ID, f"bundle_{bundle_id}")
 
     # Configuration selectors
     CONFIG_USE_PATIENT_DATA_LOOKUP = (By.CSS_SELECTOR, "li#usePatientDataLookup input[type='checkbox']")
     CONFIG_USE_PSEUDONYMIZATION_SERVICE = (By.CSS_SELECTOR, "li#usePseudonymizationService input[type='checkbox']")
     CONFIG_REGISTER_PATIENT_DATA = (By.CSS_SELECTOR, "li#registerPatientData input[type='checkbox']")
 
-    INPUT_BUNDLE_AVAILABLE_SEARCH = (By.ID, "availableBundlesFilter")
-    INPUT_BUNDLE = lambda bundle_id: (By.ID, f"bundle_{bundle_id}")
-    BUTTON_MOVE_ITEM = lambda bundle_id: (By.ID, f"move_{bundle_id}")
-
-    INPUT_USER_AVAILABLE_SEARCH = (By.ID, "availableUsersFilter")
-    INPUT_USER = lambda username: (By.ID, f"user_{username}")
-
     TABLE_ROW_LINK = (By.CSS_SELECTOR, "#clinicTable > tbody > tr > td.dtr-control > a")
 
 class ClinicHelper:
@@ -55,9 +56,8 @@ def create_clinic(self, clinic_name, clinic_description, configurations=None, bu
             self.utils.fill_text_field(ClinicSelectors.INPUT_CLINIC_NAME, clinic_name)
 
             # Add description
-            description_field = WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION)
-            )
+            description_field = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                ClinicSelectors.INPUT_EDITABLE_DESCRIPTION))
             description_field.click()          #  self.utils.click_element(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION)
             description_field.send_keys(clinic_description)
 
@@ -92,36 +92,34 @@ def save_clinic(self, clinic_name):
             self.utils.fill_text_field(SearchBoxSelectors.CLINIC, clinic_name)
 
             # Extract the bundle ID from the link
-            clinic_link = WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located((By.LINK_TEXT, clinic_name))
-            )
+            clinic_link = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                (By.LINK_TEXT, clinic_name)))
+
             return clinic_link.get_attribute("href").split("id=")[1]
         except Exception as e:
             raise Exception(f"Error while saving clinic '{clinic_name}': {e}")
 
-    def delete_clinic(self, clinic_name):
+    def delete_clinic(self, clinic_id):
         """
-        :param clinic_name: Name of the clinic to be deleted.
+        Deletes a clinic by its ID.
+
+        :param clinic_id: ID of the clinic to be deleted.
         :return: True if the clinic was successfully deleted, False if it does not exist.
         """
         try:
             # Navigate to "Manage Clinics"
-            self.navigation_helper.navigate_to_manage_clinics(self.driver)
-
-            # Search for the clinic
-            self.utils.fill_text_field(SearchBoxSelectors.CLINIC, clinic_name)
+            self.navigation_helper.navigate_to_manage_clinics()
 
-            # Find and click the delete button
-            delete_button = WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable((By.XPATH, f'//a[contains(text(), "{clinic_name}")]/../..//button'))
-            )
-            self.utils.click_element((By.XPATH, f'//a[contains(text(), "{clinic_name}")]/../..//button'))
+            # Wait for and click the delete button for the specified clinic
+            delete_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                ClinicSelectors.BUTTON_DELETE_CLINIC(clinic_id)))
+            delete_button.click()
             return True
         except TimeoutException:
             # Clinic not found
             return False
         except Exception as e:
-            raise Exception(f"Error while deleting clinic '{clinic_name}': {e}")
+            raise Exception(f"Error while deleting clinic with ID '{clinic_id}': {e}")
 
     def configure_clinic_setting(self, config_selector, config_dropdown_value=None):
         """
@@ -130,26 +128,16 @@ def configure_clinic_setting(self, config_selector, config_dropdown_value=None):
         """
         try:
             # Enable the checkbox for the configuration
-            checkbox = WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(config_selector)
-            )
+            checkbox = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                config_selector))
+
             self.utils.scroll_to_element(config_selector)
             self.utils.toggle_checkbox(config_selector, enable=True)
 
             # Select the value from the dropdown if specified
             if config_dropdown_value:
                 parent_id = checkbox.get_attribute("triggerid")
-                dropdown = WebDriverWait(self.driver, 10).until(
-                    EC.presence_of_element_located((By.CSS_SELECTOR, f"li[parentid='{parent_id}'] select"))
-                )
-                self.utils.scroll_to_element((By.CSS_SELECTOR, f"li[parentid='{parent_id}'] select"))
-                dropdown.click()
-
-                # Locate the <option> by value instead of text
-                option = WebDriverWait(self.driver, 10).until(
-                    EC.presence_of_element_located((By.CSS_SELECTOR, f"option[value='{config_dropdown_value}']"))
-                )
-                option.click()
+                self.utils.select_dropdown(ClinicSelectors.DROPDOWN_CONFIG(parent_id), config_dropdown_value, DropdownMethod.VALUE)
         except Exception as e:
             raise Exception(
                 f"Error configuring setting '{config_selector}' with dropdown value '{config_dropdown_value}': {e}")
@@ -167,10 +155,9 @@ def assign_multiple_bundes_to_clinic(self, bundles, clinic_id=None):
                 try:
                     self.utils.fill_text_field(ClinicSelectors.INPUT_BUNDLE_AVAILABLE_SEARCH, bundle['name'])
 
-                    bundle_selector = ClinicSelectors.INPUT_BUNDLE(bundle['id'])
-                    WebDriverWait(self.driver, 10).until(
-                        EC.presence_of_element_located(bundle_selector)
-                    )
+                    WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                        ClinicSelectors.INPUT_BUNDLE(bundle['id'])))
+
                     self.utils.scroll_to_element(ClinicSelectors.BUTTON_MOVE_ITEM(bundle['id']))
                     self.utils.click_element(ClinicSelectors.BUTTON_MOVE_ITEM(bundle['id']))
                 except TimeoutException:
@@ -194,9 +181,8 @@ def assign_multiple_users_to_clinic(self, usernames, clinic_id=None):
                     self.utils.fill_text_field(ClinicSelectors.INPUT_USER_AVAILABLE_SEARCH, username)
 
                     user_selector = ClinicSelectors.INPUT_USER(username)
-                    WebDriverWait(self.driver, 10).until(
-                        EC.presence_of_element_located(user_selector)
-                    )
+                    WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                        user_selector))
                     self.utils.scroll_to_element(ClinicSelectors.BUTTON_MOVE_ITEM(username))
                     self.utils.click_element(ClinicSelectors.BUTTON_MOVE_ITEM(username))
                 except TimeoutException:
@@ -215,11 +201,15 @@ def search_and_open_clinic(self, clinic_name):
             self.navigation_helper.navigate_to_manage_clinics()
 
         try:
+            # Fill the search box with the clinic name
             self.utils.fill_text_field(SearchBoxSelectors.CLINIC, clinic_name)
-            row_hyperlink = WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(ClinicSelectors.TABLE_ROW_LINK)
-            )
-            self.utils.click_element(ClinicSelectors.TABLE_ROW_LINK)
+
+            # Wait for the clinic link to be clickable
+            clinic_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                ClinicSelectors.TABLE_ROW_LINK))
+
+            # Click the clinic link
+            clinic_link.click()
         except TimeoutException:
             raise Exception(f"Timeout while searching for clinic '{clinic_name}' to open.")
         except Exception as e:
diff --git a/selenium/helper/Condition.py b/selenium/helper/Condition.py
index 3dc35d4a..685b35ba 100644
--- a/selenium/helper/Condition.py
+++ b/selenium/helper/Condition.py
@@ -1,12 +1,62 @@
 from selenium.common import NoSuchElementException, TimeoutException
 from selenium.webdriver import Keys
+from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.select import Select
 from selenium.webdriver.support.wait import WebDriverWait
 
-from helper.Questionnaire import QuestionnaireHelper, ConditionSelectors
+from helper.Questionnaire import QuestionnaireHelper
+from helper.SeleniumUtils import DropdownMethod
 
 
+class ConditionSelectors:
+    BUTTON_ADD_CONDITION = (By.ID, 'addCondition')
+    BUTTON_ADD_TARGET = (By.ID, 'addTargetButton')
+    BUTTON_SAVE_CONDITION = (By.ID, 'saveCondition')
+    BUTTON_BACK_TO_QUESTIONNAIRE = (By.ID, 'backToQuestionnaire')
+
+    DROPDOWN_TRIGGER = (By.ID, "triggerId")
+    DROPDOWN_QUESTION = (By.ID, 'questionDropDown0')
+
+    INPUT_THRESHOLD = (By.ID, 'conditionDTOs0.thresholdValue')
+
+    TABLE_CONDITIONS_QUESTION = (By.ID, "DataTables_Table_0")
+    TABLE_CONDITIONS_ANSWER = (By.ID, "DataTables_Table_1")
+    TABLE_CONDITIONS_QUESTIONNAIRE = (By.ID, "DataTables_Table_2")
+
+    # Search input fields for each table
+    SEARCH_INPUT_CONDITIONS_QUESTION = (By.CSS_SELECTOR, "#DataTables_Table_0_filter input")
+    SEARCH_INPUT_CONDITIONS_ANSWER = (By.CSS_SELECTOR, "#DataTables_Table_1_filter input")
+    SEARCH_INPUT_CONDITIONS_QUESTIONNAIRE = (By.CSS_SELECTOR, "#DataTables_Table_2_filter input")
+
+    # Empty row in each table
+    EMPTY_ROW = (By.CSS_SELECTOR, "tbody .dataTables_empty")
+
+    CONDITION_LINK = lambda question_id: (By.XPATH, f'//a[contains(@href, "/condition/listQuestionConditions?questionId={question_id}")]')
+
+    THRESHOLD_TYPE = (By.ID, "conditionDTOs0.thresholdType")
+    class ThresholdType:
+        SMALLER_THAN = "SMALLER_THAN"
+        SMALLER_THAN_EQUALS = "SMALLER_THAN_EQUALS"
+        EQUALS = "EQUALS"
+        BIGGER_THAN_EQUALS = "BIGGER_THAN_EQUALS"
+        BIGGER_THAN = "BIGGER_THAN"
+        NOT_EQUALS = "NOT_EQUALS"
+
+    DROPDOWN_TARGET_CLASS = (By.ID, "targetClass0")
+    class TargetType:
+        QUESTION = "de.imi.mopat.model.Question"
+        ANSWER = "de.imi.mopat.model.SelectAnswer"
+        QUESTIONNAIRE = "de.imi.mopat.model.Questionnaire"
+
+    DROPDOWN_TARGET_QUESTION = (By.ID, 'targetAnswerQuestionDropDown0')
+    DROPDOWN_TARGET_ANSWER = (By.ID, 'questionDropDown0')
+    DROPDOWN_ANSWER_TARGET = (By.ID, 'answerDropDown0')
+
+    DROPDOWN_ACTION = (By.ID, 'action0')
+    class ActionType:
+        DISABLE = "DISABLE"
+        ENABLE = "ENABLE"
+
 class ConditionHelper(QuestionnaireHelper):
 
     def can_add_condition(self, question_id):
@@ -27,19 +77,19 @@ def set_target_and_action(self, target_class, target_option_index, answer_target
         :param answer_target_index: The index of the answer target if the target class is 'ANSWER'.
         :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
         """
-        Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TARGET_CLASS)).select_by_value(target_class)
+        self.utils.select_dropdown(ConditionSelectors.DROPDOWN_TARGET_CLASS, target_class, DropdownMethod.VALUE)
 
         if target_option_index > 0:
             if target_class == ConditionSelectors.TargetType.ANSWER:
-                Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TARGET_ANSWER)).select_by_index(target_option_index)
+                self.utils.select_dropdown(ConditionSelectors.DROPDOWN_TARGET_QUESTION, target_option_index, DropdownMethod.INDEX)
             else:
-                Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TARGET_QUESTION)).select_by_index(target_option_index)
-            self.utils.handle_popup_alert(True)
+                self.utils.select_dropdown(ConditionSelectors.DROPDOWN_TARGET_QUESTION, target_option_index,DropdownMethod.INDEX)
+            self.utils.handle_popup_alert(accept=True)
 
         if target_class == ConditionSelectors.TargetType.ANSWER:
-            Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_ANSWER_TARGET)).select_by_index(answer_target_index)
+            self.utils.select_dropdown(ConditionSelectors.DROPDOWN_ANSWER_TARGET, answer_target_index, DropdownMethod.INDEX)
 
-        Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_ACTION)).select_by_value(action)
+        self.utils.select_dropdown(ConditionSelectors.DROPDOWN_ACTION, action, DropdownMethod.VALUE)
 
     def add_condition_for_multiple_choice(self, question_id, trigger_index=0,
                                           target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
@@ -57,7 +107,7 @@ def add_condition_for_multiple_choice(self, question_id, trigger_index=0,
 
         # Set the trigger option
         if trigger_index > 0:
-            Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TRIGGER)).select_by_index(trigger_index)
+            self.utils.select_dropdown(ConditionSelectors.DROPDOWN_TRIGGER, trigger_index, DropdownMethod.INDEX)
             self.utils.handle_popup_alert(True)
 
         # Set the target and action
@@ -66,33 +116,33 @@ def add_condition_for_multiple_choice(self, question_id, trigger_index=0,
         # Save the condition
         self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
 
-    def add_condition_for_slider(self, question, threshold_type=ConditionSelectors.ThresholdType.BIGGER_THAN_EQUALS,
-                                 target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+    def add_condition_for_slider(self, threshold_type=ConditionSelectors.ThresholdType.BIGGER_THAN_EQUALS,
+                                 threshold_steps=1, target_type=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
                                  answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
         """
-        :param question: A dictionary containing question details (must include 'id').
         :param threshold_type: The type of threshold to use (e.g., 'BIGGER_THAN_EQUALS').
-        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
+        :param threshold_steps: The number of arrow-up key presses to set the threshold value.
+        :param target_type: The type of the target (e.g., 'ANSWER' or 'QUESTION').
         :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
         :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
         :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
         """
-        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question['id'])).click()
         self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
 
         # Set the threshold type and value
-        Select(self.driver.find_element(*ConditionSelectors.THRESHOLD_TYPE)).select_by_value(threshold_type)
+        self.utils.select_dropdown(ConditionSelectors.THRESHOLD_TYPE, threshold_type, DropdownMethod.VALUE)
         if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
             self.utils.handle_popup_alert(True)
 
         # Increment the threshold value using the arrow key
-        threshold_input = self.driver.find_element(*ConditionSelectors.INPUT_THRESHOLD)
-        threshold_input.click()
-        threshold_input.send_keys(Keys.ARROW_UP)
-        self.utils.handle_popup_alert(True)
+        for _ in range(threshold_steps):
+            threshold_input = self.driver.find_element(*ConditionSelectors.INPUT_THRESHOLD)
+            threshold_input.click()
+            threshold_input.send_keys(Keys.ARROW_UP)
+            self.utils.handle_popup_alert(True)
 
         # Set the target and action
-        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+        self.set_target_and_action(target_type, target_option_index, answer_target_index, action)
 
         # Save the condition
         self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
@@ -112,7 +162,7 @@ def add_condition_for_number_input(self, question_id, threshold_type=ConditionSe
         self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
 
         # Set the threshold type and value
-        Select(self.driver.find_element(*ConditionSelectors.THRESHOLD_TYPE)).select_by_value(threshold_type)
+        self.utils.select_dropdown(ConditionSelectors.THRESHOLD_TYPE, threshold_type, DropdownMethod.VALUE)
         if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
             self.utils.handle_popup_alert(True)
 
@@ -143,7 +193,7 @@ def add_condition_for_numbered_checkbox(self, question, threshold_type=Condition
         self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
 
         # Set the threshold type and value
-        Select(self.driver.find_element(*ConditionSelectors.THRESHOLD_TYPE)).select_by_value(threshold_type)
+        self.utils.select_dropdown(ConditionSelectors.THRESHOLD_TYPE, threshold_type, DropdownMethod.VALUE)
         if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
             self.utils.handle_popup_alert(True)
 
@@ -175,7 +225,7 @@ def add_condition_for_drop_down(self, question_id, trigger_index=1,
 
         # Set the trigger option
         if trigger_index > 0:
-            Select(self.driver.find_element(*ConditionSelectors.DROPDOWN_TRIGGER)).select_by_index(trigger_index)
+            self.utils.select_dropdown(ConditionSelectors.DROPDOWN_TRIGGER, trigger_index, DropdownMethod.INDEX)
             self.utils.handle_popup_alert(True)
 
         # Set the target and action
@@ -185,13 +235,87 @@ def add_condition_for_drop_down(self, question_id, trigger_index=1,
         self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
 
     def navigate_back_to_questionnaire(self):
-        """
-        Navigates back to the questionnaire overview by clicking the 'Back to Questionnaire' button.
-        """
         try:
-            back_button = WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(ConditionSelectors.BUTTON_BACK_TO_QUESTIONNAIRE)
-            )
+            back_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                ConditionSelectors.BUTTON_BACK_TO_QUESTIONNAIRE))
             back_button.click()
         except TimeoutException:
             print("Failed to find the 'Back to Questionnaire' button.")
+
+    def open_conditions_of_question(self, question_id):
+        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
+
+
+class ConditionAssertHelper(ConditionHelper):
+
+    def assert_condition_in_section(self, table_selector, condition_text):
+        """
+        :param table_selector: The table selector to check.
+        :param condition_text: The condition text to search for.
+        """
+        try:
+            table = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(table_selector))
+            rows = table.find_elements(By.CSS_SELECTOR, "tbody tr")
+
+            assert any(condition_text in row.text for row in rows), (
+                f"Condition '{condition_text}' not found in table {table_selector}."
+            )
+
+        except Exception as e:
+            raise AssertionError(f"Error asserting condition in section: {e}")
+
+    def assert_search_functionality(self, search_input_selector, table_selector, condition_text):
+        """
+        :param search_input_selector: The search input field selector.
+        :param table_selector: The table selector to check.
+        :param condition_text: The condition text to search for.
+        """
+        try:
+            # Input search text
+            search_input = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(search_input_selector)
+            )
+            search_input.clear()
+            search_input.send_keys(condition_text)
+
+            # Verify the condition appears in the table
+            self.assert_condition_in_section(table_selector, condition_text)
+
+        except Exception as e:
+            raise AssertionError(f"Error asserting search functionality: {e}")
+
+    def assert_question_condition_list_de(self):
+
+        # Assert that the sections are displayed
+        try:
+            # Wait for and verify the three tables are visible
+            tables = [
+                ConditionSelectors.TABLE_CONDITIONS_QUESTION,
+                ConditionSelectors.TABLE_CONDITIONS_ANSWER,
+                ConditionSelectors.TABLE_CONDITIONS_QUESTIONNAIRE
+            ]
+
+            for table in tables:
+                WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(table))
+                assert self.driver.find_element(*table).is_displayed(), f"Table {table} is not displayed."
+
+        except Exception as e:
+            raise AssertionError(f"Error asserting conditions sections: {e}")
+
+        # Assert conditions in respective sections
+        self.assert_condition_in_section(
+            ConditionSelectors.TABLE_CONDITIONS_QUESTION, "Die Frage"
+        )
+        self.assert_condition_in_section(
+            ConditionSelectors.TABLE_CONDITIONS_ANSWER, "Die Antwort"
+        )
+        self.assert_condition_in_section(
+            ConditionSelectors.TABLE_CONDITIONS_QUESTIONNAIRE, "Den Fragebogen"
+        )
+
+        # Test search functionality
+        self.assert_search_functionality(
+            ConditionSelectors.SEARCH_INPUT_CONDITIONS_QUESTION,
+            ConditionSelectors.TABLE_CONDITIONS_QUESTION,
+            "Die Frage"
+        )
\ No newline at end of file
diff --git a/selenium/helper/Navigation.py b/selenium/helper/Navigation.py
index fe694690..df67bbcf 100644
--- a/selenium/helper/Navigation.py
+++ b/selenium/helper/Navigation.py
@@ -22,6 +22,10 @@ class BundleMenu:
     class ClinicMenu:
         LINK = (By.ID, "clinicLink")
 
+class QuestionTableSelectors:
+    EDIT_QUESTION_LINK = lambda question_id: (By.XPATH, f'//a[@href="fill?id={question_id}"]')
+    EDIT_QUESTIONS_CONDITIONS_LINK = lambda question_id: (By.XPATH, f'//a[@href="/condition/listQuestionConditions?questionId={question_id}"]')
+
 class QuestionnaireTableSelectors:
     FILTER_INPUT = (By.CSS_SELECTOR, "#questionnaireTable_filter input[type='search']")
     FIRST_RESULT_LINK = (By.CSS_SELECTOR, "#questionnaireTable tbody tr td a")
@@ -43,17 +47,15 @@ def navigate_to_manage_questionnaires(self):
     def navigate_to_questions_of_questionnaire(self, questionnaire_id, questionnaire_name):
         self.navigate_to_manage_questionnaires()
         self.utils.fill_text_field(QuestionnaireTableSelectors.FILTER_INPUT, questionnaire_name)
-        link = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable(QuestionnaireTableSelectors.EDIT_QUESTIONS_LINK(questionnaire_id))
-        )
+        link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            QuestionnaireTableSelectors.EDIT_QUESTIONS_LINK(questionnaire_id)))
         link.click()
 
     def navigate_to_scores_of_questionnaire(self, questionnaire_id, questionnaire_name):
         self.navigate_to_manage_questionnaires()
         self.utils.fill_text_field(QuestionnaireTableSelectors.FILTER_INPUT, questionnaire_name)
-        scores_link = WebDriverWait(self.driver, 10).until(
-            EC.element_to_be_clickable(QuestionnaireTableSelectors.EDIT_SCORES_LINK(questionnaire_id))
-        )
+        scores_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            QuestionnaireTableSelectors.EDIT_SCORES_LINK(questionnaire_id)))
         scores_link.click()
 
     def navigate_to_manage_bundles(self):
@@ -81,37 +83,14 @@ def search_and_open_questionnaire(self, questionnaire_name):
             self.utils.fill_text_field(QuestionnaireTableSelectors.FILTER_INPUT, questionnaire_name)
 
             # Click the first result
-            first_result_link = WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(QuestionnaireTableSelectors.FIRST_RESULT_LINK)
-            )
+            first_result_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                QuestionnaireTableSelectors.FIRST_RESULT_LINK))
             first_result_link.click()
         except TimeoutException:
             raise Exception(f"Failed to search and open questionnaire '{questionnaire_name}'.")
 
-    # def search_and_delete_item(self, item_name, item_id, item_type):
-    #     try:
-    #         # Initialize variables based on the item type
-    #         if item_type == "questionnaire":
-    #             self.navigate_to_manage_questionnaires()
-    #             search_box_selector = SearchBoxSelectors.QUESTIONNAIRE
-    #             button_id = RemoveButtonSelectors.QUESTIONNAIRE.format(item_id)
-    #         elif item_type == "bundle":
-    #             self.navigate_to_manage_bundles()
-    #             search_box_selector = SearchBoxSelectors.BUNDLE
-    #             button_id = RemoveButtonSelectors.BUNDLE.format(item_id)
-    #         elif item_type == "clinic":
-    #             self.navigate_to_manage_clinics()
-    #             search_box_selector = SearchBoxSelectors.CLINIC
-    #             button_id = RemoveButtonSelectors.CLINIC.format(item_id)
-    #         else:
-    #             raise ValueError(f"Unknown item type: {item_type}")
-    #
-    #         # Search for the element using the appropriate search box
-    #         self.utils.fill_text_field(search_box_selector, item_name)
-    #
-    #         # click the remove button
-    #         self.utils.click_element((By.ID, button_id))
-    #     except TimeoutException:
-    #         raise Exception(f"Failed to delete {item_type} '{item_name}' with ID {item_id}'.")
-    #     except Exception as e:
-    #         raise Exception(f"An error occurred while deleting {item_type} '{item_name}': {e}")
\ No newline at end of file
+
+    def open_question(self, question_id):
+        question_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            QuestionTableSelectors.EDIT_QUESTION_LINK(question_id)))
+        question_link.click()
\ No newline at end of file
diff --git a/selenium/helper/Question.py b/selenium/helper/Question.py
index 1408f6f2..cb7e4076 100644
--- a/selenium/helper/Question.py
+++ b/selenium/helper/Question.py
@@ -1,54 +1,123 @@
-import time
-from functools import partial
+import os
+from datetime import datetime, timedelta
+from enum import Enum
 
-from selenium import webdriver
-from selenium.common import TimeoutException, ElementClickInterceptedException
+from selenium.common import TimeoutException
 from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 
 from helper.Navigation import NavigationHelper
-from helper.SeleniumUtils import SeleniumUtils
-
+from helper.SeleniumUtils import SeleniumUtils, DropdownMethod
+
+
+class QuestionType(Enum):
+    BODY_PART = "BODY_PART"
+    BARCODE = "BARCODE"
+    NUMBER_INPUT = "NUMBER_INPUT"
+    INFO_TEXT = "INFO_TEXT"
+    MULTIPLE_CHOICE = "MULTIPLE_CHOICE"
+    SLIDER = "SLIDER"
+    NUMBER_CHECKBOX = "NUMBER_CHECKBOX"
+    NUMBER_CHECKBOX_TEXT = "NUMBER_CHECKBOX_TEXT"
+    DROP_DOWN = "DROP_DOWN"
+    FREE_TEXT = "FREE_TEXT"
+    DATE = "DATE"
+    IMAGE = "IMAGE"
+
+
+class BodyPartSelectors:
+    # SVG selectors for body parts
+    BODY_PART_SVG_FRONT = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} #svg-FRONT")
+    BODY_PART_SVG_BACK = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} #svg-BACK")
+    # Individual body parts (front_or_back = 'front' or 'back') (left_or_right)
+    HEAD = lambda id_selector, front_or_back: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-head")
+    THROAT = lambda id_selector, front_or_back: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-throat")
+    CHEST = lambda id_selector, front_or_back: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-chest")
+    STOMACH = lambda id_selector, front_or_back: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-stomach")
+    HIPS = lambda id_selector, front_or_back: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-hips")
+    GENITALS = lambda id_selector, front_or_back: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-genitals")
+    SHOULDER = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}Shoulder")
+    ELBOW_JOINT = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}ElbowJoint")
+    LOWER_ARM = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}LowerArm")
+    HAND = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}Hand")
+    THIGH = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}Thigh")
+    KNEE = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}Knee")
+    LOWER_LEG = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}LowerLeg")
+    FOOT = lambda id_selector, front_or_back, left_or_right: (By.CSS_SELECTOR, f"#{id_selector} #bodyPart-{front_or_back}-{left_or_right}Foot")
 
 class QuestionSelectors:
+    NUMBER_INPUT_SECTION = (By.ID, "numberInput")
+    MULTIPLE_CHOICE_AND_DROP_DOWN_SECTION = (By.ID, "multipleChoice")
+    SLIDER_AND_NUMBER_CHECKBOX_SECTION = (By.ID, "slider")
+    NUMBER_CHECKBOX_TEXT_SECTION = (By.ID, "sliderFreeText")
+    DATE_SECTION = (By.ID, "date")
+    IMAGE_SECTION = (By.ID, "image")
+    BODY_PART_SECTION = (By.ID, "bodyPart")
+
+    BUTTON_ADD_QUESTION = (By.ID, "addQuestion")
     BUTTON_SAVE = (By.ID, "saveButton")
+    BUTTON_CANCEL = (By.ID, "cancelButton")
     BUTTON_ADD_ANSWER = (By.ID, "addAnswerButton")
+    BUTTON_SELECT_ALL_BODY_PARTS = lambda FRONT_or_BACK: (By.ID, f"selectAllBodyPartsButton-{FRONT_or_BACK}") # "FRONT" or "BACK"
+    BUTTON_DESELECT_ALL_BODY_PARTS = lambda FRONT_or_BACK: (By.ID, f"deleteAllBodyPartsButton-{FRONT_or_BACK}") # "FRONT" or "BACK"
 
-    DROPDOWN_QUESTION_TYPE = (By.ID, "questionTypeDropDown")
     CHECKBOX_IS_REQUIRED = (By.ID, 'isRequired1')
-    INPUT_MIN_NUMBER_ANSWERS = (By.ID, "minNumberAnswers")
-    INPUT_MAX_NUMBER_ANSWERS = (By.ID, "maxNumberAnswers")
-
-    INPUT_QUESTION_TEXT_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedQuestionTextCollapsableText_{language_code}"]/div/div[2]/div[2]')
-    INPUT_SLIDER_MIN_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
-    INPUT_SLIDER_MAX_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
-    INPUT_NUMERIC_CHECKBOX_MIN_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
-    INPUT_NUMERIC_CHECKBOX_MAX_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
-    INPUT_NUMERIC_CHECKBOX_FREETEXT_MIN_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
-    INPUT_NUMERIC_CHECKBOX_FREETEXT_MAX_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
-
-    TABLE_QUESTION = (By.ID, "questionTable")
+    CHECKBOX_QUESTION_INITIAL_ACTIVATION = (By.ID, "isEnabled1")
+    CHECKBOX_SYMBOL_ABOVE_SLIDER = (By.ID, "showIcons")
+    CHECKBOX_DISPLAY_VALUE_ON_SLIDER = (By.ID, "showValueOnButton")
+    CHECKBOX_VERTICAL = lambda index : (By.NAME, f"answers[{index}].vertical")
+    CHECKBOX_FREE_TEXT = lambda id_selector, index: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[{index}].isOther']")
+    CHECKBOX_ANSWER_INITIAL_ACTIVATION = lambda id_selector, index: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[{index}].isEnabled']")
+
+    DROPDOWN_ADD_LANGUAGE = (By.CSS_SELECTOR, "div#languageDropdown.dropdown")
+    DROPDOWN_TYPE_OF_IDENTIFICATION = (By.ID, "codedValueType")
+    DROPDOWN_QUESTION_TYPE = (By.ID, "questionTypeDropDown")
+    DROPDOWN_IMAGE_TYPE = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} select[name='imageType']")
+
+    ERROR_SLIDER_CONTAINER = (By.ID, "sliderErrors")
+    ERROR_QUESTION_TEXT = lambda language_code: (By.XPATH, f"//textarea[@id='localizedQuestionText{language_code}']/following-sibling::div[@style='color: red']")
+    ERROR_MIN_ANSWERS = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//input[@id='minNumberAnswers']/following-sibling::div[@style='color: red']")
+    ERROR_MAX_ANSWERS = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//input[@id='maxNumberAnswers']/following-sibling::div[@style='color: red']")
+    ERROR_IDENT_CODE = lambda index: (By.XPATH, f"//input[@id='answers{index}.codedValue']/following-sibling::div[@style='color: red']")
+    ERROR_MIN_VALUE = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//input[@id='answers0.minValue']/following-sibling::div[@style='color: red']")
+    ERROR_MAX_VALUE = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//input[@id='answers0.maxValue']/following-sibling::div[@style='color: red']")
+    ERROR_STEP_SIZE = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//input[@id='answers0.stepsize']/following-sibling::div[@style='color: red']")
+    ERROR_START_DATE = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//input[@id='answers0.startDate']/following-sibling::div[@style='color: red']")
+    ERROR_END_DATE = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//input[@id='answers0.endDate']/following-sibling::div[@style='color: red']")
+    ERROR_FILE_PATH = lambda id_selector: (By.XPATH, f"//div[@id='{id_selector}']//div[@style='color: red']")
+    ERROR_TEXTAREA_ANSWER = lambda id_selector, index, language_code: (By.XPATH, f"//div[@id='{id_selector}']//textarea[@name='answers[{index}].localizedLabel[{language_code}]']/following-sibling::div[@style='color: red']")
+
+    INPUT_MIN_NUMBER_ANSWERS = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[id='minNumberAnswers']")
+    INPUT_MAX_NUMBER_ANSWERS = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[id='maxNumberAnswers']")
+    INPUT_MIN_VALUE = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[0].minValue']")
+    INPUT_MAX_VALUE = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[0].maxValue']")
+    INPUT_STEP_SIZE = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[0].stepsize']")
+    INPUT_START_DATE = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[0].startDate']")
+    INPUT_END_DATE = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[0].endDate']")
+    INPUT_IMAGE_UPLOAD = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} input[type='file'][name='answers[0].imageFile']")
+    INPUT_IDENTIFICATION = lambda id_selector, index: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[{index}].codedValue']")
+    INPUT_SCORE = lambda id_selector, index: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[{index}].value']")
+    INPUT_FREETEXT_LABEL = lambda id_selector, index, language_code: (By.CSS_SELECTOR, f"#{id_selector} input[name='answers[{index}].localizedFreetextLabel[{language_code}]']")
+
+    INPUT_WYSIWYG_QUESTION_TEXT = lambda language_code: (By.XPATH, f'//*[@id="localizedQuestionTextCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_WYSIWYG_SLIDER_MIN = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_WYSIWYG_SLIDER_MAX = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextSliderCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_WYSIWYG_NUMERIC_CHECKBOX_FREETEXT_MIN = lambda language_code: (By.XPATH, f'//*[@id="localizedMinimumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
+    INPUT_WYSIWYG_NUMERIC_CHECKBOX_FREETEXT_MAX = lambda language_code: (By.XPATH, f'//*[@id="localizedMaximumTextNumberCheckboxCollapsableText_{language_code}"]/div/div[2]/div[2]')
+
+    TEXTAREA_ANSWER_TEXT = lambda id_selector, index, language_code: (By.CSS_SELECTOR, f"#{id_selector} textarea[name='answers[{index}].localizedLabel[{language_code}]']")
+
+    IMAGE_FILE_CONTAINER = lambda id_selector: (By.CSS_SELECTOR, f"#{id_selector} .form-group.imageFile")
+    MULTIPLE_CHOICE_ANSWER_PANELS = (By.CLASS_NAME, "multipleChoiceAnswerPanel")
+    DELETE_BUTTON_WITHIN_PANEL = (By.XPATH, ".//button[@id='deleteAnswerButton']")
     TABLE_LAST_ROW = (By.XPATH, "//tbody/tr[last()]")
-    TABLE_ROWS = (By.XPATH, "//tbody/tr")
-
-    class QuestionTypes:
-        INFO_TEXT = "INFO_TEXT"
-        MULTIPLE_CHOICE = "MULTIPLE_CHOICE"
-        SLIDER = "SLIDER"
-        NUMBER_CHECKBOX = "NUMBER_CHECKBOX"
-        NUMBER_CHECKBOX_TEXT = "NUMBER_CHECKBOX_TEXT"
-        DROP_DOWN = "DROP_DOWN"
-        FREE_TEXT = "FREE_TEXT"
-        NUMBER_INPUT = "NUMBER_INPUT"
-        DATE = "DATE"
-        IMAGE = "IMAGE"
-        BODY_PART = "BODY_PART"
-        BARCODE = "BARCODE"
-
+    TABLE_ROWS = (By.CSS_SELECTOR, "tbody > tr:not(#emptyRow)")
+    TABLE_QUESTIONS = (By.ID, "questionTable")
+    ACTION_BUTTONS = (By.CSS_SELECTOR, "td.actionColumn > div.d-none.d-xl-block > a.link")
+    GRIP_SELECTOR = lambda item_id: (By.ID, f"grip-{item_id}")
 
 class QuestionHelper:
 
@@ -60,80 +129,94 @@ class QuestionHelper:
     DEFAULT_OPTIONS = ["Option 1", "Option 2", "Option 3"]
     DEFAULT_QUESTION_TEXT = "Default Question Text"
     DEFAULT_STEP_SIZE = 1
-
     DEFAULT_MC_OPTIONS =["Option 1", "Option 2", "Option 3"]
     DEFAULT_MC_MIN_VALUE = 0
     DEFAULT_MC_MAX_VALUE = len(DEFAULT_MC_OPTIONS)
     DEFAULT_FREE_TEXT_LABEL = "Freetext Label"
+    DEFAULT_IMAGE_UPLOAD_PATH = "test_images"
+    DEFAULT_IMAGE_FILE_NAME = "test_upload_image.png"
+    DEFAULT_IMAGE_TYPE = 'FRONT'
 
     def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
         self.utils = SeleniumUtils(driver)
         self.navigation_helper = navigation_helper
-        self.QUESTION_TYPES = [
-            partial(self.add_question_info_text),
-            partial(self.add_question_multiple_choice),
-            partial(self.add_question_slider_question),
-            partial(self.add_question_numeric_checkbox),
-            partial(self.add_question_numeric_checkbox_freetext),
-            partial(self.add_question_date_question),
-            partial(self.add_question_dropdown),
-            partial(self.add_question_numeric_question),
-            partial(self.add_question_freetext),
-        ]
 
     def save_question(self):
         self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
         return self.get_last_added_question_id()
 
-    def get_last_added_question_id(self):
-        """
-        :return: ID of the question as a string.
-        """
-        # Wait until the table rows are loaded
-        WebDriverWait(self.driver, 30).until(
-            EC.presence_of_element_located(QuestionSelectors.TABLE_LAST_ROW)
-        )
-
-        # Find the last row in the table
-        last_row = self.driver.find_element(*QuestionSelectors.TABLE_LAST_ROW)
-
-        # Extract the ID from the `id` attribute of the last row
-        question_id = last_row.get_attribute("id")
+    def cancel_question_editing(self):
+        self.utils.click_element(QuestionSelectors.BUTTON_CANCEL)
 
-        # Ensure the ID is found
-        if not question_id:
-            raise Exception("The ID of the last question could not be found.")
-
-        return question_id
+    def get_question_type(self, question_id):
+        """
+        Retrieves the type of a question by opening its edit page and checking the selected option
+        in the question type dropdown.
 
-    def add_question_info_text(self, language_code=None, question_text=None):
+        :param question_id: The ID of the question to retrieve the type for.
+        :return: The QuestionType of the question.
+        """
+        try:
+            # Navigate to the question's edit page
+            self.navigation_helper.open_question(question_id)
+
+            # Wait for the question type dropdown to be visible
+            question_type_dropdown = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE)
+            )
+
+            # Retrieve the selected option
+            selected_option = question_type_dropdown.find_element(By.CSS_SELECTOR, "option[selected]")
+            value = selected_option.get_attribute('value')
+
+            self.cancel_question_editing()
+
+            # Convert the value to a QuestionType
+            return QuestionType(value)
+        except TimeoutException:
+            raise Exception(f"Timeout while retrieving question type for question ID {question_id}.")
+        except Exception as e:
+            raise Exception(f"Error while retrieving question type for question ID {question_id}: {e}")
+
+    def add_question_by_type_default_value(self, question_type: QuestionType):
+        if question_type == QuestionType.INFO_TEXT:
+            return self.add_question_info_text()
+        elif question_type == QuestionType.MULTIPLE_CHOICE:
+            return self.add_question_multiple_choice()
+        elif question_type == QuestionType.SLIDER:
+            return self.add_question_slider_question()
+        elif question_type == QuestionType.NUMBER_CHECKBOX:
+            return self.add_question_number_checkbox()
+        elif question_type == QuestionType.NUMBER_CHECKBOX_TEXT:
+            return self.add_question_number_checkbox_text()
+        elif question_type == QuestionType.DATE:
+            return self.add_question_date_question()
+        elif question_type == QuestionType.DROP_DOWN:
+            return self.add_question_dropdown()
+        elif question_type == QuestionType.NUMBER_INPUT:
+            return self.add_question_number_question()
+        elif question_type == QuestionType.FREE_TEXT:
+            return self.add_question_freetext()
+        elif question_type == QuestionType.IMAGE:
+            return self.add_question_image()
+        elif question_type == QuestionType.BODY_PART:
+            return self.add_question_body_part()
+        elif question_type == QuestionType.BARCODE:
+            return self.add_question_barcode()
+        else:
+            raise ValueError(f"Unknown QuestionType: {question_type}")
+
+    def add_question_info_text(self, language_code=None, is_required=False, question_text=None):
         """
         :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param is_required: Indicates if the question is required (default: False).
         :param question_text: The text content for the info text question.
         :return: A dictionary containing the question type and text for validation.
         """
-        question_type = "it"
-        if not question_text:
-            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
-        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
-
-        # Wait for the dropdown to be visible
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-
-        # Select the "Info-Text" option by its value
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.INFO_TEXT)
-
-        # Wait until the page is fully loaded
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
-
-        # Fill the editable div for the question text
-        info_text_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        question_text = self.initialize_question(QuestionType.INFO_TEXT, language_code, is_required, question_text)
 
-        self.utils.fill_editable_div(info_text_div, question_text)
-
-        # Return the question information for later validation
-        return {"type": QuestionSelectors.QuestionTypes.INFO_TEXT, "text": question_text}
+        return {"type": QuestionType.INFO_TEXT, "text": question_text}
 
     def add_question_multiple_choice(self, language_code=None, is_required=False, question_text=None, options=None, min_answers=None, max_answers=None):
         """
@@ -145,51 +228,33 @@ def add_question_multiple_choice(self, language_code=None, is_required=False, qu
         :param max_answers: The maximum number of answers allowed.
         :return: A dictionary containing the question type, text, and options for validation.
         """
-        question_type = "mc"
-        if not question_text:
-            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         options = options or self.DEFAULT_OPTIONS
         min_answers = min_answers or self.DEFAULT_MC_MIN_VALUE
         max_answers = max_answers or self.DEFAULT_MC_MAX_VALUE
+        id_selector = self.get_selector_for(QuestionType.MULTIPLE_CHOICE)
 
-        # Wait for the dropdown to be visible and select "Mehrfachauswahl"
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value \
-            (QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE)
-
-        # Wait until the page is fully loaded
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+        question_text = self.initialize_question(QuestionType.MULTIPLE_CHOICE, language_code, is_required, question_text)
 
-        # Fill the editable div for the question text
-        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
-        self.utils.fill_editable_div(question_div, question_text)
-
-        # Set required checkbox
-        if is_required:
-            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
-            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.MULTIPLE_CHOICE_AND_DROP_DOWN_SECTION)
 
         # Set min and max answers
-        self.driver.find_element(*QuestionSelectors.INPUT_MIN_NUMBER_ANSWERS).send_keys(str(min_answers))
-        self.driver.find_element(*QuestionSelectors.INPUT_MAX_NUMBER_ANSWERS).send_keys(str(max_answers))
-
+        self.set_min_max_answers(id_selector, min_answers, max_answers)
         # Add options
-        clear_and_send_keys_js = """document.querySelector('textarea[name="{name}"]').value=arguments[0];"""
-        clear_and_send_keys_js2 = """document.querySelector('input[name="{name}"]').value=arguments[0];"""
-
         for i, option in enumerate(options):
-            self.driver.execute_script(clear_and_send_keys_js.format(name=f"answers[{i}].localizedLabel[{language_code}]"), option)
-            self.driver.execute_script(clear_and_send_keys_js2.format(name=f"answers[{i}].codedValue"), option)
+            textarea_element = self.driver.find_element(*QuestionSelectors.TEXTAREA_ANSWER_TEXT(id_selector, i, language_code))
+            self.driver.execute_script("arguments[0].value=arguments[1];", textarea_element, option)
+            input_ident_element = self.driver.find_element(*QuestionSelectors.INPUT_IDENTIFICATION(id_selector, i))
+            self.driver.execute_script("arguments[0].value=arguments[1];", input_ident_element, option)
 
             # Add new answer field except for the last option
             if i < len(options) - 1:
-                add_button = self.driver.find_element(By.ID, 'addAnswerButton')
+                add_button = self.driver.find_element(*QuestionSelectors.BUTTON_ADD_ANSWER)
                 self.driver.execute_script("arguments[0].click();", add_button)
 
-        # Return the question information for later validation
         return {
-            "type": QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE,
+            "type": QuestionType.MULTIPLE_CHOICE,
             "text": question_text,
             "options": options,
             "min_answers": min_answers,
@@ -207,49 +272,27 @@ def add_question_slider_question(self, language_code=None, is_required=False, qu
         :param labels: A tuple containing two labels (min label, max label) for the slider.
         :return: A dictionary containing the question type, text, and slider configuration for validation.
         """
-        question_type = "sq"
-        if not question_text:
-            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         min_value = min_value or self.DEFAULT_MIN_VALUE
         max_value = max_value or self.DEFAULT_MAX_VALUE
         step_size = step_size or self.DEFAULT_STEP_SIZE
         labels = labels or self.DEFAULT_LABELS
 
-        # Wait for the dropdown to be visible
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-
-        # Select the "Slider" option by its value
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(
-            QuestionSelectors.QuestionTypes.SLIDER
-        )
-
-        # Wait until the page is fully loaded
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
-
-        # Fill the editable div for the question text
-        question_text_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
-        self.utils.fill_editable_div(question_text_div, question_text)
+        question_text = self.initialize_question(QuestionType.SLIDER, language_code, is_required, question_text)
 
-        # Set required checkbox
-        if is_required:
-            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
-            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.SLIDER_AND_NUMBER_CHECKBOX_SECTION)
 
         # Set slider configuration
-        self.driver.find_element(By.NAME, "answers[0].minValue").send_keys(str(min_value))
-        self.driver.find_element(By.NAME, "answers[0].maxValue").send_keys(str(max_value))
-        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys(str(step_size))
-
+        self.set_min_max_step_inputs(min_value, max_value, step_size, QuestionType.SLIDER)
         # Set labels for the slider
-        slider_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_SLIDER_MIN_EDITABLE_DIV(language_code))
+        slider_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_WYSIWYG_SLIDER_MIN(language_code))
         self.utils.fill_editable_div(slider_text_min_div, labels[0])
-        slider_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_SLIDER_MAX_EDITABLE_DIV(language_code))
+        slider_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_WYSIWYG_SLIDER_MAX(language_code))
         self.utils.fill_editable_div(slider_text_max_div, labels[1])
 
-        # Return the question information for later validation
         return {
-            "type": QuestionSelectors.QuestionTypes.SLIDER,
+            "type": QuestionType.SLIDER,
             "text": question_text,
             "min_value": min_value,
             "max_value": max_value,
@@ -257,7 +300,7 @@ def add_question_slider_question(self, language_code=None, is_required=False, qu
             "labels": labels,
         }
 
-    def add_question_numeric_checkbox(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None, labels=None):
+    def add_question_number_checkbox(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None, labels=None):
         """
         :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
         :param question_text: The text content for the numeric checkbox question.
@@ -268,46 +311,27 @@ def add_question_numeric_checkbox(self, language_code=None, is_required=False, q
         :param labels: A tuple containing two labels (min label, max label) for the numeric checkboxes.
         :return: A dictionary containing the question type, text, and numeric checkbox configuration for validation.
         """
-        question_type = "nc"
-        if not question_text:
-            question_text = f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         min_value = min_value if min_value is not None else self.DEFAULT_MIN_VALUE
         max_value = max_value if max_value is not None else self.DEFAULT_MAX_VALUE
         step_size = step_size if step_size is not None else self.DEFAULT_STEP_SIZE
         labels = labels or self.DEFAULT_LABELS
 
-        # Wait for the dropdown to be visible and select "Nummerierte Checkboxen"
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(
-            QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX
-        )
-
-        # Wait until the page is fully loaded
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
-
-        # Fill the editable div for the question text
-        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
-        self.utils.fill_editable_div(question_div, question_text)
+        question_text = self.initialize_question(QuestionType.NUMBER_CHECKBOX, language_code, is_required, question_text)
 
-        # Set required checkbox
-        if is_required:
-            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.NUMBER_CHECKBOX_TEXT_SECTION)
 
         # Set numeric values
-        self.driver.find_element(By.NAME, "answers[0].minValue").send_keys(str(min_value))
-        self.driver.find_element(By.NAME, "answers[0].maxValue").send_keys(str(max_value))
-        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys(str(step_size))
-
+        self.set_min_max_step_inputs(min_value, max_value, step_size, QuestionType.NUMBER_CHECKBOX)
         # Set labels
-        nc_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_MIN_EDITABLE_DIV(language_code))
+        nc_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_WYSIWYG_SLIDER_MIN(language_code))
         self.utils.fill_editable_div(nc_text_min_div, labels[0])
-        nc_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_MAX_EDITABLE_DIV(language_code))
+        nc_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_WYSIWYG_SLIDER_MAX(language_code))
         self.utils.fill_editable_div(nc_text_max_div, labels[1])
 
-        # Return the question information for later validation
         return {
-            "type": QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX,
+            "type": QuestionType.NUMBER_CHECKBOX,
             "text": question_text,
             "min_value": min_value,
             "max_value": max_value,
@@ -315,7 +339,7 @@ def add_question_numeric_checkbox(self, language_code=None, is_required=False, q
             "labels": labels,
         }
 
-    def add_question_numeric_checkbox_freetext(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None, freetext_label=None, labels=None):
+    def add_question_number_checkbox_text(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None, freetext_label=None, labels=None):
         """
         :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
         :param is_required: Indicates if the question is required (default: False).
@@ -327,48 +351,31 @@ def add_question_numeric_checkbox_freetext(self, language_code=None, is_required
         :param labels: A tuple containing two labels (min label, max label) for the numeric checkboxes + freetext.
         :return: A dictionary containing the question type and configuration for validation.
         """
-        question_type = "ncf"
-        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         min_value = min_value or self.DEFAULT_MIN_VALUE
         max_value = max_value or self.DEFAULT_MAX_VALUE
         step_size = step_size or self.DEFAULT_STEP_SIZE
         freetext_label = freetext_label or self.DEFAULT_FREE_TEXT_LABEL
         labels = labels or self.DEFAULT_LABELS
+        id_selector = self.get_selector_for(QuestionType.NUMBER_CHECKBOX_TEXT)
 
-        # Select the question type
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX_TEXT)
-
-        # Wait for page to load
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
+        question_text = self.initialize_question(QuestionType.NUMBER_CHECKBOX_TEXT, language_code, is_required, question_text)
 
-        # Fill question text
-        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
-        self.utils.fill_editable_div(question_div, question_text)
-
-        # Set required checkbox
-        if is_required:
-            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
-            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.NUMBER_CHECKBOX_TEXT_SECTION)
 
         # Set numeric values
-        self.driver.find_element(By.CSS_SELECTOR, "#sliderFreeTextField input[name='answers[0].minValue']").send_keys(str(min_value))
-        self.driver.find_element(By.CSS_SELECTOR, "#sliderFreeTextField input[name='answers[0].maxValue']").send_keys(str(max_value))
-        self.driver.find_element(By.CSS_SELECTOR, "#sliderFreeTextField input[name='answers[0].stepsize']").send_keys(str(step_size))
-
+        self.set_min_max_step_inputs(min_value, max_value, step_size, QuestionType.NUMBER_CHECKBOX_TEXT)
         # Set labels
-        ncf_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_FREETEXT_MIN_EDITABLE_DIV(language_code))
+        ncf_text_min_div = self.driver.find_element(*QuestionSelectors.INPUT_WYSIWYG_NUMERIC_CHECKBOX_FREETEXT_MIN(language_code))
         self.utils.fill_editable_div(ncf_text_min_div, labels[0])
-        ncf_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_NUMERIC_CHECKBOX_FREETEXT_MAX_EDITABLE_DIV(language_code))
+        ncf_text_max_div = self.driver.find_element(*QuestionSelectors.INPUT_WYSIWYG_NUMERIC_CHECKBOX_FREETEXT_MAX(language_code))
         self.utils.fill_editable_div(ncf_text_max_div, labels[1])
-
         # Set freetext label
-        self.driver.find_element(By.NAME, f"answers[0].localizedFreetextLabel[{language_code}]").send_keys(freetext_label)
+        self.driver.find_element(*QuestionSelectors.INPUT_FREETEXT_LABEL(id_selector, 0, language_code)).send_keys(freetext_label)
 
-        # Return question information
         return {
-            "type": QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX_TEXT,
+            "type": QuestionType.NUMBER_CHECKBOX_TEXT,
             "text": question_text,
             "min_value": min_value,
             "max_value": max_value,
@@ -376,37 +383,36 @@ def add_question_numeric_checkbox_freetext(self, language_code=None, is_required
             "freetext_label": freetext_label,
         }
 
-    def add_question_date_question(self, language_code=None, is_required=False, question_text=None):
+    def add_question_date_question(self, language_code=None, is_required=False, question_text=None, start_date=None, end_date=None):
         """
         :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
         :param is_required: Indicates if the question is required (default: False).
         :param question_text: The text content for the date question.
+        :param start_date: The start date for the date range (default: current date).
+        :param end_date: The end date for the date range (default: 7 days from the current date).
         :return: A dictionary containing the question type and text for validation.
         """
-        question_type = "dq"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
-        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
-
-        # Select the question type
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.DATE)
+        start_date = start_date or datetime.now().strftime("%m/%d/%Y")
+        end_date = end_date or ((datetime.now() + timedelta(days=7)).strftime("%m/%d/%Y"))
+        id_selector = self.get_selector_for(QuestionType.DATE)
 
-        # Wait for page to load
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
-
-        # Fill question text
-        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
-        self.utils.fill_editable_div(question_div, question_text)
+        question_text = self.initialize_question(QuestionType.DATE, language_code, is_required, question_text)
 
-        # Set required checkbox
-        if is_required:
-            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
-            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.DATE_SECTION)
 
+        # Find start and end date inputs
+        start_date_input = self.driver.find_element(*QuestionSelectors.INPUT_START_DATE(id_selector))
+        end_date_input = self.driver.find_element(*QuestionSelectors.INPUT_END_DATE(id_selector))
+        # Clear and input start/end date
+        start_date_input.clear()
+        start_date_input.send_keys(start_date)
+        end_date_input.clear()
+        end_date_input.send_keys(end_date)
 
-        # Return question information
         return {
-            "type": QuestionSelectors.QuestionTypes.DATE,
+            "type": QuestionType.DATE,
             "text": question_text,
         }
 
@@ -418,47 +424,34 @@ def add_question_dropdown(self, language_code=None, is_required=False, question_
         :param options: A list of dropdown options.
         :return: A dictionary containing the question type, text, and options for validation.
         """
-        question_type = "dd"
-        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         options = options or self.DEFAULT_OPTIONS
+        id_selector = self.get_selector_for(QuestionType.DROP_DOWN)
 
-        # Select the question type
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.DROP_DOWN)
-
-        # Wait for page to load
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
-
-        # Fill question text
-        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
-        self.utils.fill_editable_div(question_div, question_text)
+        question_text = self.initialize_question(QuestionType.DROP_DOWN, language_code, is_required, question_text)
 
-        # Set required checkbox
-        if is_required:
-            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
-            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
-
-        # Add dropdown options
-        clear_and_send_keys_js = """document.querySelector('textarea[name="{name}"]').value=arguments[0];"""
-        clear_and_send_keys_js2 = """document.querySelector('input[name="{name}"]').value=arguments[0];"""
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.MULTIPLE_CHOICE_AND_DROP_DOWN_SECTION)
 
+        # Add options
         for i, option in enumerate(options):
-            self.driver.execute_script(clear_and_send_keys_js.format(name=f"answers[{i}].localizedLabel[{language_code}]"), option)
-            self.driver.execute_script(clear_and_send_keys_js2.format(name=f"answers[{i}].codedValue"), option)
+            textarea_element = self.driver.find_element(*QuestionSelectors.TEXTAREA_ANSWER_TEXT(id_selector, i, language_code))
+            self.driver.execute_script("arguments[0].value=arguments[1];", textarea_element, option)
+            input_ident_element = self.driver.find_element(*QuestionSelectors.INPUT_IDENTIFICATION(id_selector, i))
+            self.driver.execute_script("arguments[0].value=arguments[1];", input_ident_element, option)
 
             # Add new option field
             if i < len(options) - 1:
-                self.driver.find_element(*QuestionSelectors.BUTTON_ADD_ANSWER).click()
+                add_button = self.driver.find_element(*QuestionSelectors.BUTTON_ADD_ANSWER)
+                self.driver.execute_script("arguments[0].click();", add_button)
 
-        # Return question information
         return {
-            "type": QuestionSelectors.QuestionTypes.DROP_DOWN,
+            "type": QuestionType.DROP_DOWN,
             "text": question_text,
             "options": options,
         }
 
-    def add_question_numeric_question(self,  language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None):
+    def add_question_number_question(self, language_code=None, is_required=False, question_text=None, min_value=None, max_value=None, step_size=None):
         """
         :param is_required: Indicates if the question is required (default: False).
         :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
@@ -468,37 +461,20 @@ def add_question_numeric_question(self,  language_code=None, is_required=False,
         :param step_size: The step size for the numeric input.
         :return: A dictionary containing the question type and configuration for validation.
         """
-        question_type = "nq"
-        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         min_value = min_value or self.DEFAULT_MIN_VALUE
         max_value = max_value or self.DEFAULT_MAX_VALUE
         step_size = step_size or self.DEFAULT_STEP_SIZE
 
-        # Select the question type
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(QuestionSelectors.QuestionTypes.NUMBER_INPUT)
-
-        # Wait for page to load
-        WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
-
-        # Fill question text
-        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
-        self.utils.fill_editable_div(question_div, question_text)
+        question_text = self.initialize_question(QuestionType.NUMBER_INPUT, language_code, is_required, question_text)
 
-        # Set required checkbox
-        if is_required:
-            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
-            self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
+        self.ensure_section_visible(QuestionSelectors.NUMBER_INPUT_SECTION)
 
         # Set numeric values
-        self.driver.find_element(By.CSS_SELECTOR, "#numberInputField input[name='answers[0].minValue']").send_keys(str(min_value))
-        self.driver.find_element(By.CSS_SELECTOR, "#numberInputField input[name='answers[0].maxValue']").send_keys(str(max_value))
-        self.driver.find_element(By.CSS_SELECTOR, "#numberInputField input[name='answers[0].stepsize']").send_keys(str(step_size))
+        self.set_min_max_step_inputs(min_value, max_value, step_size, QuestionType.NUMBER_INPUT)
 
-        # Return question information
         return {
-            "type": QuestionSelectors.QuestionTypes.NUMBER_INPUT,
+            "type": QuestionType.NUMBER_INPUT,
             "text": question_text,
             "min_value": min_value,
             "max_value": max_value,
@@ -512,104 +488,1061 @@ def add_question_freetext(self, language_code=None, is_required=False, question_
         :param question_text: The text content for the freetext question.
         :return: A dictionary containing the question type and text for validation.
         """
-        question_type = "ft"
-        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type}"
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
 
-        # Select the question type
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
-        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(
-            QuestionSelectors.QuestionTypes.FREE_TEXT
-        )
+        question_text = self.initialize_question(QuestionType.FREE_TEXT, language_code, is_required, question_text)
+
+        return {
+            "type": QuestionType.FREE_TEXT,
+            "text": question_text,
+        }
+
+    def add_question_image(self, language_code=None, is_required=False, question_text=None, upload_path=None, file_name=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param is_required: Indicates if the question is required (default: False).
+        :param question_text: The text content for the image question.
+        :param upload_path: The relative path to the image directory (default: self.DEFAULT_IMAGE_UPLOAD_PATH).
+        :param file_name: The name of the image file to upload (default: self.DEFAULT_IMAGE_FILE_NAME).
+        :return: A dictionary containing the question type and text for validation.
+        """
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        upload_path = upload_path or self.DEFAULT_IMAGE_UPLOAD_PATH
+        file_name = file_name or self.DEFAULT_IMAGE_FILE_NAME
+        id_selector = self.get_selector_for(QuestionType.IMAGE)
+
+        question_text = self.initialize_question(QuestionType.IMAGE, language_code, is_required, question_text)
+
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.IMAGE_SECTION)
+
+        image_input = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.INPUT_IMAGE_UPLOAD(id_selector)))
+
+        image_path = os.path.join(os.path.dirname(__file__), upload_path, file_name)
+        assert os.path.exists(image_path), f"Test image not found at path: {image_path}"
+        image_input.send_keys(image_path)
+
+        return {
+            "type": QuestionType.IMAGE,
+            "text": question_text,
+        }
+
+    def add_question_body_part(self, language_code=None, is_required=False, question_text=None, image_type=None, body_part_selectors=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param is_required: Indicates if the question is required (default: False).
+        :param question_text: The text content for the body part question.
+        :param image_type: The type of image to display (default: self.DEFAULT_IMAGE_TYPE).
+        :param body_part_selectors: A set of selectors for the body parts to be selected (default: HEAD(id_selector, "front")).
+        :return: A dictionary containing the question type, text, and selected body parts for validation.
+        """
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+        image_type = image_type or self.DEFAULT_IMAGE_TYPE
+        id_selector = self.get_selector_for(QuestionType.BODY_PART)
+        body_part_selectors = body_part_selectors or {BodyPartSelectors.HEAD(id_selector, "front")}
+
+        question_text = self.initialize_question(QuestionType.BODY_PART, language_code, is_required, question_text)
+
+        # Ensure the number input section is expanded
+        self.ensure_section_visible(QuestionSelectors.BODY_PART_SECTION)
+
+        self.utils.scroll_to_bottom()
+        self.utils.select_dropdown(QuestionSelectors.DROPDOWN_IMAGE_TYPE(id_selector), image_type, DropdownMethod.VALUE)
+        self.set_min_max_answers(id_selector, 0, 1)
+        selected_body_parts = self.select_body_parts(body_part_selectors, deselect_first=True)
+
+        return {
+            "type": QuestionType.BODY_PART,
+            "text": question_text,
+            "selected_body_parts": selected_body_parts,
+        }
+
+    def add_question_barcode(self, language_code=None, is_required=False, question_text=None):
+        """
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param is_required: Indicates if the question is required (default: False).
+        :param question_text: The text content for the body part question.
+        :return: A dictionary containing the question type, text.
+        """
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+
+        question_text = self.initialize_question(QuestionType.BARCODE, language_code, is_required, question_text)
+
+        return {
+            "type": QuestionType.BODY_PART,
+            "text": question_text
+        }
+
+    def initialize_question(self, question_type, language_code=None, is_required=False, question_text=None):
+        """
+        :param question_type: The type of the question (e.g., QuestionType.MULTIPLE_CHOICE).
+        :param language_code: The language code for localized labels (default: self.DEFAULT_LANGUAGE_CODE).
+        :param is_required: Indicates if the question is required (default: False).
+        :param question_text: The text content for the question.
+        :return: A dictionary containing common question details.
+        """
+        question_text = question_text or f"{self.DEFAULT_QUESTION_TEXT} - {question_type.value}"
+        language_code = language_code or self.DEFAULT_LANGUAGE_CODE
+
+        # Wait for the dropdown to be visible and select the question type
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+            QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+
+
+        self.utils.select_dropdown(QuestionSelectors.DROPDOWN_QUESTION_TYPE, question_type.value, DropdownMethod.VALUE)
 
-        # Wait for the page to load
+        # Wait until the page is fully loaded
         WebDriverWait(self.driver, 30).until(lambda d: d.execute_script("return document.readyState") == "complete")
 
-        # Fill question text
-        question_div = self.driver.find_element(*QuestionSelectors.INPUT_QUESTION_TEXT_EDITABLE_DIV(language_code))
+        # Fill the editable div for the question text (info text uses the same text field)
+        question_div = self.driver.find_element(*QuestionSelectors.INPUT_WYSIWYG_QUESTION_TEXT(language_code))
         self.utils.fill_editable_div(question_div, question_text)
 
-        # Set required checkbox
+        # Set required checkbox if needed
         if is_required:
-            self.driver.find_element(*QuestionSelectors.CHECKBOX_IS_REQUIRED)
             self.utils.toggle_checkbox(QuestionSelectors.CHECKBOX_IS_REQUIRED)
 
-        # Return question information
-        return {
-            "type": QuestionSelectors.QuestionTypes.FREE_TEXT,
-            "text": question_text,
-        }
+        return question_text
+
+    def ensure_section_visible(self, section_selector):
+        """
+        :param section_selector: The selector for the section container.
+        """
+        # Wait for the page to fully load
+        WebDriverWait(self.driver, 30).until(lambda driver: driver.execute_script("return document.readyState") == "complete")
+
+        # Locate the section container
+        section = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            section_selector))
+
+        # Check if the section is hidden
+        is_hidden = self.driver.execute_script(
+            "return arguments[0].querySelector('.form-group').style.display === 'none';", section
+        )
 
-class QuestionErrorHelper(QuestionHelper):
-
-    # TODO [LJ] refactor
-    def add_numeric_checkbox_with_failed_cases(self):
-        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located((By.ID, "questionTypeDropDown")))
-        Select(self.driver.find_element(By.ID, "questionTypeDropDown")).select_by_visible_text("Nummerierte Checkboxen")
-        WebDriverWait(self.driver, 30).until(
-                lambda driver: driver.execute_script("return document.readyState") == "complete"
-        )
-        self.driver.find_element(By.XPATH,'/html/body/div/div/div[1]/div/div[2]/div/form/div[1]/div/div[4]/div/div/div[2]/div[2]').send_keys("Diese Frage zeigt einen sog. \'Slider\' vertikal an. Sie haben die Möglichkeit, durch Berühren des Schiebereglers einen Wert festzulegen, den Punkt zu verschieben und sich durch erneutes Antippen des Punkts dazu zu entscheiden, doch keine Antwort zu geben. Wie groß sind Sie (ca.)?")
-        self.driver.find_element(By.ID, "isRequired1").click()
-        self.driver.find_element(By.NAME, "answers[0].minValue").send_keys("0")
-        self.driver.find_element(By.NAME, "answers[0].maxValue").send_keys("100")
-
-        # # Attempt to save with invalid step size
-        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys("30")
-        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys(Keys.TAB)
-        WebDriverWait(self.driver, 10).until(EC.presence_of_element_located((By.ID, "sliderErrors")))
-        error_message_element = self.driver.execute_script("return document.getElementById('sliderErrors')")
-        error_message_text = self.driver.execute_script("return arguments[0].innerText;", error_message_element).strip()
-        assert "Der Abstand zwischen Minimum und Maximum ist nicht restlos durch die Schrittweite teilbar" in error_message_text
-
-        # # # Attempt to save with step size greater than range
-        self.driver.find_element(By.NAME, "answers[0].stepsize").clear()
-        self.driver.find_element(By.NAME, "answers[0].stepsize").send_keys("210")
-        self.save_question()
-        WebDriverWait(self.driver, 30).until(
-                lambda driver: driver.execute_script("return document.readyState") == "complete"
-        )
-        WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located((By.ID, "sliderErrors")))
-        time.sleep(2)
-        error_message_element1 = self.driver.execute_script("return document.getElementById('sliderErrors')")
-        error_message_text1 = self.driver.execute_script("return arguments[0].innerText;", error_message_element1)
-        assert "Die Schrittweite der Frage war größer als der Abstand zwischen Minimum und Maximum" in error_message_text1
-
-
-        # # Attempt to save with invalid step size format
-
-        # # Correct the step size and clear min and max values
-        self.driver.execute_script("document.getElementsByName('answers[0].stepsize')[0].value = '';")
-        self.driver.execute_script("document.getElementsByName('answers[0].stepsize')[0].value = '1';")
-        self.driver.execute_script("document.getElementsByName('answers[0].minValue')[0].value = '';")
-        self.driver.execute_script("document.getElementsByName('answers[0].maxValue')[0].value = '';")
-        self.save_question()
-        WebDriverWait(self.driver, 30).until(
-                        lambda driver: driver.execute_script("return document.readyState") == "complete"
-        )
-        # # Check for errors related to min and max values
-        WebDriverWait(self.driver, 10).until(EC.presence_of_element_located((By.ID, "sliderErrors")))
-        time.sleep(2)
-        error_message_element = self.driver.execute_script("return document.getElementById('sliderErrors')")
-        error_message_text = self.driver.execute_script("return arguments[0].innerText;", error_message_element)
-        assert "Die Frage benötigt einen Minimalwert" in error_message_text
-        assert "Die Frage benötigt einen Maximalwert" in error_message_text
-
-        # # Correct the min and max values
-        self.driver.execute_script("document.getElementsByName('answers[0].minValue')[0].value = '1';")
-        self.driver.execute_script("document.getElementsByName('answers[0].maxValue')[0].value = '200';")
-        self.driver.execute_script("document.getElementsByName('answers[0].stepsize')[0].value = '1';")
-
-        time.sleep(1)
-
-    def verify_number_of_questions(self, expected_count):
+        if is_hidden:
+            # Click the legend to expand the section
+            legend = section.find_element(By.TAG_NAME, "legend")
+            legend.click()
+
+            # Wait until the section becomes visible
+            WebDriverWait(self.driver, 10).until(
+                lambda d: self.driver.execute_script(
+                    "return arguments[0].querySelector('.form-group').style.display !== 'none';", section
+                )
+            )
+
+    @staticmethod
+    def get_selector_for(question_type: QuestionType):
+        if question_type == QuestionType.BODY_PART:
+            return QuestionSelectors.BODY_PART_SECTION[1]
+        elif question_type == QuestionType.DATE:
+            return QuestionSelectors.DATE_SECTION[1]
+        elif question_type == QuestionType.IMAGE:
+            return QuestionSelectors.IMAGE_SECTION[1]
+        elif question_type == QuestionType.MULTIPLE_CHOICE or question_type == QuestionType.DROP_DOWN:
+            return QuestionSelectors.MULTIPLE_CHOICE_AND_DROP_DOWN_SECTION[1]
+        elif question_type == QuestionType.NUMBER_INPUT:
+            return QuestionSelectors.NUMBER_INPUT_SECTION[1]
+        elif question_type == QuestionType.SLIDER or question_type == QuestionType.NUMBER_CHECKBOX:
+            return QuestionSelectors.SLIDER_AND_NUMBER_CHECKBOX_SECTION[1]
+        elif question_type == QuestionType.NUMBER_CHECKBOX_TEXT:
+            return QuestionSelectors.NUMBER_CHECKBOX_TEXT_SECTION[1]
+
+    def get_last_added_question_id(self):
+        """
+        :return: ID of the question as a string.
+        """
+        # Wait until the table rows are loaded
+        WebDriverWait(self.driver, 30).until(EC.presence_of_element_located(
+            QuestionSelectors.TABLE_LAST_ROW))
+
+        # Find the last row in the table
+        last_row = self.driver.find_element(*QuestionSelectors.TABLE_LAST_ROW)
+
+        # Extract the ID from the `id` attribute of the last row
+        question_id = last_row.get_attribute("id")
+
+        # Ensure the ID is found
+        if not question_id:
+            raise Exception("The ID of the last question could not be found.")
+
+        return question_id
+
+    def clear_min_max_step_inputs(self, question_type : QuestionType):
+        id_selector = self.get_selector_for(question_type)
+
+        min_value = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_MIN_VALUE(id_selector)))
+
+        max_value = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_MAX_VALUE(id_selector)))
+
+        step_size = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_STEP_SIZE(id_selector)))
+
+        min_value.clear()
+        max_value.clear()
+        step_size.clear()
+
+    def set_min_max_step_inputs(self, min_value, max_value, step_size, question_type: QuestionType):
+        id_selector = self.get_selector_for(question_type)
+
+        self.clear_min_max_step_inputs(question_type)
+
+        WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_MIN_VALUE(id_selector))).send_keys(min_value)
+
+        WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_MAX_VALUE(id_selector))).send_keys(max_value)
+
+        WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_STEP_SIZE(id_selector))).send_keys(step_size)
+
+    def set_min_max_answers(self, id_selector, min_value, max_value):
+        input_min_answers = WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_MIN_NUMBER_ANSWERS(id_selector)))
+
+        input_max_answers = WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+            QuestionSelectors.INPUT_MAX_NUMBER_ANSWERS(id_selector)))
+
+        input_min_answers.clear()
+        input_min_answers.send_keys(min_value)
+        input_max_answers.clear()
+        input_max_answers.send_keys(max_value)
+
+    def select_body_parts(self, body_part_selectors, deselect_first=False):
+        """
+        :param body_part_selectors: A list of selectors for the body parts to be selected.
+        :param deselect_first: Indicates if all body parts should be deselected before selection (default: False).
+        :return: A list of successfully selected body part selectors.
+        """
+        if deselect_first:
+            self.deselect_all_body_parts()
+
+        successfully_selected = []
+
+        for body_part_selector in body_part_selectors:
+            try:
+                # Wait for the page to fully load
+                WebDriverWait(self.driver, 30).until(
+                    lambda driver: driver.execute_script("return document.readyState") == "complete")
+
+                WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                    body_part_selector))
+
+                # Click the element to select
+                self.utils.click_element(body_part_selector)
+
+                # Verify if the body part is selected
+                body_part_element = self.driver.find_element(*body_part_selector)
+                if "shape-selected" in body_part_element.get_attribute("class"):
+                    successfully_selected.append(body_part_selector)
+            except Exception as e:
+                print(f"Failed to select body part with selector {body_part_selector}: {e}")
+
+        return successfully_selected
+
+    def deselect_all_body_parts(self):
+        id_selector = self.get_selector_for(QuestionType.BODY_PART)
+
+        image_type_dropdown = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.DROPDOWN_IMAGE_TYPE(id_selector)))
+
+        selected_image_type = Select(image_type_dropdown).first_selected_option.get_attribute("value")
+
+        # Perform deselection based on the selected image type
+        if selected_image_type == "FRONT":
+            parts_deselect = QuestionSelectors.BUTTON_DESELECT_ALL_BODY_PARTS("FRONT")
+            self.utils.click_element(parts_deselect)
+        elif selected_image_type == "BACK":
+            parts_deselect = QuestionSelectors.BUTTON_DESELECT_ALL_BODY_PARTS("BACK")
+            self.utils.click_element(parts_deselect)
+        elif selected_image_type == "FRONT_BACK":
+            parts_deselect_front = QuestionSelectors.BUTTON_DESELECT_ALL_BODY_PARTS("FRONT")
+            parts_deselect_back = QuestionSelectors.BUTTON_DESELECT_ALL_BODY_PARTS("BACK")
+            self.utils.click_element(parts_deselect_front)
+            self.utils.click_element(parts_deselect_back)
+        else:
+            raise ValueError(f"Unexpected image type: {selected_image_type}")
+
+    def reorder_question(self, source_question_id, new_index):
+        # Get all rows
+        rows = WebDriverWait(self.driver, 10).until(
+            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
+        )
+
+        # Identify target rows
+        target_question_id = rows[new_index].get_attribute('id')
+
+        if target_question_id == source_question_id: return
+
+        # Use the drag-and-drop utility
+        self.utils.drag_and_drop(QuestionSelectors.GRIP_SELECTOR(source_question_id),
+                                 QuestionSelectors.GRIP_SELECTOR(target_question_id))
+
+        # Validate the reordering
+        reordered_rows = WebDriverWait(self.driver, 10).until(
+            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
+        )
+        reordered_ids = [row.get_attribute("id") for row in reordered_rows]
+
+        return reordered_ids
+
+
+class QuestionAssertHelper(QuestionHelper):
+
+    def assert_question_fill_page(self):
+        language_code = self.DEFAULT_LANGUAGE_CODE
+        id_selector = self.get_selector_for(QuestionType.MULTIPLE_CHOICE)
+        try:
+            # Select one of the question types
+            WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+                QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+            self.utils.select_dropdown(QuestionSelectors.DROPDOWN_QUESTION_TYPE, QuestionType.MULTIPLE_CHOICE.value, DropdownMethod.VALUE)
+
+            # Validate dropdown to add language
+            language_dropdown = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.DROPDOWN_ADD_LANGUAGE))
+            assert language_dropdown.is_displayed(), "Dropdown to add language is not displayed."
+
+            # Validate select for question type
+            question_type_select = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+            assert question_type_select.is_displayed(), "Dropdown for question type is not displayed."
+
+            # Validate WYSIWYG editor for the question text
+            wysiwyg_question_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.INPUT_WYSIWYG_QUESTION_TEXT(language_code)))
+            assert wysiwyg_question_text.is_displayed(), "WYSIWYG editor for question text is not displayed."
+
+            # Validate checkboxes for mandatory and initial activation
+            mandatory_checkbox = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.CHECKBOX_IS_REQUIRED))
+            assert mandatory_checkbox.is_displayed(), "Checkbox to make question mandatory is not displayed."
+
+            initial_activation_checkbox = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.CHECKBOX_ANSWER_INITIAL_ACTIVATION(id_selector, 0)))
+            assert initial_activation_checkbox.is_displayed(), "Checkbox to activate question initially is not displayed."
+
+            self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+            # Error: Localized question text missing
+            error_message_element = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                QuestionSelectors.ERROR_QUESTION_TEXT(self.DEFAULT_LANGUAGE_CODE)))
+            error_message = error_message_element.text.strip()
+
+            expected_error = "Die Frage benötigt einen lokalisierten Fragetext"
+            assert error_message == expected_error, f"Unexpected error message: '{error_message}'"
+
+            self.cancel_question_editing()
+        except TimeoutException:
+            raise AssertionError("Timed out waiting for elements on the question fill page.")
+        except AssertionError as e:
+            raise e
+
+    def assert_question_by_type(self, question_type: QuestionType):
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+        Select(self.driver.find_element(*QuestionSelectors.DROPDOWN_QUESTION_TYPE)).select_by_value(question_type.value)
+        # Wait for the page to fully load
+        WebDriverWait(self.driver, 30).until(lambda driver: driver.execute_script("return document.readyState") == "complete")
+
+        if question_type == QuestionType.INFO_TEXT:
+            self.assert_fields_create_info_text_question()
+        elif question_type == QuestionType.MULTIPLE_CHOICE:
+            self.assert_fields_create_multiple_choice_question()
+            self.assert_validation_errors_multiple_choice()
+        elif question_type == QuestionType.SLIDER:
+            self.assert_fields_create_slider_question()
+            self.assert_validation_errors_sq_nc(question_type = QuestionType.SLIDER)
+        elif question_type == QuestionType.NUMBER_CHECKBOX:
+            self.assert_fields_numeric_checkbox_question()
+            self.assert_validation_errors_sq_nc(question_type = QuestionType.NUMBER_CHECKBOX)
+        elif question_type == QuestionType.NUMBER_CHECKBOX_TEXT:
+            self.assert_fields_numeric_checkbox_freetext_question()
+            self.assert_validation_errors_ncf()
+        elif question_type == QuestionType.DATE:
+            self.assert_fields_create_date_question()
+            self.assert_validation_errors_dq()
+        elif question_type == QuestionType.DROP_DOWN:
+            self.assert_fields_create_dropdown_question()
+            self.assert_validation_errors_dd()
+        elif question_type == QuestionType.NUMBER_INPUT:
+            self.assert_fields_create_number_question()
+            self.assert_nq_validation_errors_de()
+        elif question_type == QuestionType.FREE_TEXT:
+            self.assert_freetext_question()
+        elif question_type == QuestionType.IMAGE:
+            self.assert_fields_create_image_question()
+            self.assert_validation_errors_iq()
+        elif question_type == QuestionType.BODY_PART:
+            self.assert_fields_create_body_part_question()
+            self.assert_validation_errors_bp()
+        elif question_type == QuestionType.BARCODE:
+            self.assert_fields_create_barcode_question()
+        else:
+            raise ValueError(f"Unknown QuestionType: {question_type}")
+
+        question_info = self.add_question_by_type_default_value(question_type)
+        question_id = self.save_question()
+        question_info['id'] = question_id
+        return question_info
+
+    def assert_fields_create_multiple_choice_question(self):
+        self.assert_mc_dd_common_validations(QuestionType.MULTIPLE_CHOICE)
+
+    def assert_fields_create_slider_question(self):
+        self.assert_sq_nc_common_validations(QuestionType.SLIDER)
+
+        checkbox_vertical = self.driver.find_element(*QuestionSelectors.CHECKBOX_VERTICAL(0))
+        assert not checkbox_vertical.is_enabled(), f"Checkbox for 'vertical' should be disabled but is enabled."
+
+        symbols_checkbox = self.driver.find_element(*QuestionSelectors.CHECKBOX_SYMBOL_ABOVE_SLIDER)
+        value_checkbox = self.driver.find_element(*QuestionSelectors.CHECKBOX_DISPLAY_VALUE_ON_SLIDER)
+        assert symbols_checkbox.is_displayed(), "Checkbox for enable/disable symbol above slider is not displayed."
+        assert value_checkbox.is_displayed(), "Checkbox for enable/disable value on slider is not displayed."
+
+    def assert_freetext_question(self):
+        try:
+            allowed_ids = {
+                QuestionSelectors.DROPDOWN_QUESTION_TYPE[1],
+                QuestionSelectors.CHECKBOX_IS_REQUIRED[1],
+                QuestionSelectors.CHECKBOX_QUESTION_INITIAL_ACTIVATION[1],
+                QuestionSelectors.BUTTON_SAVE[1],
+            }
+            self.assert_question_inputs(allowed_ids)
+        except AssertionError as e:
+            raise e
+
+    def assert_fields_create_info_text_question(self):
+        try:
+            allowed_ids = {
+                QuestionSelectors.DROPDOWN_QUESTION_TYPE[1],
+                QuestionSelectors.CHECKBOX_IS_REQUIRED[1],
+                QuestionSelectors.CHECKBOX_QUESTION_INITIAL_ACTIVATION[1],
+                QuestionSelectors.BUTTON_SAVE[1],
+            }
+            self.assert_question_inputs(allowed_ids)
+        except AssertionError as e:
+            raise e
+
+    def assert_fields_create_barcode_question(self):
+        try:
+            allowed_ids = {
+                QuestionSelectors.DROPDOWN_QUESTION_TYPE[1],
+                QuestionSelectors.CHECKBOX_IS_REQUIRED[1],
+                QuestionSelectors.CHECKBOX_QUESTION_INITIAL_ACTIVATION[1],
+                QuestionSelectors.BUTTON_SAVE[1],
+            }
+            self.assert_question_inputs(allowed_ids)
+        except AssertionError as e:
+            raise e
+
+    def assert_fields_numeric_checkbox_question(self):
+        self.assert_sq_nc_common_validations(QuestionType.NUMBER_CHECKBOX)
+        checkbox_vertical = self.driver.find_element(*QuestionSelectors.CHECKBOX_VERTICAL(0))
+        assert checkbox_vertical.is_enabled(), f"Checkbox for 'vertical' should be enabled but is disabled."
+
+    def assert_fields_numeric_checkbox_freetext_question(self):
+        try:
+            language_code = self.DEFAULT_LANGUAGE_CODE
+            id_selector = self.get_selector_for(QuestionType.NUMBER_CHECKBOX_TEXT)
+
+            min_value = self.driver.find_element(*QuestionSelectors.INPUT_MIN_VALUE(id_selector))
+            max_value = self.driver.find_element(*QuestionSelectors.INPUT_MAX_VALUE(id_selector))
+            step_size = self.driver.find_element(*QuestionSelectors.INPUT_STEP_SIZE(id_selector))
+            assert min_value.is_displayed(), "Input for minimum value is not displayed."
+            assert max_value.is_displayed(), "Input for maximum value is not displayed."
+            assert step_size.is_displayed(), "Input for step size is not displayed."
+
+            freetext_label = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.INPUT_FREETEXT_LABEL(id_selector, 0, language_code)))
+            assert freetext_label.is_displayed(), "Freetext input field is not displayed."
+
+            wysiwyg_min_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.INPUT_WYSIWYG_NUMERIC_CHECKBOX_FREETEXT_MIN(language_code)))
+            assert wysiwyg_min_text.is_displayed(), "WYSIWYG editor for text at minimum position is not displayed."
+
+            wysiwyg_max_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionSelectors.INPUT_WYSIWYG_NUMERIC_CHECKBOX_FREETEXT_MAX(language_code)))
+            assert wysiwyg_max_text.is_displayed(), "WYSIWYG editor for text at maximum position is not displayed."
+        except AssertionError as e:
+            raise e
+
+    def assert_fields_create_dropdown_question(self):
+        id_selector= self.get_selector_for(QuestionType.DROP_DOWN)
+
+        self.assert_mc_dd_common_validations(QuestionType.DROP_DOWN)
+
+        # If min and max should be readonly
+        input_min_answers = self.driver.find_element(*QuestionSelectors.INPUT_MIN_NUMBER_ANSWERS(id_selector))
+        input_max_answers = self.driver.find_element(*QuestionSelectors.INPUT_MAX_NUMBER_ANSWERS(id_selector))
+        assert input_min_answers.get_attribute("readonly"), "Min answers input is not readonly."
+        assert input_max_answers.get_attribute("readonly"), "Max answers input is not readonly."
+        assert input_min_answers.get_attribute("value") == "1", "Min answers input does not have the expected value '1'."
+        assert input_max_answers.get_attribute("value") == "1", "Max answers input does not have the expected value '1'."
+
+    def assert_fields_create_number_question(self):
+        question_type = QuestionType.NUMBER_INPUT
+        id_selector = self.get_selector_for(question_type)
+
+        min_value = self.driver.find_element(*QuestionSelectors.INPUT_MIN_VALUE(id_selector))
+        max_value = self.driver.find_element(*QuestionSelectors.INPUT_MAX_VALUE(id_selector))
+        step_size = self.driver.find_element(*QuestionSelectors.INPUT_STEP_SIZE(id_selector))
+        assert min_value.is_displayed(), "Input for minimum value is not displayed."
+        assert max_value.is_displayed(), "Input for maximum value is not displayed."
+        assert step_size.is_displayed(), "Input for step size is not displayed."
+
+    def assert_fields_create_date_question(self):
+        id_selector = self.get_selector_for(QuestionType.DATE)
+
+        start_date = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.INPUT_START_DATE(id_selector)))
+        assert start_date.is_displayed(), "Start date input field is not displayed."
+
+        end_date = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.INPUT_END_DATE(id_selector)))
+        assert end_date.is_displayed(), "End date input field is not displayed."
+
+    def assert_fields_create_image_question(self):
+        id_selector = self.get_selector_for(QuestionType.IMAGE)
+
+        # Locate the container for the image upload
+        container_locator = QuestionSelectors.IMAGE_FILE_CONTAINER(id_selector)
+        container = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            container_locator))
+
+        # Check if the container is displayed
+        assert container.is_displayed(), "Image upload container is not visible."
+
+        image_input = container.find_element(*QuestionSelectors.INPUT_IMAGE_UPLOAD(id_selector))
+
+        # Validate attributes or further behaviors if necessary
+        accepted_file_types = image_input.get_attribute("accept")
+        assert accepted_file_types == ".png,.jpeg,.jpg", f"Unexpected accepted file types: {accepted_file_types}"
+
+    def assert_fields_create_body_part_question(self):
+        id_selector = self.get_selector_for(QuestionType.BODY_PART)
+
+        # Validate Select for the type of image
+        image_type_dropdown = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.DROPDOWN_IMAGE_TYPE(id_selector)))
+        assert image_type_dropdown.is_displayed(), "Dropdown for selecting image type is not displayed."
+
+        # Test: Changing the image type updates the graphic
+        self.utils.select_dropdown(QuestionSelectors.DROPDOWN_IMAGE_TYPE(id_selector), "BACK", DropdownMethod.VALUE)
+        back_svg = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            BodyPartSelectors.BODY_PART_SVG_BACK(id_selector)))
+        assert back_svg.is_displayed(), "SVG for 'BACK' view is not displayed."
+
+        self.utils.select_dropdown(QuestionSelectors.DROPDOWN_IMAGE_TYPE(id_selector), "FRONT", DropdownMethod.VALUE)
+        front_svg = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            BodyPartSelectors.BODY_PART_SVG_FRONT(id_selector)))
+        assert front_svg.is_displayed(), "SVG for 'FRONT' view is not displayed."
+
+        # Validate min and max answers inputs
+        input_min_answers = self.driver.find_element(*QuestionSelectors.INPUT_MIN_NUMBER_ANSWERS(id_selector))
+        input_max_answers = self.driver.find_element(*QuestionSelectors.INPUT_MAX_NUMBER_ANSWERS(id_selector))
+        assert input_min_answers.is_displayed(), "Input for minimum answers is not displayed."
+        assert input_max_answers.is_displayed(), "Input for maximum answers is not displayed."
+
+        # Validate interactable body part graphics
+        head = BodyPartSelectors.HEAD(id_selector, "front")
+        front_body_part = front_svg.find_element(*head)
+        assert front_body_part.is_displayed(), "Body part (head) is not displayed in the front SVG."
+
+
+        self.utils.scroll_to_bottom()
+        self.select_body_parts({head})  # Select the body part
+        WebDriverWait(self.driver, 10).until(
+            lambda driver: "shape-selected" in front_body_part.get_attribute("class"),
+            "Body part (head) was not selected."
+        )
+
+        # self.utils.click_element(front_body_part)  # Deselect the body part
+        self.select_body_parts({head})  # Deselect the body part
+        WebDriverWait(self.driver, 10).until(
+            lambda driver: "shape-selected" not in front_body_part.get_attribute("class"),
+            "Body part (head) was not deselected."
+        )
+
+        # Validate select/deselect all buttons
+        parts_select = QuestionSelectors.BUTTON_SELECT_ALL_BODY_PARTS("FRONT")
+        select_all_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            parts_select))
+
+        parts_deselect = QuestionSelectors.BUTTON_DESELECT_ALL_BODY_PARTS("FRONT")
+        deselect_all_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+            parts_deselect))
+
+        assert select_all_button.is_displayed(), "Button to select all body parts is not displayed."
+        assert deselect_all_button.is_displayed(), "Button to deselect all body parts is not displayed."
+
+        self.utils.click_element(parts_select)
+        selected_parts = front_svg.find_elements(By.CLASS_NAME, "shape-selected")
+        assert len(selected_parts) > 0, "No body parts were selected after clicking 'Select All'."
+
+        self.utils.click_element(parts_deselect)
+        selected_parts = front_svg.find_elements(By.CLASS_NAME, "shape-selected")
+        assert len(selected_parts) == 0, "Body parts were not deselected after clicking 'Deselect All'."
+
+    def assert_nq_validation_errors_de(self):
+        question_type = QuestionType.NUMBER_INPUT
+        id_selector = self.get_selector_for(question_type)
+
+        # Set min > max and validate the corresponding error
+        self.set_min_max_step_inputs(min_value="10", max_value="5", step_size="1", question_type=question_type)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_VALUE(id_selector),
+            "Das Minimum der Zahleneingabe war gleich oder größer als das Maximum"
+        )
+
+        # Set invalid step size (greater than max-min difference)
+        self.set_min_max_step_inputs(min_value="1.0", max_value="4.0", step_size="10", question_type=question_type)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_error_message(
+            QuestionSelectors.ERROR_STEP_SIZE(id_selector),
+            "Die Schrittgröße der Zahleneingabe war größer als der Abstand zwischen Minimum und Maximum\nDer Abstand zwischen Minimum und Maximum ist nicht restlos durch die Schrittgröße teilbar"
+        )
+
+    def assert_validation_errors_dd(self):
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+
+        id_selector = self.get_selector_for(QuestionType.DROP_DOWN)
+        language_code = self.DEFAULT_LANGUAGE_CODE
+
+        # Error: Answer text missing
+        self.validate_error_message(
+            QuestionSelectors.ERROR_TEXTAREA_ANSWER(id_selector, 0, language_code),
+            "Die Auswahlantwort benötigt einen lokalisierten Text"
+        )
+
+        # Error: Identification code missing
+        self.validate_error_message(
+            QuestionSelectors.ERROR_IDENT_CODE(0),
+            "Der Identifikationscode darf nicht leer sein"
+        )
+
+    def assert_validation_errors_multiple_choice(self):
+        id_selector = self.get_selector_for(QuestionType.MULTIPLE_CHOICE)
+
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+
+        # Error: Min and Max answers missing
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_ANSWERS(id_selector),
+            "Minimale Anzahl von zu beantwortenden Antworten muss vergeben werden"
+        )
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MAX_ANSWERS(id_selector),
+            "Maximale Anzahl von zu beantwortenden Antworten muss vergeben werden"
+        )
+
+        # Error: Identification code missing
+        self.validate_error_message(
+            QuestionSelectors.ERROR_IDENT_CODE(0),
+            "Der Identifikationscode darf nicht leer sein"
+        )
+
+        # Max number greater than existing answers
+        self.set_min_max_answers(id_selector, "1000", "1000")
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MAX_ANSWERS(id_selector),
+            "Maximale Anzahl von zu beantwortenden Antworten ist größer als die Anzahl der vorhandenen Antworten"
+        )
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_ANSWERS(id_selector),
+            "Minimale Anzahl von zu beantwortenden Antworten ist größer als die Anzahl der vorhandenen Antworten"
+        )
+
+        # Add answer and check error: Min greater than Max
+        self.utils.scroll_and_click(QuestionSelectors.BUTTON_ADD_ANSWER)
+
+        self.set_min_max_answers(id_selector, "2", "1")
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_ANSWERS(id_selector),
+            "Minimale Anzahl von zu beantwortenden Antworten darf höchstens so groß wie die maximale Anzahl sein"
+        )
+
+        # Delete answer
+        panels = self.driver.find_elements(*QuestionSelectors.MULTIPLE_CHOICE_ANSWER_PANELS)
+        second_panel = panels[1]
+        delete_button = second_panel.find_element(*QuestionSelectors.DELETE_BUTTON_WITHIN_PANEL)
+        self.driver.execute_script("arguments[0].click();", delete_button)
+
+    def assert_validation_errors_ncf(self):
+        question_type = QuestionType.NUMBER_CHECKBOX_TEXT
+        id_selector = self.get_selector_for(question_type)
+
+        # Clear and validate initial errors
+        self.clear_min_max_step_inputs(question_type)
+
+        # Click save and validate errors for missing values
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_VALUE(id_selector),
+            "Die Frage benötigt einen Minimalwert"
+        )
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MAX_VALUE(id_selector),
+            "Die Frage benötigt einen Maximalwert"
+        )
+        self.validate_error_message(
+            QuestionSelectors.ERROR_STEP_SIZE(id_selector),
+            "Die Schrittweite der Frage entspricht nicht dem geforderten Format."
+        )
+
+        # Set min > max and validate the corresponding error
+        self.set_min_max_step_inputs(min_value="10", max_value="5", step_size="1", question_type=question_type)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_VALUE(id_selector),
+            "Das Minimum der Frage war gleich oder größer als das Maximum"
+        )
+
+        # Set invalid step size (greater than max-min difference)
+        self.set_min_max_step_inputs(min_value="1.0", max_value="4.0", step_size="10", question_type=question_type)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_error_message(
+            QuestionSelectors.ERROR_STEP_SIZE(id_selector),
+            "Die Schrittweite der Frage war größer als der Abstand zwischen Minimum und Maximum\nDer Abstand zwischen Minimum und Maximum ist nicht restlos durch die Schrittweite teilbar"
+        )
+
+    def assert_validation_errors_dq(self):
+        id_selector = self.get_selector_for(QuestionType.DATE)
+
+        # Find start and end date inputs
+        start_date = self.driver.find_element(*QuestionSelectors.INPUT_START_DATE(id_selector))
+        end_date = self.driver.find_element(*QuestionSelectors.INPUT_END_DATE(id_selector))
+
+        # Get today's date and date one week ago
+        today =  datetime.now().strftime("%m/%d/%Y")
+        one_week_ago =  (datetime.now() - timedelta(days=7)).strftime("%m/%d/%Y")
+
+        start_date.clear()
+        start_date.send_keys(today)
+        end_date.clear()
+        end_date.send_keys(one_week_ago)
+
+        # Save the question
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+
+        # Validate error message for incorrect date order
+        self.validate_error_message(
+            QuestionSelectors.ERROR_START_DATE(id_selector),
+            "Das späteste Datum ist früher als das früheste Datum"
+        )
+
+    def assert_validation_errors_iq(self):
+        id_selector = self.get_selector_for(QuestionType.IMAGE)
+
+        # Save the question
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+
+        # Validate error for missing image
+        self.validate_error_message(
+            QuestionSelectors.ERROR_FILE_PATH(id_selector),
+            "Der Dateipfad darf nicht leer sein."
+        )
+
+    def assert_validation_errors_bp(self):
+        id_selector = self.get_selector_for(QuestionType.BODY_PART)
+        min_number_answers = QuestionSelectors.INPUT_MIN_NUMBER_ANSWERS(id_selector)
+        max_number_answers = QuestionSelectors.INPUT_MAX_NUMBER_ANSWERS(id_selector)
+
+        # Clear inputs and save to trigger validation errors for missing values
+        min_input = self.driver.find_element(*min_number_answers)
+        max_input = self.driver.find_element(*max_number_answers)
+        min_input.clear()
+        max_input.clear()
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.utils.scroll_to_bottom()
+
+        # Validate error messages for missing min and max answers
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_ANSWERS(id_selector),
+            "Es muss mindestens eine Körperregion als Antwort ausgewählt sein.\nMinimale Anzahl von zu beantwortenden Antworten muss vergeben werden"
+        )
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MAX_ANSWERS(id_selector),
+            "Maximale Anzahl von zu beantwortenden Antworten muss vergeben werden"
+        )
+
+        # Select one body part and validate errors for exceeding the available selections
+        selected_body_parts = self.select_body_parts({BodyPartSelectors.HEAD(id_selector, "front")})  # 1 body part selected
+
+        min_input = self.driver.find_element(*min_number_answers)
+        max_input = self.driver.find_element(*max_number_answers)
+        min_input.clear()
+        max_input.clear()
+        self.utils.fill_text_field(min_number_answers, 100)
+        self.utils.fill_text_field(max_number_answers, 100)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.utils.scroll_to_bottom()
+
+        # Validate error messages when min and max exceed the number of selected body parts
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_ANSWERS(id_selector),
+            "Minimale Anzahl von zu beantwortenden Antworten ist größer als die Anzahl der vorhandenen Antworten"
+        )
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MAX_ANSWERS(id_selector),
+            "Maximale Anzahl von zu beantwortenden Antworten ist größer als die Anzahl der vorhandenen Antworten"
+        )
+
+        # Select another body part and validate errors for conflicting min and max values
+        selected_body_parts.append(
+            self.select_body_parts({BodyPartSelectors.THROAT(id_selector, "front")}))  # 2 body parts selected
+
+        min_input = self.driver.find_element(*min_number_answers)
+        max_input = self.driver.find_element(*max_number_answers)
+        min_input.clear()
+        max_input.clear()
+        self.utils.fill_text_field(min_number_answers, 2)  # Set min to 2
+        self.utils.fill_text_field(max_number_answers, 1)  # Set max to 1 (conflict with min)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.utils.scroll_to_bottom()
+
+        # Validate error message when min exceeds max
+        self.validate_error_message(
+            QuestionSelectors.ERROR_MIN_ANSWERS(id_selector),
+            "Minimale Anzahl von zu beantwortenden Antworten darf höchstens so groß wie die maximale Anzahl sein"
+        )
+
+    def assert_validation_errors_sq_nc(self, question_type: QuestionType):
+
+        # Clear and validate initial errors
+        self.clear_min_max_step_inputs(question_type)
+
+        # Click save and validate errors for missing values
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+
+        self.validate_min_max_step_errors(
+            expected_errors=[
+                "Die Frage benötigt einen Minimalwert",
+                "Die Frage benötigt einen Maximalwert",
+                "Die Schrittweite der Frage entspricht nicht dem geforderten Format."
+            ]
+        )
+
+        # Set min > max and validate the corresponding error
+        self.set_min_max_step_inputs(min_value="10", max_value="5", step_size="1", question_type=question_type)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_min_max_step_errors(
+            expected_errors=[
+                "Das Minimum der Frage war gleich oder größer als das Maximum"
+            ]
+        )
+
+        # Set invalid step size (greater than max-min difference)
+        self.set_min_max_step_inputs(min_value="1.0", max_value="4.0", step_size="10", question_type=question_type)
+        self.utils.click_element(QuestionSelectors.BUTTON_SAVE)
+        self.validate_min_max_step_errors(
+            expected_errors=[
+                "Die Schrittweite der Frage war größer als der Abstand zwischen Minimum und Maximum\nDer Abstand zwischen Minimum und Maximum ist nicht restlos durch die Schrittweite teilbar"
+            ]
+        )
+
+    def assert_sq_nc_common_validations(self, question_type: QuestionType):
+        """
+        Common validation for both Slider and Numbered Checkbox questions.
+        :param question_type:
+        """
+        language_code = self.DEFAULT_LANGUAGE_CODE
+
+        id_selector = self.get_selector_for(question_type)
+        min_value = self.driver.find_element(*QuestionSelectors.INPUT_MIN_VALUE(id_selector))
+        max_value = self.driver.find_element(*QuestionSelectors.INPUT_MAX_VALUE(id_selector))
+        step_size = self.driver.find_element(*QuestionSelectors.INPUT_STEP_SIZE(id_selector))
+        assert min_value.is_displayed(), "Input for minimum value is not displayed."
+        assert max_value.is_displayed(), "Input for maximum value is not displayed."
+        assert step_size.is_displayed(), "Input for step size is not displayed."
+
+        wysiwyg_min_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.INPUT_WYSIWYG_SLIDER_MIN(language_code)))
+        assert wysiwyg_min_text.is_displayed(), "WYSIWYG editor for text at minimum position is not displayed."
+
+        wysiwyg_max_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.INPUT_WYSIWYG_SLIDER_MAX(language_code)))
+        assert wysiwyg_max_text.is_displayed(), "WYSIWYG editor for text at maximum position is not displayed."
+
+    def assert_mc_dd_common_validations(self, question_type):
+        try:
+            language_code = self.DEFAULT_LANGUAGE_CODE
+            id_selector = self.get_selector_for(question_type)
+
+            # Validate min and max answers
+            input_min_answers = self.driver.find_element(*QuestionSelectors.INPUT_MIN_NUMBER_ANSWERS(id_selector))
+            input_max_answers = self.driver.find_element(*QuestionSelectors.INPUT_MAX_NUMBER_ANSWERS(id_selector))
+            assert input_min_answers.is_displayed(), "Input for min answers is not displayed."
+            assert input_max_answers.is_displayed(), "Input for max answers is not displayed."
+
+            # Shows select for type of identification
+            dropdown_type_of_identification = self.driver.find_element(
+                *QuestionSelectors.DROPDOWN_TYPE_OF_IDENTIFICATION)
+            assert dropdown_type_of_identification.is_displayed(), "Dropdown for type of identification is not displayed."
+
+            # Answer text
+            input_answer_text = self.driver.find_element(
+                *QuestionSelectors.TEXTAREA_ANSWER_TEXT(id_selector, 0, language_code))
+            assert input_answer_text.is_displayed(), "Input for answer text is not displayed."
+
+            # Initially activated and free text
+            checkbox_initial_active = self.driver.find_element(
+                *QuestionSelectors.CHECKBOX_ANSWER_INITIAL_ACTIVATION(id_selector, 0))
+            checkbox_free_text = self.driver.find_element(*QuestionSelectors.CHECKBOX_FREE_TEXT(id_selector, 0))
+            assert checkbox_initial_active.is_displayed(), "Checkbox to make answer initially active is not displayed."
+            assert checkbox_free_text.is_displayed(), "Checkbox to activate free text field is not displayed."
+
+            # Identification code and score
+            input_identification = self.driver.find_element(*QuestionSelectors.INPUT_IDENTIFICATION(id_selector, 0))
+            input_score = self.driver.find_element(*QuestionSelectors.INPUT_SCORE(id_selector, 0))
+            assert input_identification.is_displayed(), "Input for identification is not displayed."
+            assert input_score.is_displayed(), "Input for score is not displayed."
+
+            # Validate add and delete answer buttons
+            add_button = self.driver.find_element(*QuestionSelectors.BUTTON_ADD_ANSWER)
+            assert add_button.is_displayed(), "Button to add an answer is not displayed."
+
+            text = 'Text to duplicate'
+            self.utils.fill_text_field(QuestionSelectors.TEXTAREA_ANSWER_TEXT(id_selector, 0, language_code), text)
+            self.utils.scroll_and_click(QuestionSelectors.BUTTON_ADD_ANSWER)
+            second_answer_text = self.driver.find_element(
+                *QuestionSelectors.TEXTAREA_ANSWER_TEXT(id_selector, 1, language_code))
+            second_answer_text_value = second_answer_text.get_attribute("value")
+            assert second_answer_text_value == text, f"Text in the second answer field does not match. Expected: '{text}', Found: '{second_answer_text_value}'"
+
+            panels = self.driver.find_elements(*QuestionSelectors.MULTIPLE_CHOICE_ANSWER_PANELS)
+            second_panel = panels[1]
+            delete_button = second_panel.find_element(*QuestionSelectors.DELETE_BUTTON_WITHIN_PANEL)
+            assert delete_button.is_displayed(), "Button to delete an answer is not displayed."
+            self.driver.execute_script("arguments[0].click();", delete_button)
+            self.utils.clear_text_field(QuestionSelectors.TEXTAREA_ANSWER_TEXT(id_selector, 0, language_code))
+        except AssertionError as e:
+            raise e
+
+    def assert_question_inputs(self, allowed_ids_of_visible_inputs):
+        try:
+            # Wait for the question type dropdown to be visible
+            WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+                QuestionSelectors.DROPDOWN_QUESTION_TYPE))
+
+            # Get all visible input, select, and textarea elements
+            visible_inputs = [
+                element for element in self.driver.find_elements(By.CSS_SELECTOR, "input, select, textarea")
+                if element.is_displayed()
+            ]
+
+            # Validate that each visible input has an ID in the allowed list
+            for element in visible_inputs:
+                element_id = element.get_attribute("id")
+                assert element_id in allowed_ids_of_visible_inputs, f"Unexpected input found with id: {element_id}. Allowed: {allowed_ids_of_visible_inputs}"
+
+            # Ensure the count of visible inputs matches the allowed list
+            assert len(visible_inputs) == len(allowed_ids_of_visible_inputs), (
+                f"Mismatch in visible inputs. Expected {len(allowed_ids_of_visible_inputs)}, found {len(visible_inputs)}."
+            )
+        except AssertionError as e:
+            raise e
+
+    def validate_error_message(self, selector, expected_message):
+        error_message_element = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            selector))
+        actual_message = error_message_element.text.strip()
+        assert actual_message == expected_message, f"Unexpected error message: '{actual_message}'"
+
+    def validate_min_max_step_errors(self, expected_errors):
+
+        error_slider_container = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            QuestionSelectors.ERROR_SLIDER_CONTAINER))
+        error_messages = error_slider_container.find_elements(By.XPATH, "./div")
+        assert len(error_messages) > 0, "No error messages displayed under the sliderErrors container."
+
+        # Extract actual error messages
+        actual_errors = [error.text.strip() for error in error_messages]
+
+        # Validate each expected error is present
+        for expected_error in expected_errors:
+            assert expected_error in actual_errors, f"Expected error message '{expected_error}' not found. Actual: {actual_errors}"
+
+    def assert_question_table_functionality(self, expected_count=11):
+        """
+        :param expected_count: The expected number of questions.
+        """
+        self.assert_number_of_questions_and_buttons(expected_count)
+        self.validate_reordering(original_index=0, new_index=2)
+        self.assert_add_question_button()
+
+    def assert_number_of_questions(self, expected_count):
         """
         :param expected_count: The expected number of questions.
         :raises AssertionError: If the number of questions does not match the expected count.
         """
         rows = [
-            row for row in self.driver.find_element(*QuestionSelectors.TABLE_QUESTION)
+            row for row in self.driver.find_element(*QuestionSelectors.TABLE_QUESTIONS)
             .find_element(By.TAG_NAME, "tbody")
             .find_elements(By.TAG_NAME, "tr") if row.is_displayed()
         ]
         assert len(rows) == expected_count, f"Expected {expected_count} questions, but found {len(rows)}."
+        return rows
+
+    def assert_number_of_questions_and_buttons(self, expected_count, min_buttons=3, max_buttons=4):
+        """
+        :param expected_count: The expected number of questions.
+        :param min_buttons: The minimum number of action buttons per question.
+        :param max_buttons: The maximum number of action buttons per question.
+        :raises AssertionError: If the number of questions or action buttons does not match expectations.
+        """
+        rows = self.assert_number_of_questions(expected_count)
+
+        for index, row in enumerate(rows, start=1):
+            action_buttons = row.find_elements(*QuestionSelectors.ACTION_BUTTONS)
+            assert min_buttons <= len(action_buttons) <= max_buttons, (
+                f"Row {index} does not have the expected range of action buttons ({min_buttons}-{max_buttons}). "
+                f"Found: {len(action_buttons)}."
+            )
+
+    def validate_reordering(self, original_index, new_index):
+        """
+        :param original_index: The index of the question to be moved.
+        :param new_index: The target index where the question should be dropped.
+        :raises AssertionError: If the reordering does not succeed.
+        """
+        # Get all rows
+        rows = WebDriverWait(self.driver, 10).until(
+            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
+        )
+        assert len(rows) > max(original_index, new_index), "Invalid indices for reordering."
+
+        # Identify source and target rows
+        source_id = rows[original_index].get_attribute('id')
+        target_id = rows[new_index].get_attribute('id')
+
+        # Use the drag-and-drop utility
+        self.utils.drag_and_drop(QuestionSelectors.GRIP_SELECTOR(source_id),
+                                 QuestionSelectors.GRIP_SELECTOR(target_id))
+
+        # Validate the reordering
+        reordered_rows = WebDriverWait(self.driver, 10).until(
+            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
+        )
+        reordered_ids = [row.get_attribute("id") for row in reordered_rows]
+
+        # Calculate expected order directly
+        expected_order = [row.get_attribute("id") for row in rows]
+        item_to_move = expected_order.pop(original_index)
+        expected_order.insert(new_index, item_to_move)
+
+        # Assert the new order matches the expected order
+        assert reordered_ids == expected_order, f"Reordering failed. Expected: {expected_order}, Found: {reordered_ids}"
+
+    def assert_add_question_button(self):
+        add_question_button = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            QuestionSelectors.BUTTON_ADD_QUESTION))
+        assert add_question_button.is_displayed(), "The 'Add Question' button is not displayed."
+
+
+
diff --git a/selenium/helper/Questionnaire.py b/selenium/helper/Questionnaire.py
index ad3b40cb..e534597f 100644
--- a/selenium/helper/Questionnaire.py
+++ b/selenium/helper/Questionnaire.py
@@ -1,12 +1,13 @@
 import datetime
 
+from selenium.common import TimeoutException
 from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 
 from helper.Navigation import NavigationHelper
-from helper.Question import QuestionHelper
+from helper.Question import QuestionHelper, QuestionType
 from helper.SeleniumUtils import SeleniumUtils
 
 
@@ -15,69 +16,39 @@ class QuestionnaireSelectors:
     BUTTON_ADD_QUESTION = (By.ID, "addQuestion")
     BUTTON_SAVE = (By.ID, "saveButton")
     BUTTON_SAVE_AND_EDIT = (By.ID, "saveEditButton")
+    BUTTON_DELETE_LANGUAGE = lambda language_code: (By.ID, f"{language_code}_Delete")
+    BUTTON_DELETE_LANGUAGE_MODAL = (By.XPATH, "//button[contains(@class, 'btn-danger') and text()='Entfernen']")
+
+    DROPDOWN_ADD_LANGUAGE = (By.CSS_SELECTOR, "div#languageDropdown.dropdown")
+    DROPDOWN_LANGUAGE_ITEM = lambda language_id: (By.CSS_SELECTOR, f"a.dropdown-item#{language_id}")
+
+    DELETE_LANGUAGE_MODAL = (By.ID, "deleteLanguageModal")
+    DELETE_LAST_LANGUAGE_MODAL = (By.ID, "deleteLastLanguageModal")
+    DELETE_LAST_LANGUAGE_OK_BUTTON = (By.CSS_SELECTOR, "#deleteLastLanguageModal .btn-secondary")
 
     INPUT_NAME = (By.ID, "name")
+    INPUT_LOGO = (By.ID, "file")
     INPUT_LOCALIZED_DISPLAY_NAME = lambda language_code: (By.ID, f"localizedDisplayName{language_code}")
     INPUT_EDITABLE_DESCRIPTION = (By.CSS_SELECTOR, "div.note-editable")
     INPUT_WELCOME_TEXT_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedWelcomeTextCollapsableText_{language_code}"]/div/div[2]/div[2]')
     INPUT_FINAL_TEXT_EDITABLE_DIV = lambda language_code: (By.XPATH, f'//*[@id="localizedFinalTextCollapsableText_{language_code}"]/div/div[2]/div[2]')
 
-    class QuestionTypes:
-        INFO_TEXT = "INFO_TEXT"
-        MULTIPLE_CHOICE = "MULTIPLE_CHOICE"
-        SLIDER = "SLIDER"
-        NUMBER_CHECKBOX = "NUMBER_CHECKBOX"
-        NUMBER_CHECKBOX_TEXT = "NUMBER_CHECKBOX_TEXT"
-        DROP_DOWN = "DROP_DOWN"
-        FREE_TEXT = "FREE_TEXT"
-        NUMBER_INPUT = "NUMBER_INPUT"
-        DATE = "DATE"
-        IMAGE = "IMAGE"
-        BODY_PART = "BODY_PART"
-        BARCODE = "BARCODE"
-
-class ConditionSelectors:
-    BUTTON_ADD_CONDITION = (By.ID, 'addCondition')
-    BUTTON_ADD_TARGET = (By.ID, 'addTargetButton')
-    BUTTON_SAVE_CONDITION = (By.ID, 'saveCondition')
-    BUTTON_BACK_TO_QUESTIONNAIRE = (By.ID, 'backToQuestionnaire')
-
-    CONDITION_LINK = lambda question_id: (By.XPATH, f'//a[contains(@href, "/condition/listQuestionConditions?questionId={question_id}")]')
-
-    DROPDOWN_TRIGGER = (By.ID, "triggerId")
-    DROPDOWN_QUESTION = (By.ID, 'questionDropDown0')
-
-    INPUT_THRESHOLD = (By.ID, 'conditionDTOs0.thresholdValue')
-
-    THRESHOLD_TYPE = (By.ID, "conditionDTOs0.thresholdType")
-    class ThresholdType:
-        SMALLER_THAN = "SMALLER_THAN"
-        SMALLER_THAN_EQUALS = "SMALLER_THAN_EQUALS"
-        EQUALS = "EQUALS"
-        BIGGER_THAN_EQUALS = "BIGGER_THAN_EQUALS"
-        BIGGER_THAN = "BIGGER_THAN"
-        NOT_EQUALS = "NOT_EQUALS"
-
-    DROPDOWN_TARGET_CLASS = (By.ID, "targetClass0")
-    class TargetType:
-        QUESTION = "de.imi.mopat.model.Question"
-        ANSWER = "de.imi.mopat.model.SelectAnswer"
-
-    DROPDOWN_TARGET_QUESTION = (By.ID, 'targetAnswerQuestionDropDown0')
-    DROPDOWN_TARGET_ANSWER = (By.ID, 'questionDropDown0')
-    DROPDOWN_ANSWER_TARGET = (By.ID, 'answerDropDown0')
-
-    DROPDOWN_ACTION = (By.ID, 'action0')
-    class ActionType:
-        DISABLE = "DISABLE"
-        ENABLE = "ENABLE"
+    QUESTIONNAIRE_TABLE = (By.ID, "questionnaireTable")
+    TABLE_ROWS = (By.CSS_SELECTOR, "table#questionnaireTable tbody tr")
+    TABLE_FIRST_ROW = (By.XPATH, "//tbody/tr[not(@id='emptyRow')][1]")
+    FLAG_ICONS = (By.CSS_SELECTOR, "table#questionnaireTable img[title]")
+    PAGINATION = (By.ID, "questionnaireTable_paginate")
+    SEARCH_BOX = (By.CSS_SELECTOR, "#questionnaireTable_filter input[type='search']")
+    ACTION_BUTTONS = (By.CSS_SELECTOR, "td.actionColumn > div.d-none.d-xl-block > a.link")
+    LANGUAGE_FLAG_ICONS = (By.CSS_SELECTOR, ".languageLabel img")
 
 class QuestionnaireHelper:
 
-    DEFAULT_DESCRIPTION = "Dieser Fragebogen enthält alle bisher implementierten Fragetypen"
+    DEFAULT_DESCRIPTION = "This description of the questionnaire is a dummy text."
     DEFAULT_LANGUAGE_CODE = "de_DE"
-    DEFAULT_LOCALIZED_WELCOME_TEXT = 'Ein Willkommenstext für den Fragebogen. Nichts besonderes zu sehen.'
-    DEFAULT_LOCALIZED_FINAL_TEXT = 'Dieser Text wird am Ende des Fragebogens gezeigt.'
+    DEFAULT_LANGUAGE_CODE_EN = "en"
+    DEFAULT_LOCALIZED_WELCOME_TEXT = 'A welcome text for the questionnaire. Nothing special to see.'
+    DEFAULT_LOCALIZED_FINAL_TEXT = 'This text is shown at the end of the questionnaire.'
 
     def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
@@ -90,7 +61,7 @@ def click_add_questionnaire_button(self):
         self.utils.click_element(QuestionnaireSelectors.BUTTON_ADD_QUESTIONNAIRE)
 
     def fill_questionnaire_details(self, questionnaire_name=None, description=None, language_code=None, localized_display_name=None,
-                                   localized_welcome_text=None, localized_final_text=None):
+                                   localized_welcome_text=None, localized_final_text=None, question_types=None):
         """
         :param questionnaire_name: Name of the questionnaire (optional).
         :param description: Description of the questionnaire (optional).
@@ -100,7 +71,12 @@ def fill_questionnaire_details(self, questionnaire_name=None, description=None,
         :param localized_final_text: Localized final text (optional).
         """
         timestamp: str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        questionnaire_name = questionnaire_name or f"Fragebogen alle Typen {timestamp}"
+        fragetypen_text = ''
+        if question_types:
+            delimiter = "+"
+            fragetypen_text = f" (Fragetypen: {delimiter.join(str(question_type.value) for question_type in question_types)})"
+
+        questionnaire_name = questionnaire_name or f"Fragebogen {timestamp}{fragetypen_text}"
         description = description or self.DEFAULT_DESCRIPTION
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         localized_display_name = localized_display_name or questionnaire_name
@@ -111,9 +87,8 @@ def fill_questionnaire_details(self, questionnaire_name=None, description=None,
         self.utils.fill_text_field(QuestionnaireSelectors.INPUT_NAME, questionnaire_name)
 
         # Fill in the description
-        WebDriverWait(self.driver, 30).until(
-            EC.visibility_of_element_located(QuestionnaireSelectors.INPUT_EDITABLE_DESCRIPTION)
-        )
+        WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+            QuestionnaireSelectors.INPUT_EDITABLE_DESCRIPTION))
         self.utils.fill_text_field(QuestionnaireSelectors.INPUT_EDITABLE_DESCRIPTION, description)
 
         # Fill in the localized display name
@@ -121,20 +96,40 @@ def fill_questionnaire_details(self, questionnaire_name=None, description=None,
 
         # Fill Welcome Text
         if localized_welcome_text:
-            welcome_text_div = WebDriverWait(self.driver, 30).until(
-                EC.visibility_of_element_located(QuestionnaireSelectors.INPUT_WELCOME_TEXT_EDITABLE_DIV(language_code))
-            )
+            welcome_text_div = WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+                QuestionnaireSelectors.INPUT_WELCOME_TEXT_EDITABLE_DIV(language_code)))
             self.utils.fill_editable_div(welcome_text_div, localized_welcome_text)
 
         # Fill Final Text
         if localized_final_text:
-            final_text_div = WebDriverWait(self.driver, 30).until(
-                EC.visibility_of_element_located(QuestionnaireSelectors.INPUT_FINAL_TEXT_EDITABLE_DIV(language_code))
-            )
+            final_text_div = WebDriverWait(self.driver, 30).until(EC.visibility_of_element_located(
+                QuestionnaireSelectors.INPUT_FINAL_TEXT_EDITABLE_DIV(language_code)))
             self.utils.fill_editable_div(final_text_div, localized_final_text)
 
         return questionnaire_name
 
+    def add_language(self, language_code):
+        """
+        :param language_code: The Code of the language to add (e.g., 'en' for English).
+        """
+        try:
+            # Click on the "Add Language" button
+            add_language_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                QuestionnaireSelectors.DROPDOWN_ADD_LANGUAGE))
+            add_language_button.click()
+
+            # Select the desired language from the dropdown
+            language_option = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                QuestionnaireSelectors.DROPDOWN_LANGUAGE_ITEM(language_code)))
+            language_option.click()
+
+        except TimeoutException:
+            raise AssertionError(f"Timed out while trying to add language '{language_code}'.")
+
+
+    def click_add_question_button(self):
+        self.utils.click_element(QuestionnaireSelectors.BUTTON_ADD_QUESTION)
+
     def save_questionnaire_edit_question(self):
         """
         :return: The ID of the newly created questionnaire.
@@ -151,25 +146,46 @@ def save_questionnaire_edit_question(self):
         except IndexError:
             raise Exception(f"Failed to extract questionnaire ID from URL: {new_url}")
 
-    def click_add_question_button(self):
-        self.utils.click_element(QuestionnaireSelectors.BUTTON_ADD_QUESTION)
+
+    def save_questionnaire(self):
+        """
+        :return: The ID of the newly created questionnaire.
+        """
+        current_url = self.driver.current_url
+        self.utils.click_element(QuestionnaireSelectors.BUTTON_SAVE)
+
+        # Wait for redirection and extract questionnaire ID
+        WebDriverWait(self.driver, 15).until(EC.url_changes(
+            current_url))
+
+        WebDriverWait(self.driver, 30).until(EC.presence_of_element_located(
+            QuestionnaireSelectors.TABLE_FIRST_ROW))
+
+        # Find the last row in the table
+        first_row = self.driver.find_element(*QuestionnaireSelectors.TABLE_FIRST_ROW)
+
+        questionnaire_id = first_row.get_attribute("id")
+
+        if not questionnaire_id:
+            raise Exception("The ID of the last added questionnaire could not be found.")
+
+        return questionnaire_id
 
     def create_questionnaire_with_questions(self, questionnaire_name=None, questionnaire_description=None,
                                             questionnaire_language_code=None, questionnaire_display_name=None,
                                             questionnaire_welcome_text=None, questionnaire_final_text=None, question_types=None):
         """
-        Creates a questionnaire and adds all specified question types.
-
         :param questionnaire_name: Name of the questionnaire.
         :param questionnaire_description: Description of the questionnaire.
         :param questionnaire_language_code: Language code (e.g., 'de_DE').
         :param questionnaire_display_name: Localized display name of the questionnaire.
         :param questionnaire_welcome_text: Welcome text for the questionnaire.
         :param questionnaire_final_text: Final text for the questionnaire.
-        :param question_types: A list of methods to add question types.
+        :param question_types: A list of question types.
         :return: A dictionary containing the questionnaire ID and a list of added questions.
         """
-        question_types = question_types or self.question_helper.QUESTION_TYPES
+        excluded_question_types = {QuestionType.IMAGE, QuestionType.BODY_PART, QuestionType.BARCODE}
+        question_types = question_types or [question_type for question_type in QuestionType if question_type not in excluded_question_types]
 
         # Navigate to "Manage Questionnaires"
         self.navigation_helper.navigate_to_manage_questionnaires()
@@ -178,20 +194,165 @@ def create_questionnaire_with_questions(self, questionnaire_name=None, questionn
         self.click_add_questionnaire_button()
         questionnaire_name = self.fill_questionnaire_details(questionnaire_name, questionnaire_description,
                                                   questionnaire_language_code, questionnaire_display_name,
-                                                  questionnaire_welcome_text, questionnaire_final_text)
+                                                  questionnaire_welcome_text, questionnaire_final_text, question_types)
         questionnaire_id = self.save_questionnaire_edit_question()
 
         # Add questions to the questionnaire
         added_questions = []
-        for add_question_method in question_types:
+        for question_type in question_types:
             self.click_add_question_button()
-            question_info = add_question_method()  # Add question
+            question_info = self.question_helper.add_question_by_type_default_value(question_type)
             question_info["id"] = self.question_helper.save_question()  # Save the question and retrieve ID
             added_questions.append(question_info)
 
         return {"id": questionnaire_id, "name": questionnaire_name, "questions": added_questions}
 
 
-# TODO [] The helper functions for asserting questionnaires should be implemented here
 class QuestionnaireAssertHelper(QuestionnaireHelper):
-    pass
\ No newline at end of file
+
+    def assert_questionnaire_list(self):
+        try:
+            # Validate table with questionnaires
+            questionnaire_table = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.QUESTIONNAIRE_TABLE))
+            assert questionnaire_table.is_displayed(), "The table with available questionnaires is not displayed."
+
+            # Validate flag icons
+            flag_icons = self.driver.find_elements(*QuestionnaireSelectors.FLAG_ICONS)
+            assert len(flag_icons) > 0, "No flag icons are displayed for the questionnaires."
+
+            # Validate pagination
+            pagination = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.PAGINATION))
+            assert pagination.is_displayed(), "Pagination is not displayed."
+
+            # Validate search box
+            search_box = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.SEARCH_BOX))
+            assert search_box.is_displayed(), "Search box is not displayed."
+
+            # Validate buttons in the action column
+            rows = self.driver.find_elements(*QuestionnaireSelectors.TABLE_ROWS)
+            assert len(rows) > 0, "No rows found in the questionnaire table."
+
+            for index, row in enumerate(rows, start=1):
+                action_buttons = row.find_elements(*QuestionnaireSelectors.ACTION_BUTTONS)
+                assert len(action_buttons) == 5, f"Row {index} does not have exactly 5 action buttons. Found: {len(action_buttons)}"
+
+            # Validate the button to create a new questionnaire
+            create_button = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.BUTTON_ADD_QUESTIONNAIRE))
+            assert create_button.is_displayed(), "Button to create a new questionnaire is not displayed."
+
+        except TimeoutException:
+            raise AssertionError("Timed out waiting for elements on the questionnaire list view.")
+        except AssertionError as e:
+            raise e
+
+    def assert_questionnaire_fill_page(self, add_language_code = None):
+        add_language_code = add_language_code or self.DEFAULT_LANGUAGE_CODE_EN
+        try:
+            # Validate dropdown to add language
+            dropdown = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.DROPDOWN_ADD_LANGUAGE))
+            assert dropdown.is_displayed(), "Language dropdown for adding a language is not displayed."
+
+            # Validate input for questionnaire name
+            questionnaire_name_input = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.INPUT_NAME))
+            assert questionnaire_name_input.is_displayed(), "Input for questionnaire name is not displayed."
+
+            # Validate input for logo
+            logo_input = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.INPUT_LOGO))
+            logo_display = self.driver.execute_script("return window.getComputedStyle(arguments[0]).display;",logo_input)
+            assert logo_display != "none", "Logo input display is set to 'none'."
+
+            # Validate WYSIWYG editor for description
+            wysiwyg_description = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.INPUT_EDITABLE_DESCRIPTION))
+            assert wysiwyg_description.is_displayed(), "WYSIWYG editor for description is not displayed."
+
+            # Validate input for display name
+            display_name_input = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.INPUT_LOCALIZED_DISPLAY_NAME(self.DEFAULT_LANGUAGE_CODE)))
+            assert display_name_input.is_displayed(), "Input for display name is not displayed."
+
+            # Validate WYSIWYG editor for welcome text
+            wysiwyg_welcome_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.INPUT_WELCOME_TEXT_EDITABLE_DIV(self.DEFAULT_LANGUAGE_CODE)))
+            assert wysiwyg_welcome_text.is_displayed(), "WYSIWYG editor for welcome text is not displayed."
+
+            # Validate WYSIWYG editor for end text
+            wysiwyg_end_text = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                QuestionnaireSelectors.INPUT_FINAL_TEXT_EDITABLE_DIV(self.DEFAULT_LANGUAGE_CODE)))
+            assert wysiwyg_end_text.is_displayed(), "WYSIWYG editor for end text is not displayed."
+
+            # Validate flag icons
+            flag_icons = self.driver.find_elements(
+                *QuestionnaireSelectors.LANGUAGE_FLAG_ICONS)
+            assert len(flag_icons) > 0, "No flag icons are displayed for inputs."
+
+            # Add a language
+            self.add_language(add_language_code)
+
+            # Validate duplicated inputs with flag icons
+            new_flag_icons = self.driver.find_elements(
+                *QuestionnaireSelectors.LANGUAGE_FLAG_ICONS)
+            assert len(new_flag_icons) == len(flag_icons) * 2, "Adding a language did not duplicate inputs with flag icons."
+
+            # Delete a language
+            delete_added_language_button = self.driver.find_elements(
+                *QuestionnaireSelectors.BUTTON_DELETE_LANGUAGE(add_language_code))
+            assert len(delete_added_language_button) > 0, "No delete buttons for languages are displayed."
+            delete_added_language_button[0].click()
+
+            # Close the modal
+            delete_language_modal = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                QuestionnaireSelectors.DELETE_LANGUAGE_MODAL))
+            remove_button = delete_language_modal.find_element(
+                *QuestionnaireSelectors.BUTTON_DELETE_LANGUAGE_MODAL)
+            remove_button.click()
+
+            # Validate deletion removes duplicated inputs
+            updated_flag_icons = self.driver.find_elements(
+                *QuestionnaireSelectors.LANGUAGE_FLAG_ICONS)
+            assert len(updated_flag_icons) == len(flag_icons), "Deleting a language did not remove duplicated inputs."
+
+            # Validate deleting the last language is not possible
+            delete_default_language_button = self.driver.find_elements(
+                *QuestionnaireSelectors.BUTTON_DELETE_LANGUAGE(self.DEFAULT_LANGUAGE_CODE))
+            if len(delete_default_language_button) == 1:
+                delete_default_language_button[0].click()
+
+                # Wait until the modal for the last language becomes visible
+                last_language_modal = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                    QuestionnaireSelectors.DELETE_LAST_LANGUAGE_MODAL))
+                assert last_language_modal.is_displayed(), "Modal for deleting the last language is not displayed."
+
+                # Click the 'Ok' button in the modal
+                ok_button = last_language_modal.find_element(
+                    *QuestionnaireSelectors.DELETE_LAST_LANGUAGE_OK_BUTTON)
+                ok_button.click()
+
+            questionnaire_name = self.fill_questionnaire_details()
+
+            self.utils.scroll_to_element(QuestionnaireSelectors.BUTTON_SAVE)
+
+            # Wait until the save button is visible
+            WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                QuestionnaireSelectors.BUTTON_SAVE))
+
+            # Validate save button creates a questionnaire and redirects
+            questionnaire_id = self.save_questionnaire()
+
+            WebDriverWait(self.driver, 10).until(EC.url_contains("/questionnaire/list"))
+
+            return {
+                "id": questionnaire_id,
+                "name": questionnaire_name
+            }
+        except TimeoutException:
+            raise AssertionError("Timed out waiting for elements on the questionnaire fill page.")
+        except AssertionError as e:
+            raise e
\ No newline at end of file
diff --git a/selenium/helper/Score.py b/selenium/helper/Score.py
index bcda6796..52116ee4 100644
--- a/selenium/helper/Score.py
+++ b/selenium/helper/Score.py
@@ -1,10 +1,11 @@
-from selenium.webdriver import Keys
+from datetime import datetime
+
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.select import Select
 from selenium.webdriver.support.wait import WebDriverWait
 
 from helper.Questionnaire import QuestionnaireHelper
+from helper.SeleniumUtils import DropdownMethod
 
 class ScoreSelectors:
     BUTTON_ADD_SCORE = (By.ID, "addScore")
@@ -18,6 +19,17 @@ class ScoreSelectors:
     INPUT_NAME = (By.ID, "name")
     INPUT_VALUE = lambda index: (By.NAME, f"expression.expressions[{index}].value")
 
+    TABLE_ROWS = (By.CSS_SELECTOR, "tbody > tr:not(#emptyRow)")
+    SCORE_TABLE = (By.ID, "scoreTable")
+    ACTION_BUTTONS = (By.CSS_SELECTOR, "td.actionColumn > a.link")
+
+    DROPDOWN_EXPRESSION_TYPE = (By.ID, "expression")
+    EXPRESSION_OPERATOR_SELECTED = lambda path: (By.NAME, f"{path}.operatorId")
+    EXPRESSION_OPERATOR_UNSELECTED = lambda path: (By.NAME, f"{path}")
+    EXPRESSION_VALUE = lambda path: (By.NAME, f"{path}.value")
+    EXPRESSION_QUESTION = lambda path: (By.NAME, f"{path}.questionId")
+    EXPRESSION_SCORE = lambda path: (By.NAME, f"{path}.scoreId")
+
     # Specific score types
     class ExpressionType:
         ADDITION = "1"
@@ -48,76 +60,273 @@ def click_add_score_button(self):
     def save_score(self):
         self.utils.click_element(ScoreSelectors.BUTTON_SAVE)
 
-    def add_basic_score(self, name, expression_type, steps=1):
+    def create_basic_score(self, expression_type, name_prefix=None, question_id=None, score_id=None):
         """
-        :param name: Name of the score.
-        :param expression_type: The type of expression (e.g., '1' for addition, '5' for question value, etc.).
-        :param steps: Number of times to press ARROW_UP for value fields (default is 1).
+        Creates a basic score for a given operator.
+
+        :param expression_type: The expression type for which the score should be created (e.g., "+" or "VALUE").
+        :param name_prefix: Prefix for the name of the score.
+        :param question_id: Question ID for QUESTION_VALUE operator.
+        :param score_id: Score ID for VALUE_OF_SCORE operator.
+        :return: A dictionary with details of the created score.
         """
-        self.utils.fill_text_field(ScoreSelectors.INPUT_NAME, name)
-        self.utils.select_dropdown(ScoreSelectors.DROPDOWN_EXPRESSION, expression_type, "value")
+        timestamp: str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        name_prefix = name_prefix or f"Basic Score {timestamp}"
 
-        # Dispatch logic based on expression type
-        if expression_type in [ScoreSelectors.ExpressionType.ADDITION, ScoreSelectors.ExpressionType.SUBTRACTION, ScoreSelectors.ExpressionType.MULTIPLICATION, ScoreSelectors.ExpressionType.DIVISION]:
-            self._binary_score(steps)
-        elif expression_type == ScoreSelectors.ExpressionType.QUESTION_VALUE:
-            self._question_value_score()
+        score_name = f"{name_prefix} - {expression_type}"
+        expression_tree = self._get_basic_expression_tree(expression_type, question_id=question_id, score_id=score_id)
+
+        # Add the score using the helper
+        self.add_score(
+            name=score_name,
+            expression_type=expression_type,
+            expression_tree=expression_tree
+        )
+
+        return {
+            "name": score_name,
+            "operator": expression_type,
+            "expression_tree": expression_tree
+        }
+
+    def _get_basic_expression_tree(self, expression_type, question_id=None, score_id=None):
+        """
+        Generates a basic expression tree for a given operator.
+
+        :param expression_type: The operator value for the expression.
+        :param question_id: The ID of the question to use (required for QUESTION_VALUE).
+        :param score_id: The ID of the score to use (required for VALUE_OF_SCORE).
+        :return: A dictionary representing a basic expression tree.
+        """
+        if expression_type in [ScoreSelectors.ExpressionType.ADDITION, ScoreSelectors.ExpressionType.SUBTRACTION,
+                               ScoreSelectors.ExpressionType.MULTIPLICATION, ScoreSelectors.ExpressionType.DIVISION,
+                               ScoreSelectors.ExpressionType.GREATER_THAN, ScoreSelectors.ExpressionType.GREATER_THAN_EQUALS,
+                               ScoreSelectors.ExpressionType.LESS_THAN, ScoreSelectors.ExpressionType.LESS_THAN_EQUALS,
+                               ScoreSelectors.ExpressionType.EQUALS, ScoreSelectors.ExpressionType.NOT_EQUALS]:
+            # Binary operator: Two operands
+            return {
+                "operator": expression_type,
+                "nested": [
+                    {"operator": ScoreSelectors.ExpressionType.VALUE, "value": 10},
+                    {"operator": ScoreSelectors.ExpressionType.VALUE, "value": 5}
+                ]
+            }
+        elif expression_type in [ScoreSelectors.ExpressionType.SUM, ScoreSelectors.ExpressionType.COUNTER,
+                                 ScoreSelectors.ExpressionType.AVERAGE, ScoreSelectors.ExpressionType.MAXIMUM,
+                                 ScoreSelectors.ExpressionType.MINIMUM]:
+            # Multi operator: Multiple operands
+            return {
+                "operator": expression_type,
+                "nested": [
+                    {"operator": ScoreSelectors.ExpressionType.VALUE, "value": 10},
+                    {"operator": ScoreSelectors.ExpressionType.VALUE, "value": 20}
+                ]
+            }
         elif expression_type == ScoreSelectors.ExpressionType.VALUE:
-            self._value_score(steps)
-        elif expression_type == ScoreSelectors.ExpressionType.SUM:
-            self._sum_score(steps)
-        elif expression_type in [ScoreSelectors.ExpressionType.GREATER_THAN, ScoreSelectors.ExpressionType.GREATER_THAN_EQUALS, ScoreSelectors.ExpressionType.LESS_THAN, ScoreSelectors.ExpressionType.LESS_THAN_EQUALS, ScoreSelectors.ExpressionType.EQUALS, ScoreSelectors.ExpressionType.NOT_EQUALS]:
-            self._binary_score(steps)
-        elif expression_type == ScoreSelectors.ExpressionType.COUNTER:
-            self._counter_score(steps)
-        elif expression_type == ScoreSelectors.ExpressionType.AVERAGE:
-            self._average_score(steps)
+            # Unary operator: Single value
+            return {
+                "operator": expression_type,
+                "value": 42
+            }
+        elif expression_type == ScoreSelectors.ExpressionType.QUESTION_VALUE:
+            if not question_id:
+                raise ValueError("QUESTION_VALUE requires a valid question_id.")
+            # Question-based operator
+            return {
+                "operator": expression_type,
+                "question": question_id
+            }
         elif expression_type == ScoreSelectors.ExpressionType.VALUE_OF_SCORE:
-            self._value_of_score()
-        elif expression_type in [ScoreSelectors.ExpressionType.MAXIMUM, ScoreSelectors.ExpressionType.MINIMUM]:
-            self._min_or_max_score(steps)
+            if not score_id:
+                raise ValueError("VALUE_OF_SCORE requires a valid score_id.")
+            # Score-based operator
+            return {
+                "operator": expression_type,
+                "score": score_id
+            }
+        else:
+            raise ValueError(f"Unsupported operator: {expression_type}")
+
+    def add_score(self, name=None, expression_type=None, expression_tree=None):
+        """
+        Adds a score with a specific name and an expression structure.
+
+        :param name: Optional name of the score (generated if None).
+        :param expression_type: Type of the root expression (e.g., ADDITION, SUM).
+        :param expression_tree: Nested dictionary representing the expression tree.
+        :return: A dictionary with details of the created score.
+        """
+        # Generate name if not provided
+        timestamp: str = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        name = name or f"Score {timestamp} - {expression_type}"
+
+        # Click Add Score Button
+        self.utils.click_element(ScoreSelectors.BUTTON_ADD_SCORE)
+        self.utils.fill_text_field(ScoreSelectors.INPUT_NAME, name)
+
+        # Build the expression tree
+        if expression_tree:
+            self._build_expression("expression", expression_tree)
+
+        return {
+            "name": name,
+            "operator": expression_type,
+            "expression_tree": expression_tree
+        }
+
+    def _build_expression(self, path: str, expression: dict):
+        """
+        Recursively builds an expression.
+
+        :param path: Path prefix for the current expression (e.g., "expression").
+        :param expression: Dictionary representing the expression structure.
+        """
+        operator = expression.get("operator")
+        value = expression.get("value")
+        question = expression.get("question")
+        score = expression.get("score")
+        nested_expressions = expression.get("nested")
 
-    # Score Logic
-    def _binary_score(self, steps):
-        """binary scores (e.g., +, -, *, /)."""
-        self._set_operator_and_value(0, steps=steps)
-        self._set_operator_and_value(1, steps=steps)
+        if operator:
+            self.utils.select_dropdown(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(path), operator, DropdownMethod.VALUE)
 
-    def _question_value_score(self):
-        self.utils.select_dropdown(ScoreSelectors.DROPDOWN_QUESTION, 2, "index")
+        if value is not None:
+            self.utils.fill_number_field(ScoreSelectors.EXPRESSION_VALUE(path), value)
 
-    def _value_score(self, steps):
-        self.utils.set_value("expression.value", steps)
+        if question:
+            self.utils.select_dropdown(ScoreSelectors.EXPRESSION_QUESTION(path), question, DropdownMethod.VALUE)
 
-    def _sum_score(self, steps):
-        self._set_operator_and_value(0, steps=steps)
+        if score:
+            self.utils.select_dropdown(ScoreSelectors.EXPRESSION_SCORE(path), score, DropdownMethod.VALUE)
 
-    def _counter_score(self, steps):
-        self._set_operator_and_value(0, nested=True, steps=steps)
-        self.utils.select_dropdown((By.NAME, "expression.expressions[0].operatorId"), ScoreSelectors.ExpressionType.LESS_THAN_EQUALS, "value")
-        self._set_operator_and_value(1, nested=True, steps=steps)
+        if nested_expressions:
+            for i, nested_expression in enumerate(nested_expressions):
+                nested_path = f"{path}.expressions[{i}]"
+                self._build_expression(nested_path, nested_expression)
 
-    def _average_score(self, steps):
-        self._set_operator_and_value(0, steps=steps)
+class ScoreAssertHelper(ScoreHelper):
 
-    def _value_of_score(self):
-        self.utils.select_dropdown(ScoreSelectors.DROPDOWN_SCORE, 1, "index")
+    def assert_scores_list(self):
+        # Arrange: Verify 'Add New Score' button is present
+        add_score_button = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(ScoreSelectors.BUTTON_ADD_SCORE)
+        )
+        assert add_score_button.is_displayed(), "The 'Add New Score' button is not displayed."
 
-    def _min_or_max_score(self, steps):
-        self._set_operator_and_value(0, steps=steps)
+        # Act & Assert: Add the first score and verify
+        self.add_and_verify_score(ScoreSelectors.ExpressionType.ADDITION)
 
-    # Helpers
-    def _set_operator_and_value(self, index, steps=1, nested=False):
+        # Act & Assert: Add a second score and verify
+        self.add_and_verify_score(ScoreSelectors.ExpressionType.MULTIPLICATION)
+
+        # Verify: Action buttons are displayed for each row
+        self.assert_scores_table_and_buttons()
+
+    def add_and_verify_score(self, expression_type):
+        """
+        :param expression_type: The type of the score to add.
+        """
+
+        # Add a basic score
+        score = self.create_basic_score(expression_type)
+
+        # Save the score
+        self.save_score()
+
+        # Verify: Score table contains the new score
+        score_table = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            ScoreSelectors.SCORE_TABLE))
+        assert score_table.is_displayed(), "Score table is not displayed."
+
+        rows = score_table.find_elements(By.TAG_NAME, "tr")
+        assert any(score['name'] in row.text for row in rows), f"Score '{score['name']}' is not found in the table."
+
+    def assert_scores_table_and_buttons(self):
+        # Locate table rows
+        rows = self.driver.find_elements(*ScoreSelectors.TABLE_ROWS)
+
+        # Ensure the table has rows
+        assert len(rows) > 0, "Scores table is empty. No rows found."
+
+        for index, row in enumerate(rows, start=1):
+            # Locate action buttons in the current row
+            action_buttons = row.find_elements(*ScoreSelectors.ACTION_BUTTONS)
+
+            # Assert that each row has exactly two action buttons
+            assert len(action_buttons) == 2, (
+                f"Row {index} does not have exactly two action buttons. Found: {len(action_buttons)}."
+            )
+
+    def assert_score_fill(self):
         """
-        :param index: The index of the operator and value to set.
-        :param steps: Number of times to press ARROW_UP for the value (default is 1).
-        :param nested: Whether the value is nested in another structure.
+        Verifies that the Score Fill page:
+        - Displays inputs for the question score
+        - Shows dropdowns for selecting operators
+        - Allows the combination of different operators, adjusting dynamically based on the selected values
+        - Handles errors for invalid combinations gracefully
         """
-        # Adjust the base name for nested structures
-        base_name = f"expression.expressions[0]." if nested else ""
 
-        operator_selector = (By.NAME, f"{base_name}expression.expressions[{index}].operatorId")
-        value_selector = (By.NAME, f"{base_name}expression.expressions[{index}].value")
+        # Step 1: Navigate to the Score Fill page
+        self.click_add_score_button()
+
+        # Step 2: Verify the presence of the input field for the score name
+        score_name_input = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(ScoreSelectors.INPUT_NAME))
+        assert score_name_input.is_displayed(), "Score name input field is not displayed."
+
+        # Fill the score name
+        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        score_name = f"Fill Score Test {timestamp}"
+        self.utils.fill_text_field(ScoreSelectors.INPUT_NAME, score_name)
+
+        # Step 3: Verify the presence of the operator dropdown
+        operator_dropdown = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(ScoreSelectors.DROPDOWN_EXPRESSION))
+        assert operator_dropdown.is_displayed(), "Operator dropdown is not displayed."
+
+        # Select an initial operator
+        self.utils.select_dropdown(ScoreSelectors.DROPDOWN_EXPRESSION, ScoreSelectors.ExpressionType.ADDITION,
+                                   DropdownMethod.VALUE)
+
+        # Step 4: Validate the appearance of nested operator inputs
+        first_nested_path = "expression.expressions[0]"
+        first_nested_operator = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(first_nested_path)))
+        assert first_nested_operator.is_displayed(), "First nested operator input is not displayed."
+
+        # Add a nested operator and validate the structure
+        self.utils.select_dropdown(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(first_nested_path),
+                                   ScoreSelectors.ExpressionType.VALUE, DropdownMethod.VALUE)
+        first_value_input = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(ScoreSelectors.EXPRESSION_VALUE(first_nested_path)))
+        assert first_value_input.is_displayed(), "Value input for the first nested operator is not displayed."
+
+        self.utils.fill_number_field(ScoreSelectors.EXPRESSION_VALUE(first_nested_path), 3)
+
+        # Step 5: Add a second operator and validate the DOM structure
+        second_nested_path = "expression.expressions[1]"
+        self.utils.select_dropdown(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(second_nested_path),
+                                   ScoreSelectors.ExpressionType.MULTIPLICATION, DropdownMethod.VALUE)
+
+        # Ensure a second nested operator appears
+        second_nested_first_path = f"{second_nested_path}.expressions[0]"
+        second_nested_first_operator = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(second_nested_first_path)))
+        assert second_nested_first_operator.is_displayed(), "Second nested first operator is not displayed."
+
+        self.utils.select_dropdown(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(second_nested_first_path),
+                                   ScoreSelectors.ExpressionType.VALUE, DropdownMethod.VALUE)
+        self.utils.fill_number_field(ScoreSelectors.EXPRESSION_VALUE(second_nested_first_path), 3)
+
+        # Add another nested operator to complete the second branch
+        second_nested_second_path = f"{second_nested_path}.expressions[1]"
+        second_nested_second_operator = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(second_nested_second_path)))
+        assert second_nested_second_operator.is_displayed(), "Second nested second operator is not displayed."
+
+        self.utils.select_dropdown(ScoreSelectors.EXPRESSION_OPERATOR_UNSELECTED(second_nested_second_path),
+                                   ScoreSelectors.ExpressionType.VALUE, DropdownMethod.VALUE)
+        self.utils.fill_number_field(ScoreSelectors.EXPRESSION_VALUE(second_nested_second_path), 4)
+
+        self.save_score()
 
-        self.utils.select_dropdown(operator_selector, ScoreSelectors.ExpressionType.VALUE, "value")
-        self.utils.set_value(value_selector[1], steps=steps)
\ No newline at end of file
diff --git a/selenium/helper/SeleniumUtils.py b/selenium/helper/SeleniumUtils.py
index 06649f89..64165d77 100644
--- a/selenium/helper/SeleniumUtils.py
+++ b/selenium/helper/SeleniumUtils.py
@@ -1,4 +1,5 @@
 import time
+from enum import Enum, auto
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
@@ -18,6 +19,10 @@ class SearchBoxSelectors:
     BUNDLE = (By.CSS_SELECTOR, "#bundleTable_filter input[type='search']")
     CLINIC = (By.CSS_SELECTOR, "#clinicTable_filter input[type='search']")
 
+class DropdownMethod(Enum):
+    VISIBLE_TEXT = "visible_text"
+    VALUE = "value"
+    INDEX = "index"
 
 class SeleniumUtils:
     def __init__(self, driver, navigation_helper = None):
@@ -30,6 +35,7 @@ def click_element(self, selector):
         """
         try:
             element = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(selector))
+            self.driver.execute_script("arguments[0].scrollIntoView(true);", element)
             element.click()
         except ElementClickInterceptedException:
             try:
@@ -46,9 +52,8 @@ def fill_text_field(self, selector, text):
         :param text: The text to input into the text field.
         """
         try:
-            text_field = WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(selector)
-            )
+            text_field = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                selector))
 
             text_field.clear()
             text_field.send_keys(text)
@@ -57,6 +62,35 @@ def fill_text_field(self, selector, text):
         except Exception as e:
             raise Exception(f"Failed to fill text field {selector}: {e}")
 
+    def fill_number_field(self, selector, number):
+        """
+        :param selector: A tuple representing the element locator (e.g., (By.ID, "text_field_id")).
+        :param text: The text to input into the text field.
+        """
+        try:
+            text_field = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                selector))
+
+            text_field.clear()
+            text_field.send_keys(number)
+        except TimeoutException:
+            raise Exception(f"Timeout while waiting for text field {selector} to be visible.")
+        except Exception as e:
+            raise Exception(f"Failed to fill text field {selector}: {e}")
+
+    def clear_text_field(self, selector):
+        """
+        :param selector: A tuple representing the element locator (e.g., (By.ID, "text_field_id")).
+        """
+        try:
+            text_field = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                selector))
+            text_field.clear()
+        except TimeoutException:
+            raise Exception(f"Timeout while waiting for text field {selector} to be visible.")
+        except Exception as e:
+            raise Exception(f"Failed to clear text field {selector}: {e}")
+
     def fill_editable_div(self, editable_div, text):
         """
         Fills an editable div element (e.g., a WYSIWYG editor) with the specified text.
@@ -87,27 +121,85 @@ def fill_editable_div(self, editable_div, text):
         except Exception as e:
             raise Exception(f"Error while filling the editable div: {e}")
 
+    def scroll_and_click(self, selector):
+        # Scroll to element
+        element = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            selector))
+        self.driver.execute_script("arguments[0].scrollIntoView({block: 'center'});", element)
+
+        # Wait until the element is clickable
+        try:
+            WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(selector)).click()
+        except ElementClickInterceptedException:
+            # Fallback: JavaScript click if the click is blocked
+            self.driver.execute_script("arguments[0].click();", element)
+
     def scroll_to_element(self, selector):
         """
         :param selector: A tuple representing the element locator (e.g., (By.ID, "element_id")).
         """
         try:
-            element = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(selector))
+            element = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                selector))
             self.driver.execute_script("arguments[0].scrollIntoView({block: 'center'});", element)
         except TimeoutException:
             raise Exception(f"Timeout while trying to scroll to element {selector}.")
         except Exception as e:
             raise Exception(f"Failed to scroll to element {selector}: {e}")
 
+    def scroll_to_bottom(self):
+        try:
+            # Wait for the page to fully load
+            WebDriverWait(self.driver, 30).until(lambda driver: driver.execute_script("return document.readyState") == "complete")
+
+            # Execute JavaScript to scroll to the bottom
+            self.driver.execute_script("window.scrollTo(0, document.body.scrollHeight);")
+
+            # Wait for the scrolling to complete
+            WebDriverWait(self.driver, 10).until(
+                lambda driver: driver.execute_script(
+                    "return window.scrollY + window.innerHeight") >= driver.execute_script(
+                    "return document.body.scrollHeight")
+            )
+        except TimeoutException:
+            raise Exception("Timeout while trying to scroll to the bottom of the page.")
+        except Exception as e:
+            raise Exception(f"Failed to scroll to the bottom of the page: {e}")
+
+    def scroll_to_element_or_bottom(self, selector, timeout=10):
+        """
+        :param selector: A tuple representing the element locator (e.g., (By.ID, "element_id")).
+        :param timeout: Maximum time to wait for scrolling to complete.
+        """
+        try:
+            # Wait for the page to fully load
+            WebDriverWait(self.driver, 30).until(lambda driver: driver.execute_script("return document.readyState") == "complete")
+
+            # Locate the element
+            element = WebDriverWait(self.driver, timeout).until(EC.presence_of_element_located(
+                selector))
+
+            # Scroll the element into view
+            self.driver.execute_script("arguments[0].scrollIntoView({block: 'center'});", element)
+
+            # Wait until the element is approximately centered or the bottom is reached
+            WebDriverWait(self.driver, timeout).until(
+                lambda driver: abs(driver.execute_script("return arguments[0].getBoundingClientRect().top;", element)
+                ) < driver.execute_script("return window.innerHeight / 2") or
+                    driver.execute_script("return window.scrollY + window.innerHeight >= document.body.scrollHeight")
+            )
+        except TimeoutException:
+            raise Exception(
+                f"Timeout while trying to scroll to element {selector} or detecting the bottom of the page.")
+
     def toggle_checkbox(self, selector, enable=True):
         """
         :param selector: Locator of the checkbox element.
         :param enable: True to enable the checkbox, False to disable it.
         """
         try:
-            checkbox = WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(selector)
-            )
+            checkbox = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                selector))
             self.scroll_to_element(selector)
             if checkbox.is_selected() != enable:
                 self.click_element(selector)
@@ -116,16 +208,15 @@ def toggle_checkbox(self, selector, enable=True):
         except Exception as e:
             raise Exception(f"Error while toggling checkbox {selector}: {e}")
 
-    def select_dropdown(self, selector, value, method="visible_text"):
+    def select_dropdown(self, selector, value, method=DropdownMethod.VISIBLE_TEXT):
         """
         :param selector: The locator tuple for the dropdown element.
-        :param value: The value or visible text of the option to select.
-        :param method: The selection method, either "visible_text" or "value".
+        :param value: The value, visible text, or index of the option to select.
+        :param method: The selection method, an instance of DropdownMethod Enum.
         """
         try:
-            dropdowns = WebDriverWait(self.driver, 10).until(
-                EC.presence_of_all_elements_located(selector)
-            )
+            dropdowns = WebDriverWait(self.driver, 10).until(EC.presence_of_all_elements_located(
+                selector))
 
             # Filter visible dropdowns
             visible_dropdown = next(el for el in dropdowns if el.is_displayed())
@@ -133,14 +224,21 @@ def select_dropdown(self, selector, value, method="visible_text"):
             # Initialize the Select object with the visible dropdown
             select = Select(visible_dropdown)
 
-            if method == "visible_text":
+            if method == DropdownMethod.VISIBLE_TEXT:
                 select.select_by_visible_text(value)
-            elif method == "value":
+            elif method == DropdownMethod.VALUE:
                 select.select_by_value(value)
-            elif method == "index":
-                select.select_by_index(value)
+            elif method == DropdownMethod.INDEX:
+                visible_options = [
+                    option for option in select.options
+                    if option.is_displayed() and not option.get_attribute("disabled")
+                ]
+                if value < 0 or value >= len(visible_options):
+                    raise ValueError(f"Invalid index '{value}'. Must be between 0 and {len(visible_options) - 1}.")
+                # Click the selected visible option
+                visible_options[value].click()
             else:
-                raise ValueError(f"Invalid method '{method}'. Use 'visible_text' or 'value'.")
+                raise ValueError(f"Invalid method '{method}'. Use DropdownMethod Enum values.")
         except TimeoutException:
             raise Exception(f"Timeout while selecting '{value}' in dropdown {selector}.")
         except Exception as e:
@@ -154,14 +252,14 @@ def get_visible_table_rows(self, by, value):
         :return: List of WebElement rows.
         """
         try:
-            table = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located((by, value)))
+            table = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+                (by, value)))
             tbody = table.find_element(By.TAG_NAME, "tbody")
             rows = [row for row in tbody.find_elements(By.TAG_NAME, "tr") if row.is_displayed()]
             return rows
         except TimeoutException:
             raise Exception(f"Timeout while locating table rows in table '{value}'.")
 
-
     def search_and_delete_item(self, item_name, item_id, item_type):
         """
         :param item_name: The name of the item to search for.
@@ -195,7 +293,6 @@ def search_and_delete_item(self, item_name, item_id, item_type):
         except Exception as e:
             raise Exception(f"An error occurred while deleting {item_type} '{item_name}': {e}")
 
-
     def handle_popup_alert(self, accept=True, timeout=2):
         """
         :param accept: Boolean indicating whether to accept (True) or dismiss (False) the alert.
@@ -211,17 +308,34 @@ def handle_popup_alert(self, accept=True, timeout=2):
         except TimeoutException:
             pass  # No alert appeared
 
-
     def set_value(self, field_name, steps=1):
         """
         :param field_name: The name of the input field.
         :param steps: Number of times to press the ARROW_UP key (default is 1).
         """
-        value_input = WebDriverWait(self.driver, 10).until(
-            EC.visibility_of_element_located((By.NAME, field_name))
-        )
+        value_input = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+            (By.NAME, field_name)))
         value_input.click()
         for _ in range(steps):
             value_input.send_keys(Keys.ARROW_UP)
 
 
+    def drag_and_drop(self, source_selector, target_selector):
+        """
+        :param source_selector: A tuple (By, value) identifying the source element to be dragged.
+        :param target_selector: A tuple (By, value) identifying the target element where the source should be dropped.
+        :raises TimeoutException: If either the source or target element is not found within the timeout.
+        """
+        # Wait for the source and target elements to be present
+        source_element = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            source_selector))
+        target_element = WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            target_selector))
+
+        # Scroll the elements into view to ensure they are interactable
+        self.driver.execute_script("arguments[0].scrollIntoView({block: 'center'});", source_element)
+        self.driver.execute_script("arguments[0].scrollIntoView({block: 'center'});", target_element)
+
+        # Perform the drag-and-drop action
+        ActionChains(self.driver).drag_and_drop(source_element, target_element).perform()
+
diff --git a/selenium/helper/Survey.py b/selenium/helper/Survey.py
index 182bc2be..21671b74 100644
--- a/selenium/helper/Survey.py
+++ b/selenium/helper/Survey.py
@@ -1,5 +1,3 @@
-import time
-
 from selenium.common import TimeoutException
 from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
@@ -8,8 +6,9 @@
 from selenium.webdriver.support.ui import Select
 
 from helper.Navigation import NavigationHelper
-from helper.Question import QuestionSelectors
-from helper.SeleniumUtils import SeleniumUtils
+from helper.Question import QuestionType
+from helper.SeleniumUtils import SeleniumUtils, DropdownMethod
+
 
 class SurveySelectors:
     BUTTON_SHOW_BUNDLES = (By.ID, "showBundles")
@@ -39,7 +38,6 @@ class SurveySelectors:
     LABEL_FOR_CHECKBOX = lambda selected_value: (By.CSS_SELECTOR, f"label[for='numberedCheckbox_{selected_value}']")
     LABEL_BY_OPTION_TEXT = lambda option_text: (By.XPATH, f"//div[@class='right' and text()='{option_text}']/..")
 
-
 class SurveyHelper:
 
     # Default values for survey interactions
@@ -80,7 +78,7 @@ def start_survey(self, configuration, clinic_name, case_number):
                 assert selected_clinic == clinic_name, f"Expected clinic '{clinic_name}', but got '{selected_clinic}'"
             else:
                 # Select the clinic from the dropdown
-                self.utils.select_dropdown(SurveySelectors.DROPDOWN_CLINIC_SELECTION, clinic_name, "visible_text")
+                self.utils.select_dropdown(SurveySelectors.DROPDOWN_CLINIC_SELECTION, clinic_name, DropdownMethod.VISIBLE_TEXT)
 
             # Select configuration
             config_selector = configuration['config_selector']
@@ -101,9 +99,8 @@ def complete_survey(self):
         self.click_next_button()
 
         # Wait for the survey completion message to appear
-        WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(SurveySelectors.TEXT_QUESTION_CONTENT)
-        )
+        WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(
+            SurveySelectors.TEXT_QUESTION_CONTENT))
 
         # Validate that the survey completion page is displayed
         completion_content = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_CONTENT).text
@@ -119,20 +116,14 @@ def proceed_to_bundle_selection(self, bundle_name, language_code=None):
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         try:
             # Click "Show Bundles" button to proceed
-            WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(SurveySelectors.BUTTON_SHOW_BUNDLES)
-            )
             self.utils.click_element(SurveySelectors.BUTTON_SHOW_BUNDLES)
 
             # Select bundle
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(SurveySelectors.DROPDOWN_BUNDLE_SELECTION)
-            )
-            self.utils.select_dropdown(SurveySelectors.DROPDOWN_BUNDLE_SELECTION, bundle_name, "visible_text")
+            self.utils.select_dropdown(SurveySelectors.DROPDOWN_BUNDLE_SELECTION, bundle_name, DropdownMethod.VISIBLE_TEXT)
 
             # Select language if provided
             if language_code:
-                self.utils.select_dropdown(SurveySelectors.DROPDOWN_LANGUAGE_SELECTION, language_code, "value")
+                self.utils.select_dropdown(SurveySelectors.DROPDOWN_LANGUAGE_SELECTION, language_code, DropdownMethod.VALUE)
 
             # Start the survey
             self.utils.click_element(SurveySelectors.BUTTON_START_SURVEY)
@@ -281,21 +272,19 @@ class SurveyAssertHelper(SurveyHelper):
 
     def assertion_for_welcome_text(self, text):
         WebDriverWait(self.driver, 10).until(
-            EC.text_to_be_present_in_element(SurveySelectors.TEXT_QUESTION_CONTENT, text)
-        )
+            EC.text_to_be_present_in_element(
+                SurveySelectors.TEXT_QUESTION_CONTENT, text))
         welcome_text = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_CONTENT).text
         assert text in welcome_text, "Welcome text not found!"
 
     def assertion_for_question_title(self, question):
-        if question["type"] == QuestionSelectors.QuestionTypes.INFO_TEXT:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(SurveySelectors.TEXT_QUESTION_CONTENT)
-            )
+        if question["type"] == QuestionType.INFO_TEXT:
+            WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                SurveySelectors.TEXT_QUESTION_CONTENT))
             question_text = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_CONTENT).text
             assert question['text'] in question_text, "Question text not found!"
         else:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(SurveySelectors.TEXT_QUESTION_TITLE)
-            )
+            WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
+                SurveySelectors.TEXT_QUESTION_TITLE))
             question_text = self.driver.find_element(*SurveySelectors.TEXT_QUESTION_TITLE).text
-            assert question['text'] in question_text, "Question title not found!"
+            assert question['text'] in question_text, "Question title not found!"
\ No newline at end of file
diff --git a/selenium/helper/test_images/test_upload_image.png b/selenium/helper/test_images/test_upload_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a625bdbe946b94db73c7e9190b8bac8b914de70
GIT binary patch
literal 83
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaN1JzX3_B*K#e
dzOMYu&%j*4_@29+VJc99!PC{xWt~$(699uA61)Ha

literal 0
HcmV?d00001

diff --git a/selenium/localhost8080.py b/selenium/localhost8080.py
deleted file mode 100644
index 1b957f05..00000000
--- a/selenium/localhost8080.py
+++ /dev/null
@@ -1,735 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-import json
-import random
-import string
-import unittest
-import datetime
-
-from selenium import webdriver
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support import expected_conditions as EC
-
-from helper.Authentication import AuthenticationHelper
-from helper.Bundle import BundleHelper
-from helper.Clinic import ClinicHelper, ClinicSelectors
-from helper.Navigation import NavigationHelper
-from helper.Question import QuestionHelper, QuestionErrorHelper, QuestionSelectors
-from helper.Questionnaire import QuestionnaireHelper
-from helper.Condition import ConditionHelper
-from helper.Score import ScoreHelper
-from helper.SeleniumUtils import SeleniumUtils
-from helper.Survey import SurveyHelper, SurveySelectors, SurveyAssertHelper
-from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
-from selenium.common.exceptions import TimeoutException
-
-
-class URLPaths:
-    ADMIN_INDEX = "/admin/index"
-    ADMIN_INDEX_DE = "/admin/index?lang=de_DE"
-    MOBILE_USER_LOGIN = "/mobile/user/login"
-    MOBILE_USER_LOGIN_DE = "/mobile/user/login?lang=de_DE"
-    MOBILE_SURVEY_INDEX = "/mobile/survey/index"
-    LOGIN_BAD_CREDENTIALS = "/mobile/user/login?message=BadCredentialsException"
-    LOGIN_DISABLED_EXCEPTION = "/mobile/user/login?message=DisabledException"
-    PASSWORD_FORGOT = "/mobile/user/password"
-
-
-class EmailSelectors:
-    SUBJECT_INPUT = (By.ID, "subject")
-    CONTENT_INPUT = (By.ID, "mailContent")
-    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
-    SEND_BUTTON = (By.ID, "mailButton")
-
-
-class PasswordResetSelectors:
-    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
-    USERNAME_INPUT = (By.ID, "username")
-    ERROR_MESSAGE = (By.CLASS_NAME, "error")
-
-
-class CustomTest(IMISeleniumChromeTest, unittest.TestCase):
-    seleniumMode: IMISeleniumBaseTest.SeleniumMode = IMISeleniumBaseTest.SeleniumMode.LOCAL
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.base_url = "localhost:8080"
-        cls.https_base_url = "http://localhost:8080"
-
-    def setUp(self):
-        # Initialize the WebDriver
-        self.driver = webdriver.Chrome()
-
-        # Initialize Navigation and Utils
-        self.navigation_helper = NavigationHelper(self.driver)
-        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
-        self.navigation_helper.utils = self.utils
-
-        # Initialize other helpers
-        self.authentication_helper = AuthenticationHelper(self.driver)
-        self.questionnaire_helper = QuestionnaireHelper(self.driver, self.navigation_helper)
-        self.question_helper = QuestionHelper(self.driver, self.navigation_helper)
-        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
-        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
-        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
-
-        self.condition_helper = ConditionHelper(self.driver, self.navigation_helper)
-        self.score_helper = ScoreHelper(self.driver, self.navigation_helper)
-        self.questionnaire_error_helper = QuestionErrorHelper(self.driver, self.navigation_helper)
-        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
-
-    def test_login_ad_admin(self):
-        # Arrange
-        if not self.secret.get('admin-username-ad') or not self.secret.get('admin-password-ad'):
-            self.skipTest("Admin login data is missing. Test skipped.")
-        self.driver.get(self.https_base_url)
-
-        # Act
-        self.authentication_helper.login(self.secret['admin-username-ad'], self.secret['admin-password-ad'])
-
-        # Assert - Verify login
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.ADMIN_INDEX)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Login failed: Expected URL '{self.https_base_url + URLPaths.ADMIN_INDEX}', but got '{current_url}'")
-
-        self.authentication_helper.logout()
-
-        # Assert - Verify logout
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
-
-    def test_login_local_admin(self):
-        # Arrange
-        if not self.secret.get('admin-username-local') or not self.secret.get('admin-password-ad'):
-            self.skipTest("Admin login data is missing. Test skipped.")
-        self.driver.get(self.https_base_url)
-
-        self.authentication_helper.login(self.secret['admin-username-local'], self.secret['admin-password-ad'])
-
-        # Assert - Verify login
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.ADMIN_INDEX)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Login failed: Expected URL '{self.https_base_url + URLPaths.ADMIN_INDEX}', but got '{current_url}'")
-
-        # Logout
-        self.authentication_helper.logout()
-
-        # Assert - Verify logout
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
-
-    def test_login_ad_user(self):
-        # Arrange
-        if not self.secret.get('user-username-ad') or not self.secret.get('user-password-ad'):
-            self.skipTest("User AD credentials missing. Test skipped.")
-        self.driver.get(self.https_base_url)
-
-        # Act
-        self.authentication_helper.login(self.secret['user-username-ad'], self.secret['user-password-ad'])
-
-        # Assert - Verify login
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Login failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX}', but got '{current_url}'")
-
-        # Logout
-        self.authentication_helper.logout()
-
-        # Assert - Verify logout
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
-
-    def test_login_local_user(self):
-        # Arrange
-        if not self.secret.get('user-username-local') or not self.secret.get('user-password-local'):
-            self.skipTest("Local user credentials missing. Test skipped.")
-        self.driver.get(self.https_base_url)
-
-        # Act
-        self.authentication_helper.login(self.secret['user-username-local'], self.secret['user-password-local'])
-
-        # Assert - Verify login
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Login failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_SURVEY_INDEX}', but got '{current_url}'")
-
-        # Logout
-        self.authentication_helper.logout()
-
-        # Assert - Verify logout
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(
-                f"Logout failed: Expected URL '{self.https_base_url + URLPaths.MOBILE_USER_LOGIN_DE}', but got '{current_url}'")
-
-    def test_login_unknown_user(self):
-        # Arrange
-        self.driver.get(self.https_base_url)
-
-        # Generate random login username and password
-        username = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
-        password = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
-
-        # Act
-        self.authentication_helper.login(username, password)
-
-        # Assert - Verify bad credentials URL
-        expected_url = self.https_base_url + URLPaths.LOGIN_BAD_CREDENTIALS
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(expected_url)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(f"URL mismatch. Expected '{expected_url}', got '{current_url}'")
-
-    def test_login_ad_user_wrong_password(self):
-        # Arrange
-        if not self.secret.get('user-username-local'):
-            self.skipTest("User login data is missing. Test skipped.")
-        self.driver.get(self.https_base_url)
-
-        # Generate random login password
-        username = self.secret['user-username-local']
-        password = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
-
-        # Act
-        self.authentication_helper.login(username, password)
-
-        # Check expected URL
-        expected_url = self.https_base_url + URLPaths.LOGIN_BAD_CREDENTIALS
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.url_to_be(expected_url)
-            )
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(f"URL mismatch. Expected part of URL '{expected_url}', but got '{current_url}'")
-
-    def test_login_local_user_wrong_password(self):
-        # Arrange
-        if not self.secret.get('user-username-local'):
-            self.skipTest("Local user login data is missing. Test skipped.")
-        self.driver.get(self.https_base_url)
-
-        # Generate random login password
-        username = self.secret['user-username-local']
-        password = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(7))
-
-        # Act
-        self.authentication_helper.login(username, password)
-
-        # Check expected URL
-        expected_url = self.https_base_url + URLPaths.LOGIN_BAD_CREDENTIALS
-        try:
-            WebDriverWait(self.driver, 10).until(EC.url_to_be(expected_url))
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(f"URL mismatch. Expected '{expected_url}', but got '{current_url}'")
-
-    def test_login_disabled_ad_user(self):
-        # Arrange
-        if not self.secret.get('user-username-disabled-ad') or not self.secret.get('user-password-disabled-ad'):
-            self.skipTest("Disabled user login data is missing. Test skipped.")
-        self.driver.get(self.https_base_url)
-        username = self.secret['user-username-disabled-ad']
-        password = self.secret['user-password-disabled-ad']
-
-        # Act
-        self.authentication_helper.login(username, password)
-
-        # Assert
-        expected_url = self.https_base_url + URLPaths.LOGIN_DISABLED_EXCEPTION
-        try:
-            WebDriverWait(self.driver, 10).until(EC.url_to_be(expected_url))
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(f"URL mismatch. Expected URL '{expected_url}', but got '{current_url}'")
-
-    def test_password_reset_unknown_user(self):
-        # Arrange
-        self.driver.get(self.https_base_url)
-
-        # Act
-        # Click on “Forgot your password?” Link
-        try:
-            forgot_password_link = WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(PasswordResetSelectors.FORGOT_PASSWORD_LINK)
-            )
-            forgot_password_link.click()
-        except TimeoutException:
-            self.fail("Failed to locate or click the 'Forgot your password?' link.")
-
-        # Assert - Verify navigation to password reset page
-        expected_url = self.https_base_url + URLPaths.PASSWORD_FORGOT
-        try:
-            WebDriverWait(self.driver, 10).until(EC.url_to_be(expected_url))
-        except TimeoutException:
-            current_url = self.driver.current_url
-            self.fail(f"URL mismatch: Expected '{expected_url}', but got '{current_url}'")
-
-        # Act - Input random username
-        random_username = ''.join(random.choice(string.ascii_lowercase) for _ in range(7))
-        try:
-            username_input = WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(PasswordResetSelectors.USERNAME_INPUT)
-            )
-            username_input.clear()
-            username_input.send_keys(random_username)
-            username_input.send_keys(Keys.ENTER)
-        except TimeoutException:
-            self.fail("Failed to locate or fill the username input field.")
-
-        # Assert - Verify error message
-        try:
-            error_message_element = WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(PasswordResetSelectors.ERROR_MESSAGE)
-            )
-            error_message_text = error_message_element.text.strip()
-            assert "Der Nutzername ist nicht vergeben oder es ist diesem keine E-Mail Adresse zugeordnet." in error_message_text, \
-                f"Error message mismatch. Expected text not found. Got: '{error_message_text}'"
-        except TimeoutException:
-            self.fail("Error message not displayed after entering invalid username.")
-
-    def test_rundmail(self):
-        # Arrange
-        self.driver.get(self.https_base_url)
-        self.authentication_helper.admin_login()
-
-        try:
-            self.navigation_helper.navigate_to_email_to_all_users()
-        except Exception as e:
-            self.fail(f"Failed to navigate to 'Email to All Users' page: {e}")
-
-        try:
-            # Act
-            # Input subject
-            self.utils.fill_text_field(EmailSelectors.SUBJECT_INPUT, "[MoPat3] Selenium Test")
-
-            # Input email content
-            email_content = (
-                "Sehr geehrte Damen und Herren,\n\n"
-                "diese E-Mail dient dem Test der Rundmailfunktion von MoPat3. "
-                "Diese E-Mail sollte an Nutzer mit identischer E-Mail Adresse nur genau einmal versandt werden. "
-                "Zusätzlich wird diese E-Mail an die konfigurierte Absenderadresse verschickt und sollte auch an diese Adresse nur genau einmal versandt werden.\n\n"
-                "Viele Grüße,\n\nMoPat3"
-            )
-            self.utils.fill_text_field(EmailSelectors.CONTENT_INPUT, email_content)
-
-            # Assert / Confirm the email sending
-            self.utils.click_element(EmailSelectors.SEND_BUTTON)
-        except TimeoutException as e:
-            self.fail(f"Test failed due to timeout: {e}")
-        except Exception as e:
-            self.fail(f"Unexpected error occurred: {e}")
-        finally:
-            # Logout to clean up
-            self.authentication_helper.logout()
-
-    def test_questionnaire_create_all_types(self):
-        # Arrange
-        questionnaire_name = f"Fragebogen alle Typen - Conditions - Scores - Bundles - Clinics {datetime.datetime.now()}"
-        description = questionnaire_name
-        language_code = "de_DE"
-        localized_display_name = questionnaire_name
-        self.driver.get(self.https_base_url)
-        self.authentication_helper.admin_login()
-
-        questionnaire_id = None
-        try:
-            # Act
-            # Navigate to 'Manage Questionnaires', add a new questionnaire, and fill in its name
-            self.navigation_helper.navigate_to_manage_questionnaires()
-            self.questionnaire_helper.click_add_questionnaire_button()
-            self.questionnaire_helper.fill_questionnaire_details(questionnaire_name, description, language_code,
-                                                                 localized_display_name)
-
-            # Save the questionnaire and extract its ID
-            self.questionnaire_helper.save_questionnaire_edit_question()
-            WebDriverWait(self.driver, 15).until(EC.url_contains("id="))
-            current_url = self.driver.current_url
-            questionnaire_id = current_url.split("id=")[1]
-
-            # Add all question types to the questionnaire
-            for add_question_method in self.question_helper.QUESTION_TYPES:
-                try:
-                    self.questionnaire_helper.click_add_question_button()
-                    add_question_method()
-                    self.question_helper.save_question()
-                except TimeoutException:
-                    self.fail(f"Failed to add a question of type {add_question_method.__name__}.")
-
-            # Assert
-            # Verify the correct number of questions were added
-            WebDriverWait(self.driver, 30).until(
-                EC.presence_of_element_located(QuestionSelectors.TABLE_QUESTION)
-            )
-            rows = self.utils.get_visible_table_rows(*QuestionSelectors.TABLE_QUESTION)
-            expected_count = len(self.question_helper.QUESTION_TYPES)
-            assert len(rows) == expected_count, f"Expected {expected_count} questions, found {len(rows)}."
-
-        finally:
-            # Cleanup
-            if questionnaire_id:
-                self.utils.search_and_delete_item(questionnaire_name, questionnaire_id, "questionnaire")
-            self.authentication_helper.logout()
-
-    def test_questionnaire_create_all_types_with_error(self):
-        # Arrange
-        questionnaire_id = None
-        questionnaire_name = f"Fragebogen alle Typen Selenium Test Mit Fehlertest {datetime.datetime.now()}"
-        questionnaire_description = "Dieser Fragebogen enthält alle bisher implementierten Fragetypen"
-        language_code = "de_DE"
-        questionnaire_display_name = questionnaire_name
-
-        # Login as Admin
-        self.driver.get(self.https_base_url)
-        self.authentication_helper.admin_login()
-
-        try:
-            # Act
-            # Create Questionnaire
-            self.navigation_helper.navigate_to_manage_questionnaires()
-            self.questionnaire_helper.click_add_questionnaire_button()
-            self.questionnaire_helper.fill_questionnaire_details(
-                questionnaire_name, questionnaire_description, language_code, questionnaire_display_name)
-            questionnaire_id = self.questionnaire_helper.save_questionnaire_edit_question()
-
-            # Define question-adding methods with error cases
-            question_methods = [
-                self.questionnaire_error_helper.add_question_info_text,
-                self.questionnaire_error_helper.add_question_multiple_choice,
-                self.questionnaire_error_helper.add_numeric_checkbox_with_failed_cases,
-                self.questionnaire_error_helper.add_question_slider_question,
-                self.questionnaire_error_helper.add_question_numeric_checkbox,
-                self.questionnaire_error_helper.add_question_numeric_checkbox_freetext,
-                self.questionnaire_error_helper.add_question_date_question,
-                self.questionnaire_error_helper.add_question_freetext,
-            ]
-
-            # Add Questions to questionnaire (all question types)
-            for add_question_method in question_methods:
-                try:
-                    self.questionnaire_helper.click_add_question_button()
-                    add_question_method()
-                    self.question_helper.save_question()
-                except Exception as e:
-                    self.fail(f"Failed to add question using method {add_question_method.__name__}: {e}")
-
-            # Assert
-            # Verify the correct number of questions are added
-            WebDriverWait(self.driver, 30).until(
-                EC.visibility_of_element_located(QuestionSelectors.TABLE_QUESTION)
-            )
-            WebDriverWait(self.driver, 30).until(
-                lambda driver: driver.execute_script("return document.readyState") == "complete"
-            )
-            rows = [
-                row for row in self.driver.find_element(*QuestionSelectors.TABLE_QUESTION)
-                .find_element(By.TAG_NAME, "tbody")
-                .find_elements(By.TAG_NAME, "tr") if row.is_displayed()
-            ]
-            assert len(rows) == len(
-                question_methods
-            ), f"Expected {len(question_methods)} questions, found {len(rows)}."
-
-        finally:
-            # Cleanup
-            if questionnaire_id:
-                self.utils.search_and_delete_item(questionnaire_name, questionnaire_id, "questionnaire")
-            self.authentication_helper.logout()
-
-    def test_complete_workflow(self):
-        # Arrange
-        timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
-        username_creator = "admin"
-        username_survey_executor = "user"
-
-        questionnaire = None
-        added_questions = []
-
-        bundle_id = None
-        bundle_name = f"Test Bundle {random.randint(1, 999999)}"
-
-        clinic_id = None
-        clinic_name = f"Test Klinik {timestamp}"
-        clinic_description = "Diese Klinik enthält das Fragebogenpaket \'Fragebogenpaket Alle Typen CBSC\'"
-        configurations = [
-            {'selector': ClinicSelectors.CONFIG_REGISTER_PATIENT_DATA,
-             'config_selector': SurveySelectors.RADIO_REGISTER},
-            {'selector': ClinicSelectors.CONFIG_USE_PATIENT_DATA_LOOKUP, 'dropdown_value': "patient lookup 1",
-             'config_selector': SurveySelectors.RADIO_SEARCH_HIS},
-            {'selector': ClinicSelectors.CONFIG_USE_PSEUDONYMIZATION_SERVICE, 'dropdown_value': "pseudonymization 1",
-             'config_selector': SurveySelectors.RADIO_PSEUDONYMIZATION}
-        ]
-
-        # Login as Admin
-        self.driver.get(self.https_base_url)
-        self.authentication_helper.admin_login(username=username_creator)
-
-        try:
-            # Act
-            # Step 1: Create Questionnaire with questions (all question types)
-            questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
-            added_questions = questionnaire['questions']
-
-            # Act
-            # Step 3: Add Bundle
-            self.navigation_helper.navigate_to_manage_bundles()
-            bundle_id = None
-            if not self.bundle_helper.bundle_exists(bundle_name):
-                self.bundle_helper.create_bundle(bundle_name, True,
-                                                 [{"id": questionnaire['id'], "name": questionnaire['name']}])
-                bundle_id = self.bundle_helper.save_bundle(bundle_name)
-            bundles = [{"id": bundle_id, "name": bundle_name}]
-
-            # Step 4: Add Clinic
-            self.navigation_helper.navigate_to_manage_clinics()
-            self.clinic_helper.create_clinic(clinic_name, clinic_description, configurations, bundles,
-                                             [username_creator, username_survey_executor])
-            clinic_id = self.clinic_helper.save_clinic(clinic_name)
-
-        finally:
-            # Logout
-            try:
-                self.authentication_helper.logout()
-            except Exception as e:
-                print(f"Logout failed: {e}")
-
-        # Step 5: Execute survey
-
-        # Arrange
-        case_number = "55755388"
-        language_value = QuestionnaireHelper.DEFAULT_LANGUAGE_CODE
-        welcome_text = QuestionnaireHelper.DEFAULT_LOCALIZED_WELCOME_TEXT
-
-        # Login as User
-        self.driver.get(self.https_base_url)
-        self.authentication_helper.user_login(username=username_survey_executor)
-
-        try:
-            # Act
-            self.survey_helper.start_survey(configurations[0], clinic_name, case_number)
-            self.survey_helper.proceed_to_bundle_selection(bundle_name, language_value)
-            self.survey_helper.click_next_button()
-            # Assert
-            self.survey_assert_helper.assertion_for_welcome_text(welcome_text)
-            # Act
-            self.survey_helper.click_next_button()
-
-            for question in added_questions:
-                self.survey_assert_helper.assertion_for_question_title(question)
-                if question["type"] == QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE:
-                    self.survey_helper.answer_multiple_choice_question(question)
-                elif question["type"] == QuestionSelectors.QuestionTypes.SLIDER:
-                    self.survey_helper.answer_slider_question(question)
-                elif question["type"] == QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX:
-                    self.survey_helper.answer_number_checkbox_question(question)
-                elif question["type"] == QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX_TEXT:
-                    self.survey_helper.answer_number_checkbox_text_question(question)
-                elif question["type"] == QuestionSelectors.QuestionTypes.FREE_TEXT:
-                    self.survey_helper.answer_text_question()
-                elif question["type"] == QuestionSelectors.QuestionTypes.DATE:
-                    self.survey_helper.answer_date_question(question)
-                elif question["type"] == QuestionSelectors.QuestionTypes.DROP_DOWN:
-                    self.survey_helper.select_dropdown_option(question)
-                elif question["type"] == QuestionSelectors.QuestionTypes.NUMBER_INPUT:
-                    self.survey_helper.answer_numbered_input_question(question)
-
-                self.survey_helper.click_next_button()
-
-            # Complete the survey
-            self.survey_helper.complete_survey()
-            # End survey
-            self.survey_helper.end_survey()
-
-        finally:
-            # Cleanup (teardown)
-            # Logout
-            try:
-                self.authentication_helper.logout()
-            except Exception as e:
-                print(f"Logout failed: {e}")
-
-    # TODO [] complete creation of the test 'test_TestCase_Questionnaire_Create_and_Remove_All_Types_with_Bundle_Clinic_Conditions'
-    def test_case_questionnaire_create_and_remove_all_Types_with_Bundle_Clinic_Conditions(self):
-
-        # Arrange
-        timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
-        username_creator = "admin"
-        username_survey_executor = "user"
-
-        questionnaire_id = None
-        questionnaire_name = f"Fragebogen - Alle Fragetypen - Conditions - Scores - Bundles - Clinics {timestamp}"
-        questionnaire_description = "Dieser Fragebogen enthält sämtliche derzeit verfügbaren Fragetypen und dient der vollständigen Funktionsprüfung."
-        questionnaire_language_code = "de_DE"
-        questionnaire_welcome_text = 'Willkommen! Dieser Fragebogen ist ein Testbogen. Sie können alle Fragetypen ausprobieren.'
-        questionnaire_final_text = 'Vielen Dank für Ihre Teilnahme! Dieser Text erscheint am Ende des Fragebogens.'
-        questionnaire_display_name = questionnaire_name
-        added_questions = []
-
-        bundle_id = None
-        bundle_name = f"Fragebogenpaket Fragebogen Alle Fragetypen - Conditions - Scores - Bundles - Clinics {random.randint(1, 999999)}"
-
-        clinic_id = None
-        clinic_name = f"Testklinik für Fragebogenpaket {timestamp}"
-        clinic_description = 'Diese Klinik enthält das Fragebogenpaket "Fragebogenpaket Fragebogen Alle Fragetypen ...", um verschiedene Konfigurationsmöglichkeiten und Szenarien zu testen.'
-        configurations = [
-            {'selector': ClinicSelectors.CONFIG_REGISTER_PATIENT_DATA,
-             'config_selector': SurveySelectors.RADIO_REGISTER},
-            {'selector': ClinicSelectors.CONFIG_USE_PATIENT_DATA_LOOKUP, 'dropdown_value': "patient lookup 1",
-             'config_selector': SurveySelectors.RADIO_SEARCH_HIS},
-            {'selector': ClinicSelectors.CONFIG_USE_PSEUDONYMIZATION_SERVICE, 'dropdown_value': "pseudonymization 1",
-             'config_selector': SurveySelectors.RADIO_PSEUDONYMIZATION}
-        ]
-
-        # Login as Admin
-        self.driver.get(self.https_base_url)
-        self.authentication_helper.admin_login(username=username_creator)
-
-        try:
-            # Step 1: Create Questionnaire
-            # Act
-            self.navigation_helper.navigate_to_manage_questionnaires()
-            self.questionnaire_helper.click_add_questionnaire_button()
-            self.questionnaire_helper.fill_questionnaire_details(questionnaire_name, questionnaire_description,
-                                                                 questionnaire_language_code,
-                                                                 questionnaire_display_name,
-                                                                 questionnaire_welcome_text,
-                                                                 questionnaire_final_text)
-            questionnaire_id = self.questionnaire_helper.save_questionnaire_edit_question()
-            questionnaires = [{"id": questionnaire_id, "name": questionnaire_name}]
-
-            # Step 2: Add Questions to questionnaire (all question types)
-            for add_question_method in self.question_helper.QUESTION_TYPES:
-                self.questionnaire_helper.click_add_question_button()
-                question_info = add_question_method()
-                added_questions.append(question_info)
-                self.question_helper.save_question()
-            # Assert
-            # Verify the number of questions added
-            self.questionnaire_error_helper.verify_number_of_questions(len(self.question_helper.QUESTION_TYPES))
-
-            # Step 3: Add Bundle
-            # Act
-            self.navigation_helper.navigate_to_manage_bundles()
-            bundle_id = None
-            if not self.bundle_helper.bundle_exists(bundle_name):
-                self.bundle_helper.create_bundle(bundle_name, True, questionnaires)
-                bundle_id = self.bundle_helper.save_bundle(bundle_name)
-            bundles = [{"id": bundle_id, "name": bundle_name}]
-
-            # Step 4: Add Clinic
-            self.navigation_helper.navigate_to_manage_clinics()
-            self.clinic_helper.create_clinic(clinic_name, clinic_description, configurations, bundles,
-                                             [username_creator, username_survey_executor])
-            clinic_id = self.clinic_helper.save_clinic(clinic_name)
-
-            # Step 5: Add Conditions
-            self.navigation_helper.navigate_to_questions_of_questionnaire(questionnaire_id, questionnaire_name)
-            for question in added_questions:
-                if question['type'] == QuestionSelectors.QuestionTypes.MULTIPLE_CHOICE:
-                    self.condition_helper.add_condition_for_multiple_choice(question['id'])
-                    self.condition_helper.navigate_back_to_questionnaire()
-                elif question['type'] == QuestionSelectors.QuestionTypes.SLIDER:
-                    self.condition_helper.add_condition_for_slider(question)
-                    self.condition_helper.navigate_back_to_questionnaire()
-                elif question['type'] == QuestionSelectors.QuestionTypes.NUMBER_INPUT:
-                    self.condition_helper.add_condition_for_number_input(question['id'])
-                    self.condition_helper.navigate_back_to_questionnaire()
-                elif question['type'] == QuestionSelectors.QuestionTypes.DROP_DOWN:
-                    self.condition_helper.add_condition_for_drop_down(question['id'])
-                    self.condition_helper.navigate_back_to_questionnaire()
-                elif question['type'] == QuestionSelectors.QuestionTypes.NUMBER_CHECKBOX:
-                    self.condition_helper.add_condition_for_numbered_checkbox(question)
-                    self.condition_helper.navigate_back_to_questionnaire()
-
-            # Step 6: Add Scores
-            # TODO [] implement methods
-            # self.score_helper.add_score_to_questionnaire()
-
-        finally:
-            # Cleanup (teardown): Logout and clean up created test data (questionnaire, bundle, clinic)
-            # Delete clinic
-            try:
-                if clinic_id:
-                    self.utils.search_and_delete_item(clinic_name, clinic_id, "clinic")
-            except Exception as e:
-                print(f"Cleanup failed for clinic '{clinic_name}': {e}")
-            # Delete bundle
-            try:
-                if bundle_id:
-                    self.utils.search_and_delete_item(bundle_name, bundle_id, "bundle")
-            except Exception as e:
-                print(f"Cleanup failed for bundle '{bundle_name}': {e}")
-            # Delete questionnaire
-            try:
-                if questionnaire_id:
-                    self.utils.search_and_delete_item(questionnaire_name, questionnaire_id, "questionnaire")
-            except Exception as e:
-                print(f"Cleanup failed for questionnaire '{questionnaire_name}': {e}")
-            # Logout
-            try:
-                self.authentication_helper.logout()
-            except Exception as e:
-                print(f"Logout failed: {e}")
-
-    # TODO [] complete creation of the test 'test_TestCase_Questionnaire_All_Types_with_Bundle_Clinic_Conditions_Create_and_Remove_Scores'
-    def test_case_questionnaire_all_types_with_bundle_clinic_conditions_create_and_remove_scores(self):
-        pass
-
-
-    def tearDown(self):
-        if self.driver:
-            self.driver.quit()
-
-
-if __name__ == "__main__":
-    unittest.main()
\ No newline at end of file
diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index 722cd304..44e2a2d1 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -13,7 +13,18 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
+
+from helper.Authentication import AuthenticationHelper, AuthenticationAssertHelper
+from helper.Bundle import BundleHelper
+from helper.Clinic import ClinicHelper
+from helper.Condition import ConditionHelper, ConditionSelectors, ConditionAssertHelper
 from helper.Login import LoginHelper
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper, QuestionAssertHelper, QuestionType
+from helper.Questionnaire import QuestionnaireHelper, QuestionnaireAssertHelper
+from helper.Score import ScoreHelper, ScoreAssertHelper
+from helper.SeleniumUtils import SeleniumUtils
+from helper.Survey import SurveyHelper, SurveyAssertHelper
 
 loginHelper = LoginHelper()
 
@@ -117,6 +128,29 @@ def _setLocalDriver(self, directory):
 
 
 class CustomTest(IMISeleniumBaseTest):
+
+    def setUp(self):
+        super().setUp()
+
+        self.navigation_helper = NavigationHelper(self.driver)
+        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
+        self.navigation_helper.utils = self.utils
+
+        self.authentication_helper = AuthenticationHelper(self.driver)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver, self.navigation_helper)
+        self.question_helper = QuestionHelper(self.driver, self.navigation_helper)
+        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
+        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
+        self.condition_helper = ConditionHelper(self.driver, self.navigation_helper)
+        self.score_helper = ScoreHelper(self.driver, self.navigation_helper)
+        self.question_assert_helper = QuestionAssertHelper(self.driver, self.navigation_helper)
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
+        self.authentication_assert_helper = AuthenticationAssertHelper(self.driver)
+        self.questionnaire_assert_helper = QuestionnaireAssertHelper(self.driver, self.navigation_helper)
+        self.score_assert_helper = ScoreAssertHelper(self.driver, self.navigation_helper)
+        self.condition_assert_helper = ConditionAssertHelper(self.driver, self.navigation_helper)
+
     def test_login_admin(self):
         if(self.secret['admin-username']!='' and self.secret['admin-password']!=''):
             self.driver.get(self.https_base_url)
@@ -132,7 +166,75 @@ def test_login_admin(self):
             assert True
         else:
             pass
-    
+
+    def test_admin_interface_tests(self):
+        self.driver.get(self.https_base_url)
+        # a
+        self.authentication_assert_helper.assert_mobile_user_login()
+        # b
+        self.authentication_assert_helper.assert_mobile_user_password()
+
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        # c
+        self.authentication_assert_helper.assert_admin_index()
+        #
+        self.navigation_helper.navigate_to_manage_questionnaires()
+        # d
+        self.questionnaire_assert_helper.assert_questionnaire_list()
+        self.questionnaire_helper.click_add_questionnaire_button()
+        # e
+        questionnaire = self.questionnaire_assert_helper.assert_questionnaire_fill_page()
+
+        # f
+        self.navigation_helper.search_and_open_questionnaire(questionnaire['name'])
+        self.questionnaire_helper.save_questionnaire_edit_question()
+        self.questionnaire_helper.click_add_question_button()
+        self.question_assert_helper.assert_question_fill_page()
+        # f (question types)
+        # TODO [LJ] implement for all types
+        question_list = list()
+        excluded_question_types = {QuestionType.IMAGE}
+        question_types = [question_type for question_type in QuestionType if
+                          question_type not in excluded_question_types]
+        for question_type in question_types:
+            self.questionnaire_helper.click_add_question_button()
+            question_by_type = self.question_assert_helper.assert_question_by_type(question_type)
+            question_list.append(question_by_type)
+
+        # g
+        self.question_assert_helper.assert_question_table_functionality(len(question_list))
+
+        # h
+        self.navigation_helper.navigate_to_scores_of_questionnaire(questionnaire['id'], questionnaire['name'])
+        self.score_assert_helper.assert_scores_list()
+
+        # i
+        self.navigation_helper.navigate_to_scores_of_questionnaire(questionnaire['id'], questionnaire['name'])
+        self.score_assert_helper.assert_score_fill()
+
+        # j
+        source_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(
+            question_types={QuestionType.SLIDER, QuestionType.MULTIPLE_CHOICE, QuestionType.DROP_DOWN})
+        target_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(
+            question_types={QuestionType.INFO_TEXT})
+        bundle = self.bundle_helper.create_bundle(questionnaires=[source_questionnaire, target_questionnaire])
+
+        source_questionnaire_slider_question = next((question for question in source_questionnaire['questions'] if question['type'] == QuestionType.SLIDER), None)
+
+        self.navigation_helper.navigate_to_questions_of_questionnaire(source_questionnaire['id'], source_questionnaire['name'])
+        self.question_helper.reorder_question(source_questionnaire_slider_question['id'], 0)
+
+        # Adding conditions to the slider question
+        self.condition_helper.open_conditions_of_question(source_questionnaire_slider_question['id'])
+
+        self.condition_helper.add_condition_for_slider(threshold_steps=1, target_type=ConditionSelectors.TargetType.QUESTION)
+        self.condition_helper.add_condition_for_slider(threshold_steps=2, target_type=ConditionSelectors.TargetType.ANSWER)
+        self.condition_helper.add_condition_for_slider(threshold_steps=3, target_type=ConditionSelectors.TargetType.QUESTIONNAIRE)
+
+        self.condition_assert_helper.assert_question_condition_list_de()
+
     def tearDown(self): 
         self.driver.quit()
 

From 9ebae50f7d73ab907f5198b2640b9344ad9fe576 Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Fri, 24 Jan 2025 10:12:38 +0100
Subject: [PATCH 07/20] Refactor ConditionHelper and ConditionAssertHelper

- Unified  methods for triggered and threshold-based questions.
- Added  using  IDs.
- Improved  for empty table handling.
- Enhanced  for question types.
- Added IDs to  elements in condition tables for better referencing.
---
 selenium/helper/Condition.py                  | 310 ++++++++++++------
 .../WEB-INF/condition/listQuestion.html       |   6 +-
 2 files changed, 215 insertions(+), 101 deletions(-)

diff --git a/selenium/helper/Condition.py b/selenium/helper/Condition.py
index 685b35ba..054e52b8 100644
--- a/selenium/helper/Condition.py
+++ b/selenium/helper/Condition.py
@@ -1,9 +1,10 @@
 from selenium.common import NoSuchElementException, TimeoutException
-from selenium.webdriver import Keys
+from selenium.webdriver import Keys, ActionChains
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.wait import WebDriverWait
 
+from helper.Question import QuestionType
 from helper.Questionnaire import QuestionnaireHelper
 from helper.SeleniumUtils import DropdownMethod
 
@@ -12,7 +13,9 @@ class ConditionSelectors:
     BUTTON_ADD_CONDITION = (By.ID, 'addCondition')
     BUTTON_ADD_TARGET = (By.ID, 'addTargetButton')
     BUTTON_SAVE_CONDITION = (By.ID, 'saveCondition')
+    BUTTON_CANCEL = (By.ID, "cancelButton")
     BUTTON_BACK_TO_QUESTIONNAIRE = (By.ID, 'backToQuestionnaire')
+    BUTTON_DELETE_CONDITION = lambda condition_id : (By.XPATH, f"//a[contains(@href, 'remove?id={condition_id}')]")
 
     DROPDOWN_TRIGGER = (By.ID, "triggerId")
     DROPDOWN_QUESTION = (By.ID, 'questionDropDown0')
@@ -22,6 +25,7 @@ class ConditionSelectors:
     TABLE_CONDITIONS_QUESTION = (By.ID, "DataTables_Table_0")
     TABLE_CONDITIONS_ANSWER = (By.ID, "DataTables_Table_1")
     TABLE_CONDITIONS_QUESTIONNAIRE = (By.ID, "DataTables_Table_2")
+    TABLE_LAST_ROW = (By.XPATH, "//tbody/tr[last()]")
 
     # Search input fields for each table
     SEARCH_INPUT_CONDITIONS_QUESTION = (By.CSS_SELECTOR, "#DataTables_Table_0_filter input")
@@ -91,18 +95,16 @@ def set_target_and_action(self, target_class, target_option_index, answer_target
 
         self.utils.select_dropdown(ConditionSelectors.DROPDOWN_ACTION, action, DropdownMethod.VALUE)
 
-    def add_condition_for_multiple_choice(self, question_id, trigger_index=0,
-                                          target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
-                                          answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
+    def add_condition_for_triggered_questions(self, trigger_index=0,
+                                              target_type=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+                                              answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
         """
-        :param question_id: The ID of the question to which the condition is being added.
-        :param trigger_index: The index of the trigger option in the dropdown (default is 0, which means no trigger is selected).
-        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
-        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
-        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
+        :param trigger_index: The index of the trigger option in the dropdown (default is 0).
+        :param target_type: The target type for the condition (e.g., 'QUESTION', 'ANSWER').
+        :param target_option_index: The index of the target question/answer in the dropdown.
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER'.
         :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
         """
-        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
         self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
 
         # Set the trigger option
@@ -111,20 +113,25 @@ def add_condition_for_multiple_choice(self, question_id, trigger_index=0,
             self.utils.handle_popup_alert(True)
 
         # Set the target and action
-        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+        self.set_target_and_action(target_type, target_option_index, answer_target_index, action)
 
         # Save the condition
         self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
 
-    def add_condition_for_slider(self, threshold_type=ConditionSelectors.ThresholdType.BIGGER_THAN_EQUALS,
-                                 threshold_steps=1, target_type=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
-                                 answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
+        return self.get_last_added_condition_id(target_type)
+
+
+    def add_condition_for_threshold_questions(self, threshold_type=ConditionSelectors.ThresholdType.EQUALS,
+                                              threshold_steps=1, target_type=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
+                                              answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
         """
-        :param threshold_type: The type of threshold to use (e.g., 'BIGGER_THAN_EQUALS').
+        Adds a condition for threshold-based question types like Slider, Number Input, and Number Checkbox.
+
+        :param threshold_type: The type of threshold to use (e.g., 'EQUALS').
         :param threshold_steps: The number of arrow-up key presses to set the threshold value.
-        :param target_type: The type of the target (e.g., 'ANSWER' or 'QUESTION').
-        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
-        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
+        :param target_type: The target type for the condition (e.g., 'QUESTION', 'ANSWER').
+        :param target_option_index: The index of the target question/answer in the dropdown.
+        :param answer_target_index: The index of the answer target if the target class is 'ANSWER'.
         :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
         """
         self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
@@ -147,104 +154,97 @@ def add_condition_for_slider(self, threshold_type=ConditionSelectors.ThresholdTy
         # Save the condition
         self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
 
-    def add_condition_for_number_input(self, question_id, threshold_type=ConditionSelectors.ThresholdType.EQUALS,
-                                       target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
-                                       answer_target_index=2, action=ConditionSelectors.ActionType.DISABLE):
+        return self.get_last_added_condition_id(target_type)
+
+
+    def add_basic_condition_based_on_question_type(self, target_type, question):
         """
-        :param question_id: The ID of the question to which the condition is being added.
-        :param threshold_type: The type of threshold to use (e.g., 'EQUALS').
-        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
-        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
-        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 2).
-        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        :param target_type: The target type for the condition ('QUESTION', 'ANSWER', 'QUESTIONNAIRE').
+        :param question: The question details as a dictionary.
         """
+        if question['type'] in [QuestionType.SLIDER, QuestionType.NUMBER_INPUT, QuestionType.NUMBER_CHECKBOX]:
+            return self.add_condition_for_threshold_questions(target_type=target_type)
+        elif question['type'] in [QuestionType.DROP_DOWN, QuestionType.MULTIPLE_CHOICE]:
+            return self.add_condition_for_triggered_questions(target_type=target_type)
+        else:
+            raise ValueError(f"Unsupported QuestionType: {question['type']}")
+
+    def navigate_back_to_questions_of_questionnaire(self):
+        try:
+            back_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
+                ConditionSelectors.BUTTON_BACK_TO_QUESTIONNAIRE))
+            back_button.click()
+        except TimeoutException:
+            print("Failed to find the 'Back to Questionnaire' button.")
+
+    def open_conditions_of_question(self, question_id):
         self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
-        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
 
-        # Set the threshold type and value
-        self.utils.select_dropdown(ConditionSelectors.THRESHOLD_TYPE, threshold_type, DropdownMethod.VALUE)
-        if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
-            self.utils.handle_popup_alert(True)
+    def click_add_condition(self):
+        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
 
-        threshold_input = self.driver.find_element(*ConditionSelectors.INPUT_THRESHOLD)
-        threshold_input.click()
-        threshold_input.send_keys(Keys.ARROW_UP)
-        self.utils.handle_popup_alert(True)
+    def cancel_condition_editing(self):
+        self.utils.click_element(ConditionSelectors.BUTTON_CANCEL)
 
-        # Set the target and action
-        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+    def get_last_added_condition_id(self, target_type):
+        """
+        Retrieves the ID of the most recently added condition from the appropriate table.
 
-        # Save the condition
-        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
+        :param target_type: The target type of the condition (e.g., 'QUESTION', 'ANSWER', 'QUESTIONNAIRE').
+        :return: The ID of the last condition as a string.
+        :raises ValueError: If the target type is unsupported.
+        :raises Exception: If the ID cannot be found.
+        """
+        # Map the target type to the corresponding table selector
+        if target_type == ConditionSelectors.TargetType.QUESTION:
+            target_table_selector = ConditionSelectors.TABLE_CONDITIONS_QUESTION
+        elif target_type == ConditionSelectors.TargetType.ANSWER:
+            target_table_selector = ConditionSelectors.TABLE_CONDITIONS_ANSWER
+        elif target_type == ConditionSelectors.TargetType.QUESTIONNAIRE:
+            target_table_selector = ConditionSelectors.TABLE_CONDITIONS_QUESTIONNAIRE
+        else:
+            raise ValueError(f"Unsupported TargetType: {target_type}")
 
+        # Wait for the table to be present
+        WebDriverWait(self.driver, 30).until(EC.presence_of_element_located(target_table_selector))
 
-    def add_condition_for_numbered_checkbox(self, question, threshold_type=ConditionSelectors.ThresholdType.BIGGER_THAN_EQUALS,
-                                 target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
-                                 answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
-        """
-        :param question: A dictionary containing question details (must include 'id').
-        :param threshold_type: The type of threshold to use (e.g., 'BIGGER_THAN_EQUALS').
-        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
-        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
-        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
-        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
-        """
-        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question['id'])).click()
-        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
+        # Locate the last row in the table
+        table = self.driver.find_element(*target_table_selector)
+        last_row = table.find_element(*ConditionSelectors.TABLE_LAST_ROW)
 
-        # Set the threshold type and value
-        self.utils.select_dropdown(ConditionSelectors.THRESHOLD_TYPE, threshold_type, DropdownMethod.VALUE)
-        if threshold_type != ConditionSelectors.ThresholdType.SMALLER_THAN:
-            self.utils.handle_popup_alert(True)
+        # Extract the ID from the last row
+        condition_id = last_row.get_attribute("id")
 
-        # Increment the threshold value using the arrow key
-        threshold_input = self.driver.find_element(*ConditionSelectors.INPUT_THRESHOLD)
-        threshold_input.click()
-        threshold_input.send_keys(Keys.ARROW_UP)
-        self.utils.handle_popup_alert(True)
+        # Ensure the ID is found
+        if not condition_id:
+            raise Exception("The ID of the last condition could not be found.")
 
-        # Set the target and action
-        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
+        return condition_id
 
-        # Save the condition
-        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
 
-    def add_condition_for_drop_down(self, question_id, trigger_index=1,
-                                    target_class=ConditionSelectors.TargetType.QUESTION, target_option_index=0,
-                                    answer_target_index=0, action=ConditionSelectors.ActionType.DISABLE):
+    def delete_condition(self, condition_id, questionnaire=None, question_id=None):
         """
-        :param question_id: The ID of the question to which the condition is being added.
-        :param trigger_index: The index of the trigger option in the dropdown (default is 1).
-        :param target_class: The type of the target (e.g., 'ANSWER' or 'QUESTION').
-        :param target_option_index: The index of the target question/answer in the dropdown (default is 0, which means no target is selected).
-        :param answer_target_index: The index of the answer target if the target class is 'ANSWER' (default is 0).
-        :param action: The action to perform (e.g., 'DISABLE' or 'ENABLE').
+        :param condition_id: The ID of the condition to delete.
+        :param questionnaire: The questionnaire containing the condition (optional).
+        :param question_id: The question associated with the condition (optional).
         """
-        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
-        self.driver.find_element(*ConditionSelectors.BUTTON_ADD_CONDITION).click()
-
-        # Set the trigger option
-        if trigger_index > 0:
-            self.utils.select_dropdown(ConditionSelectors.DROPDOWN_TRIGGER, trigger_index, DropdownMethod.INDEX)
-            self.utils.handle_popup_alert(True)
-
-        # Set the target and action
-        self.set_target_and_action(target_class, target_option_index, answer_target_index, action)
-
-        # Save the condition
-        self.driver.find_element(*ConditionSelectors.BUTTON_SAVE_CONDITION).click()
-
-    def navigate_back_to_questionnaire(self):
         try:
-            back_button = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
-                ConditionSelectors.BUTTON_BACK_TO_QUESTIONNAIRE))
-            back_button.click()
-        except TimeoutException:
-            print("Failed to find the 'Back to Questionnaire' button.")
+            # Navigate to the questionnaire if provided
+            if questionnaire:
+                self.navigation_helper.navigate_to_questions_of_questionnaire(questionnaire['id'], questionnaire['name'])
 
-    def open_conditions_of_question(self, question_id):
-        self.driver.find_element(*ConditionSelectors.CONDITION_LINK(question_id)).click()
+            # Open the conditions of the specified question if provided
+            if question_id:
+                self.open_conditions_of_question(question_id)
 
+            # Locate and click the delete button for the condition
+            delete_button = WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(ConditionSelectors.BUTTON_DELETE_CONDITION(condition_id))
+            )
+            delete_button.click()
+
+        except Exception as e:
+            raise AssertionError(f"Error deleting condition with ID {condition_id}: {e}")
 
 class ConditionAssertHelper(ConditionHelper):
 
@@ -284,7 +284,7 @@ def assert_search_functionality(self, search_input_selector, table_selector, con
         except Exception as e:
             raise AssertionError(f"Error asserting search functionality: {e}")
 
-    def assert_question_condition_list_de(self):
+    def assert_condition_list_and_search_de(self):
 
         # Assert that the sections are displayed
         try:
@@ -318,4 +318,118 @@ def assert_question_condition_list_de(self):
             ConditionSelectors.SEARCH_INPUT_CONDITIONS_QUESTION,
             ConditionSelectors.TABLE_CONDITIONS_QUESTION,
             "Die Frage"
+        )
+
+
+    def assert_add_condition_page(self, questionnaire):
+
+        questions = questionnaire['questions']
+        number_of_questions = len(questions)
+
+        info_text_question = next((question for question in questions if question['type'] == QuestionType.INFO_TEXT), None)
+
+        if not info_text_question:
+            self.click_add_question_button()
+            info_text_question = self.question_helper.add_question_by_type_default_value(QuestionType.INFO_TEXT)
+            info_text_question['id'] = self.question_helper.save_question()
+            number_of_questions += 1
+
+        self.reorder_question(info_text_question['id'], number_of_questions-1)
+
+        try:
+            for question in questions:
+                if question['type'] not in [QuestionType.SLIDER, QuestionType.MULTIPLE_CHOICE, QuestionType.NUMBER_CHECKBOX, QuestionType.DROP_DOWN, QuestionType.NUMBER_INPUT]:
+                    continue
+                # Open the 'Add Condition' page
+                self.open_conditions_of_question(question['id'])
+                self.click_add_condition()
+                # Validate the inputs for adding a condition
+                self.validate_condition_inputs(question)
+                self.cancel_condition_editing()
+                self.navigate_back_to_questions_of_questionnaire()
+
+            question = next((question for question in questions if question['type'] in [QuestionType.SLIDER, QuestionType.MULTIPLE_CHOICE, QuestionType.NUMBER_CHECKBOX, QuestionType.DROP_DOWN, QuestionType.NUMBER_INPUT]),None)
+            self.open_conditions_of_question(question['id'])
+
+            target_type_question = ConditionSelectors.TargetType.QUESTION
+            # Assert no conditions are initially present in the table
+            self.assert_condition_count(target_type_question, expected_count=0)
+
+            condition_id = self.add_basic_condition_based_on_question_type(target_type_question, question)
+
+            # Assert the condition is successfully created and added to the table
+            self.assert_condition_count(target_type_question, expected_count=1)
+
+            self.delete_condition(condition_id)
+
+        except Exception as e:
+            raise AssertionError(f"Error in assert_condition_addCondition_page: {e}")
+
+    def validate_condition_inputs(self, question):
+        """
+        :param question: A dictionary containing the details of the question.
+        :raises AssertionError: If any expected input is not displayed.
+        """
+        try:
+            # Common inputs for all question types
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(ConditionSelectors.DROPDOWN_TARGET_CLASS))
+            assert self.driver.find_element(
+                *ConditionSelectors.DROPDOWN_TARGET_CLASS).is_displayed(), "Target class dropdown is not displayed."
+            WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(ConditionSelectors.DROPDOWN_ACTION))
+            assert self.driver.find_element(
+                *ConditionSelectors.DROPDOWN_ACTION).is_displayed(), "Action dropdown is not displayed."
+
+            # Specific inputs based on question type
+            if question['type'] in [QuestionType.SLIDER, QuestionType.NUMBER_CHECKBOX, QuestionType.NUMBER_INPUT]:
+                WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(ConditionSelectors.THRESHOLD_TYPE))
+                assert self.driver.find_element(
+                    *ConditionSelectors.THRESHOLD_TYPE).is_displayed(), "Threshold type dropdown is not displayed."
+                WebDriverWait(self.driver, 10).until(EC.presence_of_element_located(ConditionSelectors.INPUT_THRESHOLD))
+                assert self.driver.find_element(
+                    *ConditionSelectors.INPUT_THRESHOLD).is_displayed(), "Threshold input is not displayed."
+
+            elif question['type'] in [QuestionType.MULTIPLE_CHOICE, QuestionType.DROP_DOWN]:
+                WebDriverWait(self.driver, 10).until(
+                    EC.presence_of_element_located(ConditionSelectors.DROPDOWN_TRIGGER))
+                assert self.driver.find_element(
+                    *ConditionSelectors.DROPDOWN_TRIGGER).is_displayed(), "Trigger dropdown is not displayed."
+
+            else:
+                raise ValueError(f"Unsupported QuestionType: {question['type']}")
+
+        except Exception as e:
+            raise AssertionError(f"Error validating condition inputs for question type '{question['type']}': {e}")
+
+    def assert_condition_count(self, target_type, expected_count):
+        """
+        Asserts the number of conditions in the table matches the expected count.
+
+        :param target_type: The target type for the condition (e.g., 'QUESTION', 'ANSWER', 'QUESTIONNAIRE').
+        :param expected_count: The expected number of conditions in the table.
+        """
+        # Determine the table selector based on the target type
+        if target_type == ConditionSelectors.TargetType.QUESTION:
+            table_selector = ConditionSelectors.TABLE_CONDITIONS_QUESTION
+        elif target_type == ConditionSelectors.TargetType.ANSWER:
+            table_selector = ConditionSelectors.TABLE_CONDITIONS_ANSWER
+        else:
+            table_selector = ConditionSelectors.TABLE_CONDITIONS_QUESTIONNAIRE
+
+        # Wait for the table to be present
+        table = WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(table_selector)
+        )
+
+        # Find all rows with an `id` attribute in the table
+        rows_with_id = table.find_elements(By.XPATH, ".//tbody/tr[@id]")
+
+        # Check if the number of rows with an `id` matches the expected count
+        if not rows_with_id and expected_count == 0:
+            # Special case: Table is empty, and no conditions are expected
+            return
+
+        # Assert the count of rows with an `id`
+        assert len(rows_with_id) == expected_count, (
+            f"Expected {expected_count} conditions, but found {len(rows_with_id)}."
         )
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/condition/listQuestion.html b/src/main/webapp/WEB-INF/condition/listQuestion.html
index 983d35a5..f49bff9f 100644
--- a/src/main/webapp/WEB-INF/condition/listQuestion.html
+++ b/src/main/webapp/WEB-INF/condition/listQuestion.html
@@ -44,7 +44,7 @@
 							<th:block
 								th:if="${answerCondition.targetClass eq 'de.imi.mopat.model.Question'}"
 							>
-								<tr>
+								<tr th:id="${answerCondition.id}">
 									<td>
 										<a
 											class="link"
@@ -188,7 +188,7 @@
 							<th:block
 								th:if="${answerCondition.targetClass eq 'de.imi.mopat.model.SelectAnswer'}"
 							>
-								<tr>
+								<tr th:id="${answerCondition.id}">
 									<td>
 										<a
 											class="link"
@@ -343,7 +343,7 @@
 							<th:block
 								th:if="${answerCondition.targetClass eq 'de.imi.mopat.model.Questionnaire'}"
 							>
-								<tr>
+								<tr th:id="${answerCondition.id}">
 									<td>
 										<a
 											class="link"

From 185020928ad8bb9b10bddb1a53fe6606180c4325 Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Fri, 24 Jan 2025 10:19:43 +0100
Subject: [PATCH 08/20] Move and refine `reorder_question` to
 QuestionnaireHelper

- Added page refresh to ensure UI updates, e.g., condition creation button visibility.
- Improved validation after drag-and-drop operations.
---
 selenium/helper/Question.py      | 23 -----------------------
 selenium/helper/Questionnaire.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/selenium/helper/Question.py b/selenium/helper/Question.py
index cb7e4076..571b7f31 100644
--- a/selenium/helper/Question.py
+++ b/selenium/helper/Question.py
@@ -767,29 +767,6 @@ def deselect_all_body_parts(self):
         else:
             raise ValueError(f"Unexpected image type: {selected_image_type}")
 
-    def reorder_question(self, source_question_id, new_index):
-        # Get all rows
-        rows = WebDriverWait(self.driver, 10).until(
-            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
-        )
-
-        # Identify target rows
-        target_question_id = rows[new_index].get_attribute('id')
-
-        if target_question_id == source_question_id: return
-
-        # Use the drag-and-drop utility
-        self.utils.drag_and_drop(QuestionSelectors.GRIP_SELECTOR(source_question_id),
-                                 QuestionSelectors.GRIP_SELECTOR(target_question_id))
-
-        # Validate the reordering
-        reordered_rows = WebDriverWait(self.driver, 10).until(
-            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
-        )
-        reordered_ids = [row.get_attribute("id") for row in reordered_rows]
-
-        return reordered_ids
-
 
 class QuestionAssertHelper(QuestionHelper):
 
diff --git a/selenium/helper/Questionnaire.py b/selenium/helper/Questionnaire.py
index e534597f..5b483bd4 100644
--- a/selenium/helper/Questionnaire.py
+++ b/selenium/helper/Questionnaire.py
@@ -7,7 +7,7 @@
 from selenium.webdriver.support import expected_conditions as EC
 
 from helper.Navigation import NavigationHelper
-from helper.Question import QuestionHelper, QuestionType
+from helper.Question import QuestionHelper, QuestionType, QuestionSelectors
 from helper.SeleniumUtils import SeleniumUtils
 
 
@@ -208,6 +208,32 @@ def create_questionnaire_with_questions(self, questionnaire_name=None, questionn
         return {"id": questionnaire_id, "name": questionnaire_name, "questions": added_questions}
 
 
+    def reorder_question(self, source_question_id, new_index):
+        # Get all rows
+        rows = WebDriverWait(self.driver, 10).until(
+            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
+        )
+
+        # Identify target rows
+        target_question_id = rows[new_index].get_attribute('id')
+
+        if target_question_id == source_question_id: return
+
+        # Use the drag-and-drop utility
+        self.utils.drag_and_drop(QuestionSelectors.GRIP_SELECTOR(source_question_id),
+                                 QuestionSelectors.GRIP_SELECTOR(target_question_id))
+
+        self.driver.refresh()
+
+        # Validate the reordering
+        reordered_rows = WebDriverWait(self.driver, 10).until(
+            lambda d: d.find_elements(*QuestionSelectors.TABLE_ROWS)
+        )
+        reordered_ids = [row.get_attribute("id") for row in reordered_rows]
+
+        return reordered_ids
+
+
 class QuestionnaireAssertHelper(QuestionnaireHelper):
 
     def assert_questionnaire_list(self):

From a238fda394405a65fd59f54b51ed17792434f9ee Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Fri, 24 Jan 2025 10:35:10 +0100
Subject: [PATCH 09/20] Refactor and enhance Selenium tests:

- Split `test_admin_interface_tests` into smaller test cases (`login`, `index`, `questionnaire_question_types_score`, and `conditions`).
---
 selenium/selenium_tests.py | 68 ++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index 44e2a2d1..b29ef0d4 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -167,26 +167,32 @@ def test_login_admin(self):
         else:
             pass
 
-    def test_admin_interface_tests(self):
+    def test_admin_interface_login(self):
         self.driver.get(self.https_base_url)
         # a
-        self.authentication_assert_helper.assert_mobile_user_login()
+        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
         # b
         self.authentication_assert_helper.assert_mobile_user_password()
 
+    def test_admin_interface_index(self):
         self.driver.get(self.https_base_url)
-        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
 
         # c
         self.authentication_assert_helper.assert_admin_index()
-        #
+
+        self.authentication_helper.logout()
+
+    def test_admin_interface_questionnaire_question_types_score(self):
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
         self.navigation_helper.navigate_to_manage_questionnaires()
+
         # d
         self.questionnaire_assert_helper.assert_questionnaire_list()
-        self.questionnaire_helper.click_add_questionnaire_button()
         # e
+        self.questionnaire_helper.click_add_questionnaire_button()
         questionnaire = self.questionnaire_assert_helper.assert_questionnaire_fill_page()
-
         # f
         self.navigation_helper.search_and_open_questionnaire(questionnaire['name'])
         self.questionnaire_helper.save_questionnaire_edit_question()
@@ -202,38 +208,52 @@ def test_admin_interface_tests(self):
             self.questionnaire_helper.click_add_question_button()
             question_by_type = self.question_assert_helper.assert_question_by_type(question_type)
             question_list.append(question_by_type)
-
         # g
         self.question_assert_helper.assert_question_table_functionality(len(question_list))
-
         # h
         self.navigation_helper.navigate_to_scores_of_questionnaire(questionnaire['id'], questionnaire['name'])
         self.score_assert_helper.assert_scores_list()
-
         # i
         self.navigation_helper.navigate_to_scores_of_questionnaire(questionnaire['id'], questionnaire['name'])
         self.score_assert_helper.assert_score_fill()
 
-        # j
-        source_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(
-            question_types={QuestionType.SLIDER, QuestionType.MULTIPLE_CHOICE, QuestionType.DROP_DOWN})
-        target_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(
-            question_types={QuestionType.INFO_TEXT})
-        bundle = self.bundle_helper.create_bundle(questionnaires=[source_questionnaire, target_questionnaire])
+        self.authentication_helper.logout()
 
-        source_questionnaire_slider_question = next((question for question in source_questionnaire['questions'] if question['type'] == QuestionType.SLIDER), None)
+    def test_admin_interface_conditions(self):
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
 
-        self.navigation_helper.navigate_to_questions_of_questionnaire(source_questionnaire['id'], source_questionnaire['name'])
-        self.question_helper.reorder_question(source_questionnaire_slider_question['id'], 0)
+        # j
+        # Create source and target questionnaires with specific question types and add the questionnaires to a bundle to enable selection as a condition target
+        source_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(question_types={QuestionType.SLIDER, QuestionType.MULTIPLE_CHOICE, QuestionType.DROP_DOWN})
+        target_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(question_types={QuestionType.INFO_TEXT})
+        bundle = self.bundle_helper.create_bundle(questionnaires=[source_questionnaire, target_questionnaire])
 
-        # Adding conditions to the slider question
-        self.condition_helper.open_conditions_of_question(source_questionnaire_slider_question['id'])
+        threshold_supported_question_types = {QuestionType.SLIDER, QuestionType.NUMBER_CHECKBOX, QuestionType.NUMBER_INPUT}
 
-        self.condition_helper.add_condition_for_slider(threshold_steps=1, target_type=ConditionSelectors.TargetType.QUESTION)
-        self.condition_helper.add_condition_for_slider(threshold_steps=2, target_type=ConditionSelectors.TargetType.ANSWER)
-        self.condition_helper.add_condition_for_slider(threshold_steps=3, target_type=ConditionSelectors.TargetType.QUESTIONNAIRE)
+        # Select a question where condition can be added with threshold value from the source questionnaire
+        threshold_condition_question = next((question for question in source_questionnaire['questions']
+                                                                   if question['type'] in[threshold_supported_question_types]), None)
 
-        self.condition_assert_helper.assert_question_condition_list_de()
+        # Navigate to the source questionnaire's questions and reorder the slider question to the first position
+        self.navigation_helper.navigate_to_questions_of_questionnaire(source_questionnaire['id'], source_questionnaire['name'])
+        self.questionnaire_helper.reorder_question(threshold_condition_question['id'], 0)
+        # Open the condition page for the question and add conditions targeting question, answer, and questionnaire
+        self.condition_helper.open_conditions_of_question(threshold_condition_question['id'])
+        condition_id_1 = self.condition_helper.add_condition_for_threshold_questions(threshold_steps=1, target_type=ConditionSelectors.TargetType.QUESTION)
+        condition_id_2 = self.condition_helper.add_condition_for_threshold_questions(threshold_steps=2, target_type=ConditionSelectors.TargetType.ANSWER)
+        condition_id_3 = self.condition_helper.add_condition_for_threshold_questions(threshold_steps=3, target_type=ConditionSelectors.TargetType.QUESTIONNAIRE)
+
+        # Assert the conditions are correctly listed in the tables
+        self.condition_assert_helper.assert_condition_list_and_search_de()
+        # k
+        self.condition_assert_helper.assert_add_condition_page(source_questionnaire)
+
+        self.condition_helper.delete_condition(condition_id_1)
+        self.condition_helper.delete_condition(condition_id_2)
+        self.condition_helper.delete_condition(condition_id_3)
+
+        self.authentication_helper.logout()
 
     def tearDown(self): 
         self.driver.quit()

From e092fb4e01995936b86c34e0aa25ced03b7f4bcc Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Thu, 30 Jan 2025 12:55:37 +0100
Subject: [PATCH 10/20] Manually integrate changes from
 'rework-selenium-tests-hussain'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Merged latest updates from Hussain’s branch into 'rework-selenium-tests-lueder'
---
 selenium/bundle_test.py          | 341 +++++++++++++++++++++++
 selenium/clinic_test.py          | 328 ++++++++++++++++++++++
 selenium/encounter_test.py       | 388 ++++++++++++++++++++++++++
 selenium/helper/Bundle.py        |  56 +++-
 selenium/helper/Clinic.py        |  83 +++++-
 selenium/helper/Encounter.py     | 167 +++++++++++
 selenium/helper/Language.py      |  23 ++
 selenium/helper/Navigation.py    |  51 +++-
 selenium/helper/SeleniumUtils.py |  44 ++-
 selenium/helper/User.py          | 132 +++++++++
 selenium/user_test.py            | 457 +++++++++++++++++++++++++++++++
 11 files changed, 2055 insertions(+), 15 deletions(-)
 create mode 100644 selenium/bundle_test.py
 create mode 100644 selenium/clinic_test.py
 create mode 100644 selenium/encounter_test.py
 create mode 100644 selenium/helper/Encounter.py
 create mode 100644 selenium/helper/Language.py
 create mode 100644 selenium/helper/User.py
 create mode 100644 selenium/user_test.py

diff --git a/selenium/bundle_test.py b/selenium/bundle_test.py
new file mode 100644
index 00000000..e9991e5b
--- /dev/null
+++ b/selenium/bundle_test.py
@@ -0,0 +1,341 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import unittest
+
+from selenium import webdriver
+from selenium.common.exceptions import TimeoutException
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from webdriver_manager.chrome import ChromeDriverManager
+
+from helper.Authentication import AuthenticationHelper
+from helper.Bundle import BundleHelper, BundleSelectors
+from helper.Clinic import ClinicHelper
+from helper.Condition import ConditionHelper
+from helper.Language import LanguageHelper, LanguageSelectors
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper, QuestionType
+from helper.Questionnaire import QuestionnaireHelper
+from helper.Score import ScoreHelper
+from helper.SeleniumUtils import SeleniumUtils, ErrorSelectors
+from helper.Survey import SurveyHelper, SurveyAssertHelper
+from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
+
+
+class URLPaths:
+    ADMIN_INDEX = "/admin/index"
+    ADMIN_INDEX_DE = "/admin/index?lang=de_DE"
+    MOBILE_USER_LOGIN = "/mobile/user/login"
+    MOBILE_USER_LOGIN_DE = "/mobile/user/login?lang=de_DE"
+    MOBILE_SURVEY_INDEX = "/mobile/survey/index"
+    LOGIN_BAD_CREDENTIALS = "/mobile/user/login?message=BadCredentialsException"
+    LOGIN_DISABLED_EXCEPTION = "/mobile/user/login?message=DisabledException"
+    PASSWORD_FORGOT = "/mobile/user/password"
+
+
+class EmailSelectors:
+    SUBJECT_INPUT = (By.ID, "subject")
+    CONTENT_INPUT = (By.ID, "mailContent")
+    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
+    SEND_BUTTON = (By.ID, "mailButton")
+
+
+class PasswordResetSelectors:
+    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+    USERNAME_INPUT = (By.ID, "username")
+    ERROR_MESSAGE = (By.CLASS_NAME, "error")
+
+
+class CustomTest(IMISeleniumChromeTest, unittest.TestCase):
+    seleniumMode: IMISeleniumBaseTest.SeleniumMode = IMISeleniumBaseTest.SeleniumMode.LOCAL
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.base_url = "localhost:8080"
+        cls.https_base_url = "http://localhost:8080"
+
+    def setUp(self):
+        chrome_options = Options()
+        # chrome_options.add_argument("--headless=new")
+        chrome_options.add_argument("start-maximized")
+        driver = webdriver.Chrome(options=chrome_options, service=Service(ChromeDriverManager().install()))
+        # Initialize the WebDriver
+        self.driver = webdriver.Chrome(options=chrome_options)
+
+        # Initialize Navigation and Utils
+        self.navigation_helper = NavigationHelper(self.driver)
+        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
+        self.navigation_helper.utils = self.utils
+
+        # Initialize other helpers
+        self.authentication_helper = AuthenticationHelper(self.driver)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.question_helper = QuestionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.condition_helper = ConditionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.score_helper = ScoreHelper(self.driver, navigation_helper=self.navigation_helper)
+
+        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
+        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
+
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
+        self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
+
+    def test_bundle_list(self):
+        bundle_name = "Test Bundle"
+        clinic_name = "Test Clinic"
+
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
+                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
+                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
+                                            question_types=[QuestionType.INFO_TEXT])
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+        except Exception as e:
+            self.fail(f"Failed to navigate to 'Bundles' page: {e}")
+
+        # Assert - Verify that the bundle table is available
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.TABLE_BUNDLE)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Bundle table not found")
+
+        try:
+            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
+            self.bundle_helper.save_bundle(bundle_name)
+        except Exception as e:
+            self.fail(f"Failed to create bundle: {e}")
+    
+        #Assert - Verify that flag icons are visible
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.CELL_FLAGICON)
+            )
+        except Exception as e:
+            self.fail(f"Failed to verify flag icon: {e}")
+
+        self.utils.search_item(bundle_name, "bundle")
+        bundle_id = self.bundle_helper.get_bundle_id()
+    
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            self.clinic_helper.create_clinic(clinic_name=clinic_name, 
+                                             clinic_description="Test Clinic Description",
+                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[{'id': bundle_id, 'name': bundle_name}])
+            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        # Assert - Find clinics assigned to the bundle
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+            self.utils.search_item(bundle_name, "bundle")
+            bundle_row = self.bundle_helper.get_first_bundle_row()
+            bundle_row.find_element(By.CSS_SELECTOR, "td:nth-child(3)")
+            clinic_link = bundle_row.find_element(By.CSS_SELECTOR, "ul > li > a")
+            self.assertEqual(clinic_link.text, clinic_name, f"Clinic name '{clinic_name}' not found in bundle row.")
+
+        except Exception as e:
+            self.fail(f"Failed to find clinic assigned to bundle: {e}")
+
+
+        #Assert: Verify that search box is available
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.INPUT_BUNDLE_SEARCH)
+            )
+        except TimeoutException:
+            self.fail("Search box not found")
+
+        #Assert: Verify that pagination is available
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.PAGINATION_BUNDLE)
+            )
+        except TimeoutException:
+            self.fail("Pagination not found ")
+
+        #Assert: Verify that add new bundle button is available
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.BUTTON_ADD_BUNDLE)
+            )
+        except TimeoutException:
+            self.fail("Add button not found ")
+
+        #Finally
+        finally:
+            self.utils.search_and_delete_item(clinic_name,clinic_id, "clinic")
+            self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
+            self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+
+    def test_bundle_fill(self):
+        bundle_name = "Test Bundle"
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
+                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
+                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
+                                            question_types=[QuestionType.INFO_TEXT])
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+        except Exception as e:
+            self.fail(f"Failed to navigate to 'Bundles' page: {e}")
+
+        self.utils.click_element(BundleSelectors.BUTTON_ADD_BUNDLE)
+        
+        #Assert - Visibility of language dropdown
+        try:
+            self.language_helper.open_language_dropdown()
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(LanguageSelectors.LANGUAGE_DROPDOWN)
+            )
+        except Exception as e:  
+            self.fail(f"Failed to open language dropdown: {e}")
+
+        #Assert - Visibility of bundle name input
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.INPUT_NAME)
+            )
+        except Exception as e:  
+            self.fail(f"Failed to locate bundle input: {e}")
+
+        #Assert - Visibility of bundle description input
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.INPUT_EDITABLE_DESCRIPTION)
+            )
+        except Exception as e:  
+            self.fail(f"Failed to locate bundle description: {e}")
+
+        #Assert - Visibility of bundle welcome input
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.INPUT_WELCOME_TEXT)
+            )
+        except Exception as e:  
+            self.fail(f"Failed to locate welcome input: {e}")
+
+        #Assert - Visibility of bundle welcome input
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(BundleSelectors.INPUT_END_TEXT)
+            )
+        except Exception as e:  
+            self.fail(f"Failed to locate end input: {e}")
+        
+        # Assert - Visibility of publish checkbox
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(BundleSelectors.CHECKBOX_PUBLISH)
+            )
+        except TimeoutException:
+            self.fail("Publish checkbox not found ")
+
+        # Assert - Visibility of name progress checkbox
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(BundleSelectors.CHECKBOX_NAME_PROGRESS)
+            )
+        except TimeoutException:
+            self.fail("Name progress checkbox not found ")
+
+        # Assert - Visibility of progress whole package checkbox
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(BundleSelectors.CHECKBOX_PROGRESS_WHOLE_PACKAGE)
+            )
+        except TimeoutException:
+            self.fail("Progress whole package checkbox not found ")
+
+        # Assert - Visibility of available questionnaires table
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(BundleSelectors.TABLE_AVAILABLE_QUESTIONNAIRES)
+            )
+        except TimeoutException:
+            self.fail("Available questionnaires table not found")
+
+        # Assert - Visibility of assigned questionnaires table
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(BundleSelectors.TABLE_ASSIGNED_QUESTIONNAIRES)
+            )
+        except TimeoutException:
+            self.fail("Assigned questionnaires table not found")
+
+        #Assert - Test for assigning questionnaire to bundle
+        try:
+            self.bundle_helper.assign_multiple_questionnaires_to_bundle([created_questionnaire])
+        except Exception as e:
+            self.fail(f"Failed to assign questionnaire to bundle: {e}")
+
+        #Assert - Test for removing questionnaire to bundle
+        try:
+            self.bundle_helper.remove_multiple_questionnaires_from_bundle([created_questionnaire])
+        except Exception as e:
+            self.fail(f"Failed to assign questionnaire to bundle: {e}")
+
+        #Assert - Check form validation
+        try:
+            self.utils.click_element(BundleSelectors.BUTTON_SAVE)
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            )
+            validation_errors = self.driver.find_elements(*ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            self.assertEqual(len(validation_errors), 2, "Expected 2 validation errors, but found {len(validation_errors)}")
+        except Exception as e:
+            self.fail(f"Failed to save bundle: {e}")
+        
+        #Assert - Create a bundle with a questionnaire
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
+            self.bundle_helper.save_bundle(bundle_name)
+        except Exception as e:
+            self.fail(f"Failed to create bundle: {e}")
+        
+        #Finally
+        finally:
+            self.utils.search_item(bundle_name, "bundle")
+            bundle_id = self.bundle_helper.get_bundle_id()
+            if(bundle_id):
+                self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
+            if(created_questionnaire):
+                self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+        
+    def tearDown(self):
+        if self.driver:
+            self.driver.quit()
+
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/selenium/clinic_test.py b/selenium/clinic_test.py
new file mode 100644
index 00000000..9f530883
--- /dev/null
+++ b/selenium/clinic_test.py
@@ -0,0 +1,328 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import unittest
+
+from selenium import webdriver
+from selenium.common.exceptions import TimeoutException
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from webdriver_manager.chrome import ChromeDriverManager
+
+from helper.Authentication import AuthenticationHelper
+from helper.Bundle import BundleHelper
+from helper.Clinic import ClinicHelper, ClinicSelectors
+from helper.Condition import ConditionHelper
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper, QuestionType
+from helper.Questionnaire import QuestionnaireHelper
+from helper.Score import ScoreHelper
+from helper.SeleniumUtils import SeleniumUtils, ErrorSelectors
+from helper.Survey import SurveyHelper, SurveyAssertHelper
+from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
+
+
+class URLPaths:
+    ADMIN_INDEX = "/admin/index"
+    ADMIN_INDEX_DE = "/admin/index?lang=de_DE"
+    MOBILE_USER_LOGIN = "/mobile/user/login"
+    MOBILE_USER_LOGIN_DE = "/mobile/user/login?lang=de_DE"
+    MOBILE_SURVEY_INDEX = "/mobile/survey/index"
+    LOGIN_BAD_CREDENTIALS = "/mobile/user/login?message=BadCredentialsException"
+    LOGIN_DISABLED_EXCEPTION = "/mobile/user/login?message=DisabledException"
+    PASSWORD_FORGOT = "/mobile/user/password"
+
+
+class EmailSelectors:
+    SUBJECT_INPUT = (By.ID, "subject")
+    CONTENT_INPUT = (By.ID, "mailContent")
+    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
+    SEND_BUTTON = (By.ID, "mailButton")
+
+
+class PasswordResetSelectors:
+    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+    USERNAME_INPUT = (By.ID, "username")
+    ERROR_MESSAGE = (By.CLASS_NAME, "error")
+
+
+class CustomTest(IMISeleniumChromeTest, unittest.TestCase):
+    seleniumMode: IMISeleniumBaseTest.SeleniumMode = IMISeleniumBaseTest.SeleniumMode.LOCAL
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.base_url = "localhost:8080"
+        cls.https_base_url = "http://localhost:8080"
+
+    def setUp(self):
+        chrome_options = Options()
+        # chrome_options.add_argument("--headless=new")
+        chrome_options.add_argument("start-maximized")
+        driver = webdriver.Chrome(options=chrome_options, service=Service(ChromeDriverManager().install()))
+        # Initialize the WebDriver
+        self.driver = webdriver.Chrome(options=chrome_options)
+
+        # Initialize Navigation and Utils
+        self.navigation_helper = NavigationHelper(self.driver)
+        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
+        self.navigation_helper.utils = self.utils
+
+        # Initialize other helpers
+        self.authentication_helper = AuthenticationHelper(self.driver)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.question_helper = QuestionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.condition_helper = ConditionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.score_helper = ScoreHelper(self.driver, navigation_helper=self.navigation_helper)
+
+        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
+        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
+
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
+
+    def _test_clinic_list(self):
+        clinic_name = "Test Clinic"
+        clinic_description = "Test Clinic Description"
+        clinic_id = None
+
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+        except Exception as e:
+            self.fail(f"Failed to navigate to 'Clinic' page: {e}")
+
+        # Act
+        try:
+            self.clinic_helper.create_clinic(clinic_name, clinic_description,configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}])
+            clinic_id = self.clinic_helper.save_clinic(clinic_name)
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        #Assert - Check if the clinic table is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_CLINIC)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Clinic table not found")
+            
+        #Assert - Check if the clinic table pagination is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.PAGINATION_CLINIC_TABLE)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Clinic table pagination not found")
+            
+        #Assert - Check if the clinic table search is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_SEARCH)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Clinic table pagination not found")
+        
+        #Assert - Check if the clinic table action buttons are displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_ACTION_BUTTONS)
+            )
+        except TimeoutException:  
+            self.fail(
+                f"Clinic table action buttons not found")
+        
+        #Assert - Check if the add new clinic button is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.BUTTON_ADD_CLINIC)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Add new clinic button not found")
+            
+        finally:
+            self.utils.search_and_delete_item(clinic_name,clinic_id,"clinic")
+            self.authentication_helper.logout()
+            
+    def test_clinic_fill(self):
+        clinic_name = "Test Clinic"
+        clinic_description = "Test Clinic Description"
+        clinic_id = None
+        bundle_name = "Test Bundle"
+        bundle_id=None
+
+
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        #Arrange
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
+                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
+                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
+                                            question_types=[QuestionType.INFO_TEXT])
+            self.navigation_helper.navigate_to_manage_bundles()
+            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
+            bundle_id=self.bundle_helper.save_bundle(bundle_name)
+        except Exception as e:
+            self.fail(f"Failed to setup questionnaire and bundle: {e}")
+
+        self.navigation_helper.navigate_to_manage_clinics()
+        WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(ClinicSelectors.BUTTON_ADD_CLINIC))
+        self.utils.click_element(ClinicSelectors.BUTTON_ADD_CLINIC)
+        #Assert - Check if the clinic name input is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.INPUT_CLINIC_NAME)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Clinic name input not found")
+
+        #Assert - Check if the clinic description input is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Clinic description input not found")
+
+        #Assert - Check if the clinic email input is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.INPUT_CLINIC_EMAIL)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Clinic email input not found")
+        
+        #Assert - Check if the clinic configuration is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.DIV_CLINIC_CONFIGURATION)
+            )
+            clinic_configuration = self.driver.find_element(*ClinicSelectors.DIV_CLINIC_CONFIGURATION)
+            clinic_configuration_list = clinic_configuration.find_elements(*ClinicSelectors.CLINIC_CONFIGURATION_LIST)
+            self.assertGreaterEqual(len(clinic_configuration_list), 1, "Clinic configuration list should have at least one item")
+        except:
+            self.fail(
+                f"Clinic configuration not found")
+            
+        #Assert - Check if the tables with available bundles is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_AVAIALBLE_BUNDLES)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Table with available bundles not found")
+            
+        #Assert - Check if the tables with selected bundles is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_ASSIGNED_BUNDLES)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Table with assigned bundles not found")
+            
+        #Assert - Check if the bundles can be added to the clinic
+        try:
+            self.clinic_helper.assign_multiple_bundes_to_clinic([{'id': bundle_id, 'name': bundle_name}])
+        except Exception as e:
+            self.fail(f"Failed to assign bundle to clinic: {e}")
+        
+        #Assert - Check if the bundles can be removed from the clinic
+        try:
+            self.clinic_helper.remove_multiple_bundes_from_clinic([{'id': bundle_id, 'name': bundle_name}])
+        except Exception as e:
+            self.fail(f"Failed to remove bundle from clinic: {e}")
+
+         #Assert - Check if the tables with available users is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_AVAIALBLE_USERS)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Table with available users not found")
+            
+        #Assert - Check if the tables with selected bundles is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_ASSIGNED_USERS)
+            )
+        except TimeoutException:
+            self.fail(
+                f"Table with assigned users not found")
+            
+
+        #Assert - Check if the users can be added to the clinic
+        try:
+            self.clinic_helper.assign_multiple_users_to_clinic([self.secret.get('admin-username')])
+        except Exception as e:
+            self.fail(f"Failed to assign users to clinic: {e}")
+
+        #Assert - Check if the users can be removed from the clinic
+        try:
+            self.clinic_helper.remove_multiple_users_from_clinic([self.secret.get('admin-username')])
+        except Exception as e:
+            self.fail(f"Failed to remove users from clinic: {e}")
+
+        #Assert - Check form validation
+        try:
+            self.utils.click_element(ClinicSelectors.BUTTON_SAVE)
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            )
+            validation_errors = self.driver.find_elements(*ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            configuration_errors = self.driver.find_elements(*ErrorSelectors.CONFIGURATION_ERROR_SELECTOR)
+            self.assertEqual(len(validation_errors), 2, "Expected 2 validation errors, but found {len(validation_errors)}")
+            self.assertEqual(len(configuration_errors), 1, "Expected 1 configuration errors, but found {len(configuration_errors)}")
+        except Exception as e:
+            self.fail(f"Failed to save bundle: {e}")
+
+        #Assert - Check if the clinic can be created
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            self.clinic_helper.create_clinic(clinic_name, clinic_description,
+                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[{'id': bundle_id, 'name': bundle_name}], users=[self.secret.get('admin-username')])
+            clinic_id = self.clinic_helper.save_clinic(clinic_name)
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_CLINIC)
+            )
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        finally:
+            if clinic_id:
+                self.utils.search_and_delete_item(clinic_name,clinic_id,"clinic")
+            if bundle_id:
+                self.utils.search_and_delete_item(bundle_name,bundle_id,"bundle")
+            if created_questionnaire:
+                self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+            self.authentication_helper.logout()
+
+    def tearDown(self):
+        if self.driver:
+            self.driver.quit()
+
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/selenium/encounter_test.py b/selenium/encounter_test.py
new file mode 100644
index 00000000..3e1a5c48
--- /dev/null
+++ b/selenium/encounter_test.py
@@ -0,0 +1,388 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import datetime
+import unittest
+
+from helper.Encounter import EncounterSelectors, EncounterHelper, EncounterScheduleType
+from selenium import webdriver
+from selenium.common.exceptions import TimeoutException
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from webdriver_manager.chrome import ChromeDriverManager
+
+from helper.Authentication import AuthenticationHelper
+from helper.Bundle import BundleHelper
+from helper.Clinic import ClinicHelper
+from helper.Condition import ConditionHelper
+from helper.Language import LanguageHelper
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper, QuestionType
+from helper.Questionnaire import QuestionnaireHelper
+from helper.Score import ScoreHelper
+from helper.SeleniumUtils import SeleniumUtils
+from helper.Survey import SurveyHelper, SurveyAssertHelper
+from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
+
+
+class URLPaths:
+    ADMIN_INDEX = "/admin/index"
+    ADMIN_INDEX_DE = "/admin/index?lang=de_DE"
+    MOBILE_USER_LOGIN = "/mobile/user/login"
+    MOBILE_USER_LOGIN_DE = "/mobile/user/login?lang=de_DE"
+    MOBILE_SURVEY_INDEX = "/mobile/survey/index"
+    LOGIN_BAD_CREDENTIALS = "/mobile/user/login?message=BadCredentialsException"
+    LOGIN_DISABLED_EXCEPTION = "/mobile/user/login?message=DisabledException"
+    PASSWORD_FORGOT = "/mobile/user/password"
+
+
+class EmailSelectors:
+    SUBJECT_INPUT = (By.ID, "subject")
+    CONTENT_INPUT = (By.ID, "mailContent")
+    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
+    SEND_BUTTON = (By.ID, "mailButton")
+
+
+class PasswordResetSelectors:
+    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+    USERNAME_INPUT = (By.ID, "username")
+    ERROR_MESSAGE = (By.CLASS_NAME, "error")
+
+
+class CustomTest(IMISeleniumChromeTest, unittest.TestCase):
+    seleniumMode: IMISeleniumBaseTest.SeleniumMode = IMISeleniumBaseTest.SeleniumMode.LOCAL
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.base_url = "localhost:8080"
+        cls.https_base_url = "http://localhost:8080"
+
+    def setUp(self):
+        chrome_options = Options()
+        # chrome_options.add_argument("--headless=new")
+        chrome_options.add_argument("start-maximized")
+        driver = webdriver.Chrome(options=chrome_options, service=Service(ChromeDriverManager().install()))
+        # Initialize the WebDriver
+        self.driver = webdriver.Chrome(options=chrome_options)
+
+        # Initialize Navigation and Utils
+        self.navigation_helper = NavigationHelper(self.driver)
+        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
+        self.navigation_helper.utils = self.utils
+
+        # Initialize other helpers
+        self.authentication_helper = AuthenticationHelper(self.driver)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.question_helper = QuestionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.condition_helper = ConditionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.score_helper = ScoreHelper(self.driver, navigation_helper=self.navigation_helper)
+
+        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
+        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
+        self.encounter_helper = EncounterHelper(self.driver, self.navigation_helper)
+
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
+        self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
+
+    def test_encounter_list(self):
+        bundle_name = "TestBundle"
+        clinic_name = "TestClinic"
+        clinic_description = "TestDescription"
+        
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
+                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
+                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
+                                            question_types=[QuestionType.INFO_TEXT])
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
+            self.bundle_helper.save_bundle(bundle_name)
+        except Exception as e:
+            self.fail(f"Failed to create bundle: {e}")
+
+
+        self.utils.search_item(bundle_name, "bundle")
+        bundle_id = self.bundle_helper.get_bundle_id()
+
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            self.clinic_helper.create_clinic(clinic_name=clinic_name, 
+                                             clinic_description="Test Clinic Description",
+                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[{'id': bundle_id, 'name': bundle_name}])
+            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        # Act
+        self.navigation_helper.navigate_to_manage_surveys()
+
+        #Assert - Check if tabs for "All Encounters" and "Scheduled Encounters" are present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(EncounterSelectors.BUTTON_ENCOUNTER_TABLE)
+            )
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+            )
+        except TimeoutException:
+            self.fail("Encounter tabs not found")
+        
+        # Act - Click on "All Encounters" tab
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_TABLE)
+        # Assert - Check if the table for all encounters is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.TABLE_ALL_ENCOUNTERS)
+            )
+        except TimeoutException:
+            self.fail("All Encounters table not found")
+        
+        #Assert - Check if table pagination is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.PAGINATION_ENCOUNTER_TABLE)
+            )
+        except TimeoutException:
+            self.fail("Pagination for All Encounters table not found")
+
+        #Assert - Check if table search is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.SEARCH_ALL_ENCOUNTERS)
+            )
+        except TimeoutException:
+            self.fail("Search for All Encounters table not found")
+
+        #TODO: Action column, number of exports [after create survey function implementation]
+
+        #Assert - Check for button for starting an encounter
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(EncounterSelectors.BUTTON_EXECUTE_ENCOUNTER)
+            )
+        except TimeoutException:
+            self.fail("Execute Encounter button not found")
+
+
+        # Act - Click on "Scheduled Encounters" tab
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+        # Assert - Check if the table for scheduled encounters is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.TABLE_SCHEDULED_ENCOUNTERS)
+            )
+        except TimeoutException:
+            self.fail("Scheduled Encounters table not found")
+
+        #Assert - Check if table for scheduled encounters is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.TABLE_SCHEDULED_ENCOUNTERS)
+            )
+        except TimeoutException:
+            self.fail("Scheduled Encounters table not found")
+
+        #Assert - Check if table pagination is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.PAGINATION_ENCOUNTER_SCHEDULE_TABLE)
+            )
+        except TimeoutException:
+            self.fail("Pagination for Scheduled Encounters table not found")
+        
+        #Assert - Check if table search is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.SEARCH_SCHEDULED_ENCOUNTERS)
+            )
+        except TimeoutException:
+            self.fail("Search for Scheduled Encounters table not found")
+        encounter_id = None
+        try:
+            self.utils.click_element(EncounterSelectors.BUTTON_SCHEDULE_ENCOUNTER)
+            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic_name, bundle_name, "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
+        except Exception as e:
+            self.fail(f"Failed to schedule encounter: {e}")
+
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+
+        #Assert - Check if the action column is present
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EncounterSelectors.TABLE_ACTION_COLUMN)
+            )
+        except TimeoutException:
+            self.fail("Action column for Scheduled Encounters table not found")
+
+        #TODO: number of exports [after survey schedule function implementation]
+
+        #Assert - Check for button for scheduling an encounter
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(EncounterSelectors.BUTTON_SCHEDULE_ENCOUNTER)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter button not found")
+
+        finally:
+            self.encounter_helper.delete_scheduled_encounter(encounter_id, "123456")
+            self.utils.search_and_delete_item(clinic_name,clinic_id, "clinic")
+            self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
+            self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+
+
+    def test_encounter_schedule(self):
+        bundle_name = "TestBundle"
+        clinic_name = "TestClinic"
+        clinic_description = "TestDescription"
+        
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])    
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
+                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
+                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
+                                            question_types=[QuestionType.INFO_TEXT])
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
+            self.bundle_helper.save_bundle(bundle_name)
+        except Exception as e:
+            self.fail(f"Failed to create bundle: {e}")
+
+
+        self.utils.search_item(bundle_name, "bundle")
+        bundle_id = self.bundle_helper.get_bundle_id()
+        clinic_id = None
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            self.clinic_helper.create_clinic(clinic_name=clinic_name, 
+                                             clinic_description=clinic_description,
+                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[{'id': bundle_id, 'name': bundle_name}])
+            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+        
+        try:
+            self.navigation_helper.navigate_to_manage_surveys()
+            self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+            self.utils.click_element(EncounterSelectors.BUTTON_SCHEDULE_ENCOUNTER)
+        except Exception as e:
+            self.fail(f"Failed to navigate to Schedule Encounter form: {e}")
+
+        # Assert - Check if all the inputs are present
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.INPUT_SCHEDULE_CASE_NUMBER)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Case Number' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.SELECT_SCHEDULE_CLINIC)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Clinic' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.SELECT_SCHEDULE_BUNDLE)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Bundle' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.INPUT_SCHEDULE_EMAIL)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Email' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.SELECT_SURVEY_TYPE)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Survey Type' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.INPUT_DATE)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Date' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.INPUT_END_DATE)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'End Date' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.INPUT_TIME_PERIOD)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Time Period' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.SELECT_LANGUAGE)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Language' not found")
+
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located(EncounterSelectors.INPUT_PERSONAL_TEXT)
+            )
+        except TimeoutException:
+            self.fail("Schedule Encounter form element 'Personal Text' not found")
+        
+        encounter_id = None
+        try:
+            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic_name, bundle_name, "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
+        except Exception as e:
+            self.fail(f"Failed to schedule encounter: {e}")
+            
+        finally:
+            self.encounter_helper.delete_scheduled_encounter(encounter_id, "123456")
+            self.utils.search_and_delete_item(clinic_name,clinic_id, "clinic")
+            self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
+            self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+        
+    def tearDown(self):
+        if self.driver:
+            self.driver.quit()
+
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/selenium/helper/Bundle.py b/selenium/helper/Bundle.py
index 870d13bb..c4e08e2f 100644
--- a/selenium/helper/Bundle.py
+++ b/selenium/helper/Bundle.py
@@ -17,18 +17,28 @@ class BundleSelectors:
     BUTTON_MOVE_ITEM = lambda questionnaire_id: (By.ID, f"move_{questionnaire_id}")
 
     CHECKBOX_PUBLISH = (By.ID, "isPublished1")
+    CHECKBOX_NAME_PROGRESS = (By.ID, "deactivateProgressAndNameDuringSurvey1")
+    CHECKBOX_PROGRESS_WHOLE_PACKAGE = (By.ID, "showProgressPerBundle1")
 
     INPUT_NAME = (By.ID, "name")
     INPUT_EDITABLE_DESCRIPTION = (By.CSS_SELECTOR, "div.note-editable")
+    INPUT_WELCOME_TEXT = (By.CSS_SELECTOR, "#localizedWelcomeTextCollapsableText_de_DE > div > div.note-editing-area > div.note-editable")
+    INPUT_END_TEXT = (By.CSS_SELECTOR, "#localizedFinalTextCollapsableText_de_DE > div:nth-child(2) > div:nth-child(2) > div:nth-child(3)")
     INPUT_BUNDLE_SEARCH = (By.ID, "bundleTable_filter")
     INPUT_QUESTIONNAIRE = lambda questionnaire_id: (By.ID, f"questionnaire_{questionnaire_id}")
     INPUT_QUESTIONNAIRE_AVAILABLE_SEARCH = (By.ID, "availableQuestionnairesFilter")
+    INPUT_QUESTIONNAIRE_ASSIGNED_SEARCH = (By.ID, "assignedQuestionnairesFilter")
 
     BUNDLE_LINK = lambda bundle_id: (By.ID, f"bundleLink_{bundle_id}")
     BUNDLE_LINK_BY_NAME = lambda bundle_name: (By.XPATH, f"//table[@id='bundleTable']//a[text()='{bundle_name}']")
 
     TABLE_ROWS = (By.CSS_SELECTOR, "#DataTables_Table_0 tbody tr")
+    TABLE_BUNDLE = (By.ID, "bundleTable")
+    TABLE_AVAILABLE_QUESTIONNAIRES = (By.ID, "availableQuestionnairesTable")
+    TABLE_ASSIGNED_QUESTIONNAIRES = (By.ID, "assignedQuestionnairesTable")
 
+    CELL_FLAGICON=(By.CSS_SELECTOR, "#bundleTable > tbody > tr > td:nth-child(2) > img")
+    PAGINATION_BUNDLE = (By.CSS_SELECTOR, "#bundleTable_paginate")
 
 class BundleHelper:
     def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
@@ -79,7 +89,7 @@ def create_bundle(self, bundle_name=None, publish_bundle=False, questionnaires=N
         :param questionnaires: List of questionnaires to assign to the bundle (optional).
         """
         timestamp: str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        bundle_name = bundle_name or f"Bundle {timestamp}"
+        bundle_name = bundle_name or f"Test Bundle {timestamp}"
 
         try:
             self.navigation_helper.navigate_to_manage_bundles()
@@ -105,10 +115,7 @@ def create_bundle(self, bundle_name=None, publish_bundle=False, questionnaires=N
             if publish_bundle:
                 self.utils.toggle_checkbox(BundleSelectors.CHECKBOX_PUBLISH, enable=True)
 
-            bundle_id = self.save_bundle(bundle_name)
-
             return {
-                "id": bundle_id,
                 "name": bundle_name
             }
 
@@ -162,4 +169,43 @@ def assign_multiple_questionnaires_to_bundle(self, questionnaires, bundle_id=Non
                 except Exception as e:
                     raise Exception(f"Error while assigning questionnaire '{questionnaire['name']}': {e}")
         except Exception as e:
-            raise Exception(f"Error while assigning multiple questionnaires: {e}")
\ No newline at end of file
+            raise Exception(f"Error while assigning multiple questionnaires: {e}")
+
+    def get_bundle_id(self):
+        edit_link = self.get_first_bundle_row().find_element(By.CSS_SELECTOR, "a[href^='fill?id=']")
+        href = edit_link.get_attribute('href')
+        # Extract ID from href using split
+        bundle_id = href.split('id=')[1]
+        return bundle_id
+
+    def get_first_bundle_row(self):
+        return self.driver.find_element(*BundleSelectors.TABLE_BUNDLE) \
+            .find_element(By.TAG_NAME, "tbody") \
+            .find_element(By.TAG_NAME, "tr")
+
+    def remove_multiple_questionnaires_from_bundle(self, questionnaires, bundle_id=None):
+        """
+        :param questionnaires: List of dictionaries containing questionnaire details (e.g., {'id': str, 'name': str}).
+        :param bundle_id: ID of the bundle from which the questionnaires will be removed (optional).
+        """
+        try:
+            if bundle_id:
+                self.search_and_open_bundle(bundle_id)
+
+            for questionnaire in questionnaires:
+                try:
+                    self.utils.fill_text_field(BundleSelectors.INPUT_QUESTIONNAIRE_ASSIGNED_SEARCH,
+                                               questionnaire['name'])
+
+                    questionnaire_selector = BundleSelectors.INPUT_QUESTIONNAIRE(questionnaire['id'])
+                    WebDriverWait(self.driver, 10).until(
+                        EC.presence_of_element_located(questionnaire_selector)
+                    )
+                    self.utils.scroll_to_element(BundleSelectors.BUTTON_MOVE_ITEM(questionnaire['id']))
+                    self.utils.click_element(BundleSelectors.BUTTON_MOVE_ITEM(questionnaire['id']))
+                except TimeoutException:
+                    raise Exception(f"Timeout while removing questionnaire '{questionnaire['name']}'.")
+                except Exception as e:
+                    raise Exception(f"Error while removing questionnaire '{questionnaire['name']}': {e}")
+        except Exception as e:
+            raise Exception(f"Error while removing multiple questionnaires: {e}")
diff --git a/selenium/helper/Clinic.py b/selenium/helper/Clinic.py
index a5c1f668..798949b8 100644
--- a/selenium/helper/Clinic.py
+++ b/selenium/helper/Clinic.py
@@ -1,3 +1,5 @@
+import datetime
+
 from selenium.common import TimeoutException
 from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.common.by import By
@@ -20,26 +22,44 @@ class ClinicSelectors:
     DROPDOWN_CONFIG = lambda parent_id: (By.CSS_SELECTOR, f"li[parentid='{parent_id}'] select")
 
     INPUT_CLINIC_NAME = (By.ID, "name")
+    INPUT_CLINIC_EMAIL = (By.ID, 'email')
     INPUT_EDITABLE_DESCRIPTION = (By.CSS_SELECTOR, "div.note-editable")
     INPUT_USER_AVAILABLE_SEARCH = (By.ID, "availableUsersFilter")
+    INPUT_USER_ASSIGNED_SEARCH = (By.ID, "assignedUsersFilter")
     INPUT_USER = lambda username: (By.ID, f"user_{username}")
     INPUT_BUNDLE_AVAILABLE_SEARCH = (By.ID, "availableBundlesFilter")
+    INPUT_BUNDLE_ASSIGNED_SEARCH = (By.ID, "assignedBundlesFilter")
     INPUT_BUNDLE = lambda bundle_id: (By.ID, f"bundle_{bundle_id}")
 
     # Configuration selectors
+    DIV_CLINIC_CONFIGURATION = (By.ID, "clinicConfigurations")
+    CLINIC_CONFIGURATION_LIST = (By.CSS_SELECTOR, "#clinicConfigurations > div > div > ul > li")
     CONFIG_USE_PATIENT_DATA_LOOKUP = (By.CSS_SELECTOR, "li#usePatientDataLookup input[type='checkbox']")
     CONFIG_USE_PSEUDONYMIZATION_SERVICE = (By.CSS_SELECTOR, "li#usePseudonymizationService input[type='checkbox']")
     CONFIG_REGISTER_PATIENT_DATA = (By.CSS_SELECTOR, "li#registerPatientData input[type='checkbox']")
 
     TABLE_ROW_LINK = (By.CSS_SELECTOR, "#clinicTable > tbody > tr > td.dtr-control > a")
+    TABLE_CLINIC= (By.CSS_SELECTOR, "#clinicTable")
+    TABLE_SEARCH = (By.ID, 'clinicTable_filter')
+    TABLE_ACTION_BUTTONS= (By.CSS_SELECTOR, "td.actionColumn")
+
+    TABLE_AVAIALBLE_BUNDLES = (By.ID, "availableBundlesTable")
+    TABLE_ASSIGNED_BUNDLES = (By.ID, "assignedBundlesTable")
+    TABLE_AVAIALBLE_USERS = (By.ID, "availableUsersTable")
+    TABLE_ASSIGNED_USERS = (By.ID, "assignedUsersTable")
+
+    PAGINATION_CLINIC_TABLE = (By.ID, "clinicTable_paginate")
 
 class ClinicHelper:
+
+    DEFAULT_DESCRIPTION = "This description of the clinic is a dummy text."
+
     def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
         self.driver = driver
         self.navigation_helper = navigation_helper
         self.utils = SeleniumUtils(driver)
 
-    def create_clinic(self, clinic_name, clinic_description, configurations=None, bundles=None, users=None):
+    def create_clinic(self, clinic_name=None, clinic_description=None, configurations=None, bundles=None, users=None):
         """
         :param clinic_name: Name of the clinic to be created.
         :param clinic_description: Description of the clinic.
@@ -47,7 +67,12 @@ def create_clinic(self, clinic_name, clinic_description, configurations=None, bu
         - 'selector': The selector for the configuration checkbox.
         - 'dropdown_value': Optional dropdown value to select for the configuration (default: None).
         :param bundles: List of bundles to be associated with the clinic (optional).
+        param users: A list of users to be assigned to the clinic
         """
+        timestamp: str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        clinic_name = clinic_name or f"Test Clinic {timestamp}"
+        clinic_description = clinic_description or self.DEFAULT_DESCRIPTION
+
         try:
             # Click "Add Clinic" button
             self.utils.click_element(ClinicSelectors.BUTTON_ADD_CLINIC)
@@ -77,6 +102,8 @@ def create_clinic(self, clinic_name, clinic_description, configurations=None, bu
             if users:
                 self.assign_multiple_users_to_clinic(users)
 
+            return clinic_name
+
         except Exception as e:
             raise Exception(f"Error while creating clinic '{clinic_name}': {e}")
 
@@ -213,4 +240,56 @@ def search_and_open_clinic(self, clinic_name):
         except TimeoutException:
             raise Exception(f"Timeout while searching for clinic '{clinic_name}' to open.")
         except Exception as e:
-            raise Exception(f"Error while opening clinic '{clinic_name}': {e}")
\ No newline at end of file
+            raise Exception(f"Error while opening clinic '{clinic_name}': {e}")
+
+    def remove_multiple_bundes_from_clinic(self, bundles, clinic_id=None):
+        """
+        :param bundles: List of dictionaries containing bundle details (e.g., {'id': str, 'name': str}).
+        :param clinic_id: ID of the clinic to which the bundles will be removed (optional).
+        """
+        try:
+            if clinic_id:
+                self.search_and_open_clinic(clinic_id)
+
+            for bundle in bundles:
+                try:
+                    self.utils.fill_text_field(ClinicSelectors.INPUT_BUNDLE_ASSIGNED_SEARCH, bundle['name'])
+
+                    bundle_selector = ClinicSelectors.INPUT_BUNDLE(bundle['id'])
+                    WebDriverWait(self.driver, 10).until(
+                        EC.presence_of_element_located(bundle_selector)
+                    )
+                    self.utils.scroll_to_element(ClinicSelectors.BUTTON_MOVE_ITEM(bundle['id']))
+                    self.utils.click_element(ClinicSelectors.BUTTON_MOVE_ITEM(bundle['id']))
+                except TimeoutException:
+                    raise Exception(f"Timeout while assigning bundle '{bundle['name']}'.")
+                except Exception as e:
+                    raise Exception(f"Error while assigning bundle '{bundle['name']}': {e}")
+        except Exception as e:
+            raise Exception(f"Error while assigning multiple bundles: {e}")
+
+    def remove_multiple_users_from_clinic(self, usernames, clinic_id=None):
+        """
+        :param usernames: List of usernames.
+        :param clinic_id: ID of the clinic to which the bundles will be removed (optional).
+        """
+        try:
+            if clinic_id:
+                self.search_and_open_clinic(clinic_id)
+
+            for username in usernames:
+                try:
+                    self.utils.fill_text_field(ClinicSelectors.INPUT_USER_ASSIGNED_SEARCH, username)
+
+                    user_selector = ClinicSelectors.INPUT_USER(username)
+                    WebDriverWait(self.driver, 10).until(
+                        EC.presence_of_element_located(user_selector)
+                    )
+                    self.utils.scroll_to_element(ClinicSelectors.BUTTON_MOVE_ITEM(username))
+                    self.utils.click_element(ClinicSelectors.BUTTON_MOVE_ITEM(username))
+                except TimeoutException:
+                    raise Exception(f"Timeout while assigning user '{username}'.")
+                except Exception as e:
+                    raise Exception(f"Error while assigning user '{username}': {e}")
+        except Exception as e:
+            raise Exception(f"Error while assigning multiple users: {e}")
\ No newline at end of file
diff --git a/selenium/helper/Encounter.py b/selenium/helper/Encounter.py
new file mode 100644
index 00000000..600a271c
--- /dev/null
+++ b/selenium/helper/Encounter.py
@@ -0,0 +1,167 @@
+from enum import Enum
+
+from selenium.common import TimeoutException
+from selenium.webdriver.chrome.webdriver import WebDriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+
+from helper.Navigation import NavigationHelper
+from helper.SeleniumUtils import SearchBoxSelectors, SeleniumUtils
+
+
+class EncounterSurveyLanguages(Enum):
+    DE_DE = "de_DE"
+    EN_GB = "en_GB"
+    ES_ES = "es_ES"
+    FR_FR = "fr_FR"
+    HI_IN = "hi_IN"
+    IT_IT = "it_IT"
+    NL_NL = "nl_NL"
+    NO_NO = "no_NO"
+    PL_PL = "pl_PL"
+    PT_PT = "pt_PT"
+    RU_RU = "ru_RU"
+    SV_SE = "sv_SE"
+    TR_TR = "tr_TR"
+    AR = "ar"
+    FA_IR = "fa_IR"
+    DARI = "dari"
+    KU = "ku"
+
+class EncounterScheduleType(Enum):
+    UNIQUELY = "UNIQUELY"
+    REPEATEDLY = "REPEATEDLY"
+    WEEKLY = "WEEKLY"
+    MONTHLY = "MONTHLY"
+
+
+class EncounterSelectors:
+    BUTTON_ENCOUNTER_TABLE = (By.ID, "encounter-tablink")
+    BUTTON_ENCOUNTER_SCHEDULE_TABLE = (By.ID, "encounterScheduled-tablink")
+    BUTTON_EXECUTE_ENCOUNTER = (By.ID, "executeEncounter")
+    BUTTON_SCHEDULE_ENCOUNTER = (By.ID, "scheduleEncounter")
+    BUTTON_SAVE_SCHEDULED_ENCOUNTER = (By.ID, "saveButton")
+
+    INPUT_SCHEDULE_CASE_NUMBER = (By.ID, "caseNumber")
+    INPUT_SCHEDULE_EMAIL = (By.ID, "email")
+    INPUT_DATE= (By.ID, "startDate")
+    INPUT_TIME_PERIOD = (By.ID, "repeatPeriod")
+    INPUT_END_DATE = (By.ID, "endDate")
+    INPUT_PERSONAL_TEXT= (By.ID, "personalText")
+
+    SELECT_SCHEDULE_CLINIC = (By.ID, "activeClinicDTO")
+    SELECT_SCHEDULE_BUNDLE = (By.ID, "bundleDTO.id")
+    SELECT_SURVEY_TYPE = (By.ID, "encounterScheduledSerialType")
+    SELECT_LANGUAGE = (By.ID, "locale")
+
+    TABLE_ALL_ENCOUNTERS = (By.ID, "encounterTable")
+    TABLE_SCHEDULED_ENCOUNTERS = (By.ID, "encounterScheduled")
+    TABLE_ACTION_COLUMN=(By.CSS_SELECTOR, "td.actionColumn")
+
+    PAGINATION_ENCOUNTER_SCHEDULE_TABLE = (By.ID, "encounterScheduled_paginate")
+    PAGINATION_ENCOUNTER_TABLE = (By.ID, "encounterTable_paginate")
+
+    SEARCH_ALL_ENCOUNTERS = (By.ID, "encounterTable_filter")
+    SEARCH_SCHEDULED_ENCOUNTERS = (By.ID, "encounterScheduled_filter")
+
+class EncounterHelper:
+
+    def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
+        self.driver = driver
+        self.utils = SeleniumUtils(driver)
+        self.navigation_helper = navigation_helper
+
+    def schedule_encounter(self, case_number, clinic, bundle, email, survey_type, start_date, time_period_days=7, end_date=None, language=EncounterSurveyLanguages.DE_DE.value, message=""):
+        """
+        :param case_number: case number of type string.
+        :param clinic: clinic name of type string.
+        :param bundle: bundle name of type string.
+        :param email: email of type string.
+        :param survey_type: survey type of type EncounterScheduleType enum.
+        :param start_date: A string representing the date to set (e.g., "2024-12-20").
+        :param time_period_days: time period in days of type int.
+        :param end_date: A string representing the date to set (e.g., "2024-12-20").
+        :param language: language of type EncounterSurveyLanguages enum.
+        :param message: message of type string.
+        """
+
+        try:
+            self.utils.fill_text_field(EncounterSelectors.INPUT_SCHEDULE_CASE_NUMBER, case_number)
+            self.utils.select_dropdown(EncounterSelectors.SELECT_SCHEDULE_CLINIC, clinic)
+            self.utils.select_dropdown(EncounterSelectors.SELECT_SCHEDULE_BUNDLE, bundle)
+            self.utils.fill_text_field(EncounterSelectors.INPUT_SCHEDULE_EMAIL, email)
+            self.driver.execute_script("document.getElementById('startDate').valueAsDate = new Date(arguments[0]);", start_date)
+            self.driver.execute_script("document.getElementById('startDate').dispatchEvent(new Event('blur'));")
+        
+        except Exception as e:
+            print("Error filling schedule encounter form elements ", e)
+            
+        try:
+            if survey_type == EncounterScheduleType.REPEATEDLY:
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "REPEATEDLY", method="value")
+                self.utils.fill_text_field(EncounterSelectors.INPUT_TIME_PERIOD, time_period_days)
+                if end_date is not None:
+                    self.driver.execute_script("document.getElementById('endDate').valueAsDate = new Date(arguments[0]);", end_date)
+                    self.driver.execute_script("document.getElementById('endDate').dispatchEvent(new Event('blur'));")
+            elif survey_type == EncounterScheduleType.WEEKLY:
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "WEEKLY", method="value")
+                if end_date is not None:
+                    self.driver.execute_script("document.getElementById('endDate').valueAsDate = new Date(arguments[0]);", end_date)
+                    self.driver.execute_script("document.getElementById('endDate').dispatchEvent(new Event('blur'));")        
+            elif survey_type == EncounterScheduleType.MONTHLY:
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "MONTHLY", method="value")
+                if end_date is not None:
+                    self.driver.execute_script("document.getElementById('endDate').valueAsDate = new Date(arguments[0]);", end_date)
+                    self.driver.execute_script("document.getElementById('endDate').dispatchEvent(new Event('blur'));")
+            else:
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "UNIQUELY", method="value")
+            
+        except Exception as e:
+            print("Error filling schedule encounter form elements ", e)
+
+        try:
+            self.utils.select_dropdown(EncounterSelectors.SELECT_LANGUAGE, language, method="value")
+            self.utils.fill_text_field(EncounterSelectors.INPUT_PERSONAL_TEXT, message)
+            self.utils.click_element(EncounterSelectors.BUTTON_SAVE_SCHEDULED_ENCOUNTER)
+
+        except Exception as e:
+            print("Error clicking schedule encounter button ", e)
+
+        self.navigation_helper.navigate_to_manage_surveys()
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+
+        # Search for the bundle by name
+        self.utils.fill_text_field(SearchBoxSelectors.SCHEDULED_ENCOUNTER, case_number)
+
+        scheduled_encounter_id=None
+        try:
+            WebDriverWait(self.driver, 10).until(
+            EC.presence_of_element_located((By.XPATH, f"//span[text()='{email}']"))
+            )
+            span = self.driver.find_element(By.XPATH, f"//span[text()='{email}']")
+
+            href = span.get_attribute("href")
+            scheduled_encounter_id = href.split("#")[1].split("_")[0]
+        except TimeoutException:
+            print(f"Could not find the span with email: {email}")
+
+        return scheduled_encounter_id
+    
+
+    def delete_scheduled_encounter(self, scheduled_encounter_id, case_number):
+
+        self.navigation_helper.navigate_to_manage_surveys()
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+        search_box_selector = SearchBoxSelectors.SCHEDULED_ENCOUNTER
+        button_id = f"removeScheduleEncounter_{scheduled_encounter_id}"
+
+
+        try:
+            # Search for the element using the appropriate search box
+            self.utils.fill_text_field(search_box_selector, case_number)
+
+            # click the remove button
+            self.utils.click_element((By.ID, button_id))
+        except TimeoutException:
+            print(f"Failed to delete scheduled encounter '{scheduled_encounter_id}'.")
\ No newline at end of file
diff --git a/selenium/helper/Language.py b/selenium/helper/Language.py
new file mode 100644
index 00000000..c10f4edb
--- /dev/null
+++ b/selenium/helper/Language.py
@@ -0,0 +1,23 @@
+from helper.Navigation import NavigationHelper
+from helper.SeleniumUtils import SeleniumUtils
+
+from selenium.common import TimeoutException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
+class LanguageSelectors:
+    LANGUAGE_DROPDOWN_BUTTON = (By.CSS_SELECTOR, "#languageDropdown > a")
+    LANGUAGE_DROPDOWN = (By.ID, "addLanguageDropdown")
+
+class LanguageHelper:
+    def __init__(self, driver, navigation_helper: NavigationHelper):
+        self.driver = driver
+        self.utils = SeleniumUtils(driver, navigation_helper)
+
+    def open_language_dropdown(self):
+        try:
+            self.utils.click_element(LanguageSelectors.LANGUAGE_DROPDOWN_BUTTON)
+        except Exception as e:
+            raise Exception(f"Failed to open language dropdown: {e}")
+    
\ No newline at end of file
diff --git a/selenium/helper/Navigation.py b/selenium/helper/Navigation.py
index df67bbcf..50d6c7a1 100644
--- a/selenium/helper/Navigation.py
+++ b/selenium/helper/Navigation.py
@@ -10,6 +10,8 @@ class NavigationBarSelectors:
     class UserMenu:
         BUTTON = (By.ID, "userDropdownLink")
         MAIL_TO_ALL_LINK = (By.ID, "mailToAllLink")
+        MANAGE_USER_LINK = (By.ID, "managerUserLink")
+        MANAGE_INVITATIONS_LINK = (By.ID, "manageInvitationLink")
 
     class QuestionnaireMenu:
         BUTTON = (By.ID, "questionnaireDropdownLink")
@@ -22,6 +24,12 @@ class BundleMenu:
     class ClinicMenu:
         LINK = (By.ID, "clinicLink")
 
+    class SurveysMenu:
+        BUTTON = (By.ID, "surveyDropdownLink")
+        MANAGE_SURVEY_LINK = (By.ID, "manageSurveyLink")
+        SCHEDULE_SURVEY_LINK = (By.ID, "scheduleSurveyLink")
+        EXECUTE_SURVEY_LINK = (By.ID, "executeSurveyLink")
+
 class QuestionTableSelectors:
     EDIT_QUESTION_LINK = lambda question_id: (By.XPATH, f'//a[@href="fill?id={question_id}"]')
     EDIT_QUESTIONS_CONDITIONS_LINK = lambda question_id: (By.XPATH, f'//a[@href="/condition/listQuestionConditions?questionId={question_id}"]')
@@ -93,4 +101,45 @@ def search_and_open_questionnaire(self, questionnaire_name):
     def open_question(self, question_id):
         question_link = WebDriverWait(self.driver, 10).until(EC.element_to_be_clickable(
             QuestionTableSelectors.EDIT_QUESTION_LINK(question_id)))
-        question_link.click()
\ No newline at end of file
+        question_link.click()
+
+    def navigate_to_manage_surveys(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.SurveysMenu.BUTTON)
+            self.utils.click_element(NavigationBarSelectors.SurveysMenu.MANAGE_SURVEY_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Manage Surveys': {e}")
+
+    def navigate_to_schedule_survey(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.SurveysMenu.BUTTON)
+            self.utils.click_element(NavigationBarSelectors.SurveysMenu.SCHEDULE_SURVEY_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Schedule Survey': {e}")
+
+    def navigate_to_execute_survey(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.SurveysMenu.BUTTON)
+            self.utils.click_element(NavigationBarSelectors.SurveysMenu.EXECUTE_SURVEY_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Execute Survey': {e}")
+
+    def navigate_to_manager_user(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.UserMenu.BUTTON)
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(NavigationBarSelectors.UserMenu.MANAGE_USER_LINK)
+            )
+            self.utils.click_element(NavigationBarSelectors.UserMenu.MANAGE_USER_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Manage Users': {e}")
+
+    def navigate_to_manage_invitations(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.UserMenu.BUTTON)
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(NavigationBarSelectors.UserMenu.MANAGE_INVITATIONS_LINK)
+            )
+            self.utils.click_element(NavigationBarSelectors.UserMenu.MANAGE_INVITATIONS_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Manage Invitations': {e}")
\ No newline at end of file
diff --git a/selenium/helper/SeleniumUtils.py b/selenium/helper/SeleniumUtils.py
index 64165d77..324aaf15 100644
--- a/selenium/helper/SeleniumUtils.py
+++ b/selenium/helper/SeleniumUtils.py
@@ -1,13 +1,13 @@
-import time
-from enum import Enum, auto
+from enum import Enum
 
+from selenium.common.exceptions import TimeoutException, ElementClickInterceptedException
+from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
-from selenium.common.exceptions import TimeoutException, ElementClickInterceptedException
 from selenium.webdriver.support.ui import Select
-from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.common.action_chains import ActionChains
+from selenium.webdriver.support.ui import WebDriverWait
+
 
 class RemoveButtonSelectors:
     QUESTIONNAIRE = "removeQuestionnaire_{}"
@@ -18,12 +18,18 @@ class SearchBoxSelectors:
     QUESTIONNAIRE = (By.CSS_SELECTOR, "#questionnaireTable_filter input[type='search']")
     BUNDLE = (By.CSS_SELECTOR, "#bundleTable_filter input[type='search']")
     CLINIC = (By.CSS_SELECTOR, "#clinicTable_filter input[type='search']")
+    SCHEDULED_ENCOUNTER = (By.CSS_SELECTOR, "#encounterScheduled_filter input[type='search']")
+    INVITATION = (By.CSS_SELECTOR, "#invitationTable_filter input[type='search']")
 
 class DropdownMethod(Enum):
     VISIBLE_TEXT = "visible_text"
     VALUE = "value"
     INDEX = "index"
 
+class ErrorSelectors:
+    INPUT_VALIDATION_SELECTOR=(By.CLASS_NAME, "validationError")
+    CONFIGURATION_ERROR_SELECTOR=(By.CLASS_NAME, "configurationError")
+
 class SeleniumUtils:
     def __init__(self, driver, navigation_helper = None):
         self.driver = driver
@@ -65,7 +71,7 @@ def fill_text_field(self, selector, text):
     def fill_number_field(self, selector, number):
         """
         :param selector: A tuple representing the element locator (e.g., (By.ID, "text_field_id")).
-        :param text: The text to input into the text field.
+        :param number: The number to input into the field.
         """
         try:
             text_field = WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(
@@ -339,3 +345,27 @@ def drag_and_drop(self, source_selector, target_selector):
         # Perform the drag-and-drop action
         ActionChains(self.driver).drag_and_drop(source_element, target_element).perform()
 
+    def search_item(self, item_name, item_type):
+        """
+        :param item_name: The name of the item to search for.
+        :param item_type: The type of the item to delete (e.g., "questionnaire", "bundle", "clinic").
+        """
+        try:
+            # Initialize variables based on the item type
+            if item_type == "questionnaire":
+                self.navigator.navigate_to_manage_questionnaires()
+                search_box_selector = SearchBoxSelectors.QUESTIONNAIRE
+            elif item_type == "bundle":
+                self.navigator.navigate_to_manage_bundles()
+                search_box_selector = SearchBoxSelectors.BUNDLE
+            elif item_type == "clinic":
+                self.navigator.navigate_to_manage_clinics()
+                search_box_selector = SearchBoxSelectors.CLINIC
+            else:
+                raise ValueError(f"Unknown item type: {item_type}")
+
+            # Search for the element using the appropriate search box
+            self.fill_text_field(search_box_selector, item_name)
+
+        except Exception as e:
+            raise Exception(f"An error occurred while searching for {item_type} '{item_name}'")
\ No newline at end of file
diff --git a/selenium/helper/User.py b/selenium/helper/User.py
new file mode 100644
index 00000000..b664eeeb
--- /dev/null
+++ b/selenium/helper/User.py
@@ -0,0 +1,132 @@
+from enum import Enum
+from selenium.webdriver.chrome.webdriver import WebDriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
+from helper.Navigation import NavigationHelper
+from helper.SeleniumUtils import SearchBoxSelectors, SeleniumUtils
+
+class UserSelector:
+    BUTTON_INVITE_USER = (By.ID, "newInvitationButton")
+    BUTTON_ADD_USER = (By.ID, "addInvitationButton")
+    BUTTON_MOVE_CLINIC = lambda id: (By.ID, f"{id}")
+    BUTTON_SEND_INVITE = (By.ID, "inviteButton")
+    BUTTON_EDIT_INVITE = (By.ID, "editInvite")
+    BUTTON_REMOVE_INVITATION = (By.CLASS_NAME, "removeInvitationButton")
+    BUTTON_PREVIEW = (By.ID, "previewButton")
+    BUTTON_MAIL_PREVIEW = (By.ID, "mailPreviewButton")
+    BUTTON_MAIL_TO_ALL = (By.ID, "mailButton")
+
+    INPUT_USER_FIRST_NAME = lambda index: (By.ID, f"invitationUsers{index}.firstName")
+    INPUT_USER_LAST_NAME = lambda index: (By.ID, f"invitationUsers{index}.lastName")
+    INPUT_USER_EMAIL = lambda index: (By.ID, f"invitationUsers{index}.email")
+    INPUT_PERSONAL_TEXT = (By.ID, "personalText")
+    INPUT_CSV = (By.CLASS_NAME, "file-input")
+    INPUT_SUBJECT = (By.ID, "subject")
+    INPUT_MESSAGE = (By.ID, "mailContent")
+
+    SELECT_USER_ROLE = (By.ID, "userRoleSelect")
+    SELECT_USER_LANGUAGE = (By.ID, "userLanguageSelect")
+    SELECT_MAIL_LANGUAGE = (By.ID, "language")
+
+    TABLE_USERS = (By.ID, "userTable")
+    TABLE_INVITAIONS = (By.ID, "invitationTable")
+    TABLE_ACTION_BUTTONS= (By.CSS_SELECTOR, "td.actionColumn")
+    TABLE_AVAILABLE_CLINICS = (By.ID, "availableClinicsTable")
+    TABLE_ASSIGNED_CLINICS = (By.ID, "assignedClinicsTable")
+    
+    PAGINATION_USER_TABLE = (By.ID, "userTable_paginate")
+    PAGINATION_INVITATION_TABLE = (By.ID, "invitationTable_paginate")
+
+    DIV_PREVIEW = (By.ID, "previewDiv")
+    DIV_PREVIEW_MAIL = (By.ID, "preview")
+
+
+class UserRoles(Enum):
+    ADMIN = "ROLE_USER"
+    USER = "ROLE_USER"
+    MODERATOR = "ROLE_MODERATOR"
+    ENCOUNTERMANAGER = "ROLE_ENCOUNTERMANAGER"
+    EDITOR = "ROLE_EDITOR"
+
+class UserHelper:
+    def __init__(self, driver: WebDriver, navigation_helper: NavigationHelper):
+        self.driver = driver
+        self.navigation_helper = navigation_helper
+        self.utils = SeleniumUtils(driver)
+
+    def invite_user(self, users, role=UserRoles.USER, language="DEUTSCH", invite_message=None, clinic=None):
+        """
+        :param users: An array of user json objects like {"first_name": str, "last_name":str, "email":str}.
+        :param role: The role of the user to be invited.
+        :param language: The language of the invitation email.
+        :param invite_message: The message to be sent with the invitation.
+        :param clinic: The array of clinics to which the user is invited.
+        """
+        try:
+            self.navigation_helper.navigate_to_manager_user()
+
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(UserSelector.BUTTON_INVITE_USER)
+            )
+
+            self.utils.click_element(UserSelector.BUTTON_INVITE_USER)
+            
+            for index in range(len(users)):
+                try:
+                    WebDriverWait(self.driver, 10).until(
+                    EC.element_to_be_clickable(UserSelector.INPUT_USER_FIRST_NAME(index))
+                    )
+                    self.utils.fill_text_field(UserSelector.INPUT_USER_FIRST_NAME(index), users[index]['first_name'])
+                    self.utils.fill_text_field(UserSelector.INPUT_USER_LAST_NAME(index), users[index]['last_name'])
+                    self.utils.fill_text_field(UserSelector.INPUT_USER_EMAIL(index), users[index]['email'])
+                    self.utils.click_element(UserSelector.BUTTON_ADD_USER)
+                except Exception as e:
+                    raise Exception(f"Failed to fill user data: {e}")
+            
+            self.utils.select_dropdown(UserSelector.SELECT_USER_ROLE, role.value)
+            self.utils.select_dropdown(UserSelector.SELECT_USER_LANGUAGE, language)
+            if invite_message:
+                self.utils.fill_text_field(UserSelector.INPUT_PERSONAL_TEXT, invite_message)
+
+            if clinic:
+                try:
+                    for c in clinic:
+                        self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(c))
+                except Exception as e:
+                    raise Exception(f"Failed to move assign clinics to user while inviting: {e}")
+                
+            self.utils.click_element(UserSelector.BUTTON_INVITE_USER)
+                
+        except Exception as e:
+            raise Exception(f"Failed to invite user: {e}")
+        
+    def send_invite(self, users):
+        """
+        :param users: An array of user json objects like {"first_name": str, "last_name":str, "email":str}.
+        """
+        try:
+            # send the invite
+            self.utils.click_element(UserSelector.BUTTON_SEND_INVITE)
+
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located((By.ID, "invitationTable"))
+            )
+            invite_ids = []
+            for user in users:
+            # Search for the bundle by name
+                self.utils.fill_text_field(SearchBoxSelectors.INVITATION, user['email'])
+
+                # Extract the bundle ID from the link
+                edit_link = WebDriverWait(self.driver, 10).until(
+                    EC.presence_of_element_located((UserSelector.BUTTON_EDIT_INVITE))
+                )
+                invite_id = edit_link.get_attribute("href").split("id=")[1]
+                if invite_id:
+                    invite_ids.append(invite_id)
+            
+            return invite_ids
+
+        except Exception as e:
+            raise Exception(f"Error while inviting users: {e}")
\ No newline at end of file
diff --git a/selenium/user_test.py b/selenium/user_test.py
new file mode 100644
index 00000000..916bfb38
--- /dev/null
+++ b/selenium/user_test.py
@@ -0,0 +1,457 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import unittest
+
+from helper.User import UserSelector
+from selenium import webdriver
+from selenium.common.exceptions import TimeoutException
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from webdriver_manager.chrome import ChromeDriverManager
+
+from helper.Authentication import AuthenticationHelper
+from helper.Bundle import BundleHelper
+from helper.Clinic import ClinicHelper
+from helper.Condition import ConditionHelper
+from helper.Language import LanguageHelper
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper
+from helper.Questionnaire import QuestionnaireHelper
+from helper.Score import ScoreHelper
+from helper.SeleniumUtils import SeleniumUtils, ErrorSelectors
+from helper.Survey import SurveyHelper, SurveyAssertHelper
+from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
+
+
+class URLPaths:
+    ADMIN_INDEX = "/admin/index"
+    ADMIN_INDEX_DE = "/admin/index?lang=de_DE"
+    MOBILE_USER_LOGIN = "/mobile/user/login"
+    MOBILE_USER_LOGIN_DE = "/mobile/user/login?lang=de_DE"
+    MOBILE_SURVEY_INDEX = "/mobile/survey/index"
+    LOGIN_BAD_CREDENTIALS = "/mobile/user/login?message=BadCredentialsException"
+    LOGIN_DISABLED_EXCEPTION = "/mobile/user/login?message=DisabledException"
+    PASSWORD_FORGOT = "/mobile/user/password"
+
+
+class EmailSelectors:
+    SUBJECT_INPUT = (By.ID, "subject")
+    CONTENT_INPUT = (By.ID, "mailContent")
+    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
+    SEND_BUTTON = (By.ID, "mailButton")
+
+
+class PasswordResetSelectors:
+    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+    USERNAME_INPUT = (By.ID, "username")
+    ERROR_MESSAGE = (By.CLASS_NAME, "error")
+
+
+class CustomTest(IMISeleniumChromeTest, unittest.TestCase):
+    seleniumMode: IMISeleniumBaseTest.SeleniumMode = IMISeleniumBaseTest.SeleniumMode.LOCAL
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.base_url = "localhost:8080"
+        cls.https_base_url = "http://localhost:8080"
+
+    def setUp(self):
+        chrome_options = Options()
+        # chrome_options.add_argument("--headless=new")
+        chrome_options.add_argument("start-maximized")
+        driver = webdriver.Chrome(options=chrome_options, service=Service(ChromeDriverManager().install()))
+        # Initialize the WebDriver
+        self.driver = webdriver.Chrome(options=chrome_options)
+
+        # Initialize Navigation and Utils
+        self.navigation_helper = NavigationHelper(self.driver)
+        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
+        self.navigation_helper.utils = self.utils
+
+        # Initialize other helpers
+        self.authentication_helper = AuthenticationHelper(self.driver)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.question_helper = QuestionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.condition_helper = ConditionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.score_helper = ScoreHelper(self.driver, navigation_helper=self.navigation_helper)
+
+        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
+        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
+
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
+        self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
+
+    def test_user_list(self):
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        # Act
+        self.navigation_helper.navigate_to_manager_user()
+
+        # Assert - Check if the user list is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.TABLE_USERS)
+            )
+        except:
+            self.fail("User list not displayed")
+
+        #Assert - Check if the elements for pagination is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.PAGINATION_USER_TABLE)
+            )
+        except:
+            self.fail("Pagination not displayed")
+
+        #Assert - Check if the elements for action buttons is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.TABLE_ACTION_BUTTONS)
+            )
+        except:
+            self.fail("Action buttons not displayed")
+        
+        #Assert - Check if the button to invite a user is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_INVITE_USER)
+            )
+        except:
+            self.fail("Invite user button not displayed")
+        
+    def test_invitation_edit(self):
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        #Arrange - Create a new clinic
+        clinic_name = "Test Clinic"
+        clinic_description = "This is a test clinic"
+        clinic_id = None
+        self.navigation_helper.navigate_to_manage_clinics()
+
+        try:
+            self.clinic_helper.create_clinic(clinic_name, clinic_description,
+                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],)
+            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+        except TimeoutException:
+            self.fail("Failed to create clinic")
+
+        #Arrange - Click on the user menu
+        self.navigation_helper.navigate_to_manager_user()
+
+        # Act
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_INVITE_USER)
+            )
+            self.utils.click_element(UserSelector.BUTTON_INVITE_USER)
+        except TimeoutException:
+            self.fail("User list not displayed")
+
+        #Assert - Check if the input fields are displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_FIRST_NAME(0))
+            )
+        except TimeoutException:
+            self.fail("First name input field not displayed")
+        
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_LAST_NAME(0))
+            )
+        except TimeoutException:
+            self.fail("Last name input field not displayed")
+        
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_EMAIL(0))
+            )
+        except TimeoutException:
+            self.fail("Email input field not displayed")
+        
+        #Assert - Check if add new user button is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_ADD_USER)
+            )
+            self.utils.click_element(UserSelector.BUTTON_ADD_USER)
+        except TimeoutException:
+            self.fail("Add user button not displayed")
+        
+        #Assert - Check if new user inputs are created
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_FIRST_NAME(1))
+            )
+        except TimeoutException:
+            self.fail("Second user's first name input field not displayed")
+        
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_LAST_NAME(1))
+            )
+        except TimeoutException:
+            self.fail("Second user's last name input field not displayed")
+        
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_EMAIL(1))
+            )
+        except TimeoutException:
+            self.fail("Second user's email input field not displayed")
+        
+        #Assert - Check if the remove user button is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_REMOVE_INVITATION)
+            )
+            self.utils.click_element(UserSelector.BUTTON_REMOVE_INVITATION)
+        except TimeoutException:
+            self.fail("Remove user button not displayed")
+        
+        #Assert - Check if the fields were removed
+        try:
+            WebDriverWait(self.driver, 10).until_not(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_FIRST_NAME(0))
+            )
+        except TimeoutException:
+            self.fail("First name input field still displayed")
+
+        try:
+            WebDriverWait(self.driver, 10).until_not(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_LAST_NAME(0))
+            )
+        except TimeoutException:
+            self.fail("Last name input field still displayed")
+        
+        try:
+            WebDriverWait(self.driver, 10).until_not(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_EMAIL(0))
+            )
+        except TimeoutException:
+            self.fail("Email input field still displayed")
+
+        #Assert - Check if the file upload button is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_CSV)
+            )
+        except TimeoutException:
+            self.fail("File upload button not displayed")
+        #Assert - Check if the role dropdown is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.SELECT_USER_ROLE)
+            )
+        except TimeoutException:
+            self.fail("Role dropdown not displayed")
+
+        #Assert - Check if the language dropdown is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.SELECT_USER_LANGUAGE)
+            )
+        except TimeoutException:
+            self.fail("Language dropdown not displayed")
+
+        #Assert - Check if input for invitation message is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.INPUT_PERSONAL_TEXT)
+            )
+        except TimeoutException:
+            self.fail("Invite message input field not displayed")
+        
+        #Assert - Check if the clinic table is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.TABLE_AVAILABLE_CLINICS)
+            )
+        except TimeoutException:
+            self.fail("Available clinic table not displayed")
+
+        #Assert - Check if the assigned clinics table is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.TABLE_ASSIGNED_CLINICS)
+            )
+        except TimeoutException:
+            self.fail("Assigned clinic table not displayed")
+
+        #Assert - Move clinic from available to assigned
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
+            )
+            self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
+        except TimeoutException:
+            self.fail("Move clinic button not displayed")
+
+        #Assert - Move clinic from assigned to available
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
+            )
+            self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
+        except TimeoutException:
+            self.fail("Move clinic button not displayed")
+
+        #Assert - Check validations
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_SEND_INVITE)
+            )
+            self.utils.click_element(UserSelector.BUTTON_SEND_INVITE)
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            )
+            validation_errors = self.driver.find_elements(*ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            self.assertEqual(len(validation_errors), 3, "Expected 3 validation errors, but found {len(validation_errors)}")
+
+        except TimeoutException:
+            self.fail("Validation error not displayed")
+
+        #Assert - Check if preview button works
+        try:
+            self.utils.fill_text_field(UserSelector.INPUT_USER_FIRST_NAME(0), "Test1")
+            self.utils.fill_text_field(UserSelector.INPUT_USER_LAST_NAME(0), "Test2")
+            self.utils.fill_text_field(UserSelector.INPUT_USER_EMAIL(0), "test@test.com")
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_PREVIEW)
+            )
+            self.utils.click_element(UserSelector.BUTTON_PREVIEW)
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.DIV_PREVIEW)
+            )
+        except TimeoutException:
+            self.fail("Preview not displayed")
+        finally:
+            if clinic_id:
+                self.utils.search_and_delete_item(clinic_name, clinic_id, "clinic")
+        
+    def test_user_mail_to_all(self):
+        test_subject = "Test Subject"
+        test_content = "Test Content"
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        self.navigation_helper.navigate_to_email_to_all_users()
+        
+        #Assert - Check if the subject input is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EmailSelectors.SUBJECT_INPUT)
+            )
+        except TimeoutException:
+            self.fail("Subject input field not displayed")
+
+        #Assert - Check if the content input is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EmailSelectors.CONTENT_INPUT)
+            )
+        except TimeoutException:
+            self.fail("Content input field not displayed")
+            
+        #Assert - Check if the language dropdown is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.SELECT_MAIL_LANGUAGE)
+            )
+        except TimeoutException:
+            self.fail("Language dropdown not displayed")
+
+        #Assert - Check if the preview button is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EmailSelectors.MAIL_PREVIEW_BUTTON)
+            )
+        except TimeoutException:
+            self.fail("Preview button not displayed")
+
+        #Assert - Check if the send button is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(EmailSelectors.SEND_BUTTON)
+            )
+        except TimeoutException:
+            self.fail("Send button not displayed")
+
+        #Assert - Check if the preview button works
+        try:
+            self.utils.fill_text_field(EmailSelectors.SUBJECT_INPUT, test_subject)
+            self.utils.fill_text_field(EmailSelectors.CONTENT_INPUT, test_content)
+            self.utils.click_element(EmailSelectors.MAIL_PREVIEW_BUTTON)
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.DIV_PREVIEW_MAIL)
+            )
+        except TimeoutException:
+            self.fail("Preview not displayed")
+
+    def test_invitation_list(self):
+        # Arrange
+        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
+            self.skipTest("User AD credentials missing. Test skipped.")
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        # Act
+        self.navigation_helper.navigate_to_manage_invitations()
+
+        #Assert - Check if the user list is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.TABLE_INVITAIONS)
+            )
+        except:
+            self.fail("User list not displayed")
+
+        #Assert - Check if the elements for pagination is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.PAGINATION_INVITATION_TABLE)
+            )
+        except:
+            self.fail("Pagination not displayed")
+
+        #Assert - Check if the elements for action buttons is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.TABLE_ACTION_BUTTONS)
+            )
+        except:
+            self.fail("Action buttons not displayed")
+        
+        #Assert - Check if the button to invite a user is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_INVITE_USER)
+            )
+        except:
+            self.fail("Invite user button not displayed")
+
+
+
+    def tearDown(self):
+        if self.driver:
+            self.driver.quit()
+
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file

From ea09fb294e8fe76fe35b7737ccf05b7040dde9a5 Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Thu, 13 Feb 2025 14:24:16 +0100
Subject: [PATCH 11/20] merge bundle tests into main selenium tests

---
 selenium/helper/SeleniumUtils.py             |  12 +-
 selenium/selenium_tests.py                   | 148 +++++++++++++++++--
 src/main/webapp/WEB-INF/fragments/forms.html |   2 +-
 3 files changed, 148 insertions(+), 14 deletions(-)

diff --git a/selenium/helper/SeleniumUtils.py b/selenium/helper/SeleniumUtils.py
index 324aaf15..d30ed400 100644
--- a/selenium/helper/SeleniumUtils.py
+++ b/selenium/helper/SeleniumUtils.py
@@ -368,4 +368,14 @@ def search_item(self, item_name, item_type):
             self.fill_text_field(search_box_selector, item_name)
 
         except Exception as e:
-            raise Exception(f"An error occurred while searching for {item_type} '{item_name}'")
\ No newline at end of file
+            raise Exception(f"An error occurred while searching for {item_type} '{item_name}'")
+        
+    def check_visibility_of_element(self, selector, error_message):
+        """
+        :param selector: A tuple representing the element locator (e.g., (By.ID, "element_id")).
+        :param error_message: The error message to display when the element is not visible.
+        """
+        try:
+            WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(selector))
+        except TimeoutException:
+            raise Exception(error_message)
\ No newline at end of file
diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index b29ef0d4..50c1a8bc 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -15,7 +15,7 @@
 from selenium.webdriver.support import expected_conditions as EC
 
 from helper.Authentication import AuthenticationHelper, AuthenticationAssertHelper
-from helper.Bundle import BundleHelper
+from helper.Bundle import BundleHelper, BundleSelectors
 from helper.Clinic import ClinicHelper
 from helper.Condition import ConditionHelper, ConditionSelectors, ConditionAssertHelper
 from helper.Login import LoginHelper
@@ -23,8 +23,9 @@
 from helper.Question import QuestionHelper, QuestionAssertHelper, QuestionType
 from helper.Questionnaire import QuestionnaireHelper, QuestionnaireAssertHelper
 from helper.Score import ScoreHelper, ScoreAssertHelper
-from helper.SeleniumUtils import SeleniumUtils
+from helper.SeleniumUtils import SeleniumUtils, ErrorSelectors
 from helper.Survey import SurveyHelper, SurveyAssertHelper
+from helper.Language import LanguageSelectors, LanguageHelper
 
 loginHelper = LoginHelper()
 
@@ -150,12 +151,13 @@ def setUp(self):
         self.questionnaire_assert_helper = QuestionnaireAssertHelper(self.driver, self.navigation_helper)
         self.score_assert_helper = ScoreAssertHelper(self.driver, self.navigation_helper)
         self.condition_assert_helper = ConditionAssertHelper(self.driver, self.navigation_helper)
+        self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
 
-    def test_login_admin(self):
+    def _test_login_admin(self):
         if(self.secret['admin-username']!='' and self.secret['admin-password']!=''):
             self.driver.get(self.https_base_url)
 
-            loginHelper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+            self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
             WebDriverWait(self.driver, 10).until(EC.url_to_be(self.https_base_url + "admin/index"))
 
@@ -167,25 +169,25 @@ def test_login_admin(self):
         else:
             pass
 
-    def test_admin_interface_login(self):
+    def _test_admin_interface_login(self):
         self.driver.get(self.https_base_url)
         # a
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
         # b
         self.authentication_assert_helper.assert_mobile_user_password()
 
-    def test_admin_interface_index(self):
+    def _test_admin_interface_index(self):
         self.driver.get(self.https_base_url)
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         # c
         self.authentication_assert_helper.assert_admin_index()
 
         self.authentication_helper.logout()
 
-    def test_admin_interface_questionnaire_question_types_score(self):
+    def _test_admin_interface_questionnaire_question_types_score(self):
         self.driver.get(self.https_base_url)
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
         self.navigation_helper.navigate_to_manage_questionnaires()
 
         # d
@@ -219,9 +221,9 @@ def test_admin_interface_questionnaire_question_types_score(self):
 
         self.authentication_helper.logout()
 
-    def test_admin_interface_conditions(self):
+    def _test_admin_interface_conditions(self):
         self.driver.get(self.https_base_url)
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         # j
         # Create source and target questionnaires with specific question types and add the questionnaires to a bundle to enable selection as a condition target
@@ -255,6 +257,127 @@ def test_admin_interface_conditions(self):
 
         self.authentication_helper.logout()
 
+    def test_bundle_list(self):
+        bundle={}
+        created_questionnaire={}
+        clinic={}
+
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+        except Exception as e:
+            self.fail(f"Failed to navigate to 'Bundles' page: {e}")
+
+        self.utils.check_visibility_of_element(BundleSelectors.TABLE_BUNDLE, "Bundle table not found")
+
+        try:
+            bundle = self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle['id']=self.bundle_helper.save_bundle(bundle_name=bundle['name'])
+        except Exception as e:
+            self.fail(f"Failed to create bundle: {e}")
+    
+        self.utils.check_visibility_of_element(BundleSelectors.CELL_FLAGICON, "Flag icon not found")
+    
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            clinic["name"] = self.clinic_helper.create_clinic(bundles=[bundle],
+                                                              configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}])
+            clinic['id']=self.clinic_helper.save_clinic(clinic_name=clinic['name'])
+
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        # Assert - Find clinics assigned to the bundle
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+            self.utils.search_item(bundle["name"], "bundle")
+            bundle_row = self.bundle_helper.get_first_bundle_row()
+            bundle_row.find_element(By.CSS_SELECTOR, "td:nth-child(3)")
+            clinic_link = bundle_row.find_element(By.CSS_SELECTOR, "ul > li > a")
+            self.assertEqual(clinic_link.text, clinic["name"], f"Clinic name '{clinic["name"]}' not found in bundle row.")
+
+        except Exception as e:
+            self.fail(f"Failed to find clinic assigned to bundle: {e}")
+
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_BUNDLE_SEARCH, "Bundle table search box not found")
+        self.utils.check_visibility_of_element(BundleSelectors.PAGINATION_BUNDLE, "Bundle table pagination not found")
+        self.utils.check_visibility_of_element(BundleSelectors.BUTTON_ADD_BUNDLE, "Bundle add button not found")
+
+        try:
+            pass
+        finally:
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"], "clinic")
+            self.utils.search_and_delete_item(bundle["name"],bundle["id"], "bundle")
+            self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+
+        self.authentication_helper.logout()
+
+    def test_bundle_fill(self):
+        created_questionnaire = {}
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+        except Exception as e:
+            self.fail(f"Failed to navigate to 'Bundles' page: {e}")
+
+        self.utils.click_element(BundleSelectors.BUTTON_ADD_BUNDLE)
+        self.language_helper.open_language_dropdown()
+        self.utils.check_visibility_of_element(LanguageSelectors.LANGUAGE_DROPDOWN, "Failed to open language dropdown")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_NAME, "Failed to locate bundle input")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_EDITABLE_DESCRIPTION, "Failed to locate bundle description input")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_WELCOME_TEXT, "Failed to locate welcome input")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_END_TEXT, "Failed to locate end input")
+        self.utils.check_visibility_of_element(BundleSelectors.CHECKBOX_PUBLISH, "Failed to locate publish checkbox")
+        self.utils.check_visibility_of_element(BundleSelectors.CHECKBOX_NAME_PROGRESS, "Failed to locate name progress checkbox")
+        self.utils.check_visibility_of_element(BundleSelectors.CHECKBOX_PROGRESS_WHOLE_PACKAGE, "Failed to locate progress whole package checkbox")
+        self.utils.check_visibility_of_element(BundleSelectors.TABLE_AVAILABLE_QUESTIONNAIRES, "Available questionnaires table not found")
+        self.utils.check_visibility_of_element(BundleSelectors.TABLE_ASSIGNED_QUESTIONNAIRES, "Assigned questionnaires table not found")
+
+        #Assert - Test for assigning questionnaire to bundle
+        try:
+            self.bundle_helper.assign_multiple_questionnaires_to_bundle([created_questionnaire])
+        except Exception as e:
+            self.fail(f"Failed to assign questionnaire to bundle: {e}")
+
+        #Assert - Test for removing questionnaire to bundle
+        try:
+            self.bundle_helper.remove_multiple_questionnaires_from_bundle([created_questionnaire])
+        except Exception as e:
+            self.fail(f"Failed to assign questionnaire to bundle: {e}")
+
+        #Assert - Check form validation
+        try:
+            self.utils.click_element(BundleSelectors.BUTTON_SAVE)
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            )
+            validation_errors = self.driver.find_elements(*ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            self.assertEqual(len(validation_errors), 2, "Expected 2 validation errors, but found {len(validation_errors)}")
+        except Exception as e:
+            self.fail(f"Failed to save bundle: {e}")
+    
+        
+        #Finally
+        finally:
+            if(created_questionnaire):
+                self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+
+        self.authentication_helper.logout()
+    
     def tearDown(self): 
         self.driver.quit()
 
@@ -268,6 +391,7 @@ def _setServerDriver(self):
         options = webdriver.ChromeOptions()
         options.set_capability("acceptInsecureCerts", True)
         options.add_argument("--headless=new")
+        options.add_argument("--window-size=1920,1080")
         options.set_capability("selenoid:options", {
                                                     "enableVNC": False,
                                                     "enableVideo": False,
diff --git a/src/main/webapp/WEB-INF/fragments/forms.html b/src/main/webapp/WEB-INF/fragments/forms.html
index 4cf50da3..2e460a10 100644
--- a/src/main/webapp/WEB-INF/fragments/forms.html
+++ b/src/main/webapp/WEB-INF/fragments/forms.html
@@ -178,7 +178,7 @@
 	<div
 		th:if="${#fields.hasErrors(path)}"
 		th:errors="*{__${path}__}"
-		th:class="${not #strings.isEmpty(errorClazz)} ? ${errorClazz} : ''"
+		th:class="${not #strings.isEmpty(errorClazz)} ? ${errorClazz} : 'validationError'"
 		th:text="${#fields.errors(path)}"
 		style="color: red"
 	>

From 9ab28ee43218786507491786761a3227074e36da Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Thu, 13 Feb 2025 14:24:31 +0100
Subject: [PATCH 12/20] update bundle_tests

---
 selenium/bundle_test.py | 188 +++++++---------------------------------
 1 file changed, 33 insertions(+), 155 deletions(-)

diff --git a/selenium/bundle_test.py b/selenium/bundle_test.py
index e9991e5b..17f2f8ad 100644
--- a/selenium/bundle_test.py
+++ b/selenium/bundle_test.py
@@ -86,8 +86,9 @@ def setUp(self):
         self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
 
     def test_bundle_list(self):
-        bundle_name = "Test Bundle"
-        clinic_name = "Test Clinic"
+        bundle={}
+        created_questionnaire={}
+        clinic={}
 
         # Arrange
         if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
@@ -96,10 +97,7 @@ def test_bundle_list(self):
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         try:
-            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
-                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
-                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
-                                            question_types=[QuestionType.INFO_TEXT])
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
         except Exception as e:
             self.fail(f"Failed to create questionnaire: {e}")
 
@@ -108,39 +106,21 @@ def test_bundle_list(self):
         except Exception as e:
             self.fail(f"Failed to navigate to 'Bundles' page: {e}")
 
-        # Assert - Verify that the bundle table is available
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.TABLE_BUNDLE)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Bundle table not found")
+        self.utils.check_visibility_of_element(BundleSelectors.TABLE_BUNDLE, "Bundle table not found")
 
         try:
-            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
-            self.bundle_helper.save_bundle(bundle_name)
+            bundle = self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle['id']=self.bundle_helper.save_bundle(bundle_name=bundle['name'])
         except Exception as e:
             self.fail(f"Failed to create bundle: {e}")
     
-        #Assert - Verify that flag icons are visible
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.CELL_FLAGICON)
-            )
-        except Exception as e:
-            self.fail(f"Failed to verify flag icon: {e}")
-
-        self.utils.search_item(bundle_name, "bundle")
-        bundle_id = self.bundle_helper.get_bundle_id()
+        self.utils.check_visibility_of_element(BundleSelectors.CELL_FLAGICON, "Flag icon not found")
     
         try:
             self.navigation_helper.navigate_to_manage_clinics()
-            self.clinic_helper.create_clinic(clinic_name=clinic_name, 
-                                             clinic_description="Test Clinic Description",
-                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
-                                             bundles=[{'id': bundle_id, 'name': bundle_name}])
-            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+            clinic["name"] = self.clinic_helper.create_clinic(bundles=[bundle],
+                                                              configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}])
+            clinic['id']=self.clinic_helper.save_clinic(clinic_name=clinic['name'])
 
         except Exception as e:
             self.fail(f"Failed to create clinic: {e}")
@@ -148,48 +128,30 @@ def test_bundle_list(self):
         # Assert - Find clinics assigned to the bundle
         try:
             self.navigation_helper.navigate_to_manage_bundles()
-            self.utils.search_item(bundle_name, "bundle")
+            self.utils.search_item(bundle["name"], "bundle")
             bundle_row = self.bundle_helper.get_first_bundle_row()
             bundle_row.find_element(By.CSS_SELECTOR, "td:nth-child(3)")
             clinic_link = bundle_row.find_element(By.CSS_SELECTOR, "ul > li > a")
-            self.assertEqual(clinic_link.text, clinic_name, f"Clinic name '{clinic_name}' not found in bundle row.")
+            self.assertEqual(clinic_link.text, clinic["name"], f"Clinic name '{clinic["name"]}' not found in bundle row.")
 
         except Exception as e:
             self.fail(f"Failed to find clinic assigned to bundle: {e}")
 
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_BUNDLE_SEARCH, "Bundle table search box not found")
 
-        #Assert: Verify that search box is available
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.INPUT_BUNDLE_SEARCH)
-            )
-        except TimeoutException:
-            self.fail("Search box not found")
+        self.utils.check_visibility_of_element(BundleSelectors.PAGINATION_BUNDLE, "Bundle table pagination not found")
 
-        #Assert: Verify that pagination is available
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.PAGINATION_BUNDLE)
-            )
-        except TimeoutException:
-            self.fail("Pagination not found ")
+        self.utils.check_visibility_of_element(BundleSelectors.BUTTON_ADD_BUNDLE, "Bundle add button not found")
 
-        #Assert: Verify that add new bundle button is available
         try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.BUTTON_ADD_BUNDLE)
-            )
-        except TimeoutException:
-            self.fail("Add button not found ")
-
-        #Finally
+            pass
         finally:
-            self.utils.search_and_delete_item(clinic_name,clinic_id, "clinic")
-            self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"], "clinic")
+            self.utils.search_and_delete_item(bundle["name"],bundle["id"], "bundle")
             self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
 
     def test_bundle_fill(self):
-        bundle_name = "Test Bundle"
+        created_questionnaire = {}
         # Arrange
         if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
             self.skipTest("User AD credentials missing. Test skipped.")
@@ -197,10 +159,7 @@ def test_bundle_fill(self):
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         try:
-            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
-                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
-                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
-                                            question_types=[QuestionType.INFO_TEXT])
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
         except Exception as e:
             self.fail(f"Failed to create questionnaire: {e}")
 
@@ -210,87 +169,17 @@ def test_bundle_fill(self):
             self.fail(f"Failed to navigate to 'Bundles' page: {e}")
 
         self.utils.click_element(BundleSelectors.BUTTON_ADD_BUNDLE)
-        
-        #Assert - Visibility of language dropdown
-        try:
-            self.language_helper.open_language_dropdown()
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(LanguageSelectors.LANGUAGE_DROPDOWN)
-            )
-        except Exception as e:  
-            self.fail(f"Failed to open language dropdown: {e}")
-
-        #Assert - Visibility of bundle name input
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.INPUT_NAME)
-            )
-        except Exception as e:  
-            self.fail(f"Failed to locate bundle input: {e}")
-
-        #Assert - Visibility of bundle description input
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.INPUT_EDITABLE_DESCRIPTION)
-            )
-        except Exception as e:  
-            self.fail(f"Failed to locate bundle description: {e}")
-
-        #Assert - Visibility of bundle welcome input
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.INPUT_WELCOME_TEXT)
-            )
-        except Exception as e:  
-            self.fail(f"Failed to locate welcome input: {e}")
-
-        #Assert - Visibility of bundle welcome input
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(BundleSelectors.INPUT_END_TEXT)
-            )
-        except Exception as e:  
-            self.fail(f"Failed to locate end input: {e}")
-        
-        # Assert - Visibility of publish checkbox
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.visibility_of_element_located(BundleSelectors.CHECKBOX_PUBLISH)
-            )
-        except TimeoutException:
-            self.fail("Publish checkbox not found ")
-
-        # Assert - Visibility of name progress checkbox
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.visibility_of_element_located(BundleSelectors.CHECKBOX_NAME_PROGRESS)
-            )
-        except TimeoutException:
-            self.fail("Name progress checkbox not found ")
-
-        # Assert - Visibility of progress whole package checkbox
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.visibility_of_element_located(BundleSelectors.CHECKBOX_PROGRESS_WHOLE_PACKAGE)
-            )
-        except TimeoutException:
-            self.fail("Progress whole package checkbox not found ")
-
-        # Assert - Visibility of available questionnaires table
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.visibility_of_element_located(BundleSelectors.TABLE_AVAILABLE_QUESTIONNAIRES)
-            )
-        except TimeoutException:
-            self.fail("Available questionnaires table not found")
-
-        # Assert - Visibility of assigned questionnaires table
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.visibility_of_element_located(BundleSelectors.TABLE_ASSIGNED_QUESTIONNAIRES)
-            )
-        except TimeoutException:
-            self.fail("Assigned questionnaires table not found")
+        self.language_helper.open_language_dropdown()
+        self.utils.check_visibility_of_element(LanguageSelectors.LANGUAGE_DROPDOWN, "Failed to open language dropdown")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_NAME, "Failed to locate bundle input")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_EDITABLE_DESCRIPTION, "Failed to locate bundle description input")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_WELCOME_TEXT, "Failed to locate welcome input")
+        self.utils.check_visibility_of_element(BundleSelectors.INPUT_END_TEXT, "Failed to locate end input")
+        self.utils.check_visibility_of_element(BundleSelectors.CHECKBOX_PUBLISH, "Failed to locate publish checkbox")
+        self.utils.check_visibility_of_element(BundleSelectors.CHECKBOX_NAME_PROGRESS, "Failed to locate name progress checkbox")
+        self.utils.check_visibility_of_element(BundleSelectors.CHECKBOX_PROGRESS_WHOLE_PACKAGE, "Failed to locate progress whole package checkbox")
+        self.utils.check_visibility_of_element(BundleSelectors.TABLE_AVAILABLE_QUESTIONNAIRES, "Available questionnaires table not found")
+        self.utils.check_visibility_of_element(BundleSelectors.TABLE_ASSIGNED_QUESTIONNAIRES, "Assigned questionnaires table not found")
 
         #Assert - Test for assigning questionnaire to bundle
         try:
@@ -314,21 +203,10 @@ def test_bundle_fill(self):
             self.assertEqual(len(validation_errors), 2, "Expected 2 validation errors, but found {len(validation_errors)}")
         except Exception as e:
             self.fail(f"Failed to save bundle: {e}")
-        
-        #Assert - Create a bundle with a questionnaire
-        try:
-            self.navigation_helper.navigate_to_manage_bundles()
-            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
-            self.bundle_helper.save_bundle(bundle_name)
-        except Exception as e:
-            self.fail(f"Failed to create bundle: {e}")
+    
         
         #Finally
         finally:
-            self.utils.search_item(bundle_name, "bundle")
-            bundle_id = self.bundle_helper.get_bundle_id()
-            if(bundle_id):
-                self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
             if(created_questionnaire):
                 self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
         

From 01f23134cc544a2f13cdeb09993c9157ab6258b7 Mon Sep 17 00:00:00 2001
From: schluebbo <lueder.jungjohann@uni-muenster.de>
Date: Thu, 13 Feb 2025 14:36:18 +0100
Subject: [PATCH 13/20] Fixing Failing Tests

---
 selenium/helper/Condition.py     |  6 +++++-
 selenium/helper/Question.py      |  2 +-
 selenium/helper/Questionnaire.py |  4 ++--
 selenium/selenium_tests.py       | 18 ++++++++++--------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/selenium/helper/Condition.py b/selenium/helper/Condition.py
index 054e52b8..42a9c1c0 100644
--- a/selenium/helper/Condition.py
+++ b/selenium/helper/Condition.py
@@ -25,7 +25,7 @@ class ConditionSelectors:
     TABLE_CONDITIONS_QUESTION = (By.ID, "DataTables_Table_0")
     TABLE_CONDITIONS_ANSWER = (By.ID, "DataTables_Table_1")
     TABLE_CONDITIONS_QUESTIONNAIRE = (By.ID, "DataTables_Table_2")
-    TABLE_LAST_ROW = (By.XPATH, "//tbody/tr[last()]")
+    TABLE_LAST_ROW = (By.XPATH, ".//tbody/tr[last()]")
 
     # Search input fields for each table
     SEARCH_INPUT_CONDITIONS_QUESTION = (By.CSS_SELECTOR, "#DataTables_Table_0_filter input")
@@ -281,6 +281,10 @@ def assert_search_functionality(self, search_input_selector, table_selector, con
             # Verify the condition appears in the table
             self.assert_condition_in_section(table_selector, condition_text)
 
+            search_input = WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(search_input_selector)
+            )
+            search_input.clear()
         except Exception as e:
             raise AssertionError(f"Error asserting search functionality: {e}")
 
diff --git a/selenium/helper/Question.py b/selenium/helper/Question.py
index 571b7f31..37b1310c 100644
--- a/selenium/helper/Question.py
+++ b/selenium/helper/Question.py
@@ -570,7 +570,7 @@ def add_question_barcode(self, language_code=None, is_required=False, question_t
         question_text = self.initialize_question(QuestionType.BARCODE, language_code, is_required, question_text)
 
         return {
-            "type": QuestionType.BODY_PART,
+            "type": QuestionType.BARCODE,
             "text": question_text
         }
 
diff --git a/selenium/helper/Questionnaire.py b/selenium/helper/Questionnaire.py
index 5b483bd4..fac707de 100644
--- a/selenium/helper/Questionnaire.py
+++ b/selenium/helper/Questionnaire.py
@@ -74,9 +74,9 @@ def fill_questionnaire_details(self, questionnaire_name=None, description=None,
         fragetypen_text = ''
         if question_types:
             delimiter = "+"
-            fragetypen_text = f" (Fragetypen: {delimiter.join(str(question_type.value) for question_type in question_types)})"
+            fragetypen_text = f" (Question types: {delimiter.join(str(question_type.value) for question_type in question_types)})"
 
-        questionnaire_name = questionnaire_name or f"Fragebogen {timestamp}{fragetypen_text}"
+        questionnaire_name = questionnaire_name or f"Questionnaire {timestamp}{fragetypen_text}"
         description = description or self.DEFAULT_DESCRIPTION
         language_code = language_code or self.DEFAULT_LANGUAGE_CODE
         localized_display_name = localized_display_name or questionnaire_name
diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index b29ef0d4..e0bec030 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -170,13 +170,13 @@ def test_login_admin(self):
     def test_admin_interface_login(self):
         self.driver.get(self.https_base_url)
         # a
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_assert_helper.assert_mobile_user_login()
         # b
         self.authentication_assert_helper.assert_mobile_user_password()
 
     def test_admin_interface_index(self):
         self.driver.get(self.https_base_url)
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         # c
         self.authentication_assert_helper.assert_admin_index()
@@ -185,7 +185,7 @@ def test_admin_interface_index(self):
 
     def test_admin_interface_questionnaire_question_types_score(self):
         self.driver.get(self.https_base_url)
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
         self.navigation_helper.navigate_to_manage_questionnaires()
 
         # d
@@ -221,19 +221,20 @@ def test_admin_interface_questionnaire_question_types_score(self):
 
     def test_admin_interface_conditions(self):
         self.driver.get(self.https_base_url)
-        self.authentication_helper.login(self.driver,self.secret['admin-username'], self.secret['admin-password'])
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         # j
         # Create source and target questionnaires with specific question types and add the questionnaires to a bundle to enable selection as a condition target
         source_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(question_types={QuestionType.SLIDER, QuestionType.MULTIPLE_CHOICE, QuestionType.DROP_DOWN})
         target_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(question_types={QuestionType.INFO_TEXT})
         bundle = self.bundle_helper.create_bundle(questionnaires=[source_questionnaire, target_questionnaire])
+        bundle['id'] = self.bundle_helper.save_bundle(bundle['name'])
 
         threshold_supported_question_types = {QuestionType.SLIDER, QuestionType.NUMBER_CHECKBOX, QuestionType.NUMBER_INPUT}
 
         # Select a question where condition can be added with threshold value from the source questionnaire
         threshold_condition_question = next((question for question in source_questionnaire['questions']
-                                                                   if question['type'] in[threshold_supported_question_types]), None)
+                                                                   if question['type'] in threshold_supported_question_types), None)
 
         # Navigate to the source questionnaire's questions and reorder the slider question to the first position
         self.navigation_helper.navigate_to_questions_of_questionnaire(source_questionnaire['id'], source_questionnaire['name'])
@@ -246,12 +247,13 @@ def test_admin_interface_conditions(self):
 
         # Assert the conditions are correctly listed in the tables
         self.condition_assert_helper.assert_condition_list_and_search_de()
-        # k
-        self.condition_assert_helper.assert_add_condition_page(source_questionnaire)
-
         self.condition_helper.delete_condition(condition_id_1)
         self.condition_helper.delete_condition(condition_id_2)
         self.condition_helper.delete_condition(condition_id_3)
+        self.condition_helper.navigate_back_to_questions_of_questionnaire()
+
+        # k
+        self.condition_assert_helper.assert_add_condition_page(source_questionnaire)
 
         self.authentication_helper.logout()
 

From d4a516d5d24ad1cae16382f7093fc1b2b9e6b85f Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Thu, 13 Feb 2025 14:59:53 +0100
Subject: [PATCH 14/20] clinic tests

---
 selenium/clinic_test.py    | 171 ++++++++-----------------------------
 selenium/selenium_tests.py | 135 ++++++++++++++++++++++++++++-
 2 files changed, 171 insertions(+), 135 deletions(-)

diff --git a/selenium/clinic_test.py b/selenium/clinic_test.py
index 9f530883..5011a06b 100644
--- a/selenium/clinic_test.py
+++ b/selenium/clinic_test.py
@@ -83,10 +83,8 @@ def setUp(self):
 
         self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
 
-    def _test_clinic_list(self):
-        clinic_name = "Test Clinic"
-        clinic_description = "Test Clinic Description"
-        clinic_id = None
+    def test_clinic_list(self):
+        clinic={}
 
         # Arrange
         if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
@@ -99,69 +97,30 @@ def _test_clinic_list(self):
         except Exception as e:
             self.fail(f"Failed to navigate to 'Clinic' page: {e}")
 
-        # Act
         try:
-            self.clinic_helper.create_clinic(clinic_name, clinic_description,configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}])
-            clinic_id = self.clinic_helper.save_clinic(clinic_name)
+            self.navigation_helper.navigate_to_manage_clinics()
+            clinic["name"] = self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}])
+            clinic['id']=self.clinic_helper.save_clinic(clinic_name=clinic['name'])
+
         except Exception as e:
             self.fail(f"Failed to create clinic: {e}")
 
-        #Assert - Check if the clinic table is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.TABLE_CLINIC)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Clinic table not found")
-            
-        #Assert - Check if the clinic table pagination is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.PAGINATION_CLINIC_TABLE)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Clinic table pagination not found")
-            
-        #Assert - Check if the clinic table search is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.TABLE_SEARCH)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Clinic table pagination not found")
-        
-        #Assert - Check if the clinic table action buttons are displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.TABLE_ACTION_BUTTONS)
-            )
-        except TimeoutException:  
-            self.fail(
-                f"Clinic table action buttons not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_CLINIC, "Clinic table not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.PAGINATION_CLINIC_TABLE, "Clinic table pagination not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_SEARCH, "Clinic table search not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_ACTION_BUTTONS, "Clinic table action buttons not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.BUTTON_ADD_CLINIC, "Add new clinic button not found")
         
-        #Assert - Check if the add new clinic button is displayed
         try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.BUTTON_ADD_CLINIC)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Add new clinic button not found")
-            
+            pass
         finally:
-            self.utils.search_and_delete_item(clinic_name,clinic_id,"clinic")
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"],"clinic")
             self.authentication_helper.logout()
             
     def test_clinic_fill(self):
-        clinic_name = "Test Clinic"
-        clinic_description = "Test Clinic Description"
-        clinic_id = None
-        bundle_name = "Test Bundle"
-        bundle_id=None
-
+        clinic={}
+        created_questionnaire={}
+        bundle={}
 
         # Arrange
         if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
@@ -171,45 +130,20 @@ def test_clinic_fill(self):
 
         #Arrange
         try:
-            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
-                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
-                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
-                                            question_types=[QuestionType.INFO_TEXT])
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
             self.navigation_helper.navigate_to_manage_bundles()
-            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
-            bundle_id=self.bundle_helper.save_bundle(bundle_name)
+            bundle = self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle['id']=self.bundle_helper.save_bundle(bundle_name=bundle['name'])
         except Exception as e:
             self.fail(f"Failed to setup questionnaire and bundle: {e}")
 
         self.navigation_helper.navigate_to_manage_clinics()
         WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(ClinicSelectors.BUTTON_ADD_CLINIC))
         self.utils.click_element(ClinicSelectors.BUTTON_ADD_CLINIC)
-        #Assert - Check if the clinic name input is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.INPUT_CLINIC_NAME)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Clinic name input not found")
 
-        #Assert - Check if the clinic description input is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Clinic description input not found")
-
-        #Assert - Check if the clinic email input is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.INPUT_CLINIC_EMAIL)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Clinic email input not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.INPUT_CLINIC_NAME, "Clinic name input not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION, "Clinic description input not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.INPUT_CLINIC_EMAIL, "Clinic email input not found")
         
         #Assert - Check if the clinic configuration is displayed
         try:
@@ -223,54 +157,24 @@ def test_clinic_fill(self):
             self.fail(
                 f"Clinic configuration not found")
             
-        #Assert - Check if the tables with available bundles is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.TABLE_AVAIALBLE_BUNDLES)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Table with available bundles not found")
-            
-        #Assert - Check if the tables with selected bundles is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.TABLE_ASSIGNED_BUNDLES)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Table with assigned bundles not found")
-            
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_AVAIALBLE_BUNDLES, "Available bundles table not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_ASSIGNED_BUNDLES, "Assigned bundles table not found")            
+
+                    
         #Assert - Check if the bundles can be added to the clinic
         try:
-            self.clinic_helper.assign_multiple_bundes_to_clinic([{'id': bundle_id, 'name': bundle_name}])
+            self.clinic_helper.assign_multiple_bundes_to_clinic([{'id': bundle["id"], 'name': bundle["name"]}])
         except Exception as e:
             self.fail(f"Failed to assign bundle to clinic: {e}")
         
         #Assert - Check if the bundles can be removed from the clinic
         try:
-            self.clinic_helper.remove_multiple_bundes_from_clinic([{'id': bundle_id, 'name': bundle_name}])
+            self.clinic_helper.remove_multiple_bundes_from_clinic([{'id': bundle["id"], 'name': bundle["name"]}])
         except Exception as e:
             self.fail(f"Failed to remove bundle from clinic: {e}")
 
-         #Assert - Check if the tables with available users is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.TABLE_AVAIALBLE_USERS)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Table with available users not found")
-            
-        #Assert - Check if the tables with selected bundles is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.visibility_of_element_located(ClinicSelectors.TABLE_ASSIGNED_USERS)
-            )
-        except TimeoutException:
-            self.fail(
-                f"Table with assigned users not found")
-            
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_AVAIALBLE_USERS, "Available users table not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_ASSIGNED_USERS, "Assigned users table not found") 
 
         #Assert - Check if the users can be added to the clinic
         try:
@@ -300,10 +204,9 @@ def test_clinic_fill(self):
         #Assert - Check if the clinic can be created
         try:
             self.navigation_helper.navigate_to_manage_clinics()
-            self.clinic_helper.create_clinic(clinic_name, clinic_description,
-                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
-                                             bundles=[{'id': bundle_id, 'name': bundle_name}], users=[self.secret.get('admin-username')])
-            clinic_id = self.clinic_helper.save_clinic(clinic_name)
+            clinic['name']=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[{'id': bundle["id"], 'name': bundle["name"]}], users=[self.secret.get('admin-username')])
+            clinic['id'] = self.clinic_helper.save_clinic(clinic["name"])
             WebDriverWait(self.driver, 10).until(
                 EC.visibility_of_element_located(ClinicSelectors.TABLE_CLINIC)
             )
@@ -311,10 +214,10 @@ def test_clinic_fill(self):
             self.fail(f"Failed to create clinic: {e}")
 
         finally:
-            if clinic_id:
-                self.utils.search_and_delete_item(clinic_name,clinic_id,"clinic")
-            if bundle_id:
-                self.utils.search_and_delete_item(bundle_name,bundle_id,"bundle")
+            if clinic["id"]:
+                self.utils.search_and_delete_item(clinic['name'],clinic["id"],"clinic")
+            if bundle["id"]:
+                self.utils.search_and_delete_item(bundle["name"],bundle["id"],"bundle")
             if created_questionnaire:
                 self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
             self.authentication_helper.logout()
diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index 50c1a8bc..9d5080ce 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -16,7 +16,7 @@
 
 from helper.Authentication import AuthenticationHelper, AuthenticationAssertHelper
 from helper.Bundle import BundleHelper, BundleSelectors
-from helper.Clinic import ClinicHelper
+from helper.Clinic import ClinicHelper, ClinicSelectors
 from helper.Condition import ConditionHelper, ConditionSelectors, ConditionAssertHelper
 from helper.Login import LoginHelper
 from helper.Navigation import NavigationHelper
@@ -377,6 +377,139 @@ def test_bundle_fill(self):
                 self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
 
         self.authentication_helper.logout()
+
+    def test_clinic_list(self):
+        clinic={}
+
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+        except Exception as e:
+            self.fail(f"Failed to navigate to 'Clinic' page: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            clinic["name"] = self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}])
+            clinic['id']=self.clinic_helper.save_clinic(clinic_name=clinic['name'])
+
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_CLINIC, "Clinic table not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.PAGINATION_CLINIC_TABLE, "Clinic table pagination not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_SEARCH, "Clinic table search not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_ACTION_BUTTONS, "Clinic table action buttons not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.BUTTON_ADD_CLINIC, "Add new clinic button not found")
+        
+        try:
+            pass
+        finally:
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"],"clinic")
+            self.authentication_helper.logout()
+            
+    def test_clinic_fill(self):
+        clinic={}
+        created_questionnaire={}
+        bundle={}
+
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        #Arrange
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
+            self.navigation_helper.navigate_to_manage_bundles()
+            bundle = self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle['id']=self.bundle_helper.save_bundle(bundle_name=bundle['name'])
+        except Exception as e:
+            self.fail(f"Failed to setup questionnaire and bundle: {e}")
+
+        self.navigation_helper.navigate_to_manage_clinics()
+        WebDriverWait(self.driver, 10).until(EC.visibility_of_element_located(ClinicSelectors.BUTTON_ADD_CLINIC))
+        self.utils.click_element(ClinicSelectors.BUTTON_ADD_CLINIC)
+
+        self.utils.check_visibility_of_element(ClinicSelectors.INPUT_CLINIC_NAME, "Clinic name input not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.INPUT_EDITABLE_DESCRIPTION, "Clinic description input not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.INPUT_CLINIC_EMAIL, "Clinic email input not found")
+        
+        #Assert - Check if the clinic configuration is displayed
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.DIV_CLINIC_CONFIGURATION)
+            )
+            clinic_configuration = self.driver.find_element(*ClinicSelectors.DIV_CLINIC_CONFIGURATION)
+            clinic_configuration_list = clinic_configuration.find_elements(*ClinicSelectors.CLINIC_CONFIGURATION_LIST)
+            self.assertGreaterEqual(len(clinic_configuration_list), 1, "Clinic configuration list should have at least one item")
+        except:
+            self.fail(
+                f"Clinic configuration not found")
+            
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_AVAIALBLE_BUNDLES, "Available bundles table not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_ASSIGNED_BUNDLES, "Assigned bundles table not found")            
+
+                    
+        #Assert - Check if the bundles can be added to the clinic
+        try:
+            self.clinic_helper.assign_multiple_bundes_to_clinic([{'id': bundle["id"], 'name': bundle["name"]}])
+        except Exception as e:
+            self.fail(f"Failed to assign bundle to clinic: {e}")
+        
+        #Assert - Check if the bundles can be removed from the clinic
+        try:
+            self.clinic_helper.remove_multiple_bundes_from_clinic([{'id': bundle["id"], 'name': bundle["name"]}])
+        except Exception as e:
+            self.fail(f"Failed to remove bundle from clinic: {e}")
+
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_AVAIALBLE_USERS, "Available users table not found")
+        self.utils.check_visibility_of_element(ClinicSelectors.TABLE_ASSIGNED_USERS, "Assigned users table not found") 
+
+        #Assert - Check if the users can be added to the clinic
+        try:
+            self.clinic_helper.assign_multiple_users_to_clinic([self.secret.get('admin-username')])
+        except Exception as e:
+            self.fail(f"Failed to assign users to clinic: {e}")
+
+        #Assert - Check if the users can be removed from the clinic
+        try:
+            self.clinic_helper.remove_multiple_users_from_clinic([self.secret.get('admin-username')])
+        except Exception as e:
+            self.fail(f"Failed to remove users from clinic: {e}")
+
+        #Assert - Check form validation
+        try:
+            self.utils.click_element(ClinicSelectors.BUTTON_SAVE)
+            WebDriverWait(self.driver, 10).until(
+            EC.visibility_of_element_located(ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            )
+            validation_errors = self.driver.find_elements(*ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            configuration_errors = self.driver.find_elements(*ErrorSelectors.CONFIGURATION_ERROR_SELECTOR)
+            self.assertEqual(len(validation_errors), 2, "Expected 2 validation errors, but found {len(validation_errors)}")
+            self.assertEqual(len(configuration_errors), 1, "Expected 1 configuration errors, but found {len(configuration_errors)}")
+        except Exception as e:
+            self.fail(f"Failed to save bundle: {e}")
+
+        #Assert - Check if the clinic can be created
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            clinic['name']=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[{'id': bundle["id"], 'name': bundle["name"]}], users=[self.secret.get('admin-username')])
+            clinic['id'] = self.clinic_helper.save_clinic(clinic["name"])
+            WebDriverWait(self.driver, 10).until(
+                EC.visibility_of_element_located(ClinicSelectors.TABLE_CLINIC)
+            )
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        finally:
+            if clinic["id"]:
+                self.utils.search_and_delete_item(clinic['name'],clinic["id"],"clinic")
+            if bundle["id"]:
+                self.utils.search_and_delete_item(bundle["name"],bundle["id"],"bundle")
+            if created_questionnaire:
+                self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+            self.authentication_helper.logout()
     
     def tearDown(self): 
         self.driver.quit()

From 91fa149a4438d14c9106fcf3760b6870dc5f1113 Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Thu, 13 Feb 2025 15:00:06 +0100
Subject: [PATCH 15/20] clinic tests

---
 src/main/webapp/WEB-INF/clinic/edit.html                        | 2 +-
 .../webapp/WEB-INF/fragments/processClinicConfigurations.html   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/clinic/edit.html b/src/main/webapp/WEB-INF/clinic/edit.html
index fc5cd78f..4094abb6 100644
--- a/src/main/webapp/WEB-INF/clinic/edit.html
+++ b/src/main/webapp/WEB-INF/clinic/edit.html
@@ -47,7 +47,7 @@
                 </div>
                 <div
                     class="accordion"
-                    id="accordionExample"
+                    id="clinicConfigurations"
                 >
                     <div class="accordion-item">
                         <h2
diff --git a/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html b/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html
index c90c9986..72076b2d 100644
--- a/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html
+++ b/src/main/webapp/WEB-INF/fragments/processClinicConfigurations.html
@@ -71,6 +71,7 @@
                     th:errors="*{__${selectionPath}__[__${configurationIndex.index}__].value}"
                     th:text="${#fields.errors('__${selectionPath}__[__${configurationIndex.index}__].value')}"
                     style="color: red"
+                    class="configurationError"
                 >
                 </div>
             </div>

From 61bef1bc364899b0615a6efadb8b44be407da5de Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Mon, 17 Feb 2025 09:57:11 +0100
Subject: [PATCH 16/20] encounter selenium tests

---
 selenium/encounter_test.py                    | 237 ++++--------------
 selenium/helper/Encounter.py                  |  12 +-
 selenium/selenium_tests.py                    | 147 +++++++++++
 src/main/webapp/WEB-INF/encounter/list.html   |   3 +-
 src/main/webapp/WEB-INF/navigation/admin.html |   8 +-
 5 files changed, 207 insertions(+), 200 deletions(-)

diff --git a/selenium/encounter_test.py b/selenium/encounter_test.py
index 3e1a5c48..d55654cd 100644
--- a/selenium/encounter_test.py
+++ b/selenium/encounter_test.py
@@ -89,147 +89,70 @@ def setUp(self):
         self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
 
     def test_encounter_list(self):
-        bundle_name = "TestBundle"
-        clinic_name = "TestClinic"
-        clinic_description = "TestDescription"
+        created_questionnaire = {}
+        bundle={}
+        clinic={}
         
         # Arrange
-        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
-            self.skipTest("User AD credentials missing. Test skipped.")
         self.driver.get(self.https_base_url)
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
 
         try:
-            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
-                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
-                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
-                                            question_types=[QuestionType.INFO_TEXT])
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
         except Exception as e:
             self.fail(f"Failed to create questionnaire: {e}")
 
         try:
             self.navigation_helper.navigate_to_manage_bundles()
-            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
-            self.bundle_helper.save_bundle(bundle_name)
+            bundle = self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle["id"]=self.bundle_helper.save_bundle(bundle["name"])
         except Exception as e:
             self.fail(f"Failed to create bundle: {e}")
 
-
-        self.utils.search_item(bundle_name, "bundle")
-        bundle_id = self.bundle_helper.get_bundle_id()
-
         try:
             self.navigation_helper.navigate_to_manage_clinics()
-            self.clinic_helper.create_clinic(clinic_name=clinic_name, 
-                                             clinic_description="Test Clinic Description",
-                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
-                                             bundles=[{'id': bundle_id, 'name': bundle_name}])
-            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+            clinic["name"]=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[bundle])
+            clinic["id"]=self.clinic_helper.save_clinic(clinic["name"])
 
         except Exception as e:
             self.fail(f"Failed to create clinic: {e}")
 
         # Act
         self.navigation_helper.navigate_to_manage_surveys()
-
-        #Assert - Check if tabs for "All Encounters" and "Scheduled Encounters" are present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(EncounterSelectors.BUTTON_ENCOUNTER_TABLE)
-            )
-            WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
-            )
-        except TimeoutException:
-            self.fail("Encounter tabs not found")
         
+        self.utils.check_visibility_of_element(EncounterSelectors.BUTTON_ENCOUNTER_TABLE, "Encounter Table button not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE, "Encounter Schedule Table button not found")
+
         # Act - Click on "All Encounters" tab
         self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_TABLE)
-        # Assert - Check if the table for all encounters is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.TABLE_ALL_ENCOUNTERS)
-            )
-        except TimeoutException:
-            self.fail("All Encounters table not found")
-        
-        #Assert - Check if table pagination is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.PAGINATION_ENCOUNTER_TABLE)
-            )
-        except TimeoutException:
-            self.fail("Pagination for All Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.TABLE_ALL_ENCOUNTERS, "All Encounters table not found")
 
-        #Assert - Check if table search is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.SEARCH_ALL_ENCOUNTERS)
-            )
-        except TimeoutException:
-            self.fail("Search for All Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.PAGINATION_ENCOUNTER_TABLE, "Pagination for All Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SEARCH_ALL_ENCOUNTERS, "Search for All Encounters table not found")
 
         #TODO: Action column, number of exports [after create survey function implementation]
 
-        #Assert - Check for button for starting an encounter
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable(EncounterSelectors.BUTTON_EXECUTE_ENCOUNTER)
-            )
-        except TimeoutException:
-            self.fail("Execute Encounter button not found")
-
+        self.utils.check_visibility_of_element(EncounterSelectors.BUTTON_EXECUTE_ENCOUNTER, "Execute Encounter button not found")
 
         # Act - Click on "Scheduled Encounters" tab
         self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
-        # Assert - Check if the table for scheduled encounters is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.TABLE_SCHEDULED_ENCOUNTERS)
-            )
-        except TimeoutException:
-            self.fail("Scheduled Encounters table not found")
-
-        #Assert - Check if table for scheduled encounters is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.TABLE_SCHEDULED_ENCOUNTERS)
-            )
-        except TimeoutException:
-            self.fail("Scheduled Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.TABLE_SCHEDULED_ENCOUNTERS, "Scheduled Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.PAGINATION_ENCOUNTER_SCHEDULE_TABLE, "Pagination for Scheduled Encounters table not found")
 
-        #Assert - Check if table pagination is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.PAGINATION_ENCOUNTER_SCHEDULE_TABLE)
-            )
-        except TimeoutException:
-            self.fail("Pagination for Scheduled Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SEARCH_SCHEDULED_ENCOUNTERS, "Search for Scheduled Encounters table not found")
         
-        #Assert - Check if table search is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.SEARCH_SCHEDULED_ENCOUNTERS)
-            )
-        except TimeoutException:
-            self.fail("Search for Scheduled Encounters table not found")
         encounter_id = None
         try:
             self.utils.click_element(EncounterSelectors.BUTTON_SCHEDULE_ENCOUNTER)
-            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic_name, bundle_name, "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
+            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic["name"], bundle["name"], "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
         except Exception as e:
             self.fail(f"Failed to schedule encounter: {e}")
 
         self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
 
-        #Assert - Check if the action column is present
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EncounterSelectors.TABLE_ACTION_COLUMN)
-            )
-        except TimeoutException:
-            self.fail("Action column for Scheduled Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.TABLE_ACTION_COLUMN, "Action column for Scheduled Encounters table not found")
 
         #TODO: number of exports [after survey schedule function implementation]
 
@@ -243,48 +166,37 @@ def test_encounter_list(self):
 
         finally:
             self.encounter_helper.delete_scheduled_encounter(encounter_id, "123456")
-            self.utils.search_and_delete_item(clinic_name,clinic_id, "clinic")
-            self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"], "clinic")
+            self.utils.search_and_delete_item(bundle["name"],bundle["id"], "bundle")
             self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
 
 
     def test_encounter_schedule(self):
-        bundle_name = "TestBundle"
-        clinic_name = "TestClinic"
-        clinic_description = "TestDescription"
+        clinic={}
+        bundle={}
+        created_questionnaire = {}
         
         # Arrange
-        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
-            self.skipTest("User AD credentials missing. Test skipped.")
         self.driver.get(self.https_base_url)
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])    
 
         try:
-            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions(questionnaire_name="Test", questionnaire_description="Test",
-                                            questionnaire_language_code="de_DE", questionnaire_display_name="Test",
-                                            questionnaire_welcome_text="Test", questionnaire_final_text="Test", 
-                                            question_types=[QuestionType.INFO_TEXT])
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
         except Exception as e:
             self.fail(f"Failed to create questionnaire: {e}")
 
         try:
             self.navigation_helper.navigate_to_manage_bundles()
-            self.bundle_helper.create_bundle(bundle_name, True, [created_questionnaire])
-            self.bundle_helper.save_bundle(bundle_name)
+            bundle=self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle["id"]=self.bundle_helper.save_bundle(bundle["name"])
         except Exception as e:
             self.fail(f"Failed to create bundle: {e}")
 
-
-        self.utils.search_item(bundle_name, "bundle")
-        bundle_id = self.bundle_helper.get_bundle_id()
-        clinic_id = None
         try:
             self.navigation_helper.navigate_to_manage_clinics()
-            self.clinic_helper.create_clinic(clinic_name=clinic_name, 
-                                             clinic_description=clinic_description,
-                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
-                                             bundles=[{'id': bundle_id, 'name': bundle_name}])
-            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+            clinic["name"]=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[bundle])
+            clinic["id"]=self.clinic_helper.save_clinic(clinic["name"])
 
         except Exception as e:
             self.fail(f"Failed to create clinic: {e}")
@@ -296,87 +208,28 @@ def test_encounter_schedule(self):
         except Exception as e:
             self.fail(f"Failed to navigate to Schedule Encounter form: {e}")
 
-        # Assert - Check if all the inputs are present
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.INPUT_SCHEDULE_CASE_NUMBER)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Case Number' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.SELECT_SCHEDULE_CLINIC)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Clinic' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.SELECT_SCHEDULE_BUNDLE)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Bundle' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.INPUT_SCHEDULE_EMAIL)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Email' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.SELECT_SURVEY_TYPE)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Survey Type' not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_SCHEDULE_CASE_NUMBER, "Case Number input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_SCHEDULE_CLINIC, "Clinic select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_SCHEDULE_BUNDLE, "Bundle select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_SCHEDULE_EMAIL, "Email input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_SURVEY_TYPE, "Survey Type select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_DATE, "Date input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_END_DATE, "End Date input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_TIME_PERIOD, "Time Period input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_LANGUAGE, "Language select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_PERSONAL_TEXT, "Personal Text input not found")
 
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.INPUT_DATE)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Date' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.INPUT_END_DATE)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'End Date' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.INPUT_TIME_PERIOD)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Time Period' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.SELECT_LANGUAGE)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Language' not found")
-
-        try:
-            WebDriverWait(self.driver, 10).until(
-            EC.presence_of_element_located(EncounterSelectors.INPUT_PERSONAL_TEXT)
-            )
-        except TimeoutException:
-            self.fail("Schedule Encounter form element 'Personal Text' not found")
         
         encounter_id = None
         try:
-            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic_name, bundle_name, "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
+            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic["name"], bundle["name"], "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
         except Exception as e:
             self.fail(f"Failed to schedule encounter: {e}")
             
         finally:
             self.encounter_helper.delete_scheduled_encounter(encounter_id, "123456")
-            self.utils.search_and_delete_item(clinic_name,clinic_id, "clinic")
-            self.utils.search_and_delete_item(bundle_name,bundle_id, "bundle")
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"], "clinic")
+            self.utils.search_and_delete_item(bundle["name"],bundle["id"], "bundle")
             self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
         
     def tearDown(self):
diff --git a/selenium/helper/Encounter.py b/selenium/helper/Encounter.py
index 600a271c..e0071ef6 100644
--- a/selenium/helper/Encounter.py
+++ b/selenium/helper/Encounter.py
@@ -7,7 +7,7 @@
 from selenium.webdriver.support.ui import WebDriverWait
 
 from helper.Navigation import NavigationHelper
-from helper.SeleniumUtils import SearchBoxSelectors, SeleniumUtils
+from helper.SeleniumUtils import SearchBoxSelectors, SeleniumUtils, DropdownMethod
 
 
 class EncounterSurveyLanguages(Enum):
@@ -99,29 +99,29 @@ def schedule_encounter(self, case_number, clinic, bundle, email, survey_type, st
             
         try:
             if survey_type == EncounterScheduleType.REPEATEDLY:
-                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "REPEATEDLY", method="value")
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "REPEATEDLY", method=DropdownMethod.VALUE)
                 self.utils.fill_text_field(EncounterSelectors.INPUT_TIME_PERIOD, time_period_days)
                 if end_date is not None:
                     self.driver.execute_script("document.getElementById('endDate').valueAsDate = new Date(arguments[0]);", end_date)
                     self.driver.execute_script("document.getElementById('endDate').dispatchEvent(new Event('blur'));")
             elif survey_type == EncounterScheduleType.WEEKLY:
-                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "WEEKLY", method="value")
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "WEEKLY", method=DropdownMethod.VALUE)
                 if end_date is not None:
                     self.driver.execute_script("document.getElementById('endDate').valueAsDate = new Date(arguments[0]);", end_date)
                     self.driver.execute_script("document.getElementById('endDate').dispatchEvent(new Event('blur'));")        
             elif survey_type == EncounterScheduleType.MONTHLY:
-                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "MONTHLY", method="value")
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "MONTHLY", method=DropdownMethod.VALUE)
                 if end_date is not None:
                     self.driver.execute_script("document.getElementById('endDate').valueAsDate = new Date(arguments[0]);", end_date)
                     self.driver.execute_script("document.getElementById('endDate').dispatchEvent(new Event('blur'));")
             else:
-                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "UNIQUELY", method="value")
+                self.utils.select_dropdown(EncounterSelectors.SELECT_SURVEY_TYPE, "UNIQUELY", method=DropdownMethod.VALUE)
             
         except Exception as e:
             print("Error filling schedule encounter form elements ", e)
 
         try:
-            self.utils.select_dropdown(EncounterSelectors.SELECT_LANGUAGE, language, method="value")
+            self.utils.select_dropdown(EncounterSelectors.SELECT_LANGUAGE, language, method=DropdownMethod.VALUE)
             self.utils.fill_text_field(EncounterSelectors.INPUT_PERSONAL_TEXT, message)
             self.utils.click_element(EncounterSelectors.BUTTON_SAVE_SCHEDULED_ENCOUNTER)
 
diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index 4e2d0ac1..9743926e 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from time import gmtime, strftime
+import datetime
 import unittest
 import json
 import os
@@ -18,6 +19,7 @@
 from helper.Bundle import BundleHelper, BundleSelectors
 from helper.Clinic import ClinicHelper, ClinicSelectors
 from helper.Condition import ConditionHelper, ConditionSelectors, ConditionAssertHelper
+from helper.Encounter import EncounterHelper, EncounterSelectors, EncounterScheduleType
 from helper.Login import LoginHelper
 from helper.Navigation import NavigationHelper
 from helper.Question import QuestionHelper, QuestionAssertHelper, QuestionType
@@ -152,6 +154,7 @@ def setUp(self):
         self.score_assert_helper = ScoreAssertHelper(self.driver, self.navigation_helper)
         self.condition_assert_helper = ConditionAssertHelper(self.driver, self.navigation_helper)
         self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
+        self.encounter_helper = EncounterHelper(self.driver, self.navigation_helper)
 
     def test_login_admin(self):
         if(self.secret['admin-username']!='' and self.secret['admin-password']!=''):
@@ -513,6 +516,150 @@ def test_clinic_fill(self):
                 self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
             self.authentication_helper.logout()
     
+    def test_encounter_list(self):
+        created_questionnaire = {}
+        bundle={}
+        clinic={}
+        
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+            bundle = self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle["id"]=self.bundle_helper.save_bundle(bundle["name"])
+        except Exception as e:
+            self.fail(f"Failed to create bundle: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            clinic["name"]=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[bundle])
+            clinic["id"]=self.clinic_helper.save_clinic(clinic["name"])
+
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+
+        # Act
+        self.navigation_helper.navigate_to_manage_surveys()
+        
+        self.utils.check_visibility_of_element(EncounterSelectors.BUTTON_ENCOUNTER_TABLE, "Encounter Table button not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE, "Encounter Schedule Table button not found")
+
+        # Act - Click on "All Encounters" tab
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_TABLE)
+        self.utils.check_visibility_of_element(EncounterSelectors.TABLE_ALL_ENCOUNTERS, "All Encounters table not found")
+
+        self.utils.check_visibility_of_element(EncounterSelectors.PAGINATION_ENCOUNTER_TABLE, "Pagination for All Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SEARCH_ALL_ENCOUNTERS, "Search for All Encounters table not found")
+
+        #TODO: Action column, number of exports [after create survey function implementation]
+
+        self.utils.check_visibility_of_element(EncounterSelectors.BUTTON_EXECUTE_ENCOUNTER, "Execute Encounter button not found")
+
+        # Act - Click on "Scheduled Encounters" tab
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+        self.utils.check_visibility_of_element(EncounterSelectors.TABLE_SCHEDULED_ENCOUNTERS, "Scheduled Encounters table not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.PAGINATION_ENCOUNTER_SCHEDULE_TABLE, "Pagination for Scheduled Encounters table not found")
+
+        self.utils.check_visibility_of_element(EncounterSelectors.SEARCH_SCHEDULED_ENCOUNTERS, "Search for Scheduled Encounters table not found")
+        
+        encounter_id = None
+        try:
+            self.utils.click_element(EncounterSelectors.BUTTON_SCHEDULE_ENCOUNTER)
+            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic["name"], bundle["name"], "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
+        except Exception as e:
+            self.fail(f"Failed to schedule encounter: {e}")
+
+        self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+
+        self.utils.check_visibility_of_element(EncounterSelectors.TABLE_ACTION_COLUMN, "Action column for Scheduled Encounters table not found")
+
+        #TODO: number of exports [after survey schedule function implementation]
+
+        #Assert - Check for button for scheduling an encounter
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.element_to_be_clickable(EncounterSelectors.BUTTON_SCHEDULE_ENCOUNTER)
+            )
+        except Exception as e:
+            self.fail("Schedule Encounter button not found")
+
+        finally:
+            self.encounter_helper.delete_scheduled_encounter(encounter_id, "123456")
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"], "clinic")
+            self.utils.search_and_delete_item(bundle["name"],bundle["id"], "bundle")
+            self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+
+
+    def test_encounter_schedule(self):
+        clinic={}
+        bundle={}
+        created_questionnaire = {}
+        
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])    
+
+        try:
+            created_questionnaire = self.questionnaire_helper.create_questionnaire_with_questions()
+        except Exception as e:
+            self.fail(f"Failed to create questionnaire: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_bundles()
+            bundle=self.bundle_helper.create_bundle(publish_bundle=True, questionnaires=[created_questionnaire])
+            bundle["id"]=self.bundle_helper.save_bundle(bundle["name"])
+        except Exception as e:
+            self.fail(f"Failed to create bundle: {e}")
+
+        try:
+            self.navigation_helper.navigate_to_manage_clinics()
+            clinic["name"]=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePatientDataLookup > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],
+                                             bundles=[bundle])
+            clinic["id"]=self.clinic_helper.save_clinic(clinic["name"])
+
+        except Exception as e:
+            self.fail(f"Failed to create clinic: {e}")
+        
+        try:
+            self.navigation_helper.navigate_to_manage_surveys()
+            self.utils.click_element(EncounterSelectors.BUTTON_ENCOUNTER_SCHEDULE_TABLE)
+            self.utils.click_element(EncounterSelectors.BUTTON_SCHEDULE_ENCOUNTER)
+        except Exception as e:
+            self.fail(f"Failed to navigate to Schedule Encounter form: {e}")
+
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_SCHEDULE_CASE_NUMBER, "Case Number input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_SCHEDULE_CLINIC, "Clinic select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_SCHEDULE_BUNDLE, "Bundle select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_SCHEDULE_EMAIL, "Email input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_SURVEY_TYPE, "Survey Type select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_DATE, "Date input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_END_DATE, "End Date input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_TIME_PERIOD, "Time Period input not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.SELECT_LANGUAGE, "Language select not found")
+        self.utils.check_visibility_of_element(EncounterSelectors.INPUT_PERSONAL_TEXT, "Personal Text input not found")
+
+        
+        encounter_id = None
+        try:
+            encounter_id = self.encounter_helper.schedule_encounter("123456", clinic["name"], bundle["name"], "test@email.com", EncounterScheduleType.UNIQUELY,(datetime.date.today() + datetime.timedelta(days=1)).strftime("%Y-%m-%d"))
+        except Exception as e:
+            self.fail(f"Failed to schedule encounter: {e}")
+            
+        finally:
+            self.encounter_helper.delete_scheduled_encounter(encounter_id, "123456")
+            self.utils.search_and_delete_item(clinic["name"],clinic["id"], "clinic")
+            self.utils.search_and_delete_item(bundle["name"],bundle["id"], "bundle")
+            self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
+            self.authentication_helper.logout()
     def tearDown(self): 
         self.driver.quit()
 
diff --git a/src/main/webapp/WEB-INF/encounter/list.html b/src/main/webapp/WEB-INF/encounter/list.html
index b331f875..c8a6e2db 100644
--- a/src/main/webapp/WEB-INF/encounter/list.html
+++ b/src/main/webapp/WEB-INF/encounter/list.html
@@ -542,6 +542,7 @@
 														th:unless="${item.encounterDTOs != null and not #lists.isEmpty(item.encounterDTOs)}"
 													>
 														<a
+															th:id="'removeScheduleEncounter_' + ${item.id}"
 															class="link"
 															th:href="|remove?encounterScheduledId=${item.id}|"
 														>
@@ -1025,4 +1026,4 @@
 			}
 		}
 	</script>
-</th:block>
+</th:block>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/navigation/admin.html b/src/main/webapp/WEB-INF/navigation/admin.html
index ce1aa56b..4b1715a6 100644
--- a/src/main/webapp/WEB-INF/navigation/admin.html
+++ b/src/main/webapp/WEB-INF/navigation/admin.html
@@ -92,6 +92,7 @@
 							<ul class="dropdown-menu">
 								<li>
 									<a
+										id="managerUserLink"
 										class="dropdown-item"
 										th:href="@{/user/list}"
 										th:text="${messages.get(#locale, 'admin.navigation.user', 'Manage Users')}"
@@ -109,6 +110,7 @@
 								</li>
 								<li>
 									<a
+										id="manageInvitationLink"
 										class="dropdown-item"
 										th:href="@{/invitation/list}"
 										th:text="#{admin.navigation.user.editInvitation}"
@@ -123,6 +125,7 @@
 						class="nav-item dropdown"
 					>
 						<a
+							id="surveyDropdownLink"
 							class="nav-link d-flex align-items-center"
 							data-bs-toggle="dropdown"
 							role="button"
@@ -138,6 +141,7 @@
 						<ul class="dropdown-menu">
 							<li>
 								<a
+									id="manageSurveyLink"
 									class="dropdown-item"
 									th:href="@{/encounter/list}"
 									th:text="${messages.get(#locale, 'admin.navigation.manageSurveys', 'Manage surveys')}"
@@ -146,6 +150,7 @@
 							</li>
 							<li>
 								<a
+									id="scheduleSurveyLink"
 									class="dropdown-item"
 									th:href="@{/encounter/schedule}"
 									th:text="#{admin.navigation.scheduleSurvey}"
@@ -154,6 +159,7 @@
 							</li>
 							<li>
 								<a
+									id="executeSurveyLink"
 									class="dropdown-item"
 									th:href="@{/mobile/survey/index}"
 									th:text="#{admin.navigation.executeSurvey}"
@@ -215,4 +221,4 @@
 		</div>
 		<!-- toggle get grouped for better mobile display -->
 	</div>
-</th:block>
+</th:block>
\ No newline at end of file

From 3bd35c105abdcf36fb9212d809e7441091e42cc4 Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Mon, 17 Feb 2025 14:13:51 +0100
Subject: [PATCH 17/20] selenium tests for user module

---
 selenium/helper/User.py                      |   6 +
 selenium/selenium_tests.py                   | 153 ++++++++++
 selenium/user_test.py                        | 290 +++----------------
 src/main/webapp/WEB-INF/invitation/edit.html |   6 +-
 src/main/webapp/WEB-INF/invitation/list.html |   1 +
 src/main/webapp/WEB-INF/user/mailtoall.html  |   2 +
 6 files changed, 207 insertions(+), 251 deletions(-)

diff --git a/selenium/helper/User.py b/selenium/helper/User.py
index b664eeeb..1a1f30ae 100644
--- a/selenium/helper/User.py
+++ b/selenium/helper/User.py
@@ -7,6 +7,12 @@
 from helper.Navigation import NavigationHelper
 from helper.SeleniumUtils import SearchBoxSelectors, SeleniumUtils
 
+class EmailSelectors:
+    SUBJECT_INPUT = (By.ID, "subject")
+    CONTENT_INPUT = (By.ID, "mailContent")
+    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
+    SEND_BUTTON = (By.ID, "mailButton")
+    
 class UserSelector:
     BUTTON_INVITE_USER = (By.ID, "newInvitationButton")
     BUTTON_ADD_USER = (By.ID, "addInvitationButton")
diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index 9743926e..542cab25 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -28,6 +28,7 @@
 from helper.SeleniumUtils import SeleniumUtils, ErrorSelectors
 from helper.Survey import SurveyHelper, SurveyAssertHelper
 from helper.Language import LanguageSelectors, LanguageHelper
+from helper.User import UserHelper, UserRoles, UserSelector, EmailSelectors
 
 loginHelper = LoginHelper()
 
@@ -660,6 +661,158 @@ def test_encounter_schedule(self):
             self.utils.search_and_delete_item(bundle["name"],bundle["id"], "bundle")
             self.utils.search_and_delete_item(created_questionnaire['name'], created_questionnaire['id'], "questionnaire")
             self.authentication_helper.logout()
+
+    def test_user_list(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        # Act
+        self.navigation_helper.navigate_to_manager_user()
+
+        self.utils.check_visibility_of_element(UserSelector.TABLE_USERS, "User list not displayed")
+        self.utils.check_visibility_of_element(UserSelector.PAGINATION_USER_TABLE, "Pagination not displayed")
+        self.utils.check_visibility_of_element(UserSelector.TABLE_ACTION_BUTTONS, "Action buttons not displayed")
+        self.utils.check_visibility_of_element(UserSelector.BUTTON_INVITE_USER, "Invite user button not displayed")
+        
+    def test_invitation_edit(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        #Arrange - Create a new clinic
+        clinic={}
+        self.navigation_helper.navigate_to_manage_clinics()
+
+        try:
+            clinic["name"]=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],)
+            clinic["id"]=self.clinic_helper.save_clinic(clinic["name"])
+        except Exception:
+            self.fail("Failed to create clinic")
+
+        #Arrange - Click on the user menu
+        self.navigation_helper.navigate_to_manager_user()
+
+        self.utils.click_element(UserSelector.BUTTON_INVITE_USER)
+        
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_FIRST_NAME(0), "First name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_LAST_NAME(0), "Last name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_EMAIL(0), "Email input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.BUTTON_ADD_USER, "Add user button not displayed")
+        self.utils.click_element(UserSelector.BUTTON_ADD_USER)
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_FIRST_NAME(1), "Second user's first name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_LAST_NAME(1), "Second user's last name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_EMAIL(1), "Second user's email input field not displayed")
+        self.utils.click_element(UserSelector.BUTTON_REMOVE_INVITATION)        
+        
+        #Assert - Check if the fields were removed
+        try:
+            WebDriverWait(self.driver, 10).until_not(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_FIRST_NAME(0))
+            )
+        except Exception:
+            self.fail("First name input field still displayed")
+
+        try:
+            WebDriverWait(self.driver, 10).until_not(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_LAST_NAME(0))
+            )
+        except Exception:
+            self.fail("Last name input field still displayed")
+        
+        try:
+            WebDriverWait(self.driver, 10).until_not(
+                EC.presence_of_element_located(UserSelector.INPUT_USER_EMAIL(0))
+            )
+        except Exception:
+            self.fail("Email input field still displayed")
+
+        self.utils.check_visibility_of_element(UserSelector.INPUT_CSV, "File upload button not displayed")
+        self.utils.check_visibility_of_element(UserSelector.SELECT_USER_ROLE, "Role dropdown not displayed")
+        self.utils.check_visibility_of_element(UserSelector.SELECT_USER_LANGUAGE, "Language dropdown not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_PERSONAL_TEXT, "Invite message input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.TABLE_AVAILABLE_CLINICS, "Available clinic table not displayed")
+        self.utils.check_visibility_of_element(UserSelector.TABLE_ASSIGNED_CLINICS, "Assigned clinic table not displayed")
+        
+        self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic["id"]))
+        
+        self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic["id"]))
+        
+
+        #Assert - Check validations
+        try:
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_SEND_INVITE)
+            )
+            self.utils.click_element(UserSelector.BUTTON_SEND_INVITE)
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            )
+            validation_errors = self.driver.find_elements(*ErrorSelectors.INPUT_VALIDATION_SELECTOR)
+            self.assertEqual(len(validation_errors), 3, "Expected 3 validation errors, but found {len(validation_errors)}")
+
+        except Exception as e:
+            self.fail("Validation error not displayed")
+
+        #Assert - Check if preview button works
+        try:
+            self.utils.fill_text_field(UserSelector.INPUT_USER_FIRST_NAME(0), "Test1")
+            self.utils.fill_text_field(UserSelector.INPUT_USER_LAST_NAME(0), "Test2")
+            self.utils.fill_text_field(UserSelector.INPUT_USER_EMAIL(0), "test@test.com")
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.BUTTON_PREVIEW)
+            )
+            self.utils.click_element(UserSelector.BUTTON_PREVIEW)
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.DIV_PREVIEW)
+            )
+        except Exception as e:
+            self.fail("Preview not displayed")
+        finally:
+            if clinic["id"]:
+                self.utils.search_and_delete_item(clinic["name"], clinic["id"], "clinic")
+        
+    def test_user_mail_to_all(self):
+        test_subject = "Test Subject"
+        test_content = "Test Content"
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        self.navigation_helper.navigate_to_email_to_all_users()
+        
+        self.utils.check_visibility_of_element(EmailSelectors.SUBJECT_INPUT, "Subject input field not displayed")
+        self.utils.check_visibility_of_element(EmailSelectors.CONTENT_INPUT, "Content input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.SELECT_MAIL_LANGUAGE, "Language dropdown not displayed")
+        self.utils.check_visibility_of_element(EmailSelectors.MAIL_PREVIEW_BUTTON, "Preview button not displayed")
+        self.utils.check_visibility_of_element(EmailSelectors.SEND_BUTTON, "Send button not displayed")
+
+
+        #Assert - Check if the preview button works
+        try:
+            self.utils.fill_text_field(EmailSelectors.SUBJECT_INPUT, test_subject)
+            self.utils.fill_text_field(EmailSelectors.CONTENT_INPUT, test_content)
+            self.utils.click_element(EmailSelectors.MAIL_PREVIEW_BUTTON)
+            WebDriverWait(self.driver, 10).until(
+                EC.presence_of_element_located(UserSelector.DIV_PREVIEW_MAIL)
+            )
+        except Exception as e:
+            self.fail("Preview not displayed")
+
+        self.authentication_helper.logout()
+
+    def test_invitation_list(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        # Act
+        self.navigation_helper.navigate_to_manage_invitations()
+        self.utils.check_visibility_of_element(UserSelector.TABLE_INVITAIONS, "User list not displayed")
+        self.utils.check_visibility_of_element(UserSelector.PAGINATION_INVITATION_TABLE, "Pagination not displayed")
+        self.utils.check_visibility_of_element(UserSelector.BUTTON_INVITE_USER, "Invite user button not displayed")
+
+        self.authentication_helper.logout()
     def tearDown(self): 
         self.driver.quit()
 
diff --git a/selenium/user_test.py b/selenium/user_test.py
index 916bfb38..b9994633 100644
--- a/selenium/user_test.py
+++ b/selenium/user_test.py
@@ -88,139 +88,46 @@ def setUp(self):
 
     def test_user_list(self):
         # Arrange
-        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
-            self.skipTest("User AD credentials missing. Test skipped.")
         self.driver.get(self.https_base_url)
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         # Act
         self.navigation_helper.navigate_to_manager_user()
 
-        # Assert - Check if the user list is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.TABLE_USERS)
-            )
-        except:
-            self.fail("User list not displayed")
-
-        #Assert - Check if the elements for pagination is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.PAGINATION_USER_TABLE)
-            )
-        except:
-            self.fail("Pagination not displayed")
-
-        #Assert - Check if the elements for action buttons is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.TABLE_ACTION_BUTTONS)
-            )
-        except:
-            self.fail("Action buttons not displayed")
-        
-        #Assert - Check if the button to invite a user is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.BUTTON_INVITE_USER)
-            )
-        except:
-            self.fail("Invite user button not displayed")
+        self.utils.check_visibility_of_element(UserSelector.TABLE_USERS, "User list not displayed")
+        self.utils.check_visibility_of_element(UserSelector.PAGINATION_USER_TABLE, "Pagination not displayed")
+        self.utils.check_visibility_of_element(UserSelector.TABLE_ACTION_BUTTONS, "Action buttons not displayed")
+        self.utils.check_visibility_of_element(UserSelector.BUTTON_INVITE_USER, "Invite user button not displayed")
         
     def test_invitation_edit(self):
         # Arrange
-        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
-            self.skipTest("User AD credentials missing. Test skipped.")
         self.driver.get(self.https_base_url)
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         #Arrange - Create a new clinic
-        clinic_name = "Test Clinic"
-        clinic_description = "This is a test clinic"
-        clinic_id = None
+        clinic={}
         self.navigation_helper.navigate_to_manage_clinics()
 
         try:
-            self.clinic_helper.create_clinic(clinic_name, clinic_description,
-                                             configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],)
-            clinic_id=self.clinic_helper.save_clinic(clinic_name)
+            clinic["name"]=self.clinic_helper.create_clinic(configurations=[{'selector': (By.CSS_SELECTOR, '#usePseudonymizationService > div:nth-child(1) > div:nth-child(3) > label:nth-child(1)')}],)
+            clinic["id"]=self.clinic_helper.save_clinic(clinic["name"])
         except TimeoutException:
             self.fail("Failed to create clinic")
 
         #Arrange - Click on the user menu
         self.navigation_helper.navigate_to_manager_user()
 
-        # Act
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.BUTTON_INVITE_USER)
-            )
-            self.utils.click_element(UserSelector.BUTTON_INVITE_USER)
-        except TimeoutException:
-            self.fail("User list not displayed")
-
-        #Assert - Check if the input fields are displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_USER_FIRST_NAME(0))
-            )
-        except TimeoutException:
-            self.fail("First name input field not displayed")
+        self.utils.click_element(UserSelector.BUTTON_INVITE_USER)
         
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_USER_LAST_NAME(0))
-            )
-        except TimeoutException:
-            self.fail("Last name input field not displayed")
-        
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_USER_EMAIL(0))
-            )
-        except TimeoutException:
-            self.fail("Email input field not displayed")
-        
-        #Assert - Check if add new user button is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.BUTTON_ADD_USER)
-            )
-            self.utils.click_element(UserSelector.BUTTON_ADD_USER)
-        except TimeoutException:
-            self.fail("Add user button not displayed")
-        
-        #Assert - Check if new user inputs are created
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_USER_FIRST_NAME(1))
-            )
-        except TimeoutException:
-            self.fail("Second user's first name input field not displayed")
-        
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_USER_LAST_NAME(1))
-            )
-        except TimeoutException:
-            self.fail("Second user's last name input field not displayed")
-        
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_USER_EMAIL(1))
-            )
-        except TimeoutException:
-            self.fail("Second user's email input field not displayed")
-        
-        #Assert - Check if the remove user button is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.BUTTON_REMOVE_INVITATION)
-            )
-            self.utils.click_element(UserSelector.BUTTON_REMOVE_INVITATION)
-        except TimeoutException:
-            self.fail("Remove user button not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_FIRST_NAME(0), "First name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_LAST_NAME(0), "Last name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_EMAIL(0), "Email input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.BUTTON_ADD_USER, "Add user button not displayed")
+        self.utils.click_element(UserSelector.BUTTON_ADD_USER)
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_FIRST_NAME(1), "Second user's first name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_LAST_NAME(1), "Second user's last name input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_USER_EMAIL(1), "Second user's email input field not displayed")
+        self.utils.click_element(UserSelector.BUTTON_REMOVE_INVITATION)        
         
         #Assert - Check if the fields were removed
         try:
@@ -244,70 +151,17 @@ def test_invitation_edit(self):
         except TimeoutException:
             self.fail("Email input field still displayed")
 
-        #Assert - Check if the file upload button is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_CSV)
-            )
-        except TimeoutException:
-            self.fail("File upload button not displayed")
-        #Assert - Check if the role dropdown is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.SELECT_USER_ROLE)
-            )
-        except TimeoutException:
-            self.fail("Role dropdown not displayed")
-
-        #Assert - Check if the language dropdown is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.SELECT_USER_LANGUAGE)
-            )
-        except TimeoutException:
-            self.fail("Language dropdown not displayed")
-
-        #Assert - Check if input for invitation message is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.INPUT_PERSONAL_TEXT)
-            )
-        except TimeoutException:
-            self.fail("Invite message input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_CSV, "File upload button not displayed")
+        self.utils.check_visibility_of_element(UserSelector.SELECT_USER_ROLE, "Role dropdown not displayed")
+        self.utils.check_visibility_of_element(UserSelector.SELECT_USER_LANGUAGE, "Language dropdown not displayed")
+        self.utils.check_visibility_of_element(UserSelector.INPUT_PERSONAL_TEXT, "Invite message input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.TABLE_AVAILABLE_CLINICS, "Available clinic table not displayed")
+        self.utils.check_visibility_of_element(UserSelector.TABLE_ASSIGNED_CLINICS, "Assigned clinic table not displayed")
+        
+        self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic["id"]))
+        
+        self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic["id"]))
         
-        #Assert - Check if the clinic table is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.TABLE_AVAILABLE_CLINICS)
-            )
-        except TimeoutException:
-            self.fail("Available clinic table not displayed")
-
-        #Assert - Check if the assigned clinics table is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.TABLE_ASSIGNED_CLINICS)
-            )
-        except TimeoutException:
-            self.fail("Assigned clinic table not displayed")
-
-        #Assert - Move clinic from available to assigned
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
-            )
-            self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
-        except TimeoutException:
-            self.fail("Move clinic button not displayed")
-
-        #Assert - Move clinic from assigned to available
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
-            )
-            self.utils.click_element(UserSelector.BUTTON_MOVE_CLINIC(clinic_id))
-        except TimeoutException:
-            self.fail("Move clinic button not displayed")
 
         #Assert - Check validations
         try:
@@ -339,59 +193,24 @@ def test_invitation_edit(self):
         except TimeoutException:
             self.fail("Preview not displayed")
         finally:
-            if clinic_id:
-                self.utils.search_and_delete_item(clinic_name, clinic_id, "clinic")
+            if clinic["id"]:
+                self.utils.search_and_delete_item(clinic["name"], clinic["id"], "clinic")
         
     def test_user_mail_to_all(self):
         test_subject = "Test Subject"
         test_content = "Test Content"
         # Arrange
-        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
-            self.skipTest("User AD credentials missing. Test skipped.")
         self.driver.get(self.https_base_url)
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         self.navigation_helper.navigate_to_email_to_all_users()
         
-        #Assert - Check if the subject input is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EmailSelectors.SUBJECT_INPUT)
-            )
-        except TimeoutException:
-            self.fail("Subject input field not displayed")
-
-        #Assert - Check if the content input is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EmailSelectors.CONTENT_INPUT)
-            )
-        except TimeoutException:
-            self.fail("Content input field not displayed")
-            
-        #Assert - Check if the language dropdown is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.SELECT_MAIL_LANGUAGE)
-            )
-        except TimeoutException:
-            self.fail("Language dropdown not displayed")
-
-        #Assert - Check if the preview button is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EmailSelectors.MAIL_PREVIEW_BUTTON)
-            )
-        except TimeoutException:
-            self.fail("Preview button not displayed")
+        self.utils.check_visibility_of_element(EmailSelectors.SUBJECT_INPUT, "Subject input field not displayed")
+        self.utils.check_visibility_of_element(EmailSelectors.CONTENT_INPUT, "Content input field not displayed")
+        self.utils.check_visibility_of_element(UserSelector.SELECT_MAIL_LANGUAGE, "Language dropdown not displayed")
+        self.utils.check_visibility_of_element(EmailSelectors.MAIL_PREVIEW_BUTTON, "Preview button not displayed")
+        self.utils.check_visibility_of_element(EmailSelectors.SEND_BUTTON, "Send button not displayed")
 
-        #Assert - Check if the send button is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(EmailSelectors.SEND_BUTTON)
-            )
-        except TimeoutException:
-            self.fail("Send button not displayed")
 
         #Assert - Check if the preview button works
         try:
@@ -404,49 +223,20 @@ def test_user_mail_to_all(self):
         except TimeoutException:
             self.fail("Preview not displayed")
 
+        self.authentication_helper.logout()
+
     def test_invitation_list(self):
         # Arrange
-        if not self.secret.get('admin-username') or not self.secret.get('admin-username'):
-            self.skipTest("User AD credentials missing. Test skipped.")
         self.driver.get(self.https_base_url)
         self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
 
         # Act
         self.navigation_helper.navigate_to_manage_invitations()
+        self.utils.check_visibility_of_element(UserSelector.TABLE_INVITAIONS, "User list not displayed")
+        self.utils.check_visibility_of_element(UserSelector.PAGINATION_INVITATION_TABLE, "Pagination not displayed")
+        self.utils.check_visibility_of_element(UserSelector.BUTTON_INVITE_USER, "Invite user button not displayed")
 
-        #Assert - Check if the user list is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.TABLE_INVITAIONS)
-            )
-        except:
-            self.fail("User list not displayed")
-
-        #Assert - Check if the elements for pagination is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.PAGINATION_INVITATION_TABLE)
-            )
-        except:
-            self.fail("Pagination not displayed")
-
-        #Assert - Check if the elements for action buttons is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.TABLE_ACTION_BUTTONS)
-            )
-        except:
-            self.fail("Action buttons not displayed")
-        
-        #Assert - Check if the button to invite a user is displayed
-        try:
-            WebDriverWait(self.driver, 10).until(
-                EC.presence_of_element_located(UserSelector.BUTTON_INVITE_USER)
-            )
-        except:
-            self.fail("Invite user button not displayed")
-
-
+        self.authentication_helper.logout()
 
     def tearDown(self):
         if self.driver:
diff --git a/src/main/webapp/WEB-INF/invitation/edit.html b/src/main/webapp/WEB-INF/invitation/edit.html
index 41b4be2d..447c2b3c 100644
--- a/src/main/webapp/WEB-INF/invitation/edit.html
+++ b/src/main/webapp/WEB-INF/invitation/edit.html
@@ -227,6 +227,7 @@
 					<select
 						name="role"
 						class="form-control"
+						id="userRoleSelect"
 					>
 						<th:block th:each="item: ${roleList}">
 							<!--/* Every user has one authority. Get the first one with help of the iterator */-->
@@ -256,6 +257,7 @@
 						th:value="${invitationDTO.locale}"
 						th:field="*{locale}"
 						class="form-control"
+						id="userLanguageSelect"
 					>
 						<option value="de_DE">
 							<label
@@ -476,6 +478,7 @@
 												<div class="col-1">
 													<a
 														data-bs-toggle="collapse"
+														th:id="${item.id}"
 														onClick="move($(this), $('#availableClinicsTable'), $('#assignedClinicsTable'))"
 													>
 														<span class="bi bi-chevron-left"></span>
@@ -504,6 +507,7 @@
 				<div
 					th:if="${not #strings.isEmpty(preview)}"
 					class="form-group"
+					id="previewDiv"
 				>
 					<div
 						th:text="${messages.get(#locale, 'user.label.preview', 'Preview')}"
@@ -536,7 +540,7 @@
 					type="submit"
 					class="btn btn-primary"
 					value="preview"
-					id="inviteButton"
+					id="previewButton"
 					name="action"
 					th:text="${messages.get(#locale, 'user.button.preview', 'Preview')}"
 				>
diff --git a/src/main/webapp/WEB-INF/invitation/list.html b/src/main/webapp/WEB-INF/invitation/list.html
index fec219cb..6e67624d 100644
--- a/src/main/webapp/WEB-INF/invitation/list.html
+++ b/src/main/webapp/WEB-INF/invitation/list.html
@@ -8,6 +8,7 @@
 	<th:block layout:fragment="content">
 		<div class="table-responsive">
 			<table
+				id="invitationTable"
 				class="table table-hover pagedTable responsive"
 				style="width: 100%"
 			>
diff --git a/src/main/webapp/WEB-INF/user/mailtoall.html b/src/main/webapp/WEB-INF/user/mailtoall.html
index 912a71a2..913734bf 100644
--- a/src/main/webapp/WEB-INF/user/mailtoall.html
+++ b/src/main/webapp/WEB-INF/user/mailtoall.html
@@ -72,6 +72,7 @@
 					</select>
 				</div>
 				<th:block th:if="${#bools.isTrue(preview)}">
+					<div id="preview">
 					<h3
 						th:text="${messages.get(#locale, 'user.label.preview', 'Preview')}"
 					></h3>
@@ -99,6 +100,7 @@
 							th:text="${previewContent}"
 						></textarea>
 					</div>
+					</div>
 				</th:block>
 
 				<button

From d83bbae59adb047ac074976ab552bb2e45c57c8d Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Mon, 24 Feb 2025 15:23:07 +0100
Subject: [PATCH 18/20] configuration tests seleniums

---
 selenium/configuration_test.py                | 204 ++++++++++++++++++
 selenium/docker-compose.yml                   |   7 +
 selenium/helper/Configuration.py              | 143 ++++++++++++
 selenium/helper/Navigation.py                 |   9 +-
 selenium/helper/test_images/test_logo.png     | Bin 0 -> 23457 bytes
 selenium/selenium_tests.py                    | 108 ++++++++++
 .../webapp/WEB-INF/configuration/edit.html    |   1 +
 src/main/webapp/WEB-INF/navigation/admin.html |   1 +
 8 files changed, 472 insertions(+), 1 deletion(-)
 create mode 100644 selenium/configuration_test.py
 create mode 100644 selenium/helper/Configuration.py
 create mode 100644 selenium/helper/test_images/test_logo.png

diff --git a/selenium/configuration_test.py b/selenium/configuration_test.py
new file mode 100644
index 00000000..efbd6ce8
--- /dev/null
+++ b/selenium/configuration_test.py
@@ -0,0 +1,204 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import time
+import unittest
+
+from helper.User import UserSelector
+from selenium import webdriver
+from selenium.common.exceptions import TimeoutException
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.chrome.service import Service
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from webdriver_manager.chrome import ChromeDriverManager
+
+from helper.Authentication import AuthenticationHelper
+from helper.Bundle import BundleHelper
+from helper.Clinic import ClinicHelper
+from helper.Condition import ConditionHelper
+from helper.Language import LanguageHelper
+from helper.Navigation import NavigationHelper
+from helper.Question import QuestionHelper
+from helper.Questionnaire import QuestionnaireHelper
+from helper.Score import ScoreHelper
+from helper.SeleniumUtils import SeleniumUtils, ErrorSelectors
+from helper.Survey import SurveyHelper, SurveyAssertHelper
+from helper.Configuration import ConfigurationSelectors, ConfigurationHelper
+from utils.imiseleniumtest import IMISeleniumBaseTest, IMISeleniumChromeTest
+
+
+
+class URLPaths:
+    ADMIN_INDEX = "/admin/index"
+    ADMIN_INDEX_DE = "/admin/index?lang=de_DE"
+    MOBILE_USER_LOGIN = "/mobile/user/login"
+    MOBILE_USER_LOGIN_DE = "/mobile/user/login?lang=de_DE"
+    MOBILE_SURVEY_INDEX = "/mobile/survey/index"
+    LOGIN_BAD_CREDENTIALS = "/mobile/user/login?message=BadCredentialsException"
+    LOGIN_DISABLED_EXCEPTION = "/mobile/user/login?message=DisabledException"
+    PASSWORD_FORGOT = "/mobile/user/password"
+
+
+class EmailSelectors:
+    SUBJECT_INPUT = (By.ID, "subject")
+    CONTENT_INPUT = (By.ID, "mailContent")
+    MAIL_PREVIEW_BUTTON = (By.ID, "mailPreviewButton")
+    SEND_BUTTON = (By.ID, "mailButton")
+
+
+class PasswordResetSelectors:
+    FORGOT_PASSWORD_LINK = (By.ID, "forgotPasswordLink")
+    USERNAME_INPUT = (By.ID, "username")
+    ERROR_MESSAGE = (By.CLASS_NAME, "error")
+
+
+class CustomTest(IMISeleniumChromeTest, unittest.TestCase):
+    seleniumMode: IMISeleniumBaseTest.SeleniumMode = IMISeleniumBaseTest.SeleniumMode.LOCAL
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.base_url = "localhost:8080"
+        cls.https_base_url = "http://localhost:8080"
+
+    def setUp(self):
+        chrome_options = Options()
+        # chrome_options.add_argument("--headless=new")
+        chrome_options.add_argument("start-maximized")
+        driver = webdriver.Chrome(options=chrome_options, service=Service(ChromeDriverManager().install()))
+        # Initialize the WebDriver
+        self.driver = webdriver.Chrome(options=chrome_options)
+
+        # Initialize Navigation and Utils
+        self.navigation_helper = NavigationHelper(self.driver)
+        self.utils = SeleniumUtils(self.driver, navigation_helper=self.navigation_helper)
+        self.navigation_helper.utils = self.utils
+
+        # Initialize other helpers
+        self.authentication_helper = AuthenticationHelper(self.driver)
+        self.questionnaire_helper = QuestionnaireHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.question_helper = QuestionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.condition_helper = ConditionHelper(self.driver, navigation_helper=self.navigation_helper)
+        self.score_helper = ScoreHelper(self.driver, navigation_helper=self.navigation_helper)
+
+        self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
+        self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
+
+        self.survey_assert_helper = SurveyAssertHelper(self.driver, self.navigation_helper)
+        self.language_helper = LanguageHelper(self.driver, self.navigation_helper)
+        self.configuration_helper = ConfigurationHelper(self.driver, self.navigation_helper)
+
+    def test_configuration_edit(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        # Act        
+        self.navigation_helper.navigate_to_configuration()
+
+        self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_LANGUAGE, "Select Language not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_CASE_NUMBER_TYPE, "Case Number Type input not found")
+        self.configuration_helper.add_additional_logo()
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_STORAGE_PATH_FOR_UPLOADS, "Storage Path for Uploads input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_BASE_URL, "Base URL input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_PATH_UPLOAD_IMAGES, self.configuration_helper.DEFAUL_EXPORT_IMAGE_UPLOAD_PATH)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PATH_MAIN_DIRECTORY, "Path for Main Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_AD_AUTH)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_AD, "URL AD input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_DOMAIN_AD, "Domain AD input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_DEFAULT_LANGUAGE_AD, "Default Language AD select not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_NUMBER_AD, "Phone Number AD input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_PATIENT_LOOKUP)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_PATIENT_LOOKUP_IMPLEMENTATION, "Patient Lookup Implementation select not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_HOST_PATIENT_LOOKUP, "Host Patient Lookup input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_PORT_PATIENT_LOOKUP, self.configuration_helper.DEFAULT_PORT_HL7_PATIENT_LOOKUP)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PORT_PATIENT_LOOKUP, "Port Patient Lookup input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PSEUDONYMIZATION_URL, "Pseudonymization URL input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PSEUDONYMIZATION_API_KEY, "Pseudonymization API Key input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_OID, "OID input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_ODM_TO_PDF, "URL ODM to PDF input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_SYSTEM_URI_FOR_FHIR, "System URI for FHIR input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_EXPORT_PATH_ORBIS, self.configuration_helper.DEFAULT_EXPORT_PATH)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_HL7_DIRECTORY, "Export Path HL7 Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_VIA_SERVER)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_HL7_HOST, "HL7 Host input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_HL7_PORT, "HL7 Port input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_SENDING_FACILITY, "Sending Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_RECEIVING_APPLICATION, "Receiving Application input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_RECEIVING_FACILITY, "Receiving Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_FILE_ORDER_NUMBER, "File Order Number input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENCRYPT_MESSAGE_TLS)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.FILE_PATH_CERTIFICATE, "File Path Certificate input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_USE_CERTIFICATE)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.FILE_PKCS_ARCHIVE, "File PKCS Archive input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PASSWORD_PKCS_ARCHIVE, "Password PKCS Archive input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_ODM_DIRECTORY, "Export Path ODM Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_REST)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_REST_INTERFACE, "URL REST Interface input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_HL7)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_HL7_HOST, "ODM HL7 Host input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_HL7_PORT, "ODM HL7 Port input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_SENDING_FACILITY, "ODM Sending Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_RECEIVING_APPLICATION, "ODM Receiving Application input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_RECEIVING_FACILITY, "ODM Receiving Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_FILE_ORDER_NUMBER, "ODM File Order Number input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_FHIR_DIRECTORY, "Export Path FHIR Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_COMMUNICATION_SERVER)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_FHIR_HOST, "FHIR Host input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_REDCAP, "Export Path REDCap input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_VIA_REST)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_REDCAP, "URL REDCap input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TOKEN_REDCAP, "Token REDCap input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_ENCOUNTER, "Time Delete Incomplete Encounter input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_ENCOUNTER_AND_NOT_SENT_QUESTIONNAIRE, "Time Delete Incomplete Encounter and Not Sent Questionnaire input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_EMAIL_COMPLETED_ENCOUNTER, "Time Delete Email Completed Encounter input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_SCHEDULED_ENCOUNTERS, "Time Delete Incomplete Scheduled Encounters input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_SCHEDULED_ENCOUNTER_AND_NOT_SENT_QUESTIONNAIRE, "Time Delete Incomplete Scheduled Encounter and Not Sent Questionnaire input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_UTILIZE_MAILER)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_HOST, "Mail Host input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_PORT, "Mail Port input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENABLE_TLS)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_SMTP_AUTHENTICATION)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_USERNAME_MAILER, "Username Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PASSWORD_MAILER, "Password Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_SENDER_MAILER, "Sender Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EMAIL_ADDRESS_MAILER, "Email Address Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_MAILER, "Phone Mailer input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_MAIL_SUPPORT, self.configuration_helper.DEFAULT_MAIL_SUPPORT)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_SUPPORT, "Mail Support input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_SUPPORT, "Phone Support input not found")
+
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_AD_AUTH, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_PATIENT_LOOKUP, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_VIA_SERVER, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENCRYPT_MESSAGE_TLS, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_USE_CERTIFICATE, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_REST, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_HL7, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_COMMUNICATION_SERVER, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_VIA_REST, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_SMTP_AUTHENTICATION, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENABLE_TLS, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_UTILIZE_MAILER, False)
+
+        self.configuration_helper.save_configuration()
+        self.utils.scroll_to_bottom()
+        self.utils.check_visibility_of_element(ConfigurationSelectors.IMAGE_ADDITIONAL_LOGO, "Additional Logo not found")
+
+    def tearDown(self):
+        if self.driver:
+            self.driver.quit()
+
+
+if __name__ == "__main__":
+    unittest.main()
\ No newline at end of file
diff --git a/selenium/docker-compose.yml b/selenium/docker-compose.yml
index 304fa3e9..435ba4fe 100644
--- a/selenium/docker-compose.yml
+++ b/selenium/docker-compose.yml
@@ -34,6 +34,13 @@ services:
       - "8080:8080"
     networks:
       - selenoid-network
+    volumes:
+      - /var/lib/mopatImages
+      - /var/lib/mopatExport
+      - /var/lib/mopatExport/ODM
+      - /var/lib/mopatExport/FHIR
+      - /var/lib/mopatExport/REDCap
+
     environment:
       - MYSQL_USER=mopat
       - MYSQL_PASSWORD=mopat
diff --git a/selenium/helper/Configuration.py b/selenium/helper/Configuration.py
new file mode 100644
index 00000000..ec938c53
--- /dev/null
+++ b/selenium/helper/Configuration.py
@@ -0,0 +1,143 @@
+import os
+from selenium.common import NoSuchElementException, TimeoutException
+from selenium.webdriver import Keys, ActionChains
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
+
+from helper.Question import QuestionType
+from helper.Questionnaire import QuestionnaireHelper
+from helper.SeleniumUtils import DropdownMethod, SeleniumUtils
+from helper.Navigation import NavigationHelper
+
+
+class ConfigurationSelectors:
+    SELECT_LANGUAGE = (By.ID, "configurationGroupDTOsgeneral0\\.configurationDTOs0\\.value")
+    INPUT_ADDITIONAL_LOGO = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.general > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(2) > div:nth-child(1) > div:nth-child(2) > div:nth-child(4) > div:nth-child(3) > div:nth-child(1) > div:nth-child(5) > input:nth-child(3)")
+    INPUT_CASE_NUMBER_TYPE= (By.ID, "configurationGroupDTOsgeneral0\\.configurationDTOs2\\.value")
+    INPUT_STORAGE_PATH_FOR_UPLOADS = (By.ID, "configurationGroupDTOsgeneral0\\.configurationDTOs3\\.value")
+    INPUT_BASE_URL = (By.ID, "configurationGroupDTOsgeneral0\\.configurationDTOs4\\.value")
+    INPUT_PATH_UPLOAD_IMAGES = (By.ID, "configurationGroupDTOsgeneral0\\.configurationDTOs5\\.value")
+    INPUT_PATH_MAIN_DIRECTORY = (By.ID, "configurationGroupDTOsgeneral0\\.configurationDTOs6\\.value")
+
+    CHECKBOX_AD_AUTH = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.activeDirectoryAuthentication > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(1) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_URL_AD = (By.ID, "configurationGroupDTOsactiveDirectoryAuthentication0.configurationDTOs0.children0.value")
+    INPUT_DOMAIN_AD = (By.ID, "configurationGroupDTOsactiveDirectoryAuthentication0.configurationDTOs0.children1.value")
+    SELECT_DEFAULT_LANGUAGE_AD = (By.ID, "configurationGroupDTOsactiveDirectoryAuthentication0.configurationDTOs0.children2.value")
+    INPUT_PHONE_NUMBER_AD = (By.ID, "configurationGroupDTOsactiveDirectoryAuthentication0.configurationDTOs0.children3.value")
+
+    CHECKBOX_PATIENT_LOOKUP = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.usePatientLookUp > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(1) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    SELECT_PATIENT_LOOKUP_IMPLEMENTATION = (By.ID, "configurationGroupDTOsusePatientLookUp0\\.configurationDTOs1\\.value")
+    INPUT_HOST_PATIENT_LOOKUP = (By.ID, "configurationGroupDTOsusePatientLookUp0\\.configurationDTOs2\\.value")
+    INPUT_PORT_PATIENT_LOOKUP = (By.ID, "configurationGroupDTOsusePatientLookUp0\\.configurationDTOs3\\.value")
+
+    INPUT_PSEUDONYMIZATION_URL = (By.ID, "configurationGroupDTOspseudonymization0\\.configurationDTOs0\\.value")
+    INPUT_PSEUDONYMIZATION_API_KEY = (By.ID, "configurationGroupDTOspseudonymization0\\.configurationDTOs1\\.value")
+
+    INPUT_OID = (By.ID, "configurationGroupDTOsmetadataExporter0\\.configurationDTOs0\\.value")
+    INPUT_URL_ODM_TO_PDF = (By.ID, "configurationGroupDTOsmetadataExporter0\\.configurationDTOs1\\.value")
+    INPUT_SYSTEM_URI_FOR_FHIR = (By.ID, "configurationGroupDTOsmetadataExporter0\\.configurationDTOs2\\.value")
+
+    INPUT_EXPORT_PATH_ORBIS = (By.ID, "configurationGroupDTOsORBIS0\\.configurationDTOs0\\.value")
+
+    CHECKBOX_EXPORT_HL7_INTO_DIRECTORY = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.HLSeven > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(1) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_EXPORT_PATH_HL7_DIRECTORY = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs0\\.children0\\.value")
+
+    CHECKBOX_EXPORT_HL7_VIA_SERVER = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.HLSeven > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(3) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_HL7_HOST = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs1\\.children0\\.value")
+    INPUT_HL7_PORT = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs1\\.children1\\.value")
+    INPUT_SENDING_FACILITY = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs1\\.children2\\.value")
+    INPUT_RECEIVING_APPLICATION = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs1\\.children3\\.value")
+    INPUT_RECEIVING_FACILITY = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs1\\.children4\\.value")
+    INPUT_FILE_ORDER_NUMBER = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs1\\.children5\\.value")
+
+    CHECKBOX_ENCRYPT_MESSAGE_TLS = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.HLSeven > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(10) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    FILE_PATH_CERTIFICATE = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.HLSeven > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(11) > div:nth-child(1) > div:nth-child(2) > div:nth-child(2) > div:nth-child(2) > div:nth-child(3) > div:nth-child(1) > input:nth-child(1)")
+
+    CHECKBOX_USE_CERTIFICATE = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.HLSeven > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(12) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    FILE_PKCS_ARCHIVE = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.HLSeven > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(13) > div:nth-child(1) > div:nth-child(2) > div:nth-child(2) > div:nth-child(2) > div:nth-child(3) > div:nth-child(1) > input:nth-child(1)")
+    INPUT_PASSWORD_PKCS_ARCHIVE = (By.ID, "configurationGroupDTOsHLSeven0\\.configurationDTOs3\\.children1\\.value")
+
+    CHECKBOX_EXPORT_ODM_INTO_DIRECTORY = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.ODM > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(1) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_EXPORT_PATH_ODM_DIRECTORY = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs0\\.children0\\.value")
+
+    CHECKBOX_EXPORT_ODM_VIA_REST = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.ODM > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(3) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_URL_REST_INTERFACE = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs1\\.children0\\.value")
+
+    CHECKBOX_EXPORT_ODM_VIA_HL7 = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.ODM > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(5) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_ODM_HL7_HOST = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs2\\.children0\\.value")
+    INPUT_ODM_HL7_PORT = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs2\\.children1\\.value")
+    INPUT_ODM_SENDING_FACILITY = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs2\\.children2\\.value")
+    INPUT_ODM_RECEIVING_APPLICATION = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs2\\.children3\\.value")
+    INPUT_ODM_RECEIVING_FACILITY = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs2\\.children4\\.value")
+    INPUT_ODM_FILE_ORDER_NUMBER = (By.ID, "configurationGroupDTOsODM0\\.configurationDTOs2\\.children5\\.value")
+
+    CHECKBOX_EXPORT_FHIR_INTO_DIRECTORY = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.FHIR > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(1) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_EXPORT_PATH_FHIR_DIRECTORY = (By.ID, "configurationGroupDTOsFHIR0\\.configurationDTOs0\\.children0\\.value")
+
+    CHECKBOX_EXPORT_FHIR_INTO_COMMUNICATION_SERVER = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.FHIR > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(3) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_FHIR_HOST = (By.ID, "configurationGroupDTOsFHIR0\\.configurationDTOs1\\.children0\\.value")
+
+    CHECKBOX_EXPORT_REDCAP_INTO_DIRECTORY = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.REDCap > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(1) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_EXPORT_PATH_REDCAP = (By.ID, "configurationGroupDTOsREDCap0\\.configurationDTOs0\\.children0\\.value")
+
+    CHECKBOX_EXPORT_REDCAP_VIA_REST = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.REDCap > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(3) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_URL_REDCAP = (By.ID, "configurationGroupDTOsREDCap0\\.configurationDTOs1\\.children0\\.value")
+    INPUT_TOKEN_REDCAP = (By.ID, "configurationGroupDTOsREDCap0\\.configurationDTOs1\\.children1\\.value")
+
+    INPUT_TIME_DELETE_INCOMPLETE_ENCOUNTER = (By.ID, "configurationGroupDTOsencounter0\\.configurationDTOs0\\.value")    
+    INPUT_TIME_DELETE_INCOMPLETE_ENCOUNTER_AND_NOT_SENT_QUESTIONNAIRE = (By.ID, "configurationGroupDTOsencounter0\\.configurationDTOs1\\.value")
+    INPUT_TIME_DELETE_EMAIL_COMPLETED_ENCOUNTER = (By.ID, "configurationGroupDTOsencounter0\\.configurationDTOs2\\.value")
+    INPUT_TIME_DELETE_INCOMPLETE_SCHEDULED_ENCOUNTERS = (By.ID, "configurationGroupDTOsencounter0\\.configurationDTOs3\\.value")
+    INPUT_TIME_DELETE_INCOMPLETE_SCHEDULED_ENCOUNTER_AND_NOT_SENT_QUESTIONNAIRE = (By.ID, "configurationGroupDTOsencounter0\\.configurationDTOs4\\.value")
+
+    CHECKBOX_UTILIZE_MAILER = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.mail > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(1) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    INPUT_MAIL_HOST = (By.ID, "configurationGroupDTOsmail0\\.configurationDTOs0\\.children0\\.value")
+    INPUT_MAIL_PORT = (By.ID, "configurationGroupDTOsmail0\\.configurationDTOs0\\.children1\\.value")
+
+    CHECKBOX_ENABLE_TLS = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.mail > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(4) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+    CHECKBOX_SMTP_AUTHENTICATION = (By.CSS_SELECTOR, "#configurationGroup\\.label\\.mail > fieldset:nth-child(2) > ul:nth-child(2) > li:nth-child(5) > div:nth-child(1) > div:nth-child(2) > label:nth-child(1) > input:nth-child(2)")
+
+    INPUT_USERNAME_MAILER = (By.ID, "configurationGroupDTOsmail0\\.configurationDTOs0\\.children4\\.value")
+    INPUT_PASSWORD_MAILER = (By.ID, "configurationGroupDTOsmail0\\.configurationDTOs0\\.children5\\.value")
+    INPUT_SENDER_MAILER = (By.ID, "configurationGroupDTOsmail0\\.configurationDTOs0\\.children6\\.value")
+    INPUT_EMAIL_ADDRESS_MAILER = (By.ID, "configurationGroupDTOsmail0\\.configurationDTOs0\\.children7\\.value")
+    INPUT_PHONE_MAILER = (By.ID, "configurationGroupDTOsmail0\\.configurationDTOs0\\.children8\\.value")
+
+    INPUT_MAIL_SUPPORT = (By.ID,"configurationGroupDTOssupport0\\.configurationDTOs0\\.value")
+    INPUT_PHONE_SUPPORT = (By.ID,"configurationGroupDTOssupport0\\.configurationDTOs1\\.value")
+
+    BUTTON_SAVE_CONFIGURATION = (By.ID, "saveButton")
+
+    IMAGE_ADDITIONAL_LOGO = (By.CSS_SELECTOR, "div.footer-bar.d-flex.align-items-center.justify-content-between > div.d-bp-flex.d-none.justify-content-end.d-flex")
+    
+
+class ConfigurationHelper:
+
+    DEFAULT_IMAGE_UPLOAD_PATH = "test_images"
+    DEFAULT_IMAGE_FILE_NAME = "test_logo.png"
+
+    DEFAUL_EXPORT_IMAGE_UPLOAD_PATH = "/var/lib/mopatImages"
+    DEFAULT_EXPORT_PATH = "/var/lib/mopatExport"
+    DEFAULT_EXPORT_PATH_ODM = os.path.join(DEFAULT_EXPORT_PATH, "ODM")
+    DEFAULT_EXPORT_PATH_FHIR = os.path.join(DEFAULT_EXPORT_PATH, "FHIR")
+    DEFAULT_EXPORT_PATH_REDCap = os.path.join(DEFAULT_EXPORT_PATH, "REDCap")
+    DEFAULT_PORT_HL7_PATIENT_LOOKUP = 1234
+
+    DEFAULT_MAIL_SUPPORT = "test@test.com"
+
+    def __init__(self, driver, navigation_helper: NavigationHelper):
+        self.driver = driver
+        self.utils = SeleniumUtils(driver, navigation_helper)
+    
+    def add_additional_logo(self, upload_path=DEFAULT_IMAGE_UPLOAD_PATH, file_name=DEFAULT_IMAGE_FILE_NAME):
+        try:
+            image_path = os.path.join(os.path.dirname(__file__), upload_path, file_name)
+            assert os.path.exists(image_path), f"Test image not found at path: {image_path}"
+
+            self.driver.find_element(*ConfigurationSelectors.INPUT_ADDITIONAL_LOGO).send_keys(image_path)
+        except (NoSuchElementException, TimeoutException) as e:
+            print(f"An error occurred while adding additional logo: {e}")
+
+    def save_configuration(self):
+        self.utils.click_element(ConfigurationSelectors.BUTTON_SAVE_CONFIGURATION)
\ No newline at end of file
diff --git a/selenium/helper/Navigation.py b/selenium/helper/Navigation.py
index 50d6c7a1..5d2ffc57 100644
--- a/selenium/helper/Navigation.py
+++ b/selenium/helper/Navigation.py
@@ -29,6 +29,7 @@ class SurveysMenu:
         MANAGE_SURVEY_LINK = (By.ID, "manageSurveyLink")
         SCHEDULE_SURVEY_LINK = (By.ID, "scheduleSurveyLink")
         EXECUTE_SURVEY_LINK = (By.ID, "executeSurveyLink")
+        CONFIGURATION_LINK = (By.ID, "configurationLink")
 
 class QuestionTableSelectors:
     EDIT_QUESTION_LINK = lambda question_id: (By.XPATH, f'//a[@href="fill?id={question_id}"]')
@@ -142,4 +143,10 @@ def navigate_to_manage_invitations(self):
             )
             self.utils.click_element(NavigationBarSelectors.UserMenu.MANAGE_INVITATIONS_LINK)
         except Exception as e:
-            raise Exception(f"Failed to navigate to 'Manage Invitations': {e}")
\ No newline at end of file
+            raise Exception(f"Failed to navigate to 'Manage Invitations': {e}")
+        
+    def navigate_to_configuration(self):
+        try:
+            self.utils.click_element(NavigationBarSelectors.SurveysMenu.CONFIGURATION_LINK)
+        except Exception as e:
+            raise Exception(f"Failed to navigate to 'Configuration': {e}")
\ No newline at end of file
diff --git a/selenium/helper/test_images/test_logo.png b/selenium/helper/test_images/test_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a2d3ef30f38ba3d03548764f10e04d058ff7c61
GIT binary patch
literal 23457
zcmeFZc|6qJ`#5~YFf<G*OIfEBQm8O?O<CIPTXwRhnM%l>2BAnPQr1M4tb-^?Mp7gs
z+sM*rk)5)Z%5&bM?$7=CJ>S>!yne6edH#Fu*WI|zwO{94=Q`*8K4<2#vEe}+RtO6K
zz#TrMV+z1JD)Ns54KaRC&ZxmZ>%0zG`v4#(f&4=S<m~f<NCjhkbKTX|RZ&sl|E>QY
zhGY~&ab90jLo>jO-%T`j@}k6NQfY4(v*wKaCID=f59{nV4|q2@*cX1UDkZ;zW$SHc
zr@Gb7szQwiEf&d}Q7oZ{NrUOJor_obX07pK{mM|`|Nr0r_dW28Bo~SXlnDFKO)tcA
zSKeo=2Dk5975}ntRX*;*@As#E(Eyk^v3e+fVkzbEd85M57Y=?m@qWKr{cGvcoIe1|
z)o*@}-V1C@?3-Tazw*&>GN{`3_Ypum_nZ7c+vClKPyO@RLqZp{KqlkJ#DyoLKOGmv
z-aBS+KZRDYuO95kyZ^vnYG`C8R#3kN1^PUn*3CU(Tai9>tYyjiVc}tAfPXT*_ll1}
z`eKcD&G|b%3Ic#ax$C!cvG&WmhdIx1fFrYd{^PDLEuM${DghQ)AW~Y(<+6@b>)PBC
zqioSZK#>T!V^*_ozBl)@!g~yu%&xgwp<3x`TOC*1N(2<wQ2hc;-5#->M+_dKK&siP
z+q-tqFIYd@)ek8A_fp7c@NE1E&|KI)<}^b943}27G+BTvOZ0v64#f(VuT853p@pVI
z?>9rD{H@S(+k*qY_KkEbiUVW+LYzaG``4KH+;@Ojc=sKk9D3|f_}T81-foasT>HbJ
z_~Ohv4CxRm^H8hX6Ki&xw?c0VPx+xTw>g9hJZ>!!ya$Y5Jx{^)yb9f~wg8pj9Z&5`
zwkmX$4KIZa?LjXe{0TS5%DzQ3*z3JnmaTa4*Qmt<6w$ZUqR3)3)OXQD7_eSdx>K|T
zI)HqDvZxbiO1Yh0*^6Tx?ps(uT5bgm6dpw3OZ>d{N}s7#e~AU$UGo(NXRVK)-O2()
zJ~&6Bv^>$2NAHFuRSwM_PJNgSsIepCn$kPoUwt==25-kP6Z`v)Pvu`GfZdf*@KgFu
zY0vHs47hGDX+{!J=x`sC21Re?2`@eyFV(l0fB<cEIw@|WMy&`Nr8i)G%&ly|+jnkp
zYhs19Di(;J4BC0%a=CXG`zbJ6*wgb!XC<?B|5q?;R&4D`Y;v!8tcGILv~5Lil|S%?
z4DyvKqukM;5|e@hT|)ed{jHc&5V^Y@15V-;g&_z(TuVf|gme{CwLhSwt9mA{9^I1`
z0f=EKL(OK1J>={;J(Toiv%wt+3XtCD=Ac2}ku=o@n(pY{O>8eW0p9M(sGC;1_5-|`
zmR)wib`C8MG+tfHuHg$A@LH??@QPD&jC*GyNYS95je88ibR1>&2{tl##t;zgu3{tW
z9O7)0utfc1g$IVkuhnB&!83yr1Bb|G?c{t;;<ld66n+kHvB%m2h(AttN8@RqQabY(
zbDmYr(0R#TyqfTN;N*>aW*gFqp)@PaDhY$1ugi_CzAB}95&*YLyOLGQ*eo2Zlis*0
z{R&kU6eV3LyYs+t38^?1YF^8vHRlfc7c?cE-iY2{SYb^8MDM8+cTxA;P%PkZpddCl
zAV2|2lo^T)SI!1HBlglr^F+G;U8*`s4@IY;%)PFBIiYM1dQM=1KRr7uUeT)Mj%L`m
zaYkkjhP=km)X5)F9@JKLAU`)Iw0s*!X-XN&BYBOyBqv<!1It@`Cm&<-Qq`BX0<Eqe
zzPJOAY%c)XjI}2S({iu)4JhwFrQF2u?(D-%@POsZ5NvmDmIkZT-F#V+sdEsg(7TH(
zlD174z;5ty<tKig{D@Mewy;y|&=9%joHuT-vkQTO?eoJinc~TyNs0M^w<%XG!xBqS
z9czDX;6OFz5CMD=Vt(NJKs<?dtl2$*2jX=+90`BPkRsDNr16?qj^b7Ab?4ce-|*|h
zRd#$YXvPpvwvM7OH@Dk<X=9JKE|JY}Fix*Nw}ftbiSI@Dtykx}!fjMbv3O3wYRnBB
z<xREw9lQLDQ+?n-g^}E>L|@5tG%)dLeL<o*l3OsmH_|mI7iz3`V|lMaX!Uln7U1}N
z(o=etlT#1HQl`katO<c|Y7bc6)>otjRPJaGg|!btHkIT`4DA+zN`Syl1TgR@M$K+5
z<N<~qRwVGGzK<Qe^eI8j=Jt)FDcauyZ~=FW`T+N*k4jFWcgj&B&tH;gL0WETmGJal
zioxV74E15`wO&eGQb#SH)4{3MYz(~(l?`gnlBMHg(0ZuF<2!lqTWmwXJr4+c4elsZ
z-$^uW{WQ$7?SlNf>Kc}No&B%S^oCEh(v*jHiC(eUJm3kA?TH}UEP;;}Yy!?`hdr~F
z$5KC^%1`$Wa~X<#cTmu2yZUFA=(1~aG@;^$cWKvWbkpUrvsE3=Xoi*Yj4o=(`zwJ@
zWnk~46_zJO$(kw@1r72m%<NX%QdC~q4q@8PT?EkPYDS=x_66Zok{j8<oeDbaCj{_n
zQ|FC<fOxeH8R!guLQ~#*p2^@PiWq8v<!+}S+@(ftaj=@~P;rZ$x6L`4hjO6|LT_8Q
z3DX=ON9VEd`rc@T9PgEKdnvT(stz`)g`Cq39DaE|rPw=cIe`pO`lTox<;RZb++Gmw
zW62M-!h9t@A5)StK}o`K_j#j^h%C;hl=gxIGPwIa2)DZ#v&KgmQ-a*^lM<gmHWWmZ
zv3~J2$s|LATL%ovQH|qb)8B|&63Df|YR0)8vSQLNi_hA!zv@hJK)*_Ht$AF5&e<%Y
z%a-U)XvXk09-bjy&JbMk&lE8XV#m4(+GpM#tL)PhmA;u>K-o**DJY$6?;Ey({u(Vk
zF!&CQ_aV#yncJ=v_3ZJLLnqOhn1sUwye&kY{Q6)KG$nRph`Quilxs7j$t?B6i8sYT
z)Tts(;O$b0GTuVsp`=-z0$t73>_jcKLL9|LbqO?GgglL>9b#EjpK#aKIHHwo<uX`_
zzJiecuI~np<Ft1khPqvtH@USJggz0dgkVqigfV5GLB={t?_E%@`9y$?W&8;@+pG;A
zN2|3tfV%D~Rj4aadb1D)*er58Ck<OfvSl<&fGqZ+dxae+)kT$RqoC}p8cg7&7av(v
zjC}mXF#*Gsqm3KUDlLuBNbi-5%`{bvzZ2!yAY^R|5DoHKWeXUrnEM2-_Gk{CM-7$D
zXNc0u(iXU9tNJ?8DmN;IP?lbkD6g~^!x%8(5c}>uTIJH92C%HCWB1~y2?S)P3p@<y
zn3f}&{^|Gy9w(3D_Fh1+DanweWrRG%#8Y_sD57!G<zUCa`6kTd^W)~=zDhope(=kj
z62(=-oNcoH3ke+l9*;ZJHcbMT`>x{-wLoAD0h%EYOqCFhH$=G4b7kxy3e~F1&>Y;w
z%TYU)LvT(9c^Wa~o`FFF)ZzoHAVBWY96XBhbLX*lN+|q{0V}B*XDADkNt|9B!J{mN
z)~A72{K1L4=%Nm~tRQ1|k{BRaL7ena9?C<6xElh>2%v&s5E2UndQ}GjLj*FHj_=}O
zQz@kH(gY3@N-a3hrVzl5a-0~HMYSmgZ$LS29^8p)TcBF;EvJ3H3%&@Z=CISG()8GP
z!y2<_FQG7pDOn(vMSLLzl1;33VSie}x$yxJz~x1=T>Ri_!VpY~W?^*+=3#iWwx+Mg
z3&rY&-3e;_W=y%%==b#^%WpVR{HO!vwd}M0rPg9t-kVdJ6mjww6z^>a%+!vY=HPuy
z-zC5%xpaU+C(od|D}D(Pe>#&iOETSC2ha23wS>#}ch|bFC{Z+GTBFFu#fGJ*PtPDg
zD(!1S6U$I{?dOGvhU6v;fB7#ViZgm%2pk@S&2we;a>OX|T}}%KK>Ps`<jc*ddJ}0A
z)VfFlecq#}Q6<19?Df<Vs%#Z_Y^?E87)TR{rKn6gsKpppH*dtf>Yh-d>{ZFdzM4|<
zR{@O}rbuQlSZ>>6VT^xig8GjDG*XKp8a9qNnMmtp_X6x^=>X~6UXdkkroJ`bVsOyG
z7~C5Ym^2~Rei4QG!p+F>Wz%Dlm`pn5O>Nbq$p2O6Ur8tw(>llVSAjGEBK{Zie_8*-
z!wlzdO#f%HwDp{q3k$I<%mL}lAROhMTKgfW_j%R7)idQO=Ub<Bp+QJ>wI|2D+zx$r
z4*oYA-l$fc7e)uIyWQ4Q-v6g3Db5j3d}D2S)+oATn){d(N?m0T4tD8XC7y>Oz_L0Z
zCfosyugaMdiPUCx^Yam40;>2@wF{tq-ZU58<NgWiIH=`-51t>S4r&@fJ-lh!1x^PA
zmo~wnyf{LX0UI`JSp3BcwsuajQCv$him2M9stiE6C=v+NAJsernRL7&y9kJ<cVZsL
zC!x8)p|<Pn@rgJe6g^CW2eFrq^WCypn2Mq%beIXii0b=@f;Xtg<$!v5nB2WlCE*bk
zsziU;eir4W4Zu&fs;5DKP>zr*M1{$UkFEh~a9QBcGXa7VngOa@B5-O;yx^*nI>G8a
z3BhfGxSQlr6z#ZNMh!K_0nOMAF%}3WEQ7E_S&Ew$1tQIU<XM7n5S;C)!L(F_I4s%j
z7*N=YfM3bes58{N>>!V7&gbCo-vSt1Q1Vva8#E=sN(L)0G$0RDS_XYKIh;NB5HK_#
zQP2vHrQP4fA1SY7^biXS&n+lM$<q-5YZ<H~mB>fwRAm>_ato6NC=HG4!!81sSa`#8
zvSzn%>YzBDnVKw9*s{RIvtR9^-g}2jgX7Rn9l{-^V!;=h?SBT~Z=`xC{48hC(oqyE
zNh6PCYZ4@PK)!vRX@}T|Dgt5@Hg=%%<%-O*pp+?!_l80NLtN0G6*znA@mqNTqVFFL
zk6~1ZzmEdImoz>@FE5_*l?V8}oIH&F?sPz*@6w=!qdB?3rM742T`GVwx=SPTw4n;X
zqYX7OPa*)Pe>-{n^F{aowkPnU*%Uij0FF2(Cr|!OXy4VPY!*Oq{G;ed_O5*YDRg{7
zs)zEzSO^V6bif#$DX{gL^&LjXC&zwKzFA#8iE3*7pg<URerX5x&d;*uN&3BJ!yjF2
z&&lPXL;HB6V@78S&idD*<MVPBHsx(dm=LAd_3gWL#Lj*Sd?GDw%fl4&&_PqO3*&y6
z#CudziVNc_N*H#80s-0t9pA6SJyZQAN?}>P5|^c<<%G^;)pE&ptvD(|*`RU$g<f^g
zF%{tUD6qgxMxBZ>zEba#e&9O=M{%ad#U1Di!%@N^uoVHa=y5o4Dty-Tb7^3Q&p~PJ
z^w~d_us&xk(8d|f8#8VwA|`Z>wFh9m{STv!vvL;V^EPGg6r$|a)cCwZ_e&5a(>(i&
zMq~(W(N`61Tofy%sr#t<HcGm;b4V;P(_a>CT%PKo`Q2w5KZq38m}<_DxDTY$Bnp}`
zL^XkQMy+O38pPyNASML?!XYLZlJcK9pW*rDc8~|i96!TTjsOJ^@cs+zWs)FIxhq22
z8?=~kXJqUxTc*t7B7R>5ry%9A#?;jQ(<LRg;G{zE?}R>16ZIfqe5a5Fztdk(7A%})
zpsY9BRe-M15>!*P1UJY}MDwfxU2k83y~CH#px`qNy|<&<29<vc%`<y|4`lgZH5@Ln
z5WO5?ZlFA#qK#GMb=S2g&j9oG9kV*h)%vLXbTh_Rgfo>7^@sCAq%>gtk|T{YeH~(u
zrVebH4BBOYSt+Pse0-dhQWv=6$ZNr@*w~HW_i&E%`c^puuzbNG#`zDs<(l+{I9VSQ
zW8V|LMotr$*GEmB@Ul@x*P0yv-Mm!Nxh`M}7L;lFvh49K(F4m(`FtG1!_KS}9%zg;
z`{;V0HIgHZdQhSRmS1NIs0<E9a)3M5Hr2FdOz##DGF>95@;!3&!(LX3{CrH9*`VD;
zFnhCcokiN%xDYF)bWjof#S?Mhn4LK~@2n(0c=Bm1N7|$M(Qm*|N;u8fW^_v&JZXXg
z4aw$UcCVEAS*(XCiYA<9+_*XIFdI1Ib%0-L)IJc*a;KJ^Rk5X_XsIPX!XjGb)Iq?t
zR=Ub<Svp{xBDj3Cs&Yb8min&5N%V!|faN0+$JI`ovjC9jSK>a>5tMb2Iz#$cuP`W5
znBchDVTBOw6Im@q0Fi98y?(t~uMj9wKDn+4Rsy;ROFK&B2RBGnVa@n;OaxI-RW?nj
zHIP#P^cRoO2-9ehIxPkbINJWJdFfA+u}1w@(@E;sF+p(8c@VWyq!RG>5x{Sr;HEc>
zzGb2KioFY;w>c&N?kVPT-l(aj0(?%+b-`_ZXYEl$n}nzMJv(8YsWfzo?_y-JP`akE
z5s4yOv2Z0i$+aQH-W0?Sbv{PFJ$p$SOg_7wb?+mu37|(x=pKHtB@0j!tUcl{$!Y>8
z`Kx@}anYApXs5|j`!`h01B&Q^4cayc_CVDl4Q}~((~C8!IqZPdgTzA~LxGOIcTBQx
zI>RZUUY8XFS5&eia-)+OEdq<L*(hiYCH9HR5<F0OmZ@gdno$kBE;UY97o9u%3()pJ
zE*pd^o3455++;E*h%O73o1iNQf~zh|c0E)NIUv#mxt-eWfJ)+^Pv9L*n7+n-?VnE-
zuOk2z%hG)T2@pl&6Rww{+bIDr#hNeQGE!qP;OYoPX6S>l4A|YM=f$1FLQzo3jOkTP
zge%f8MaJRF8iicj!Uo#Tc5b;1(}N*m+(=4;qndXXqalBGTpiqYmQcxiil$u_vtiwc
zlsN^)o_Y+ZS4C&Yt1gHF{j&7~lY3FXj11+0mV)#KeOMI9M<ovLhHPbVDHn|f?6v}@
zn7B7`CA^3$WPd>psJ4Ms7-Dfy=h`Q&&D|{=M#NEaQxZ|Nrcl4^I83ay&)tntkPZWt
zr2qN+!}M>~HKu>F{trxR`c&TEvtT+Y8)sDyy?IV3;D^prb`anv$feVr{Wb&GIzX~#
z`{U#qjo1;?>I~hwG<Dy4jg^Dsi&|q95CngMqYm0XL;?w~k-l|g0kaS3%BsA29;g|y
zdT$R&5C%{5Dh{~+rjf=D-F)t+Jc|q@jE~~0_sdlD<x@1#JxPyd{-SK=j|W7XtCUiG
zm)B@ws0hkY5OP4D!i}h^i=x2$Q%FII%1taN|HQG(1ip1OZ$gZa+wuyc&F%yIF$hE=
zfGwfDIMToeg|~&6iwMRgBI*7!*L*bbDLKQIEp>#2*pp^t5m8TMr=<01Jj4)M*(gsS
z5P|@&{{jOL@I^3_{|3Ae3=6$4o1DFc8+@+_Jl#i5;RM?sT@nfof^T65%?;|sFe-qr
zzD;a#9)R#v-#AT8SXCw`j~np-yqbD2y%Q-MYvinoifDw)_@Bw)wp|8+LLY^|D`yWL
zM1Q^JyusOwDER1+yHO>wTBr*cr&tg3jhr?{6VHlB+X%dbYe5($&MdJx9z*%2V*Fs&
z)%9$Y4XVZuwjsb)RpYK3Xy^ueOj5Q&8Y)viyKP65iw-K&I7yT*yX+GHN6uNOC5gaL
zto@8*qU*UpWBDWvkx^;k-lYm7s#t5P{a-f!FlYT?hD~pO<x8l{fF#jR#Yz`ZnIRD)
z&F@?}(8TY%)SFVbvjgLZ*wJQsH^5MYUKdEYD5E!llT^j>mx$>qhb33i?hsTaH_u=~
zao#W|xJl)=Es?{>gDz)Ntz_?Mbztsdq7}#lp0AtzZ=mbBC7Ey>Cae!j$W=YGAUNr~
zlaLChLdUspFC~#Is&cMaCk$&qG5wp%Mgqu>E2fj5VF0W0&dk>XTs9#8>K{ZeDYJ+x
zY8U8wX-N(Y+*A&X?^?3D-BWNvW$I;PUp2YXScq{MGSU)PVOdgB&5#j4*1!+OKLr$o
zs3c*5%;!JANeI{>n1X+RN|g*5p13kBSn$@kshkBTkg{xIWX)YH;GZ*8WG@cG0wn~9
zK!D)<yIdMv<{;l@XY`ZxY`|G~J|2-F4_$t-q^OU|^d7pb*Si^>GpNt#WT$eOg8V_V
z^??#tz}kCw>lqysg)V9EDNY*jrut_MU19+pfl}j0Gi|L||EHP$-_1YN|3}Q4UDuh>
z6>DJgly;#g7lh|cR3eVA13#fFUp2Un0*2Jk<sih>FX{PAR{u!8*Mpg?;CJ@*Lw6OU
zwt-p4T0Lxz@-`G@^|9wY<I@O=Gmb9?1+|RJ++e8|iU+h(_nUl8WFiZwvoSZt$0D>B
zx{{G+_lTe<?~{E^Hzf>nfS+w<QjuR35!CoaQ(o>+cA&)o%hDo0xj_iyZen=ArYnF3
zpZ3HfBHp7YJgPto!(N95;@%*Hi^=_oihc>_ONS~L+QSY<ja%L8H41iQ1Gfk~ht>JA
zMy^+#q%q0<wXSBc5U50ps*C_w2wsSJ)CgS!v@h<BzU6&*R-gqXQsG?h=%atMOW(o)
zLfpFa2@3!|FQ3RY8^rAgjH84_>V0;=Ygd{=9!G)a?k+rtM7^d(f&o%Z$dhL?df*X`
z!=6z|gitnkuG8~$lsK5(ARL_bf&nQ${DxB1n?eAMB>CC*Ml*tPak*BZ!KDQly2ZX~
zkv{hU<(6vtxJWI0Mtm}!n{GI4Cj%I6v3_f`UP$9g4}-L}F>?<uIesvU$umo@uQmrX
z^{&o!0w1|SK!dK<_ls~nX&p0vDU4GG3{jq6zK?2-L#dqg#s?Kf0cFXKt*c%RBMN54
z#LEz7j<$p3gTb480WH;L-MRc1@n|sAP0H7{$EgB_eMOX7munLW%mkg3z5}Ol{r5|)
zQpjqf<vhon!q?~_$jtpBK|shI|J&rNdxgk=rl#er{%Q~|a+W9Wb?xC&0#3z+iE7Uq
zjnSYd<w2qmT*&BRHn09|c|ccRG*jUXpe*PqoukwfA!kkDee?jAB5*=O4BUADGDD*3
zS7p>@KyA#-^XnCM2Q&d?&B~hQ-Dpr{HQzNYhR_c0%=hcr<O*nn+N^iU2{7&A(pH};
zOTn}gR$V=R#t<fHmG|$JHUSqdKyT`)Uh)2>4yeg<?@y(2!q9&%oo|iW1gJNQeGr6>
z$An$~2n&1(q1Ibf4ZEtUt@4x{Qtj5rc?D!d%wuBU*MlfQ5dSQ*(9cKd383(uetc3n
zVVDivo9(jbfjM5U^z5WO2C_t1um_KE$pL(viS^Vy<wt;`IQ{CRR7E}HEt4)x*Fb33
zEp3pS2+#d)TGl+;WCMsYmZFm`yB`3Gd662GnfwK45;wA&{;wwEe{5cATVwtYHDW%f
z0SgW_7evfU{spF^_(8n61hojRRL(UVMbFhDAWKU@L{|w0QhE%IZzl+u1ELL2q+2U8
zOP?Jf@5u#}=S6CV3isRtlrBu%XD1oB<Q#TkIzQr7@W5Rg>M(TKzOXwBP(ImQUt=h2
z^4`r4>u1A#({Y?Mz-vaES#Lv%mX{2>8O*%<MHe$(Yy?#FAAE1iE(Bj@Et%5hq=Ev$
zUMd!93B#;la`=A5t_^G;ywkdQmmZYhY|%0E<dOtV;z^fn5S1Ru`MSu0@ZU|}BQ0A^
zkabx{7Ll&d@A}j19K~&iJN~50xqF0;0Gh+Djg^P^z$HV{_OFUJ0A<kEc_$ls9iX>c
zkhj0td<f7&cWpEnK8Z(xmFoMlvB=^uIdT0N86wn8ZT(>B2`7C{LOdW}z3{%RV+PPl
zFtwG**)TKh`+8l}55ml>DcA2R5ra<h)Vf_q7LuWNlgIf`pvL=WjXiUVGf`$i;)OQ;
zGA4X@cVhP?Ksn#n+rX4uT%Z=hs+Rs?19SWMsT^sgp4Y7M<k|w9&P0r?A>!y&V>kq{
z#*e4R5QGl^+O*;=rX8V<%0_2aXt<&@`V^d}jFK!;L>piMiyn?V{Yc3$C?G}D{~Muc
z-iuL2a{v{}csUN)2gK3I4X}uKND!C;eV1AZh)V?LivNKeUTjq{j0PeH{QIJCfR~&T
zB&11f&RAMe;l8!+XYl!-;;ZeUB4_*`5>*nJif0o(YvFE9Pt?ZAef(sB=BQ!_MX*bk
zcAx(ExmLpKUE#?HG}o&ZXz@Zo+xeQsD3urj{Z_gUoAAD1yYg>MU+TE!t%J<>PT%Su
zw_52xC$~^hb@aQ~>0e)45viYDBm)QZo;!hY`gL{r&L2iqrPOk%sWD_izxn#GI6AAa
z>Qai+9QsU#ZE8*8J}YJUaD&pammd!Y7W*m$%%^1VlKX1xJ6GM$d+tm5&d&8b?fWy!
z(#@B`WqsO@=dFLAq||D;+*#y5q0HOj-g&4tSBllPXS!GP!bA66(tYznr?XTQe6eY#
zPt0EoHc+Z3JXBxxHgJ4>p=VraK!;5@Y*%`QSLyxjbiek>eRXj%u1N-^>%-H1ddqOB
z4xJmr4NAJdI-4_5Y{HwFp4LtEh%K*FZlBzAx0mDiTZclfsH+I8toF6+RbDo7R%tIs
zeOvX;y4KykO#i>f%@0kPQpc3)EpIlz=^zCipni7O^4RWs>-#p_yVuGJZ7-ZQl9~D}
zH!U-IMW^1fKIgZ_%$fM5ZMMlqWv9>1C~sgB4r)EbM;_MqIIT$6)RbHh5?1;^!fD%=
zj;*Ut>Q<@CSkWeIzEfA!>m}HFJIw6r?^GwB!W~-l=`X7f1D}#67KEm=!f~~d^q(|#
zj<Sy<+k4@g@#l>E2n%H~^g*VU*b2w!-wErIO9Z+}%RKV+Q4Sl)p^RG1XCb+LpRCD2
zxcVgd72LRz<`%m5SmmLkE#(^bkCd*DfPLllCXCquJU&I@iZ7izNgRYf;weG0EzUc~
z$GSBJe^e}(JMJ9d5<!M2)uAw(9y4AUZF}KG*Rk~Xm2ZS&!i$$l=dUiOwq@La#zrLD
z3iY&2sQed-+xJ}P>N7JfEz^^#8}gvLo{@8v#uD~<MP+MLTss1XI6E9?w6}hQz2r=y
zhX8jF?x9J2lvFZIs+n!y1b~61?a@)Ca4$mliimG!@BBq4PPwko>bj<r3cG9dc(1DQ
zl7kGW>#E*{pIY}j(A)53<ERpAs*`r<I%p%kZfP6+itCVXr{ftP7^aV)0QvXPkkk<O
zkRy-GUZ4K8-HUM3sgo3LK)uONRvqZ=Cu_NMk{(gngxwR_QpHtjbDD=AwvH$eYV{I#
z+Ftm+DO2p)3oAbIXUEB2jnDzR#rAH}rdY8Xqe@5seqyS(2I=!cFS4SyL8rclCDaj`
z-P0U3w=D?Gc-<cD7s%E_MoYkA<_kYLs93)(Hz;*~cCW@PtF5`J>^2fxs)IIl9YKbv
zu5Bgfu)xvj1tAkVHmmEaCWqECVD)CNVFY{$)wGQ1s9Ctx*k?ZDz4s<_1Pd%pI0!IJ
zkS;OeAZ#S>(EOwEclm=HZawH@TTr-cZ2lXP&M>*aUo}~##$l)bj1WQy4wsGIL8y&#
z+DKlD269H1y!lTyTs*D%`^9h`jL$@akDf{<XER4*M~i*RvsEdoLxa=&6&+@`tF?bx
zU6KD4P_ys%g5HQ0_x;txIFEZUwCc!-$~GrHa<|>o;ohGQfBjq@t$m&7D|2S?ivD2V
z>0jZv`rKYFy?O!5$J^O^zsJhABz?CraBx*VS<_fsXI{)2+}?ScIRzUN#v?wp{CtbP
zu(@At`hE~j`K{gNy?xS8ds$P(mmQ<FIVR%HeCkY-?888nyyWm=_u8eoX$2)V+wh>1
zFO=^rn#GvCw^^gbN#AN2jo$eUou{&)XuatB3v~G%Pu+semtH;&W;y##F-X@&ThAX(
z3xW0r-}@`iy}vP7WmJyq{#C{*T&VJEa1LEBNiTnRu7G5-!ZY;rQQk%}j072n@M3Jg
z<l_|C((TF@<ZK4t1=l0}3pH8hoVr6j*MGxv!sXs$^eWWzT4+-C*qRy3p7fBpx6k@c
zSy0ypG0Z&`U45g&B<Roj%0r6!p6dJb--ynws!MW0as}r49B18F65~$YlzP=WEoY{B
z#EQi`>IlA-v)O>8OIo>PK-~hXHB591&xVyI#ZKFnB)5Xfsppb(l^<%QZ(A>Qh(aR2
zIXItnAu_dl2?ik0Jopdx+Fa??aZ6DS#2z$TB~<K~lRW*PR@S!O!q2t(uPcQeKZ;2k
zr^9+`%CLV}34R<^7bSce_-x%;V97qXFTCKvradJBuz#|~w6DA_oY01@J=^VMCo6U+
zytV0P@q(1OMOA6^U!8O4J4$;6SAv+f8(d7N*F#+$ex<V^!3>{VPZs-BcF_H;>>Irc
z9`!G-2Cet&X@vzSdJeyDW#1FCk`TvV>usfA?CQUzOm1puX$Y{TI_;F9oBn?8FS->O
zBV?$SX-Uf4*YO+*wd>jN&)~J5|Czv}nGw2=IclTakk9%3OZAm7PG)RKMpV^!cAhT|
zUS@;q%WaF>FWI3}-8Nv~P|VQJi{Wt}<mX>;VXjO=E3#=Xdu;o=NwB&(?R<5DHp(q=
zklI-BeW*u2ROe4x>`Qa%H>>$I-P0DT_b*htQsb{;(b`S?NajR2%{8p6s@-NY{eE8H
z%Aa2TKFn%6FC3_x?7orweBS)HSPkS%dbs`b`Dry0p<Yi%W)df0I)+5Bb^PtnxFRx&
zpQlbgVFtw_bmRS$T!OY9vro6se|m+>>Y+ovY4$Ucq}F<9BzhycS#f1xE@gt8^(U8F
zd8Ft!Mwe=4l280eI>fUC2}X_uM}p`(X0|bvoyzu`>38h6Rg?LTGTSQ$2Uu!F`N@et
z@3=9Cz|wI13i}SmTZgNUaSl%)<<lb92J#~-R@=?~$s2wXf1TZTs}e3258pCE>W7`z
z!!FH_Xx~hZP8H5_YA9BeX=rTRN@q>oK{#`eP55*UREl`5s$ceN!S8``ha}x=C(?ud
zo9hJvVy0#;6C59`BMcmYLAToLQEOd24OdY8@a|!Kl<j@kJ=HB7Rf75+zoQH;_*~;%
z>w2GC>&cE|ZND}vF{c4cgPJQ&E3ZDzJC=VvZN4_e5M}32VrN~dvXwZPk@1qJ_lC><
zICDOEQ0`B!47joOvm4s&_;Kf0c5dIlkTaUke&!4A<oy@wOzYXu9zQ>9xRXS>NmR8J
zQdUH?GsUYmZ~yBBobGkw62Bg3!SQG22&_P|L1pJx2)Et-g$XDN-1BD)B<V0?oL74E
zr^WyH2s5`)uIkLxps3E@TCuL`4%cw#r@|$;{eY<h4I5B@xpFV<43__on*IxqGuJJt
zJCeU{fgI5TWG=zMyX>sCgpBmVNV>xHggJ9;e+2BSl>ZwmYwEr?Mk4{Gy8Y2>6%k?l
zO<euPwfwOin%P2M?A|Q*Seu8V>b3q?$-W?_{gu6TzR_a5WXZm&y5jsF+H3k@#3MZO
zg#nJ`=adBh>5@72A8~HRYm@m6Qry@Cr)y7`%{U`7kl86v$V8HLMM1GUBM85insAR5
zrlt6BC}wS9AyZtkkMAFy8_B{6vTwz+-_|z$nJY*f$Ev;J=4yJYBTD|MS?oXFR`68F
z+uqDGUq`Tf{A#x#C-lI=?ee!hwl`CQIS4VeHxUyseU94WY9rZUUYpiO#p=S^I@?LM
zr`!qUC1>nsj-}77uk1gb`>3pTkJ?iMG0ZyNYX3rf)a+VCYBB%6*|0<8?qAFQB;9Y~
zM9S2YnZ5#b^M8`_h4_h_FTOpJMwO@T>|6_aMD8QcgCXw;qd--g{{&leW#5~T%T*2S
z`}4^$f2TY&E4|<33j1pFcnY%ARQ(!^6BLYvLvqf%@p=pI8WtIrofFX{IrikZ>GxLL
zsh*?)wag=HX;oY#KJEM_-BB=Fr+*u)%Z}r&x0(H>wd2a5;8yc<17S`s+xeO47ALQ<
z7+3YL40(RFYX91*hb(@ky8T-3A9T+f{)x_jT2^Dvt&=~Rp8t0wKHk1u)z$yN;sKLq
z(O<#A7g6_fR>Z8W!eaiR01`tVx4r)+)$q90J026AvIls{q1)EhIl|(eydWi;c0sA|
zxN`#hBW1BrwrJ*>VvF9ycetjWU2a+r(;HUu^vSXxpxde0vK=-1ce1o<{<LUMTovf=
z75Dw^`X6jauf<HZ1sw9VIThEnH2XYnzh;$Tx#rJiIPqm~7NWA%p$D<sU#mB{eGKY2
znRFRuOaE^TEvEN5thR5j(L?$AyZ4&ZzX&}o^ZFyQ1v$x8H6QuF^J;NQp$@gIE&rK@
z7P9a-PDt$d_4u`0i$7Ug_QIZjvcFezCVh1E_mbCzKMM=&mMory4dwm_q6*lcnVTNV
z*9IZc>hEA_g`Tmj;RITeZo2r~+W{xu`ipCm$+AH9PTbV)#;T{{!Vvph>l(g3su0QN
zxl`3St=E5_V@<uou@-T$xh-KINy1(-yw&I*@z55{Q{2AE9E5%A!)23e)_;U+d$?>;
zV2ft4wdv|a(eK@l3qSKP(*o(Z@j1G$*+c_tszp|KoRQL2eI&bVYaf2?@~^CSw567D
z;+VX$q+SF6$}V}`UzLBStZ?1!s==NT&(%|p@vCBR7%VG0;7$i~)roUt^Vrj>M@Rlt
zUsmC|lgdMM)9I<RJ~ufCeqY}>O-sW$ne_1Z$GGCadn^9dbvp;(;|F1Jvr0H_@Hm5`
zYU}S7b^Eg73lcW%QqQ1nKgv)%b8i*d8MULz<O<xz*s^AbKSp*@0a2|>Rg$egd!iP2
z;=YtPeN<4!jeHM-9h!XftJ1fSX(iJRaTv<0{Q3b?WGMYlh4=S+P3t>q3SR!3;f0-v
zAK?8q<=?hswW!dNk!#!GtUkCK?irz;ue%OUpK0}VC_Nu+IrnnI+Ty^RnjS%)=7pC$
zr@d}{vA&j2l`*lOdUkf>A?mRAda~|&kMehdyZT~QkAJqFZFy1Wts5-K+-t&RvE5vV
zJQn)N-7bM_w(<D&0;h(!M2$1U9E7E0o03J<;ni=y2Oriiou1oQkzs@+O{=U({fL&?
zO!rXk&-X*EXY?yt?ZYoP>GnoAx$v_w2dVgC;d#TK`&QNJ6vxg@r1GskxSItX+CsnT
zrQpsC<g-!PuQ!WxdGZIvJ1Y;*Ukft#)r4Kyzh2Kp&wrD0cyY{*sye$LU;S3wUHj)k
zg;x?U^i<_S9c3@FXc_@9m5Q(M;2)pAaBaHu*Vy86on|+pfLlx%8Mgrrg7W;f3?+LW
zWW+8O?q^QFIc?@P)|T8x=t33{-G$c+FKl|h1=qh2N?>6wA(lsUU4ztoZF?8+^!(9r
zEfbG7%+)T-=H0FfW7Q?hAh?gOA&-zza9xgT!k|WiU=^$K)+&0O0te~QwGTmOYhhjq
z*hb0gl2VxyYRQW=RoGxbFgR3Rw@`i72zJIm!+P>*#cs#R>hoi!@82SB{5Z-?duzeq
zTfOZ+^QVL0Mx{zyUoVci<t+C|=q%Of@@Mwc77@t;buQt0fqvOMes-jgO{$Ywg&#Li
z*OT|eg}T;99XG2TqB3)ptv7g!41G8G<d@whgUGz{Ju1n`Gp;dVL@f)ic+Z?j{L58x
z*M9k=9=wSRB-_EuC65|55tw;BE2g@OzqUJ&X?G8oFrp&W`DkWO%K@rM`zfSa4|uZL
zPB&UkVdY>wQh(9#=xjagfLuC3Ud8HUtr(Iv1~6?5Kiafs)5oWjV65Y7v6l4)F`Nq@
z^&%|(<xmJddr4QN1jFM0EbFO85Hi$^zIl&4$Z_skN(>HjmDw4ot8#Vl$u`QVFd>_p
znNyp`7E+uff-8P7=Y{1mOZEx>A5RyBFFSoa&#h*at>ndIQw_YRX60M(TMv0!VBfQb
zw6-oe9@_Qd#i8)HAmr^#{fMOmeQ2-l_mHVEErfCU0|()u(5)Xcng=Flj$f~Ja!I!g
zVa}n#kEZ)pg>Uz?no-McEZVpcyw|)jEKmRGze!+;7wM53h>!av=;exc0!%GD;Om64
z-}@duxa9%guu(1M7aI1a&D#>DQ^VtYFb3U|X@$so(b7GaxKD59RKAl7C%Y)~fvND+
z`Ho++`(8FWh=s?UnoO<nKK=d;bBqsH9rI~@NkS5SgZ4pWr<3HrSHy3AzdY=??jfD_
zFC?y8S74eX2QRW0Z8{YsuZ?V#Pr*@f_;|$eOtRmQdTsj8m&HyJae6`3aS}-RJ@(^#
zooCgH8smCBwO1_-f^cvOej8P|4Sgn66{3%`3a`_=c`F);p<C<L?}HWF(>+Kf702#|
z$4R^7dLN5m`eAva|4q*K*2lvmdRyp+LL+5LZ%(FhCXT2s2@7uV{Y5sBo~$R33wyOT
zYY@Yd`U9*Nf*#af@t@hhpBm{h3mPr^&x<&;S1s<<x4|vC30HLwq*I=0PIuBB<)#j%
z`)z(P_Ip-6%xO+`FOju<#V8~n!(MS_`ef366nOc@e(?l+-CuF01RmIg!#{DzYhU-l
z?Z_z&xxrn6059q}_`y3Cc=$fI?-D#?D!FNo+;cEE*Vl`N$5RBj<%9=M1o9&CvbzG8
z%2b4d@1Bv<v<68;A5`Rs9NhI&PkAeZ!`JAZax2K$nx<l}WW*Nu8Xsz5il;(E@xKuj
zg)jAtTsQ#TTB@4-90Q)`J|d)Cfp4%KV?UIyhwqzH?KLMSP{?s}Nt{{)WQ1?BnFxP=
zJ47XX?Y!p7d=lajeRBLb)0LVaI&`1o^jq81%Bb~#D)k4^wzY#*>;*(*8=htcXmH9}
z5(}O$8r!a$$7}#p@&7RL2_Z)TMx|AzR#&zGCuP3{sy-j=p!K#pRDO#BdR+GVDa1FA
z>-lcT8N}64qlT~W1mHBL_-52y7<S`UlNNYnz_7W0^96YqJTfq`NxIAe&pEc8OorzG
z14R#ZZG;EZKJzt9d4bC|(3OAGskQ8dXBdQ79odbMtE8E>q`|6WC5k}f{<LjRSNk*Q
z&4+*X2WLLNk19GhRem0YbwrJx2H^^a%@N&chqKgeilhJo#OU0FHtQ{%dqOc2FrN2Y
z-KIuQ!{k^o+g5<Y)8-`808ca-YFkJ~Mmw>9ZZGS)1Mw@Nj4O`?o~<@n)tr>w0Z$dO
zuT&Pky8(|2au2N;sW&fxhg1x%+`Va7m@9u2tu;9eTf++A4TVRRw0Hdt1uVeNZFl#y
zWFa(gGsH~=IUh<vTOh~65h0Z|ugam?uI6Ja!8XSL?P`}uz8Xxogc5U6m`C?jjn4tV
znm0o1h6hsv_K!_r^LY=)F~mCEbtj^Qe3BdCt^dR8(Z)2c;<JW5Y{_K(qt?vFYf~&I
zphu@fG-wpb0VhG_`f=&(ZZ<G^{CXj`&qH{^r<t#+Vt6VL9!8CRmSGwwwmO&A_XEaZ
zeA(jV<|29ERFh|ZF0+RP9#E#<D?ktK+6_@P=I8D;V$py=x>z7#U<uC}ll9N#4?#@T
zTf&l6+;(`>snld{^9AOCXKFAtS_vY2H{O5H#s&^_5|&P+>q12KsgfS#Jo4R$*tF+O
z6iDr2xrrdi-@1mUE#X0EWL5RcLRkgi6zh=jR!tDj*ZzTxuX`Y6|8_&s_MiU1DI!|&
z9LpR$h{EZI?$dU=3r~h8?%h|oy~+)qw0~MMV*;(8mV6#034z%XlcaBO`d@0@Se3w}
zw0v4hxY7eD8M-&r4ttbA@#Jmy69(W{ju@K$hhHJ3gJ4A0a7F{?xr?nxQ)R6g{@>02
zm#A%)*6`q)q_%FH%u@&t(3=e?YW+?yAxZ;Y8Rd~=;SoB2_Rmkuq9H{VgZ|cAeCYfh
zG{Ft5X0~YBXTp2Qlm*P#7&i7MJ1FYG8Xdb`qye0i`o=c+@8khiq@;8?6Wbs_v#Fi*
zjmxWqOy;qMy_<^R9l>;6@5hHczM{Z{{*6vueK;*F_ud-cn+s1ZCk9ya3U3>-fg)$Q
z?sH7io?GJw5EAM3(Q{im;oMTXCmDxSC&h(FZ(CVd!BhWRDT<4*dUbYvG>w2?gbewz
zL&0+r-dD)IAN>M3DohDF0h_E+d;TYE-Wn7657VEfSKK4t+72~%P2%C9qe8)O-gu6$
z-|q&$@p@<CUJi%*&h=o~eETk4uZJ5@ly(i*?G4E6xuVMP!BZCU<m)mKZ?35Bo<we6
z+(sjGhRyzFDxAfNF5Fz|a7GG$-u73_wOkC|`q<>-M2C|ywSFcFnSPsncwaTd!22j(
z8*dE2x^s8)PqCw?4#S%!J`zG#P_ytGkOP-6E<gj!3P-#jL@LwfpVNj&Srv$93RJI$
zeGf0cI99L6ohXxofZ_)ejqG#qj*7?is|ZV3+}rEwuryX#s(4Fb!Nn21u5_g237hyM
zW%#rXqPDDh{W(Zv{i3J13tkUiP8IH;N)|$(KJJ8F`e&$(p{H2#>KiKv^^z!n4qR%D
z%U6S1Rg|-W;N+}dlYjnyqx|2N$wq<FPhRY0qm<*m8HX56@PQc1SnaR4o*f|Zb=(Q;
zNlt!n<R5(<+vY80K;py}&h5kQ_gRS5)8)oOVm&f|Z$c8AGkm(3g?NA9(qmYN!zZ@g
zHP^S?3HS;&Tr};lE(XTAhq;gFxmB|elWkO`MY9*MV7tw|%!>~Mc7enbiQ%T@R%O6A
zQ;*|Fvr{7rF)(AVvFXX90^pTG6VWr!rUDp?xZL01qQMXNURo7&Z8Bm5jeC-0R9~2(
zh@Mw+j$Hj}4vaUs+<$B4*@yvdkhC8mnLv_>%P<S^u;TH~7-X*?5Ng_GTMdl44d@SG
zAqcN&(eg|wwg=Ktl4Kh=1<T@Y7!^PY#q`9pTz<Ho_nS>0wmkKng}7Pq_)&Vp4|wrz
z;CY7cV6h{RuHUt=t*D%W%4ALN%0_aqbztd1Wzuf&$!KHM^JKsSzAG$go|UAbiHon#
z8>O$C1@W5O*_%^~oIz7s^~@_IpA$u-kvt_mPoKy2>;a!%5BR&m<-yC}Q;NOfCKuRj
z<{cl|b_7ES*`eC>+*uY)tV$Gdef9tinv!mynXE^+%a6Z9flo)8_Y?Hh0Yx8jUh-rI
z@p(3{P2g`vTwILzPDIwFbEbxddOL-{w+d<1rXwzg;RVe<=4&pi1XkO2g7{SHXU+O<
znbP2sUUOJEoJa&0ojEhx9uR-a;c0U_*&a=_g!c0*N>F&Ipdi=7ebDf|^{2gEp^WSE
zO&uDWrLkahN2j(2++jgsA4Hj}OFY?of%+JQ-xw4$iqs84vyvJz<;TYERv=dc_GBT=
z`oGN#F=lgNufdQzNd(-;%ZqM<Wrm!slTedq!3{2Vt{JGZ&S-YX36ul(42*cvnI)@L
zHf*FC#4BoQ#_YBp1MzYOJ}sG$W1GIwwF4SO=fI()-0H|T8iGKCx;`CYl`-&%y^C-h
z=^XGrk--Trzg2vQk67RaJ0P$v<qHc1O~_KXg9RJzd7idDc~lI%b&;_+?oJW|H$GB|
zcaOka^Hyw?y^3fPGP@t+qQwtXoEl(lr%IXK$ND~;M&Y;Tn%-;*kpW&bJzqVT5(o5i
zyx|U#)kDVO?rT_}*~zRPtQvpCVs%fSMfR8Olfm_p6XM{8ij%@(trHYPd`Ufz0t^c7
zAiUnB_u{EKGm|gxawDBbLv$P?<0%VbhMZmsV35Obne?JX!3D3WXIn7?wwy^9`9;c5
z#1j=o;Sjw>q@jeb!b{62;p&<dA>?nFMeGa;=_K13I5g~J6=-Hn+rM@GBL;>4F#Vg=
zi}r$~=7@n|Nj%Cs^H;%|#edt)^s2N%eBn5ic*F|^UN(4f19TAv`&Ma1kLixm)Aj%5
zD*kw_#+u0e=j+#aO_hI`GI<AKNB`-dml-!Wpl|pp!wtvNhk986H~mtvO^7`3x@^f^
z4~OU?;pmp4ea^u@oB@L+j_+Aex;zF6I}N&{a_9cclY0xTfYztC?qct46b}^VXyXci
zU+KPU{)GH(5YUqK&wn|GF-LsOQb3CVLsx13ncbQ23cKsL`k6flFc+^8FmuUZ3Eq#7
zg<{PV8K80*0<F+|ns&S0P;RgsNPA{1Ltx5fddS&!X>9>285z~&EJzYDY_}s+Exyr&
zSMGB?<b=mylCpQcjc7ecwh0Ebvia9;3WLa<`-BH!J@5+vsTtLiM8sNrlGuqUSk}gp
zTeMCitR@fUi6kC)EqsedCfqSR&&^?nXd>Ar2x+qB{nMoGMD`K>MzWgphtr4%JvB*e
zQXc{Ob~#d&5vpTlK-gpW)N(3Oj(!K)rAlb)s6K1WV}rMkS_JZ8DSE@T{_`fi82DWU
z2;hrLIl<!H58xb}@%_%1q@(YjcLG#)DD;NGiKa|t>}5OHBf4n^7WCg&VHl^M;R01D
z+pt}tfOtZN+Zg_mN&S5l;vll^SW}V~gEn*;LIHB-AEl<3H>3@ZxS%QigWK1&b*#LD
zdp{o4@QQKnjHk*VAQtj>E)T)WixGVFfs&3Q;E7=)Dz8WM#0v~4op9x7^Id91(F)zy
zh5KlRoCC94wco2IZ<$>K(h*<-#N2TwLqL}Ph=O3kP5c<xlrj|Uqz&~fu9XhAXpnRX
z@=$LGknQvo2*Ap%BRsAJF;aM<{zYVvBOZjzY*Fyqf^f4zZu5`Atdtq94d`B>^O0b-
zG7k!#-%+qx7=*M&O5akriv>>=4|CeJUz7pM;mPKY_}Ji9$2yEdKc9tSlzdp1x1tn&
z(Z^kq-(<iJcK6F^Zx%US6kbs<3t^?(UD|MXDuI=<ubOvz;*jz>xV_nOWH*oFc6gCC
zQX1i`a?qmXNF!?nw-+3MvhHW7|5ot9ln-9J-V$>ZekBR|gb)d9+8K725Tf&6B9{qt
zfk=+soW<&I8<Ge3rsa5e2M7JJ#6G)AHz<9#u*Bvyk?;vul<AxAmhih|+t$TLHTPnP
z_mhtB;&C^jl_TA+Q1`MHYFUhPO|W>;Y<U6722J}*H{Rxqb}Dlc!-O_d5*43X!%e~=
zaIcXs0L08uR}+NH7$|9jQ!7$Rl|y16vGKM423M>G(A_hazAc%Bhq(WBh?D_F3>foD
za34y9mtOfAE}?I@F;F0K_Xo;Fd0m_a$mCKBil@F4<RY#M3f9`805{?+qoeyj%r63b
zFeE)rg{nUp9^|=^_mCYVcXmW@aXobf-nrTAs`+A1-N0T5S-<H=Q?87S?w6c?>JGef
zvf2A?hqQxFo?j_(AsJ<3Qz&AFP>sg-6CoYo(+TR!gpCpfpy^Emw~@n@d=|XAp6PXA
z1Y_uNK}uQA92LJ=;(k;7dJEwC`7X4xHw#O-vP;i&80N_H5tMKStmkAg>i^JW{qny_
zjl6w+3fy~zCLA#de1Rbr*sQ4JoCui#_dKbwW><#<d5AG$i(W_eejh;{YR_U&$}`F|
z&o6*&d1Vo1NjAeMaDQy-ePZt1AUZy&dD<XQ&ru8P2n?d>UA_{=j^Cm-Vk+svKpnbt
zeTMJIsvWp-*F~=J?LI+@&gku<_4Dm)_;rw_{0LOE!`O@1fnZSn>I65^FD&34JW;0y
zDHj)KDLD5!R-jWgK<+Wt{3QT*tz1emk?i1NE(3&){}ckeH^b4!0kF7Xxfza<uq@sP
zM=$5h(w?Ki*1f}k4`OURqN5y>A&&~=QTDIn1kb-w)f;B?>bQW;H*-7|%LB`si5C#x
zPJpVP-(>(T^ObV|A2alnOI#rvOTqJ9dX|T&;{`fSTlqukugCzF-Pf^CcWD^QU}+1G
zc<b~LUDTr#7L(;DQxhOZpvMiXBbY8%`KXy4{A`Q^Se@hiIa$C?FHE{9+nkTm@(prZ
z9lkFO1WoYR!tM>i;Mnf{d=8nA#(5i$m9Jju1`IOKiu@Dz`5F|hInY3xC*UU3ZkR*l
zbI7ZP-vqwV%fLY^D%YdL@MS38)F`o8$yQCc>Og>i0FhB*)UXjTkaoRSah@V8S+^C4
zoT~2gI?jnuHA+24QMMaXq0Xy0ciG9gQ0F%xo!(_x6hlQQh$i>I1x<8_7=?crcp+;2
zX#}|aBo`%ohzth+B|Ldp9scS~6G?~~_8dbb$Nl18JlA;@M>+3F!_;&V1wkM#3;v;q
z!gll<W_ud}VE6P}3`@T&Ls2<#KKq>!6X6D-Zh(HI0e-~-^B6RdU^Mtrl<>y>&NDb5
zeBw5z)b4KpYJ<|Bl$>0g=Yr9+U@jF(=cYhFd4hp`_e}`Oc$G*0+SsPFJcwd6K5@tM
zr?py{K!JEVi0=iLag>Bz%ED51&mgjAL<y}kycJWA#+O3hp$-_5NJ*JXI1J<j=4nIY
zcq7kxs1>4{NE9Z=Un{(APPbU0wl{jg+n#rPH(((;pfBT~cT77(Bp@`?(KYbDNSSs#
z>RX}C=WV2$xb^=d7j*P*q<<Aq_P%C%a?xFk|9@}@b`{gNf02G>JN%4CF+Hb6VuD2>
z>0(dc*nc}0-%A-Sh!$5`b6utPE&V-Y!23EBPMuyG0V%1fj#6RRJFHS=DA$i?D~geU
z9(`ij*R`ff?(O%R=tJ*!A)QD(kv+)842fYASDyttk2lR^7OYdy;$vd*tS$xM?E~iM
z@~W3^KFH>_y{d0U3{mefiXu8+;bDW_$_Q)?KudQFmWmVAu4IQF*c=4nxu(4DS`|l;
znK}g?gTrq^ajy)?Lgg?-qL<Ami_Swuzn#)rWuA9Ap=!@toF|$vyeWRwG^5)0+7xP_
z!HN>&3}k1`NoSvx$MwOiz^lPOEN|P;%i_vYnjqZzlM+K2VQC?~3j`P54x#b9QyLT=
z&lwc2RH^3|RET~s4+WnX&2r}?Uo4BxoBr#R_HLtn3E-BQ7&hc^nKZ2%65mS_8neKy
zpe7P+2~(E@1V@xU-=zt~=%VDZHTbNWT}>#l(mZTEQiL3KAh=tTFF;pmWsp@xvvh|t
zaLBgeW4Pu<v&fslp8+U194I~e*m4X-3&gB&&vN?|0K@D75RmW|P4SUd1_Wcs#PS(K
zlRN@<ta$@~o^Jv%yE<`{R(&|XZ;WARVg=1JJ7^{uui&iY3N=Ap{W=?hqaXdUMVPi;
zPo0Y@uIY>7W_%Z-?u5W%uB{wZ9RhwiwsKwo0TgAF!Byj(nt<LiSi&Nb{Z?DhN${wP
z5sLdGRKcy`i01wb0r!kj6np1&oRdU*FQs9u2}6yXCee0W5nu~Q9llFDZ1YPK3@OmH
zDHUBmg259X(USqvURfu<)o{)h<b5I0s;5H(Q4R`$Pcdo5U*mBM{@Qf(BZf_vHi6R3
zmCYiTRmV;{@;DIO>UfWK;vdwYa1PqVvV>d^efLhDveP2l(V23lMEl$vfNv-T*p^?7
zei!o6bm0L{A8{)U054fA1OEO@cV+&2SI~QxI8W-xyW@sHvm}#F2Ffm)rDM<{mgNyQ
zTb5&NfdHGAC|0LVz=A1u$#A1RWTlWyD6A#gt=w$Rj<MXK_rpGvYM=2#;~(`@N*h<z
z8-nNlKC)P-;Zn&`EH3e+<tcD4YtMbGbmt&9xYuw`CR4|#wU_eXwmBQ$!8s+os!ch{
z&Eyo=cK9eE6JIexBBltzAJ5qlRQH`&&?N@kj3Lcn3S|u7PxpL)h-$M_z?C+D#*+$g
zlwG%jf$M8B8o#l7R7$j|Q@ausf6a0V6`x%{qaNSArGGM7w5he?>jbx}UIY(bAtexO
ze(VW<Hb_T-2X7`60{U)?l%lHN>i!??T<KR+*A_oFSE3C@&}KE5C|qgP#6HniNEiwd
zkWq^m!=OnR#FQz3l=>ht#47^gf+C780~7%n1sP-pr36{8K`QbX!&D4|RR$$2L>xfg
zvG#p<f57|pzU;H_9?rRI-*eVIckg?C)b=S!*<#Wr6A_yDU4;<)vFSPCp<c!GbxlzP
zZDkluQG#s{nChPkG*v1YGs-Il7lXjvC20!++fPapPc*ch_=&0{WI3D;6}}2F4xe3n
zG8?)NY2qq{*p3eRv_=qUfi;Y!02`L+pMG%%JjJWl=*sLbgF3iGA-<mNhkK3s3Q+Ce
zsuxB!sxu$&pld&bUMlB)(FJfz0tb2{V>fZMcX5$uX?x*M2HLn=Bk<}OM;nHF-tHy7
zN!X+(FR+6-q9^y52Y^A|4LEnoCQua(W{2E((LiVg_wk1V)3oq3CL2i7p~__!9nQ*q
zX2Tr3S_b$1yFMyI4$ez|K*k2{Q8iMG8_61j);zY#pI?DAP&Is>Bm_1SRi2c@7<$PP
z4Ugi=gBg&5`dskR7J(ERJuc)K$aiF1+)EssX1f##@jTf+(wt8pld3Z5_s&D=GQ=%~
z;9`kiCK>*wxOkWp+TfO?rHW}DIf@&)@T0-$o(@!HRNq~P-aqoS7S3bctU~tj%{@^Q
z!80aZO}eZE1}Y}K@}@!z+-=#;L%6Fil$GawO;=lFLFIs?gBTsK0HYU4OeT2kXH&4a
zlKP#9US>ZH*yLU@P@fd?#6bJf462F<B!dS5x^=r%mWSsfHe*;dMBiePH4;1KP*oAP
z4B-e#c1S@k7-#ClPfTX?9L3k^kBHi0!z=_XvB1&))f@cSWX2I)pbvqhU~{Q^675J5
zo1F!TK^)Npjg#?mxXOxY<cT`C6{Hy?ilH2DAmZ)BXsc`?Zmyp>z8))wXe?)4VS`m6
z6ExTrWdCFKr^kP*D0)N0UM-Fg#Z1sr%p$LW2>o&=Gd9nEa@FQ8*JxQsC;cVod%e9)
zU>vCGWZP&fKUU3#uwuVwR1&^+IVf^Ewt>hw^Q#`msA-Cz_7n9!MG4(IskoMF^HuJK
zEy`C5K*ei{h8w;Ff||TDFSN{WHw1Gl<F6t@UpF0++-ycmb*o6chYXHaG(|lk`dNDL
z0)V_U`A#e^yZp8h{3O+_K3^mTanJrvmoyPM(Pq`Ht<K6wXC)ZClOA+Cbg-A@0eMAm
zs3FN-HX2W;%<kx9%t@(c4VoI>ej#@7RB}Wv*k%QVwjK<inAQ#F56;{+px~#b3pGcc
zU(u9*_GoK-eL9sS51?T3Zz(kRA`#5X$exA+Qd3|en3a*;qQ<tDBPtnLU$1<60>MwQ
zLmS{R{UP}{4N}aq!x~9E^Qh36z7oRyg2XZE^zUJ;_=Ush*j#taQ#)t1dgmbE<nKg9
z(Ed89Cam*l5aN|v{U;C(spMWM_fVOkPTy9LnmpXk(8v(R6H;a2HRpJJuEixs!Lj_n
zYd*y!4eaC}ZrlfLtllEvko7D`0`Fj<HUUdzPHqJ44*k=Q?WErmBeayD-JqIjg_VAT
zZijr2lf6ei3pilaO#03rlDN5GszO)9hN9FV4j%>S<Nz`du~P>C#}|d{fQa3E0A68c
zt3w-ROm$%4rA1VC!VKf{d$&`8^wb#RyzFxl$PQ50x~Rg^YKXuqkdhJ>e8tNB?M6f;
zsMTLr9$8oT6$QAJHa&dG@Us-~L;zF-dZdI6+diMtr+_h++1IUGsku#Mh<w-e4z5ca
zfkRjy+`MO9pAO)>xlkAK>K54^uCfm~ok{HQJsbW3M_I31!`%LTlvQya3z!T$U1pE5
zmLp*YCq`2ybSYrVzcvQipAcvTS~GyKATXY7&PQ=|2u-TCJ#L6mU_L931rsI*kE8f~
z>rCU|2N{(RRfcK9xKDF|G8=0_?`*Hz&x#xx1sv-gb+TdnI%@px4#K$=lJ&lO?zEM~
z2^8O!GW>3cD=1tqJ~;aY1#GL`yzE_e7cRZFyt?=Ku7XW5-~RE-k`Ebt<JO2dt!!~&
zGQhR*fkVNLzARXm#A<hxBH$Rk3fAKiN~U+S@^^?eMJ%9l?~K{swI@;GABF&Rx?r~Q
z#mp&|dk&D3oRnQ=by;it7cY;)qgNxbcC~j;pK(Va1eJ`M)8^rVg4f*o)%>qcc2&hT
z&I@q@cwd?kWm)Pt7+E}E+(Cl)xW7-;)n6SRtpBMW1wUtvjHZ=0uAV6*0^yy2_pRqg
zvTrU9MjV2MoRaL;&P$m&Fu$raT9*E8zWs%%bIg<Cm383i;gB}-eP@lEv+PaDz`<+j
z%ci9t50E7{&iQ0SIYU6#rLH-4f#fB-Yf=4WK|m)0u1yXY1+Ps`?VY($|8zb%oZ17x
zhfAlOmffZFwL^~7tQLz8?`{;ee9*K^>9#Qf`21?3lcnLPB{QVnKJ>RI=SI4MUPqYm
zi~y*t7A#u6bFNuiEc%ZAzlRn6{|GPw8z$Gl^UA1>z1&jsj{$MCJz`UC?H&7Xz>xub

literal 0
HcmV?d00001

diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index 542cab25..5ce6a367 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -19,6 +19,7 @@
 from helper.Bundle import BundleHelper, BundleSelectors
 from helper.Clinic import ClinicHelper, ClinicSelectors
 from helper.Condition import ConditionHelper, ConditionSelectors, ConditionAssertHelper
+from helper.Configuration import ConfigurationHelper, ConfigurationSelectors
 from helper.Encounter import EncounterHelper, EncounterSelectors, EncounterScheduleType
 from helper.Login import LoginHelper
 from helper.Navigation import NavigationHelper
@@ -145,6 +146,7 @@ def setUp(self):
         self.question_helper = QuestionHelper(self.driver, self.navigation_helper)
         self.bundle_helper = BundleHelper(self.driver, self.navigation_helper)
         self.clinic_helper = ClinicHelper(self.driver, self.navigation_helper)
+        self.configuration_helper = ConfigurationHelper(self.driver, self.navigation_helper)
         self.survey_helper = SurveyHelper(self.driver, self.navigation_helper)
         self.condition_helper = ConditionHelper(self.driver, self.navigation_helper)
         self.score_helper = ScoreHelper(self.driver, self.navigation_helper)
@@ -813,6 +815,112 @@ def test_invitation_list(self):
         self.utils.check_visibility_of_element(UserSelector.BUTTON_INVITE_USER, "Invite user button not displayed")
 
         self.authentication_helper.logout()
+
+    def test_configuration_edit(self):
+        # Arrange
+        self.driver.get(self.https_base_url)
+        self.authentication_helper.login(self.secret['admin-username'], self.secret['admin-password'])
+
+        # Act        
+        self.navigation_helper.navigate_to_configuration()
+
+        self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_LANGUAGE, "Select Language not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_CASE_NUMBER_TYPE, "Case Number Type input not found")
+        self.configuration_helper.add_additional_logo()
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_STORAGE_PATH_FOR_UPLOADS, "Storage Path for Uploads input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_BASE_URL, "Base URL input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_PATH_UPLOAD_IMAGES, self.configuration_helper.DEFAUL_EXPORT_IMAGE_UPLOAD_PATH)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PATH_MAIN_DIRECTORY, "Path for Main Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_AD_AUTH)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_AD, "URL AD input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_DOMAIN_AD, "Domain AD input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_DEFAULT_LANGUAGE_AD, "Default Language AD select not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_NUMBER_AD, "Phone Number AD input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_PATIENT_LOOKUP)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_PATIENT_LOOKUP_IMPLEMENTATION, "Patient Lookup Implementation select not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_HOST_PATIENT_LOOKUP, "Host Patient Lookup input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_PORT_PATIENT_LOOKUP, self.configuration_helper.DEFAULT_PORT_HL7_PATIENT_LOOKUP)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PORT_PATIENT_LOOKUP, "Port Patient Lookup input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PSEUDONYMIZATION_URL, "Pseudonymization URL input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PSEUDONYMIZATION_API_KEY, "Pseudonymization API Key input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_OID, "OID input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_ODM_TO_PDF, "URL ODM to PDF input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_SYSTEM_URI_FOR_FHIR, "System URI for FHIR input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_EXPORT_PATH_ORBIS, self.configuration_helper.DEFAULT_EXPORT_PATH)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_HL7_DIRECTORY, "Export Path HL7 Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_VIA_SERVER)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_HL7_HOST, "HL7 Host input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_HL7_PORT, "HL7 Port input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_SENDING_FACILITY, "Sending Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_RECEIVING_APPLICATION, "Receiving Application input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_RECEIVING_FACILITY, "Receiving Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_FILE_ORDER_NUMBER, "File Order Number input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENCRYPT_MESSAGE_TLS)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.FILE_PATH_CERTIFICATE, "File Path Certificate input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_USE_CERTIFICATE)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.FILE_PKCS_ARCHIVE, "File PKCS Archive input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PASSWORD_PKCS_ARCHIVE, "Password PKCS Archive input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_ODM_DIRECTORY, "Export Path ODM Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_REST)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_REST_INTERFACE, "URL REST Interface input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_HL7)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_HL7_HOST, "ODM HL7 Host input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_HL7_PORT, "ODM HL7 Port input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_SENDING_FACILITY, "ODM Sending Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_RECEIVING_APPLICATION, "ODM Receiving Application input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_RECEIVING_FACILITY, "ODM Receiving Facility input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_ODM_FILE_ORDER_NUMBER, "ODM File Order Number input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_FHIR_DIRECTORY, "Export Path FHIR Directory input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_COMMUNICATION_SERVER)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_FHIR_HOST, "FHIR Host input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_INTO_DIRECTORY)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EXPORT_PATH_REDCAP, "Export Path REDCap input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_VIA_REST)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_URL_REDCAP, "URL REDCap input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TOKEN_REDCAP, "Token REDCap input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_ENCOUNTER, "Time Delete Incomplete Encounter input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_ENCOUNTER_AND_NOT_SENT_QUESTIONNAIRE, "Time Delete Incomplete Encounter and Not Sent Questionnaire input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_EMAIL_COMPLETED_ENCOUNTER, "Time Delete Email Completed Encounter input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_SCHEDULED_ENCOUNTERS, "Time Delete Incomplete Scheduled Encounters input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_TIME_DELETE_INCOMPLETE_SCHEDULED_ENCOUNTER_AND_NOT_SENT_QUESTIONNAIRE, "Time Delete Incomplete Scheduled Encounter and Not Sent Questionnaire input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_UTILIZE_MAILER)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_HOST, "Mail Host input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_PORT, "Mail Port input not found")
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENABLE_TLS)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_SMTP_AUTHENTICATION)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_USERNAME_MAILER, "Username Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PASSWORD_MAILER, "Password Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_SENDER_MAILER, "Sender Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_EMAIL_ADDRESS_MAILER, "Email Address Mailer input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_MAILER, "Phone Mailer input not found")
+        self.utils.fill_text_field(ConfigurationSelectors.INPUT_MAIL_SUPPORT, self.configuration_helper.DEFAULT_MAIL_SUPPORT)
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_SUPPORT, "Mail Support input not found")
+        self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_SUPPORT, "Phone Support input not found")
+
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_AD_AUTH, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_PATIENT_LOOKUP, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_VIA_SERVER, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENCRYPT_MESSAGE_TLS, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_USE_CERTIFICATE, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_REST, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_ODM_VIA_HL7, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_FHIR_INTO_COMMUNICATION_SERVER, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_INTO_DIRECTORY, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_REDCAP_VIA_REST, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_SMTP_AUTHENTICATION, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENABLE_TLS, False)
+        self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_UTILIZE_MAILER, False)
+
+        self.configuration_helper.save_configuration()
+        self.utils.scroll_to_bottom()
+        self.utils.check_visibility_of_element(ConfigurationSelectors.IMAGE_ADDITIONAL_LOGO, "Additional Logo not found")
+        self.authentication_helper.logout()
     def tearDown(self): 
         self.driver.quit()
 
diff --git a/src/main/webapp/WEB-INF/configuration/edit.html b/src/main/webapp/WEB-INF/configuration/edit.html
index a03cd743..49a41435 100644
--- a/src/main/webapp/WEB-INF/configuration/edit.html
+++ b/src/main/webapp/WEB-INF/configuration/edit.html
@@ -31,6 +31,7 @@
 						<!--/* <c:set var="nameKey" value="${entry.key}" /> */-->
 						<div
 							class="configurationGroup"
+							th:id="${configurationGroup.labelMessageCode}"
 							th:attr="data-deletable=${configurationGroup.deletable}"
 						>
 							<th:block th:if="${configurationGroup.referringId != null}">
diff --git a/src/main/webapp/WEB-INF/navigation/admin.html b/src/main/webapp/WEB-INF/navigation/admin.html
index 4b1715a6..ab481398 100644
--- a/src/main/webapp/WEB-INF/navigation/admin.html
+++ b/src/main/webapp/WEB-INF/navigation/admin.html
@@ -211,6 +211,7 @@
 					<li class="nav-item">
 						<a
 							class="nav-link"
+							id="configurationLink"
 							th:href="@{/configuration/edit}"
 							th:text="#{admin.navigation.configuration}"
 							>Configuration</a

From d963cdcac53bfaee2e1c121d58bf07185f80e50b Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Fri, 28 Feb 2025 15:21:19 +0100
Subject: [PATCH 19/20] validation for configuration

---
 selenium/configuration_test.py | 13 ++++++++++++-
 selenium/selenium_tests.py     | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/selenium/configuration_test.py b/selenium/configuration_test.py
index efbd6ce8..13a7a0c2 100644
--- a/selenium/configuration_test.py
+++ b/selenium/configuration_test.py
@@ -100,7 +100,6 @@ def test_configuration_edit(self):
 
         self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_LANGUAGE, "Select Language not found")
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_CASE_NUMBER_TYPE, "Case Number Type input not found")
-        self.configuration_helper.add_additional_logo()
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_STORAGE_PATH_FOR_UPLOADS, "Storage Path for Uploads input not found")
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_BASE_URL, "Base URL input not found")
         self.utils.fill_text_field(ConfigurationSelectors.INPUT_PATH_UPLOAD_IMAGES, self.configuration_helper.DEFAUL_EXPORT_IMAGE_UPLOAD_PATH)
@@ -174,6 +173,16 @@ def test_configuration_edit(self):
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_SUPPORT, "Mail Support input not found")
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_SUPPORT, "Phone Support input not found")
 
+        self.configuration_helper.save_configuration()
+
+        # Count all divs with class config_error
+        error_divs = self.driver.find_elements(By.CLASS_NAME, "config_error")
+        error_count = len(error_divs)
+
+        # Expect 7 and throw error if less
+        expected_error_count = 7
+        if error_count < expected_error_count:
+            raise AssertionError(f"Expected at least {expected_error_count} divs with class 'config_error', but found {error_count}")
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_AD_AUTH, False)
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_PATIENT_LOOKUP, False)
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_INTO_DIRECTORY, False)
@@ -191,6 +200,8 @@ def test_configuration_edit(self):
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENABLE_TLS, False)
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_UTILIZE_MAILER, False)
 
+        self.configuration_helper.add_additional_logo()
+
         self.configuration_helper.save_configuration()
         self.utils.scroll_to_bottom()
         self.utils.check_visibility_of_element(ConfigurationSelectors.IMAGE_ADDITIONAL_LOGO, "Additional Logo not found")
diff --git a/selenium/selenium_tests.py b/selenium/selenium_tests.py
index 5ce6a367..a433559d 100644
--- a/selenium/selenium_tests.py
+++ b/selenium/selenium_tests.py
@@ -826,7 +826,6 @@ def test_configuration_edit(self):
 
         self.utils.check_visibility_of_element(ConfigurationSelectors.SELECT_LANGUAGE, "Select Language not found")
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_CASE_NUMBER_TYPE, "Case Number Type input not found")
-        self.configuration_helper.add_additional_logo()
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_STORAGE_PATH_FOR_UPLOADS, "Storage Path for Uploads input not found")
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_BASE_URL, "Base URL input not found")
         self.utils.fill_text_field(ConfigurationSelectors.INPUT_PATH_UPLOAD_IMAGES, self.configuration_helper.DEFAUL_EXPORT_IMAGE_UPLOAD_PATH)
@@ -900,6 +899,16 @@ def test_configuration_edit(self):
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_MAIL_SUPPORT, "Mail Support input not found")
         self.utils.check_visibility_of_element(ConfigurationSelectors.INPUT_PHONE_SUPPORT, "Phone Support input not found")
 
+        self.configuration_helper.save_configuration()
+
+        # Count all divs with class config_error
+        error_divs = self.driver.find_elements(By.CLASS_NAME, "config_error")
+        error_count = len(error_divs)
+
+        # Expect 7 and throw error if less
+        expected_error_count = 7
+        if error_count < expected_error_count:
+            raise AssertionError(f"Expected at least {expected_error_count} divs with class 'config_error', but found {error_count}")
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_AD_AUTH, False)
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_PATIENT_LOOKUP, False)
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_EXPORT_HL7_INTO_DIRECTORY, False)
@@ -917,6 +926,8 @@ def test_configuration_edit(self):
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_ENABLE_TLS, False)
         self.utils.toggle_checkbox(ConfigurationSelectors.CHECKBOX_UTILIZE_MAILER, False)
 
+        self.configuration_helper.add_additional_logo()
+
         self.configuration_helper.save_configuration()
         self.utils.scroll_to_bottom()
         self.utils.check_visibility_of_element(ConfigurationSelectors.IMAGE_ADDITIONAL_LOGO, "Additional Logo not found")

From c77731d69fde999acb60c3c885fb7f8a661a8ecd Mon Sep 17 00:00:00 2001
From: Hussain Sabir <hussainaliasghar053@gmail.com>
Date: Fri, 28 Feb 2025 15:21:32 +0100
Subject: [PATCH 20/20] validation for configuration

---
 src/main/webapp/WEB-INF/fragments/processConfigurations.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/WEB-INF/fragments/processConfigurations.html b/src/main/webapp/WEB-INF/fragments/processConfigurations.html
index a50bbd85..81d90fc6 100644
--- a/src/main/webapp/WEB-INF/fragments/processConfigurations.html
+++ b/src/main/webapp/WEB-INF/fragments/processConfigurations.html
@@ -68,6 +68,7 @@
 					th:errors="*{__${selectionPath}__[__${configurationIndex.index}__].value}"
 					th:text="${#fields.errors('__${selectionPath}__[__${configurationIndex.index}__].value')}"
 					style="color: red"
+					class="config_error"
 				>
 				</div>
 			</div>