+
+
+
+ {% trans "Operations Overview" %}
+{% trans "Letzte Laufzeit- und Backup-Signale auf einen Blick." %}
+
+ {% if ops_summary.can_view_jobs %}
+
+ {% trans "Fehlgeschlagene Jobs (24h)" %}
+ {{ ops_summary.failed_count_24h }}
+
+
+ {% trans "Erfolgreiche Jobs (24h)" %}
+ {{ ops_summary.success_count_24h }}
+
+
+ {% trans "Offene Starts (24h)" %}
+ {{ ops_summary.started_count_24h }}
+
+ {% endif %}
+ {% if ops_summary.can_manage_backups and ops_summary.backup_health %}
+
+ {% trans "Backup-Status" %}
+ {{ ops_summary.backup_health.label }}
+ {{ ops_summary.backup_health.summary }}
+
+ {% endif %}
+
+ {% if ops_summary.can_view_jobs and ops_summary.recent_failed_logs %}
+
+
+ {% endif %}
+
+
+ {% trans "Letzte Fehler" %}
+ {% trans "Job Monitor öffnen" %} +
+ {% for log in ops_summary.recent_failed_logs %}
+
+ {{ log.task_name }}
+ {{ log.target_label|default:log.target_type }}
+
+ {% endfor %}
+
+ {{ log.error_message|truncatechars:120 }}
+
+
+ {% if job_summary.recent_failed %}
+
+
+
+ {{ job_summary.failed_count_24h }}
+
+
+
+ {{ job_summary.success_count_24h }}
+
+
+
+ {{ job_summary.started_count_24h }}
+
+
+
+
+
+ {% endif %}
+| {% trans "Zuletzt fehlgeschlagen" %} | +{% trans "Ziel" %} | +{% trans "Fehler" %} | +
|---|---|---|
| {{ log.task_name }} | +{{ log.target_label|default:log.target_type }} | +{{ log.error_message|truncatechars:140 }} |
+
{{ field }} {{ field.label_tag }}
{% if field.help_text %}
+ {% if custom_field_details %}
+ {{ field.help_text }}
{% endif %}
@@ -102,7 +102,7 @@
{% for field in block.fields %}
{% if field.is_hidden %}
{{ field }}
- {% elif field.name in onboarding_inline_checks %}
+ {% elif field.name in onboarding_inline_checks or field.field.widget.input_type == 'checkbox' %}
{{ field }} {{ field.label_tag }}
{% if field.help_text %}
{{ field.help_text }}
{% endif %}
diff --git a/backend/workflows/templates/workflows/request_timeline.html b/backend/workflows/templates/workflows/request_timeline.html
index a0c0dc0..c59c416 100644
--- a/backend/workflows/templates/workflows/request_timeline.html
+++ b/backend/workflows/templates/workflows/request_timeline.html
@@ -37,9 +37,15 @@
.timeline-detail-row { display:grid; grid-template-columns:160px 1fr; gap:12px; font-size:13px; }
.timeline-detail-row strong { color:#566886; }
.timeline-detail-list { margin:0; padding-left:18px; color:#4f617f; }
+.timeline-custom-fields { margin: 0 0 20px; padding: 18px 20px; border: 1px solid #d9e3f8; border-radius: 20px; background: linear-gradient(180deg,#ffffff 0%,#f7faff 100%); box-shadow: 0 18px 40px rgba(23,39,90,.08); }
+.timeline-custom-fields h2 { margin: 0 0 14px; font-size: 18px; color: #20345f; }
+.timeline-custom-grid { display:grid; grid-template-columns: repeat(2, minmax(0,1fr)); gap: 12px 16px; }
+.timeline-custom-item { padding: 12px 14px; border: 1px solid #d8e1f5; border-radius: 16px; background: #fff; }
+.timeline-custom-item strong { display:block; margin-bottom: 4px; color:#566886; font-size:12px; letter-spacing:.05em; text-transform:uppercase; }
+.timeline-custom-item span { color:#22324d; font-size:14px; line-height:1.45; }
@media (max-width: 1160px) { .timeline-summary-grid { grid-template-columns:repeat(3, minmax(0,1fr)); } }
@media (max-width: 820px) { .timeline-summary-grid { grid-template-columns:repeat(2, minmax(0,1fr)); } }
-@media (max-width: 700px) { .timeline-summary-grid { grid-template-columns:1fr; } .timeline-head { flex-direction:column; } .timeline-stamp { white-space:normal; } .timeline-detail-row { grid-template-columns:1fr; } }
+@media (max-width: 700px) { .timeline-summary-grid { grid-template-columns:1fr; } .timeline-custom-grid { grid-template-columns:1fr; } .timeline-head { flex-direction:column; } .timeline-stamp { white-space:normal; } .timeline-detail-row { grid-template-columns:1fr; } }
{% endblock %}
@@ -80,6 +86,20 @@
{% trans "Benutzerdefinierte Felder" %}
+
+ {% for item in custom_field_details %}
+
+
+ {{ item.label }}
+ {{ item.value }}
+
+ {% endfor %}
+
{% for row in timeline_rows %}
diff --git a/backend/workflows/tests/test_form_builder_admin.py b/backend/workflows/tests/test_form_builder_admin.py
index 69ee28e..3620174 100644
--- a/backend/workflows/tests/test_form_builder_admin.py
+++ b/backend/workflows/tests/test_form_builder_admin.py
@@ -3,7 +3,7 @@ import json
from django.contrib.auth import get_user_model
from django.test import TestCase
-from workflows.models import FormConditionalRuleConfig, FormFieldConfig, FormOption, FormSectionConfig
+from workflows.models import FormConditionalRuleConfig, FormCustomFieldConfig, FormFieldConfig, FormOption, FormSectionConfig
class FormBuilderAdminTests(TestCase):
@@ -202,3 +202,59 @@ class FormBuilderAdminTests(TestCase):
self.assertEqual(len(rule.clauses), 2)
self.assertEqual(rule.clauses[0]['field'], 'successor_required_choice')
self.assertEqual(rule.clauses[1]['operator'], 'not_equals')
+
+ def test_staff_can_add_custom_field(self):
+ self.client.force_login(self.staff)
+ response = self.client.post(
+ '/admin-tools/form-builder/?form_type=onboarding&option_category=device',
+ data={
+ 'builder_action': 'add_custom_field',
+ 'custom_label': 'Laptop-Tag',
+ 'custom_label_en': 'Laptop tag',
+ 'custom_section_key': 'itsetup',
+ 'custom_field_type': 'text',
+ 'custom_sort_order': '3',
+ 'custom_is_required': 'on',
+ },
+ HTTP_HOST='localhost',
+ )
+
+ self.assertEqual(response.status_code, 302)
+ field = FormCustomFieldConfig.objects.get(form_type='onboarding', field_key='laptop_tag')
+ self.assertEqual(field.section_key, 'itsetup')
+ self.assertEqual(field.field_type, 'text')
+ self.assertEqual(field.is_required, True)
+
+ def test_save_order_updates_custom_field_section_and_sort_order(self):
+ self.client.force_login(self.staff)
+ custom_field = FormCustomFieldConfig.objects.create(
+ form_type='onboarding',
+ field_key='laptop_tag',
+ section_key='itsetup',
+ sort_order=99,
+ field_type='text',
+ label='Laptop-Tag',
+ )
+ self.client.get('/admin-tools/form-builder/?form_type=onboarding', HTTP_HOST='localhost')
+
+ payload = {
+ 'form_type': 'onboarding',
+ 'columns': {
+ 'stammdaten': ['department'],
+ 'vertrag': ['contract_start'],
+ 'itsetup': ['custom__laptop_tag'],
+ 'abschluss': [],
+ },
+ }
+
+ response = self.client.post(
+ '/admin-tools/form-builder/save-order/',
+ data=json.dumps(payload),
+ content_type='application/json',
+ HTTP_HOST='localhost',
+ )
+
+ self.assertEqual(response.status_code, 200)
+ custom_field.refresh_from_db()
+ self.assertEqual(custom_field.section_key, 'itsetup')
+ self.assertEqual(custom_field.sort_order, 2)
diff --git a/backend/workflows/tests/test_observability_ui.py b/backend/workflows/tests/test_observability_ui.py
new file mode 100644
index 0000000..5c80698
--- /dev/null
+++ b/backend/workflows/tests/test_observability_ui.py
@@ -0,0 +1,123 @@
+from datetime import timedelta
+
+from django.contrib.auth import get_user_model
+from django.test import Client, TestCase
+from django.utils import timezone
+
+from workflows.models import AsyncTaskLog
+from workflows.roles import ROLE_ADMIN, ROLE_STAFF, assign_user_role
+
+
+class ObservabilityUITests(TestCase):
+ def setUp(self):
+ user_model = get_user_model()
+ self.admin = user_model.objects.create_user(
+ username='ops_admin',
+ email='ops-admin@example.com',
+ password='secret123',
+ )
+ assign_user_role(self.admin, ROLE_ADMIN)
+
+ self.staff = user_model.objects.create_user(
+ username='ops_staff',
+ email='ops-staff@example.com',
+ password='secret123',
+ )
+ assign_user_role(self.staff, ROLE_STAFF)
+
+ def _create_log(self, *, status: str, task_name: str, target_label: str, error_message: str = '') -> AsyncTaskLog:
+ log = AsyncTaskLog.objects.create(
+ task_name=task_name,
+ status=status,
+ target_type='request',
+ target_id=1,
+ target_label=target_label,
+ error_message=error_message,
+ )
+ AsyncTaskLog.objects.filter(id=log.id).update(
+ started_at=timezone.now() - timedelta(hours=2),
+ finished_at=timezone.now() - timedelta(hours=1, minutes=45),
+ )
+ return AsyncTaskLog.objects.get(id=log.id)
+
+ def test_home_shows_operations_overview_for_admin(self):
+ self._create_log(
+ status='failed',
+ task_name='send_scheduled_welcome_email',
+ target_label='Request A',
+ error_message='smtp failed hard',
+ )
+ self._create_log(
+ status='succeeded',
+ task_name='process_onboarding_request',
+ target_label='Request B',
+ )
+ self._create_log(
+ status='started',
+ task_name='process_offboarding_request',
+ target_label='Request C',
+ )
+
+ client = Client()
+ client.force_login(self.admin)
+ response = client.get('/', HTTP_HOST='localhost')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, 'Operations Overview')
+ self.assertContains(response, 'Fehlgeschlagene Jobs (24h)')
+ self.assertContains(response, '1', html=True)
+ self.assertContains(response, 'send_scheduled_welcome_email')
+ self.assertContains(response, 'Backup-Status')
+
+ def test_home_hides_operations_overview_for_staff(self):
+ self._create_log(
+ status='failed',
+ task_name='process_onboarding_request',
+ target_label='Request A',
+ error_message='pdf failed',
+ )
+
+ client = Client()
+ client.force_login(self.staff)
+ response = client.get('/', HTTP_HOST='localhost')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertNotContains(response, 'Operations Overview')
+ self.assertNotContains(response, 'Job Monitor öffnen')
+
+ def test_job_monitor_summary_shows_recent_counts(self):
+ self._create_log(
+ status='failed',
+ task_name='process_onboarding_request',
+ target_label='Request A',
+ error_message='pdf failed',
+ )
+ self._create_log(
+ status='succeeded',
+ task_name='process_offboarding_request',
+ target_label='Request B',
+ )
+ self._create_log(
+ status='started',
+ task_name='send_scheduled_welcome_email',
+ target_label='Request C',
+ )
+
+ client = Client()
+ client.force_login(self.admin)
+ response = client.get('/admin-tools/jobs/', HTTP_HOST='localhost')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, 'Fehlgeschlagene Jobs (24h)')
+ self.assertContains(response, 'Erfolgreiche Jobs (24h)')
+ self.assertContains(response, 'Offene Starts (24h)')
+ self.assertContains(response, 'Zuletzt fehlgeschlagen')
+ self.assertContains(response, 'pdf failed')
+
+ def test_job_monitor_requires_capability(self):
+ client = Client()
+ client.force_login(self.staff)
+
+ response = client.get('/admin-tools/jobs/', HTTP_HOST='localhost')
+
+ self.assertEqual(response.status_code, 302)
diff --git a/backend/workflows/tests/test_offboarding_flow.py b/backend/workflows/tests/test_offboarding_flow.py
index 6306a0b..df83b5f 100644
--- a/backend/workflows/tests/test_offboarding_flow.py
+++ b/backend/workflows/tests/test_offboarding_flow.py
@@ -4,7 +4,7 @@ from django.contrib.auth import get_user_model
from django.test import TestCase
from workflows.branding import get_company_email_domain
-from workflows.models import EmployeeProfile, OffboardingRequest
+from workflows.models import EmployeeProfile, FormCustomFieldConfig, OffboardingRequest
class OffboardingFlowTests(TestCase):
@@ -59,3 +59,37 @@ class OffboardingFlowTests(TestCase):
self.assertEqual(obj.requested_by_email, f'operator@{self.company_domain}')
self.assertEqual(obj.requested_by_name, 'Nina Admin')
mock_delay.assert_called_once_with(obj.id)
+
+ @patch('workflows.views.process_offboarding_request.delay')
+ def test_offboarding_custom_field_is_saved(self, mock_delay):
+ FormCustomFieldConfig.objects.create(
+ form_type='offboarding',
+ field_key='return_comment',
+ section_key='abschluss',
+ sort_order=0,
+ field_type='textarea',
+ is_active=True,
+ is_required=False,
+ label='Rückgabehinweis',
+ )
+
+ payload = {
+ 'full_name': self.profile.full_name,
+ 'work_email': self.profile.work_email,
+ 'department': self.profile.department,
+ 'job_title': self.profile.job_title,
+ 'last_working_day': '2026-12-31',
+ 'notes': 'Bitte Accounts sperren.',
+ 'custom__return_comment': 'Abholung durch IT am Freitag.',
+ }
+
+ response = self.client.post(
+ f'/offboarding/new/?profile={self.profile.id}',
+ payload,
+ HTTP_HOST='localhost',
+ )
+
+ self.assertEqual(response.status_code, 302)
+ obj = OffboardingRequest.objects.get(work_email=self.profile.work_email)
+ self.assertEqual(obj.custom_field_values, {'return_comment': 'Abholung durch IT am Freitag.'})
+ mock_delay.assert_called_once_with(obj.id)
diff --git a/backend/workflows/tests/test_onboarding_flow.py b/backend/workflows/tests/test_onboarding_flow.py
index c43bad6..8cad82c 100644
--- a/backend/workflows/tests/test_onboarding_flow.py
+++ b/backend/workflows/tests/test_onboarding_flow.py
@@ -4,7 +4,7 @@ from django.contrib.auth import get_user_model
from django.test import TestCase
from workflows.branding import get_company_email_domain
-from workflows.models import FormConditionalRuleConfig, FormFieldConfig, FormSectionConfig, OnboardingRequest
+from workflows.models import FormConditionalRuleConfig, FormCustomFieldConfig, FormFieldConfig, FormSectionConfig, OnboardingRequest
class OnboardingFlowTests(TestCase):
@@ -171,3 +171,168 @@ class OnboardingFlowTests(TestCase):
self.assertEqual(response.status_code, 200)
self.assertIn('employment-end-box', html)
self.assertIn('"value": "unbefristet"', html)
+
+ def test_onboarding_custom_field_uses_combined_order(self):
+ FormCustomFieldConfig.objects.create(
+ form_type='onboarding',
+ field_key='office_location',
+ section_key='stammdaten',
+ sort_order=1,
+ field_type='text',
+ is_active=True,
+ label='Bürostandort',
+ )
+ FormFieldConfig.objects.update_or_create(
+ form_type='onboarding',
+ field_name='gender',
+ defaults={'sort_order': 2, 'page_key': 'stammdaten'},
+ )
+
+ response = self.client.get('/onboarding/new/', HTTP_HOST='localhost')
+ html = response.content.decode('utf-8')
+
+ self.assertLess(html.index('Bürostandort'), html.index('Anrede'))
+
+ @patch('workflows.views.process_onboarding_request.delay')
+ def test_onboarding_custom_field_is_rendered_and_saved(self, mock_delay):
+ FormCustomFieldConfig.objects.create(
+ form_type='onboarding',
+ field_key='office_location',
+ section_key='stammdaten',
+ sort_order=0,
+ field_type='text',
+ is_active=True,
+ is_required=True,
+ label='Bürostandort',
+ )
+
+ response = self.client.get('/onboarding/new/', HTTP_HOST='localhost')
+ self.assertContains(response, 'Bürostandort')
+
+ payload = {
+ 'first_name': 'Mara',
+ 'last_name': 'Muster',
+ 'gender': 'frau',
+ 'job_title': 'Consultant',
+ 'department': 'IT-Service',
+ 'work_email': f'mara.muster@{self.company_domain}',
+ 'contract_start': '2026-11-01',
+ 'employment_type': 'unbefristet',
+ 'group_mailboxes_required_choice': 'nein',
+ 'additional_hardware_needed_choice': 'nein',
+ 'additional_software_needed_choice': 'nein',
+ 'additional_access_needed_choice': 'nein',
+ 'successor_required_choice': 'nein',
+ 'inherit_phone_number_choice': 'nein',
+ 'custom__office_location': 'Berlin Mitte',
+ 'agreement_confirm': 'on',
+ }
+
+ submit_response = self.client.post('/onboarding/new/', payload, HTTP_HOST='localhost')
+
+ self.assertEqual(submit_response.status_code, 302)
+ obj = OnboardingRequest.objects.get(work_email=f'mara.muster@{self.company_domain}')
+ self.assertEqual(obj.custom_field_values, {'office_location': 'Berlin Mitte'})
+ mock_delay.assert_called_once_with(obj.id)
+
+ @patch('workflows.views.process_onboarding_request.delay')
+ def test_hidden_required_custom_field_does_not_block_submission(self, mock_delay):
+ FormCustomFieldConfig.objects.create(
+ form_type='onboarding',
+ field_key='visitor_badge_name',
+ section_key='stammdaten',
+ sort_order=0,
+ field_type='text',
+ is_active=True,
+ is_required=True,
+ label='Besucherausweis',
+ )
+ FormConditionalRuleConfig.objects.update_or_create(
+ form_type='onboarding',
+ target_key='custom__visitor_badge_name',
+ defaults={
+ 'is_active': True,
+ 'clauses': [{'field': 'order_business_cards', 'operator': 'checked', 'value': True}],
+ },
+ )
+
+ response = self.client.get('/onboarding/new/', HTTP_HOST='localhost')
+ html = response.content.decode('utf-8')
+ self.assertIn('custom__visitor_badge_name', html)
+ self.assertIn('"custom__visitor_badge_name"', html)
+
+ payload = {
+ 'first_name': 'Lea',
+ 'last_name': 'Leicht',
+ 'gender': 'frau',
+ 'job_title': 'Consultant',
+ 'department': 'IT-Service',
+ 'work_email': f'lea.leicht@{self.company_domain}',
+ 'contract_start': '2026-11-01',
+ 'employment_type': 'unbefristet',
+ 'group_mailboxes_required_choice': 'nein',
+ 'additional_hardware_needed_choice': 'nein',
+ 'additional_software_needed_choice': 'nein',
+ 'additional_access_needed_choice': 'nein',
+ 'successor_required_choice': 'nein',
+ 'inherit_phone_number_choice': 'nein',
+ 'agreement_confirm': 'on',
+ }
+
+ submit_response = self.client.post('/onboarding/new/', payload, HTTP_HOST='localhost')
+
+ self.assertEqual(submit_response.status_code, 302)
+ obj = OnboardingRequest.objects.get(work_email=f'lea.leicht@{self.company_domain}')
+ self.assertEqual(obj.custom_field_values, {'visitor_badge_name': ''})
+ mock_delay.assert_called_once_with(obj.id)
+
+ @patch('workflows.views.process_onboarding_request.delay')
+ def test_visible_required_custom_field_blocks_submission(self, mock_delay):
+ FormCustomFieldConfig.objects.create(
+ form_type='onboarding',
+ field_key='visitor_badge_name',
+ section_key='stammdaten',
+ sort_order=0,
+ field_type='text',
+ is_active=True,
+ is_required=True,
+ label='Besucherausweis',
+ )
+ FormConditionalRuleConfig.objects.update_or_create(
+ form_type='onboarding',
+ target_key='custom__visitor_badge_name',
+ defaults={
+ 'is_active': True,
+ 'clauses': [{'field': 'order_business_cards', 'operator': 'checked', 'value': True}],
+ },
+ )
+
+ payload = {
+ 'first_name': 'Lia',
+ 'last_name': 'Laut',
+ 'gender': 'frau',
+ 'job_title': 'Consultant',
+ 'department': 'IT-Service',
+ 'work_email': f'lia.laut@{self.company_domain}',
+ 'contract_start': '2026-11-01',
+ 'employment_type': 'unbefristet',
+ 'order_business_cards': 'on',
+ 'business_card_name': 'Lia Laut',
+ 'business_card_title': 'Consultant',
+ 'business_card_email': f'lia.laut@{self.company_domain}',
+ 'business_card_phone': '030 123456',
+ 'group_mailboxes_required_choice': 'nein',
+ 'additional_hardware_needed_choice': 'nein',
+ 'additional_software_needed_choice': 'nein',
+ 'additional_access_needed_choice': 'nein',
+ 'successor_required_choice': 'nein',
+ 'inherit_phone_number_choice': 'nein',
+ 'agreement_confirm': 'on',
+ }
+
+ response = self.client.post('/onboarding/new/', payload, HTTP_HOST='localhost')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, 'Besucherausweis')
+ self.assertFalse(OnboardingRequest.objects.filter(work_email=f'lia.laut@{self.company_domain}').exists())
+ mock_delay.assert_not_called()
diff --git a/backend/workflows/tests/test_pdf_sections.py b/backend/workflows/tests/test_pdf_sections.py
index 9d4321e..80ee418 100644
--- a/backend/workflows/tests/test_pdf_sections.py
+++ b/backend/workflows/tests/test_pdf_sections.py
@@ -1,6 +1,6 @@
from django.test import TestCase
-from workflows.models import FormFieldConfig, FormSectionConfig, OffboardingRequest, OnboardingRequest
+from workflows.models import FormCustomFieldConfig, FormFieldConfig, FormSectionConfig, OffboardingRequest, OnboardingRequest
from workflows.pdf_sections import build_pdf_sections
@@ -94,3 +94,32 @@ class PDFSectionBuilderTests(TestCase):
self.assertIn('last_working_day', [field['name'] for field in austritt['fields']])
date_field = next(field for field in austritt['fields'] if field['name'] == 'last_working_day')
self.assertTrue(date_field['display_value'])
+
+ def test_custom_fields_are_included_in_pdf_sections(self):
+ FormCustomFieldConfig.objects.create(
+ form_type='onboarding',
+ field_key='office_location',
+ section_key='stammdaten',
+ sort_order=0,
+ field_type='text',
+ is_active=True,
+ label='Bürostandort',
+ )
+ request_obj = OnboardingRequest.objects.create(
+ full_name='Max Mustermann',
+ gender='herr',
+ job_title='Consultant',
+ department='IT-Service',
+ work_email='max.mustermann@workdock.de',
+ contract_start='2026-11-01',
+ employment_type='unbefristet',
+ agreement='accepted',
+ custom_field_values={'office_location': 'Berlin Mitte'},
+ )
+
+ sections = build_pdf_sections('onboarding', request_obj, 'de')
+ stammdaten = next(section for section in sections if section['key'] == 'stammdaten')
+ custom_field = next(field for field in stammdaten['fields'] if field['name'] == 'custom__office_location')
+
+ self.assertEqual(custom_field['label'], 'Bürostandort')
+ self.assertEqual(custom_field['display_value'], 'Berlin Mitte')
diff --git a/backend/workflows/tests/test_request_timeline.py b/backend/workflows/tests/test_request_timeline.py
new file mode 100644
index 0000000..389e3be
--- /dev/null
+++ b/backend/workflows/tests/test_request_timeline.py
@@ -0,0 +1,73 @@
+from django.contrib.auth import get_user_model
+from django.test import TestCase
+
+from workflows.models import FormCustomFieldConfig, OffboardingRequest, OnboardingRequest
+from workflows.roles import ROLE_ADMIN, assign_user_role
+
+
+class RequestTimelineCustomFieldTests(TestCase):
+ def setUp(self):
+ user_model = get_user_model()
+ self.user = user_model.objects.create_user(
+ username='timeline_admin',
+ email='timeline-admin@example.com',
+ password='secret123',
+ )
+ assign_user_role(self.user, ROLE_ADMIN)
+ self.client.force_login(self.user)
+
+ def test_onboarding_timeline_renders_custom_field_values(self):
+ FormCustomFieldConfig.objects.create(
+ form_type='onboarding',
+ field_key='office_location',
+ section_key='stammdaten',
+ sort_order=0,
+ field_type='text',
+ is_active=True,
+ label='Bürostandort',
+ )
+ obj = OnboardingRequest.objects.create(
+ full_name='Max Mustermann',
+ gender='herr',
+ job_title='Consultant',
+ department='IT-Service',
+ work_email='max.mustermann@workdock.de',
+ contract_start='2026-11-01',
+ employment_type='unbefristet',
+ agreement='accepted',
+ custom_field_values={'office_location': 'Berlin Mitte'},
+ )
+
+ response = self.client.get(f'/requests/timeline/onboarding/{obj.id}/', HTTP_HOST='localhost')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, 'Benutzerdefinierte Felder')
+ self.assertContains(response, 'Bürostandort')
+ self.assertContains(response, 'Berlin Mitte')
+
+ def test_offboarding_timeline_renders_custom_field_values(self):
+ FormCustomFieldConfig.objects.create(
+ form_type='offboarding',
+ field_key='return_comment',
+ section_key='abschluss',
+ sort_order=0,
+ field_type='textarea',
+ is_active=True,
+ label='Rückgabehinweis',
+ )
+ obj = OffboardingRequest.objects.create(
+ full_name='Lara Beispiel',
+ work_email='lara.beispiel@workdock.de',
+ department='IT-Service',
+ job_title='Engineer',
+ last_working_day='2026-12-31',
+ requested_by_email='admin@workdock.de',
+ custom_field_values={'return_comment': 'Abholung durch IT am Freitag.'},
+ )
+
+ response = self.client.get(f'/requests/timeline/offboarding/{obj.id}/', HTTP_HOST='localhost')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, 'Benutzerdefinierte Felder')
+ self.assertContains(response, 'Rückgabehinweis')
+ self.assertContains(response, 'Abholung durch IT am Freitag.')
diff --git a/backend/workflows/views.py b/backend/workflows/views.py
index e44bbc7..ad2422d 100644
--- a/backend/workflows/views.py
+++ b/backend/workflows/views.py
@@ -10,6 +10,7 @@ from django.conf import settings
from django.db import connection
from django.db import IntegrityError
from django.db.models import Q
+from django.db.models import Count
from django.shortcuts import get_object_or_404, redirect, render
from django.contrib import messages
from django.contrib.auth import get_user_model, login as auth_login
@@ -46,15 +47,18 @@ from .form_builder import (
ONBOARDING_DEFAULT_PAGE,
ONBOARDING_PAGE_LABELS,
ONBOARDING_PAGE_ORDER,
+ build_custom_field_key,
+ custom_field_target_key,
ensure_form_field_configs,
ensure_form_conditional_rule_configs,
ensure_form_section_configs,
+ get_custom_field_configs,
get_default_page_map,
get_section_labels,
get_section_order,
apply_form_preset,
)
-from .models import AdminAuditLog, AsyncTaskLog, EmployeeProfile, FormConditionalRuleConfig, FormFieldConfig, FormOption, FormSectionConfig, IntroChecklistItem, NotificationRule, NotificationTemplate, OffboardingRequest, OnboardingIntroductionSession, OnboardingRequest, PortalAppConfig, PortalBranding, PortalCompanyConfig, PortalTrialConfig, ScheduledWelcomeEmail, SystemEmailConfig, UserNotification, UserProfile, WorkflowConfig
+from .models import AdminAuditLog, AsyncTaskLog, EmployeeProfile, FormConditionalRuleConfig, FormCustomFieldConfig, FormFieldConfig, FormOption, FormSectionConfig, IntroChecklistItem, NotificationRule, NotificationTemplate, OffboardingRequest, OnboardingIntroductionSession, OnboardingRequest, PortalAppConfig, PortalBranding, PortalCompanyConfig, PortalTrialConfig, ScheduledWelcomeEmail, SystemEmailConfig, UserNotification, UserProfile, WorkflowConfig
from .emailing import send_system_email
from .notifications import notify_user
from .roles import ROLE_GROUP_NAMES, ROLE_LABELS, ROLE_PLATFORM_OWNER, ROLE_SUPER_ADMIN, assign_user_role, get_user_role_key, get_user_role_label, user_has_capability
@@ -105,8 +109,6 @@ ONBOARDING_GROUPS = {
'phone-box': ['phone_number_choice'],
}
-ONBOARDING_HIDDEN_BY_DEFAULT = set(DEFAULT_CONDITIONAL_RULES.get('onboarding', {}).keys())
-
ONBOARDING_INLINE_CHECKS = {'order_business_cards', 'agreement_confirm'}
ONBOARDING_CHECKBOX_LISTS = {
'needed_devices_multi',
@@ -144,6 +146,10 @@ def _normalized_conditional_rule_payload(form_type: str) -> dict[str, dict]:
return payload
+def _active_conditional_target_keys(form_type: str) -> set[str]:
+ return set(_normalized_conditional_rule_payload(form_type).keys())
+
+
def healthz(request):
db_ok = True
try:
@@ -450,6 +456,36 @@ def _request_status_label(status_key: str, language_code: str | None = None) ->
return labels.get(status_key, status_key)
+def _request_custom_field_details(obj, kind: str, language_code: str | None = None) -> list[dict[str, str]]:
+ form_type = 'onboarding' if kind == 'onboarding' else 'offboarding'
+ language_code = ((language_code or getattr(obj, 'preferred_language', '') or get_language() or 'de').split('-')[0]).lower()
+ values = getattr(obj, 'custom_field_values', {}) or {}
+ rows = []
+ yes_label = 'Ja' if language_code == 'de' else 'Yes'
+ for cfg in get_custom_field_configs(form_type, include_inactive=True):
+ raw_value = values.get(cfg.field_key)
+ if raw_value in (None, '', False, []):
+ continue
+ if isinstance(raw_value, bool):
+ display_value = str(yes_label) if raw_value else ''
+ elif isinstance(raw_value, list):
+ display_value = ', '.join(str(item).strip() for item in raw_value if str(item).strip())
+ else:
+ display_value = str(raw_value).strip()
+ if not display_value:
+ continue
+ rows.append(
+ {
+ 'label': cfg.translated_label(language_code),
+ 'value': display_value,
+ 'section': cfg.section_key,
+ 'sort_order': cfg.sort_order,
+ }
+ )
+ rows.sort(key=lambda item: (item['section'], item['sort_order'], item['label']))
+ return rows
+
+
def _audit_action_label(action: str) -> str:
labels = {
'requests_deleted': _('Vorgänge gelöscht'),
@@ -505,6 +541,7 @@ def _build_onboarding_layout(form) -> list[dict]:
for group_id, group_fields in ONBOARDING_GROUPS.items():
for name in group_fields:
group_by_field[name] = group_id
+ conditional_target_keys = _active_conditional_target_keys('onboarding')
rendered_groups = set()
consumed = set()
@@ -529,7 +566,7 @@ def _build_onboarding_layout(form) -> list[dict]:
{
'kind': 'group',
'id': group_id,
- 'hidden_default': group_id in ONBOARDING_HIDDEN_BY_DEFAULT,
+ 'hidden_default': group_id in conditional_target_keys,
'fields': group_fields,
}
)
@@ -537,6 +574,18 @@ def _build_onboarding_layout(form) -> list[dict]:
consumed.update([f.name for f in group_fields])
continue
+ if field_name.startswith('custom__') and field_name in conditional_target_keys:
+ blocks.append(
+ {
+ 'kind': 'group',
+ 'id': field_name,
+ 'hidden_default': True,
+ 'fields': [form[field_name]],
+ }
+ )
+ consumed.add(field_name)
+ continue
+
blocks.append({'kind': 'field', 'field': form[field_name]})
consumed.add(field_name)
@@ -600,10 +649,42 @@ def _build_offboarding_sections(form, visible_section_keys: set[str] | None = No
]
+def _ops_summary_for_user(user) -> dict[str, object]:
+ can_view_jobs = user_has_capability(user, 'view_job_monitor')
+ can_manage_backups = user_has_capability(user, 'manage_backups')
+ summary: dict[str, object] = {
+ 'show': can_view_jobs or can_manage_backups,
+ 'can_view_jobs': can_view_jobs,
+ 'can_manage_backups': can_manage_backups,
+ 'failed_count_24h': 0,
+ 'started_count_24h': 0,
+ 'success_count_24h': 0,
+ 'recent_failed_logs': [],
+ 'backup_health': latest_backup_health_snapshot() if can_manage_backups else None,
+ }
+ if not can_view_jobs:
+ return summary
+
+ since = timezone.now() - timedelta(hours=24)
+ logs = AsyncTaskLog.objects.filter(started_at__gte=since)
+ counts = {
+ row['status']: row['count']
+ for row in logs.values('status').annotate(count=Count('id'))
+ }
+ summary['failed_count_24h'] = counts.get('failed', 0)
+ summary['started_count_24h'] = counts.get('started', 0)
+ summary['success_count_24h'] = counts.get('succeeded', 0)
+ summary['recent_failed_logs'] = list(
+ AsyncTaskLog.objects.filter(status='failed').order_by('-started_at', '-id')[:5]
+ )
+ return summary
+
+
@login_required
def home(request):
config, _ = WorkflowConfig.objects.get_or_create(name='Default')
role_key = get_user_role_key(request.user)
+ ops_summary = _ops_summary_for_user(request.user)
return render(
request,
'workflows/home.html',
@@ -614,6 +695,7 @@ def home(request):
'role_label': get_user_role_label(request.user),
'role_key': role_key,
'portal_app_sections': build_portal_app_sections(request.user),
+ 'ops_summary': ops_summary,
},
)
@@ -641,6 +723,13 @@ def job_monitor_page(request):
logs = logs.filter(task_name=task_filter)
logs = logs.order_by('-started_at', '-id')[:200]
task_names = list(AsyncTaskLog.objects.order_by('task_name').values_list('task_name', flat=True).distinct())
+ since = timezone.now() - timedelta(hours=24)
+ recent_logs = AsyncTaskLog.objects.filter(started_at__gte=since)
+ counts = {
+ row['status']: row['count']
+ for row in recent_logs.values('status').annotate(count=Count('id'))
+ }
+ recent_failed = list(AsyncTaskLog.objects.filter(status='failed').order_by('-started_at', '-id')[:5])
return render(
request,
'workflows/job_monitor.html',
@@ -650,6 +739,12 @@ def job_monitor_page(request):
'task_filter': task_filter,
'task_names': task_names,
'status_choices': [('started', _('Gestartet')), ('succeeded', _('Erfolgreich')), ('failed', _('Fehlgeschlagen'))],
+ 'job_summary': {
+ 'started_count_24h': counts.get('started', 0),
+ 'success_count_24h': counts.get('succeeded', 0),
+ 'failed_count_24h': counts.get('failed', 0),
+ 'recent_failed': recent_failed,
+ },
},
)
@@ -1469,6 +1564,7 @@ def request_timeline_page(request, kind: str, request_id: int):
return redirect('requests_dashboard')
request_label = _request_target_label(obj, kind)
+ custom_field_details = _request_custom_field_details(obj, kind, getattr(request, 'LANGUAGE_CODE', None))
audit_rows = list(
AdminAuditLog.objects.select_related('actor')
.filter(target_type__in=[kind, 'request'])
@@ -1483,6 +1579,7 @@ def request_timeline_page(request, kind: str, request_id: int):
'title': _('Anfrage erstellt'),
'summary': request_label,
'meta': _('Status: %(status)s') % {'status': obj.get_processing_status_display()},
+ 'details': {item['label']: item['value'] for item in custom_field_details},
}
]
@@ -1569,6 +1666,7 @@ def request_timeline_page(request, kind: str, request_id: int):
'request_obj': obj,
'request_label': request_label,
'timeline_rows': timeline_rows,
+ 'custom_field_details': custom_field_details,
'contract_start': getattr(obj, 'contract_start', None),
'handover_date': getattr(obj, 'handover_date', None),
},
@@ -2076,6 +2174,7 @@ def form_builder_page(request):
if request.method == 'POST':
delete_option_id = request.POST.get('delete_option_id', '').strip()
+ delete_custom_field_id = request.POST.get('delete_custom_field_id', '').strip()
if delete_option_id:
option = FormOption.objects.filter(id=delete_option_id).first()
if not option:
@@ -2088,6 +2187,17 @@ def form_builder_page(request):
_audit(request, 'form_option_deleted', target_type='form_option', target_id=deleted_id, target_label=deleted_label)
messages.success(request, 'Option wurde gelöscht.')
return redirect(f"/admin-tools/form-builder/?form_type={form_type}&option_category={option_category}&panel=builder-content&subpanel=options#builder-content")
+ if delete_custom_field_id:
+ custom_field = FormCustomFieldConfig.objects.filter(id=delete_custom_field_id, form_type=form_type).first()
+ if not custom_field:
+ messages.error(request, 'Benutzerdefiniertes Feld nicht gefunden.')
+ else:
+ deleted_label = custom_field.label
+ deleted_id = custom_field.id
+ custom_field.delete()
+ _audit(request, 'form_custom_field_deleted', target_type='form_custom_field', target_id=deleted_id, target_label=deleted_label)
+ messages.success(request, 'Benutzerdefiniertes Feld wurde gelöscht.')
+ return redirect(f"/admin-tools/form-builder/?form_type={form_type}&option_category={option_category}&panel=builder-content&subpanel=custom-fields#builder-content")
action = request.POST.get('builder_action', '')
if action == 'add_option':
@@ -2157,6 +2267,91 @@ def form_builder_page(request):
_audit(request, 'form_field_texts_saved', target_type='form_config', target_label=form_type, details={'count': len(field_ids)})
messages.success(request, 'Feldtexte wurden gespeichert.')
+ elif action == 'add_custom_field':
+ label = (request.POST.get('custom_label') or '').strip()
+ label_en = (request.POST.get('custom_label_en') or '').strip()
+ section_key = (request.POST.get('custom_section_key') or '').strip()
+ field_type = (request.POST.get('custom_field_type') or '').strip()
+ sort_order_raw = (request.POST.get('custom_sort_order') or '').strip()
+ help_text = (request.POST.get('custom_help_text') or '').strip()
+ help_text_en = (request.POST.get('custom_help_text_en') or '').strip()
+ select_options = (request.POST.get('custom_select_options') or '').strip()
+ select_options_en = (request.POST.get('custom_select_options_en') or '').strip()
+ section_choices = {key for key in get_section_order(form_type)}
+ field_type_choices = {key for key, _ in FormCustomFieldConfig.FIELD_TYPE_CHOICES}
+ if not label:
+ messages.error(request, 'Bitte eine Bezeichnung für das benutzerdefinierte Feld angeben.')
+ elif section_key not in section_choices:
+ messages.error(request, 'Ungültiger Abschnitt für das benutzerdefinierte Feld.')
+ elif field_type not in field_type_choices:
+ messages.error(request, 'Ungültiger Feldtyp.')
+ elif field_type == FormCustomFieldConfig.FIELD_TYPE_SELECT and not select_options:
+ messages.error(request, 'Auswahlfelder benötigen mindestens eine Option.')
+ else:
+ field_key_base = build_custom_field_key(label)
+ field_key = field_key_base
+ suffix = 2
+ while FormCustomFieldConfig.objects.filter(form_type=form_type, field_key=field_key).exists():
+ field_key = f'{field_key_base}_{suffix}'
+ suffix += 1
+ try:
+ sort_order = int(sort_order_raw or 0)
+ except ValueError:
+ sort_order = 0
+ FormCustomFieldConfig.objects.create(
+ form_type=form_type,
+ field_key=field_key,
+ section_key=section_key,
+ sort_order=max(0, sort_order),
+ field_type=field_type,
+ is_active=True,
+ is_required=request.POST.get('custom_is_required') == 'on',
+ label=label,
+ label_en=label_en,
+ help_text=help_text,
+ help_text_en=help_text_en,
+ select_options=select_options,
+ select_options_en=select_options_en,
+ )
+ _audit(request, 'form_custom_field_added', target_type='form_custom_field', target_label=label, details={'form_type': form_type, 'field_type': field_type, 'section_key': section_key})
+ messages.success(request, 'Benutzerdefiniertes Feld wurde hinzugefügt.')
+
+ elif action == 'save_custom_fields':
+ custom_ids = request.POST.getlist('custom_field_ids')
+ updated = 0
+ section_choices = {key for key in get_section_order(form_type)}
+ field_type_choices = {key for key, _ in FormCustomFieldConfig.FIELD_TYPE_CHOICES}
+ for raw_id in custom_ids:
+ cfg = FormCustomFieldConfig.objects.filter(id=raw_id, form_type=form_type).first()
+ if not cfg:
+ continue
+ field_type = (request.POST.get(f'custom_field_type_{cfg.id}') or '').strip()
+ section_key = (request.POST.get(f'custom_section_key_{cfg.id}') or '').strip()
+ try:
+ sort_order = int((request.POST.get(f'custom_sort_order_{cfg.id}') or '').strip() or cfg.sort_order)
+ except ValueError:
+ sort_order = cfg.sort_order
+ cfg.label = (request.POST.get(f'custom_label_{cfg.id}') or '').strip() or cfg.label
+ cfg.label_en = (request.POST.get(f'custom_label_en_{cfg.id}') or '').strip()
+ cfg.help_text = (request.POST.get(f'custom_help_text_{cfg.id}') or '').strip()
+ cfg.help_text_en = (request.POST.get(f'custom_help_text_en_{cfg.id}') or '').strip()
+ cfg.is_required = request.POST.get(f'custom_is_required_{cfg.id}') == 'on'
+ cfg.is_active = request.POST.get(f'custom_is_active_{cfg.id}') == 'on'
+ if field_type in field_type_choices:
+ cfg.field_type = field_type
+ if section_key in section_choices:
+ cfg.section_key = section_key
+ cfg.sort_order = max(0, sort_order)
+ cfg.select_options = (request.POST.get(f'custom_select_options_{cfg.id}') or '').strip()
+ cfg.select_options_en = (request.POST.get(f'custom_select_options_en_{cfg.id}') or '').strip()
+ if cfg.field_type == FormCustomFieldConfig.FIELD_TYPE_SELECT and not cfg.select_options:
+ messages.error(request, f'Auswahlfeld "{cfg.label}" benötigt mindestens eine Option.')
+ return redirect(f"/admin-tools/form-builder/?form_type={form_type}&option_category={option_category}&panel=builder-content&subpanel=custom-fields#builder-content")
+ cfg.save()
+ updated += 1
+ _audit(request, 'form_custom_fields_saved', target_type='form_custom_field', target_label=form_type, details={'count': updated})
+ messages.success(request, 'Benutzerdefinierte Felder wurden gespeichert.')
+
elif action == 'save_field_rules':
field_ids = request.POST.getlist('field_rule_ids')
locked_fields = LOCKED_FIELD_RULES.get(form_type, set())
@@ -2223,12 +2418,14 @@ def form_builder_page(request):
else:
messages.error(request, 'Preset konnte nicht angewendet werden.')
- if action in {'add_option', 'save_options', 'save_field_texts'}:
+ if action in {'add_option', 'save_options', 'save_field_texts', 'add_custom_field', 'save_custom_fields'}:
active_panel = 'builder-content'
if action in {'add_option', 'save_options'}:
active_subpanel = 'options'
elif action == 'save_field_texts':
active_subpanel = 'field-texts'
+ elif action in {'add_custom_field', 'save_custom_fields'}:
+ active_subpanel = 'custom-fields'
elif action in {'save_field_rules', 'save_section_rules', 'save_conditional_rules'}:
active_panel = 'builder-rules'
redirect_target = f"/admin-tools/form-builder/?form_type={form_type}&option_category={option_category}"
@@ -2263,6 +2460,7 @@ def form_builder_page(request):
labels = _form_field_labels(form_type)
locked = LOCKED_FIELD_RULES.get(form_type, set())
locked_sections = LOCKED_SECTION_RULES.get(form_type, set())
+ custom_field_configs = list(FormCustomFieldConfig.objects.filter(form_type=form_type).order_by('section_key', 'sort_order', 'field_key'))
if form_type == 'onboarding':
columns = [
@@ -2289,8 +2487,30 @@ def form_builder_page(request):
'is_required': cfg.is_required,
'locked': cfg.field_name in locked,
'page_key': page_key,
+ 'is_custom': False,
+ 'sort_order': cfg.sort_order,
}
)
+ for cfg in custom_field_configs:
+ page_key = cfg.section_key or fallback
+ if page_key not in column_by_key:
+ page_key = fallback
+ column_by_key[page_key]['items'].append(
+ {
+ 'field_name': f'custom__{cfg.field_key}',
+ 'label': cfg.translated_label(language_code),
+ 'label_de': cfg.label,
+ 'label_en': cfg.label_en,
+ 'is_visible': cfg.is_active,
+ 'is_required': cfg.is_required,
+ 'locked': False,
+ 'page_key': page_key,
+ 'is_custom': True,
+ 'sort_order': cfg.sort_order,
+ }
+ )
+ for column in columns:
+ column['items'].sort(key=lambda item: (item.get('sort_order', 9999), item['field_name']))
else:
columns = [
{
@@ -2316,8 +2536,30 @@ def form_builder_page(request):
'is_required': cfg.is_required,
'locked': cfg.field_name in locked,
'page_key': page_key,
+ 'is_custom': False,
+ 'sort_order': cfg.sort_order,
}
)
+ for cfg in custom_field_configs:
+ page_key = cfg.section_key or fallback
+ if page_key not in column_by_key:
+ page_key = fallback
+ column_by_key[page_key]['items'].append(
+ {
+ 'field_name': f'custom__{cfg.field_key}',
+ 'label': cfg.translated_label(language_code),
+ 'label_de': cfg.label,
+ 'label_en': cfg.label_en,
+ 'is_visible': cfg.is_active,
+ 'is_required': cfg.is_required,
+ 'locked': False,
+ 'page_key': page_key,
+ 'is_custom': True,
+ 'sort_order': cfg.sort_order,
+ }
+ )
+ for column in columns:
+ column['items'].sort(key=lambda item: (item.get('sort_order', 9999), item['field_name']))
section_rule_items = []
if section_order:
@@ -2350,6 +2592,20 @@ def form_builder_page(request):
}
)
+ custom_field_groups = []
+ if section_order:
+ grouped_custom = {key: [] for key in section_order}
+ for cfg in custom_field_configs:
+ grouped_custom.setdefault(cfg.section_key, []).append(cfg)
+ for key in section_order:
+ custom_field_groups.append(
+ {
+ 'key': key,
+ 'title': section_labels.get(key, key),
+ 'items': grouped_custom.get(key, []),
+ }
+ )
+
field_rule_groups = []
if section_order:
grouped_rules = {key: [] for key in section_order}
@@ -2393,6 +2649,8 @@ def form_builder_page(request):
'inherit_phone_number_choice',
]:
conditional_field_choices.append((field_name, labels.get(field_name, field_name)))
+ for cfg in custom_field_configs:
+ conditional_field_choices.append((f'custom__{cfg.field_key}', cfg.translated_label(language_code)))
conditional_target_titles = {
'business-card-box': _('Visitenkarten-Details'),
'employment-end-box': _('Vertragsende'),
@@ -2417,16 +2675,26 @@ def form_builder_page(request):
clauses = list(cfg.clauses or [])
while len(clauses) < 2:
clauses.append({'field': '', 'operator': 'equals', 'value': ''})
+ if target_key.startswith('custom__'):
+ custom_field_key = target_key.replace('custom__', '', 1)
+ custom_field = next((item for item in custom_field_configs if item.field_key == custom_field_key), None)
+ target_title = custom_field.translated_label(language_code) if custom_field else target_key
+ target_description = _('Steuert die Sichtbarkeit dieses benutzerdefinierten Feldes.')
+ target_fields = [target_title]
+ else:
+ target_title = conditional_target_titles.get(target_key, target_key)
+ target_description = conditional_target_descriptions.get(target_key, '')
+ target_fields = [labels.get(name, name) for name in ONBOARDING_GROUPS.get(target_key, [])]
conditional_rule_items.append(
{
'target_key': target_key,
- 'title': conditional_target_titles.get(target_key, target_key),
- 'description': conditional_target_descriptions.get(target_key, ''),
+ 'title': target_title,
+ 'description': target_description,
'is_active': cfg.is_active,
'clauses': clauses[:2],
'field_choices': conditional_field_choices,
'operator_choices': CONDITIONAL_RULE_OPERATOR_CHOICES,
- 'target_fields': [labels.get(name, name) for name in ONBOARDING_GROUPS.get(target_key, [])],
+ 'target_fields': target_fields,
}
)
@@ -2441,6 +2709,16 @@ def form_builder_page(request):
item for item in field_rule_group_map.get(key, [])
if item['locked'] or item['is_visible']
]
+ visible_items.extend(
+ [
+ {
+ 'label': cfg.translated_label(language_code),
+ 'locked': False,
+ }
+ for cfg in custom_field_configs
+ if cfg.section_key == key and cfg.is_active
+ ]
+ )
if section_visible:
preview_sections.append(
{
@@ -2459,6 +2737,7 @@ def form_builder_page(request):
'configurable_field_count': configurable_field_count,
'hidden_field_count': hidden_field_count,
'hidden_section_count': hidden_section_count,
+ 'custom_field_count': len([cfg for cfg in custom_field_configs if cfg.is_active]),
}
return render(
@@ -2479,6 +2758,8 @@ def form_builder_page(request):
'section_rule_items': section_rule_items,
'builder_summary': builder_summary,
'conditional_rule_items': conditional_rule_items,
+ 'custom_field_groups': custom_field_groups,
+ 'custom_field_type_choices': _translate_choice_list(FormCustomFieldConfig.FIELD_TYPE_CHOICES),
'active_panel': active_panel,
'active_subpanel': active_subpanel,
'available_presets': FORM_PRESETS.get(form_type, {}),
@@ -2921,22 +3202,24 @@ def form_builder_save_order(request):
form_type = payload.get('form_type')
if form_type not in DEFAULT_FIELD_ORDER:
return JsonResponse({'ok': False, 'error': 'Ungültiger Formulartyp.'}, status=400)
+ default_page_map = get_default_page_map(form_type)
columns = payload.get('columns')
if not isinstance(columns, dict):
return JsonResponse({'ok': False, 'error': 'Spalten-Daten fehlen.'}, status=400)
configs = list(FormFieldConfig.objects.filter(form_type=form_type).order_by('sort_order', 'field_name'))
- allowed_names = {cfg.field_name for cfg in configs}
+ custom_configs = list(FormCustomFieldConfig.objects.filter(form_type=form_type).order_by('sort_order', 'field_key'))
+ allowed_names = {cfg.field_name for cfg in configs} | {f'custom__{cfg.field_key}' for cfg in custom_configs}
seen = set()
- ordered_names = []
if form_type == 'onboarding':
allowed_columns = ONBOARDING_PAGE_ORDER
else:
- allowed_columns = ['all']
+ allowed_columns = OFFBOARDING_PAGE_ORDER
name_to_cfg = {cfg.field_name: cfg for cfg in configs}
+ custom_name_to_cfg = {f'custom__{cfg.field_key}': cfg for cfg in custom_configs}
sort_order = 0
for column_key in allowed_columns:
@@ -2950,14 +3233,15 @@ def form_builder_save_order(request):
if name not in allowed_names or name in seen:
continue
seen.add(name)
- ordered_names.append(name)
- cfg = name_to_cfg[name]
- cfg.sort_order = sort_order
- sort_order += 1
- if form_type == 'onboarding':
+ if name in name_to_cfg:
+ cfg = name_to_cfg[name]
+ cfg.sort_order = sort_order
cfg.page_key = column_key
else:
- cfg.page_key = ''
+ cfg = custom_name_to_cfg[name]
+ cfg.sort_order = sort_order
+ cfg.section_key = column_key
+ sort_order += 1
missing = [cfg.field_name for cfg in configs if cfg.field_name not in seen]
for name in missing:
@@ -2967,11 +3251,24 @@ def form_builder_save_order(request):
if form_type == 'onboarding':
cfg.page_key = cfg.page_key or ONBOARDING_DEFAULT_PAGE.get(name, 'abschluss')
else:
- cfg.page_key = ''
+ cfg.page_key = cfg.page_key or default_page_map.get(name, OFFBOARDING_PAGE_ORDER[-1])
+
+ missing_custom = [name for name in custom_name_to_cfg.keys() if name not in seen]
+ for name in missing_custom:
+ cfg = custom_name_to_cfg[name]
+ cfg.sort_order = sort_order
+ sort_order += 1
+ if form_type == 'onboarding':
+ cfg.section_key = cfg.section_key or 'abschluss'
+ else:
+ cfg.section_key = cfg.section_key or OFFBOARDING_PAGE_ORDER[-1]
FormFieldConfig.objects.bulk_update(configs, ['sort_order', 'page_key'])
- _audit(request, 'form_layout_saved', target_type='form_config', target_label=form_type, details={'saved_count': len(configs)})
- return JsonResponse({'ok': True, 'saved_count': len(configs)})
+ if custom_configs:
+ FormCustomFieldConfig.objects.bulk_update(custom_configs, ['sort_order', 'section_key'])
+ saved_count = len(configs) + len(custom_configs)
+ _audit(request, 'form_layout_saved', target_type='form_config', target_label=form_type, details={'saved_count': saved_count})
+ return JsonResponse({'ok': True, 'saved_count': saved_count})
@_require_capability('manage_integrations')