From 87396874c9f411f1d3d31c6677dc2dc16fa71e04 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Sat, 12 Feb 2022 13:05:09 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20legacy=20profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/utils/users.ts | 2 +- main/urls.py | 3 +- main/views/users.py | 27 -------------- templates/profile.html | 71 ------------------------------------- 4 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 templates/profile.html diff --git a/frontend/src/utils/users.ts b/frontend/src/utils/users.ts index b3b3871..ae493bc 100644 --- a/frontend/src/utils/users.ts +++ b/frontend/src/utils/users.ts @@ -1,6 +1,6 @@ import { parseISO, subDays } from "date-fns"; -import { User } from "../types"; +import type { User } from "../types"; const activeLimitDays = 365 / 2; diff --git a/main/urls.py b/main/urls.py index 194717a..eff2f59 100644 --- a/main/urls.py +++ b/main/urls.py @@ -2,13 +2,12 @@ from django.contrib.staticfiles.views import serve from django.urls import re_path from main.views.reports import inventory, inventory_add, report -from main.views.users import create_user, profile +from main.views.users import create_user urlpatterns = [ # TODO: migrate to SPA # Users re_path(r"^user/create/$", create_user, name="create-user"), - re_path(r"^profile/$", profile, name="profile"), # Reports re_path(r"^inventory/$", inventory, name="inventory"), re_path(r"^inventory/add/$", inventory_add, name="inventory-add"), diff --git a/main/views/users.py b/main/views/users.py index 49fabe8..a0cac58 100644 --- a/main/views/users.py +++ b/main/views/users.py @@ -1,11 +1,7 @@ from django.contrib import messages -from django.contrib.auth.decorators import login_required -from django.db import connection -from django.db.models import Count, Sum from django.shortcuts import redirect, render from main.forms import SimpleCreateUserForm -from main.models import Order, Transaction def create_user(request): @@ -23,26 +19,3 @@ def create_user(request): form = SimpleCreateUserForm() return render(request, "registration/create_user.html", {"form": form}) - - -@login_required -def profile(request): - transactions = Transaction.objects.filter(user=request.user.pk) - transaction_totals = {"sum": sum([t.amount for t in transactions])} - orders = Order.objects.filter(customer=request.user.pk) - orders_totals = {"sum": sum([o.order_sum for o in orders])} - - # order_lines = OrderLine.objects.filter(order__customer__pk=1).order_by("order__created") - order_report = _orders_monthly(filter_by={"customer": request.user.pk}) - top_months = order_report.order_by("-sum")[:5] - - return render(request, "profile.html", locals()) - - -def _orders_monthly(filter_by={}, order_by="month"): - - truncate_date = connection.ops.date_trunc_sql("month", "created") - qs = Order.objects.filter(**filter_by).extra({"month": truncate_date}) - order_report = qs.values("month").annotate(sum=Sum("order_sum"), num=Count("pk")).order_by(order_by) - - return order_report diff --git a/templates/profile.html b/templates/profile.html deleted file mode 100644 index e2726ff..0000000 --- a/templates/profile.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "base.html" %} -{% block active_profile %}active{% endblock %} - -{% block content %} -
-
-
-

{{user.first_name}}

-
-
-
-
-
-
Saldo
-
-

{{user.profile.balance }} kr

-
-
-
-
Kjøp totalt
-
-

{{orders_totals.sum }} kr

-
-
-
-
Topp 5 måneder
-
- {% for o in top_months %} -
  • {{ o.month|date:"F Y"}}: {{ o.num }} kjøp på totalt {{ o.sum }} kr
    • - {% endfor %} -
    -
    -
    -
    -
    -
    Kjøp over tid per produkt
    -
    -
    -
    -
    -
    -
    - {% comment %}
    -
    -
    -
    Ordre
    -
    -
      - {% for o in orders %} -
    • {{ o.created|date:"c" }}: {{ o.reciept }}
      • - {% endfor %} -
    -
    -
    -
    -
    -
    -
    Transaksjoner
    -
    -
      - {% for t in transactions %} -
    • {{ t.created|date:"c" }} {{ t.amount }}
      • - {% endfor %} -
    -
    -
    -
    -
    - {% endcomment %} -
    -{% endblock %} \ No newline at end of file