From ad30d28c44519426bdf795f2789ddf32c65d1c0f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 10 Oct 2022 08:21:08 +0000
Subject: [PATCH] fix conditions and align views, fixes #1641

Closes #1641

Merge request studip/studip!1054
---
 app/views/consultation/admin/index.php     | 14 ++++++++++++--
 app/views/consultation/admin/ungrouped.php | 21 ++++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/views/consultation/admin/index.php b/app/views/consultation/admin/index.php
index 70367ae2bdb..3ad692bfa15 100644
--- a/app/views/consultation/admin/index.php
+++ b/app/views/consultation/admin/index.php
@@ -1,3 +1,13 @@
+<?php
+/**
+ * @var Consultation_AdminController $controller
+ * @var int $page
+ * @var int $count
+ * @var int $limit
+ * @var string $current_action
+ * @var array<int, array{block: ConsultationBlock, slots: ConsultationSlot[]> $blocks
+ */
+?>
 <? if (count($blocks) === 0): ?>
 
 <?= MessageBox::info(sprintf(
@@ -163,12 +173,12 @@
             <td colspan="5">
                 <?= Studip\Button::create(_('Nachricht schreiben'), 'mail', [
                     'data-dialog'              => 'size=50%',
-                    'data-activates-condition' => '.consultation-overview tbody tr.is-occupied:has(:checkbox:checked)',
+                    'data-activates-condition' => '.consultation-overview tbody tr.is-occupied :checkbox:checked',
                     'formaction'               => $controller->mailURL('bulk'),
                 ]) ?>
                 <?= Studip\Button::create(_('Absagen'), 'cancel', [
                     'data-dialog'              => 'size=auto',
-                    'data-activates-condition' => '.consultation-overview tbody tr.is-occupied:has(:checkbox:checked)',
+                    'data-activates-condition' => '.consultation-overview tbody tr.is-occupied :checkbox:checked',
                     ]) ?>
                 <?= Studip\Button::create(_('Löschen'), 'delete', [
                     'class'        => 'consultation-delete-check',
diff --git a/app/views/consultation/admin/ungrouped.php b/app/views/consultation/admin/ungrouped.php
index 0643429c20f..d0a94c03fd7 100644
--- a/app/views/consultation/admin/ungrouped.php
+++ b/app/views/consultation/admin/ungrouped.php
@@ -1,3 +1,14 @@
+<?php
+/**
+ * @var Consultation_AdminController $controller
+ * @var int $page
+ * @var int $count
+ * @var int $limit
+ * @var string $current_action
+ * @var ConsultationBlock[] $blocks
+ * @var ConsultationSlot[] $slots
+ */
+?>
 <? if (count($blocks) === 0): ?>
 
 <?= MessageBox::info(sprintf(
@@ -249,12 +260,16 @@
             <td colspan="8">
                 <?= Studip\Button::create(_('Nachricht schreiben'), 'mail', [
                     'data-dialog'              => 'size=50%',
-                    'data-activates-condition' => '.slot-overview tbody tr.is-occupied:has(:checkbox:checked)',
+                    'data-activates-condition' => '.slot-overview tbody tr.is-occupied :checkbox:checked',
                     'formaction'               => $controller->mailURL('bulk'),
                 ]) ?>
+                <?= Studip\Button::create(_('Absagen'), 'cancel', [
+                    'data-dialog'              => 'size=auto',
+                    'data-activates-condition' => '.slot-overview tbody tr.is-occupied :checkbox:checked',
+                ]) ?>
                 <?= Studip\Button::create(_('Löschen'), 'delete', [
-                    'data-confirm'             => _('Wollen Sie diese Termine wirklich löschen?'),
-                    'data-activates-condition' => '.slot-overview tbody tr:not(.is-occupied):has(:checkbox:checked)',
+                    'class'        => 'consultation-delete-check',
+                    'data-dialog'  => 'size=auto',
                 ]) ?>
 
                 <div class="actions">
-- 
GitLab