Skip to content

Commit df89335

Browse files
tdunn891tdunn891
committed
Removed unnecessary comments from tickets templates
1 parent 45cd3e1 commit df89335

File tree

6 files changed

+178
-197
lines changed

6 files changed

+178
-197
lines changed

‎tickets/templates/add_ticket.html‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{% endblock %}
1212
{% block container-class %}add-ticket-container{% endblock %}
1313
{% block content %}
14-
<div class="jumbotron mx-auto" style="max-width: 1400px;">
14+
<div class="jumbotron mx-auto" id="add-ticket-jumbotron">
1515
<div class="row">
1616
<div class="col-12">
1717
<form method="post" enctype="multipart/form-data">
@@ -44,16 +44,11 @@
4444
</div>
4545
</div>
4646
<hr>
47-
<button class="btn btn-primary" type="submit" style="min-width: 180px;"><span
47+
<button class="btn btn-primary" id="add-ticket-btn" type="submit"><span
4848
class="material-icons align-bottom">send</span> Submit</button>
4949
<a class="" href="{% url 'tickets' %}">Cancel</a>
5050
</form>
5151
</div>
5252
</div>
5353
</div>
5454
{% endblock %}
55-
56-
{% block scripts %}
57-
<!-- Bootstrap tags input js -->
58-
<script type="text/javascript" src="{% static 'js/bootstrap-tagsinput.js' %}"></script>
59-
{% endblock %}

‎tickets/templates/dashboard.html‎

Lines changed: 32 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -12,96 +12,46 @@
1212
{% block container-class %}dashboard-container{% endblock %}
1313
{% block title %}TrackIt | Dashboard{% endblock %}
1414
{% block page_heading %}
15-
<i class="material-icons-outlined">assessment</i> Dashboard
15+
<i class="material-icons-outlined align-bottom heading-icon">assessment</i> Dashboard
1616
<div id="filtered-count" class="float-right"></div>
1717
<hr>
1818
{% endblock %}
1919
{% block content %}
20-
21-
<!-- Internal Panes Nav Items -->
22-
<nav>
23-
<div class="nav nav-tabs" id="nav-tab" role="tablist">
24-
<a class="nav-item nav-link active" id="nav-tickets-tab" data-toggle="tab" href="#nav-tickets" role="tab"
25-
aria-controls="nav-tickets" aria-selected="true">All Tickets</a>
26-
<a class="nav-item nav-link" id="nav-ph-tab" data-toggle="tab" href="#nav-ph" role="tab" aria-controls="nav-ph"
27-
aria-selected="false">Aged Tickets (>14days)</a>
28-
</div>
29-
</nav>
30-
31-
<!-- Internal Panes -->
32-
<div class="tab-content" id="nav-tabContent">
33-
<!-- Tickets Pane -->
34-
<div class="tab-pane fade show active" id="nav-tickets" role="tabpanel" aria-labelledby="nav-tickets-tab">
35-
<br>
36-
<div class="row">
37-
<div class="col-12">
38-
<div id="submitted-by-dropdown"></div>
39-
<br>
40-
</div>
20+
<div class="row">
21+
<div class="col-md-12 col-lg-4 text-center">
22+
<div class="jumbotron">
23+
<h5 class="lead">Open/Closed Tickets</h5>
24+
<div id="open-closed-tickets-pie-chart"></div>
25+
</div>
26+
<div class="jumbotron">
27+
<h5 class="lead">Status</h5>
28+
<div id="statusRowChart"></div>
4129
</div>
42-
<div class="row">
43-
<div class="col col-md-8">
44-
<div class="jumbotron text-center">
45-
<h5 class="lead">Ticket Status by Date Submitted</h5>
46-
<div id="statusByMonthBarChart"></div>
47-
</div>
48-
</div>
49-
<div class="col-md-4 text-center">
50-
<div class="jumbotron">
51-
<h5 class="lead">Open Tickets Count</h5>
52-
<div id="open-closed-tickets-pie-chart"></div>
53-
</div>
54-
<div class="jumbotron">
55-
<h5 class="lead">Status</h5>
56-
<div id="statusRowChart"></div>
57-
</div>
58-
</div>
30+
</div>
31+
<div class="col col-md-12 col-lg-8">
32+
<div class="jumbotron text-center">
33+
<h5 class="lead">Ticket Status by Date Submitted</h5>
34+
<div id="statusByMonthBarChart"></div>
5935
</div>
60-
<div class="row">
61-
<div class="col-md-4">
62-
<div class="jumbotron text-center">
63-
<h5 class="lead">Type</h5>
64-
<div id="ticketTypeRowChart"></div>
65-
</div>
66-
</div>
67-
<div class="col-md-4">
68-
<div class="jumbotron text-center">
69-
<h5 class="lead">Priority</h5>
70-
<div id="priorityRowChart"></div>
71-
</div>
72-
</div>
73-
<div class="col-md-4">
74-
<div class="jumbotron text-center">
75-
<h5 class="lead">In-Demand Tickets</h5>
76-
<div id="upvotesRowChart"></div>
77-
</div>
78-
</div>
36+
</div>
37+
</div>
38+
<div class="row">
39+
<div class="col-md-4">
40+
<div class="jumbotron text-center">
41+
<h5 class="lead">Type</h5>
42+
<div id="ticketTypeRowChart"></div>
7943
</div>
80-
<!-- <div class="row">
81-
<div class="col-12">
82-
<div class="jumbotron text-center">
83-
<h5 class="lead">Age vs Priority Scatter</h5>
84-
<div id="age-priority-scatter-plot"></div>
85-
</div>
86-
</div>
44+
</div>
45+
<div class="col-md-4">
46+
<div class="jumbotron text-center">
47+
<h5 class="lead">Priority</h5>
48+
<div id="priorityRowChart"></div>
8749
</div>
88-
<div class="row">
89-
<div class="col-12">
90-
<div class="jumbotron text-center">
91-
<h5 class="lead">Average Days to Resolve</h5>
92-
<div id="average-days-to-resolve"></div>
93-
</div>
94-
</div>
95-
</div> -->
9650
</div>
97-
<!-- placeholder Pane -->
98-
<div class="tab-pane fade show" id="nav-ph" role="tabpanel" aria-labelledby="nav-ph-tab">
99-
<br>
100-
<div class="row">
101-
<div class="col">
102-
<h5 class="lead">Aged Tickets</h5>
103-
<div id="agedRowChart"></div>
104-
</div>
51+
<div class="col-md-4">
52+
<div class="jumbotron text-center">
53+
<h5 class="lead">In-Demand Tickets</h5>
54+
<div id="upvotesRowChart"></div>
10555
</div>
10656
</div>
10757
</div>
@@ -117,8 +67,6 @@ <h5 class="lead">Aged Tickets</h5>
11767
<!-- dc.js -->
11868
<script src="https://cdnjs.cloudflare.com/ajax/libs/dc/3.1.9/dc.min.js"
11969
integrity="sha256-unWojco2TOb01l2JB43J27kr4UQIkHk+PWce5A2eq8Y=" crossorigin="anonymous"></script>
120-
<!-- dc-tableview-light.js NOT USED-->
121-
<!-- <script src="{% static 'js/dc-tableview-light.min.js' %}"></script> -->
122-
<!-- main.js -->
70+
<!-- dashboard.js -->
12371
<script src="{% static 'js/dashboard.js' %}"></script>
12472
{% endblock %}

‎tickets/templates/edit_ticket.html‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,3 @@
7070
</div>
7171
</div>
7272
{% endblock %}
73-
74-
{% block scripts %}
75-
<!-- Bootstrap tags input js -->
76-
<script type="text/javascript" src="{% static 'js/bootstrap-tagsinput.js' %}"></script>
77-
{% endblock %}

‎tickets/templates/kanban.html‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,23 @@
33
{% block title %}TrackIt | Kanban{% endblock %}
44
{% block container-class %}kanban-container{% endblock %}
55
{% block page_heading %}
6-
<i class="material-icons-outlined">view_week</i> Kanban ({{ tickets|length }})
6+
<i class="material-icons-outlined heading-icon align-bottom">view_week</i> Kanban ({{ tickets|length }})
77

88
<div class="form-check float-right" id="hide-cancelled-checkbox">
99
<br>
1010
<input type="checkbox" class="form-check-input" id="cancelled-checkbox" checked>
11-
<label class="form-check-label" for="cancelled-checkbox"><i class="material-icons-outlined align-middle">
11+
<label class="form-check-label" for="cancelled-checkbox">
12+
<i class="material-icons-outlined align-middle">
1213
visibility_off
1314
</i> Hide Cancelled ({{ cancelled_tickets|length}})
1415
</label>
1516
</div>
1617
<hr>
17-
<!-- <a href="?my_tickets_only=true" class="btn btn-primary">Mine</a> -->
1818
{% endblock %}
1919
{% block content %}
20-
<!-- <div class="row">
21-
<div class="col">
22-
<div class="form-check">
23-
<input type="checkbox" class="form-check-input" id="cancelled-checkbox" checked>
24-
<label class="form-check-label" for="cancelled-checkbox"><i class="material-icons-outlined align-middle">
25-
visibility_off
26-
</i> Hide Cancelled ({{ cancelled_tickets|length}})
27-
</label>
28-
</div>
29-
</div>
30-
</div> -->
31-
3220
<div class="row">
3321
<!-- 'New' Column -->
34-
<div class="col kanban-col">
22+
<div class="col-md-4 kanban-col">
3523
<div class="jumbotron kanban-new">
3624
<h5 class="text-center bg-info-light"><i class="material-icons-outlined align-bottom">local_activity</i> New
3725
({{ new_tickets|length }})</h5>
@@ -101,7 +89,7 @@ <h6 class="dropdown-header">Move to:</h6>
10189
</div>
10290

10391
<!-- In Progress Column -->
104-
<div class="col kanban-col">
92+
<div class="col-md-4 kanban-col">
10593
<div class="jumbotron kanban-in-progress">
10694
<h5 class="text-center bg-warning-light"><i class="material-icons align-bottom">schedule</i> In Progress
10795
({{ in_progress_tickets|length }})
@@ -172,7 +160,7 @@ <h6 class="dropdown-header">Move to:</h6>
172160
</div>
173161

174162
<!-- Resolved Column-->
175-
<div class="col kanban-col">
163+
<div class="col-md-4 kanban-col">
176164
<div class="jumbotron kanban-resolved">
177165
<h5 class="text-center bg-success-light"><i class="material-icons align-bottom">done</i> Resolved
178166
({{ resolved_tickets|length }})
@@ -184,7 +172,6 @@ <h6 class="card-title">
184172
<a href="{% url 'view_ticket' ticket.id %}" data-toggle="tooltip" data-placement="bottom"
185173
title="{{ ticket.description }}">{{ ticket.summary }}
186174
</a>
187-
188175
<!-- Priority Badge -->
189176
<span class="text-muted">
190177
<span class="badge
@@ -198,7 +185,6 @@ <h6 class="card-title">
198185
float-right">{{ ticket.priority }}
199186
</span>
200187
</span>
201-
202188
</h6>
203189

204190
<!-- Bug/Feature Icon -->
@@ -244,7 +230,7 @@ <h6 class="dropdown-header">Move to:</h6>
244230
</div>
245231

246232
<!-- Cancelled Column -->
247-
<div class="col kanban-col d-none">
233+
<div class="col-md-4 kanban-col d-none">
248234
<div class="jumbotron kanban-cancelled">
249235
<h5 class="text-center bg-grey-light"><i class="material-icons-outlined align-bottom">cancel</i> Cancelled
250236
({{ cancelled_tickets|length }})
@@ -314,5 +300,3 @@ <h6 class="dropdown-header">Move to:</h6>
314300
</div>
315301
</div>
316302
{% endblock %}
317-
{% block scripts %}
318-
{% endblock %}

‎tickets/templates/tickets.html‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{% extends "base.html" %}
2-
{% block title %}
3-
TrackIt | Tickets
4-
{% endblock %}
2+
{% block title %}TrackIt | Tickets{% endblock %}
53
{% block head %}
64
<!-- DataTables.net css -->
75
<link rel="stylesheet" type="text/css"
86
href="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.css" />
97
{% endblock %}
108
{% block page_heading %}
11-
<i class="material-icons-outlined">confirmation_number</i> Tickets ({{ tickets.count }})
12-
<a class="btn btn-primary float-right" href="{% url 'add_ticket' %}">Raise Ticket
13-
<i class="material-icons align-bottom">add</i></a>
9+
<i class="material-icons-outlined align-bottom heading-icon">confirmation_number</i> Tickets ({{ tickets.count }})
10+
<a class="btn btn-primary float-right" href="{% url 'add_ticket' %}"><span class="d-none d-md-inline-block">Raise
11+
Ticket</span>
12+
<i class="material-icons align-bottom">add</i>
13+
</a>
1414
<hr>
1515
{% endblock %}
1616
{% block container-class %}tickets-container{% endblock %}
1717
{% block content %}
1818
<div class="row">
19-
<div class="col col-12">
20-
<a href="{% url 'tickets' %}" class="btn btn-light btn-sm float-right align-top">Reset</a>
21-
<table class="table table-hover table-responsive display" style="width:100%" id="tickets-table">
19+
<div class="col-12" id="tickets-table-col">
20+
<a href="{% url 'tickets' %}" class="btn btn-light btn-sm float-right">Reset</a>
21+
<!-- Tickets Table -->
22+
<table class="table table-hover display order-column table-md table-responsive" id="tickets-table">
2223
<thead>
2324
<tr>
2425
<th>ID</th>
@@ -58,34 +59,34 @@
5859
<td>{{ ticket.submitted_by }}</td>
5960
<td>{{ ticket.assigned_to }}</td>
6061
{% if ticket.priority == "Low" %}
61-
<td><span class="badge badge badge-light">{{ ticket.priority }}</span></td>
62+
<td><span class="badge badge-light">{{ ticket.priority }}</span></td>
6263
{% elif ticket.priority == "Medium" %}
63-
<td><span class="badge badge badge-warning">{{ ticket.priority }}</span></td>
64+
<td><span class="badge badge-warning">{{ ticket.priority }}</span></td>
6465
{% elif ticket.priority == "High" %}
65-
<td><span class="badge badge badge-danger">{{ ticket.priority }}</span></td>
66+
<td><span class="badge badge-danger">{{ ticket.priority }}</span></td>
6667
{% else %}
67-
<td><span class="badge badge badge-light">{{ ticket.priority }}</span></td>
68+
<td><span class="badge badge-light">{{ ticket.priority }}</span></td>
6869
{% endif %}
6970
<!-- Ticket Status Icon -->
7071
{% if ticket.status == "New" %}
71-
<td><i class="material-icons-outlined" data-toggle="tooltip" title="New"
72+
<td><i class="material-icons-outlined status-icon" data-toggle="tooltip" title="New"
7273
data-placement="right">local_activity</i><span class="d-none">New</span></td>
7374
{% elif ticket.status == "In Progress" %}
74-
<td><i class="material-icons" data-toggle="tooltip" title="In Progress"
75+
<td><i class="material-icons status-icon" data-toggle="tooltip" title="In Progress"
7576
data-placement="right">access_time</i><span class="d-none">In
7677
Progress</span></td>
7778
{% elif ticket.status == "Resolved" %}
78-
<td><i class="material-icons" data-toggle="tooltip" title="Resolved" data-placement="right">done</i><span
79-
class="d-none">Resolved</span></td>
79+
<td><i class="material-icons status-icon" data-toggle="tooltip" title="Resolved"
80+
data-placement="right">done</i><span class="d-none">Resolved</span></td>
8081
{% elif ticket.status == "Cancelled" %}
81-
<td><i class="material-icons-outlined" data-toggle="tooltip" title="Cancelled"
82+
<td><i class="material-icons-outlined status-icon" data-toggle="tooltip" title="Cancelled"
8283
data-placement="right">cancel</i><span class="d-none">Cancelled</span></td>
8384
{% endif %}
84-
<td>{{ ticket.created_date.date }}</td>
85+
<td>{{ ticket.created_date|date:"d/m/Y" }}</td>
8586
{% if ticket.resolved_date == None %}
86-
<td>--</td>
87+
<td></td>
8788
{% else %}
88-
<td>{{ ticket.resolved_date.date }}</td>
89+
<td>{{ ticket.resolved_date|date:"d/m/Y" }}</td>
8990
{% endif %}
9091
</tr>
9192
{% endfor %}
@@ -109,8 +110,6 @@
109110
</div>
110111
{% endblock %}
111112
{% block scripts %}
112-
<!-- PDF Maker js -->
113-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
114113
<!-- VFS Fonts js -->
115114
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
116115
<!-- DataTables js -->

0 commit comments

Comments
 (0)