|
|
|
|
@ -9,18 +9,20 @@ use Entity; |
|
|
|
|
use Silex\Application; |
|
|
|
|
use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator; |
|
|
|
|
use Symfony\Component\HttpFoundation\Response; |
|
|
|
|
use Doctrine\Common\Collections\Criteria; |
|
|
|
|
|
|
|
|
|
use Symfony\Component\Routing\Annotation\Route; |
|
|
|
|
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Class RoleController |
|
|
|
|
* @todo @route and @method function don't work yet |
|
|
|
|
* Class JuryMemberController |
|
|
|
|
* @package ChamiloLMS\Controller |
|
|
|
|
* @author Julio Montoya <gugli100@gmail.com> |
|
|
|
|
*/ |
|
|
|
|
class JuryMemberController extends CommonController |
|
|
|
|
{ |
|
|
|
|
public $maxCountOfMemberToVoteToConsiderEvaluated = 3; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @Route("/") |
|
|
|
|
* @Method({"GET"}) |
|
|
|
|
@ -37,43 +39,195 @@ class JuryMemberController extends CommonController |
|
|
|
|
*/ |
|
|
|
|
public function listUsersAction() |
|
|
|
|
{ |
|
|
|
|
$userId = $this->getUser()->getUserId(); |
|
|
|
|
|
|
|
|
|
/** @var Entity\Jury $jury */ |
|
|
|
|
|
|
|
|
|
$jury = $this->getRepository()->getJuryByUserId($userId); |
|
|
|
|
|
|
|
|
|
if (!$jury) { |
|
|
|
|
$this->get('session')->getFlashBag()->add('warning', "No tiene un comité asignado."); |
|
|
|
|
$url = $this->get('url_generator')->generate('jury_president.controller:indexAction'); |
|
|
|
|
return $this->redirect($url); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$attempts = $jury->getExerciseAttempts(); |
|
|
|
|
|
|
|
|
|
// @todo move logic in a repository |
|
|
|
|
/** @var Entity\TrackExercise $attempt */ |
|
|
|
|
$relations = array(); |
|
|
|
|
$myStudentStatus = array(); |
|
|
|
|
foreach ($attempts as $attempt) { |
|
|
|
|
|
|
|
|
|
$user = $attempt->getUser(); |
|
|
|
|
$juryAttempts = $attempt->getJuryAttempts(); |
|
|
|
|
|
|
|
|
|
/** @var Entity\TrackExerciseAttemptJury $juryAttempt */ |
|
|
|
|
$tempAttempt = array(); |
|
|
|
|
foreach ($juryAttempts as $juryAttempt) { |
|
|
|
|
if (!isset($tempAttempt[$juryAttempt->getJuryUserId()])) { |
|
|
|
|
$tempAttempt[$juryAttempt->getJuryUserId()] = 1; |
|
|
|
|
} else { |
|
|
|
|
$tempAttempt[$juryAttempt->getJuryUserId()]++; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$juryCorrections = 1; |
|
|
|
|
foreach ($tempAttempt as $memberId => $answerCount) { |
|
|
|
|
$relations[$attempt->getExeId()][$user->getUserId()][$memberId] = $answerCount; |
|
|
|
|
|
|
|
|
|
// the jury_member correct the attempt |
|
|
|
|
if (!empty($answerCount) && $userId == $memberId) { |
|
|
|
|
$myStudentStatus[$attempt->getExeId()][$user->getUserId()] = true; |
|
|
|
|
} |
|
|
|
|
$juryCorrections++; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$members = $jury->getMembers(); |
|
|
|
|
|
|
|
|
|
/** @var Entity\JuryMembers $member */ |
|
|
|
|
$studentsByMember = array(); |
|
|
|
|
foreach ($members as $member) { |
|
|
|
|
$students = $member->getStudents(); |
|
|
|
|
foreach ($students as $student) { |
|
|
|
|
$studentsByMember[$member->getUserId()][] = $student->getUserId(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$template = $this->get('template'); |
|
|
|
|
|
|
|
|
|
$template->assign('my_student_status', $myStudentStatus); |
|
|
|
|
$template->assign('relations', $relations); |
|
|
|
|
$template->assign('attempts', $attempts); |
|
|
|
|
$template->assign('members', $members); |
|
|
|
|
$template->assign('students_by_member', $studentsByMember); |
|
|
|
|
$template->assign('considered_evaluated', $this->maxCountOfMemberToVoteToConsiderEvaluated); |
|
|
|
|
$template->assign('jury', $jury); |
|
|
|
|
$response = $template->render_template($this->getTemplatePath().'assign_members.tpl'); |
|
|
|
|
|
|
|
|
|
return new Response($response, 200, array()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @Route("/score-user/{exeId}") |
|
|
|
|
* @Route("/score-attempt/{exeId}/jury/{juryId}") |
|
|
|
|
* @Method({"GET"}) |
|
|
|
|
*/ |
|
|
|
|
public function scoreUserAction($exeId) |
|
|
|
|
public function scoreAttemptAction($exeId, $juryId) |
|
|
|
|
{ |
|
|
|
|
$userId = $this->getUser()->getUserId(); |
|
|
|
|
$trackExercise = \ExerciseLib::get_exercise_track_exercise_info($exeId); |
|
|
|
|
|
|
|
|
|
if (empty($trackExercise)) { |
|
|
|
|
$this->createNotFoundException(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** @var \Entity\Jury $jury */ |
|
|
|
|
$jury = $this->getRepository()->find($juryId); |
|
|
|
|
|
|
|
|
|
if (empty($jury)) { |
|
|
|
|
$this->createNotFoundException('Jury does not exists'); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ($jury->getExerciseId() != $trackExercise['exe_exo_id']) { |
|
|
|
|
$this->createNotFoundException('Exercise attempt is not related with this jury.'); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$members = $jury->getMembers(); |
|
|
|
|
|
|
|
|
|
$criteria = Criteria::create() |
|
|
|
|
->where(Criteria::expr()->eq("userId", $userId)) |
|
|
|
|
->setFirstResult(0) |
|
|
|
|
->setMaxResults(1); |
|
|
|
|
/** @var Entity\JuryMembers $member */ |
|
|
|
|
$member = $members->matching($criteria)->first(); |
|
|
|
|
|
|
|
|
|
if (empty($member)) { |
|
|
|
|
$this->createNotFoundException('You are not part of the jury.'); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$students = $member->getStudents(); |
|
|
|
|
|
|
|
|
|
$criteria = Criteria::create() |
|
|
|
|
->where(Criteria::expr()->eq("userId", $trackExercise['exe_user_id'])) |
|
|
|
|
->setFirstResult(0) |
|
|
|
|
->setMaxResults(1); |
|
|
|
|
/** @var Entity\JuryMembers $member */ |
|
|
|
|
$student = $students->matching($criteria)->first(); |
|
|
|
|
|
|
|
|
|
if (empty($student)) { |
|
|
|
|
$this->createNotFoundException('You are not assigned to this user.'); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$security = $this->get('security'); |
|
|
|
|
|
|
|
|
|
// Setting member only for president. |
|
|
|
|
if ($security->isGranted('ROLE_JURY_PRESIDENT')) { |
|
|
|
|
// Relating user with president |
|
|
|
|
if ($member) { |
|
|
|
|
$this->getManager()->getRepository('Entity\JuryMembers')->assignUserToJuryMember( |
|
|
|
|
$trackExercise['exe_user_id'], |
|
|
|
|
$member->getId() |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$questionScoreTypeModel = array(); |
|
|
|
|
|
|
|
|
|
$criteria = array( |
|
|
|
|
'exeId' => $exeId, |
|
|
|
|
'juryUserId' => $userId |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$trackJury = $this->getManager()->getRepository('Entity\TrackExerciseAttemptJury')->findBy($criteria); |
|
|
|
|
|
|
|
|
|
if ($trackJury) { |
|
|
|
|
$this->get('session')->getFlashBag()->add('info', "You already review this exercise attempt."); |
|
|
|
|
/** @var Entity\TrackExerciseAttemptJury $track */ |
|
|
|
|
foreach ($trackJury as $track) { |
|
|
|
|
$questionScoreTypeModel[$track->getQuestionId()] = $track->getQuestionScoreNameId(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$questionList = explode(',', $trackExercise['data_tracking']); |
|
|
|
|
$exerciseResult = \ExerciseLib::getExerciseResult($trackExercise); |
|
|
|
|
$counter = 1; |
|
|
|
|
|
|
|
|
|
$objExercise = new \Exercise(); |
|
|
|
|
$objExercise = new \Exercise($trackExercise['c_id']); |
|
|
|
|
$objExercise->read($trackExercise['exe_exo_id']); |
|
|
|
|
$show_results = true; |
|
|
|
|
|
|
|
|
|
$totalScore = $totalWeighting = 0; |
|
|
|
|
|
|
|
|
|
$show_media = true; |
|
|
|
|
|
|
|
|
|
$tempParentId = null; |
|
|
|
|
$mediaCounter = 0; |
|
|
|
|
$media_list = array(); |
|
|
|
|
|
|
|
|
|
$modelType = $objExercise->getScoreTypeModel(); |
|
|
|
|
|
|
|
|
|
$options = array(); |
|
|
|
|
|
|
|
|
|
if ($modelType) { |
|
|
|
|
/** @var \Entity\QuestionScore $questionScoreName */ |
|
|
|
|
$questionScore = $this->get('orm.em')->getRepository('Entity\QuestionScore')->find($modelType); |
|
|
|
|
if ($questionScore) { |
|
|
|
|
$items = $questionScore->getItems(); |
|
|
|
|
/** @var \Entity\QuestionScoreName $score */ |
|
|
|
|
foreach ($items as $score) { |
|
|
|
|
$options[$score->getId().':'.$score->getScore()] = $score; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
return $this->createNotFoundException('The exercise does not contain a model type.'); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$exerciseContent = null; |
|
|
|
|
|
|
|
|
|
foreach ($questionList as $questionId) { |
|
|
|
|
ob_start(); |
|
|
|
|
$choice = $exerciseResult[$questionId]; |
|
|
|
|
$choice = isset($exerciseResult[$questionId]) ? $exerciseResult[$questionId] : null; |
|
|
|
|
|
|
|
|
|
// Creates a temporary Question object |
|
|
|
|
/** @var \Question $objQuestionTmp */ |
|
|
|
|
$objQuestionTmp = \Question::read($questionId); |
|
|
|
|
|
|
|
|
|
if ($objQuestionTmp->parent_id != 0) { |
|
|
|
|
@ -94,7 +248,17 @@ class JuryMemberController extends CommonController |
|
|
|
|
$questionWeighting = $objQuestionTmp->selectWeighting(); |
|
|
|
|
$answerType = $objQuestionTmp->selectType(); |
|
|
|
|
|
|
|
|
|
$question_result = $objExercise->manageAnswers($exeId, $questionId, $choice,'exercise_show', array(), false, true, $show_results); |
|
|
|
|
$question_result = $objExercise->manageAnswers( |
|
|
|
|
$exeId, |
|
|
|
|
$questionId, |
|
|
|
|
$choice, |
|
|
|
|
'exercise_show', |
|
|
|
|
array(), |
|
|
|
|
false, |
|
|
|
|
true, |
|
|
|
|
true |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$questionScore = $question_result['score']; |
|
|
|
|
$totalScore += $question_result['score']; |
|
|
|
|
|
|
|
|
|
@ -103,23 +267,42 @@ class JuryMemberController extends CommonController |
|
|
|
|
$totalWeighting += $questionWeighting; |
|
|
|
|
|
|
|
|
|
$score = array(); |
|
|
|
|
if ($show_results) { |
|
|
|
|
$score['result'] = get_lang('Score')." : ".\ExerciseLib::show_score($my_total_score, $my_total_weight, false, false); |
|
|
|
|
$score['pass'] = $my_total_score >= $my_total_weight ? true : false; |
|
|
|
|
$score['type'] = $answerType; |
|
|
|
|
$score['score'] = $my_total_score; |
|
|
|
|
$score['weight'] = $my_total_weight; |
|
|
|
|
$score['comments'] = isset($comnt) ? $comnt : null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$score['result'] = get_lang('Score')." : ".\ExerciseLib::show_score($my_total_score, $my_total_weight, false, false); |
|
|
|
|
$score['pass'] = $my_total_score >= $my_total_weight ? true : false; |
|
|
|
|
$score['type'] = $answerType; |
|
|
|
|
$score['score'] = $my_total_score; |
|
|
|
|
$score['weight'] = $my_total_weight; |
|
|
|
|
$score['comments'] = isset($comnt) ? $comnt : null; |
|
|
|
|
|
|
|
|
|
$contents = ob_get_clean(); |
|
|
|
|
$question_content = '<div class="question_row">'; |
|
|
|
|
$question_content .= $objQuestionTmp->return_header(null, $counter, $score, $show_media, $mediaCounter); |
|
|
|
|
$question_content .= $objQuestionTmp->return_header($objExercise->feedback_type, $counter, $score, $show_media, $mediaCounter); |
|
|
|
|
$question_content .= '</table>'; |
|
|
|
|
|
|
|
|
|
// display question category, if any |
|
|
|
|
$question_content .= \Testcategory::getCategoryNamesForQuestion($questionId); |
|
|
|
|
|
|
|
|
|
$question_content .= $contents; |
|
|
|
|
|
|
|
|
|
$defaultValue = isset($questionScoreTypeModel[$questionId]) ? $questionScoreTypeModel[$questionId] : null; |
|
|
|
|
|
|
|
|
|
//$question_content .= \Display::select('options['.$questionId.']', $options, $defaultValue); |
|
|
|
|
foreach ($options as $value => $score) { |
|
|
|
|
$attributes = array(); |
|
|
|
|
if ($score->getId() == $defaultValue) { |
|
|
|
|
$attributes = array('checked' => 'checked'); |
|
|
|
|
} |
|
|
|
|
$question_content .= '<label>'; |
|
|
|
|
$question_content .= \Display::input( |
|
|
|
|
'radio', |
|
|
|
|
'options['.$questionId.']', |
|
|
|
|
$value, |
|
|
|
|
$attributes |
|
|
|
|
) |
|
|
|
|
.' <span title="'.$score->getDescription().'" data-toggle="tooltip" > '.$score->getName().' </span>'; |
|
|
|
|
|
|
|
|
|
$question_content .= '</label>'; |
|
|
|
|
} |
|
|
|
|
$question_content .= '</div>'; |
|
|
|
|
$exerciseContent .= $question_content; |
|
|
|
|
|
|
|
|
|
@ -127,19 +310,72 @@ class JuryMemberController extends CommonController |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$template = $this->get('template'); |
|
|
|
|
|
|
|
|
|
$template->assign('exercise', $exerciseContent); |
|
|
|
|
|
|
|
|
|
$response = $this->get('template')->render_template($this->getTemplatePath().'score_user.tpl'); |
|
|
|
|
$template->assign('exe_id', $exeId); |
|
|
|
|
$template->assign('jury_id', $juryId); |
|
|
|
|
$response = $this->get('template')->render_template($this->getTemplatePath().'score_attempt.tpl'); |
|
|
|
|
return new Response($response, 200, array()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @Route("/save-score") |
|
|
|
|
* @Route("/save-score/{exeId}/jury/{juryId}") |
|
|
|
|
* @Method({"POST"}) |
|
|
|
|
*/ |
|
|
|
|
public function saveScoreAction() |
|
|
|
|
public function saveScoreAction($exeId, $juryId) |
|
|
|
|
{ |
|
|
|
|
$questionsAndScore = $this->getRequest()->get('options'); |
|
|
|
|
/** @var \Entity\TrackExercise $attempt */ |
|
|
|
|
$attempt = $this->getManager()->getRepository('Entity\TrackExercise')->find($exeId); |
|
|
|
|
|
|
|
|
|
$totalScore = 0; |
|
|
|
|
|
|
|
|
|
if ($attempt) { |
|
|
|
|
$userId = $this->getUser()->getUserId(); |
|
|
|
|
$em = $this->getManager(); |
|
|
|
|
|
|
|
|
|
if (!empty($questionsAndScore)) { |
|
|
|
|
foreach ($questionsAndScore as $questionId => $scoreInfo) { |
|
|
|
|
$scoreInfo = explode(':', $scoreInfo); |
|
|
|
|
$questionScoreNameId = $scoreInfo[0]; |
|
|
|
|
$score = $scoreInfo[1]; |
|
|
|
|
|
|
|
|
|
$criteria = array( |
|
|
|
|
'exeId' => $exeId, |
|
|
|
|
'questionId' => $questionId, |
|
|
|
|
'juryUserId' => $userId |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$totalScore += $score; |
|
|
|
|
|
|
|
|
|
$obj = $this->getManager()->getRepository('Entity\TrackExerciseAttemptJury')->findOneBy($criteria); |
|
|
|
|
if ($obj) { |
|
|
|
|
$obj->setQuestionScoreNameId($questionScoreNameId); |
|
|
|
|
$obj->setScore($score); |
|
|
|
|
} else { |
|
|
|
|
$obj = new Entity\TrackExerciseAttemptJury(); |
|
|
|
|
$obj->setJuryUserId($userId); |
|
|
|
|
$obj->setAttempt($attempt); |
|
|
|
|
$obj->setQuestionScoreNameId($questionScoreNameId); |
|
|
|
|
$obj->setScore($score); |
|
|
|
|
$obj->setQuestionId($questionId); |
|
|
|
|
} |
|
|
|
|
$em->persist($obj); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Updating TrackExercise do not |
|
|
|
|
$attempt->setJuryId($juryId); |
|
|
|
|
//$attempt->setJuryScore($totalScore); |
|
|
|
|
$em->persist($attempt); |
|
|
|
|
$em->flush(); |
|
|
|
|
|
|
|
|
|
$this->get('session')->getFlashBag()->add('success', "Saved"); |
|
|
|
|
//$url = $this->generateUrl('jury_member.controller:scoreAttemptAction', array('exeId' => $exeId, 'juryId' => $juryId)); |
|
|
|
|
$url = $this->generateUrl('jury_member.controller:listUsersAction'); |
|
|
|
|
return $this->redirect($url); |
|
|
|
|
} else { |
|
|
|
|
return $this->createNotFoundException('Attempt not found'); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -157,7 +393,7 @@ class JuryMemberController extends CommonController |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @return \Entity\Repository\BranchSyncRepository |
|
|
|
|
* @return \Entity\Repository\JuryRepository |
|
|
|
|
*/ |
|
|
|
|
protected function getRepository() |
|
|
|
|
{ |
|
|
|
|
|
Julio Montoya
12 years ago