From deb5a2c620e86b5fca90e75faeb15dc051abd21e Mon Sep 17 00:00:00 2001 From: "youstina.nabil" Date: Thu, 9 May 2024 12:35:52 +0300 Subject: [PATCH 1/3] [MIG] survey_question_type_nps: Migration to 17.0 --- survey_question_type_nps/README.rst | 76 ++++ survey_question_type_nps/__init__.py | 1 + survey_question_type_nps/__manifest__.py | 25 ++ survey_question_type_nps/i18n/it.po | 113 +++++ .../i18n/survey_question_type_nps.pot | 98 ++++ survey_question_type_nps/models/__init__.py | 2 + .../models/survey_question.py | 55 +++ .../models/survey_user_input_line.py | 59 +++ survey_question_type_nps/pyproject.toml | 3 + .../readme/CONTRIBUTORS.md | 1 + .../readme/DESCRIPTION.md | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 423 ++++++++++++++++++ .../static/src/js/survey.js | 37 ++ .../static/src/scss/parameters.scss | 3 + .../static/src/scss/survey.scss | 51 +++ .../templates/survey_template.xml | 116 +++++ survey_question_type_nps/tests/__init__.py | 1 + survey_question_type_nps/tests/test_survey.py | 110 +++++ .../views/survey_question.xml | 22 + 20 files changed, 1197 insertions(+) create mode 100644 survey_question_type_nps/README.rst create mode 100644 survey_question_type_nps/__init__.py create mode 100644 survey_question_type_nps/__manifest__.py create mode 100644 survey_question_type_nps/i18n/it.po create mode 100644 survey_question_type_nps/i18n/survey_question_type_nps.pot create mode 100644 survey_question_type_nps/models/__init__.py create mode 100644 survey_question_type_nps/models/survey_question.py create mode 100644 survey_question_type_nps/models/survey_user_input_line.py create mode 100644 survey_question_type_nps/pyproject.toml create mode 100644 survey_question_type_nps/readme/CONTRIBUTORS.md create mode 100644 survey_question_type_nps/readme/DESCRIPTION.md create mode 100644 survey_question_type_nps/static/description/icon.png create mode 100644 survey_question_type_nps/static/description/index.html create mode 100644 survey_question_type_nps/static/src/js/survey.js create mode 100644 survey_question_type_nps/static/src/scss/parameters.scss create mode 100644 survey_question_type_nps/static/src/scss/survey.scss create mode 100644 survey_question_type_nps/templates/survey_template.xml create mode 100644 survey_question_type_nps/tests/__init__.py create mode 100644 survey_question_type_nps/tests/test_survey.py create mode 100644 survey_question_type_nps/views/survey_question.xml diff --git a/survey_question_type_nps/README.rst b/survey_question_type_nps/README.rst new file mode 100644 index 00000000..5067cea3 --- /dev/null +++ b/survey_question_type_nps/README.rst @@ -0,0 +1,76 @@ +======================== +Survey nps question type +======================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:9621e797605aa10b2625d4eb6b4f97abe8d106691b6ac8709f7b6ff5376b91bd + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsurvey-lightgray.png?logo=github + :target: https://github.com/OCA/survey/tree/17.0/survey_question_type_nps + :alt: OCA/survey +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/survey-17-0/survey-17-0-survey_question_type_nps + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/survey&target_branch=17.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module add NPS rating question type for survey page + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* ACSONE SA/NV + +Contributors +------------ + +- Souheil Bejaoui + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/survey `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/survey_question_type_nps/__init__.py b/survey_question_type_nps/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/survey_question_type_nps/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/survey_question_type_nps/__manifest__.py b/survey_question_type_nps/__manifest__.py new file mode 100644 index 00000000..dc8ddfd7 --- /dev/null +++ b/survey_question_type_nps/__manifest__.py @@ -0,0 +1,25 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Survey nps question type", + "summary": """ + This module add nps rating as question type for survey page""", + "version": "17.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/survey", + "depends": ["survey"], + "data": [ + "views/survey_question.xml", + "templates/survey_template.xml", + ], + "assets": { + "survey.survey_assets": [ + "/survey_question_type_nps/static/src/js/survey.js", + "/survey_question_type_nps/static/src/scss/parameters.scss", + "/survey_question_type_nps/static/src/scss/survey.scss", + ], + }, + "demo": [], +} diff --git a/survey_question_type_nps/i18n/it.po b/survey_question_type_nps/i18n/it.po new file mode 100644 index 00000000..be9bb6c6 --- /dev/null +++ b/survey_question_type_nps/i18n/it.po @@ -0,0 +1,113 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * survey_question_type_nps +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-10-29 06:42+0000\n" +"Last-Translator: mymage \n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. module: survey_question_type_nps +#: model_terms:ir.ui.view,arch_db:survey_question_type_nps.nps_rate +msgid "10" +msgstr "10" + +#. module: survey_question_type_nps +#: model_terms:ir.ui.view,arch_db:survey_question_type_nps.survey_question_form +msgid "" +"\n" +" \n" +" \n" +" \n" +" " +msgstr "" +"\n" +" \n" +" \n" +" \n" +" " + +#. module: survey_question_type_nps +#: code:addons/survey_question_type_nps/models/survey_user_input_line.py:0 +#, python-format +msgid "Answer is not in the right range" +msgstr "La risposta non รจ nell'intervallo corretto" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question__display_name +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input__display_name +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line__display_name +msgid "Display Name" +msgstr "Nome visualizzato" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question__id +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input__id +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line__id +msgid "ID" +msgstr "ID" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question____last_update +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input____last_update +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line____last_update +msgid "Last Modified on" +msgstr "Ultima modifica il" + +#. module: survey_question_type_nps +#: model_terms:ir.ui.view,arch_db:survey_question_type_nps.avg_nps +msgid "NPS Average" +msgstr "Media NPS" + +#. module: survey_question_type_nps +#: model:ir.model.fields.selection,name:survey_question_type_nps.selection__survey_question__question_type__nps_rate +msgid "NPS Rating" +msgstr "Punteggio NPS" + +#. module: survey_question_type_nps +#: code:addons/survey_question_type_nps/models/survey_user_input_line.py:0 +#, python-format +msgid "NPS rate question must have numeric answer" +msgstr "La domanda valutazione NPS deve avere una risposta numerica" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question__question_type +msgid "Question Type" +msgstr "Tipo di domanda" + +#. module: survey_question_type_nps +#: model:ir.model,name:survey_question_type_nps.model_survey_question +msgid "Survey Question" +msgstr "Domanda sondaggio" + +#. module: survey_question_type_nps +#: model:ir.model,name:survey_question_type_nps.model_survey_user_input +msgid "Survey User Input" +msgstr "Risposta utente al sondaggio" + +#. module: survey_question_type_nps +#: model:ir.model,name:survey_question_type_nps.model_survey_user_input_line +msgid "Survey User Input Line" +msgstr "Riga risposta utente al sondaggio" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line__value_nps +msgid "Value Nps" +msgstr "Valorizza NPS" diff --git a/survey_question_type_nps/i18n/survey_question_type_nps.pot b/survey_question_type_nps/i18n/survey_question_type_nps.pot new file mode 100644 index 00000000..2687d8b8 --- /dev/null +++ b/survey_question_type_nps/i18n/survey_question_type_nps.pot @@ -0,0 +1,98 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * survey_question_type_nps +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: survey_question_type_nps +#: model_terms:ir.ui.view,arch_db:survey_question_type_nps.nps_rate +msgid "10" +msgstr "" + +#. module: survey_question_type_nps +#: model_terms:ir.ui.view,arch_db:survey_question_type_nps.survey_question_form +msgid "" +"\n" +" \n" +" \n" +" \n" +" " +msgstr "" + +#. module: survey_question_type_nps +#: code:addons/survey_question_type_nps/models/survey_user_input_line.py:0 +#: code:addons/survey_question_type_nps/models/survey_user_input_line.py:0 +#, python-format +msgid "Answer is not in the right range" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question__display_name +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input__display_name +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line__display_name +msgid "Display Name" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question__id +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input__id +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line__id +msgid "ID" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question____last_update +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input____last_update +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: survey_question_type_nps +#: model_terms:ir.ui.view,arch_db:survey_question_type_nps.avg_nps +msgid "NPS Average" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model.fields.selection,name:survey_question_type_nps.selection__survey_question__question_type__nps_rate +msgid "NPS Rating" +msgstr "" + +#. module: survey_question_type_nps +#: code:addons/survey_question_type_nps/models/survey_user_input_line.py:0 +#, python-format +msgid "NPS rate question must have numeric answer" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_question__question_type +msgid "Question Type" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model,name:survey_question_type_nps.model_survey_question +msgid "Survey Question" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model,name:survey_question_type_nps.model_survey_user_input +msgid "Survey User Input" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model,name:survey_question_type_nps.model_survey_user_input_line +msgid "Survey User Input Line" +msgstr "" + +#. module: survey_question_type_nps +#: model:ir.model.fields,field_description:survey_question_type_nps.field_survey_user_input_line__value_nps +msgid "Value Nps" +msgstr "" diff --git a/survey_question_type_nps/models/__init__.py b/survey_question_type_nps/models/__init__.py new file mode 100644 index 00000000..948dcfaf --- /dev/null +++ b/survey_question_type_nps/models/__init__.py @@ -0,0 +1,2 @@ +from . import survey_question +from . import survey_user_input_line diff --git a/survey_question_type_nps/models/survey_question.py b/survey_question_type_nps/models/survey_question.py new file mode 100644 index 00000000..cecb1296 --- /dev/null +++ b/survey_question_type_nps/models/survey_question.py @@ -0,0 +1,55 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +import collections + +from odoo import fields, models, tools + + +class SurveyQuestion(models.Model): + + _inherit = "survey.question" + + question_type = fields.Selection(selection_add=[("nps_rate", "NPS Rating")]) + + def _get_stats_summary_data(self, user_input_lines): + stats = super()._get_stats_summary_data(user_input_lines) + if self.question_type in ["nps_rate"]: + stats.update(self._get_stats_summary_data_numerical(user_input_lines)) + all_nps = user_input_lines.filtered(lambda line: not line.skipped).mapped("value_nps") + stats.update({ + "common_lines": + collections.Counter( + user_input_lines.filtered(lambda line: not line.skipped).mapped( + "value_numerical_box")).most_common(5), + "right_inputs_count": + len( + user_input_lines.filtered(lambda line: line.answer_is_correct).mapped( + "user_input_id")), + "average_nps": + round(sum(all_nps) / len(all_nps), 2) if all_nps else 0, + }) + return stats + + def validate_nps_rate(self, post, answer_tag): + self.ensure_one() + errors = {} + answer = post[answer_tag].strip() + # Empty answer to mandatory question + if self.constr_mandatory and not answer: + errors.update({answer_tag: self.constr_error_msg}) + # Checks if user input is a number + if answer: + try: + floatanswer = float(answer) + except ValueError: + errors.update({answer_tag: "This is not a number"}) + return errors + # Answer is not in the right range + with tools.ignore(Exception): + # 0 answer to mandatory question + if self.constr_mandatory: + if floatanswer == 0: + errors.update({answer_tag: self.constr_error_msg}) + if not (0 <= floatanswer <= 10): + errors.update({answer_tag: "Answer is not in the right range"}) + return errors diff --git a/survey_question_type_nps/models/survey_user_input_line.py b/survey_question_type_nps/models/survey_user_input_line.py new file mode 100644 index 00000000..0c8005c4 --- /dev/null +++ b/survey_question_type_nps/models/survey_user_input_line.py @@ -0,0 +1,59 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError + + +class SurveyUserInput(models.Model): + _inherit = "survey.user_input" + + def _save_lines(self, question, answer, comment=None, overwrite_existing=True): + old_answers = self.env["survey.user_input.line"].search([ + ("user_input_id", "=", self.id), + ("question_id", "=", question.id), + ]) + + if question.question_type in ["nps_rate"]: + return self._save_line_simple_answer(question, old_answers, answer) + return super()._save_lines( + question, + answer, + comment=comment, + overwrite_existing=overwrite_existing, + ) + + def _get_line_answer_values(self, question, answer, answer_type): + vals = super()._get_line_answer_values(question, answer, answer_type) + if answer_type == "nps_rate" and answer: + value = float(answer) + nps = 1 if value >= 9 else -1 if value <= 6 else 0 + vals.update({ + "value_numerical_box": float(answer), + "answer_type": "numerical_box", + "value_nps": nps, + }) + vals.pop("value_nps_rate") + return vals + + +class SurveyUserInputLine(models.Model): + + _inherit = "survey.user_input.line" + + value_nps = fields.Integer() + + @api.constrains("question_id", "answer_type", "value_numerical_box") + def _check_nps_rate_answer(self): + for rec in self: + if rec.question_id.question_type == "nps_rate": + if not rec.answer_type: + continue + if rec.answer_type != "numerical_box": + raise ValidationError( + _("NPS rate question must have numeric answer") + ) + if rec.question_id.constr_mandatory and not (0 < rec.value_numerical_box <= 10): + raise ValidationError(_("Answer is not in the right range")) + if not rec.question_id.constr_mandatory and not (0 <= rec.value_numerical_box <= 10): + raise ValidationError(_("Answer is not in the right range")) diff --git a/survey_question_type_nps/pyproject.toml b/survey_question_type_nps/pyproject.toml new file mode 100644 index 00000000..4231d0cc --- /dev/null +++ b/survey_question_type_nps/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/survey_question_type_nps/readme/CONTRIBUTORS.md b/survey_question_type_nps/readme/CONTRIBUTORS.md new file mode 100644 index 00000000..fc5fcbef --- /dev/null +++ b/survey_question_type_nps/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- Souheil Bejaoui \<\> diff --git a/survey_question_type_nps/readme/DESCRIPTION.md b/survey_question_type_nps/readme/DESCRIPTION.md new file mode 100644 index 00000000..dfae97be --- /dev/null +++ b/survey_question_type_nps/readme/DESCRIPTION.md @@ -0,0 +1 @@ +This module add NPS rating question type for survey page diff --git a/survey_question_type_nps/static/description/icon.png b/survey_question_type_nps/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/survey_question_type_nps/static/description/index.html b/survey_question_type_nps/static/description/index.html new file mode 100644 index 00000000..7a114761 --- /dev/null +++ b/survey_question_type_nps/static/description/index.html @@ -0,0 +1,423 @@ + + + + + +Survey nps question type + + + +
+

Survey nps question type

+ + +

Beta License: AGPL-3 OCA/survey Translate me on Weblate Try me on Runboat

+

This module add NPS rating question type for survey page

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ACSONE SA/NV
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/survey project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/survey_question_type_nps/static/src/js/survey.js b/survey_question_type_nps/static/src/js/survey.js new file mode 100644 index 00000000..d0dca6f8 --- /dev/null +++ b/survey_question_type_nps/static/src/js/survey.js @@ -0,0 +1,37 @@ +/* Copyright 2018 ACSONE SA/NV +License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).*/ +odoo.define("survey_question_type_nps", [], function () { + "use strict"; + + const survey_form = odoo.loader.modules.get("@survey/js/survey_form")[Symbol.for("default")]; + survey_form.include({ + events: $.extend({}, survey_form.prototype.events, { + "click .nps_rate > label": "_onClickNPSLabel", + }), + _onClickNPSLabel: function (event) { + if (this.readonly) { + return; + } + var target = event.target; + var label_items = $(target).parent().find("label"); + var value = label_items.length - $(target).index(); + label_items.removeClass("checked"); + $(target).addClass("checked"); + var $input = $(target).parent().find("input"); + $input.val(value); + // We will trigger the change in order to make it compatible with conditional. + // If it is not installed, it has no effects + $input.trigger("change"); + }, + _prepareSubmitValues: function (formData, params) { + this._super.apply(this, arguments); + this.$("[data-question-type]").each(function () { + switch ($(this).data("questionType")) { + case "nps_rate": + params[this.name] = this.value; + break; + } + }); + }, + }); +}); diff --git a/survey_question_type_nps/static/src/scss/parameters.scss b/survey_question_type_nps/static/src/scss/parameters.scss new file mode 100644 index 00000000..f6d4b105 --- /dev/null +++ b/survey_question_type_nps/static/src/scss/parameters.scss @@ -0,0 +1,3 @@ +/* survey.scss parameters */ +$nps-widget-background-color: #fff; +$nps-widget-color: #0a0a0a; diff --git a/survey_question_type_nps/static/src/scss/survey.scss b/survey_question_type_nps/static/src/scss/survey.scss new file mode 100644 index 00000000..465180ed --- /dev/null +++ b/survey_question_type_nps/static/src/scss/survey.scss @@ -0,0 +1,51 @@ +/* Copyright 2018 ACSONE SA/NV +License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ + +.nps_rate_widget { + margin-left: 10px; +} +.nps_rate_widget > input { + display: none; +} +.nps_rate_widget > label { + font: 20px Arial, sans-serif; + + width: 2em; + height: 2em; + box-sizing: initial; + + background: $nps-widget-background-color; + border: 0.15em solid $nps-widget-color; + color: $nps-widget-color; + text-align: center; + border-radius: 50%; + + line-height: 2em; + box-sizing: content-box; + + float: right; + cursor: pointer; + margin: 10px; + + @include media-breakpoint-down(md) { + font: 16px Arial, sans-serif; + + width: 1.5em; + height: 1.5em; + box-sizing: initial; + text-align: center; + border-radius: 50%; + + line-height: 1.5em; + box-sizing: content-box; + + float: right; + cursor: pointer; + margin: 3px; + } +} +.nps_rate > label:hover, +.nps_rate_widget .checked { + color: $nps-widget-background-color; + background: $nps-widget-color; +} diff --git a/survey_question_type_nps/templates/survey_template.xml b/survey_question_type_nps/templates/survey_template.xml new file mode 100644 index 00000000..248efc2a --- /dev/null +++ b/survey_question_type_nps/templates/survey_template.xml @@ -0,0 +1,116 @@ + + + + + + + + + + diff --git a/survey_question_type_nps/tests/__init__.py b/survey_question_type_nps/tests/__init__.py new file mode 100644 index 00000000..df7702e6 --- /dev/null +++ b/survey_question_type_nps/tests/__init__.py @@ -0,0 +1 @@ +from . import test_survey diff --git a/survey_question_type_nps/tests/test_survey.py b/survey_question_type_nps/tests/test_survey.py new file mode 100644 index 00000000..c657edb3 --- /dev/null +++ b/survey_question_type_nps/tests/test_survey.py @@ -0,0 +1,110 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.exceptions import ValidationError + +from odoo.addons.survey.tests import common + + +class TestSurvey(common.SurveyCase): + def setUp(self): + super().setUp() + user = self.env["res.users"].with_context(no_reset_password=True) + (group_survey_user, group_employee) = ( + self.ref("survey.group_survey_user"), + self.ref("base.group_user"), + ) + self.survey_manager = user.create( + { + "name": "Maria Riera", + "login": "Riera", + "email": "maria.riera@example.com", + "groups_id": [ + ( + 6, + 0, + [ + self.ref("survey.group_survey_manager"), + group_survey_user, + group_employee, + ], + ) + ], + } + ) + self.survey1 = ( + self.env["survey.survey"] + .with_user(self.survey_manager) + .create({"title": "S0", "page_ids": [(0, 0, {"title": "P0"})]}) + ) + self.page1 = ( + self.env["survey.question"] + .with_user(self.survey_manager) + .create( + { + "title": "First page", + "survey_id": self.survey1.id, + "sequence": 1, + "is_page": True, + } + ) + ) + self.user_input1 = ( + self.env["survey.user_input"] + .with_user(self.survey_manager) + .create( + { + "survey_id": self.survey1.id, + "partner_id": self.survey_manager.partner_id.id, + } + ) + ) + self.question1 = ( + self.env["survey.question"] + .with_user(self.survey_manager) + .create( + { + "title": "Test NPS Rate", + "page_id": self.page1.id, + "question_type": "nps_rate", + "validation_required": True, + } + ) + ) + self.answer_tag1 = "{}_{}_{}".format( + self.survey1.id, + self.page1.id, + self.question1.id, + ) + self._type_match["nps_rate"] = ("numerical_box", "value_numerical_box") + + def test_01_question_nps_rate_with_error_values(self): + error_results = [ + ("aaa", "This is not a number"), + ("-1", "Answer is not in the right range"), + ("11", "Answer is not in the right range"), + ] + for i in range(len(error_results)): + self.assertEqual( + self.question1.validate_nps_rate( + {self.answer_tag1: error_results[i][0]}, self.answer_tag1 + ), + {self.answer_tag1: error_results[i][1]}, + ) + + def test_02_question_nps_rate_with_valid_values(self): + for i in ("0", "6", "8"): + self.user_input1._save_lines(question=self.question1, answer=i) + self.assertEqual( + self.user_input1.user_input_line_ids.filtered( + lambda r: r.question_id == self.question1 + ).value_numerical_box, + float(i), + ) + + def test_03_question_nps_rate_with_constr_mandatory(self): + self.question1.constr_mandatory = True + with self.assertRaises(ValidationError): + self.user_input1._save_lines(question=self.question1, answer="0") + with self.assertRaises(ValidationError): + self.user_input1._save_lines(question=self.question1, answer="11") diff --git a/survey_question_type_nps/views/survey_question.xml b/survey_question_type_nps/views/survey_question.xml new file mode 100644 index 00000000..929684ac --- /dev/null +++ b/survey_question_type_nps/views/survey_question.xml @@ -0,0 +1,22 @@ + + + + + survey.question.form + survey.question + + + + +
+ + + + + +
+ + + + From 8be8132db88c4adba15842cdd95f78fbe38c639d Mon Sep 17 00:00:00 2001 From: "youstina.nabil" Date: Thu, 9 May 2024 12:38:22 +0300 Subject: [PATCH 2/3] [FIX] survey_question_type_nps: precommit auto fixes --- .../models/survey_question.py | 92 ++++++++-------- .../models/survey_user_input_line.py | 101 ++++++++++-------- .../static/src/js/survey.js | 66 ++++++------ .../templates/survey_template.xml | 76 +++++++------ survey_question_type_nps/tests/test_survey.py | 6 +- 5 files changed, 183 insertions(+), 158 deletions(-) diff --git a/survey_question_type_nps/models/survey_question.py b/survey_question_type_nps/models/survey_question.py index cecb1296..3052e591 100644 --- a/survey_question_type_nps/models/survey_question.py +++ b/survey_question_type_nps/models/survey_question.py @@ -6,50 +6,56 @@ class SurveyQuestion(models.Model): + _inherit = "survey.question" - _inherit = "survey.question" + question_type = fields.Selection(selection_add=[("nps_rate", "NPS Rating")]) - question_type = fields.Selection(selection_add=[("nps_rate", "NPS Rating")]) + def _get_stats_summary_data(self, user_input_lines): + stats = super()._get_stats_summary_data(user_input_lines) + if self.question_type in ["nps_rate"]: + stats.update(self._get_stats_summary_data_numerical(user_input_lines)) + all_nps = user_input_lines.filtered(lambda line: not line.skipped).mapped( + "value_nps" + ) + stats.update( + { + "common_lines": collections.Counter( + user_input_lines.filtered(lambda line: not line.skipped).mapped( + "value_numerical_box" + ) + ).most_common(5), + "right_inputs_count": len( + user_input_lines.filtered( + lambda line: line.answer_is_correct + ).mapped("user_input_id") + ), + "average_nps": round(sum(all_nps) / len(all_nps), 2) + if all_nps + else 0, + } + ) + return stats - def _get_stats_summary_data(self, user_input_lines): - stats = super()._get_stats_summary_data(user_input_lines) - if self.question_type in ["nps_rate"]: - stats.update(self._get_stats_summary_data_numerical(user_input_lines)) - all_nps = user_input_lines.filtered(lambda line: not line.skipped).mapped("value_nps") - stats.update({ - "common_lines": - collections.Counter( - user_input_lines.filtered(lambda line: not line.skipped).mapped( - "value_numerical_box")).most_common(5), - "right_inputs_count": - len( - user_input_lines.filtered(lambda line: line.answer_is_correct).mapped( - "user_input_id")), - "average_nps": - round(sum(all_nps) / len(all_nps), 2) if all_nps else 0, - }) - return stats - - def validate_nps_rate(self, post, answer_tag): - self.ensure_one() - errors = {} - answer = post[answer_tag].strip() - # Empty answer to mandatory question - if self.constr_mandatory and not answer: - errors.update({answer_tag: self.constr_error_msg}) - # Checks if user input is a number - if answer: - try: - floatanswer = float(answer) - except ValueError: - errors.update({answer_tag: "This is not a number"}) - return errors - # Answer is not in the right range - with tools.ignore(Exception): - # 0 answer to mandatory question - if self.constr_mandatory: - if floatanswer == 0: + def validate_nps_rate(self, post, answer_tag): + self.ensure_one() + errors = {} + answer = post[answer_tag].strip() + # Empty answer to mandatory question + if self.constr_mandatory and not answer: errors.update({answer_tag: self.constr_error_msg}) - if not (0 <= floatanswer <= 10): - errors.update({answer_tag: "Answer is not in the right range"}) - return errors + # Checks if user input is a number + if answer: + try: + floatanswer = float(answer) + except ValueError: + errors.update({answer_tag: "This is not a number"}) + return errors + # Answer is not in the right range + with tools.ignore(Exception): + # 0 answer to mandatory question + if self.constr_mandatory: + if floatanswer == 0: + errors.update({answer_tag: self.constr_error_msg}) + if not (0 <= floatanswer <= 10): + errors.update({answer_tag: "Answer is not in the right range"}) + return errors diff --git a/survey_question_type_nps/models/survey_user_input_line.py b/survey_question_type_nps/models/survey_user_input_line.py index 0c8005c4..594addca 100644 --- a/survey_question_type_nps/models/survey_user_input_line.py +++ b/survey_question_type_nps/models/survey_user_input_line.py @@ -6,54 +6,61 @@ class SurveyUserInput(models.Model): - _inherit = "survey.user_input" - - def _save_lines(self, question, answer, comment=None, overwrite_existing=True): - old_answers = self.env["survey.user_input.line"].search([ - ("user_input_id", "=", self.id), - ("question_id", "=", question.id), - ]) - - if question.question_type in ["nps_rate"]: - return self._save_line_simple_answer(question, old_answers, answer) - return super()._save_lines( - question, - answer, - comment=comment, - overwrite_existing=overwrite_existing, - ) - - def _get_line_answer_values(self, question, answer, answer_type): - vals = super()._get_line_answer_values(question, answer, answer_type) - if answer_type == "nps_rate" and answer: - value = float(answer) - nps = 1 if value >= 9 else -1 if value <= 6 else 0 - vals.update({ - "value_numerical_box": float(answer), - "answer_type": "numerical_box", - "value_nps": nps, - }) - vals.pop("value_nps_rate") - return vals + _inherit = "survey.user_input" + + def _save_lines(self, question, answer, comment=None, overwrite_existing=True): + old_answers = self.env["survey.user_input.line"].search( + [ + ("user_input_id", "=", self.id), + ("question_id", "=", question.id), + ] + ) + + if question.question_type in ["nps_rate"]: + return self._save_line_simple_answer(question, old_answers, answer) + return super()._save_lines( + question, + answer, + comment=comment, + overwrite_existing=overwrite_existing, + ) + + def _get_line_answer_values(self, question, answer, answer_type): + vals = super()._get_line_answer_values(question, answer, answer_type) + if answer_type == "nps_rate" and answer: + value = float(answer) + nps = 1 if value >= 9 else -1 if value <= 6 else 0 + vals.update( + { + "value_numerical_box": float(answer), + "answer_type": "numerical_box", + "value_nps": nps, + } + ) + vals.pop("value_nps_rate") + return vals class SurveyUserInputLine(models.Model): + _inherit = "survey.user_input.line" + + value_nps = fields.Integer() - _inherit = "survey.user_input.line" - - value_nps = fields.Integer() - - @api.constrains("question_id", "answer_type", "value_numerical_box") - def _check_nps_rate_answer(self): - for rec in self: - if rec.question_id.question_type == "nps_rate": - if not rec.answer_type: - continue - if rec.answer_type != "numerical_box": - raise ValidationError( - _("NPS rate question must have numeric answer") - ) - if rec.question_id.constr_mandatory and not (0 < rec.value_numerical_box <= 10): - raise ValidationError(_("Answer is not in the right range")) - if not rec.question_id.constr_mandatory and not (0 <= rec.value_numerical_box <= 10): - raise ValidationError(_("Answer is not in the right range")) + @api.constrains("question_id", "answer_type", "value_numerical_box") + def _check_nps_rate_answer(self): + for rec in self: + if rec.question_id.question_type == "nps_rate": + if not rec.answer_type: + continue + if rec.answer_type != "numerical_box": + raise ValidationError( + _("NPS rate question must have numeric answer") + ) + if rec.question_id.constr_mandatory and not ( + 0 < rec.value_numerical_box <= 10 + ): + raise ValidationError(_("Answer is not in the right range")) + if not rec.question_id.constr_mandatory and not ( + 0 <= rec.value_numerical_box <= 10 + ): + raise ValidationError(_("Answer is not in the right range")) diff --git a/survey_question_type_nps/static/src/js/survey.js b/survey_question_type_nps/static/src/js/survey.js index d0dca6f8..ff96e34c 100644 --- a/survey_question_type_nps/static/src/js/survey.js +++ b/survey_question_type_nps/static/src/js/survey.js @@ -1,37 +1,39 @@ /* Copyright 2018 ACSONE SA/NV License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).*/ odoo.define("survey_question_type_nps", [], function () { - "use strict"; + "use strict"; - const survey_form = odoo.loader.modules.get("@survey/js/survey_form")[Symbol.for("default")]; - survey_form.include({ - events: $.extend({}, survey_form.prototype.events, { - "click .nps_rate > label": "_onClickNPSLabel", - }), - _onClickNPSLabel: function (event) { - if (this.readonly) { - return; - } - var target = event.target; - var label_items = $(target).parent().find("label"); - var value = label_items.length - $(target).index(); - label_items.removeClass("checked"); - $(target).addClass("checked"); - var $input = $(target).parent().find("input"); - $input.val(value); - // We will trigger the change in order to make it compatible with conditional. - // If it is not installed, it has no effects - $input.trigger("change"); - }, - _prepareSubmitValues: function (formData, params) { - this._super.apply(this, arguments); - this.$("[data-question-type]").each(function () { - switch ($(this).data("questionType")) { - case "nps_rate": - params[this.name] = this.value; - break; - } - }); - }, - }); + const survey_form = odoo.loader.modules.get("@survey/js/survey_form")[ + Symbol.for("default") + ]; + survey_form.include({ + events: $.extend({}, survey_form.prototype.events, { + "click .nps_rate > label": "_onClickNPSLabel", + }), + _onClickNPSLabel: function (event) { + if (this.readonly) { + return; + } + var target = event.target; + var label_items = $(target).parent().find("label"); + var value = label_items.length - $(target).index(); + label_items.removeClass("checked"); + $(target).addClass("checked"); + var $input = $(target).parent().find("input"); + $input.val(value); + // We will trigger the change in order to make it compatible with conditional. + // If it is not installed, it has no effects + $input.trigger("change"); + }, + _prepareSubmitValues: function (formData, params) { + this._super.apply(this, arguments); + this.$("[data-question-type]").each(function () { + switch ($(this).data("questionType")) { + case "nps_rate": + params[this.name] = this.value; + break; + } + }); + }, + }); }); diff --git a/survey_question_type_nps/templates/survey_template.xml b/survey_question_type_nps/templates/survey_template.xml index 248efc2a..ccd73dd5 100644 --- a/survey_question_type_nps/templates/survey_template.xml +++ b/survey_question_type_nps/templates/survey_template.xml @@ -9,14 +9,18 @@ -