From d6458e68df909898818ed3699c49f917ee3b561f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Warnon?= <awa@odoo.com>
Date: Thu, 28 Nov 2019 09:32:28 +0000
Subject: [PATCH] [IMP] survey: allow to link a user answer to its user input
email field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
PURPOSE
Allow some questions to be linked to customer data. We would like to have an
email field filled with user info / updating user info automatically in the survey.
SPECIFICATION
For now, we only want to be able to collect the user email address for a specific
question of the survey. For that purpose, add a ``save_as_email`` field on the
question model.
If this option is checked, the answer to that specific question will override the
"email" stored on the survey.user_input allowing live udpate of user input
based on given information. If multiple questions are marked as such, the
last (not empty) answer will prevail.
If user input already has an email (invitation-based surveys for example)
prefill the answer with the email so that people don't have to retype it.
GOING FURTHER (aka, incoming)
With live mode: maybe some additional fields will need to be saved
nickname
avatar
LINKS
Task 1919290
PR #41429
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Co-authored-by: Aurélien Warnon <awa@odoo.com>
Co-authored-by: Thibault Delavallée <tde@odoo.com>
---
addons/survey/models/survey_question.py | 10 ++++++++++
addons/survey/models/survey_survey.py | 11 ++++++++---
addons/survey/models/survey_user.py | 6 ++++--
addons/survey/views/survey_question_views.xml | 4 +++-
4 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/addons/survey/models/survey_question.py b/addons/survey/models/survey_question.py
index 81e3a14238ce..486c3d2d95d0 100644
--- a/addons/survey/models/survey_question.py
+++ b/addons/survey/models/survey_question.py
@@ -78,6 +78,10 @@ class SurveyQuestion(models.Model):
('simple_choice', 'Multiple choice: only one answer'),
('multiple_choice', 'Multiple choice: multiple answers allowed'),
('matrix', 'Matrix')], string='Question Type')
+ # -- char_box
+ save_as_email = fields.Boolean(
+ "Save as user email", compute='_compute_save_as_email', readonly=False, store=True,
+ help="If checked, this option will save the user's answer as its email address.")
# -- simple choice / multiple choice / matrix
suggested_answer_ids = fields.One2many(
'survey.question.answer', 'question_id', string='Types of answers', copy=True,
@@ -171,6 +175,12 @@ class SurveyQuestion(models.Model):
None
)
+ @api.depends('question_type', 'validation_email')
+ def _compute_save_as_email(self):
+ for question in self:
+ if question.question_type != 'char_box' or not question.validation_email:
+ question.save_as_email = False
+
# Validation methods
def validate_question(self, answer, comment=None):
""" Validate question, depending on question type and parameters
diff --git a/addons/survey/models/survey_survey.py b/addons/survey/models/survey_survey.py
index a321b1853bae..33dcb38d1fa5 100644
--- a/addons/survey/models/survey_survey.py
+++ b/addons/survey/models/survey_survey.py
@@ -225,7 +225,7 @@ class Survey(models.Model):
self.check_access_rights('read')
self.check_access_rule('read')
- answers = self.env['survey.user_input']
+ user_inputs = self.env['survey.user_input']
for survey in self:
if partner and not user and partner.user_ids:
user = partner.user_ids[0]
@@ -254,9 +254,14 @@ class Survey(models.Model):
answer_vals['invite_token'] = self.env['survey.user_input']._generate_invite_token()
answer_vals.update(additional_vals)
- answers += answers.create(answer_vals)
+ user_inputs += user_inputs.create(answer_vals)
- return answers
+ for question in self.mapped('question_ids').filtered(lambda q: q.question_type == 'char_box' and q.save_as_email):
+ for user_input in user_inputs:
+ if user_input.email:
+ user_input.save_lines(question, user_input.email)
+
+ return user_inputs
def _check_answer_creation(self, user, partner, email, test_entry=False, check_attempts=True, invite_token=False):
""" Ensure conditions to create new tokens are met. """
diff --git a/addons/survey/models/survey_user.py b/addons/survey/models/survey_user.py
index cea87343a897..a41181386668 100644
--- a/addons/survey/models/survey_user.py
+++ b/addons/survey/models/survey_user.py
@@ -7,7 +7,7 @@ import uuid
from dateutil.relativedelta import relativedelta
from odoo import api, fields, models, _
-from odoo.exceptions import ValidationError, UserError
+from odoo.exceptions import ValidationError
_logger = logging.getLogger(__name__)
@@ -38,7 +38,7 @@ class SurveyUserInput(models.Model):
access_token = fields.Char('Identification token', default=lambda self: str(uuid.uuid4()), readonly=True, required=True, copy=False)
invite_token = fields.Char('Invite token', readonly=True, copy=False) # no unique constraint, as it identifies a pool of attempts
partner_id = fields.Many2one('res.partner', string='Partner', readonly=True)
- email = fields.Char('E-mail', readonly=True)
+ email = fields.Char('Email', readonly=True)
# questions / answers
user_input_line_ids = fields.One2many('survey.user_input.line', 'user_input_id', string='Answers', copy=True)
predefined_question_ids = fields.Many2many('survey.question', string='Predefined Questions', readonly=True)
@@ -199,6 +199,8 @@ class SurveyUserInput(models.Model):
if question.question_type in ['char_box', 'text_box', 'numerical_box', 'date', 'datetime']:
self._save_line_simple_answer(question, old_answers, answer)
+ if question.save_as_email and answer:
+ self.write({'email': answer})
elif question.question_type in ['simple_choice', 'multiple_choice']:
self._save_line_choice(question, old_answers, answer, comment)
elif question.question_type == 'matrix':
diff --git a/addons/survey/views/survey_question_views.xml b/addons/survey/views/survey_question_views.xml
index 780d94627917..77ee491f3e87 100644
--- a/addons/survey/views/survey_question_views.xml
+++ b/addons/survey/views/survey_question_views.xml
@@ -97,7 +97,9 @@
<notebook attrs="{'invisible': [('is_page', '=', True)]}">
<page string="Answers">
<field name="validation_email" attrs="{'invisible': [('question_type', '!=', 'char_box')]}"/>
- <label for="validation_email" attrs="{'invisible': [('question_type', '!=', 'char_box')]}"/>
+ <label for="validation_email" attrs="{'invisible': [('question_type', '!=', 'char_box')]}"/><br/>
+ <field name="save_as_email" attrs="{'invisible': ['|', ('question_type', '!=', 'char_box'), ('validation_email', '=', False)]}"/>
+ <label for="save_as_email" attrs="{'invisible': ['|', ('question_type', '!=', 'char_box'), ('validation_email', '=', False)]}"/>
<field name="page_id" invisible="1" required="0"/>
<field name="survey_id" invisible="1" readonly="1"/>
<field name="scoring_type" invisible="1"/>
--
GitLab