fixed models.py for wordlist: word should be unique and mandatory, ex…

…planation should also be mandatory
HoiskolensChemikerforening · Nov 10, 2024 · 6530ace · 6530ace
1 parent 26b6081
commit 6530ace
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/chemie/wordlist/migrations/0001_initial.py b/chemie/wordlist/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.28 on 2024-11-10 10:35
+# Generated by Django 2.2.28 on 2024-11-10 11:54
 
 from django.conf import settings
 from django.db import migrations, models
@@ -45,7 +45,7 @@ class Migration(migrations.Migration):
                 ('date', models.DateField(auto_now_add=True, verbose_name='Dato')),
                 ('picture', models.ImageField(blank=True, null=True, upload_to='posters', verbose_name='Bilde')),
                 ('secret', models.BooleanField(default=False, verbose_name='Hemmelig?')),
-                ('word', models.CharField(blank=True, max_length=100, verbose_name='infinitiv')),
+                ('word', models.CharField(max_length=100, unique=True, verbose_name='infinitiv')),
                 ('present', models.CharField(blank=True, max_length=100, verbose_name='presens')),
                 ('past', models.CharField(blank=True, max_length=100, verbose_name='preteritum')),
                 ('future', models.CharField(blank=True, max_length=100, verbose_name='presens futurum')),
@@ -64,7 +64,7 @@ class Migration(migrations.Migration):
                 ('date', models.DateField(auto_now_add=True, verbose_name='Dato')),
                 ('picture', models.ImageField(blank=True, null=True, upload_to='posters', verbose_name='Bilde')),
                 ('secret', models.BooleanField(default=False, verbose_name='Hemmelig?')),
-                ('word', models.CharField(blank=True, max_length=100, verbose_name='ubestemt_entall')),
+                ('word', models.CharField(max_length=100, unique=True, verbose_name='ubestemt_entall')),
                 ('indefinite_plural', models.CharField(blank=True, max_length=100, verbose_name='ubestemt_flertall')),
                 ('definite_singular', models.CharField(blank=True, max_length=100, verbose_name='bestemt_entall')),
                 ('definite_plural', models.CharField(blank=True, max_length=100, verbose_name='bestemt_flertall')),
@@ -83,7 +83,7 @@ class Migration(migrations.Migration):
                 ('date', models.DateField(auto_now_add=True, verbose_name='Dato')),
                 ('picture', models.ImageField(blank=True, null=True, upload_to='posters', verbose_name='Bilde')),
                 ('secret', models.BooleanField(default=False, verbose_name='Hemmelig?')),
-                ('word', models.CharField(blank=True, max_length=100, verbose_name='positiv')),
+                ('word', models.CharField(max_length=100, unique=True, verbose_name='positiv')),
                 ('comparative', models.CharField(blank=True, max_length=100, verbose_name='komparativ')),
                 ('superlative', models.CharField(blank=True, max_length=100, verbose_name='superlativ')),
                 ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Forfatter')),

diff --git a/chemie/wordlist/models.py b/chemie/wordlist/models.py
@@ -37,8 +37,8 @@ class Noun(AbstractWord):
     word = models.CharField(
         max_length=100,
         verbose_name="ubestemt_entall",
-        unique=False,
-        blank=True,
+        unique=True,
+        blank=False,
     )
     indefinite_plural = models.CharField(
         max_length=100,
@@ -62,7 +62,7 @@ def __str__(self):
 
 class Verb(AbstractWord):
     word = models.CharField(
-        max_length=100, verbose_name="infinitiv", unique=False, blank=True
+        max_length=100, verbose_name="infinitiv", unique=True, blank=False
     )
     present = models.CharField(
         max_length=100, verbose_name="presens", unique=False, blank=True
@@ -83,7 +83,7 @@ def __str__(self):
 
 class Adjective(AbstractWord):
     word = models.CharField(
-        max_length=100, verbose_name="positiv", unique=False, blank=True
+        max_length=100, verbose_name="positiv", unique=True, blank=False
     )
     comparative = models.CharField(
         max_length=100, verbose_name="komparativ", unique=False, blank=True

diff --git a/chemie/wordlist/views.py b/chemie/wordlist/views.py
@@ -191,10 +191,8 @@ def ordListe(request):
 def createWord(request):
     form = CheckWhatFormForm()
     formindex = 0
-
 
-
-    if request.method == "POST" and "check" in request.POST: 
+    if request.method == "POST" and "check" in request.POST:
         if request.POST["choice"] == "1" and "check" in request.POST:
             form = WordInput()
             formindex = 1
@@ -208,9 +206,7 @@ def createWord(request):
             form = AdjectiveInput()
             formindex = 4
 
-
     if request.method == "POST" and "check" not in request.POST:
-
         if ("nytt_tag_1" or "tag_1") in request.POST:
             form = WordInput(data=request.POST, files=request.FILES)
         if ("nytt_tag_2" or "tag_2") in request.POST:
@@ -220,9 +216,7 @@ def createWord(request):
         if ("nytt_tag_4" or "tag_4") in request.POST:
             form = AdjectiveInput(data=request.POST, files=request.FILES)
 
-
         if "nytt_tag_3" in request.POST and form.is_valid():
-
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -235,7 +229,7 @@ def createWord(request):
             )
             return HttpResponseRedirect(reverse("wordlist:innsending"))
 
-        if "nytt_tag_2" in request.POST and form.is_valid():
+        elif "nytt_tag_2" in request.POST and form.is_valid():
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -248,7 +242,7 @@ def createWord(request):
             )
             return HttpResponseRedirect(reverse("wordlist:innsending"))
 
-        if "nytt_tag_4" in request.POST and form.is_valid():
+        elif "nytt_tag_4" in request.POST and form.is_valid():
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -261,7 +255,7 @@ def createWord(request):
             )
             return HttpResponseRedirect(reverse("wordlist:innsending"))
 
-        if "nytt_tag_1" in request.POST and form.is_valid():
+        elif "nytt_tag_1" in request.POST and form.is_valid():
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -274,7 +268,7 @@ def createWord(request):
             )
             return HttpResponseRedirect(reverse("wordlist:innsending"))
 
-        if "tag_3" in request.POST and form.is_valid():
+        elif "tag_3" in request.POST and form.is_valid():
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -287,7 +281,7 @@ def createWord(request):
             )
             return HttpResponseRedirect(reverse("wordlist:index"))
 
-        if "tag_2" in request.POST and form.is_valid():
+        elif "tag_2" in request.POST and form.is_valid():
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -300,7 +294,7 @@ def createWord(request):
             )
             return HttpResponseRedirect(reverse("wordlist:index"))
 
-        if "tag_4" in request.POST and form.is_valid():
+        elif "tag_4" in request.POST and form.is_valid():
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -313,7 +307,7 @@ def createWord(request):
             )
             return HttpResponseRedirect(reverse("wordlist:index"))
 
-        if "tag_1" in request.POST and form.is_valid():
+        elif "tag_1" in request.POST and form.is_valid():
             form_instace = form.save(commit=False)
             form_instace.author = request.user
             form_instace.save()
@@ -325,8 +319,15 @@ def createWord(request):
                 extra_tags="Big slay; et nytt ord!",
             )
             return HttpResponseRedirect(reverse("wordlist:index"))
+        else: 
+            messages.add_message(
+                request,
+                messages.ERROR,
+                f"Ditt ord ble ikke lagret.",
+                extra_tags="Dette kan skyldes ",
+            )
 
-    context = {"form": form, "formindex":formindex}
+    context = {"form": form, "formindex": formindex}
     return render(request, "createWord.html", context)
 
 
@@ -419,9 +420,7 @@ def details(
     if klassetall == 4:
         ordet = (get_object_or_404(Word, id=pk), klassetall)
 
-    context = {
-        "ord": ordet
-    }
+    context = {"ord": ordet}
     return render(request, "details.html", context)