[smarcet] - #14011

* added thx u final step for user survey
* updated pot files

Author: smarcet

gettext/pot/survey_ui.pot

@@ -498,4 +498,21 @@ msgstr ""
 
 #: survey_builder/templates/Layout/UserSurveyPage_LandingPage.ss:48
 msgid "Continue Survey"
+msgstr ""
+
+#: survey_builder/templates/Layout/UserSurveyPage_ThankYou.ss:6
+msgid ""
+      "Thank you for your submission. The OpenStack User Survey is open all year. As your "
+      "cloud grows, visit <a href=\"%1$s\">%1$s</a> to update your deployment profile or update your existing "
+      "survey."
+msgstr ""
+
+#: survey_builder/templates/Layout/UserSurveyPage_ThankYou.ss:11
+msgid ""
+      "If you'd like to review the results of the survey to see how other deployments stack "
+      "up, check out our <a href=\"%1$s\">Survey Analytics page</a>."
+msgstr ""
+
+#: survey_builder/templates/Layout/UserSurveyPage_ThankYou.ss:18
+msgid "Back to Home"
 msgstr ""

gettext/readme.md

@@ -33,4 +33,9 @@ download po files from zanata server
 
 ```
 sake dev/tasks/ZanataServerPOFilesDownloaderTask
-```
+```
+
+# Workflow
+
+once that a .pot file is updated, should be uploaded to zanata
+for new translations

survey_builder/code/ui/frontend/SurveyPage.php

@@ -85,6 +85,7 @@ public function setMemberManager(IMemberManager $manager)
         'AddEntity',
         'EditEntity',
         'DeleteEntity',
+        'RenderSurveyEnd',
     ];
 
     static $url_handlers = [
@@ -97,6 +98,7 @@ public function setMemberManager(IMemberManager $manager)
         'GET  SurveyStepForm' => 'SurveyStepForm',
         'POST SurveyDynamicEntityStepForm' => 'SurveyDynamicEntityStepForm',
         'GET  SurveyDynamicEntityStepForm' => 'SurveyDynamicEntityStepForm',
+        'GET thank-you-end' => 'RenderSurveyEnd',
         'GET  $STEP_SLUG' => 'RenderSurvey',
         'POST $Action//$ID/$OtherID' => 'handleAction',
     ];
@@ -322,9 +324,9 @@ public function RenderSurvey(SS_HTTPRequest $request)
                 $this->survey_manager->sendFinalStepEmail(new SurveyThankYouEmailSenderService, $current_survey);
             }
 
-            return $this->customise(array(
+            return $this->customise([
                 'Survey' => $current_survey,
-            ))->renderWith(array('Surveys_CurrentSurveyContainer', 'SurveyPage'));
+            ])->renderWith(['Surveys_CurrentSurveyContainer', 'SurveyPage']);
         }
         catch(NotFoundEntityException $ex1){
             SS_Log::log($ex1, SS_Log::WARN);
@@ -336,6 +338,15 @@ public function RenderSurvey(SS_HTTPRequest $request)
         }
     }
 
+    public function RenderSurveyEnd(SS_HTTPRequest $request){
+        $current_survey = $this->getCurrentSurveyInstance();
+
+        return $this->customise([
+            'Survey' => $current_survey,
+            'SurveyReportPage' => SurveyReportPage::getLive()
+        ])->renderWith(['UserSurveyPage_ThankYou', 'SurveyPage']);
+    }
+
     /**
      * @param $step_name
      * @return string
@@ -498,7 +509,8 @@ public function NextStep($data, $form)
                 $this->survey_manager->sendFinalStepEmail(new SurveyThankYouEmailSenderService, $current_survey);
 
             $this->survey_manager->completeSurvey($current_step);
-            $form->sessionMessage(GetTextTemplateHelpers::_t("survey_ui", "Thank you for your submission !!!"), 'good');
+
+            return $this->redirect($this->Link().'thank-you-end');
         }
         SS_Log::log(sprintf("end current step %s", $current_survey->currentStep()->Template()->Name), SS_Log::DEBUG);
         return $this->redirect($this->Link().$next_step->template()->title());

survey_builder/code/ui/frontend/SurveyReportPage.php

@@ -17,11 +17,18 @@
  */
 class SurveyReportPage extends Page
 {
-    static $db = array(
-    );
-
-    static $has_one = array();
+    static $db = [];
+    static $has_one  = [];
 
+    /**
+     * @return SurveyReportPage
+     */
+    static public function getLive(){
+        $page = Versioned::get_by_stage('SurveyReportPage', 'Live')->first();
+        if(is_null($page))
+            $page = Versioned::get_by_stage('SurveyReportPage', 'Stage')->first();
+        return $page;
+    }
 }
 
 class SurveyReportPage_Controller extends Page_Controller

survey_builder/css/user-survey.css

@@ -1112,3 +1112,13 @@ div.field.checkbox input {
 #language-selector{
     padding: 10px;
 }
+
+.back-home-button, .back-home-button:visited
+{
+    color: white;
+}
+
+.container-thx-u-end{
+    padding-top: 15px;
+    padding-bottom: 15px;
+}

survey_builder/templates/Layout/UserSurveyPage_ThankYou.ss

@@ -0,0 +1,22 @@
+<h1 class="survey-subtitle">$_T("survey_template", $Survey.Template.Title)</h1>
+<div class="container container-thx-u-end">
+    <div class="row">
+        <div class="col-md-12 col-lg-12">
+            <p class="thx-u-end-txt">
+                $_T("survey_ui", "Thank you for your submission. The OpenStack User Survey is open all year. As your
+                cloud grows, visit <a href=\"%1$s\">%1$s</a> to update your deployment profile or update your existing
+                survey.", $Link)
+            </p>
+            <p class="thx-u-end-txt">
+                $_T("survey_ui", "If you'd like to review the results of the survey to see how other deployments stack
+                up, check out our <a href=\"%1$s\">Survey Analytics page</a>.", $SurveyReportPage.Link)
+            </p>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12 col-lg-12">
+            <a class="btn btn-primary back-home-button" href="{$Link}landing"> $_T("survey_ui", "Back to Home")</a>
+        </div>
+    </div>
+</div>
+