fix: proper ordering of closed question answers in form responses (#553)

csvalpha · May 20, 2022 · fca9816 · fca9816
1 parent bf50bdb
commit fca9816
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/components/form/responses-table-totals.hbs b/app/components/form/responses-table-totals.hbs
@@ -9,7 +9,7 @@
     {{#if question.isOpenQuestion}}
       <strong>{{question.sumOfAnswers}}</strong>
     {{else}}
-      {{#each question.options as |opt|}}
+      {{#each question.sortedOptions as |opt|}}
         <strong>{{opt.sumOfAnswers}}</strong>
         {{opt.option}}<br />
       {{/each}}

diff --git a/app/models/form/response.js b/app/models/form/response.js
@@ -32,6 +32,11 @@ export default class Response extends DirtySaveModel {
             await this.closedQuestionAnswers
           ).map((closedQuestionAnswer) => closedQuestionAnswer.option)
         );
+        answers.sort((answer1, answer2) =>
+          answer1.option && answer2.option
+            ? answer1.option.get('position') - answer2.option.get('position')
+            : 0
+        );
         return answers;
       })
       .then(this.groupAnswers);