From 092812b9b758a8b59c60adbc166a4ce31dac06b1 Mon Sep 17 00:00:00 2001 From: LordBaryhobal Date: Sun, 2 Feb 2025 23:01:17 +0100 Subject: [PATCH] added project delete + changed to list template --- TimeDispatcher/urls.py | 5 +-- dispatcher/static/base.css | 1 + dispatcher/static/list.css | 2 ++ dispatcher/static/list.js | 2 +- dispatcher/static/projects.css | 7 +++- dispatcher/static/projects.js | 17 +++++++--- dispatcher/views.py | 26 ++++++++++++++- templates/projects.html | 58 ++++++++++++++-------------------- 8 files changed, 74 insertions(+), 44 deletions(-) diff --git a/TimeDispatcher/urls.py b/TimeDispatcher/urls.py index 7b4ce68..01b6b80 100644 --- a/TimeDispatcher/urls.py +++ b/TimeDispatcher/urls.py @@ -25,15 +25,16 @@ register_converter(DateConverter, "date") urlpatterns = [ path("", views.dashboard_view, name="dashboard"), path("import/", views.import_view, name="import"), - path("projects/", views.projects_view, name="projects"), + path("projects/", views.ProjectsView.as_view(), name="projects"), path("parents/", views.ParentsView.as_view(), name="parents"), path("table///", views.get_table_data, name="table_data"), path("table/", views.table_view, name="table"), path("parents/new/", views.new_parent_view, name="new_parent"), path("parents//on_delete/", views.parent_on_delete_view, name="parent_on_delete"), path("parents//", views.parent_view, name="parent"), + path("projects//on_delete/", views.project_on_delete_view, name="project_on_delete"), + path("projects//set_parent/", views.set_parent, name="set_parent"), path("projects//", views.project_view, name="project"), - path("projects//set_parent", views.set_parent, name="set_parent"), path("stats/by-month///", views.get_stats_by_month, name="stats_by_month"), path("stats/between///", views.get_stats_between, name="stats_between"), path("clockings//", views.set_clocking, name="set_clocking") diff --git a/dispatcher/static/base.css b/dispatcher/static/base.css index a164621..03c4707 100644 --- a/dispatcher/static/base.css +++ b/dispatcher/static/base.css @@ -82,6 +82,7 @@ main { display: flex; flex-direction: column; padding: 2em; + overflow-y: auto; } button, input, select { diff --git a/dispatcher/static/list.css b/dispatcher/static/list.css index f469b4d..15edbaa 100644 --- a/dispatcher/static/list.css +++ b/dispatcher/static/list.css @@ -5,6 +5,7 @@ display: flex; flex-direction: column; gap: 1em; + overflow-y: auto; } .list-header { @@ -22,6 +23,7 @@ gap: 0.8em; flex-direction: column; padding: 0; + overflow-y: auto; } .list li { diff --git a/dispatcher/static/list.js b/dispatcher/static/list.js index 95b640d..e8e4dfe 100644 --- a/dispatcher/static/list.js +++ b/dispatcher/static/list.js @@ -33,7 +33,7 @@ window.addEventListener("load", () => { document.querySelectorAll(".list li").forEach(row => { let id = row.dataset.id - row.querySelector("button.edit").addEventListener("click", () => { + row.querySelector("button.edit")?.addEventListener("click", () => { window.location.href = `${id}/` }) diff --git a/dispatcher/static/projects.css b/dispatcher/static/projects.css index 6b8217a..e2be0bf 100644 --- a/dispatcher/static/projects.css +++ b/dispatcher/static/projects.css @@ -1,4 +1,8 @@ +.productive { + box-shadow: 0.2em 0 0 var(--accent) inset; +} +/* .projects { width: 100%; max-width: 40em; @@ -21,4 +25,5 @@ .projects tbody tr:nth-child(even) { background-color: var(--dark2); -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/dispatcher/static/projects.js b/dispatcher/static/projects.js index 43168f0..958d6fa 100644 --- a/dispatcher/static/projects.js +++ b/dispatcher/static/projects.js @@ -1,5 +1,16 @@ +onBeforeDelete = async row => { + await req(`${row.dataset.id}/on_delete/`).then(res => { + return res.json() + }).then(res => { + if (res.status === "success") { + let popup = document.getElementById("delete-popup") + popup.querySelector(".task-count").innerText = res.tasks + } + }) +} + window.addEventListener("load", () => { - document.querySelectorAll(".projects tbody tr").forEach(row => { + document.querySelectorAll(".list li").forEach(row => { let id = row.dataset.id let selector = row.querySelector(".parent-sel") selector.addEventListener("change", () => { @@ -10,9 +21,5 @@ window.addEventListener("load", () => { body: fd }) }) - - row.querySelector("button.edit").addEventListener("click", () => { - window.location.href = `${id}/` - }) }) }) \ No newline at end of file diff --git a/dispatcher/views.py b/dispatcher/views.py index ee00b9b..d4fd1a6 100644 --- a/dispatcher/views.py +++ b/dispatcher/views.py @@ -59,6 +59,15 @@ def parent_on_delete_view(request, id): "tasks": tasks }) +def project_on_delete_view(request, id): + project = get_object_or_404(Project, id=id) + tasks = project.task_set.count() + + return JsonResponse({ + "status": "success", + "tasks": tasks + }) + def new_parent_view(request): context = { "class": "parent" @@ -72,6 +81,11 @@ def new_parent_view(request): def project_view(request, id): project = get_object_or_404(Project, id=id) + + if request.method == "DELETE": + project.delete() + return JsonResponse({"status": "success"}) + context = { "class": "project", "id": id @@ -88,7 +102,7 @@ def table_view(request): @require_POST def set_parent(request, id): project = get_object_or_404(Project, id=id) - parent_id = request.POST.get("parent_id") + parent_id = request.POST.get("parent_id") or None try: parent = Parent.objects.get(id=parent_id) except Parent.DoesNotExist: @@ -181,6 +195,16 @@ class ParentsView(generic.ListView): template_name = "parents.html" context_object_name = "elements" +class ProjectsView(generic.ListView): + model = Project + template_name = "projects.html" + context_object_name = "elements" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["parents"] = Parent.objects.all() + return context + def get_table_data(request, start_date: datetime.date, end_date: datetime.date): end_date = end_date + timedelta(days=1) diff --git a/templates/projects.html b/templates/projects.html index 0a8d8d0..1baa1aa 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -1,39 +1,29 @@ -{% extends "base.html" %} +{% extends "list.html" %} {% load static %} {% block title %}Projects{% endblock %} -{% block head %} +{% block extra-head %} {% endblock %} -{% block footer %}{% endblock %} -{% block main %} - {% csrf_token %} - - - - - - - - - - {% for project in projects %} - - - - - - {% endfor %} - -
ProjectParentActions
{{ project.name }} - - - - -
-{% endblock %} \ No newline at end of file +{% block extra-class %}{% if element.parent.is_productive %}productive{% endif %}{% endblock %} +{% block element-name %}{{ element.name }}{% endblock %} +{% block element %} +
{{ element.name }}
+{% endblock %} +{% block actions %} + + + +{% endblock %} +{% block delete-desc %} + Are sure you want to delete ? + This action is IRREVERSIBLE ! By deleting this element, you will also delete: +
    +
  • task imputation(s)
    • +
+{% endblock %}