Skip to content

Commit

Permalink
IOMAD: Course completion report pie chart numbers being skewed by mul…
Browse files Browse the repository at this point in the history 
…tiple departments
  • Loading branch information
@turf212
turf212 committed Sep 25, 2023
1 parent 7765aeb commit 606aede
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions local/report_completion/classes/tables/course_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function col_licenseallocated($row) {
}

// Count the unused licenses.
$licensesunused = $DB->count_records_sql("SELECT COUNT(lit.id)
$licensesunused = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id)
Expand All @@ -170,7 +170,7 @@ public function col_licenseallocated($row) {
$sqlparams);

// Count the allocated licenses.
$licensesallocated = $DB->count_records_sql("SELECT count(lit.id) FROM {local_iomad_track} lit
$licensesallocated = $DB->count_records_sql("SELECT count(DISTINCT lit.id) FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -234,7 +234,7 @@ public function col_licenseallocated($row) {
}

// Count the unused licenses.
$licensesunused = $DB->count_records_sql("SELECT COUNT(lit.id)
$licensesunused = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id)
Expand All @@ -248,7 +248,7 @@ public function col_licenseallocated($row) {
$sqlparams);

// Count the used licenses.
$licensesallocated = $DB->count_records_sql("SELECT count(lit.id) FROM {local_iomad_track} lit
$licensesallocated = $DB->count_records_sql("SELECT count(DISTINCT lit.id) FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -727,7 +727,7 @@ public function col_userstarted($row) {
}

// Count the enrolled users
$started = $DB->count_records_sql("SELECT COUNT(lit.id)
$started = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
Expand Down Expand Up @@ -789,7 +789,7 @@ public function col_userstarted($row) {
}

// Count the enrolled users
$started = $DB->count_records_sql("SELECT COUNT(lit.id)
$started = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {user} u ON (lit.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -894,7 +894,7 @@ public function col_userinprogress($row) {
}

// Count the enrolled users
$inprogress = $DB->count_records_sql("SELECT COUNT(lit.id)
$inprogress = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
Expand Down Expand Up @@ -952,7 +952,7 @@ public function col_userinprogress($row) {
}

// Count the enrolled users
$inprogress = $DB->count_records_sql("SELECT COUNT(lit.id)
$inprogress = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {user} u ON (lit.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -1067,7 +1067,7 @@ public function col_usercompleted($row) {
}

// Count the completed users.
$completed = $DB->count_records_sql("SELECT COUNT(lit.id)
$completed = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
Expand Down Expand Up @@ -1125,7 +1125,7 @@ public function col_usercompleted($row) {
}

// Count the completed users.
$completed = $DB->count_records_sql("SELECT COUNT(lit.id)
$completed = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {user} u ON (lit.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -1229,7 +1229,7 @@ public function col_usernotstarted($row) {
}

// Count the non started users.
$notstarted = $DB->count_records_sql("SELECT count(lit.id) FROM {local_iomad_track} lit
$notstarted = $DB->count_records_sql("SELECT count(DISTINCT lit.id) FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -1292,7 +1292,7 @@ public function col_usernotstarted($row) {
}

// Count the non started users.
$notstarted = $DB->count_records_sql("SELECT count(lit.id) FROM {local_iomad_track} lit
$notstarted = $DB->count_records_sql("SELECT count(DISTINCT lit.id) FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -1395,7 +1395,7 @@ public function col_usersummary($row) {
}

// Count the completed users.
$completed = $DB->count_records_sql("SELECT COUNT(lit.id)
$completed = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
Expand All @@ -1409,7 +1409,7 @@ public function col_usersummary($row) {
$sqlparams);

// Count the enrolled users
$started = $DB->count_records_sql("SELECT COUNT(lit.id)
$started = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
Expand All @@ -1423,7 +1423,7 @@ public function col_usersummary($row) {
$sqlparams);

// Count the non started users.
$notstarted = $DB->count_records_sql("SELECT count(lit.id) FROM {local_iomad_track} lit
$notstarted = $DB->count_records_sql("SELECT count(DISTINCT lit.id) FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down Expand Up @@ -1486,7 +1486,7 @@ public function col_usersummary($row) {
}

// Count the completed users.
$completed = $DB->count_records_sql("SELECT COUNT(lit.id)
$completed = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {user} u ON (lit.userid = u.id)
WHERE lit.courseid = :courseid
Expand All @@ -1498,7 +1498,7 @@ public function col_usersummary($row) {
$sqlparams);

// Count the enrolled users
$started = $DB->count_records_sql("SELECT COUNT(lit.id)
$started = $DB->count_records_sql("SELECT COUNT(DISTINCT lit.id)
FROM {local_iomad_track} lit
JOIN {user} u ON (lit.userid = u.id)
WHERE lit.courseid = :courseid
Expand All @@ -1511,7 +1511,7 @@ public function col_usersummary($row) {
$sqlparams);

// Count the non started users.
$notstarted = $DB->count_records_sql("SELECT count(lit.id) FROM {local_iomad_track} lit
$notstarted = $DB->count_records_sql("SELECT count(DISTINCT lit.id) FROM {local_iomad_track} lit
JOIN {company_users} cu ON (lit.userid = cu.userid AND lit.companyid = cu.companyid)
JOIN {user} u ON (lit.userid = u.id AND cu.userid = u.id)
WHERE lit.courseid = :courseid
Expand Down

0 comments on commit 606aede

Please sign in to comment.