From b611fe5961945304e4160366963bdcaa2663d5f1 Mon Sep 17 00:00:00 2001 From: Titouan Vervack Date: Sat, 10 Mar 2018 00:50:02 +0100 Subject: [PATCH] Removed UTF-8 annotations, better count --- app/database/add_oceans_garden.py | 2 -- app/database/add_simpizza.py | 2 -- app/models.py | 8 -------- app/templates/order.html | 2 +- app/utils.py | 2 -- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/app/database/add_oceans_garden.py b/app/database/add_oceans_garden.py index 51a4d00..fcc063f 100644 --- a/app/database/add_oceans_garden.py +++ b/app/database/add_oceans_garden.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from models import Location, Product from app import db from itertools import product diff --git a/app/database/add_simpizza.py b/app/database/add_simpizza.py index 4414034..59bfb2e 100644 --- a/app/database/add_simpizza.py +++ b/app/database/add_simpizza.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from models import Location, Product from app import db diff --git a/app/models.py b/app/models.py index 9db3526..2507e82 100644 --- a/app/models.py +++ b/app/models.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from datetime import datetime from collections import defaultdict @@ -110,12 +108,6 @@ class Order(db.Model): return group - def len(self): - size = 0 - for _ in self.items: - size = size + 1 - return size - def group_by_product(self): group = dict() for item in self.items: diff --git a/app/templates/order.html b/app/templates/order.html index 4ee0619..fe4db94 100644 --- a/app/templates/order.html +++ b/app/templates/order.html @@ -78,7 +78,7 @@
-

Ordered products: {{ order.len() }}

+

Ordered products: {{ order.items.count() }}

{% for key, value in order.group_by_product().items() -%}
{{ key }}: {{ value["count"] }} diff --git a/app/utils.py b/app/utils.py index e17f506..9742ff9 100644 --- a/app/utils.py +++ b/app/utils.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from datetime import datetime from flask import render_template