Skip to content

Commit 9ce6752

Browse files
justusdieckmannjustusdieckmann
committed
Address commented issues: Set roles and purge caches when settings are changed, remove secondary navigation
1 parent f738b1f commit 9ce6752

14 files changed

+62
-34
lines changed

‎adminsettings.php

+11-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
} else if ($data = $mform->get_data()) {
5959
// Form is submitted.
6060
// Added course category.
61+
62+
global $DB;
63+
$evasysroleid = $DB->get_record('role', ['shortname' => 'evasysmanager'])->id;
6164
if (isset($data->addcatbutton)) {
6265
// Insert new record.
6366
$record = new stdClass();
@@ -71,7 +74,10 @@
7174
$record->mode_flags = 0;
7275
$persistent = new \block_evasys_sync\evasys_category(0, $record);
7376
$persistent->create();
74-
77+
if ($evasysroleid) {
78+
role_assign($evasysroleid, $record->userid, context_coursecat::instance($record->course_category));
79+
}
80+
\block_evasys_sync\evalcat_manager::get_instance()->purge();
7581
redirect($PAGE->url);
7682
exit();
7783
} else if (isset($data->submitbutton)) {
@@ -127,8 +133,12 @@
127133
$allocation->set('category_mode', $newvaluemode);
128134
$allocation->update();
129135
}
136+
if ($evasysroleid) {
137+
role_assign($evasysroleid, $data->$newvalue, context_coursecat::instance($allocation->get('course_category')));
138+
}
130139
}
131140
}
141+
\block_evasys_sync\evalcat_manager::get_instance()->purge();
132142
}
133143

134144
echo $OUTPUT->header();

‎block_evasys_sync.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
// You should have received a copy of the GNU General Public License
1515
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
1616

17-
use block_evasys_sync\course_evaluation_allocation;
18-
1917
defined('MOODLE_INTERNAL') || die();
2018

2119
class block_evasys_sync extends block_base{
@@ -34,9 +32,8 @@ public function init() {
3432
*/
3533
public function get_content() {
3634
global $OUTPUT;
37-
$evasyssynccheck = optional_param('evasyssynccheck', 0, PARAM_BOOL);
3835

39-
// There should never be content, so if there is, we want to output that.
36+
// Return cached content if there is any.
4037
if ($this->content !== null) {
4138
return $this->content;
4239
}

‎classes/evalcat_manager.php

+4
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,8 @@ public function purge() {
9696
$this->usercache->purge();
9797
}
9898

99+
public function purge_categories() {
100+
$this->cache->purge();
101+
}
102+
99103
}

‎classes/evaluation_manager.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public static function set_default_evaluation_for($courseids, evasys_category $c
8989
];
9090

9191
$synchronizer->sync_students();
92-
$teacherroleid = $DB->get_record('role', ['shortname' => 'editingteacher'])->id;
93-
$teachers = get_role_users($teacherroleid, \context_course::instance($course->id));
92+
$teachers = get_users_by_capability(\context_course::instance($course->id), 'block/evasys_sync:getnotifiedteacher');
9493

9594
$data = new \stdClass();
9695
$data->coordinator = fullname($coordinatoruser);

‎classes/remaining_courses_table.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
*/
3939
class remaining_courses_table extends \table_sql {
4040

41-
private int $teacherroleid;
4241
private evasys_category $evasyscategory;
4342

4443
/**
@@ -49,7 +48,6 @@ public function __construct($categoryids, $semester, evasys_category $evasyscate
4948
global $DB, $PAGE, $OUTPUT;
5049

5150
$this->evasyscategory = $evasyscategory;
52-
$this->teacherroleid = $DB->get_record('role', ['shortname' => 'editingteacher'])->id;
5351

5452
$fields = 'c.id as courseid, c.fullname as coursename, cfd.intvalue as semester';
5553

@@ -119,7 +117,7 @@ public function col_courseid($row) {
119117
}
120118

121119
public function col_teacher($row) {
122-
$users = get_role_users($this->teacherroleid, \context_course::instance($row->courseid));
120+
$users = get_users_by_capability(\context_course::instance($row->courseid), 'block/evasys_sync:getnotifiedteacher');
123121
$users = array_map(function($user) {
124122
return \html_writer::link(new moodle_url('/user/profile.php', ['id' => $user->id]), fullname($user));
125123
}, $users);

‎db/access.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,13 @@
6161
'block/evasys_sync:managecourses' => array(
6262
'captype' => 'write',
6363
'contextlevel' => CONTEXT_COURSECAT
64-
)
64+
),
65+
'block/evasys_sync:teacherforcourse' => [
66+
'contextlevel' => CONTEXT_COURSE,
67+
'captype' => 'read',
68+
'archetypes' => [
69+
'editingteacher' => CAP_ALLOW,
70+
'manager' => CAP_PREVENT
71+
]
72+
]
6573
);

‎editcategory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
$title = get_string('evasys_settings_for', 'block_evasys_sync', $category->name);
3535
$PAGE->set_url(new moodle_url('/blocks/evasys_sync/editcategory.php', ['id' => $id]));
36-
$PAGE->set_context($category->get_context());
36+
$PAGE->set_context(context_system::instance());
3737
$PAGE->set_title($title);
3838

3939
require_capability('block/evasys_sync:managecourses', $PAGE->context);

‎lang/de/block_evasys_sync.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,4 @@
273273
Falls Sie Probleme mit dem Zeitraum der Evaluation haben, wenden Sie sich bitte an Ihre*n Evaluationskoordinator*in {$a->coordinator}.
274274
275275
Mit freundlichen Grüßen,
276-
Ihr Learnweb-Support';
276+
Ihr Learnweb-Support';

‎lang/en/block_evasys_sync.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
$string['evasys_sync:synchronize'] = 'Export participants to EvaSys';
155155
$string['evasys_sync:modifymapping'] = 'Modify mapping of EvaSys courses to moodle course';
156156
$string['evasys_sync:managecourses'] = 'EvaSys manage course';
157+
$string['evasys_sync:teacherforcourse'] = 'Get emails regarding your course.';
157158

158159
// Settings.
159160
$string['settings'] = 'EvaSys Sync Block Settings';
@@ -285,4 +286,4 @@
285286
Sincerely,
286287
Your Learnweb-Support';
287288

288-
$string['request_eval'] = 'Request evaluation';
289+
$string['request_eval'] = 'Request evaluation';

‎managecategory.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@
2424

2525
use block_evasys_sync\dbtables;
2626
use block_evasys_sync\local\entity\evaluation_state;
27+
use customfield_semester\data_controller;
2728

2829
require_once(__DIR__ . '/../../config.php');
29-
global $DB, $USER, $OUTPUT, $PAGE;
30+
global $CFG, $DB, $USER, $OUTPUT, $PAGE;
31+
require_once($CFG->libdir . '/tablelib.php');
3032

3133
require_login();
3234

@@ -36,10 +38,10 @@
3638
$evasyscategory = \block_evasys_sync\evasys_category::for_category($id);
3739

3840
$PAGE->set_url(new moodle_url('/blocks/evasys_sync/managecategory.php', ['id' => $id]));
39-
$PAGE->set_context($category->get_context());
41+
$PAGE->set_context(context_system::instance());
4042
$PAGE->set_title(get_string('evasys_sync', 'block_evasys_sync'));
4143

42-
require_capability('block/evasys_sync:managecourses', $PAGE->context);
44+
require_capability('block/evasys_sync:managecourses', $category->get_context());
4345

4446
$cachekey = 'manageroverview';
4547
$cache = cache::make('block_evasys_sync', 'mformdata');
@@ -68,9 +70,11 @@
6870

6971
$catids = array_merge($category->get_all_children_ids(), [$category->id]);
7072

71-
$categorynode = $PAGE->navigation->find($category->id, navigation_node::TYPE_CATEGORY);
72-
$evasysnode = $categorynode->add('Evaluations', new moodle_url('/blocks/evasys_sync/managecategory.php', ['id' => $category->id]));
73-
$evasysnode->add(\customfield_semester\data_controller::get_name_for_semester($data->semester))->make_active();
73+
$PAGE->navigation->add('EvaSys', new moodle_url('/blocks/evasys_sync/manageroverview.php'))
74+
->add(
75+
get_string('evaluations', 'block_evasys_sync') . ' in ' . data_controller::get_name_for_semester($data->semester),
76+
new moodle_url('/blocks/evasys_sync/managecategory.php', ['id' => $category->id])
77+
)->make_active();
7478

7579
list($inmanualsql, $params) = $DB->get_in_or_equal(evaluation_state::MANUAL_STATES, SQL_PARAMS_NAMED);
7680
list($incatsql, $incatparams) = $DB->get_in_or_equal($catids, SQL_PARAMS_NAMED);

‎managecategory_remaining.php

+8-6
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*/
2424

2525
use block_evasys_sync\remaining_courses_table;
26+
use customfield_semester\data_controller;
2627

2728
require_once(__DIR__ . '/../../config.php');
2829
global $DB, $USER, $OUTPUT, $PAGE;
@@ -35,10 +36,10 @@
3536
$evasyscategory = \block_evasys_sync\evasys_category::for_category($id);
3637

3738
$PAGE->set_url(new moodle_url('/blocks/evasys_sync/managecategory_remaining.php', ['id' => $id]));
38-
$PAGE->set_context($category->get_context());
39+
$PAGE->set_context(context_system::instance());
3940
$PAGE->set_title(get_string('evasys_sync', 'block_evasys_sync'));
4041

41-
require_capability('block/evasys_sync:managecourses', $PAGE->context);
42+
require_capability('block/evasys_sync:managecourses', $category->get_context());
4243

4344
$cachekey = 'manageroverview';
4445
$cache = cache::make('block_evasys_sync', 'mformdata');
@@ -74,10 +75,11 @@
7475
$table = new remaining_courses_table($catids, $data->semester ?? null, $evasyscategory, $data->coursename ?? null);
7576
$table->define_baseurl($PAGE->url);
7677

77-
$categorynode = $PAGE->navigation->find($category->id, navigation_node::TYPE_CATEGORY);
78-
$evasysnode = $categorynode->add('Evaluations', new moodle_url('/blocks/evasys_sync/managecategory.php', ['id' => $category->id]));
79-
$semesternode = $evasysnode->add(\customfield_semester\data_controller::get_name_for_semester($data->semester));
80-
$semesternode->add('Requests', $PAGE->url)->make_active();
78+
$PAGE->navigation->add('EvaSys', new moodle_url('/blocks/evasys_sync/manageroverview.php'))
79+
->add(
80+
get_string('evaluations', 'block_evasys_sync') . ' in ' . data_controller::get_name_for_semester($data->semester),
81+
new moodle_url('/blocks/evasys_sync/managecategory.php', ['id' => $category->id])
82+
)->add(get_string('courses_without_evals', 'block_evasys_sync'), $PAGE->url)->make_active();
8183

8284
echo $OUTPUT->header();
8385

‎managecategory_requests.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2323
*/
2424

25+
use customfield_semester\data_controller;
26+
2527
require_once(__DIR__ . '/../../config.php');
2628
global $DB, $USER, $OUTPUT, $PAGE;
2729

@@ -33,10 +35,10 @@
3335
$evasyscategory = \block_evasys_sync\evasys_category::for_category($id);
3436

3537
$PAGE->set_url(new moodle_url('/blocks/evasys_sync/managecategory_requests.php', ['id' => $id]));
36-
$PAGE->set_context($category->get_context());
38+
$PAGE->set_context(context_system::instance());
3739
$PAGE->set_title(get_string('evasys_sync', 'block_evasys_sync'));
3840

39-
require_capability('block/evasys_sync:managecourses', $PAGE->context);
41+
require_capability('block/evasys_sync:managecourses', $category->get_context());
4042

4143
$cachekey = 'manageroverview';
4244
$cache = cache::make('block_evasys_sync', 'mformdata');
@@ -58,10 +60,11 @@
5860
$data->coursename ?? null);
5961
$table->define_baseurl($PAGE->url);
6062

61-
$categorynode = $PAGE->navigation->find($category->id, navigation_node::TYPE_CATEGORY);
62-
$evasysnode = $categorynode->add('Evaluations', new moodle_url('/blocks/evasys_sync/managecategory.php', ['id' => $category->id]));
63-
$semesternode = $evasysnode->add(\customfield_semester\data_controller::get_name_for_semester($data->semester));
64-
$semesternode->add('Requests', $PAGE->url)->make_active();
63+
$PAGE->navigation->add('EvaSys', new moodle_url('/blocks/evasys_sync/manageroverview.php'))
64+
->add(
65+
get_string('evaluations', 'block_evasys_sync') . ' in ' . data_controller::get_name_for_semester($data->semester),
66+
new moodle_url('/blocks/evasys_sync/managecategory.php', ['id' => $category->id])
67+
)->add(get_string('courses_with_requests', 'block_evasys_sync'), $PAGE->url)->make_active();
6568

6669
echo $OUTPUT->header();
6770

‎manageroverview.php

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
$PAGE->set_context(context_system::instance());
4242
$PAGE->set_title(get_string('evasys_sync', 'block_evasys_sync'));
4343

44+
$PAGE->navigation->add('EvaSys', new moodle_url('/blocks/evasys_sync/manageroverview.php'));
45+
4446
$categories = evalcat_manager::get_instance()->get_categories();
4547

4648
$table = new flexible_table('block_evasys_sync-manageroverview');

‎version.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
defined('MOODLE_INTERNAL') || die();
1919

2020
$plugin->component = 'block_evasys_sync';
21-
$plugin->version = 2022102600; // YYYYMMDDHH (year, month, day, 24-hr time).
22-
$plugin->requires = 2017111300; // YYYYMMDDHH (This is the release version for Moodle 2.0).
21+
$plugin->version = 2023040900; // YYYYMMDDHH (year, month, day, 24-hr time).
22+
$plugin->requires = 2022041900; // YYYYMMDDHH (This is the release version for Moodle 4.0).
2323
$plugin->maturity = MATURITY_RC;

0 commit comments

Comments
 (0)