|
|
@ -182,14 +182,12 @@ if (!$hideExpectedAnswer) { |
|
|
|
|
|
|
|
|
|
|
|
if ($objQuestion->selectType() == HOT_SPOT_DELINEATION) { |
|
|
|
if ($objQuestion->selectType() == HOT_SPOT_DELINEATION) { |
|
|
|
$qb |
|
|
|
$qb |
|
|
|
->where($qb->expr()->eq('a.cId', $courseId)) |
|
|
|
->where($qb->expr()->eq('a.questionId', $questionId)) |
|
|
|
->andWhere($qb->expr()->eq('a.questionId', $questionId)) |
|
|
|
|
|
|
|
->andWhere("a.hotspotType != 'noerror'") |
|
|
|
->andWhere("a.hotspotType != 'noerror'") |
|
|
|
->orderBy('a.id', 'ASC'); |
|
|
|
->orderBy('a.iid', 'ASC'); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$qb |
|
|
|
$qb |
|
|
|
->where($qb->expr()->eq('a.cId', $courseId)) |
|
|
|
->where($qb->expr()->eq('a.questionId', $questionId)) |
|
|
|
->andWhere($qb->expr()->eq('a.questionId', $questionId)) |
|
|
|
|
|
|
|
->orderBy('a.position', 'ASC'); |
|
|
|
->orderBy('a.position', 'ASC'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|