|
@@ -530,8 +530,7 @@ async def search_event(
|
|
class_name_obj = await Class_name.get(id=class_obj.name_id)
|
|
class_name_obj = await Class_name.get(id=class_obj.name_id)
|
|
class_name = class_name_obj.name
|
|
class_name = class_name_obj.name
|
|
|
|
|
|
- try:
|
|
|
|
- class_date_obj = await Class_date.get(class_list_id=class_obj.id)
|
|
|
|
|
|
+ try :
|
|
state = await check_date_state(class_event_id=class_obj.id)
|
|
state = await check_date_state(class_event_id=class_obj.id)
|
|
class_data = {
|
|
class_data = {
|
|
"class_name" : class_name,
|
|
"class_name" : class_name,
|
|
@@ -548,35 +547,26 @@ async def search_event(
|
|
"people": class_obj.people,
|
|
"people": class_obj.people,
|
|
"fee_method": class_obj.fee_method,
|
|
"fee_method": class_obj.fee_method,
|
|
"registration_way": class_obj.registration_way,
|
|
"registration_way": class_obj.registration_way,
|
|
- "registration_start": class_date_obj.registration_start,
|
|
|
|
- "registration_end": class_date_obj.registration_end,
|
|
|
|
- "number_limit": class_date_obj.number_limit,
|
|
|
|
- "amount_left": class_date_obj.amount_left,
|
|
|
|
"remark": class_obj.remark,
|
|
"remark": class_obj.remark,
|
|
"state": state["result"]
|
|
"state": state["result"]
|
|
}
|
|
}
|
|
- classes.append(class_data)
|
|
|
|
|
|
+
|
|
|
|
+ try:
|
|
|
|
+ class_date_obj = await Class_date.get(class_list_id=class_obj.id)
|
|
|
|
+ class_data["registration_start"] = class_date_obj.registration_start
|
|
|
|
+ class_data["registration_end"] = class_date_obj.registration_end
|
|
|
|
+ class_data["number_limit"] = class_date_obj.number_limit
|
|
|
|
+ class_data["amount_left"] = class_date_obj.amount_left
|
|
|
|
+
|
|
|
|
+ except:
|
|
|
|
+ pass
|
|
|
|
+
|
|
except:
|
|
except:
|
|
- state = await check_date_state(class_event_id=class_obj.id)
|
|
|
|
class_data = {
|
|
class_data = {
|
|
- "class_name" : class_name,
|
|
|
|
- "event_id": class_obj.id,
|
|
|
|
- "name_id": class_obj.name_id,
|
|
|
|
- "event": class_obj.event,
|
|
|
|
- "start_time": class_obj.start_time,
|
|
|
|
- "end_time": class_obj.end_time,
|
|
|
|
- "location": class_obj.location,
|
|
|
|
- "lecturer": class_obj.lecturer,
|
|
|
|
- "contact": class_obj.contact,
|
|
|
|
- "content": class_obj.content,
|
|
|
|
- "URL": class_obj.URL,
|
|
|
|
- "people": class_obj.people,
|
|
|
|
- "fee_method": class_obj.fee_method,
|
|
|
|
- "registration_way": class_obj.registration_way,
|
|
|
|
- "remark": class_obj.remark,
|
|
|
|
- "state": state["result"]
|
|
|
|
|
|
+ "msg" : "fail to get data"
|
|
}
|
|
}
|
|
- classes.append(class_data)
|
|
|
|
|
|
+
|
|
|
|
+ classes.append(class_data)
|
|
|
|
|
|
return {"msg": "success", "code": 200, "classes": classes}
|
|
return {"msg": "success", "code": 200, "classes": classes}
|
|
except Exception as e:
|
|
except Exception as e:
|
|
@@ -685,19 +675,24 @@ async def get_class_name(
|
|
school_obj = await Schools.get(id=class_name_obj.school_id)
|
|
school_obj = await Schools.get(id=class_name_obj.school_id)
|
|
school_name = school_obj.name
|
|
school_name = school_obj.name
|
|
if not group_id or class_name_obj.group_id==group_id:
|
|
if not group_id or class_name_obj.group_id==group_id:
|
|
- state = await check_date_state(class_name_id=class_name_obj.id)
|
|
|
|
- class_data = {
|
|
|
|
- "class_name_id": class_name_obj.id,
|
|
|
|
- "name": class_name_obj.name,
|
|
|
|
- "school":school_name,
|
|
|
|
- "category": class_name_obj.category,
|
|
|
|
- "introduction": class_name_obj.introduction,
|
|
|
|
- "organizer": class_name_obj.organizer,
|
|
|
|
- "group_id": class_name_obj.group_id,
|
|
|
|
- "cover_img": class_name_obj.cover_img,
|
|
|
|
- "group_sort":class_name_obj.group_sort,
|
|
|
|
- "state": state["result"]
|
|
|
|
- }
|
|
|
|
|
|
+ try:
|
|
|
|
+ state = await check_date_state(class_name_id=class_name_obj.id)
|
|
|
|
+ class_data = {
|
|
|
|
+ "class_name_id": class_name_obj.id,
|
|
|
|
+ "name": class_name_obj.name,
|
|
|
|
+ "school":school_name,
|
|
|
|
+ "category": class_name_obj.category,
|
|
|
|
+ "introduction": class_name_obj.introduction,
|
|
|
|
+ "organizer": class_name_obj.organizer,
|
|
|
|
+ "group_id": class_name_obj.group_id,
|
|
|
|
+ "cover_img": class_name_obj.cover_img,
|
|
|
|
+ "group_sort":class_name_obj.group_sort,
|
|
|
|
+ "state": state["result"]
|
|
|
|
+ }
|
|
|
|
+ except:
|
|
|
|
+ class_data = {
|
|
|
|
+ "msg" : "fail to get data"
|
|
|
|
+ }
|
|
if page_num and page_amount:
|
|
if page_num and page_amount:
|
|
if count < page_num*page_amount and count >= (page_num-1)*page_amount :
|
|
if count < page_num*page_amount and count >= (page_num-1)*page_amount :
|
|
classes_name.append(class_data)
|
|
classes_name.append(class_data)
|