Merge branch 'master' of https://gitea.prod.resk-u.ch/CLERC/Reskreen

.gitignore

@@ -365,18 +365,17 @@ FodyWeavers.xsd
 .venv*
 .venv-main*
 venv
-*migrations/
 
+*/migrations/__pycache__/
 
 server_config.py
 ./db.sqlite3
 db.sqlite3
 media/
 /mycaldav/export.pdf
-/vehicles/migrations/
-/vehicles/migrations_save/
-/carnet_rouge/migrations/
-/collabs/migrations/
 db.sqlite3
 /Reskreen/my.cnf
 db.sqlite3
+
+/config/my.cnf
+/config/my_dev.cnf

Dockerfile

@@ -13,7 +13,7 @@ RUN apk update && apk add --no-cache mariadb-connector-c-dev && apk add --no-cac
 RUN python -m venv venv \
     && . venv/bin/activate \
     && pip install --no-cache-dir -r requirements.txt
-RUN source venv/bin/activate && python manage.py makemigrations && python manage.py migrate
+#RUN source venv/bin/activate && python manage.py makemigrations && python manage.py migrate
 
 
 EXPOSE 8080

VERSION

@@ -1 +1 @@
-v3.1.45
+v3.1.47

vehicles/models.py

@@ -38,6 +38,7 @@ class Vehicles(models.Model):
     nStatus = models.CharField('Statut', max_length=1, choices=STATUS_CHOICES, default=1)
     nType = models.CharField('Type', max_length=1, choices=VHC_CHOICES, default=1)
     bLucas = models.BooleanField("Lucas", default=0)
+    #bDrap = models.BooleanField("Drap HRC", default=0)
     nOrder = models.IntegerField("Ordre", default=0)
     nTeam = models.CharField('Équipe', max_length=1, choices=TEAM_NUMBER, default=1)