|
@@ -540,7 +540,7 @@ class Exercise
|
|
* @param string $sord
|
|
* @param string $sord
|
|
* @param array $where_condition
|
|
* @param array $where_condition
|
|
*/
|
|
*/
|
|
- public function getQuestionListPagination($start, $limit, $sidx, $sord, $where_condition = array())
|
|
|
|
|
|
+ public function getQuestionListPagination($start, $limit, $sidx, $sord, $where_condition = array(), $extraFields = array())
|
|
{
|
|
{
|
|
if (!empty($this->id)) {
|
|
if (!empty($this->id)) {
|
|
$category_list = Testcategory::getListOfCategoriesNameForTest($this->id, false);
|
|
$category_list = Testcategory::getListOfCategoriesNameForTest($this->id, false);
|
|
@@ -580,6 +580,9 @@ class Exercise
|
|
$result = Database::query($sql);
|
|
$result = Database::query($sql);
|
|
$questions = array();
|
|
$questions = array();
|
|
if (Database::num_rows($result)) {
|
|
if (Database::num_rows($result)) {
|
|
|
|
+ if (!empty($extraFields)) {
|
|
|
|
+ $extraFieldValue = new ExtraFieldValue('question');
|
|
|
|
+ }
|
|
while ($question = Database::fetch_array($result, 'ASSOC')) {
|
|
while ($question = Database::fetch_array($result, 'ASSOC')) {
|
|
$objQuestionTmp = Question::read($question['iid']);
|
|
$objQuestionTmp = Question::read($question['iid']);
|
|
$category_labels = Testcategory::return_category_labels($objQuestionTmp->category_list, $category_list);
|
|
$category_labels = Testcategory::return_category_labels($objQuestionTmp->category_list, $category_list);
|
|
@@ -607,6 +610,18 @@ class Exercise
|
|
'score' => $objQuestionTmp->selectWeighting(),
|
|
'score' => $objQuestionTmp->selectWeighting(),
|
|
'level' => $objQuestionTmp->level
|
|
'level' => $objQuestionTmp->level
|
|
);
|
|
);
|
|
|
|
+
|
|
|
|
+ if (!empty($extraFields)) {
|
|
|
|
+ foreach ($extraFields as $extraField) {
|
|
|
|
+ $value = $extraFieldValue->get_values_by_handler_and_field_id($question['id'], $extraField['id']);
|
|
|
|
+ $stringValue = null;
|
|
|
|
+ if ($value) {
|
|
|
|
+ $stringValue = $value['field_value'];
|
|
|
|
+ }
|
|
|
|
+ $question[$extraField['field_variable']] = $stringValue;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
$questions[] = $question;
|
|
$questions[] = $question;
|
|
}
|
|
}
|
|
}
|
|
}
|