Fix history
This commit is contained in:
@ -230,12 +230,12 @@ def start_checkin(request):
|
|||||||
).first()
|
).first()
|
||||||
|
|
||||||
if existing_start:
|
if existing_start:
|
||||||
logger.warning(f"Team {entry.team_name} (zekken: {zekken_number}) already started at {existing_start.checkin_time}")
|
logger.warning(f"Team {entry.team.team_name} (zekken: {zekken_number}) already started at {existing_start.checkin_time}")
|
||||||
return Response({
|
return Response({
|
||||||
"status": "WARNING",
|
"status": "WARNING",
|
||||||
"message": "このチームは既にスタートしています",
|
"message": "このチームは既にスタートしています",
|
||||||
"start_time": existing_start.checkin_time.strftime("%Y-%m-%d %H:%M:%S"),
|
"start_time": existing_start.checkin_time.strftime("%Y-%m-%d %H:%M:%S"),
|
||||||
"team_name": entry.team_name
|
"team_name": entry.team.team_name
|
||||||
})
|
})
|
||||||
|
|
||||||
# トランザクション開始
|
# トランザクション開始
|
||||||
@ -252,12 +252,12 @@ def start_checkin(request):
|
|||||||
extra_data={"source": "admin_start"}
|
extra_data={"source": "admin_start"}
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.info(f"Team {entry.team_name} (zekken: {zekken_number}) started at {start_info.checkin_time}")
|
logger.info(f"Team {entry.team.team_name} (zekken: {zekken_number}) started at {start_info.checkin_time}")
|
||||||
|
|
||||||
return Response({
|
return Response({
|
||||||
"status": "OK",
|
"status": "OK",
|
||||||
"message": "スタート処理が完了しました",
|
"message": "スタート処理が完了しました",
|
||||||
"team_name": entry.team_name,
|
"team_name": entry.team.team_name,
|
||||||
"zekken_number": zekken_number,
|
"zekken_number": zekken_number,
|
||||||
"event_code": event_code,
|
"event_code": event_code,
|
||||||
"start_time": start_info.checkin_time.strftime("%Y-%m-%d %H:%M:%S")
|
"start_time": start_info.checkin_time.strftime("%Y-%m-%d %H:%M:%S")
|
||||||
@ -1261,9 +1261,9 @@ def get_checkin_list(request):
|
|||||||
return Response({
|
return Response({
|
||||||
"status": "OK",
|
"status": "OK",
|
||||||
"team_info": {
|
"team_info": {
|
||||||
"team_name": entry.team_name,
|
"team_name": entry.team.team_name,
|
||||||
"zekken_number": zekken_number,
|
"zekken_number": zekken_number,
|
||||||
"class_name": entry.class_name,
|
"class_name": entry.category.category_name,
|
||||||
"event_code": event_code
|
"event_code": event_code
|
||||||
},
|
},
|
||||||
"start_info": start_info,
|
"start_info": start_info,
|
||||||
@ -1526,10 +1526,10 @@ def get_yet_check_service_list(request):
|
|||||||
# チェックポイントをリストに追加
|
# チェックポイントをリストに追加
|
||||||
pending_service_checks.append({
|
pending_service_checks.append({
|
||||||
"id": cp.id,
|
"id": cp.id,
|
||||||
"team_name": entry.team_name,
|
"team_name": entry.team.team_name,
|
||||||
"zekken_number": entry.zekken_number,
|
"zekken_number": entry.zekken_number,
|
||||||
"cp_number": cp.cp_number,
|
"cp_number": cp.cp_number,
|
||||||
"class_name": entry.class_name,
|
"class_name": entry.category.category_name,
|
||||||
"checkin_time": cp.checkin_time.strftime("%Y-%m-%d %H:%M:%S") if cp.checkin_time else None,
|
"checkin_time": cp.checkin_time.strftime("%Y-%m-%d %H:%M:%S") if cp.checkin_time else None,
|
||||||
"image_url": cp.image_address
|
"image_url": cp.image_address
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user