Commit 3d1ce239 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Gerrit Code Review

Merge "Bug 1850544: Make the overdue items appear at top"

parents 4d843bef 0fda9aed
......@@ -48,6 +48,7 @@ class PluginBlocktypePlans extends MaharaCoreBlocktype {
return array(
array(
'file' => 'js/plansblock.js',
'initjs' => " enableCheckBoxes();",
)
);
}
......
......@@ -1526,7 +1526,12 @@ class ArtefactTypeTask extends ArtefactType {
$sql .= " AND a.id IN ( " . join(',', array_fill(0, count($tasks), '?')) . ")";
$values = array_merge($values, $tasks);
}
$sql .= " ORDER BY a.id";
if ($plan->is_template()) {
$sql .= " ORDER BY a.id";
}
else {
$sql .= " ORDER BY at.completed, at.completiondate ASC, a.id";
}
($results = get_records_sql_array($sql, $values, $offset, $limit))
|| ($results = array());
......
......@@ -37,6 +37,7 @@
padding-top: 4px;
z-index: 3;
position: relative;
cursor: pointer;
}
.plan-task-heading {
max-width: 60%;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment