Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Dev: fixed #14226 second part (#1192)
Dev: move to use extends "./subviews/content/submit.twig" Dev: add a lot of block to allow updating Dev: do the job 2 times : one in SurveyRunTime : didn't broke current extended template Dev: 2 times too for automatic translation Dev: add information about url (print and stats) and disable url
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1085,7 +1085,9 @@ private function setNotAnsweredAndNotValidated() | |
| private function moveSubmitIfNeeded() | ||
| { | ||
| if ($this->sMove == "movesubmit") { | ||
| /* Put active in var for next part */ | ||
| $surveyActive = ($this->aSurveyInfo['active'] == "Y"); | ||
| $oSurvey = Survey::model()->findByPk($this->iSurveyid); | ||
| // Parts needed for active and unactive | ||
| //Check for assessments | ||
| $this->aSurveyInfo['aAssessments']['show'] = false; | ||
|
|
@@ -1102,77 +1104,55 @@ private function moveSubmitIfNeeded() | |
| $this->aSurveyInfo['aCompleted']['sEndText'] = $this->processString($this->aSurveyInfo['surveyls_endtext'], 2); | ||
| } | ||
|
|
||
| //Update the token if needed and send a confirmation email | ||
| if ($surveyActive && $oSurvey->getHasTokensTable()) { | ||
| submittokens(); | ||
| } | ||
| //Send notifications | ||
| if($surveyActive) { | ||
| sendSubmitNotifications($this->iSurveyid); | ||
| } | ||
| // Link to Print Answer Preview ********** | ||
| $this->aSurveyInfo['aCompleted']['aPrintAnswers']['show'] = false; | ||
| if ($this->aSurveyInfo['printanswers'] == 'Y') { | ||
| $this->aSurveyInfo['aCompleted']['aPrintAnswers']['show'] = true; | ||
| $this->aSurveyInfo['aCompleted']['aPrintAnswers']['sUrl'] = $surveyActive ? Yii::app()->getController()->createUrl("/printanswers/view", array('surveyid'=>$this->iSurveyid)) : "#"; | ||
| $this->aSurveyInfo['aCompleted']['aPrintAnswers']['sText'] = $surveyActive ? gT("Print your answers.") : gT("Print your answers is disable when survey not activated."); | ||
| } | ||
| // Link to Public statistics | ||
| $this->aSurveyInfo['aCompleted']['aPublicStatistics']['show'] = false; | ||
| if ($this->aSurveyInfo['publicstatistics'] == 'Y') { | ||
| $this->aSurveyInfo['aCompleted']['aPublicStatistics']['show'] = true; | ||
| $this->aSurveyInfo['aCompleted']['aPublicStatistics']['sUrl'] = $surveyActive ? Yii::app()->getController()->createUrl("/statistics_user/action/", array('surveyid'=>$this->iSurveyid, 'language'=>App()->getLanguage())) : "#"; | ||
| $this->aSurveyInfo['aCompleted']['aPublicStatistics']['sText'] = $surveyActive ? gT("View the statistics for this survey.") : gT("View the statistics for this survey is disable when survey not activated."); | ||
| } | ||
|
|
||
| $this->completed = true; | ||
|
|
||
| $_SESSION[$this->LEMsessid]['finished'] = true; | ||
| $_SESSION[$this->LEMsessid]['sid'] = $this->iSurveyid; | ||
|
|
||
| // cookies | ||
| if($surveyActive && $this->aSurveyInfo['usecookie'] == "Y") { | ||
| if(!$oSurvey->getHasTokensTable()) { | ||
| setcookie("LS_".$this->iSurveyid."_STATUS", "COMPLETE", time() + 31536000); //Cookie will expire in 365 days | ||
| } | ||
| } | ||
|
|
||
| $redata['completed'] = $this->completed; | ||
| // event afterSurveyComplete | ||
| $blocks = array(); | ||
| if($surveyActive) { // @todo : enable event even when survey is not active, but broke API | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
Shnoulle
Author
Collaborator
|
||
| $event = new PluginEvent('afterSurveyComplete'); | ||
| if ($surveyActive && isset($_SESSION[$this->LEMsessid]['srid'])) { | ||
| $event->set('responseId', $_SESSION[$this->LEMsessid]['srid']); | ||
| } | ||
| $event->set('surveyId', $this->iSurveyid); | ||
| App()->getPluginManager()->dispatchEvent($event); | ||
| foreach ($event->getAllContent() as $blockData) { | ||
| /* @var $blockData PluginEventContent */ | ||
| $blocks[] = CHtml::tag('div', array('id' => $blockData->getCssId(), 'class' => $blockData->getCssClass()), $blockData->getContent()); | ||
| } | ||
| } | ||
|
|
||
| $this->aSurveyInfo['aCompleted']['sPluginHTML'] = implode("\n", $blocks)."\n"; | ||
|
|
@@ -1182,29 +1162,12 @@ private function moveSubmitIfNeeded() | |
| $this->aSurveyInfo['surveyls_url'] = templatereplace($this->aSurveyInfo['surveyls_url'], array(), $redata, 'URLReplace', false, null, array(), true); // to do INSERTANS substitutions | ||
| $this->aSurveyInfo['aCompleted']['sSurveylsUrl'] = $this->aSurveyInfo['surveyls_url']; | ||
|
|
||
| $this->aSurveyInfo['aCompleted']['sSurveylsUrlDescription'] = $this->aSurveyInfo['surveyls_urldescription']; | ||
| if ($this->aSurveyInfo['aCompleted']['sSurveylsUrlDescription'] == "") { | ||
| $this->aSurveyInfo['aCompleted']['sSurveylsUrlDescription'] = $this->aSurveyInfo['surveyls_url']; | ||
| } | ||
|
|
||
| // LEM debug (???? what is this usage …) | ||
| $this->aSurveyInfo['aLEM']['debugvalidation']['show'] = false; | ||
| if (($this->LEMdebugLevel & LEM_DEBUG_VALIDATION_SUMMARY) == LEM_DEBUG_VALIDATION_SUMMARY) { | ||
| $this->aSurveyInfo['aLEM']['debugvalidation']['show'] = true; | ||
|
|
@@ -1221,13 +1184,31 @@ private function moveSubmitIfNeeded() | |
| $this->aSurveyInfo['aLEM']['debugvalidation']['message'] .= "<table><tr><td align='left'><b>Group/Question Validation Results:</b>".$this->aMoveResult['message']."</td></tr></table>\n"; | ||
| } | ||
|
|
||
| // kill survey session before redirecting | ||
| if ($this->aSurveyInfo['printanswers'] != 'Y') { | ||
| killSurveySession($this->iSurveyid); | ||
| } | ||
|
|
||
| if (isset($this->aSurveyInfo['autoredirect']) && $this->aSurveyInfo['autoredirect'] == "Y" && $this->aSurveyInfo['surveyls_url']) { | ||
| //Automatically redirect the page to the "url" setting for the survey | ||
| $headToSurveyUrl = htmlspecialchars_decode ($this->aSurveyInfo['surveyls_url']); | ||
| $actualRedirect = $headToSurveyUrl; | ||
| if($surveyActive) { | ||
| header("Access-Control-Allow-Origin: *"); | ||
| if(Yii::app()->request->getParam('ajax') == 'on'){ | ||
| header("X-Redirect: ".$headToSurveyUrl, false, 302); | ||
| } else { | ||
| header("Location: ".$actualRedirect, false, 302); | ||
| } | ||
| } | ||
| $this->aSurveyInfo['aCompleted']['sSurveylsUrlDescriptionExta'] = gT("Automatically load URL when survey complete deactivated disable when survey is not activated."); | ||
| } | ||
|
|
||
| $this->aSurveyInfo['include_content'] = 'submit'; | ||
| if(!$surveyActive) { | ||
| $this->aSurveyInfo['include_content'] = 'submit_preview'; | ||
| } | ||
| Yii::app()->twigRenderer->renderTemplateFromFile("layout_global.twig", array('oSurvey'=> $oSurvey, 'aSurveyInfo'=>$this->aSurveyInfo), false); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Broke how?