|
@@ -36,14 +36,16 @@ async def insert_school(
|
|
location_name: str = Form(default=''),
|
|
location_name: str = Form(default=''),
|
|
Lng: str = Form(default=''),
|
|
Lng: str = Form(default=''),
|
|
Lat: str = Form(default=''),
|
|
Lat: str = Form(default=''),
|
|
- address : str = Form(default='')
|
|
|
|
|
|
+ address : str = Form(default=''),
|
|
|
|
+ update_time : datetime = Form(default=datetime.now())
|
|
):
|
|
):
|
|
try:
|
|
try:
|
|
new_school = await Schools.create(
|
|
new_school = await Schools.create(
|
|
name=location_name,
|
|
name=location_name,
|
|
longitude=Lng,
|
|
longitude=Lng,
|
|
latitude=Lat,
|
|
latitude=Lat,
|
|
- address = address
|
|
|
|
|
|
+ address = address,
|
|
|
|
+ update_time = update_time
|
|
)
|
|
)
|
|
|
|
|
|
return {"msg": "success", "code": 200, "location_id": new_school.id}
|
|
return {"msg": "success", "code": 200, "location_id": new_school.id}
|
|
@@ -139,17 +141,17 @@ async def insert_session(
|
|
):
|
|
):
|
|
try:
|
|
try:
|
|
session_list = await Class_detail.filter(class_list_id=class_event_id).all()
|
|
session_list = await Class_detail.filter(class_list_id=class_event_id).all()
|
|
- session = 1
|
|
|
|
|
|
+ session = 0
|
|
if session_list != []:
|
|
if session_list != []:
|
|
for session_obj in session_list:
|
|
for session_obj in session_list:
|
|
- if session <= session_obj.sessions:
|
|
|
|
|
|
+ if session < session_obj.sessions:
|
|
session = session_obj.sessions
|
|
session = session_obj.sessions
|
|
|
|
|
|
new_session = await Class_detail.create(
|
|
new_session = await Class_detail.create(
|
|
class_list_id=class_event_id,
|
|
class_list_id=class_event_id,
|
|
start_time=start_time,
|
|
start_time=start_time,
|
|
end_time=end_time,
|
|
end_time=end_time,
|
|
- sessions=sessions,
|
|
|
|
|
|
+ sessions=session +1,
|
|
content = content
|
|
content = content
|
|
)
|
|
)
|
|
|
|
|
|
@@ -191,12 +193,12 @@ async def update_school(
|
|
async def update_class_name(
|
|
async def update_class_name(
|
|
class_name_id: int = Form(default=0),
|
|
class_name_id: int = Form(default=0),
|
|
name: str = Form(default=''),
|
|
name: str = Form(default=''),
|
|
- location_id: int = Form(default=''),
|
|
|
|
|
|
+ location_id: int = Form(default=0),
|
|
category: str = Form(default=''),
|
|
category: str = Form(default=''),
|
|
introduction: str = Form(default=''),
|
|
introduction: str = Form(default=''),
|
|
organizer: str = Form(default=''),
|
|
organizer: str = Form(default=''),
|
|
cover_img_file:UploadFile = File(default=''),
|
|
cover_img_file:UploadFile = File(default=''),
|
|
- group_id : int = Form(default=1)
|
|
|
|
|
|
+ group_id : int = Form(default=0)
|
|
):
|
|
):
|
|
try:
|
|
try:
|
|
class_name = await Class_name.get(id=class_name_id)
|
|
class_name = await Class_name.get(id=class_name_id)
|
|
@@ -204,8 +206,9 @@ async def update_class_name(
|
|
if name.strip() != '':
|
|
if name.strip() != '':
|
|
class_name.name = name
|
|
class_name.name = name
|
|
|
|
|
|
- if location_id != '':
|
|
|
|
|
|
+ if location_id != 0:
|
|
class_name.school_id = location_id
|
|
class_name.school_id = location_id
|
|
|
|
+ update_location_time(location_id= location_id)
|
|
|
|
|
|
if category.strip() != '':
|
|
if category.strip() != '':
|
|
class_name.category = category
|
|
class_name.category = category
|
|
@@ -216,7 +219,7 @@ async def update_class_name(
|
|
if organizer.strip() != '':
|
|
if organizer.strip() != '':
|
|
class_name.organizer = organizer
|
|
class_name.organizer = organizer
|
|
|
|
|
|
- if group_id != 1 :
|
|
|
|
|
|
+ if group_id != 0 :
|
|
class_name.group_id = group_id
|
|
class_name.group_id = group_id
|
|
|
|
|
|
if cover_img_file != '':
|
|
if cover_img_file != '':
|
|
@@ -230,7 +233,7 @@ async def update_class_name(
|
|
|
|
|
|
await class_name.save()
|
|
await class_name.save()
|
|
|
|
|
|
- update_location_time(location_id= location_id)
|
|
|
|
|
|
+
|
|
return {"msg": "success", "code": 200}
|
|
return {"msg": "success", "code": 200}
|
|
except Exception as e:
|
|
except Exception as e:
|
|
return {"msg": str(e), "code": 500}
|
|
return {"msg": str(e), "code": 500}
|