ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4482 from FinnStutzenstein/sortAgendaOnProjector

Browse Source 
Fallback to id when sorting the agenda
This commit is contained in:
Emanuel Schütze 2019-03-09 21:40:51 +01:00 committed by GitHub
commit 2e2bf9bf54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openslides/agenda/projector.py
View File

@ -16,6 +16,17 @@ from ..utils.projector import (
# to be fast! # to be fast!
def get_sorted_agenda_items(all_data: AllData) -> List[Dict[str, Any]]:
"""
Returns all sorted agenda items by id first and then weight, resulting in
ordered items, if some have the same weight.
"""
return sorted(
sorted(all_data["agenda/item"].values(), key=lambda item: item["id"]),
key=lambda item: item["weight"],
)
def get_flat_tree(all_data: AllData, parent_id: int = 0) -> List[Dict[str, Any]]: def get_flat_tree(all_data: AllData, parent_id: int = 0) -> List[Dict[str, Any]]:
""" """
Build the item tree from all_data. Build the item tree from all_data.
@ -29,9 +40,7 @@ def get_flat_tree(all_data: AllData, parent_id: int = 0) -> List[Dict[str, Any]]
# Build a dict from an item_id to all its children # Build a dict from an item_id to all its children
children: Dict[int, List[int]] = defaultdict(list) children: Dict[int, List[int]] = defaultdict(list)
if "agenda/item" in all_data: if "agenda/item" in all_data:
for item in sorted( for item in get_sorted_agenda_items(all_data):
all_data["agenda/item"].values(), key=lambda item: item["weight"]
):
if item["type"] == 1: # only normal items if item["type"] == 1: # only normal items
children[item["parent_id"] or 0].append(item["id"]) children[item["parent_id"] or 0].append(item["id"])
@ -69,9 +78,7 @@ def item_list_slide(
if only_main_items: if only_main_items:
agenda_items = [] agenda_items = []
for item in sorted( for item in get_sorted_agenda_items(all_data):
all_data["agenda/item"].values(), key=lambda item: item["weight"]
):
if item["parent_id"] is None and item["type"] == 1: if item["parent_id"] is None and item["type"] == 1:
agenda_items.append( agenda_items.append(
{ {