Skip to content

Commit a2f5324

Browse files
nickygerritsennickygerritsen
committed
Improve display of clarification forms for teams and jury even more.
1 parent 68bf2b2 commit a2f5324

File tree

9 files changed

+43
-62
lines changed

9 files changed

+43
-62
lines changed

‎webapp/src/Form/Type/JuryClarificationType.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
9999
]);
100100

101101
$builder->add('message', TextareaType::class, [
102-
'label' => false,
103102
'attr' => [
104103
'rows' => 5,
105104
'cols' => 85,

‎webapp/src/Form/Type/TeamClarificationType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
1111
use Symfony\Component\Form\Extension\Core\Type\TextType;
1212
use Symfony\Component\Form\FormBuilderInterface;
13+
use Symfony\Component\Validator\Constraints\NotEqualTo;
1314

1415
class TeamClarificationType extends AbstractType
1516
{
@@ -50,7 +51,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
5051
'choices' => $subjects,
5152
]);
5253
$builder->add('message', TextareaType::class, [
53-
'label' => false,
5454
'attr' => [
5555
'rows' => 5,
5656
'cols' => 85,

‎webapp/templates/jury/partials/clarification_form.html.twig

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
11
{{ form_start(form) }}
22
{{ form_row(form.recipient) }}
33
{{ form_row(form.subject) }}
4-
<div class="list-group mb-3">
5-
<div class="list-group-item">
6-
<div class="flex-column">
7-
<label for="jury_clarification_message"
8-
class="form-label text-muted d-flex justify-content-end"><small>message</small></label>
9-
</div>
10-
{{ form_row(form.message) }}
11-
</div>
12-
<div class="list-group-item">
13-
<div class="mb-3">
14-
<div class="flex-column">
15-
<label class="form-label text-muted d-flex justify-content-end">
16-
<small>message preview</small></label>
17-
</div>
18-
<div class="card">
19-
<div class="card-body" id="messagepreview">
20-
Start typing to see a preview of your message
21-
</div>
22-
</div>
4+
{{ form_row(form.message) }}
5+
<div class="mb-3">
6+
<div class="card">
7+
<div class="card-body">
8+
<label class="form-label text-muted"><small>rendered preview</small></label>
9+
<div id="messagepreview">Start typing to see a preview of your message</div>
2310
</div>
2411
</div>
2512
</div>

‎webapp/templates/team/base.html.twig

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,21 @@
1616
return confirm("Send clarification request to Jury?");
1717
});
1818
19-
$body.on('click', '#clarification-reply-button', function() {
19+
window.replaceClarificationReplyButton = function() {
20+
var $replyButton = $('#clarification-reply-button');
2021
var $submitButton = $('<button type="submit" name="submit" class="btn btn-primary"><i class="fas fa-envelope"></i> Send</button>');
21-
$(this).replaceWith($submitButton);
22+
$replyButton.replaceWith($submitButton);
2223
2324
$submitButton.on('click', function() {
2425
var $form = $('form[name="team_clarification"]');
2526
if ($form[0].reportValidity()) {
2627
$form.submit();
2728
}
28-
})
29+
});
30+
}
31+
32+
$body.on('click', '#clarification-reply-button', function() {
33+
replaceClarificationReplyButton();
2934
});
3035
3136
/* Show the notification options if the browser supports it */

‎webapp/templates/team/clarification.html.twig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919

2020
{% block extrafooter %}
2121
<script>
22-
setupPreviewClarification($('#team_clarification_message') , $('#messagepreview'), true);
22+
setupPreviewClarification($('#team_clarification_message'), $('#messagepreview'), true);
23+
{% if not form.vars.valid %}
24+
$(function () {
25+
replaceClarificationReplyButton();
26+
});
27+
{% endif %}
2328
</script>
2429
{% endblock %}

‎webapp/templates/team/clarification_add.html.twig

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,12 @@
1010
{{ form_start(form) }}
1111
{{ form_row(form.recipient) }}
1212
{{ form_row(form.subject) }}
13-
<div class="list-group mb-3">
14-
<div class="list-group-item">
15-
<div class="flex-column">
16-
<label for="team_clarification_message" class="form-label text-muted d-flex justify-content-end"><small>message</small></label>
17-
</div>
18-
{{ form_row(form.message) }}
19-
</div>
20-
<div class="list-group-item">
21-
<div class="mb-3">
22-
<div class="flex-column">
23-
<label class="form-label text-muted d-flex justify-content-end"><small>message preview</small></label>
24-
</div>
25-
<div class="card">
26-
<div class="card-body" id="messagepreview">Start typing to see a preview of your message</div>
27-
</div>
13+
{{ form_row(form.message) }}
14+
<div class="mb-3">
15+
<div class="card">
16+
<div class="card-body">
17+
<label class="form-label text-muted"><small>rendered preview</small></label>
18+
<div id="messagepreview">Start typing to see a preview of your message</div>
2819
</div>
2920
</div>
3021
</div>

‎webapp/templates/team/clarification_add_modal.html.twig

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,14 @@
1111
<div class="modal-body clarificationform">
1212
{{ form_row(form.recipient) }}
1313
{{ form_row(form.subject) }}
14-
<div class="list-group mb-3">
15-
<div class="list-group-item">
16-
<div class="flex-column">
17-
<label for="team_clarification_message" class="form-label text-muted d-flex justify-content-end"><small>message</small></label>
18-
</div>
19-
{{ form_row(form.message) }}
20-
</div>
21-
<div class="list-group-item">
22-
<div class="mb-3">
23-
<div class="flex-column">
24-
<label class="form-label text-muted d-flex justify-content-end"><small>message preview</small></label>
25-
</div>
26-
<div class="card">
27-
<div class="card-body" id="messagepreview">Start typing to see a preview of your message</div>
14+
{{ form_row(form.message) }}
15+
<div class="mb-3">
16+
<div class="card">
17+
<div class="card-body">
18+
<label class="form-label text-muted"><small>rendered preview</small></label>
19+
<div id="messagepreview">Start typing to see a preview of your message</div>
2820
</div>
2921
</div>
30-
</div>
3122
</div>
3223
</div>
3324
<div class="modal-footer">

‎webapp/templates/team/partials/clarification_content.html.twig

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,20 @@
55
{% endfor %}
66
</div>
77

8-
<div class="collapse mt-3 container clarificationform" id="collapsereplyform">
8+
<div class="{% if form.vars.valid %}collapse{% endif%} mt-3 container clarificationform" id="collapsereplyform">
99
<div class="card card-body">
1010
{{ form_start(form) }}
1111
{{ form_row(form.recipient) }}
12-
{{ form_row(form.message) }}
1312
<div class="mb-3">
14-
<div class="flex-column">
15-
<label class="form-label text-muted d-flex justify-content-end"><small>message preview</small></label>
16-
</div>
13+
{{ form_widget(form.message) }}
14+
{{ form_errors(form.message) }}
15+
</div>
16+
<div class="mb-3">
1717
<div class="card">
18-
<div class="card-body" id="messagepreview">Start typing to see a preview of your message</div>
18+
<div class="card-body">
19+
<label class="form-label text-muted"><small>rendered preview</small></label>
20+
<div id="messagepreview">Start typing to see a preview of your message</div>
21+
</div>
1922
</div>
2023
</div>
2124
{{ form_end(form) }}

‎webapp/tests/Unit/Controller/Jury/ClarificationControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function testClarificationRequestComposeForm(): void
103103
$labels = $crawler->filter('label')->extract(['_text']);
104104
self::assertEquals('Send to', $labels[0]);
105105
self::assertEquals('Subject', $labels[1]);
106-
self::assertEquals('message', $labels[2]);
106+
self::assertEquals('Message', $labels[2]);
107107

108108
$this->client->submitForm('Send', [
109109
'jury_clarification[recipient]' => '',

0 commit comments

Comments
 (0)