|
@@ -467,11 +467,15 @@ switch ($action) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (!in_array($sidx, array('training_hours'))) {
|
|
|
|
+ //$sidx = 'training_hours';
|
|
|
|
+ }
|
|
|
|
+
|
|
$result = CourseManager::get_user_list_from_course_code(
|
|
$result = CourseManager::get_user_list_from_course_code(
|
|
null,
|
|
null,
|
|
null,
|
|
null,
|
|
"LIMIT $start, $limit",
|
|
"LIMIT $start, $limit",
|
|
- " $sidx $sord",
|
|
|
|
|
|
+ null, //" $sidx $sord",
|
|
null,
|
|
null,
|
|
null,
|
|
null,
|
|
true,
|
|
true,
|
|
@@ -509,7 +513,9 @@ switch ($action) {
|
|
$column_names[] = $extra['3'];
|
|
$column_names[] = $extra['3'];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ if (!in_array($sidx, array('title'))) {
|
|
|
|
+ $sidx = 'title';
|
|
|
|
+ }
|
|
$result = CourseManager::get_user_list_from_course_code(
|
|
$result = CourseManager::get_user_list_from_course_code(
|
|
null,
|
|
null,
|
|
null,
|
|
null,
|
|
@@ -682,6 +688,7 @@ switch ($action) {
|
|
$columns = array(
|
|
$columns = array(
|
|
'student', 'works'
|
|
'student', 'works'
|
|
);
|
|
);
|
|
|
|
+
|
|
$result = getWorkUserListData(
|
|
$result = getWorkUserListData(
|
|
$workId,
|
|
$workId,
|
|
api_get_course_id(),
|
|
api_get_course_id(),
|