frontend kikoo

tickets/templates/tickets/aff_ticket.html

@@ -31,7 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
 
-<h2> Ticket #{{ticket.id}} </h2>
+<h2> Ticket #{{ticket.id}} 
+{% if ticket.solved %}
+<span class="badge badge-success">{% trans "Solved" %}</span>
+{% else %}
+<span class="badge badge-danger">{% trans "Not Solved" %}</span>
+{% endif %}
+</h2>
 
 <div class="panel panel-default">
 <div class="panel-heading">
@@ -59,13 +65,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% bootstrap_form changestatusform %}
 
     {% if not ticket.solved %}
-        {% bootstrap_button "Résoudre" button_type="submit" button_class='btn-info' %}
+        {% bootstrap_button "Mark as Solved" button_type="submit" button_class='btn-info' %}
     {% else %}
-        {% bootstrap_button "Ouvrir" button_type="submit" button_class='btn-warning' %}
+        {% bootstrap_button "Mark as not Solved" button_type="submit" button_class='btn-warning' %}
     {% endif %}
 </form>
 </div>
 </div>
 </div>
 
+
+<div class="text-right">
+    <a type="button" href="{% url 'tickets:aff-tickets' %}" class="btn btn-primary"><p>{% trans "Tous les tickets" %}</p></a>
+</div>
+
 {% endblock %}

tickets/templates/tickets/aff_tickets.html

@@ -28,8 +28,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Tickets" %}{% endblock %}
 
 {% block content %}
+
+
+<div class="container-fluid">
+<hr class="col-sm-12">
+  <div class="row justify-content-start">
+    <div class="col-sm-4">
+      <span class="badge badge-light">{{ nbr_tickets }}</span> {% trans "Tickets" %}
+    </div>
+    <div class="col-sm-4">
+      <span class="badge badge-light">{{ nbr_tickets_unsolved }}</span>{% trans "Not Solved Tickets" %}
+    </div>
+    <div class="col-sm-4">
+      <span>{% trans "Last Ticket:" %} {{ last_ticket_date }}</span>
+    </div>
+  </div>
+<hr class="col-sm-12">
+</div>
+
 <div class="table-responsiv">
-    <table class="table" id="machines_table">
+    <table class="table">
     <thead>
         <tr>
             <th scope="col"></th>

tickets/views.py

@@ -57,8 +57,15 @@ def aff_ticket(request,ticketid):
 def aff_tickets(request):
     """ Vue d'affichage de tout les tickets """
     tickets = Ticket.objects.all().order_by('-date')
-    return render(request,'tickets/index.html',
-                    {'tickets_list':tickets})
+    last_ticket_date = tickets.first().date
+    nbr_tickets = tickets.count()
+    nbr_tickets_unsolved = Ticket.objects.filter(solved=False).count()
+    context = {'tickets_list':tickets,
+                'last_ticket_date':last_ticket_date,
+                'nbr_tickets':nbr_tickets,
+                'nbr_tickets_unsolved':nbr_tickets_unsolved}
+
+    return render(request,'tickets/index.html',context=context)
 
 def edit_preferences(request):
     """ Vue d'édition des préférences des tickets """