Continue implementing message creat

Author: spapas

etsd/msgs/forms.py

@@ -1,5 +1,13 @@
 from django import forms
+from django_tools.middlewares import ThreadLocal
+from django.utils.translation import ugettext as _
+
 from . import models
+from etsd.keys.models import PublicKey
+
+
+def has_active_public_key(authority):
+    return PublicKey.objects.filter(authority=authority, status="ACTIVE").exists()
 
 
 class ParticipantInlineForm(forms.ModelForm):
@@ -9,6 +17,48 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         super(ParticipantInlineForm, self).__init__(*args, **kwargs)
-        
+        user = ThreadLocal.get_current_user()
+
         new_choices = list(self.fields["kind"].choices)
         self.fields["kind"].choices = new_choices[:3]
+
+        auth_qs = self.fields["authority"].queryset
+        self.fields["authority"].queryset = auth_qs.exclude(id=user.get_authority().id)
+
+    def clean(self):
+        authority = self.cleaned_data.get("authority")
+        if authority and not has_active_public_key(authority):
+            self.add_error(
+                "authority",
+                _("This authority does not have an active public key!"),
+            )
+
+
+class MessageCreateForm(forms.ModelForm):
+    class Meta:
+        model = models.Message
+        fields = ["category", "kind", "available_to_sender", "rel_message"]
+
+    def clean(self):
+        user = ThreadLocal.get_current_user()
+        my_authority = user.get_authority()
+        if self.cleaned_data["available_to_sender"] and not has_active_public_key(
+            my_authority
+        ):
+            self.add_error(
+                "available_to_sender",
+                _("Your authority does not have an active public key!"),
+            )
+
+        kind = self.cleaned_data.get("kind")
+        rel_message = self.cleaned_data.get("rel_message")
+        if kind == "NEW" and rel_message:
+            self.add_error(
+                "rel_message",
+                _("You cannot add a related message when message kind is New!"),
+            )
+        if kind != "NEW" and not rel_message:
+            self.add_error(
+                "rel_message",
+                _("You must provide a related message when message kind is not New!"),
+            )

etsd/msgs/models.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.db.models import Max
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 
@@ -101,6 +102,9 @@ def send(self):
         self.protocol = max_protocol + 1
         self.status = "SENT"
         self.save()
+    
+    def get_absolute_url(self):
+        return reverse("message_detail", kwargs={"pk": self.pk})
 
 
 PARTICIPANT_KIND_CHOICES = (

etsd/msgs/tables.py

@@ -1,22 +1,34 @@
 import django_tables2 as tables
 from django_tables2_column_shifter.tables import ColumnShiftTable
-from . import models
 from django.utils.html import mark_safe
+from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as __
+
 from django_tables2.utils import A
 
+from . import models
+
+PROTOCOL = """
+{{% if record.protocol %}}
+    {{{{ record.protocol }}}} / {{{{ record.protocol_year }}}}
+{{% else %}}
+    {0}
+{{% endif %}}
+""" .format( _('Draft message'))
+
 
 class MessageTable(ColumnShiftTable):
-    # id = tables.LinkColumn(
-    #    "app_detail",
-    #   args=[A("id")],
-    #    verbose_name="ΚΩΔ",
-    #    attrs={"a": {"class": "btn btn-primary btn-sm"}},
-    # )
+    id = tables.LinkColumn(
+        "message_detail",
+        args=[A("id")],
+        verbose_name="ID",
+        attrs={"a": {"class": "btn btn-primary btn-sm"}},
+    )
 
-    proto = tables.TemplateColumn("{{ record.protocol }} / {{ record.protocol_year }}")
+    proto = tables.TemplateColumn(PROTOCOL, verbose_name=__('Protocol'), orderable=False)
 
     class Meta:
         model = models.Message
-        fields = ("id", "proto", "sent_on", "kind" , "status", "category", "rel_message")
+        fields = ("id", "proto", "sent_on", "kind", "status", "category", "rel_message")
         attrs = {"class": "table table-sm table-stripped"}
         empty_text = "No entries"

etsd/msgs/templates/msgs/message_detail.html

@@ -0,0 +1,22 @@
+{% extends "site_base.html" %}
+{% load i18n %}
+
+
+
+{% block head_title %}{% trans "Message detail" %}{% endblock %}
+{% block page_title %}{% trans "Message detail" %}{% endblock %}
+{% block page_content %}
+
+
+{% for mp in message.participant_set.all %}
+  {{ mp.authority }}: {{ mp.get_kind_display }}
+  
+{% endfor %}
+
+<div class="row">
+    <div class="col-md-12">
+		<a class='btn btn-info' href='{% url "message_list" %}'>Return</a>
+    </div>
+</div>
+
+{% endblock %}

etsd/msgs/urls.py

@@ -25,6 +25,13 @@ def any_permission_required(*args):
         ),
         name="message_list",
     ),
+    path(
+        "message_detail/<int:pk>/",
+        any_permission_required("core.admin", "core.user")(
+            views.MessageDetailView.as_view()
+        ),
+        name="message_detail",
+    ),    
     path(
         "new/",
         any_permission_required("core.admin", "core.user")(

etsd/msgs/views.py

@@ -1,5 +1,6 @@
-from django.views.generic import ListView
-
+from django.views.generic import ListView, DetailView
+from django.contrib import messages
+from django.utils.translation import ugettext as _
 from django_tables2 import RequestConfig
 from django_tables2.export.views import ExportMixin
 
@@ -48,4 +49,27 @@ class ParticipantInline(InlineFormSetFactory):
 class MessageCreateView(CreateWithInlinesView):
     model = models.Message
     inlines = [ParticipantInline]
-    fields = ["category", "kind", "available_to_sender", "rel_message"]
+    form_class = forms.MessageCreateForm
+
+    def forms_valid(self, form, inlines):
+        r = super().forms_valid(form, inlines)
+        messages.info(
+            self.request,
+            _("Draft message created"),
+        )
+        msg = form.instance
+        models.Participant.objects.create(
+            message=msg,
+            authority=self.request.user.get_authority(),
+            kind='SENDER'
+        )
+        return r
+
+
+class MessageDetailView(MessageAccessMixin, DetailView):
+    model = models.Message
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+
+        return context