diff options
| author | Aurélien Warnon <awa@odoo.com> | 2019-02-28 14:45:15 +0000 |
|---|---|---|
| committer | Aurélien Warnon <awa@odoo.com> | 2019-03-11 10:46:11 +0000 |
| commit | 7070fa32190124b1ca06b6aa3d857ca2ae148d62 (patch) | |
| tree | 6c9129fcb72d3b393e78c22daebd6e62f8d650cb | |
| parent | db53057528cd0c0c1a7794b2e57b0e355d4e58ec (diff) | |
[IMP] survey: rename 'Survey' to 'Certification' when relevant
Purpose
=======
This commit reworks some views to rename 'Survey' to 'Certification'
for a better visual integration of the new certification flow.
4 files changed, 20 insertions, 7 deletions
diff --git a/addons/survey/data/mail_template_data.xml b/addons/survey/data/mail_template_data.xml index de05a6a22d9..222d1fbae11 100644 --- a/addons/survey/data/mail_template_data.xml +++ b/addons/survey/data/mail_template_data.xml @@ -9,11 +9,19 @@ <div style="margin: 0px; padding: 0px; font-size: 13px;"> <p style="margin: 0px; padding: 0px; font-size: 13px;"> Dear ${object.partner_id.name or 'participant'}<br/><br/> - We are conducting a survey and your response would be appreciated. + % if object.survey_id.certificate: + You have been invited to take a new certification. + % else: + We are conducting a survey and your response would be appreciated. + % endif <div style="margin: 16px 0px 16px 0px;"> <a href="${('%s?answer_token=%s' % (object.survey_id.public_url, object.token)) | safe}" style="background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;"> - Start Survey + % if object.survey_id.certificate: + Start Certification + % else: + Start Survey + % endif </a> </div> % if object.deadline: diff --git a/addons/survey/static/src/js/tour_test_certification_failure.js b/addons/survey/static/src/js/tour_test_certification_failure.js index 395e6b23990..baebb64864d 100644 --- a/addons/survey/static/src/js/tour_test_certification_failure.js +++ b/addons/survey/static/src/js/tour_test_certification_failure.js @@ -9,8 +9,8 @@ odoo.define('survey.tour_test_certification_failure', function (require) { var tour = require('web_tour.tour'); var failSteps = [{ // Page-1 - content: "Clicking on Start Survey", - trigger: 'a.btn.btn-primary.btn-lg:contains("Start Survey")', + content: "Clicking on Start Certification", + trigger: 'a.btn.btn-primary.btn-lg:contains("Start Certification")', }, { // Question: Do we sell Acoustic Bloc Screens? content: "Selecting answer 'No'", trigger: 'div.js_question-wrapper:contains("Do we sell Acoustic Bloc Screens") select', diff --git a/addons/survey/static/src/js/tour_test_certification_success.js b/addons/survey/static/src/js/tour_test_certification_success.js index 9d0d7d4ec33..39108e1b7a4 100644 --- a/addons/survey/static/src/js/tour_test_certification_success.js +++ b/addons/survey/static/src/js/tour_test_certification_success.js @@ -8,8 +8,8 @@ tour.register('test_certification_success', { url: '/survey/start/4ead4bc8-b8f2-4760-a682-1fde8ddb95ac' }, [{ // Page-1 - content: "Clicking on Start Survey", - trigger: 'a.btn.btn-primary.btn-lg:contains("Start Survey")', + content: "Clicking on Start Certification", + trigger: 'a.btn.btn-primary.btn-lg:contains("Start Certification")', }, { // Question: Do we sell Acoustic Bloc Screens? content: "Selecting answer 'Yes'", trigger: 'div.js_question-wrapper:contains("Do we sell Acoustic Bloc Screens") select', diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml index e5f13cf766f..cbef0daac68 100644 --- a/addons/survey/views/survey_templates.xml +++ b/addons/survey/views/survey_templates.xml @@ -178,7 +178,12 @@ </p> </div> <a role="button" class="btn btn-primary btn-lg" t-att-href="'/survey/fill/%s/%s' % (survey.access_token, answer.token)"> - Start Survey + <t t-if="survey.certificate"> + Start Certification + </t> + <t t-else=""> + Start Survey + </t> </a> </div> </div> |