corbz/ticket-website
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases 1 Wiki Activity

Remove commented code & remake tags dropdown

Browse Source
This commit is contained in:
Corban-Lee Jones 2024-01-21 23:12:01 +00:00
parent 3f7127347b
commit 4344dfb271
2 changed files with 42 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/static/js/tickets.js
View File

@ -10,21 +10,6 @@ $(document).ready(function() {
setupFilter("#filterSidebar .filter-tags", "tags"); setupFilter("#filterSidebar .filter-tags", "tags");
setupFilter("#filterSidebar .filter-priority", "priority"); setupFilter("#filterSidebar .filter-priority", "priority");
// alert($(".deselect-radio-filters").length);
// $(".deselect-radio-filters").on("change", function() {
// const checked = $(this).prop("checked");
// alert(checked);
// if (checked) {
// const name = $(this).prop("name");
// $(`[name='${name}']`).each(function(elem) {
// alert($(elem).prop("id"));
// });
// }
// });
loadFilterCounts(); loadFilterCounts();
loadTicketItems(); loadTicketItems();
}); });
@ -387,4 +372,9 @@ function fetchTicketsPromise(queryFilters) {
} }
}); });
}); });
} }
// Prevent certain dropdowns from closing when the user clicks.
$(".dropdown-menu.prevent-click-close").on("click", function(e) {
e.stopPropagation();
});

94
apps/templates/home/tickets.html
View File

@ -54,18 +54,6 @@
</li> </li>
{% endfor %} {% endfor %}
<!--
<li id="filterPriorityAll" class="nav-item filter-priority">
<label for="filterPriority-all" class="nav-link text-reset actived">
<div class="peers ai-c jc-sb">
<div class="peer peer-greed">
<input type="radio" id="filterPriority-all" name="filterPriorities" class="btn-check" checked="checked" value="all">
<span class="btn btn-sm btn-secondary">Remove Filter</span>
</div>
</div>
</label>
</li> -->
{% endif %} {% endif %}
@ -75,37 +63,43 @@
{% if tags %} {% if tags %}
<li class="nav-item"> <li class="nav-item">
<h6 class="peers ai-c jc-sb mb-2 px-3"> <h6 class="peers ai-c jc-sb mb-2 px-3">
<span class="peer-greed">Tags</span> <span class="peer-greed">Tags</span>
<div class="dropdown"> <div class="peer dropdown">
<button type="button" class="peer text-body bg-none border-none" data-bs-toggle="dropdown"> <span class="text-body badge small bg-none border-none py-0 cur-p" data-bs-toggle="dropdown">
<i class="ti-more-alt"></i> <i class="ti-more-alt"></i>
</button> </span>
<ul class="dropdown-menu"> <div class="dropdown-menu prevent-click-close mT-5">
<li> <li class="px-3 py-2">
<span class="dropdown-item-text">Tag Filtering</span> <label for="strictTags" class="form-check-label small mb-2 fw-normal">Only show tickets matching all selected tags?</label>
</li> <div class="form-switch flex-wrap">
<li> <input type="checkbox" name="strictTags" id="strictTags" class="form-check-input" checked="checked">
<label for="ticketTags-AND" class="dropdown-item"> </div>
<div class="form-check form-check-switch"> </li>
<span class="form-check-label">Strict</span> <!-- <li>
<input type="radio" name="ticketTags" id="ticketTags-AND" class="form-check-input" checked="checked" value="AND"> <span class="dropdown-item-text">Tag Filtering</span>
</div> </li>
</label> <li>
</li> <label for="ticketTags-AND" class="dropdown-item">
<li> <div class="form-check form-check-switch">
<label for="ticketTags-OR" class="dropdown-item"> <span class="form-check-label">Strict</span>
<div class="form-check form-check-switch"> <input type="radio" name="ticketTags" id="ticketTags-AND" class="form-check-input" checked="checked" value="AND">
<span class="form-check-label">Loose</span> </div>
<input type="radio" name="ticketTags" id="ticketTags-OR" class="form-check-input" value="OR"> </label>
</div> </li>
</label> <li>
</li> <label for="ticketTags-OR" class="dropdown-item">
</ul> <div class="form-check form-check-switch">
<span class="form-check-label">Loose</span>
<input type="radio" name="ticketTags" id="ticketTags-OR" class="form-check-input" value="OR">
</div>
</label>
</li> -->
</div> </div>
</h6> </div>
</li> </h6>
</li>
{% for tag in tags %} {% for tag in tags %}
@ -133,10 +127,6 @@
{% if departments %} {% if departments %}
<!-- <li class="nav-item">
<h6 class="px-3">Departments</h6>
</li> -->
<li id="filterDepartmentAll" class="nav-item filter-department"> <li id="filterDepartmentAll" class="nav-item filter-department">
<h6 class="peers ai-c jc-sb mb-2 px-3"> <h6 class="peers ai-c jc-sb mb-2 px-3">
<span class="peer-greed">Departments</span> <span class="peer-greed">Departments</span>
@ -149,18 +139,6 @@
</h6> </h6>
</li> </li>
<!-- <li id="filterDepartmentAll" class="nav-item filter-department">
<label for="filterDepartment-all" class="nav-link text-reset actived">
<div class="peers ai-c jc-sb">
<div class="peer peer-greed">
<input type="radio" id="filterDepartment-all" name="filterDepartment" class="form-check-input me-2" checked="checked" value="all">
<span>All</span>
</div>
</div>
</label>
</li> -->
{% for department in departments %} {% for department in departments %}
<li class="nav-item filter-department"> <li class="nav-item filter-department">