From 0ced0c76dd071c445e47af791ae940d02a65e2b2 Mon Sep 17 00:00:00 2001 From: MOIS3Y Date: Sat, 5 Aug 2023 00:41:32 +0900 Subject: [PATCH] Modified: template structure add includes tmp --- logs_collector/collector/models.py | 2 +- .../static/collector/js/jq.ticket.detail.js | 44 ++-- .../collector/templates/collector/base.html | 14 +- .../templates/collector/delete_ticket.html | 2 +- .../collector/includes/modal_archive.html | 43 ++++ .../collector/includes/modal_ticket.html | 40 ++++ .../collector/includes/navigation.html | 165 ++++++++++++++ .../collector/includes/pagination.html | 41 ++++ .../collector/includes/ticket_archives.html | 37 +++ .../collector/includes/ticket_info.html | 19 ++ .../templates/collector/navigation.html | 163 -------------- .../templates/collector/pagination.html | 37 --- .../collector/templates/collector/ticket.html | 212 ++++-------------- .../templates/collector/tickets.html | 56 +++-- 14 files changed, 458 insertions(+), 417 deletions(-) create mode 100644 logs_collector/collector/templates/collector/includes/modal_archive.html create mode 100644 logs_collector/collector/templates/collector/includes/modal_ticket.html create mode 100644 logs_collector/collector/templates/collector/includes/navigation.html create mode 100644 logs_collector/collector/templates/collector/includes/pagination.html create mode 100644 logs_collector/collector/templates/collector/includes/ticket_archives.html create mode 100644 logs_collector/collector/templates/collector/includes/ticket_info.html delete mode 100644 logs_collector/collector/templates/collector/navigation.html delete mode 100644 logs_collector/collector/templates/collector/pagination.html diff --git a/logs_collector/collector/models.py b/logs_collector/collector/models.py index 5169387..ff24e86 100644 --- a/logs_collector/collector/models.py +++ b/logs_collector/collector/models.py @@ -83,7 +83,7 @@ class Ticket(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) class Meta: - ordering = ['-time_update'] + ordering = ['-time_create'] def get_absolute_url(self): return reverse( diff --git a/logs_collector/collector/static/collector/js/jq.ticket.detail.js b/logs_collector/collector/static/collector/js/jq.ticket.detail.js index 036aef1..e84b516 100644 --- a/logs_collector/collector/static/collector/js/jq.ticket.detail.js +++ b/logs_collector/collector/static/collector/js/jq.ticket.detail.js @@ -1,18 +1,19 @@ $(function () { console.log("JQ is ready to work"); + // CSRF token: const CSRF = $("input[name=csrfmiddlewaretoken]").val() - // -- -- -- -- - function deleteArchiveListElement(id) { - const archiveList = `#li-archive-${id}` - $(archiveList).hide(1500); - }; + // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + + // delete one attachment + // -- -- -- -- -- -- -- $(".btn-archive-eraser").click(function (e) { e.preventDefault(); const archiveListElement = $(this).attr("data-jq-archive-target"); + const delUrl = $(this).attr("href"); $.ajax({ type: "delete", - url: $(this).attr("href"), + url: delUrl, headers: { "X-CSRFToken":CSRF, "Content-Type":"application/json" @@ -22,30 +23,31 @@ $(function () { // }, success: function (response) { console.log(response.status); - deleteArchiveListElement(archiveListElement); + $(archiveListElement).hide(1500); }, error: function (response) { console.log(response.status); } }); }); - $("#ticket-state").click(function () { + // change ticket state + // -- -- -- -- -- -- -- + $("input[name=ticket-state]").click(function () { console.log('Press'); let resolved = false; - let ticket_state_url = $(this).attr("ticket-state-url") + let ticketStateUrl = $(this).attr("ticket-state-url") if ($(this).attr("ticket-state-switch") === "1") { console.log('Find it!!!') resolved = true; $(this).attr("ticket-state-switch", "0"); // disable - } else { resolved = false; $(this).attr("ticket-state-switch", "1"); // enable } console.log(resolved) $.ajax({ - type: "post", - url: ticket_state_url, + type: "POST", + url: ticketStateUrl, headers: { "X-CSRFToken":CSRF, "Content-Type":"application/json" @@ -63,23 +65,27 @@ $(function () { } }); }); + // delete ticket with attachments: + // -- -- -- -- -- -- -- -- -- -- -- $(".btn-ticket-del").click(function (e) { e.preventDefault(); - const del_url = $(this).attr("href") - const redirect_url = $(this).attr("data-jq-ticket-del-redirect") + const delUrl = $(this).attr("href") + const redirectUrl = $(this).attr("data-jq-ticket-del-redirect") + const elementTarget = $(this).attr("data-jq-ticket-del-target") + const delDiv = $(elementTarget) $.ajax({ type: "DELETE", - url: del_url, + url: delUrl, headers: { 'X-CSRFToken':CSRF, 'Content-Type':'application/json' }, success: function (response) { console.log(response.status); - if (redirect_url) { - window.location.href = redirect_url; - }else { - console.log("Need delete ticket card"); + if (delDiv.length) { + delDiv.hide(1500); + } else { + window.location.href = redirectUrl; } }, error: function (response) { diff --git a/logs_collector/collector/templates/collector/base.html b/logs_collector/collector/templates/collector/base.html index 16300bb..7d8b44e 100644 --- a/logs_collector/collector/templates/collector/base.html +++ b/logs_collector/collector/templates/collector/base.html @@ -34,14 +34,24 @@ rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css" > - Document + {% block title %}{% endblock title %} +
+
+ {% include 'collector/includes/navigation.html' %} +
+
- {% block content %}{% endblock content %} + {% block main %}{% endblock main %}
+ diff --git a/logs_collector/collector/templates/collector/delete_ticket.html b/logs_collector/collector/templates/collector/delete_ticket.html index b39d414..5391216 100644 --- a/logs_collector/collector/templates/collector/delete_ticket.html +++ b/logs_collector/collector/templates/collector/delete_ticket.html @@ -1,7 +1,7 @@ {% extends 'collector/base.html' %} {% load static %} {% block content %} -{% include 'collector/navigation.html' %} +{% include 'collector/includes/navbar.html' %}
diff --git a/logs_collector/collector/templates/collector/includes/modal_archive.html b/logs_collector/collector/templates/collector/includes/modal_archive.html new file mode 100644 index 0000000..407b816 --- /dev/null +++ b/logs_collector/collector/templates/collector/includes/modal_archive.html @@ -0,0 +1,43 @@ + diff --git a/logs_collector/collector/templates/collector/includes/modal_ticket.html b/logs_collector/collector/templates/collector/includes/modal_ticket.html new file mode 100644 index 0000000..70f2a5e --- /dev/null +++ b/logs_collector/collector/templates/collector/includes/modal_ticket.html @@ -0,0 +1,40 @@ + diff --git a/logs_collector/collector/templates/collector/includes/navigation.html b/logs_collector/collector/templates/collector/includes/navigation.html new file mode 100644 index 0000000..2f8bd90 --- /dev/null +++ b/logs_collector/collector/templates/collector/includes/navigation.html @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + +
diff --git a/logs_collector/collector/templates/collector/includes/pagination.html b/logs_collector/collector/templates/collector/includes/pagination.html new file mode 100644 index 0000000..3c295e0 --- /dev/null +++ b/logs_collector/collector/templates/collector/includes/pagination.html @@ -0,0 +1,41 @@ +{% if page_obj.has_other_pages %} +
+ +
+{% endif %} diff --git a/logs_collector/collector/templates/collector/includes/ticket_archives.html b/logs_collector/collector/templates/collector/includes/ticket_archives.html new file mode 100644 index 0000000..ff80d58 --- /dev/null +++ b/logs_collector/collector/templates/collector/includes/ticket_archives.html @@ -0,0 +1,37 @@ +
  • + + File: + {{ archive.file }} + + +
    + SHA1: + {{ archive.sha1 }} +     + +
    + Uploaded: + {{ archive.time_update }} +     +
    + + Size: + {{ archive.size }} + +
    +
    + GET + +
    +
    +
    • diff --git a/logs_collector/collector/templates/collector/includes/ticket_info.html b/logs_collector/collector/templates/collector/includes/ticket_info.html new file mode 100644 index 0000000..eb4c1a9 --- /dev/null +++ b/logs_collector/collector/templates/collector/includes/ticket_info.html @@ -0,0 +1,19 @@ +
    +

    Ticket: {{ ticket.number }}

    + {{ ticket.time_create }} +
    +
    + + +
    +
    +
    Platform: {{ ticket.platform.pretty_name }}
    +
    Owner: {{ ticket.user.username }}
    +
    diff --git a/logs_collector/collector/templates/collector/navigation.html b/logs_collector/collector/templates/collector/navigation.html deleted file mode 100644 index e0a13ef..0000000 --- a/logs_collector/collector/templates/collector/navigation.html +++ /dev/null @@ -1,163 +0,0 @@ -
    -
    - - - - - - - - - - - - - - - - -
    -
    diff --git a/logs_collector/collector/templates/collector/pagination.html b/logs_collector/collector/templates/collector/pagination.html deleted file mode 100644 index e707a59..0000000 --- a/logs_collector/collector/templates/collector/pagination.html +++ /dev/null @@ -1,37 +0,0 @@ -{% if page_obj.has_other_pages %} - -{% endif %} diff --git a/logs_collector/collector/templates/collector/ticket.html b/logs_collector/collector/templates/collector/ticket.html index 7da58ce..75b8340 100644 --- a/logs_collector/collector/templates/collector/ticket.html +++ b/logs_collector/collector/templates/collector/ticket.html @@ -1,175 +1,57 @@ {% extends 'collector/base.html' %} {% load static %} -{% block content %} -{% include 'collector/navigation.html' %} -
    -
    -
    -
    - {% csrf_token %} -
    -
    -
    -

    Ticket: {{ ticket.number }}

    - {{ ticket.time_create }} -
    -
    - - -
    -
    -
    Platform: {{ ticket.platform.pretty_name }}
    -
    Owner: {{ ticket.user.username }}
    -
    -
    - {% if ticket.note %} -
    -
    - Note: -
    -
    -

    {{ ticket.note }}

    -
    +{% block title %}Collector - {{ ticket.number }}{% endblock title %} +{% block main %} +
    +
    + {% csrf_token %} +
    +
    + {% include 'collector/includes/ticket_info.html' %} +
    + {% if ticket.note %} +
    +
    + Note: +
    +
    +

    {{ ticket.note }}

    - {% endif %}
    - - {% if ticket.archive_set.all %} -
      - {% for archive in ticket.archive_set.all %} -
    • - - File: - {{ archive.file }} - - -
      - SHA1: - {{ archive.sha1 }} -       - -
      - Uploaded: - {{ archive.time_update }} -       -
      - - Size: - {{ archive.size }} - -
      -
      - GET - -
      -
      -
      • - {% endfor %} -
    - {% endif %} - -
    - Edit - -
    -
    + {% endif %}
    -
    - - {% for archive in ticket.archive_set.all %} - - {% endfor %} - - -
    -
    -{% endblock content %} +
    + + {% for archive in ticket.archive_set.all %} + {% include 'collector/includes/modal_archive.html' %} + {% endfor %} + + {% include 'collector/includes/modal_ticket.html' %} +
    +{% endblock main %} {% block jquery %} -{% endblock jquery %} \ No newline at end of file +{% endblock jquery %} diff --git a/logs_collector/collector/templates/collector/tickets.html b/logs_collector/collector/templates/collector/tickets.html index c23d75c..0f496bb 100644 --- a/logs_collector/collector/templates/collector/tickets.html +++ b/logs_collector/collector/templates/collector/tickets.html @@ -1,24 +1,15 @@ {% extends 'collector/base.html' %} {% load static %} -{% block content %} - -{% include 'collector/navigation.html' %} - +{% block title %}Collector{% endblock title %} +{% block main %}
    + {% csrf_token %} + {% for ticket in tickets %}
    - -
    +
    -
    -
    Ticket: {{ ticket.number }}
    - {{ ticket.time_create }} -
    -
    - -
    Platform: {{ ticket.platform.pretty_name }}
    -
    Owner: {{ ticket.user.username }}
    -
    + {% include 'collector/includes/ticket_info.html' %}
    {% if ticket.note %} @@ -60,18 +51,10 @@ data-bs-parent="#archive_{{ ticket.number }}" >
    -
      - {% for archive in ticket.archive_set.all %} -
    • - {{ archive.file }} -
      • - {% endfor %} +
        + {% for archive in ticket.archive_set.all %} + {% include 'collector/includes/ticket_archives.html' %} + {% endfor %}
    @@ -84,14 +67,29 @@ href="{{ ticket.get_absolute_url }}" class="btn btn-outline-primary mb-1 mt-1" >Open +
    + + {% include 'collector/includes/modal_ticket.html' %} + + {% for archive in ticket.archive_set.all %} + {% include 'collector/includes/modal_archive.html' %} + {% endfor %} {% endfor %} - {% include 'collector/pagination.html' %} + {% include 'collector/includes/pagination.html' %}
    -{% endblock content %} +{% endblock main %} {% block bs %} {% endblock bs %} +{% block jquery %} + +{% endblock jquery %}