From 68574f9b9fd7b0dc2b417d0fbc5211485c9e86df Mon Sep 17 00:00:00 2001 From: LouisGac Date: Thu, 23 Feb 2017 15:59:38 +0100 Subject: [PATCH] Dev: moved doAssessment to the right place --- application/helpers/SurveyRuntimeHelper.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php index 53cd3c419d1..422e500e500 100644 --- a/application/helpers/SurveyRuntimeHelper.php +++ b/application/helpers/SurveyRuntimeHelper.php @@ -150,19 +150,9 @@ public function run($surveyid,$args) $_SESSION[$this->LEMsessid]['maxstep'] = 0; } - // TODO: remove those line, why a special condition when survey is not active VS when it's active and why HERE???? - if ($this->thissurvey['active'] != "Y"){ - // TODO: TWIG ASSESSMENTS !!!!! - if ($thissurvey['assessments'] == "Y"){ - $assessments = $this->assessments = doAssessment($thissurvey['sid']); - } - } - - $this->moveSubmitIfNeeded(); - extract($aPrivateVariables); // For redata // We really need to replace redata get_defined_vars by something else. @@ -1260,7 +1250,13 @@ private function moveSubmitIfNeeded() //Check for assessments - if ($thissurvey['assessments'] == "Y" && $this->assessments ){ + // TODO: TWIG ASSESSMENTS !!!!! + if ($thissurvey['assessments'] == "Y"){ + $assessments = $this->assessments = doAssessment($thissurvey['sid']); + } + + + if ($thissurvey['assessments'] == "Y" && $assessments ){ echo templatereplace(file_get_contents($sTemplateViewPath."assessment.pstpl"), array(), $redata, 'SubmitAssessmentI', false, NULL, array(), true ); }