Suivi de pintes
+
+
+
+ {{form.use_pinte_monitoring}}
+
+
+
+
+ {{form.lost_pintes_allowed}}
+
+
+
diff --git a/preferences/urls.py b/preferences/urls.py
index 7981698..dd7d3b8 100644
--- a/preferences/urls.py
+++ b/preferences/urls.py
@@ -14,4 +14,5 @@ urlpatterns = [
path('editPaymentMethod/', views.editPaymentMethod, name="editPaymentMethod"),
path('deletePaymentMethod/', views.deletePaymentMethod, name="deletePaymentMethod"),
path('inactive', views.inactive, name="inactive"),
+ path('getConfig', views.get_config, name="getConfig"),
]
diff --git a/preferences/views.py b/preferences/views.py
index 08c8976..3f9ec6d 100644
--- a/preferences/views.py
+++ b/preferences/views.py
@@ -1,7 +1,11 @@
+import json
+
from django.shortcuts import render, redirect, get_object_or_404
from django.contrib import messages
from django.urls import reverse
from django.contrib.auth.decorators import login_required, permission_required
+from django.http import HttpResponse
+from django.forms.models import model_to_dict
from coopeV3.acl import active_required
@@ -238,4 +242,14 @@ def inactive(request):
"""
gp, _ = GeneralPreferences.objects.get_or_create(pk=1)
return render(request, 'preferences/inactive.html', {"message": gp.active_message})
+
+########## Config ##########
+
+def get_config(request):
+ """
+ Load the config and return it in a json format
+ """
+ gp,_ = GeneralPreferences.objects.get_or_create(pk=1)
+ data = json.dumps(model_to_dict(gp))
+ return HttpResponse(data, content_type='application/json')
\ No newline at end of file
diff --git a/staticfiles/manage.js b/staticfiles/manage.js
index 39e174a..ad2691b 100644
--- a/staticfiles/manage.js
+++ b/staticfiles/manage.js
@@ -5,20 +5,32 @@ paymentMethod = null
balance = 0
username = ""
id = 0
+listPintes = []
+nbPintes = 0;
+use_pinte_monitoring = false;
+
+function get_config(){
+ res = $.get("../preferences/getConfig", function(data){
+ console.log(data.use_pinte_monitoring)
+ use_pinte_monitoring = data.use_pinte_monitoring;
+ });
+}
function get_product(barcode){
res = $.get("getProduct/" + barcode, function(data){
- add_product(data.pk, data.barcode, data.name, data.amount);
+ nbPintes += data.nb_pintes;
+ add_product(data.pk, data.barcode, data.name, data.amount, data.needQuantityButton);
});
}
function get_menu(barcode){
res = $.get("getMenu/" + barcode, function(data){
- add_menu(data.pk, data.barcode, data.name, data.amount);
+ nbPintes += data.nb_pintes;
+ add_menu(data.pk, data.barcode, data.name, data.amount, data.needQuantityButton);
});
}
-function add_product(pk, barcode, name, amount){
+function add_product(pk, barcode, name, amount, needQuantityButton){
exist = false
index = -1
for(k=0;k < products.length; k++){
@@ -27,10 +39,18 @@ function add_product(pk, barcode, name, amount){
index = k
}
}
- if(exist){
- products[index].quantity += 1;
+ if(needQuantityButton){
+ quantity = parseInt(window.prompt("Quantité ?",""));
}else{
- products.push({"pk": pk, "barcode": barcode, "name": name, "amount": amount, "quantity": 1});
+ quantity = 1;
+ }
+ if(quantity == null || !Number.isInteger(quantity)){
+ quantity = 1;
+ }
+ if(exist){
+ products[index].quantity += quantity;
+ }else{
+ products.push({"pk": pk, "barcode": barcode, "name": name, "amount": amount, "quantity": quantity});
}
generate_html()
}
@@ -53,7 +73,7 @@ function add_menu(pk, barcode, name, amount){
}
function generate_html(){
- html =""
+ html = "";
for(k=0;k' + product.name + ' ' + String(product.amount) + ' ' + String(Number((product.quantity * product.amount).toFixed(2))) + ' ';
@@ -94,6 +114,7 @@ function updateMenuInput(a){
}
$(document).ready(function(){
+ get_config();
$(".product").click(function(){
product = get_product($(this).attr('target'));
});
@@ -113,7 +134,25 @@ $(document).ready(function(){
});
});
$(".pay_button").click(function(){
- $.post("order", {"user":id, "paymentMethod": $(this).attr('data-payment'), "order_length": products.length + menus.length, "order": JSON.stringify(products), "amount": total, "menus": JSON.stringify(menus)}, function(data){
+ if(use_pinte_monitoring){
+ message = "Il reste " + nbPintes.toString() + " pintes à renseigner. Numéro de la pinte ?"
+ while(nbPintes > 0){
+ id_pinte = window.prompt(message,"");
+ if(id_pinte == null){
+ return;
+ }else{
+ id_pinte = parseInt(id_pinte);
+ if(!Number.isInteger(id_pinte) || id_pinte < 0){
+ message = "Numéro incorrect. Il reste " + nbPintes.toString() + " pintes à renseigner. Numéro de la pinte ?";
+ }else{
+ listPintes.push(id_pinte)
+ nbPintes -= 1;
+ message = "Il reste " + nbPintes.toString() + " pintes à renseigner. Numéro de la pinte ?"
+ }
+ }
+ }
+ }
+ $.post("order", {"user":id, "paymentMethod": $(this).attr('data-payment'), "order_length": products.length + menus.length, "order": JSON.stringify(products), "amount": total, "menus": JSON.stringify(menus), "listPintes": JSON.stringify(listPintes)}, function(data){
alert(data);
location.reload();
}).fail(function(data){
diff --git a/users/models.py b/users/models.py
index bda3ba2..c3b0df9 100644
--- a/users/models.py
+++ b/users/models.py
@@ -119,6 +119,13 @@ class Profile(models.Model):
alcohol += consumption.quantity * float(product.deg) * product.volume * 0.79 /10 /1000
return alcohol
+ @property
+ def nb_pintes(self):
+ """
+ Return the number of pintes currently owned
+ """
+ return self.user.pintes_owned_currently.count()
+
def __str__(self):
return str(self.user)
@@ -128,9 +135,12 @@ class Profile(models.Model):
tente de retourner l'attribut de l'user associé à l'instance
"""
try:
- r = super().__getattr__(name)
+ r = self.__getattribute__(name)
except AttributeError:
- r = getattr(self.user, name)
+ try:
+ r = super().__getattr__(name)
+ except AttributeError:
+ r = getattr(self.user, name)
return r