3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-11-05 01:16:28 +00:00

Add alcohol field

This commit is contained in:
Yoann Pétri 2019-06-11 01:28:22 +02:00
parent 666be3f9bd
commit 8308eac31f
6 changed files with 62 additions and 21 deletions

View file

@ -38,6 +38,7 @@ INSTALLED_APPS = [
'dal_select2',
'simple_history',
'django_tex',
'debug_toolbar'
]
MIDDLEWARE = [
@ -50,6 +51,7 @@ MIDDLEWARE = [
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'simple_history.middleware.HistoryRequestMiddleware',
'django.contrib.admindocs.middleware.XViewMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
]
ROOT_URLCONF = 'coopeV3.urls'
@ -127,3 +129,4 @@ LOGIN_URL = '/users/login'
MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles')
MEDIA_URL = '/media/'
INTERNAL_IPS = ["127.0.0.1"]

View file

@ -30,3 +30,10 @@ urlpatterns = [
path('gestion/', include('gestion.urls')),
path('preferences/', include('preferences.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
if settings.DEBUG:
import debug_toolbar
urlpatterns = [
path('__debug__/', include(debug_toolbar.urls)),
] + urlpatterns

View file

@ -60,10 +60,10 @@
{% for customer in bestDrinkers %}
<tr>
<th>{{ forloop.counter }}</th>
<th><a href="{% url 'users:profile' customer.0.pk %}">{{ customer.0.username }}</a></th>
<th>{{ customer.1 }}</th>
<th><a href="{% url 'users:profile' customer.pk %}">{{ customer.username }}</a></th>
<th>{{ customer.profile.alcohol }}</th>
</tr>
{%endfor%}
{% endfor %}
</tbody>
</table>
</div>

View file

@ -715,12 +715,13 @@ def ranking(request):
Displays the ranking page.
"""
bestBuyers = User.objects.order_by('-profile__debit')[:25]
customers = User.objects.all()
list = []
for customer in customers:
alcohol = customer.profile.alcohol
list.append([customer, alcohol])
bestDrinkers = sorted(list, key=lambda x: x[1], reverse=True)[:25]
#customers = User.objects.all()
#list = []
#for customer in customers:
# alcohol = customer.profile.alcohol
# list.append([customer, alcohol])
#bestDrinkers = sorted(list, key=lambda x: x[1], reverse=True)[:25]
bestDrinkers = User.objects.order_by('-profile__alcohol')[:25]
form = SearchProductForm(request.POST or None)
if(form.is_valid()):
product_ranking = form.cleaned_data['product'].ranking

View file

@ -0,0 +1,38 @@
# Generated by Django 2.1 on 2019-06-10 23:05
from django.db import migrations, models
def update(apps, schema_editor):
db_alias = schema_editor.connection.alias
users = apps.get_model('auth', 'User').objects.using(db_alias).all()
for user in users:
consumptions = apps.get_model('gestion', 'ConsumptionHistory').objects.using(db_alias).filter(customer=user).select_related('product')
alcohol = 0
for consumption in consumptions:
product = consumption.product
alcohol += consumption.quantity * float(product.deg) * product.volume * 0.79 /10 /1000
user.profile.alcohol = alcohol
user.profile.save()
def reverse_update(apps, schema_editor):
pass
class Migration(migrations.Migration):
dependencies = [
('users', '0005_auto_20190227_0859'),
]
operations = [
migrations.AddField(
model_name='historicalprofile',
name='alcohol',
field=models.DecimalField(decimal_places=2, default=0, max_digits=5, null=True),
),
migrations.AddField(
model_name='profile',
name='alcohol',
field=models.DecimalField(decimal_places=2, default=0, max_digits=5, null=True),
),
migrations.RunPython(update, reverse_update)
]

View file

@ -120,6 +120,10 @@ class Profile(models.Model):
"""
Date of end of cotisation for the client
"""
alcohol = models.DecimalField(max_digits=5, decimal_places=2, default=0, null=True)
"""
Ingerated alcohol
"""
history = HistoricalRecords()
@property
@ -152,18 +156,6 @@ class Profile(models.Model):
"""
return Profile.objects.filter(debit__gte=self.debit).count()
@property
def alcohol(self):
"""
Computes ingerated alcohol.
"""
consumptions = ConsumptionHistory.objects.filter(customer=self.user).select_related('product')
alcohol = 0
for consumption in consumptions:
product = consumption.product
alcohol += consumption.quantity * float(product.deg) * product.volume * 0.79 /10 /1000
return alcohol
@property
def nb_pintes(self):
"""