klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-09 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

counter inactive state with settings variable, traduction file problem fixed

Browse Source
This commit is contained in:
guillaume-renaud
2016-10-26 15:06:00 +02:00
committed by Skia
parent 7f6424d51e
commit 57b663c4c5
5 changed files with 237 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
counter/models.py
View File

@ -223,12 +223,9 @@ class Counter(models.Model):
def is_inactive(self):
"""
Returns True if the counter self is inactive from 10 minutes, else False
Returns True if the counter self is inactive from SITH_COUNTER_MINUTE_INACTIVE's value minutes, else False
"""
if (self.is_open()):
return ((timezone.now() - self.permanencies.model.objects.order_by('-activity').first().activity) > datetime.timedelta(minutes=10))
else:
return False
return self.is_open() and ((timezone.now() - self.permanencies.order_by('-activity').first().activity) > datetime.timedelta(minutes=settings.SITH_COUNTER_MINUTE_INACTIVE))
def barman_list(self):
"""

5
counter/templates/counter/activity.jinja
View File

@ -16,11 +16,10 @@
</ul>
{% endif %}
<h5>{% trans %}Legend{% endtrans %}</h5>
<h5>{% trans %}Legend{% endtrans %}</h5>
<span style="color: green">&#x2713;</span> : {% trans %}counter is open, there's at least one barman connected{% endtrans %}
<br>
<span style="color: orange">&#x3f;</span> : {% trans %}counter is open but not active, the last sale was done at least 10 minutes ago {% endtrans %}
<span style="color: orange">&#x3f;</span> : {% trans minutes=settings.SITH_COUNTER_MINUTE_INACTIVE %}counter is open but not active, the last sale was done at least {{ minutes }} minutes ago {% endtrans %}
<br>
<span style="color: red">&#10007;</span> : {% trans %}counter is not open : no one is connected{% endtrans %}
{% endblock %}