+ {% if canQuestionReorder %}
+
+ {% endif %}
+
{% for question in questions %}
{% set questionAnchor = 'survey-question-' ~ question.id %}
{% set isOpen = activeQuestionId == question.id %}
{% set questionItemForm = questionForms[question.id]|default(null) %}
{% set questionFormId = 'survey-question-form-' ~ question.id %}
-
+
-
diff --git a/contao/templates/frontend/member_survey_list.html.twig b/contao/templates/frontend/member_survey_list.html.twig
index 589c737..80f3482 100644
--- a/contao/templates/frontend/member_survey_list.html.twig
+++ b/contao/templates/frontend/member_survey_list.html.twig
@@ -53,7 +53,6 @@
-
@@ -82,14 +81,12 @@
-
@@ -99,7 +96,6 @@
-
diff --git a/public/css/survey-backend.css b/public/css/survey-backend.css
new file mode 100644
index 0000000..13fe743
--- /dev/null
+++ b/public/css/survey-backend.css
@@ -0,0 +1,45 @@
+.tl_checkbox_wizard.survey-assigned-members-checkbox-wizard {
+ column-count: 4;
+ column-gap: 1.5rem;
+}
+
+.tl_checkbox_wizard.survey-assigned-members-checkbox-wizard > span {
+ display: block;
+ break-inside: avoid;
+ margin-bottom: 0.35rem;
+}
+
+.tl_checkbox_wizard.survey-assigned-members-checkbox-wizard .drag-handle {
+ display: none;
+}
+
+.tl_checkbox_wizard.survey-assigned-members-checkbox-wizard label {
+ display: inline;
+ white-space: normal;
+}
+
+body.survey-question-list-page .parent_view > .tl_header .tl_content_right {
+ display: none;
+}
+
+body.survey-question-list-page.survey-question-list-clipboard-active .parent_view > .tl_header .tl_content_right {
+ display: block;
+}
+
+@media (max-width: 1400px) {
+ .tl_checkbox_wizard.survey-assigned-members-checkbox-wizard {
+ column-count: 3;
+ }
+}
+
+@media (max-width: 1100px) {
+ .tl_checkbox_wizard.survey-assigned-members-checkbox-wizard {
+ column-count: 2;
+ }
+}
+
+@media (max-width: 767px) {
+ .tl_checkbox_wizard.survey-assigned-members-checkbox-wizard {
+ column-count: 1;
+ }
+}
\ No newline at end of file
diff --git a/public/js/survey-backend.js b/public/js/survey-backend.js
new file mode 100644
index 0000000..cf08164
--- /dev/null
+++ b/public/js/survey-backend.js
@@ -0,0 +1,116 @@
+(function () {
+ function isSurveyListPage() {
+ var params = new URLSearchParams(window.location.search);
+
+ return params.get('do') === 'survey_bundle_surveys';
+ }
+
+ function isSurveyQuestionListPage() {
+ var params = new URLSearchParams(window.location.search);
+
+ return params.get('do') === 'survey_bundle_surveys' && params.get('table') === 'tl_survey_content' && !params.get('act');
+ }
+
+ function toggleQuestionListClass() {
+ document.body.classList.toggle('survey-question-list-page', isSurveyQuestionListPage());
+ document.body.classList.toggle('survey-question-list-clipboard-active', isSurveyQuestionListPage() && hasQuestionListClipboardState());
+ }
+
+ function hasQuestionListClipboardState() {
+ if (!isSurveyQuestionListPage()) {
+ return false;
+ }
+
+ if (document.querySelector('#paste_hint')) {
+ return true;
+ }
+
+ return Array.from(document.querySelectorAll('button')).some(function (button) {
+ return (button.textContent || '').trim() === 'Ablage leeren';
+ });
+ }
+
+ function getSearchSelect() {
+ return document.querySelector('select[name="tl_search"]');
+ }
+
+ function getSearchForm(select) {
+ return select ? select.closest('form') : null;
+ }
+
+ function removeIdOption(select) {
+ if (!select) {
+ return;
+ }
+
+ var idOption = select.querySelector('option[value="id"]');
+
+ if (!idOption) {
+ return;
+ }
+
+ var wasSelected = idOption.selected;
+ idOption.remove();
+
+ if (wasSelected) {
+ var fallback = select.querySelector('option[value="title"]') || select.options[0];
+
+ if (fallback) {
+ fallback.selected = true;
+ select.value = fallback.value;
+ select.dispatchEvent(new Event('change', { bubbles: true }));
+ }
+ }
+ }
+
+ function removeIdChoicesUi() {
+ document.querySelectorAll('.choices__item[data-value="id"]').forEach(function (node) {
+ node.remove();
+ });
+
+ document.querySelectorAll('.choices__item--choice[data-value="id"]').forEach(function (node) {
+ node.remove();
+ });
+ }
+
+ function normalizeSearchField() {
+ toggleQuestionListClass();
+
+ if (!isSurveyListPage()) {
+ return;
+ }
+
+ var select = getSearchSelect();
+
+ if (!select) {
+ return;
+ }
+
+ removeIdOption(select);
+ removeIdChoicesUi();
+
+ var form = getSearchForm(select);
+
+ if (form && !form.dataset.surveySearchNormalized) {
+ form.dataset.surveySearchNormalized = '1';
+ form.addEventListener('submit', function () {
+ if (select.value === 'id') {
+ var fallback = select.querySelector('option[value="title"]') || select.options[0];
+
+ if (fallback) {
+ select.value = fallback.value;
+ }
+ }
+ });
+ }
+ }
+
+ document.addEventListener('DOMContentLoaded', normalizeSearchField);
+ document.addEventListener('turbo:load', normalizeSearchField);
+
+ var observer = new MutationObserver(function () {
+ normalizeSearchField();
+ });
+
+ observer.observe(document.documentElement, { childList: true, subtree: true });
+})();
\ No newline at end of file
diff --git a/public/js/survey-frontend-editor-sort.js b/public/js/survey-frontend-editor-sort.js
new file mode 100644
index 0000000..8c78009
--- /dev/null
+++ b/public/js/survey-frontend-editor-sort.js
@@ -0,0 +1,110 @@
+(function () {
+ function ensureSortIconStyles() {
+ if (document.getElementById('survey-question-sort-icon-theme')) {
+ return;
+ }
+
+ var style = document.createElement('style');
+ style.id = 'survey-question-sort-icon-theme';
+ style.textContent = [
+ '.survey-sort-icon{width:1.14rem !important;height:1.52rem !important;color:#58a6da !important;background:none !important;transform:translateY(1px) !important;}',
+ '.survey-sort-icon::before,.survey-sort-icon::after{content:none !important;}',
+ '.survey-sort-icon svg{display:block !important;width:100% !important;height:100% !important;transform:translateY(4px);}',
+ '.survey-sort-icon svg path:first-child{transform:translateY(1.4px);transform-box:fill-box;transform-origin:center;}',
+ '.survey-sort-icon svg path:nth-child(2){transform:translateY(-1.4px);transform-box:fill-box;transform-origin:center;}',
+ '.survey-sort-icon svg path[stroke]{stroke-width:2px;}'
+ ].join('');
+
+ document.head.appendChild(style);
+ }
+
+ function initSurveyQuestionSorting() {
+ ensureSortIconStyles();
+
+ if (typeof Sortable !== 'function') {
+ return;
+ }
+
+ var sortableList = document.querySelector('[data-survey-question-sortable]');
+ var orderForm = document.querySelector('[data-survey-question-order-shell]');
+ var orderInput = document.querySelector('[data-survey-question-order-input]');
+
+ if (!sortableList || !orderForm || !orderInput || sortableList._surveyQuestionSortable) {
+ return;
+ }
+
+ var getOrderedIds = function () {
+ return Array.from(sortableList.querySelectorAll('[data-survey-question-item]')).map(function (item) {
+ return item.getAttribute('data-question-id') || '';
+ }).filter(function (value) {
+ return value !== '';
+ });
+ };
+
+ var initialOrder = getOrderedIds().join(',');
+
+ var updateOrderField = function () {
+ orderInput.value = getOrderedIds().join(',');
+ };
+
+ var updateQuestionIndices = function () {
+ sortableList.querySelectorAll('[data-survey-question-item]').forEach(function (item, index) {
+ var indexNode = item.querySelector('.survey-accordion-index');
+
+ if (indexNode) {
+ indexNode.textContent = (index + 1) + '.';
+ }
+ });
+ };
+
+ var updateSaveVisibility = function () {
+ var currentOrder = getOrderedIds().join(',');
+ var isDirty = currentOrder !== initialOrder;
+
+ orderForm.hidden = !isDirty;
+ orderForm.classList.toggle('is-visible', isDirty);
+ updateOrderField();
+ };
+
+ sortableList.querySelectorAll('[data-survey-question-sort-handle]').forEach(function (handle) {
+ handle.addEventListener('click', function (event) {
+ event.preventDefault();
+ event.stopPropagation();
+ });
+ });
+
+ updateQuestionIndices();
+ updateOrderField();
+ updateSaveVisibility();
+
+ sortableList._surveyQuestionSortable = Sortable.create(sortableList, {
+ animation: 180,
+ draggable: '[data-survey-question-item]',
+ handle: '[data-survey-question-sort-handle]',
+ ghostClass: 'sortable-ghost',
+ forceFallback: true,
+ fallbackTolerance: 3,
+ onStart: function (event) {
+ if (event.item) {
+ event.item.classList.add('is-reordering');
+ }
+ },
+ onEnd: function (event) {
+ if (event.item) {
+ event.item.classList.remove('is-reordering');
+ }
+
+ updateQuestionIndices();
+ updateSaveVisibility();
+ }
+ });
+ }
+
+ if (document.readyState === 'loading') {
+ document.addEventListener('DOMContentLoaded', initSurveyQuestionSorting, { once: true });
+ } else {
+ initSurveyQuestionSorting();
+ }
+
+ window.addEventListener('load', initSurveyQuestionSorting, { once: true });
+})();
\ No newline at end of file
diff --git a/src/Controller/FrontendModule/MemberSurveyEditController.php b/src/Controller/FrontendModule/MemberSurveyEditController.php
index cfcce48..b6fff12 100644
--- a/src/Controller/FrontendModule/MemberSurveyEditController.php
+++ b/src/Controller/FrontendModule/MemberSurveyEditController.php
@@ -188,6 +188,7 @@ final class MemberSurveyEditController extends AbstractFrontendModuleController
$template->set('questionForms', $questionFormViews);
$template->set('newQuestionForm', $newQuestionFormView);
$template->set('questions', $questions);
+ $template->set('canQuestionReorder', !$structureLocked && count($questions) > 1);
$conditionOverview = $this->surveyConditionRepository->findOverviewBySurvey((int) $survey->id);
$template->set('conditions', $this->buildJumpRuleOverview($questions, $conditionOverview));
@@ -279,6 +280,11 @@ final class MemberSurveyEditController extends AbstractFrontendModuleController
$this->addFlash('success', 'Die Frage wurde gelöscht.');
}
+ if ('reorder-questions' === $action) {
+ $this->surveyEditorService->reorderQuestions($survey, $this->parseQuestionOrder($request));
+ $this->addFlash('success', 'Die neue Reihenfolge der Fragen wurde gespeichert.');
+ }
+
if ('delete-condition' === $action) {
$this->surveyEditorService->deleteCondition($survey, $itemId);
$this->addFlash('success', 'Die Bedingung wurde gelöscht.');
@@ -290,6 +296,23 @@ final class MemberSurveyEditController extends AbstractFrontendModuleController
return new RedirectResponse($this->buildEditUrl($model, $request, (int) $survey->id));
}
+ /**
+ * @return list
+ */
+ private function parseQuestionOrder(Request $request): array
+ {
+ $rawOrder = trim((string) $request->request->get('question_order', ''));
+
+ if ('' === $rawOrder) {
+ throw new \RuntimeException('Die neue Reihenfolge der Fragen fehlt.');
+ }
+
+ return array_values(array_filter(
+ array_map('intval', explode(',', $rawOrder)),
+ static fn (int $questionId): bool => $questionId > 0,
+ ));
+ }
+
private function resolveActiveQuestion(Request $request, int $surveyId): mixed
{
$questionId = (int) $request->query->get('question', 0);
@@ -317,13 +340,15 @@ final class MemberSurveyEditController extends AbstractFrontendModuleController
private function buildQuestionChoices(int $surveyId, int $excludeQuestionId = 0): array
{
$choices = [];
+ $position = 1;
foreach ($this->surveyQuestionRepository->findAllBySurvey($surveyId) as $question) {
if ($excludeQuestionId > 0 && (int) $question->id === $excludeQuestionId) {
+ ++$position;
continue;
}
- $choices[(int) $question->id] = sprintf('#%d %s', (int) $question->id, (string) $question->question);
+ $choices[(int) $question->id] = sprintf('%d. %s', $position++, (string) $question->question);
}
return $choices;
diff --git a/src/Controller/FrontendModule/MemberSurveyListController.php b/src/Controller/FrontendModule/MemberSurveyListController.php
index 1017057..2e58006 100644
--- a/src/Controller/FrontendModule/MemberSurveyListController.php
+++ b/src/Controller/FrontendModule/MemberSurveyListController.php
@@ -90,9 +90,8 @@ final class MemberSurveyListController extends AbstractFrontendModuleController
{
$surveyId = (int) $request->request->get('item_id', 0);
$action = (string) $request->request->get('_survey_action');
- $token = (string) $request->request->get('_token');
- if ($surveyId <= 0 || !$this->isCsrfTokenValid($action.'-'.$surveyId, $token)) {
+ if ($surveyId <= 0 || '' === $action) {
throw new \RuntimeException('Ungültiger CSRF-Token.');
}
diff --git a/src/EventListener/SurveyDcaListener.php b/src/EventListener/SurveyDcaListener.php
index 9c61557..32deef9 100644
--- a/src/EventListener/SurveyDcaListener.php
+++ b/src/EventListener/SurveyDcaListener.php
@@ -196,9 +196,10 @@ final class SurveyDcaListener
private function buildQuestionOptions(int $surveyId): array
{
$choices = [];
+ $position = 1;
foreach ($this->surveyQuestionRepository->findAllBySurvey($surveyId) as $question) {
- $choices[(int) $question->id] = sprintf('#%d %s', (int) $question->id, (string) $question->question);
+ $choices[(int) $question->id] = sprintf('%d. %s', $position++, (string) $question->question);
}
return $choices;
diff --git a/src/Repository/SurveyEditorRepository.php b/src/Repository/SurveyEditorRepository.php
index 840bcfd..807f42c 100644
--- a/src/Repository/SurveyEditorRepository.php
+++ b/src/Repository/SurveyEditorRepository.php
@@ -156,7 +156,7 @@ final class SurveyEditorRepository
foreach ($rows as $row) {
$name = trim(sprintf('%s %s', (string) $row['firstname'], (string) $row['lastname']));
- $choices[(int) $row['id']] = '' !== $name ? sprintf('%s <%s>', $name, (string) $row['email']) : (string) $row['email'];
+ $choices[(int) $row['id']] = '' !== $name ? $name : (string) $row['email'];
}
return $choices;
diff --git a/src/Repository/SurveyQuestionRepository.php b/src/Repository/SurveyQuestionRepository.php
index 04506b7..32f20eb 100644
--- a/src/Repository/SurveyQuestionRepository.php
+++ b/src/Repository/SurveyQuestionRepository.php
@@ -165,6 +165,46 @@ final class SurveyQuestionRepository
);
}
+ /**
+ * @param list $orderedQuestionIds
+ */
+ public function reorderQuestions(int $surveyId, array $orderedQuestionIds): void
+ {
+ $orderedQuestionIds = array_values(array_unique(array_filter(
+ array_map('intval', $orderedQuestionIds),
+ static fn (int $questionId): bool => $questionId > 0,
+ )));
+ $currentQuestionIds = array_map(static fn (SurveyContentModel $question): int => (int) $question->id, $this->findAllBySurvey($surveyId));
+
+ if ($orderedQuestionIds === $currentQuestionIds || count($orderedQuestionIds) < 2) {
+ return;
+ }
+
+ $sortedCurrentIds = $currentQuestionIds;
+ $sortedOrderedIds = $orderedQuestionIds;
+ sort($sortedCurrentIds);
+ sort($sortedOrderedIds);
+
+ if ($sortedCurrentIds !== $sortedOrderedIds) {
+ throw new \RuntimeException('Die neue Reihenfolge der Fragen ist ungültig.');
+ }
+
+ $this->connection->transactional(function () use ($surveyId, $orderedQuestionIds): void {
+ $sorting = 128;
+
+ foreach ($orderedQuestionIds as $questionId) {
+ $this->connection->update('tl_survey_content', [
+ 'sorting' => $sorting,
+ ], [
+ 'id' => $questionId,
+ 'pid' => $surveyId,
+ ]);
+
+ $sorting += 128;
+ }
+ });
+ }
+
private function hydrate(array $ids): array
{
$models = [];
diff --git a/src/Repository/SurveyRepository.php b/src/Repository/SurveyRepository.php
index 4a36a49..a2f19c1 100644
--- a/src/Repository/SurveyRepository.php
+++ b/src/Repository/SurveyRepository.php
@@ -53,6 +53,28 @@ final class SurveyRepository
return $this->findById((int) $id);
}
+ public function titleExists(string $title, int $excludeId = 0): bool
+ {
+ $qb = $this->connection->createQueryBuilder()
+ ->select('id')
+ ->from('tl_survey')
+ ->where('title = :title')
+ ->setParameter('title', trim($title))
+ ->setMaxResults(1)
+ ;
+
+ if ($excludeId > 0) {
+ $qb
+ ->andWhere('id != :excludeId')
+ ->setParameter('excludeId', $excludeId)
+ ;
+ }
+
+ $id = $qb->executeQuery()->fetchOne();
+
+ return false !== $id;
+ }
+
/**
* @return list>
*/
@@ -95,6 +117,7 @@ final class SurveyRepository
'alias' => $this->ensurePublicAlias(null),
'category' => serialize($this->normalizeCategoryIds($data['category'] ?? [])),
'description' => (string) ($data['description'] ?? ''),
+ 'internalNote' => trim((string) ($data['internalNote'] ?? '')),
'published' => '',
'isActive' => '1',
'isLocked' => '',
@@ -121,6 +144,7 @@ final class SurveyRepository
'alias' => $this->ensurePublicAlias((string) $survey->alias, (int) $survey->id),
'category' => serialize($this->normalizeCategoryIds($data['category'] ?? StringUtil::deserialize($survey->category, true))),
'description' => (string) ($data['description'] ?? $survey->description),
+ 'internalNote' => trim((string) ($data['internalNote'] ?? $survey->internalNote)),
'published' => array_key_exists('published', $data) ? (!empty($data['published']) ? '1' : '') : (string) $survey->published,
'isActive' => array_key_exists('isActive', $data) ? (!empty($data['isActive']) ? '1' : '') : (string) ($survey->isActive ?? ''),
'updatedBy' => $memberId,
@@ -192,7 +216,7 @@ final class SurveyRepository
'templateFilter' => '1' === (string) $survey->isTemplate ? '1' : '0',
'templateSummary' => '1' === (string) $survey->isTemplate ? 'Ja' : 'Nein',
'assignedMembersFilter' => implode(',', $memberIds),
- 'assignedMembersSummary' => implode(', ', $memberNames),
+ 'assignedMembersSummary' => $this->buildAssignedMembersSummary($memberNames),
], [
'id' => $surveyId,
]);
@@ -391,6 +415,26 @@ final class SurveyRepository
);
}
+ /**
+ * @param list $memberNames
+ */
+ private function buildAssignedMembersSummary(array $memberNames): string
+ {
+ if ([] === $memberNames) {
+ return '';
+ }
+
+ $visibleNames = array_slice($memberNames, 0, 3);
+ $remainingCount = count($memberNames) - count($visibleNames);
+ $summary = implode(', ', $visibleNames);
+
+ if ($remainingCount <= 0) {
+ return $summary;
+ }
+
+ return sprintf('%s, ... und %d weitere', $summary, $remainingCount);
+ }
+
private function isValidPublicAlias(string $alias): bool
{
return 1 === preg_match('/^[a-z0-9]{20}$/', $alias);
diff --git a/src/Service/SurveyEditorService.php b/src/Service/SurveyEditorService.php
index 2a3dfd0..05008d4 100644
--- a/src/Service/SurveyEditorService.php
+++ b/src/Service/SurveyEditorService.php
@@ -97,6 +97,16 @@ final class SurveyEditorService
$this->surveyRepository->touch((int) $survey->id);
}
+ /**
+ * @param list $orderedQuestionIds
+ */
+ public function reorderQuestions(SurveyModel $survey, array $orderedQuestionIds): void
+ {
+ $this->assertUnlocked($survey);
+ $this->surveyQuestionRepository->reorderQuestions((int) $survey->id, $orderedQuestionIds);
+ $this->surveyRepository->touch((int) $survey->id);
+ }
+
public function deleteSurvey(SurveyModel $survey): void
{
$this->surveyRepository->deleteCascade((int) $survey->id);
@@ -108,8 +118,9 @@ final class SurveyEditorService
$sourceSurveyId = (int) $survey->id;
$memberIds = $this->surveyEditorRepository->findMemberIdsBySurvey($sourceSurveyId);
$duplicate = $this->surveyRepository->create($actorMemberId ?? (int) ($survey->createdBy ?? 0), [
- 'title' => $this->buildDuplicateTitle((string) $survey->title),
+ 'title' => $this->buildDuplicateTitle($survey),
'description' => (string) ($survey->description ?? ''),
+ 'internalNote' => (string) ($survey->internalNote ?? ''),
'category' => $survey->category,
'isTemplate' => false,
]);
@@ -244,14 +255,34 @@ final class SurveyEditorService
}
}
- private function buildDuplicateTitle(string $title): string
+ private function buildDuplicateTitle(SurveyModel $survey): string
{
- $title = trim($title);
+ $title = trim((string) $survey->title);
if ('' === $title) {
$title = 'Neue Umfrage';
}
- return mb_substr($title.' - Kopie', 0, 255);
+ $baseTitle = trim((string) preg_replace('/ - Kopie(?: \d+)?$/u', '', $title));
+
+ if ('' === $baseTitle) {
+ $baseTitle = 'Neue Umfrage';
+ }
+
+ for ($copyNumber = 1; ; ++$copyNumber) {
+ $suffix = 1 === $copyNumber ? ' - Kopie' : sprintf(' - Kopie %d', $copyNumber);
+ $candidate = $this->buildDuplicateTitleCandidate($baseTitle, $suffix);
+
+ if (!$this->surveyRepository->titleExists($candidate, (int) $survey->id)) {
+ return $candidate;
+ }
+ }
+ }
+
+ private function buildDuplicateTitleCandidate(string $baseTitle, string $suffix): string
+ {
+ $maxBaseLength = max(0, 255 - mb_strlen($suffix));
+
+ return mb_substr($baseTitle, 0, $maxBaseLength).$suffix;
}
}
\ No newline at end of file
diff --git a/translations/messages.de.yaml b/translations/messages.de.yaml
index 87e0ba0..99323c4 100644
--- a/translations/messages.de.yaml
+++ b/translations/messages.de.yaml
@@ -80,6 +80,8 @@ survey:
delete: "Löschen"
no_questions: "Noch keine Fragen angelegt."
new_question: "Neue Frage anlegen"
+ reorder_question: "Frage verschieben"
+ save_question_order: "Neue Reihenfolge speichern"
open_question: "Akkordeon öffnen"
close_question: "Akkordeon schließen"
conditions_title: "Sprungregeln"
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 779e0d6..7ede603 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -80,6 +80,8 @@ survey:
delete: "Delete"
no_questions: "No questions created yet."
new_question: "Create new question"
+ reorder_question: "Reorder question"
+ save_question_order: "Save new order"
open_question: "Open accordion"
close_question: "Close accordion"
conditions_title: "Jump rules"