diff --git a/site_campagne/campagne/static/campagne/css/base.css b/site_campagne/campagne/static/campagne/css/base.css index 5aca90a9395a3cf1fc4dd38469b3328dc79721f7..9f1230c8b26648ca6fb1a55154d12e1480a1de1f 100644 --- a/site_campagne/campagne/static/campagne/css/base.css +++ b/site_campagne/campagne/static/campagne/css/base.css @@ -22,6 +22,7 @@ body{ background-attachment: fixed; background-size: 100%; padding: 10% 3% 3% 3%; + margin-bottom:30px; } @media (min-width : 50em){ diff --git a/site_campagne/campagne/static/campagne/js/actualisation.js b/site_campagne/campagne/static/campagne/js/actualisation.js new file mode 100644 index 0000000000000000000000000000000000000000..e1af80a7dd4c384f59700ebedfbe8c453bf3c648 --- /dev/null +++ b/site_campagne/campagne/static/campagne/js/actualisation.js @@ -0,0 +1,2 @@ +var nb = 15 ; +timer = window.setTimeout(" window.refresh();", 1000*nb, "JavaScript"); \ No newline at end of file diff --git a/site_campagne/campagne/templates/campagne/commandes_campus.html b/site_campagne/campagne/templates/campagne/commandes_campus.html index f5f467ad75d466a71a37c261fb9b7f7cbb747f48..c0924b2455f0a18dfcdefd176424ae7cb1216373 100644 --- a/site_campagne/campagne/templates/campagne/commandes_campus.html +++ b/site_campagne/campagne/templates/campagne/commandes_campus.html @@ -74,4 +74,5 @@ </div> </div> </div> +<script type="text/javascript" src="{% static 'campagne/js/actualisation.js' %}" ></script> {% endblock %} \ No newline at end of file diff --git a/site_campagne/campagne/templates/campagne/pas_lheure.html b/site_campagne/campagne/templates/campagne/pas_lheure.html new file mode 100644 index 0000000000000000000000000000000000000000..d8529904e612f29671ff9fb2a122c8a0f978d641 --- /dev/null +++ b/site_campagne/campagne/templates/campagne/pas_lheure.html @@ -0,0 +1,12 @@ +{% extends 'campagne/base.html'%} +{% load static %} + +{% block cssEtTitre %} +<link rel="stylesheet" href="{% static 'campagne/css/hotline.css' %}" /> +{% endblock %} + +{% block content %} +<div class="block_commande"> + <p>La hotline n'est ouverte qu'entre 7h et minuit.</p> +</div> +{% endblock %} \ No newline at end of file diff --git a/site_campagne/campagne/templates/campagne/qui_travaille.html b/site_campagne/campagne/templates/campagne/qui_travaille.html index 92f34e2846b5b02b135396dcb762604862526874..61029b2b0f44a715c4c0ace5c5f6a6e7d497885d 100644 --- a/site_campagne/campagne/templates/campagne/qui_travaille.html +++ b/site_campagne/campagne/templates/campagne/qui_travaille.html @@ -38,4 +38,5 @@ </div> </div> </div> +<script type="text/javascript" src="{% static 'campagne/js/actualisation.js' %}" ></script> {% endblock %} \ No newline at end of file diff --git a/site_campagne/campagne/views.py b/site_campagne/campagne/views.py index 6e35f1cbcb82f88971924b02ac955406a6eaaa79..ad35c7f6dfee81527b2812f017956a6523ace58a 100644 --- a/site_campagne/campagne/views.py +++ b/site_campagne/campagne/views.py @@ -99,6 +99,10 @@ def commande_passee(request, requete): if durée_dernière_commande <= temps_entre_commandes: patiente=temps_entre_commandes-durée_dernière_commande return render(request,"campagne/patiente.html",{"min":patiente//60, "sec":patiente%60}) + if int(date_mtn.hour<7): + return render(request,"campagne/pas_lheure.html") + if int(date_mtn.day==4): + return HttpResponse("La hotline ouvre demain à 7h.") commande=commande_crepe.objects.create(adresse_livraison=L[5], crepe_nature=L[0], crepe_nutella=L[1], crepe_sucre=L[2], crepe_confiture_fraise=L[3],crepe_confiture_abricot=L[4],commanditaire=utilisateur.objects.get(email=mail)) commande.save() #send_mail('commande crêpes',