diff --git a/docbase/~$certificate_template.xlsx b/docbase/~$certificate_template.xlsx deleted file mode 100644 index 52abcff..0000000 Binary files a/docbase/~$certificate_template.xlsx and /dev/null differ diff --git a/rog/models.py b/rog/models.py index 250ec6f..782c394 100644 --- a/rog/models.py +++ b/rog/models.py @@ -547,6 +547,11 @@ class GpsCheckin(models.Model): null=False, help_text="ゼッケン番号" ) + event_id = models.TextField( + null=True, + blank=True, + help_text="イベントID" + ) event_code = models.TextField( null=False, help_text="イベントコード" diff --git a/rog/postgres_views.sql b/rog/postgres_views.sql index c82d558..13e82fb 100644 --- a/rog/postgres_views.sql +++ b/rog/postgres_views.sql @@ -132,15 +132,16 @@ FROM INNER JOIN rog_newcategory nc ON e.category_id = nc.id INNER JOIN rog_team t ON e.team_id = t.id LEFT JOIN rog_customuser cu ON e.owner_id = cu.id - LEFT JOIN v_checkin_summary cs ON ev.event_name = cs.event_code + LEFT JOIN v_checkin_summary cs ON e.event_id = cs.event_id -- この行を変更 AND CAST(e.zekken_number AS TEXT) = cs.zekken_number LEFT JOIN v_category_rankings cr ON e.id = cr.id LEFT JOIN rog_member m ON t.id = m.team_id LEFT JOIN rog_goalimages gi ON e.owner_id = gi.user_id + AND gi.event_id = e.event_id -- ゴール情報の結合条件も修正 GROUP BY e.id, e.zekken_number, e.is_active, e."hasParticipated", e."hasGoaled", e.date, - ev.event_name, ev.start_datetime, ev.end_datetime, ev."deadlineDateTime",ev.event_description, + ev.event_name,ev.event_description, ev.start_datetime, ev.end_datetime, ev."deadlineDateTime", nc.category_name, nc.category_number, nc.duration, nc.num_of_member, nc.family, nc.female, t.team_name, @@ -153,7 +154,7 @@ GROUP BY -- インデックスの再作成 CREATE UNIQUE INDEX idx_mv_entry_details_event_zekken -ON mv_entry_details(event_name, zekken_number); +ON mv_entry_details(id); -- ビューの更新 REFRESH MATERIALIZED VIEW mv_entry_details;