Skip to content
Snippets Groups Projects
Commit 1968c0e4 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Sort objects in plan overview (issue #303)

parent 21339a4f
No related branches found
No related tags found
No related merge requests found
...@@ -92,6 +92,7 @@ class Teacher(object): ...@@ -92,6 +92,7 @@ class Teacher(object):
def get_all_teachers(): def get_all_teachers():
teachers = row_by_row(models.Teacher, Teacher) teachers = row_by_row(models.Teacher, Teacher)
teachers.sort(key=lambda a: a.shortcode)
return teachers return teachers
...@@ -145,6 +146,7 @@ class Class(object): ...@@ -145,6 +146,7 @@ class Class(object):
def get_all_classes(): def get_all_classes():
classes = row_by_row(models.Class, Class) classes = row_by_row(models.Class, Class)
classes.sort(key=lambda a: a.name)
return classes return classes
...@@ -217,8 +219,9 @@ class Room(object): ...@@ -217,8 +219,9 @@ class Room(object):
def get_all_rooms(): def get_all_rooms():
db_rooms = row_by_row(models.Room, Room) rooms = row_by_row(models.Room, Room)
return db_rooms rooms.sort(key=lambda a: a.shortcode)
return rooms
def get_room_by_id(id): def get_room_by_id(id):
...@@ -256,6 +259,7 @@ class Corridor(object): ...@@ -256,6 +259,7 @@ class Corridor(object):
def get_all_corridors(): def get_all_corridors():
corridors = row_by_row(models.Corridor, Corridor, filter_term=False) corridors = row_by_row(models.Corridor, Corridor, filter_term=False)
corridors.sort(key=lambda a: a.name)
return corridors return corridors
...@@ -312,8 +316,10 @@ class Subject(object): ...@@ -312,8 +316,10 @@ class Subject(object):
def get_all_subjects(): def get_all_subjects():
db_rooms = row_by_row(models.Subjects, Subject, filter_term=False) subjects = row_by_row(models.Subjects, Subject, filter_term=False)
return db_rooms subjects.sort(key=lambda a: a.shortcode)
return subjects
def get_subject_by_id(id): def get_subject_by_id(id):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment