Skip to content

[FIX] survey: create question at the end of survey #193007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[FIX] survey: create question at the end of survey #193007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions addons/survey/static/src/question_page/question_page_one2many_field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class QuestionPageOneToManyField extends X2ManyField {
await superSaveRecord(record);
try {
await self.props.record.save();
this.ensureLastPageLoaded();
} catch (error) {
// In case of error occurring when saving.
// Remove erroneous question row added to the embedded list
Expand Down Expand Up @@ -83,10 +84,20 @@ class QuestionPageOneToManyField extends X2ManyField {
if (params.record) {
params.record = record.data[name].records.find(r => r.resId === params.record.resId);
}
if (params.context.question_create) {
this.ensureLastPageLoaded();
}
await openRecord(params);
};
this.canOpenRecord = true;
}
async ensureLastPageLoaded() {
const limit = this.list.config.limit;
const offset = (Math.ceil(this.list.count / limit) - 1) * limit;
if (this.list.offset < offset) {
await this.list.load({ limit: limit, offset: offset });
}
}
}
QuestionPageOneToManyField.components = {
...X2ManyField.components,
Expand Down
63 changes: 63 additions & 0 deletions addons/survey/static/tests/components/question_page_one2many_field_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,22 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
is_page: { type: "boolean" },
title: { type: "char", string: "Title" },
random_questions_count: { type: "integer", string: "Question Count" },
sequence: { type: "integer" },
},
records: [
{
id: 1,
is_page: true,
title: "firstSectionTitle",
random_questions_count: 4,
sequence: 1,
},
{
id: 2,
is_page: false,
title: "recordTitle",
random_questions_count: 5,
sequence: 2,
},
],
},
Expand Down Expand Up @@ -301,4 +304,64 @@ QUnit.module("QuestionPageOneToManyField", (hooks) => {
assert.strictEqual(target.querySelector(".o_is_section [name=title]").innerText, "a");
}
);

QUnit.test("full page list question creation", async (assert) => {
const questions = [];
for (let i = 1; i <= 45; i++) {
questions.push({
id: i,
is_page: false,
title: `question ${i}`,
sequence: i,
});
}
let lastQuestionSequence = 45;

serverData.models.survey_question.records = questions;
serverData.models.survey.records[0].question_and_page_ids = questions.map((q) => q.id);
await makeView({
type: "form",
resModel: "survey",
resId: 1,
serverData,
arch: `
<form>
<field name="question_and_page_ids" widget="question_page_one2many">
<tree>
<field name="is_page" invisible="1" />
<field name="title" />
<field name="random_questions_count" />
<field name="sequence" widget="handle"/>
<control>
<create name="add_question_control" string="Add a question" context="{'question_create': True}"/>
</control>
</tree>
</field>
</form>
`,
mockRPC(route, args) {
if (args.method === "web_save" && args.model === "survey") {
const sequence = args.args[1].question_and_page_ids[0][2].sequence;
assert.ok(sequence > lastQuestionSequence);
lastQuestionSequence = sequence;
}
},
});
await click(target.querySelector(".o_field_x2many_list_row_add a"));

for (let i = 1; i <= 3; i++) {
await editInput(
target,
".o_dialog:not(.o_inactive_modal) .modal-body [name='title'] input",
`New Question ${i}`
);
await click(
target.querySelector(".o_dialog:not(.o_inactive_modal) .o_form_button_save_new")
);
}
assert.strictEqual(
target.querySelector(".o_form_renderer .o_pager_value").innerText,
"41-48"
);
});
});
2 changes: 1 addition & 1 deletion addons/survey/views/survey_survey_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<widget name="survey_question_trigger" width="30px"/>
<button name="copy" type="object" icon="fa-clone" title="Duplicate Question"/>
<control>
<create name="add_question_control" string="Add a question"/>
<create name="add_question_control" string="Add a question" context="{'question_create': True}"/>
<create name="add_section_control" string="Add a section" context="{'default_is_page': True, 'default_questions_selection': 'all'}"/>
</control>
</tree>
Expand Down