Bugfix: booking places information now correctly overriden when places are unlimited #868

Author: David Ala

classes/booking_answers.php

@@ -636,6 +636,13 @@ public static function add_availability_info_texts_to_booking_information(array
                 $bookinginformation['bookingplacesclass'] = 'text-success avail';
                 $bookinginformation['bookingplacesiconclass'] = 'avail';
             }
+        } else {
+            if (
+                !has_capability('mod/booking:updatebooking', $context)
+                && get_config('booking', 'dontshowbookingswhenunlimited')
+            ) {
+                $bookinginformation['dontshowbookingswhenunlimited'] = true;
+            }
         }
         // Waiting list places.
         if (!empty($bookinginformation['maxoverbooking'])) {

classes/output/view.php

@@ -1122,11 +1122,11 @@ public static function generate_table_for_cards(wunderbyte_table &$wbtable, arra
             ['columnclass' => 'text-left text-gray pr-2'],
             ['bookings']
         );
-        $wbtable->add_classes_to_subcolumns(
-            'cardlist',
-            ['columniclassbefore' => 'fa fa-ticket fa-fw text-gray'],
-            ['bookings']
-        );
+        // $wbtable->add_classes_to_subcolumns(
+        //     'cardlist',
+        //     ['columniclassbefore' => 'fa fa-ticket fa-fw text-gray'],
+        //     ['bookings']
+        // );
         if (in_array('minanswers', $optionsfields)) {
             $wbtable->add_classes_to_subcolumns(
                 'cardlist',
@@ -1352,11 +1352,11 @@ public static function generate_table_for_list(wunderbyte_table &$wbtable, array
             ['columnclass' => 'text-left text-gray pr-2 font-size-sm'],
             ['bookings']
         );
-        $wbtable->add_classes_to_subcolumns(
-            'footer',
-            ['columniclassbefore' => 'fa fa-ticket fa-fw text-gray font-size-sm'],
-            ['bookings']
-        );
+        // $wbtable->add_classes_to_subcolumns(
+        //     'footer',
+        //     ['columniclassbefore' => 'fa fa-ticket fa-fw text-gray font-size-sm'],
+        //     ['bookings']
+        // );
         if (in_array('minanswers', $optionsfields)) {
             $wbtable->add_classes_to_subcolumns(
                 'footer',

classes/table/bookingoptions_wbtable.php

@@ -531,10 +531,16 @@ public function col_bookings($values) {
             if ($maxoverbooking) {
                 $ret .= " (" . get_string('waitinglist', 'mod_booking') . ": $waiting / $maxoverbooking)";
             }
+            return $ret;
         } else {
             $ret = $output->render_col_availableplaces($data);
+            if (strlen(trim($ret)) > 0) {
+                $icon = html_writer::tag('i', '', ['class' => "fa fa-ticket fa-fw text-gray font-size-sm"]);
+                return $icon . $ret;
+            }
+            return '';
         }
-        return $ret;
+
     }
 
     /**

lang/de/booking.php

@@ -980,6 +980,8 @@
 $string['dontaddpersonalevents'] = 'Keine Einträge im persönlichen Kalender erstellen.';
 $string['dontaddpersonaleventsdesc'] = 'Für jede Buchung und alle Termine werden eigene Einträge im persönlichen Kalender der TeilnehmerInnen erstellt. Für eine bessere Performance auf sehr intensiv genutzten Seiten kann diese Funktion deaktiviert werden.';
 $string['dontmove'] = 'Nicht bewegen';
+$string['dontshowbookingswhenunlimited'] = "Zeige keine Buchungen wenn Plätze unlimitert sind";
+$string['dontshowbookingswhenunlimited_desc'] = "Nutzer:innen ohne Bearbeitungsrechte sehen nicht die Anzahl der gebuchten Plätze.";
 $string['dontuse'] = 'Vorlage nicht verwenden';
 $string['download'] = 'Download';
 $string['downloadallresponses'] = 'Alle Buchungen herunterladen';

lang/en/booking.php

@@ -991,6 +991,8 @@
 $string['dontaddpersonalevents'] = 'Dont add personal calendar events';
 $string['dontaddpersonaleventsdesc'] = 'For each booked option and for all of its sessions, personal events are created in the moodle calendar. Suppressing them improves performance for heavy load sites.';
 $string['dontmove'] = 'Don\'t move';
+$string['dontshowbookingswhenunlimited'] = "Don\'t show number of booked users when places are unlimited";
+$string['dontshowbookingswhenunlimited_desc'] = "Users without managing rights won\'t see bookings when this is set.";
 $string['dontuse'] = 'Don\'t use template';
 $string['download'] = 'Download';
 $string['downloadallresponses'] = 'Download all responses for all booking options';

settings.php

@@ -1322,6 +1322,15 @@
             )
         );
 
+        $settings->add(
+            new admin_setting_configcheckbox(
+                'booking/dontshowbookingswhenunlimited',
+                get_string('dontshowbookingswhenunlimited', 'mod_booking'),
+                get_string('dontshowbookingswhenunlimited_desc', 'booking'),
+                0
+            )
+        );
+
         $bookingplaceslowpercentages = [
             0 => ' 0%',
             5 => ' 5%',

templates/col_availableplaces.mustache

@@ -31,7 +31,6 @@
 {{#showmanageresponses}}
 <a href="{{{manageresponsesurl}}}" style="text-decoration: none;">
 {{/showmanageresponses}}
-
 {{! Booking places }}
 {{#maxanswers}}
     <span class="col-ap-availableplaces {{#bookingplacesclass}}{{.}}{{/bookingplacesclass}}">
@@ -50,8 +49,10 @@
     </span>
 {{/maxanswers}}
 {{^maxanswers}}
-    <span class="text-success font-weight-bold">{{booked}}</span>
+    {{^dontshowbookingswhenunlimited}}
+    <span class="text-success font-weight-bold">{{booked}} </span>
             / {{#str}} unlimitedplaces, mod_booking {{/str}}
+    {{/dontshowbookingswhenunlimited}}
 {{/maxanswers}}
 
 {{! Waiting list places }}