From 6540944fb49ff2f5653fa5401e27492016578337 Mon Sep 17 00:00:00 2001 From: Andro Gvivradze Date: Thu, 16 Feb 2023 14:34:16 +0000 Subject: [PATCH] [IMP] survey: make certification reports editable by studio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The goal of this commit is to make certification reports editable by studio. We also move certification reports into separate report folder from views, and merge modern and classic views into one. This way we avoid duplicated code and at the same time the structure will make more sense since it is already working as a single template. Task-3148819 closes odoo/odoo#113469 Related: odoo/upgrade#4503 Signed-off-by: Warnon Aurélien (awa) --- addons/survey/__init__.py | 1 + addons/survey/__manifest__.py | 4 +- .../{views => report}/survey_reports.xml | 0 addons/survey/report/survey_templates.xml | 81 ++++++++++++ .../static/src/scss/survey_reports.scss | 15 ++- .../survey/views/survey_report_templates.xml | 122 ------------------ 6 files changed, 92 insertions(+), 131 deletions(-) rename addons/survey/{views => report}/survey_reports.xml (100%) create mode 100644 addons/survey/report/survey_templates.xml delete mode 100644 addons/survey/views/survey_report_templates.xml diff --git a/addons/survey/__init__.py b/addons/survey/__init__.py index c158f87e14f..56086d0fa5d 100644 --- a/addons/survey/__init__.py +++ b/addons/survey/__init__.py @@ -3,4 +3,5 @@ from . import controllers from . import models +from . import report from . import wizard diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py index 8254f0c43a6..5a1b14857db 100644 --- a/addons/survey/__manifest__.py +++ b/addons/survey/__manifest__.py @@ -23,8 +23,8 @@ sent mails with personal token for the invitation of the survey. 'web_tour', 'gamification'], 'data': [ - 'views/survey_report_templates.xml', - 'views/survey_reports.xml', + 'report/survey_templates.xml', + 'report/survey_reports.xml', 'data/mail_template_data.xml', 'security/survey_security.xml', 'security/ir.model.access.csv', diff --git a/addons/survey/views/survey_reports.xml b/addons/survey/report/survey_reports.xml similarity index 100% rename from addons/survey/views/survey_reports.xml rename to addons/survey/report/survey_reports.xml diff --git a/addons/survey/report/survey_templates.xml b/addons/survey/report/survey_templates.xml new file mode 100644 index 00000000000..270d7c799a7 --- /dev/null +++ b/addons/survey/report/survey_templates.xml @@ -0,0 +1,81 @@ + + + + + + + + diff --git a/addons/survey/static/src/scss/survey_reports.scss b/addons/survey/static/src/scss/survey_reports.scss index 906a3078b1b..3366f18d47a 100644 --- a/addons/survey/static/src/scss/survey_reports.scss +++ b/addons/survey/static/src/scss/survey_reports.scss @@ -235,13 +235,14 @@ padding-left: 10mm; right: 35mm; } - - .certification-number { - bottom: -15mm; - left: 50%; - -webkit-transform: translateX(-50%); - transform: translateX(-50%); - } + } + + .certification-number { + width: 40mm; + bottom: 5mm; + left: 50%; + -webkit-transform: translateX(-50%); + transform: translateX(-50%); } } } diff --git a/addons/survey/views/survey_report_templates.xml b/addons/survey/views/survey_report_templates.xml deleted file mode 100644 index fb46b1c3221..00000000000 --- a/addons/survey/views/survey_report_templates.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -