From 6f05b6de1149e62af812cc679f156f8ae77687fa Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Wed, 20 Apr 2022 19:20:25 +0000
Subject: [PATCH] allow to set shortterms and limit their length

---
 fet2020/tasks/forms.py                        |  4 +++
 fet2020/tasks/models.py                       | 29 +++++++++----------
 .../templates/tasks/attachment_create.html    | 10 +++++++
 fet2020/templates/tasks/index.html            |  2 +-
 fet2020/templates/tasks/task_create.html      | 10 +++++++
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py
index 5c8c73ef..9bd7ce6c 100644
--- a/fet2020/tasks/forms.py
+++ b/fet2020/tasks/forms.py
@@ -73,6 +73,7 @@ class TaskCreateForm(forms.ModelForm):
 
         fields = [
             "title",
+            "shortterm",
             "task_list",
             "due_date",
             "assigned_to",
@@ -81,6 +82,7 @@ class TaskCreateForm(forms.ModelForm):
 
         labels = {
             "title": _("Titel des Tasks"),
+            "shortterm": _("Kürzel für den Link (optional)"),
             "task_list": _("Task-Gruppe"),
             "due_date": _("Fälligkeitsdatum"),
             "assigned_to": _("Zuweisen an"),
@@ -165,12 +167,14 @@ class DocumentCreateForm(forms.ModelForm):
 
         fields = [
             "title",
+            "shortterm",
             "date",
             "task",
         ]
 
         labels = {
             "title": _("Titel"),
+            "shortterm": _("Kürzel für den Link (optional)"),
             "date": _("Datum"),
         }
 
diff --git a/fet2020/tasks/models.py b/fet2020/tasks/models.py
index e871fd54..010f5e51 100644
--- a/fet2020/tasks/models.py
+++ b/fet2020/tasks/models.py
@@ -17,8 +17,8 @@ from .managers import TaskManager
 class TaskList(models.Model):
     name = models.CharField(max_length=128)
 
-    shortterm = models.CharField(max_length=128, unique=True, null=True, blank=True)
-    slug = models.SlugField(unique=True, null=True, blank=True)
+    shortterm = models.CharField(max_length=128, unique=True, blank=True)
+    slug = models.SlugField(unique=True, blank=True)
 
     users = models.ManyToManyField(User, blank=True)
 
@@ -36,17 +36,15 @@ class TaskList(models.Model):
 
     def clean(self):
         if not self.shortterm:
-            self.slug = slugify(self.name)
-
-        if not self.slug:
-            self.slug = slugify(self.shortterm)
+            self.shortterm = slugify(self.name)
+        self.slug = slugify(self.shortterm)
 
 
 class Task(models.Model):
     title = models.CharField(verbose_name="Titel", max_length=128)
 
-    shortterm = models.CharField(max_length=128, null=True, blank=True)
-    slug = models.SlugField(null=True, blank=True)
+    shortterm = models.CharField(max_length=25, blank=True)
+    slug = models.SlugField(max_length=25, blank=True)
 
     task_list = models.ForeignKey(
         TaskList, verbose_name="Aufgabenbereich", on_delete=models.CASCADE, null=True
@@ -93,10 +91,8 @@ class Task(models.Model):
 
     def clean(self):
         if not self.shortterm:
-            self.slug = slugify(self.title)
-
-        if not self.slug:
-            self.slug = slugify(self.shortterm)
+            self.shortterm = slugify(self.title[:20])
+        self.slug = slugify(self.shortterm)
 
     def save(self, *args, **kwargs):
         if self.completed and not self.completed_date:
@@ -110,7 +106,9 @@ class Task(models.Model):
 
 class Document(models.Model):
     title = models.CharField(verbose_name="Titel", max_length=128)
-    slug = models.SlugField(null=True, blank=True)
+
+    shortterm = models.CharField(max_length=20, blank=True)
+    slug = models.SlugField(max_length=20, blank=True)
 
     etherpad_key = models.CharField(max_length=50, blank=True)
     date = models.DateField(verbose_name="Datum", default=date.today)
@@ -131,8 +129,9 @@ class Document(models.Model):
         ]
 
     def clean(self):
-        if not self.slug:
-            self.slug = slugify(self.title)
+        if not self.shortterm:
+            self.shortterm = slugify(self.title[:20])
+        self.slug = slugify(self.shortterm)
 
         pad_name = slugify(str(self.date) + "-" + self.task.slug + "-" + self.slug)
         if len(pad_name) > 50:
diff --git a/fet2020/templates/tasks/attachment_create.html b/fet2020/templates/tasks/attachment_create.html
index 69a0ae5b..56782317 100644
--- a/fet2020/templates/tasks/attachment_create.html
+++ b/fet2020/templates/tasks/attachment_create.html
@@ -28,6 +28,16 @@
                 <input type="text" id="id_title" name="title" class="mt-1 block w-full rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50" required>
             </label>
 
+            <label>
+                <span class="text-gray-700 dark:text-gray-200">{{ form.shortterm.label }}</span>
+                {% if form.shortterm.errors %}
+                    <div class="alert alert-danger">
+                        <div class="alert-body">{{ form.shortterm.errors }}</div>
+                    </div>
+                {% endif %}
+                <input type="text" id="id_shortterm" name="shortterm" class="mt-1 block w-full rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50">
+            </label>
+
             <label>
                 <span class="text-gray-700 dark:text-gray-200">{{ form.date.label }}</span>
                 {% if form.date.errors %}
diff --git a/fet2020/templates/tasks/index.html b/fet2020/templates/tasks/index.html
index 1e7502ca..58906d40 100644
--- a/fet2020/templates/tasks/index.html
+++ b/fet2020/templates/tasks/index.html
@@ -95,7 +95,7 @@
                             <label class="flex justify-between items-start">
                                 <div class="inline-flex items-baseline mr-2">
                                     <input type="checkbox" name="checkbox" value="{{ task.id }}" {% if task.completed %}checked{% endif %} class="rounded border-gray-300 dark:border-none text-proprietary shadow-sm focus:border-blue-300 focus:ring focus:ring-offset-0 focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50">
-                                    <span class="ml-2">{{ task.title }} <a href="{% url 'tasks:task-detail' task.id %}" class="inline-block text-proprietary dark:text-proprietary-lighter">Link <i class="fa-solid fa-link"></i></a></span>
+                                    <span class="ml-2">{{ task.title|truncatechars:45 }} <a href="{% url 'tasks:task-detail' task.id %}" class="inline-block text-proprietary dark:text-proprietary-lighter">Link <i class="fa-solid fa-link"></i></a></span>
                                 </div>
                                 {% if task.due_date %}
                                     <div class="inline-flex gap-2 flex-shrink-0">
diff --git a/fet2020/templates/tasks/task_create.html b/fet2020/templates/tasks/task_create.html
index fd2c2668..bd696c44 100644
--- a/fet2020/templates/tasks/task_create.html
+++ b/fet2020/templates/tasks/task_create.html
@@ -28,6 +28,16 @@
                 <input type="text" id="id_title" name="title" class="mt-1 block w-full rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50" required>
             </label>
 
+            <label>
+                <span class="text-gray-700 dark:text-gray-200">{{ form.shortterm.label }}</span>
+                {% if form.shortterm.errors %}
+                    <div class="alert alert-danger">
+                        <div class="alert-body">{{ form.shortterm.errors }}</div>
+                    </div>
+                {% endif %}
+                <input type="text" id="id_shortterm" name="shortterm" class="mt-1 block w-full rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50">
+            </label>
+
             <label>
                 <span class="text-gray-700 dark:text-gray-200">{{ form.task_list.label }}</span>
                 {% if form.task_list.errors %}