Inventory report: Order choices and options as in container

Ref syslabcom/scrum#2858

Author: reinhardt

src/euphorie/client/browser/report.py

@@ -7,11 +7,14 @@
 """
 
 from .. import MessageFactory as _
+from Acquisition import aq_inner
+from Acquisition import aq_parent
 from base64 import b64encode
 from datetime import date
 from euphorie.client import model
 from euphorie.client import survey
 from euphorie.client import utils
+from OFS.interfaces import IOrderedContainer
 from openpyxl.workbook import Workbook
 from openpyxl.writer.excel import save_workbook
 from pkg_resources import resource_filename
@@ -293,16 +296,30 @@ def logo(self):
         with open(filename, "rb") as data:
             return b64encode(data.read())
 
+    def get_position_in_parent(self, obj):
+        parent = aq_parent(aq_inner(obj))
+        ordered = IOrderedContainer(parent, None)
+        if ordered is not None:
+            return ordered.getObjectPosition(obj.getId())
+        return 0
+
+    def get_sort_key(self, obj):
+        return (
+            self.get_position_in_parent(aq_parent(obj)),
+            self.get_position_in_parent(obj),
+        )
+
     def selected_options(self):
         selected = (
             self.sqlsession.query(model.Option)
             .join(
                 model.SurveyTreeItem, model.Option.choice_id == model.SurveyTreeItem.id
             )
             .filter(model.SurveyTreeItem.session_id == self.context.session.id)
-            .order_by(model.SurveyTreeItem.path)
         )
         objs = [
             self.context.aq_parent.restrictedTraverse(row.zodb_path) for row in selected
         ]
-        return [obj for obj in objs if obj.objectIds()]
+        objs_with_recommendations = [obj for obj in objs if obj.objectIds()]
+        ordered = sorted(objs_with_recommendations, key=self.get_sort_key)
+        return ordered