From b4199be71be8c5aa1e24745301fa559ca880a3f8 Mon Sep 17 00:00:00 2001 From: Christophe SCAYA <> Date: Mon, 5 Sep 2022 22:15:01 +0200 Subject: [PATCH] Modifs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suite du dev de la vue displayZone Corrections dans le modèle --- EscapeGame/settings.py | 2 +- .../0013_remove_challenge_code_zone_mdp.py | 23 +++++++++++++ app/migrations/0014_alter_zone_mdp.py | 19 +++++++++++ app/models.py | 7 ++-- app/templates/app/setEquipe.html | 6 ---- app/templates/app/zone.html | 34 +++++++++++++++++-- app/views.py | 16 ++++++++- 7 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 app/migrations/0013_remove_challenge_code_zone_mdp.py create mode 100644 app/migrations/0014_alter_zone_mdp.py diff --git a/EscapeGame/settings.py b/EscapeGame/settings.py index ee648a0..0d5426a 100644 --- a/EscapeGame/settings.py +++ b/EscapeGame/settings.py @@ -28,7 +28,7 @@ SECRET_KEY = 'django-insecure-k!mw8ni52p!p*--q(6ma_)=$or^x)#4f5zc2=s+xm+bo6!$&k# # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["*"] # Application definition diff --git a/app/migrations/0013_remove_challenge_code_zone_mdp.py b/app/migrations/0013_remove_challenge_code_zone_mdp.py new file mode 100644 index 0000000..cec808a --- /dev/null +++ b/app/migrations/0013_remove_challenge_code_zone_mdp.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1 on 2022-09-05 21:36 + +import app.models +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0012_zone_description'), + ] + + operations = [ + migrations.RemoveField( + model_name='challenge', + name='code', + ), + migrations.AddField( + model_name='zone', + name='mdp', + field=models.IntegerField(default=app.models.random_string), + ), + ] diff --git a/app/migrations/0014_alter_zone_mdp.py b/app/migrations/0014_alter_zone_mdp.py new file mode 100644 index 0000000..42bd029 --- /dev/null +++ b/app/migrations/0014_alter_zone_mdp.py @@ -0,0 +1,19 @@ +# Generated by Django 4.1 on 2022-09-05 21:39 + +import app.models +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0013_remove_challenge_code_zone_mdp'), + ] + + operations = [ + migrations.AlterField( + model_name='zone', + name='mdp', + field=models.IntegerField(default=app.models.random_string, unique=True), + ), + ] diff --git a/app/models.py b/app/models.py index e6e9627..9163a04 100644 --- a/app/models.py +++ b/app/models.py @@ -3,7 +3,8 @@ import random from django.db import models def random_string(): - return str(random.randint(1000, 9999)) + value = str(random.randint(1000, 9999)) + return value class Zone(models.Model): ETATS = ( @@ -13,7 +14,8 @@ class Zone(models.Model): ) nom = models.CharField(max_length=50) etat = models.CharField(max_length=1, choices=ETATS, default = 'L') - code = models.IntegerField(default = random_string, unique=True) + code = models.IntegerField(default = random_string, unique=True)#code pour accéder à la zone + mdp = models.IntegerField(default = random_string, unique=True)#code pour valider la zone description = models.TextField(default = '') def __str__(self): return self.nom+" : "+self.get_etat_display()+" ("+str(self.code)+")" @@ -38,7 +40,6 @@ class Equipe(models.Model): class Challenge(models.Model): equipe = models.ForeignKey(Equipe, on_delete=models.CASCADE) zone = models.ForeignKey(Zone, on_delete=models.CASCADE) - code = models.IntegerField(default = random_string, unique=True)#code pour valider le challenge en cours rank = models.IntegerField(default = 1)#rang du challenge dans la liste start_time = models.TimeField(null=True, blank=True) end_time = models.TimeField(null=True, blank=True) diff --git a/app/templates/app/setEquipe.html b/app/templates/app/setEquipe.html index 4f97caa..85eb6ae 100644 --- a/app/templates/app/setEquipe.html +++ b/app/templates/app/setEquipe.html @@ -5,12 +5,6 @@
{% csrf_token %} {{ form }} -
{% elif zone %}

Bienvenue équipe {{equipe_nom}} ! Pour votre prochain challenge, rendez-vous dans la zone {{zone}} et flashez le QR code pour connaître votre prochaine mission !

diff --git a/app/templates/app/zone.html b/app/templates/app/zone.html index 77ed925..9527b2c 100644 --- a/app/templates/app/zone.html +++ b/app/templates/app/zone.html @@ -1,3 +1,33 @@ {% extends 'default_template.html' %}{% block 'contenu' %} -
{{zone.description |safe}} -
{% endblock %} +
{{zone.description |safe}} +
{% if zone.description %} +
+
{% csrf_token %} +
+
+ +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
{% endif %} + {% endblock %} diff --git a/app/views.py b/app/views.py index 9da5048..4aab02c 100644 --- a/app/views.py +++ b/app/views.py @@ -33,8 +33,22 @@ def displayZone(request, zone_id=None): else: try: zone = Zone.objects.filter(code=challenge.zone.code)[0] - if zone_id == zone.code: + if request.method == 'POST': + if int(request.POST.get('mdp')) == zone.mdp: + zone.etat = 'L' + zone.save() + #next_zone = attributeZone(zone) + messages.success(request, "Bon mot de passe") + else: + messages.warning(request, "Mauvais mot de passe") + context = { + 'zone':zone, + 'title': "Bienvenue dans la zone "+zone.nom, + } + elif zone_id == zone.code: startChallengeTime(challenge) + zone.etat = 'O' + zone.save() context = { 'zone':zone, 'title': "Bienvenue dans la zone "+zone.nom,