Skip to content

fix(ZMSKVR-1056): optional textfield in admin #1808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthilo96 merged 8 commits into from
Jan 19, 2026
Merged

fix(ZMSKVR-1056): optional textfield in admin #1808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b473647
fix(ZMSKVR-1056): changed inputfield + bugfix
Dec 11, 2025
77cadf4
fex(ZMSKVR-1056): fixed typo
Dec 11, 2025
79ea427
fix(ZMSKVR-1056): fixed double acceskey & amendment trim function
Dec 11, 2025
11cdbc7
fix(ZMSKVR-1056): fixed copypaste error
Dec 11, 2025
efbb3ad
fix(ZMSKVR-1056): always update db customtextfields
Dec 17, 2025
175ecf4
fix(ZMSKVR-1056): removed unneccecary if() and fixed delete for amend…
Dec 17, 2025
6d1fbbb
Merge branch 'next' into bugfix-zmskvr-1056-optional-textfield-in-admin
ThomasAFink Dec 30, 2025
8ca28cc
fix(ZMSKVR-1056): limited textfield size
Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions zmsadmin/templates/block/queue/table.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@
{#DL#}
<td>Dieser Kunde ist geparkt</td>
{% if workstation.scope.preferences.client.customTextfieldActivated|default(0) == 1 %}
<td title="{{ item.customTextfield|decodeEntities }}">
<td title="{{ item.customTextfield|decodeEntities }}" class="limited-width">
{{ item.customTextfield|decodeEntities|slice(0, textfieldDisplayLength) }}
{% if item.customTextfield|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
</td>
{% endif %}
{% if workstation.scope.preferences.client.customTextfield2Activated|default(0) == 1 %}
<td title="{{ item.customTextfield2|decodeEntities }}">
<td title="{{ item.customTextfield2|decodeEntities }}" class="limited-width">
{{ item.customTextfield2|decodeEntities|slice(0, textfieldDisplayLength) }}
{% if item.customTextfield2|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
</td>
Expand Down Expand Up @@ -422,13 +422,13 @@
</p>
</td>
{% if workstation.scope.preferences.client.customTextfieldActivated|default(0) == 1 %}
<td title="{{ item.customTextfield|decodeEntities }}">
<td title="{{ item.customTextfield|decodeEntities }}" class="limited-width">
{{ item.customTextfield|decodeEntities|slice(0, textfieldDisplayLength) }}
{% if item.customTextfield|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
</td>
{% endif %}
{% if workstation.scope.preferences.client.customTextfield2Activated|default(0) == 1 %}
<td title="{{ item.customTextfield2|decodeEntities }}">
<td title="{{ item.customTextfield2|decodeEntities }}" class ="limited-width">
{{ item.customTextfield2|decodeEntities|slice(0, textfieldDisplayLength) }}
{% if item.customTextfield2|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
</td>
Expand Down Expand Up @@ -553,13 +553,13 @@
{#DL#}
<td>Dieser Kunde ist nicht erschienen</td>
{% if workstation.scope.preferences.client.customTextfieldActivated|default(0) == 1 %}
<td title="{{ item.customTextfield|decodeEntities }}">
<td title="{{ item.customTextfield|decodeEntities }}" class="limited-width">
{{ item.customTextfield|decodeEntities|slice(0, textfieldDisplayLength) }}
{% if item.customTextfield|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
</td>
{% endif %}
{% if workstation.scope.preferences.client.customTextfield2Activated|default(0) == 1 %}
<td title="{{ item.customTextfield2|decodeEntities }}">
<td title="{{ item.customTextfield2|decodeEntities }}" class="limited-width">
{{ item.customTextfield2|decodeEntities|slice(0, textfieldDisplayLength) }}
{% if item.customTextfield2|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
</td>
Expand Down Expand Up @@ -719,4 +719,9 @@ content.addClass('hidden')
cursor: not-allowed;
pointer-events: none;
}
.limited-width {
overflow-wrap: break-word;
hyphens: auto;
max-width: 300px;
}
</style>
12 changes: 3 additions & 9 deletions zmsdb/src/Zmsdb/Query/Process.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,15 +875,9 @@ protected function addValuesClientData($process)
if ($client && $client->offsetExists('notificationsSendCount')) {
$data['SMSverschickt'] = ('-1' == $client->notificationsSendCount) ? 0 : $client->notificationsSendCount;
}
if ($process->getAmendment()) {
$data['Anmerkung'] = $process->getAmendment();
}
if ($process->getCustomTextfield()) {
$data['custom_text_field'] = $process->getCustomTextfield();
}
if ($process->getCustomTextfield2()) {
$data['custom_text_field2'] = $process->getCustomTextfield2();
}
$data['Anmerkung'] = $process->getAmendment();
$data['custom_text_field'] = $process->getCustomTextfield();
$data['custom_text_field2'] = $process->getCustomTextfield2();
$data['zustimmung_kundenbefragung'] = ($client->surveyAccepted) ? 1 : 0;
$data['Erinnerungszeitpunkt'] = $process->getReminderTimestamp();
$data['AnzahlPersonen'] = $process->getClients()->count();
Expand Down