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

app/api/classes.py

@@ -152,7 +152,7 @@ async def insert_event(
 @classes.post("/update_class_name")
 async def update_class_name(
     id: int = Form(default=0),
-    name: int = Form(default=0),
+    name: str = Form(default=''),
     school_id: int = Form(default=0),
     category: str = Form(default=''),
     introduction: str = Form(default=''),
@@ -272,9 +272,9 @@ async def delete(id: int):
 @classes.get("/search_class")
 async def search_class(id: int):
     try:
-        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)
+        class_obj = Class_list.get(id=id).first()
+        class_name =  Class_name.get(id=class_obj.name_id).first()
+        school_obj = Schools.get(id=class_name.school_id).first()
         return {
             "msg": "success",
             "code": 200,
@@ -305,6 +305,7 @@ async def search_class(id: int):
 async def get_school():
     try:
         school_list =  Schools.all()
+        print(school_list)
         schools = []
         for school_obj in school_list:
             school_data = {
@@ -325,7 +326,7 @@ async def get_class_name():
         class_name_list = Class_name.all()
         classes_name = []
         for class_name_obj in class_name_list:
-            school_obj =  Schools.get(id=class_name_obj.school_id)
+            school_obj =  Schools.filter(id=class_name_obj.school_id).first()
             class_data = {
             "msg": "success",
             "code": 200,
@@ -350,10 +351,8 @@ async def get_class():
         class_list = Class_list.all()
         classes = []
         for class_obj in class_list:
-            class_name =  Class_name.get(id=class_obj.name_id)
-            print(class_obj.name_id)
-            print(class_name.school_id)
-            school_obj =  Schools.get(id=class_name.school_id)
+            class_name =  Class_name.filter(id=class_obj.name_id).first()
+            school_obj =  Schools.filter(id=class_name.school_id).first()
             class_data = {
             "msg": "success",
             "code": 200,
@@ -454,18 +453,18 @@ async def search_class_like(keyword: str):
 
 
 
-@classes.post("/upload/")
-async def create_upload_file(file: UploadFile = File(...)):
+# @classes.post("/upload/")
+# async def create_upload_file(file: UploadFile = File(...)):
  
-    #file.filename = f"{uuid.uuid4()}.jpeg"
-    contents = await file.read()
+#     #file.filename = f"{uuid.uuid4()}.jpeg"
+#     contents = await file.read()
  
-    #save the file
-    with open(f"{IMAGEDIR}{file.filename}", "wb") as f:
-        f.write(contents)
+#     #save the file
+#     with open(f"{IMAGEDIR}{file.filename}", "wb") as f:
+#         f.write(contents)
  
-    return {"filename": file.filename}
- #"/var/www/ntcri/app/api/images/test.jpeg"
+#     return {"filename": file.filename}
+#  #"/var/www/ntcri/app/api/images/test.jpeg"
  
 
 async def read_image_file():