Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bookingform.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class scheduler_booking_form extends moodleform {
/** @var mixed */
protected $uploadoptions;
/** @var mixed */
protected $noteoptions;
/** @var mixed */
protected $existing;

/**
Expand Down
5 changes: 5 additions & 0 deletions renderable.php
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,11 @@ class scheduler_appointment_info implements renderable {
*/
public $showresult;

/**
* @var bool whether to show booking info
*/
public $showboookinginfo;

/**
* Create appointment information for a new appointment in a slot.
*
Expand Down
1 change: 0 additions & 1 deletion teacherview.php
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ function scheduler_print_schedulebox(scheduler $scheduler, $studentid, $groupid
$PAGE->requires->js_call_amd('mod_scheduler/delselected', 'init', [$delselectedurl->out(false)]);
$delselected = $commandbar->action_menu_link($delselectedurl, 'deleteselection', 't/delete',
'confirmdelete-selected', 'delselected');
$delselected->formid = 'delselected';
$delbuttons[] = $delselected;

if ($permissions->can_edit_all_slots() && $subpage == 'allappointments') {
Expand Down
8 changes: 4 additions & 4 deletions tests/behat/grades.feature
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Feature: Teachers can grade student appointments with totals automatically compu
And I expand all fieldsets
And I set the field "Grading strategy" to "Take the highest grade"
And I press "Save and display"
And I click on "Edit" "icon" in the "3:00 AM" "table_row"
And I click on "Edit" "link" in the "3:00 AM" "table_row"
And I set the following fields to these values:
| grade[0] | 5 |
And I click on "Save" "button"
Expand All @@ -175,7 +175,7 @@ Feature: Teachers can grade student appointments with totals automatically compu
And I should see "5.00" in the "div.totalgrade" "css_element"

When I am on the "scheduler1" Activity page logged in as "teacher1"
And I click on "Edit" "icon" in the "4:00 AM" "table_row"
And I click on "Edit" "link" in the "4:00 AM" "table_row"
And I set the following fields to these values:
| grade[0] | 7 |
And I click on "Save" "button"
Expand All @@ -185,7 +185,7 @@ Feature: Teachers can grade student appointments with totals automatically compu
And I should see "7.00" in the "div.totalgrade" "css_element"

When I am on the "scheduler1" Activity page logged in as "teacher1"
And I click on "Edit" "icon" in the "4:00 AM" "table_row"
And I click on "Edit" "link" in the "4:00 AM" "table_row"
And I set the following fields to these values:
| grade[0] | 2 |
And I click on "Save" "button"
Expand All @@ -195,7 +195,7 @@ Feature: Teachers can grade student appointments with totals automatically compu
And I should see "5.00" in the "div.totalgrade" "css_element"

When I am on the "scheduler1" Activity page logged in as "teacher1"
And I click on "Edit" "icon" in the "3:00 AM" "table_row"
And I click on "Edit" "link" in the "3:00 AM" "table_row"
And I set the following fields to these values:
| grade[0] | No grade |
And I click on "Save" "button"
Expand Down