cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

typos fixed

Browse source
This commit is contained in:
Qwann 2017-01-20 20:27:24 +01:00
parent f8c49ae90c
commit 232b293052
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kfet/templates/kfet/article_stat_last.html
View file

@ -19,7 +19,7 @@ jQuery(document).ready(function() {
{% endfor %} {% endfor %}
], ],
datasets: [{ datasets: [{
label: 'Toutes consomations', label: 'Toutes consommations',
borderColor: 'rgb(255, 99, 132)', borderColor: 'rgb(255, 99, 132)',
backgroundColor: 'rgb(255, 99, 132)', backgroundColor: 'rgb(255, 99, 132)',
data: [ data: [

14
kfet/views.py
View file

@ -1990,8 +1990,8 @@ class HybridDetailView(JSONResponseMixin,
SingleObjectTemplateResponseMixin, SingleObjectTemplateResponseMixin,
BaseDetailView): BaseDetailView):
""" """
Returns a DetailView as a html page except if it asked a JSON Returns a DetailView as an html page except if a JSON is requested
file by the GET method in witch case it returns a JSON response. file by the GET method in which case it returns a JSON response.
""" """
def render_to_response(self, context): def render_to_response(self, context):
# Look for a 'format=json' GET argument # Look for a 'format=json' GET argument
@ -2006,6 +2006,10 @@ class HybridDetailView(JSONResponseMixin,
class HybridListView(JSONResponseMixin, class HybridListView(JSONResponseMixin,
MultipleObjectTemplateResponseMixin, MultipleObjectTemplateResponseMixin,
BaseListView): 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): def render_to_response(self, context):
# Look for a 'format=json' GET argument # Look for a 'format=json' GET argument
if self.request.GET.get('format') == 'json': 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 Returns a graph (or a JSON Response) of the evolution a the personnal
balance of a trigramm between begin_date and end_date 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 does not takes intto account the balance offset
""" """
model = Account model = Account
@ -2284,7 +2288,7 @@ class AccountStatLastAll(ObjectResumeStat):
class AccountStatLast(HybridDetailView): class AccountStatLast(HybridDetailView):
""" """
Returns a graph (or a JSON Response) of the evolution a the personnal 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 model = Account
trigramme_url_kwarg = 'trigramme' trigramme_url_kwarg = 'trigramme'
@ -2297,7 +2301,7 @@ class AccountStatLast(HybridDetailView):
# la première date correspond au début # la première date correspond au début
# la dernière date est la fin de la dernière plage # la dernière date est la fin de la dernière plage
def get_dates(self, **kwargs): def get_dates(self, **kwargs):
pass return {}
# doit rendre un dictionnaire des labels # doit rendre un dictionnaire des labels
# le dernier label ne sera pas utilisé # le dernier label ne sera pas utilisé