Add comments function

Author: tdunn891

tickets/admin.py

@@ -1,5 +1,6 @@
 from django.contrib import admin
-from .models import Ticket
+from .models import Ticket, Comment
 
 # Register your models here.
-admin.site.register(Ticket)
+admin.site.register(Ticket)
+admin.site.register(Comment)

tickets/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from .models import Ticket
+from .models import Ticket, Comment
 
 TICKET_TYPES = (('Bug', 'Bug'), ('Feature', 'Feature'))
 
@@ -12,6 +12,26 @@ class Meta:
         model = Ticket
         widgets = {
             'summary': forms.TextInput(attrs={'placeholder': 'Summary'}),
-            'description': forms.Textarea(attrs={'placeholder': 'Further Details'}),
+            'description': forms.Textarea(attrs={'placeholder': 'Details', 'rows': 4}),
+            # 'tags': forms.TextInput(attrs={'placeholder': 'eg. Project Alpha, Testing'}),
         }
         fields = ('ticket_type', 'summary', 'description', 'tags')
+
+
+class AddCommentForm(forms.ModelForm):
+    """Adds a comment"""
+    class Meta:
+        model = Comment
+        fields = ('comment_body',)
+        widgets = {
+            'comment_body': forms.Textarea(attrs={'placeholder': 'Leave a comment', 'rows': 3})
+        }
+        labels = {
+            # 'comment_body': ('test'),
+            'comment_body': '',
+        }
+        error_messages = {
+            'comment_body': {
+                'required': '',
+            }
+        }

tickets/migrations/0022_comment.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2020-02-19 22:42
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('tickets', '0021_auto_20200219_1713'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Comment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('comment', models.CharField(max_length=300)),
+                ('date', models.DateTimeField(auto_now_add=True)),
+                ('ticket_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tickets.Ticket')),
+                ('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name_plural': 'Comments',
+            },
+        ),
+    ]

tickets/migrations/0023_auto_20200219_2259.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2020-02-19 22:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0022_comment'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='comment',
+            old_name='comment',
+            new_name='comment_body',
+        ),
+    ]

tickets/migrations/0024_auto_20200220_1743.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2020-02-20 17:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0023_auto_20200219_2259'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='comment',
+            old_name='ticket_id',
+            new_name='ticket',
+        ),
+        migrations.RenameField(
+            model_name='comment',
+            old_name='user_id',
+            new_name='user',
+        ),
+    ]

tickets/models.py

@@ -15,7 +15,7 @@ class Ticket(models.Model):
     created_date = models.DateTimeField(auto_now_add=True)
     status = models.CharField(max_length=50, default='New')
     priority = models.CharField(max_length=50, default='Medium')
-    submitted_by = models.ForeignKey(User)
+    submitted_by = models.ForeignKey(User, on_delete=models.CASCADE)
     assigned_to = models.CharField(max_length=200, default='Unassigned')
     description = models.TextField()
     tags = TaggableManager(blank=True)
@@ -27,3 +27,16 @@ def __str__(self):
     class Meta:
         verbose_name_plural = "Tickets"
     # attachments = models.CharField(maximum_length=200)
+
+
+class Comment(models.Model):
+    ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    comment_body = models.CharField(max_length=300)
+    date = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.comment_body
+
+    class Meta:
+        verbose_name_plural = "Comments"

tickets/templates/tickets.html

@@ -7,6 +7,7 @@ <h2>Tickets</h2>
 <hr>
 {% endblock %}
 {% block content %}
+<a class="btn btn-success" href="{% url 'add_ticket' %}">Raise Ticket</a>
 <input type="text" placeholder="Search"><button class="btn btn-info">Go</button></input>
 <br>
 <br>
@@ -46,5 +47,4 @@ <h2>Tickets</h2>
       {% endfor %}
    </tbody>
 </table>
-<a class="btn btn-success" href="{% url 'add_ticket' %}">Raise Ticket</a>
 {% endblock %}

tickets/templates/view_ticket.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load bootstrap_tags %}
 {% block title %}
 View Ticket | {{ ticket.id }}
 {% endblock %}
@@ -18,16 +19,10 @@ <h4>Details</h4>
             </tr>
          </thead>
          <tbody>
-            <!-- {% for key, value in ticket.items %}
             <tr>
-               <th scope="row">{{ key }}</th>
-               <td>{{ value }}</td>
+               <th>Summary</th>
+               <td>{{ ticket.summary }}</td>
             </tr>
-            {% endfor %} -->
-            <!-- <tr>
-               <th>Ticket ID</th>
-               <td>{{ ticket.id }}</td>
-            </tr> -->
             <tr>
                <th>Ticket Type</th>
                <td>{{ ticket.ticket_type }}</td>
@@ -64,11 +59,11 @@ <h4>Details</h4>
       </table>
       <a class="btn btn-outline-primary" href="{% url 'edit_ticket' ticket.id %}">Edit</a>
       {% if ticket.status != 'Cancelled' %}
-      <a class="btn btn-danger" href="{% url 'cancel_ticket' ticket.id %}">Cancel</a>
+      <a class="btn btn-outline-warning" href="{% url 'cancel_ticket' ticket.id %}">Cancel</a>
       {% endif %}
+      <a class="btn btn-outline-danger" href="{% url 'delete_ticket' ticket.id %}">Delete</a>
    </div>
    <div class="col col-6">
-      {% comment %} History {% endcomment %}
       <h4>Change History</h4>
       <table class="table table-sm">
          <thead>
@@ -90,20 +85,21 @@ <h4>Change History</h4>
       </table>
    </div>
 </div>
-
 <hr>
 <div class="row">
-   <div class="col col-12">
-      {% comment %} Comments {% endcomment %}
+   <div class="col col-8">
       <h4>Comments</h4>
       <ul class="list-group">
-         <li class="list-group-item">I agree</li>
-         <li class="list-group-item">Same</li>
+         {% for comment in comments %}
+         <li class="list-group-item"><b>@{{ comment.user }}</b><span class="float-right">{{ comment.date }}</span>
+            <br>{{ comment.comment_body }}
+         </li>
+         {% endfor %}
       </ul>
-      <br>
-      <form method="POST">
-         <input type="text" class="form-control" placeholder="Leave Comment">
-         <a class="btn btn-primary" href="#">Submit</a>
+      <form method="post" enctype="multipart/form-data">
+         {% csrf_token %}
+         {{ form | as_bootstrap }}
+         <button class="btn btn-outline-primary" type="submit">Submit</button>
       </form>
    </div>
 </div>

tickets/urls.py

@@ -8,4 +8,8 @@
     url(r'^edit_ticket/(?P<pk>\d+)/$', views.edit_ticket, name='edit_ticket'),
     url(r'^cancel_ticket/(?P<pk>\d+)/$',
         views.cancel_ticket, name='cancel_ticket'),
+    url(r'^delete_ticket/(?P<pk>\d+)/$',
+        views.delete_ticket, name='delete_ticket'),
+    # url(r'^add_comment/$', views.add_comment, name='add_comment'),
+    # url(r'^add_comment/(?P<pk>\d+)/$', views.add_comment, name='add_comment'),
 ]

tickets/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponse
-from .models import Ticket
-from .forms import AddTicketForm
+from .models import Ticket, Comment
+from .forms import AddTicketForm, AddCommentForm
 
 
 # Create your views here.
@@ -15,7 +15,17 @@ def view_tickets(request):
 def view_ticket(request, pk):
     """Display single ticket"""
     ticket = Ticket.objects.filter(id=pk)[0]
-    return render(request, 'view_ticket.html', {'ticket': ticket})
+    comments = Comment.objects.filter(ticket_id=pk)
+    # If post (add comment button click)
+    form = AddCommentForm(request.POST, request.FILES, instance=None)
+    if (request.method == "POST"):
+        if form.is_valid():
+            comment_body = form.cleaned_data.get("comment_body")
+            comment = Comment(
+                ticket_id=pk, comment_body=comment_body, user_id=request.user.id)
+            comment.save()
+            return redirect(view_ticket, pk)
+    return render(request, 'view_ticket.html', {'ticket': ticket, 'comments': comments, 'form': form})
 
 
 def add_ticket(request, pk=None):
@@ -56,6 +66,28 @@ def cancel_ticket(request, pk=None):
     ticket = get_object_or_404(Ticket, pk=pk) if pk else None
     ticket.status = "Cancelled"
     ticket.priority = "N/A"
-    # set priorty to NA?
     ticket.save()
     return redirect(view_tickets)
+
+
+def delete_ticket(request, pk=None):
+    ticket = get_object_or_404(Ticket, pk=pk) if pk else None
+    ticket.delete()
+    return redirect(view_tickets)
+
+
+# def add_comment(request):
+#     """TESTAdd Ticket"""
+#     print('test')
+#     # On Submit
+#     if (request.method == "POST"):
+#         form = AddCommentForm(request.POST, request.FILES, instance=None)
+#         if form.is_valid():
+#             comment = form.save(commit=False)
+#             # ticket.submitted_by = request.user
+#             comment.save()
+#             form.save_m2m()
+#             return redirect(view_tickets)
+#     else:
+#         form = AddCommentForm(instance=None)
+#         return render(request, 'view_ticket.html', {'form': form})