pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] survey: add "most common" date results tab

Browse Source 
Under a survey's results (i.e. summary of all user submissions) the
question type 'numerical_box' has a "Most Common" tab of its results
displaying the top 5 survey user answers. This commit adds the same tab
to question type 'date'. It is expected this tab will be most useful for
'date' questions that are scored.

Implementation was left generic to allow for other question types to
easily adopt similar display. For now, question types: 'text_box' and
'char_box' results do not have a "Most Common" tab since this currently
adds no benefit (once scoring is implemented for 'char_box', then there
may be a benefit for it). 'datetime' is also expected to not benefit
from this additional tab and requires a more complicated implementation
to handle timezone display consistently between tabs and potential
"Right answer" (see related task id: 2169184).

Upgrade PR: odoo/upgrade#835
Task ID: 2061937
This commit is contained in:
Tiffany Chang (tic)
2020-03-18 10:17:42 +00:00
committed by Thibault Delavallée
parent c099a504ad
commit 0ca0e681db
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/survey/models/survey_question.py
+10 -1
View File
@@ -492,6 +492,8 @@ class SurveyQuestion(models.Model):
elif self.question_type == 'numerical_box':
stats.update(self._get_stats_summary_data_numerical(user_input_lines))
if self.question_type in ['numerical_box', 'date', 'datetime']:
stats.update(self._get_stats_summary_data_scored(user_input_lines))
return stats
def _get_stats_summary_data_choice(self, user_input_lines):
@@ -519,7 +521,14 @@ class SurveyQuestion(models.Model):
'numerical_max': max(all_values, default=0),
'numerical_min': min(all_values, default=0),
'numerical_average': round(lines_sum / (len(all_values) or 1), 2),
'numerical_common_lines': collections.Counter(all_values).most_common(5),
}
def _get_stats_summary_data_scored(self, user_input_lines):
return {
'common_lines': collections.Counter(
user_input_lines.filtered(lambda line: not line.skipped).mapped('value_%s' % self.question_type)
).most_common(5) if self.question_type != 'datetime' else [],
'right_inputs_count': len(user_input_lines.filtered(lambda line: line.answer_is_correct).mapped('user_input_id'))
}
addons/survey/views/survey_templates_statistics.xml
+21 -17
View File
@@ -130,11 +130,11 @@
<!-- Question Description -->
<div class="ml-3 text-muted" t-field="question.description"/>
<t t-if="question.question_type in ['text_box', 'char_box', 'date', 'datetime']">
<t t-if="question.question_type in ['text_box', 'char_box', 'datetime']">
<t t-call="survey.question_result_text"/>
</t>
<t t-elif="question.question_type in ['numerical_box']">
<t t-call="survey.question_result_number"></t>
<t t-elif="question.question_type in ['numerical_box', 'date']">
<t t-call="survey.question_result_number_or_date"></t>
</t>
<t t-elif="question.question_type in ['simple_choice', 'multiple_choice']">
<t t-call="survey.question_result_choice"></t>
@@ -145,7 +145,7 @@
</div>
</template>
<template id="question_result_text" name="Question: text result (text_box, char_box, date, datetime)">
<template id="question_result_text" name="Question: text result (text_box, char_box, datetime)">
<table class="table table-hover table-sm" t-att-id="'survey_table_question_%d' % question.id">
<thead>
<tr>
@@ -173,10 +173,6 @@
<span t-if="no_print_url" t-field="input_line.value_char_box" />
<a t-else="" t-att-href="input_line.user_input_id.get_print_url()" t-field="input_line.value_char_box"></a>
</t>
<t t-if="question.question_type == 'date'">
<span t-if="no_print_url" t-field="input_line.value_date" />
<a t-else="" t-att-href="input_line.user_input_id.get_print_url()" t-field="input_line.value_date"></a>
</t>
<t t-if="question.question_type == 'datetime'">
<span t-if="no_print_url" t-field="input_line.value_datetime" />
<a t-else="" t-att-href="input_line.user_input_id.get_print_url()" t-field="input_line.value_datetime"></a>
@@ -189,12 +185,14 @@
<t t-call="survey.question_table_pagination"/>
</template>
<template id="question_result_number" name="Question: number result (numerical_box)">
<span class="float-right mt8">
<span class="badge badge-secondary only_left_radius">Maximum </span> <span class="badge badge-success only_right_radius" t-esc="question_data['numerical_max']"></span>
<span class="badge badge-secondary only_left_radius">Minimum </span> <span class="badge badge-danger only_right_radius" t-esc="question_data['numerical_min']"></span>
<span class="badge badge-secondary only_left_radius">Average </span> <span class="badge badge-warning only_right_radius" t-esc="question_data['numerical_average']"></span>
</span>
<template id="question_result_number_or_date" name="Question: number or date result (numerical_box or date)">
<t t-if="question.question_type == 'numerical_box'">
<span class="float-right mt8">
<span class="badge badge-secondary only_left_radius">Maximum </span> <span class="badge badge-success only_right_radius" t-esc="question_data['numerical_max']"></span>
<span class="badge badge-secondary only_left_radius">Minimum </span> <span class="badge badge-danger only_right_radius" t-esc="question_data['numerical_min']"></span>
<span class="badge badge-secondary only_left_radius">Average </span> <span class="badge badge-warning only_right_radius" t-esc="question_data['numerical_average']"></span>
</span>
</t>
<ul class="nav nav-tabs d-print-none" role="tablist">
<li class="nav-item">
@@ -222,8 +220,11 @@
</tr>
</thead>
<tbody>
<tr t-foreach="question_data['numerical_common_lines']" t-as="common_line">
<td><span t-esc="common_line[0]"></span></td>
<tr t-foreach="question_data['common_lines']" t-as="common_line">
<td>
<span t-if="question.question_type == 'numerical_box'" t-esc="common_line[0]"/>
<span t-if="question.question_type == 'date'" t-esc="common_line[0]" t-options='{"widget": "date"}'/>
</td>
<td><span t-esc="common_line[1]"></span></td>
</tr>
</tbody>
@@ -248,7 +249,10 @@
</a>
</t>
</td>
<td><span t-field="input_line.value_numerical_box"></span><br/></td>
<td>
<a t-if="question.question_type == 'numerical_box'" t-att-href="input_line.user_input_id.get_print_url()" t-field="input_line.value_numerical_box"/>
<a t-if="question.question_type == 'date'" t-att-href="input_line.user_input_id.get_print_url()" t-field="input_line.value_date"/>
</td>
</tr>
</t>
</tbody>