moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-53451-master-fixup' of https://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-04-20 11:28:55 +01:00
commit 913dcb1b81
10 changed files with 76 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/tool/lpmigrate/classes/framework_processor.php
View file

@ -574,6 +574,11 @@ class framework_processor {
// Finally, we remove the course competencies, but only for the 100% successful ones.
foreach ($competenciestoremovefromcourse as $competencyid => $unused) {
// Skip competencies with issues.
if (isset($competencieswithissues[$competencyid])) {
continue;
}
try {
// Process the course competency.
api::remove_competency_from_course($courseid, $competencyid);

2
admin/tool/lpmigrate/tests/processor_test.php
View file

@ -332,7 +332,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase {
$this->assertEquals(2, $processor->get_courses_found_count());
$this->assertEquals(5, $processor->get_expected_course_competency_migrations());
$this->assertEquals(3, $processor->get_course_competency_migrations());
$this->assertEquals(3, $processor->get_course_competency_removals());
$this->assertEquals(2, $processor->get_course_competency_removals());
$this->assertEquals(3, $processor->get_cms_found_count());
$this->assertEquals(5, $processor->get_expected_module_competency_migrations());

5
competency/classes/api.php
View file

@ -1606,12 +1606,11 @@ class api {
$record->courseid = $courseid;
$record->competencyid = $competencyid;
$competency = new competency($competencyid);
$coursecompetency = new course_competency();
$exists = $coursecompetency->get_record(array('courseid' => $courseid, 'competencyid' => $competencyid));
$exists = course_competency::get_record(array('courseid' => $courseid, 'competencyid' => $competencyid));
if ($exists) {
// Delete all course_module_competencies for this competency in this course.
$cmcs = course_module_competency::list_course_module_competencies($competencyid, $courseid);
$cmcs = course_module_competency::get_records_by_competencyid_in_course($competencyid, $courseid);
foreach ($cmcs as $cmc) {
$cmc->delete();
}

29
competency/classes/course_module_competency.php
View file

@ -298,4 +298,33 @@ class course_module_competency extends persistent {
return $instances;
}
/**
* List the relationship objects for a competency in a course.
*
* @param int $competencyid The competency ID.
* @param int $courseid The course ID.
* @return course_module_competency[]
*/
public static function get_records_by_competencyid_in_course($competencyid, $courseid) {
global $DB;
$sql = 'SELECT cmc.*
FROM {' . self::TABLE . '} cmc
JOIN {course_modules} cm
ON cm.course = ?
AND cmc.cmid = cm.id
WHERE cmc.competencyid = ?
ORDER BY cmc.sortorder ASC';
$params = array($courseid, $competencyid);
$results = $DB->get_recordset_sql($sql, $params);
$instances = array();
foreach ($results as $result) {
$instances[$result->id] = new course_module_competency(0, $result);
}
$results->close();
return $instances;
}
}

9
competency/classes/related_competency.php
View file

@ -138,24 +138,25 @@ class related_competency extends persistent {
public static function get_related_competencies($competencyid) {
global $DB;
$sql = "(SELECT c.*, " . $DB->sql_concat('rc.relatedcompetencyid', "'_'", 'rc.competencyid') . " AS rid
$fields = competency::get_sql_fields('c', 'c_');
$sql = "(SELECT $fields, " . $DB->sql_concat('rc.relatedcompetencyid', "'_'", 'rc.competencyid') . " AS rid
FROM {" . self::TABLE . "} rc
JOIN {" . competency::TABLE . "} c
ON c.id = rc.relatedcompetencyid
WHERE rc.competencyid = :cid)
UNION ALL
(SELECT c.*, " . $DB->sql_concat('rc.competencyid', "'_'", 'rc.relatedcompetencyid') . " AS rid
(SELECT $fields, " . $DB->sql_concat('rc.competencyid', "'_'", 'rc.relatedcompetencyid') . " AS rid
FROM {" . self::TABLE . "} rc
JOIN {" . competency::TABLE . "} c
ON c.id = rc.competencyid
WHERE rc.relatedcompetencyid = :cid2)
ORDER BY path, sortorder ASC";
ORDER BY c_path ASC, c_sortorder ASC";
$competencies = array();
$records = $DB->get_recordset_sql($sql, array('cid' => $competencyid, 'cid2' => $competencyid));
foreach ($records as $record) {
unset($record->rid);
$competencies[$record->id] = new competency(null, $record);
$competencies[$record->c_id] = new competency(null, competency::extract_record($record, 'c_'));
}
$records->close();

7
competency/classes/template_competency.php
View file

@ -107,6 +107,8 @@ class template_competency extends persistent {
$params[] = 1;
}
$sql .= ' ORDER BY tpl.id ASC';
$results = $DB->get_records_sql($sql, $params);
$instances = array();
@ -199,11 +201,10 @@ class template_competency extends persistent {
FROM {' . competency::TABLE . '} comp
JOIN {' . self::TABLE . '} tplcomp
ON tplcomp.competencyid = comp.id
WHERE tplcomp.templateid = ?';
WHERE tplcomp.templateid = ?
ORDER BY tplcomp.sortorder ASC';
$params = array($templateid);
$sql .= 'ORDER BY tplcomp.sortorder ASC';
$results = $DB->get_records_sql($sql, $params);
$instances = array();

25
competency/classes/user_competency_course.php
View file

@ -263,24 +263,27 @@ class user_competency_course extends persistent {
public static function get_least_proficient_competencies_for_course($courseid, $skip = 0, $limit = 0) {
global $DB;
$fields = competency::get_sql_fields('c');
$fields = competency::get_sql_fields('c', 'c_');
$params = array('courseid' => $courseid);
$sql = 'SELECT ' . $fields . ', SUM(COALESCE(ucc.proficiency, 0)) AS timesproficient ' .
' FROM {' . competency::TABLE . '} c
JOIN {' . course_competency::TABLE . '} cc
ON c.id = cc.competencyid
LEFT JOIN {' . self::TABLE . '} ucc
ON ucc.competencyid = c.id AND ucc.courseid = cc.courseid
WHERE cc.courseid = :courseid
GROUP BY c.id
ORDER BY timesproficient ASC, c.id DESC';
$sql = 'SELECT ' . $fields . '
FROM (SELECT cc.competencyid, SUM(COALESCE(ucc.proficiency, 0)) AS timesproficient
FROM {' . course_competency::TABLE . '} cc
LEFT JOIN {' . self::TABLE . '} ucc
ON ucc.competencyid = cc.competencyid
AND ucc.courseid = cc.courseid
WHERE cc.courseid = :courseid
GROUP BY cc.competencyid
) p
JOIN {' . competency::TABLE . '} c
ON c.id = p.competencyid
ORDER BY p.timesproficient ASC, c.id DESC';
$results = $DB->get_records_sql($sql, $params, $skip, $limit);
$a = $DB->get_records_sql('SELECT * from {' . self::TABLE . '}');
$comps = array();
foreach ($results as $r) {
$c = competency::extract_record($r);
$c = competency::extract_record($r, 'c_');
$comps[] = new competency(0, $c);
}
return $comps;

24
competency/classes/user_competency_plan.php
View file

@ -340,24 +340,26 @@ class user_competency_plan extends persistent {
public static function get_least_proficient_competencies_for_template($templateid, $skip = 0, $limit = 0) {
global $DB;
$fields = competency::get_sql_fields('c');
$fields = competency::get_sql_fields('c', 'c_');
$params = array('templateid' => $templateid, 'notproficient' => false);
$sql = 'SELECT ' . $fields . ', COUNT(c.id) AS timesnotproficient ' .
' FROM {' . self::TABLE . '} ucp
JOIN {' . plan::TABLE . '} p
ON ucp.planid = p.id
$sql = 'SELECT ' . $fields . '
FROM (SELECT ucp.competencyid, COUNT(ucp.competencyid) AS timesnotproficient
FROM {' . self::TABLE . '} ucp
JOIN {' . plan::TABLE . '} p
ON p.id = ucp.planid
WHERE p.templateid = :templateid
AND (ucp.proficiency = :notproficient OR ucp.proficiency IS NULL)
GROUP BY ucp.competencyid
) p
JOIN {' . competency::TABLE . '} c
ON ucp.competencyid = c.id
WHERE p.templateid = :templateid
AND (ucp.proficiency = :notproficient OR ucp.proficiency IS NULL)
GROUP BY c.id
ORDER BY timesnotproficient DESC';
ON c.id = p.competencyid
ORDER BY p.timesnotproficient DESC, c.id ASC';
$results = $DB->get_records_sql($sql, $params, $skip, $limit);
$comps = array();
foreach ($results as $r) {
$c = competency::extract_record($r);
$c = competency::extract_record($r, 'c_');
$comps[] = new competency(0, $c);
}
return $comps;

3
competency/classes/user_evidence_competency.php
View file

@ -122,7 +122,8 @@ class user_evidence_competency extends persistent {
JOIN {" . user_evidence::TABLE . "} ue
ON uec.userevidenceid = ue.id
AND uc.userid = ue.userid
AND ue.id = ?";
AND ue.id = ?
ORDER BY uc.id ASC";
$usercompetencies = array();
$records = $DB->get_recordset_sql($sql, array($userevidenceid));

2
lib/grade/grade_scale.php
View file

@ -290,7 +290,7 @@ class grade_scale extends grade_object {
}
// Ask the competency subsystem.
if (\core_competency\api::is_scale_used_anywhere($scaleid)) {
if (\core_competency\api::is_scale_used_anywhere($this->id)) {
return true;
}