coopeTM/coope
3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-11-22 03:13:12 +00:00
Code Issues Releases Wiki Activity

Prise en compte des préférences

Browse source
This commit is contained in:
Yoann Pétri 2018-12-23 12:06:16 +01:00
parent 3ea5f0322a
commit 6b3136dece
3 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
preferences/urls.py
View file

@ -14,4 +14,5 @@ urlpatterns = [
path('editPaymentMethod/<int:pk>', views.editPaymentMethod, name="editPaymentMethod"), path('editPaymentMethod/<int:pk>', views.editPaymentMethod, name="editPaymentMethod"),
path('deletePaymentMethod/<int:pk>', views.deletePaymentMethod, name="deletePaymentMethod"), path('deletePaymentMethod/<int:pk>', views.deletePaymentMethod, name="deletePaymentMethod"),
path('inactive', views.inactive, name="inactive"), path('inactive', views.inactive, name="inactive"),
path('getConfig', views.get_config, name="getConfig"),
] ]

14
preferences/views.py
View file

@ -1,7 +1,11 @@
import json
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
from django.contrib import messages from django.contrib import messages
from django.urls import reverse from django.urls import reverse
from django.contrib.auth.decorators import login_required, permission_required 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 from coopeV3.acl import active_required
@ -238,4 +242,14 @@ def inactive(request):
""" """
gp, _ = GeneralPreferences.objects.get_or_create(pk=1) gp, _ = GeneralPreferences.objects.get_or_create(pk=1)
return render(request, 'preferences/inactive.html', {"message": gp.active_message}) 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')

31
staticfiles/manage.js
View file

@ -10,7 +10,10 @@ nbPintes = 0;
use_pinte_monitoring = false; use_pinte_monitoring = false;
function get_config(){ function get_config(){
use_pinte_monitoring = true; res = $.get("../preferences/getConfig", function(data){
console.log(data.use_pinte_monitoring)
use_pinte_monitoring = data.use_pinte_monitoring;
});
} }
function get_product(barcode){ function get_product(barcode){
@ -131,19 +134,21 @@ $(document).ready(function(){
}); });
}); });
$(".pay_button").click(function(){ $(".pay_button").click(function(){
message = "Il reste " + nbPintes.toString() + " pintes à renseigner. Numéro de la pinte ?" if(use_pinte_monitoring){
while(nbPintes > 0){ message = "Il reste " + nbPintes.toString() + " pintes à renseigner. Numéro de la pinte ?"
id_pinte = window.prompt(message,""); while(nbPintes > 0){
if(id_pinte == null){ id_pinte = window.prompt(message,"");
return; if(id_pinte == null){
}else{ return;
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{ }else{
listPintes.push(id_pinte) id_pinte = parseInt(id_pinte);
nbPintes -= 1; if(!Number.isInteger(id_pinte) || id_pinte < 0){
message = "Il reste " + nbPintes.toString() + " pintes à renseigner. Numéro de la pinte ?" 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 ?"
}
} }
} }
} }