CONTRIB-6891 Show other students in "Upcoming slots" table

bostelm · May 9, 2017 · 495121e · 495121e
1 parent 68933ab
commit 495121e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/renderable.php b/renderable.php
@@ -19,6 +19,8 @@ class scheduler_slot_table implements renderable {
     public $scheduler;
     public $showgrades;
     public $showactions;
+    public $hasotherstudents = false;
+
     public $actionurl;
 
     public function add_slot(scheduler_slot $slotmodel, scheduler_appointment $appointmentmodel, $otherstudents, $cancancel = false) {
@@ -40,6 +42,7 @@ public function add_slot(scheduler_slot $slotmodel, scheduler_appointment $appoi
             $slot->grade = $appointmentmodel->grade;
         }
         $this->showactions = $this->showactions || $cancancel;
+        $this->hasotherstudents = $this->hasotherstudents || (bool) $otherstudents;
 
         $this->slots[] = $slot;
     }

diff --git a/renderer.php b/renderer.php
@@ -248,6 +248,9 @@ public function render_scheduler_slot_table(scheduler_slot_table $slottable) {
         if ($slottable->showgrades) {
             $table->head[] = get_string('grade', 'scheduler');
             $table->align[] = 'left';
+        } else if ($slottable->hasotherstudents) {
+            $table->head[] = get_string('otherstudents', 'scheduler');
+            $table->align[] = 'left';
         }
         if ($slottable->showactions) {
             $table->head[] = '';
@@ -311,10 +314,11 @@ public function render_scheduler_slot_table(scheduler_slot_table $slottable) {
 
             $rowdata[] = $studentnotes;
 
-            if ($slottable->showgrades) {
+            if ($slottable->showgrades || $slottable->hasotherstudents) {
+                $gradedata = '';
                 if ($slot->otherstudents) {
                     $gradedata = $this->render($slot->otherstudents);
-                } else {
+                } else if ($slottable->showgrades) {
                     $gradedata = $this->format_grade($slottable->scheduler, $slot->grade);
                 }
                 $rowdata[] = $gradedata;