From 3f91e2080aa8cad08e54084d9ac414f3ece7bd06 Mon Sep 17 00:00:00 2001 From: Akira Date: Sat, 9 Nov 2024 19:28:11 +0900 Subject: [PATCH] Adjust Excel template and model --- docbase/certificate_template.xlsx | Bin 11348 -> 11336 bytes docbase/~$certificate_template.xlsx | Bin 165 -> 0 bytes rog/models.py | 1 + rog/postgres_views.sql | 2 ++ 4 files changed, 3 insertions(+) delete mode 100644 docbase/~$certificate_template.xlsx diff --git a/docbase/certificate_template.xlsx b/docbase/certificate_template.xlsx index f7b4856357360f4083ecc3c022898015480e4dc3..7218d3fe3801375727ec136bd9db19e6e0fbdd48 100644 GIT binary patch delta 5006 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 delta 4985 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 diff --git a/docbase/~$certificate_template.xlsx b/docbase/~$certificate_template.xlsx deleted file mode 100644 index 52abcffbccd9a04a06f2b02e94aadf62824b7593..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 xcmd<_&8$o;NmOvm&MZn)AR6#6_%dWNR5BzolmM{;gCj#WkY5C5D**Y_g#Zl86LSCn diff --git a/rog/models.py b/rog/models.py index fd77591..250ec6f 100644 --- a/rog/models.py +++ b/rog/models.py @@ -310,6 +310,7 @@ class TempUser(models.Model): class NewEvent2(models.Model): event_name = models.CharField(max_length=255, unique=True) + event_description=models.TextField(max_length=255,blank=True, null=True) start_datetime = models.DateTimeField(default=timezone.now) end_datetime = models.DateTimeField() deadlineDateTime = models.DateTimeField(null=True, blank=True) diff --git a/rog/postgres_views.sql b/rog/postgres_views.sql index 7ad9099..6c52077 100644 --- a/rog/postgres_views.sql +++ b/rog/postgres_views.sql @@ -54,9 +54,11 @@ SELECT -- イベント情報 ev.event_name, + ev.description, ev.start_datetime, ev.end_datetime, ev."deadlineDateTime", + TO_CHAR(ev.start_datetime::date, 'YYYY/MM/DD') as event_date, -- カテゴリー情報 nc.category_name,