Forráskód Böngészése

資料依照時間排序

Mia Cheng 1 éve
szülő
commit
581758ec3b
1 módosított fájl, 6 hozzáadás és 7 törlés
  1. 6 7
      app/api/classes.py

+ 6 - 7
app/api/classes.py

@@ -518,9 +518,9 @@ async def search_event(
 ):
     try:
         if event_id :
-            class_list = await Class_list.filter(id=event_id).all()
+            class_list = await Class_list.filter(id=event_id).all().order_by("-start_time")
         elif class_name_id:
-            class_list = await Class_list.filter(name_id=class_name_id).all()
+            class_list = await Class_list.filter(name_id=class_name_id).all().order_by("-start_time")
         else :
             return {"msg": "please input class_name_id or event_id", "code": 200}
 
@@ -587,9 +587,9 @@ async def get_school(
 ):
     try:
         if location_id :
-            school_list = await Schools.filter(id = location_id).all()
+            school_list = await Schools.filter(id = location_id).all().order_by("-update_time")
         else :
-            school_list = await Schools.all()
+            school_list = await Schools.all().order_by("-update_time")
         
         schools = []
         for school_obj in school_list:
@@ -648,7 +648,7 @@ async def get_class_name(
         if class_name_id :
             class_name_list = class_name_list.filter(id = class_name_id).all()
 
-        class_name_list = await class_name_list.all()
+        class_name_list = await class_name_list.all().order_by("-id")
         classes_name = []
 
         count = 0
@@ -678,7 +678,6 @@ async def get_class_name(
                     if count < page_num*page_amount and count >= (page_num-1)*page_amount :
                         classes_name.append(class_data)
                         count += 1
-                    elif  count >= page_num*page_amount: count += 1
                     else : count += 1
                 else :
                     classes_name.append(class_data)
@@ -694,7 +693,7 @@ async def get_session(
     event_id : Optional[int] = None
 ):
     try:
-        class_session_list = await Class_detail.filter(class_list_id=event_id).all()
+        class_session_list = await Class_detail.filter(class_list_id=event_id).all().order_by("start_time")
         
         classe_sessions = []
         for class_session_obj in class_session_list: