From 232b293052c3d74dac6810c8b91b287b70c2990e Mon Sep 17 00:00:00 2001 From: Qwann Date: Fri, 20 Jan 2017 20:27:24 +0100 Subject: [PATCH] typos fixed --- kfet/templates/kfet/article_stat_last.html | 2 +- kfet/views.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kfet/templates/kfet/article_stat_last.html b/kfet/templates/kfet/article_stat_last.html index fa586216..8b71732f 100644 --- a/kfet/templates/kfet/article_stat_last.html +++ b/kfet/templates/kfet/article_stat_last.html @@ -19,7 +19,7 @@ jQuery(document).ready(function() { {% endfor %} ], datasets: [{ - label: 'Toutes consomations', + label: 'Toutes consommations', borderColor: 'rgb(255, 99, 132)', backgroundColor: 'rgb(255, 99, 132)', data: [ diff --git a/kfet/views.py b/kfet/views.py index 0ec4d8d6..740a75a4 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -1990,8 +1990,8 @@ class HybridDetailView(JSONResponseMixin, SingleObjectTemplateResponseMixin, BaseDetailView): """ - Returns a DetailView as a html page except if it asked a JSON - file by the GET method in witch case it returns a JSON response. + Returns a DetailView as an html page except if a JSON is requested + file by the GET method in which case it returns a JSON response. """ def render_to_response(self, context): # Look for a 'format=json' GET argument @@ -2006,6 +2006,10 @@ class HybridDetailView(JSONResponseMixin, class HybridListView(JSONResponseMixin, MultipleObjectTemplateResponseMixin, BaseListView): + """ + Returns a ListView as an html page except if a JSON is requested + file by the GET method in which case it returns a JSON response. + """ def render_to_response(self, context): # Look for a 'format=json' GET argument if self.request.GET.get('format') == 'json': @@ -2101,7 +2105,7 @@ class AccountStatBalance(HybridDetailView): """ Returns a graph (or a JSON Response) of the evolution a the personnal balance of a trigramm between begin_date and end_date - takes into account the Operations and the Transfers + takes intto account the Operations and the Transfers does not takes intto account the balance offset """ model = Account @@ -2284,7 +2288,7 @@ class AccountStatLastAll(ObjectResumeStat): class AccountStatLast(HybridDetailView): """ Returns a graph (or a JSON Response) of the evolution a the personnal - consommation of a trigramm at the diffent dates precised + consommation of a trigramm at the diffent dates specified """ model = Account trigramme_url_kwarg = 'trigramme' @@ -2297,7 +2301,7 @@ class AccountStatLast(HybridDetailView): # la première date correspond au début # la dernière date est la fin de la dernière plage def get_dates(self, **kwargs): - pass + return {} # doit rendre un dictionnaire des labels # le dernier label ne sera pas utilisé