Merge branch 'master' of http://git.choozmo.com:3000/zooey/ntcri

app/api/classes.py

@@ -49,7 +49,7 @@ async def insert_school(
 async def insert_class(
     id: int = Form(default=0),
     name: str = Form(default=''),
-    school_id: int = Form(default=''),
+    school_id: int = Form(default=0),
     category: str = Form(default=''),
     introduction: str = Form(default=''),
     organizer: str = Form(default=''),
@@ -81,7 +81,7 @@ async def insert_class(
         
         
 
-        new_class_name = await Class_name.create(
+        new_class_name = Class_name.create(
             id=id,
             name=name,
             school_id =school_id ,
@@ -91,7 +91,7 @@ async def insert_class(
             cover_img=cover_img
         )
 
-        new_class = await Class_list.create(
+        new_class = Class_list.create(
             id=id,
             name_id=new_class_name.id,
             event =event ,
@@ -129,7 +129,7 @@ async def insert_event(
     remark : str = Form(default='')
 ):    
     try:
-        new_class = await Class_list.create(
+        new_class = Class_list.create(
             id=id,
             name_id=name_id,
             event =event,
@@ -152,15 +152,15 @@ async def insert_event(
 @classes.post("/update_class_name")
 async def update_class_name(
     id: int = Form(default=0),
-    name: int = Form(default=''),
-    school_id: int = Form(default=''),
+    name: int = Form(default=0),
+    school_id: int = Form(default=0),
     category: str = Form(default=''),
     introduction: str = Form(default=''),
     organizer: str = Form(default=''),
     cover_img_file:UploadFile = File(default='')
 ):
     try:
-        class_name = await Class_name.get(id=id)
+        class_name = Class_name.get(id=id)
 
         if name.strip() != '':
             class_name.name = name
@@ -209,7 +209,7 @@ async def update_class(
     remark : str = Form(default='')
 ):
     try:
-        class_obj = await Class_list.get(id=id)
+        class_obj = Class_list.get(id=id)
 
         if name_id != '':
             class_obj.name_id = name_id
@@ -272,9 +272,9 @@ async def delete(id: int):
 @classes.get("/search_class")
 async def search_class(id: int):
     try:
-        class_obj = await Class_list.get(id=id)
-        class_name = await Class_name.get(id=class_obj.name_id)
-        school_obj = await Schools.get(id=class_name.school_id)
+        class_obj = Class_list.get(id=id)
+        class_name =  Class_name.get(id=class_obj.name_id)
+        school_obj = Schools.get(id=class_name.school_id)
         return {
             "msg": "success",
             "code": 200,
@@ -304,7 +304,7 @@ async def search_class(id: int):
 @classes.get("/get_school")
 async def get_school():
     try:
-        school_list = await Schools.all()
+        school_list =  Schools.all()
         schools = []
         for school_obj in school_list:
             school_data = {
@@ -322,10 +322,10 @@ async def get_school():
 @classes.get("/get_class_name")
 async def get_class_name():
     try:
-        class_name_list = await Class_name.all()
+        class_name_list = Class_name.all()
         classes_name = []
         for class_name_obj in class_name_list:
-            school_obj = await Schools.get(id=class_name_obj.school_id)
+            school_obj =  Schools.get(id=class_name_obj.school_id)
             class_data = {
             "msg": "success",
             "code": 200,
@@ -347,13 +347,13 @@ async def get_class_name():
 @classes.get("/get_class")
 async def get_class():
     try:
-        class_list = await Class_list.all()
+        class_list = Class_list.all()
         classes = []
         for class_obj in class_list:
-            class_name = await Class_name.get(id=class_obj.name_id)
+            class_name =  Class_name.get(id=class_obj.name_id)
             print(class_obj.name_id)
             print(class_name.school_id)
-            school_obj = await Schools.get(id=class_name.school_id)
+            school_obj =  Schools.get(id=class_name.school_id)
             class_data = {
             "msg": "success",
             "code": 200,
@@ -386,15 +386,15 @@ async def get_class():
 @classes.get("/search_class_like")
 async def search_class_like(keyword: str):
     try:
-        class_name_list = await Class_name.filter(Q(name__icontains=keyword) ).all()
-        class_list = await Class_list.filter(Q(lecturer__icontains=keyword) ).all()
+        class_name_list =  Class_name.filter(Q(name__icontains=keyword) ).all()
+        class_list =  Class_list.filter(Q(lecturer__icontains=keyword) ).all()
         classes = []
         for class_name in class_name_list:
 
-            class_obj_list = await Class_name.filter(name_id=class_name.id).all()
+            class_obj_list = Class_name.filter(name_id=class_name.id).all()
 
             for class_obj in class_obj_list:
-                school_obj = await Schools.get(id=class_name.school_id)
+                school_obj = Schools.get(id=class_name.school_id)
                 class_data = {
                     "msg": "success",
                     "code": 200,
@@ -421,8 +421,8 @@ async def search_class_like(keyword: str):
                 classes.append(class_data)
 
         for class_obj in class_list:
-            class_name = await Class_name.get(id=class_obj.name_id)
-            school_obj = await Schools.get(id=class_name.school_id)
+            class_name =  Class_name.get(id=class_obj.name_id)
+            school_obj = Schools.get(id=class_name.school_id)
             class_data = {
                 "msg": "success",
                 "code": 200,