Deletes all resource request appointments #707

Closes #707

Merge request studip/studip!655

app/controllers/course/timesrooms.php

@@ -1362,6 +1362,7 @@ class Course_TimesroomsController extends AuthenticatedController
     private function deleteDate($termin, $cancel_comment)
     {
         $seminar_id = $termin->range_id;
+        $termin_id = $termin->id;
         $termin_room = $termin->getRoomName();
         $termin_date = $termin->getFullname();
         $has_topics  = $termin->topics->count();
@@ -1377,6 +1378,12 @@ class Course_TimesroomsController extends AuthenticatedController
         } else {
             if ($termin->delete()) {
                 StudipLog::log("SEM_DELETE_SINGLEDATE", $termin->id, $seminar_id, 'appointment cancelled');
+
+                // delete attached resource request appointments if they exist
+                ResourceRequestAppointment::deleteBySQL(
+                    "appointment_id = ?",
+                    [$termin_id]
+                );
             }
         }
 

db/migrations/5.2.10_biest_707.php

+<?php
+
+class Biest707 extends Migration
+{
+    public function description()
+    {
+        return 'Removes leftover entries of deleted course dates from resource request appointments';
+    }
+    
+    public function up()
+    {
+        DBManager::get()->exec("DELETE FROM resource_request_appointments WHERE appointment_id NOT IN (SELECT termin_id FROM termine)");
+    }
+}

lib/models/resources/ResourceRequest.class.php

@@ -1421,12 +1421,19 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
      */
     public function getTypeString($short = false)
     {
-        if (count($this->appointments)) {
+        if (count($this->appointments) > 1) {
             if ($short) {
                 return _('Einzeltermine');
             } else {
                 return sprintf(_('Einzeltermine (%sx)'), count($this->appointments));
             }
+        } elseif (count($this->appointments) == 1) {
+            if ($short) {
+                return _('Einzeltermin');
+            } else {
+                return sprintf(_('Einzeltermin (%s)'), 
+                    $this->appointments[0]->appointment->getFullname());
+            }
         } elseif ($this->date) {
             if ($short) {
                 return _('Einzeltermin');