almost finish migrate new circumstances
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
from rest_framework.decorators import api_view
|
||||
from rest_framework.response import Response
|
||||
from rest_framework import status
|
||||
from rog.models import NewEvent2, Entry, Location
|
||||
from rog.models import NewEvent2, Entry, Location2025
|
||||
from rog.models import GpsLog
|
||||
import logging
|
||||
from django.db.models import F, Q
|
||||
@ -172,7 +172,7 @@ def get_checkpoint_list(request):
|
||||
}, status=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
# イベントのチェックポイント情報を取得
|
||||
checkpoints = Location.objects.filter(event=event).order_by('cp_number')
|
||||
checkpoints = Location2025.objects.filter(event=event).order_by('cp_number')
|
||||
|
||||
checkpoint_list = []
|
||||
for cp in checkpoints:
|
||||
@ -398,12 +398,12 @@ def checkin_from_rogapp(request):
|
||||
# イベントのチェックポイント定義を確認(存在する場合)
|
||||
event_cp = None
|
||||
try:
|
||||
event_cp = Location.objects.filter(
|
||||
event_cp = Location2025.objects.filter(
|
||||
event=event,
|
||||
cp_number=cp_number
|
||||
).first()
|
||||
except:
|
||||
logger.info(f"Location model not available or CP {cp_number} not defined for event")
|
||||
logger.info(f"Location2025 model not available or CP {cp_number} not defined for event")
|
||||
|
||||
# トランザクション開始
|
||||
with transaction.atomic():
|
||||
@ -595,8 +595,8 @@ def calculate_team_score(entry):
|
||||
# チェックポイントの得点を取得
|
||||
cp_point = 0
|
||||
try:
|
||||
# Location
|
||||
event_cp = Location.objects.filter(
|
||||
# Location2025
|
||||
event_cp = Location2025.objects.filter(
|
||||
event=entry.event,
|
||||
cp_number=cp.cp_number
|
||||
).first()
|
||||
|
||||
Reference in New Issue
Block a user