From 2fbe4ad93dfb6273701d33bd51175b9a04b34662 Mon Sep 17 00:00:00 2001 From: David Morris Date: Sun, 22 Oct 2023 08:42:28 +0100 Subject: [PATCH] Adding countries table. --- cmp/models.py | 76 +++++++++++++++++++++++++++++++++++++++++++----- cmp/views.py | 1 - core/settings.py | 1 + requirements.in | 1 + requirements.txt | 3 ++ 5 files changed, 74 insertions(+), 8 deletions(-) diff --git a/cmp/models.py b/cmp/models.py index 2cc319f..c77067b 100644 --- a/cmp/models.py +++ b/cmp/models.py @@ -4,7 +4,6 @@ from .managers import CustomUserManager - class CustomUser(AbstractUser): username = None email = models.EmailField(_("email address"), unique=True) @@ -19,11 +18,74 @@ def __str__(self): class Country(models.Model): - name = models.CharField(max_length=50) - old_id = models.IntegerField(null=True, blank=True) - alpha2 = models.CharField(max_length=2, null=False, blank=False) - alpha3 = models.CharField(max_length=3, null=False, blank=False) + name_common = models.CharField(max_length=255, unique=False, default='') + name_official = models.CharField(max_length=255, unique=False, default='') + tld = models.CharField(max_length=10, unique=False, default='') + cca2 = models.CharField(max_length=2, unique=True, default='') + ccn3 = models.CharField(max_length=3, unique=True, default='') + cca3 = models.CharField(max_length=3, unique=True, default='') + cioc = models.CharField(max_length=3, unique=False, default='') + independent = models.BooleanField( default=True) + status = models.CharField(max_length=255, default='') + unMember = models.BooleanField(default=True) + currencies = models.CharField(max_length=255, default='') + idd_root = models.CharField(max_length=10, default='') + idd_suffixes = models.CharField(max_length=255, default='') + capital = models.CharField(max_length=255, default='') + alt_spellings = models.CharField(max_length=255, default='') + region = models.CharField(max_length=255, default='') + subregion = models.CharField(max_length=255, default='') + languages = models.CharField(max_length=255, default='') + translations_ces_official = models.CharField(max_length=255, default='') + translations_ces_common = models.CharField(max_length=255, default='') + translations_deu_official = models.CharField(max_length=255, default='') + translations_deu_common = models.CharField(max_length=255, default='') + translations_est_official = models.CharField(max_length=255, default='') + translations_est_common = models.CharField(max_length=255, default='') + translations_fin_official = models.CharField(max_length=255, default='') + translations_fin_common = models.CharField(max_length=255, default='') + translations_fra_official = models.CharField(max_length=255, default='') + translations_fra_common = models.CharField(max_length=255, default='') + translations_hrv_official = models.CharField(max_length=255, default='') + translations_hrv_common = models.CharField(max_length=255, default='') + translations_hun_official = models.CharField(max_length=255, default='') + translations_hun_common = models.CharField(max_length=255, default='') + translations_ita_official = models.CharField(max_length=255, default='') + translations_ita_common = models.CharField(max_length=255, default='') + translations_jpn_official = models.CharField(max_length=255, default='') + translations_jpn_common = models.CharField(max_length=255, default='') + translations_kor_official = models.CharField(max_length=255, default='') + translations_kor_common = models.CharField(max_length=255, default='') + translations_nld_official = models.CharField(max_length=255, default='') + translations_nld_common = models.CharField(max_length=255, default='') + translations_per_official = models.CharField(max_length=255, default='') + translations_per_common = models.CharField(max_length=255, default='') + translations_pol_official = models.CharField(max_length=255, default='') + translations_pol_common = models.CharField(max_length=255, default='') + translations_por_official = models.CharField(max_length=255, default='') + translations_por_common = models.CharField(max_length=255, default='') + translations_rus_official = models.CharField(max_length=255, default='') + translations_rus_common = models.CharField(max_length=255, default='') + translations_slk_official = models.CharField(max_length=255, default='') + translations_slk_common = models.CharField(max_length=255, default='') + translations_spa_official = models.CharField(max_length=255, default='') + translations_spa_common = models.CharField(max_length=255, default='') + translations_swe_official = models.CharField(max_length=255, default='') + translations_swe_common = models.CharField(max_length=255, default='') + translations_urd_official = models.CharField(max_length=255, default='') + translations_urd_common = models.CharField(max_length=255, default='') + translations_zho_official = models.CharField(max_length=255, default='') + translations_zho_common = models.CharField(max_length=255, default='') + latlng = models.CharField(max_length=255, default='') + landlocked = models.BooleanField(default=False) + borders = models.CharField(max_length=255, default='') + area = models.FloatField(default=0.0) + flag = models.CharField(max_length=255, default='') + demonyms_eng_f = models.CharField(max_length=255, default='') + demonyms_eng_m = models.CharField(max_length=255, default='') + demonyms_fra_f = models.CharField(max_length=255, default='') + demonyms_fra_m = models.CharField(max_length=255, default='') + callingCodes = models.CharField(max_length=255, default='') def __str__(self): - return self.name - + return self.name_common \ No newline at end of file diff --git a/cmp/views.py b/cmp/views.py index 437ba7e..72731b8 100644 --- a/cmp/views.py +++ b/cmp/views.py @@ -214,7 +214,6 @@ def original_unit(request, army_number): def edit_countries(request): post = request.POST form = editCountryForm(post or None) - breakpoint() if post and form.is_valid(): form.save() return HttpResponse("Country Added") diff --git a/core/settings.py b/core/settings.py index 04fbcd1..f0e5207 100644 --- a/core/settings.py +++ b/core/settings.py @@ -58,6 +58,7 @@ "django.contrib.contenttypes", "django.contrib.sessions", "django.contrib.messages", + "django_extensions", "whitenoise.runserver_nostatic", "django.contrib.staticfiles", "django_htmx", diff --git a/requirements.in b/requirements.in index 27a68e9..759fbf7 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,7 @@ Django==4.2.5 django-environ django-debug-toolbar +django-extensions django-htmx pytest-django sentry-sdk diff --git a/requirements.txt b/requirements.txt index fab74dc..fee2efa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,6 +34,7 @@ django==4.2.5 # crispy-bootstrap5 # django-crispy-forms # django-debug-toolbar + # django-extensions # django-htmx django-crispy-forms==2.1 # via @@ -43,6 +44,8 @@ django-debug-toolbar==4.2.0 # via -r requirements.in django-environ==0.11.2 # via -r requirements.in +django-extensions==3.2.3 + # via -r requirements.in django-htmx==1.16.0 # via -r requirements.in executing==2.0.0