CLERC/Reskreen
6
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Merge pull request 'vhc-drap' (#24) from vhc-drap into master
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m57s
Details

Browse Source 
Reviewed-on: #24
This commit is contained in:
Brocas Mathieu
2025-01-24 01:06:07 +00:00
parent d5060993e2 fbeae9a317
commit f9988ea0df
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

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

2
Dockerfile
View File

@@ -13,7 +13,7 @@ RUN apk update && apk add --no-cache mariadb-connector-c-dev && apk add --no-cac
RUN python -m venv venv \ RUN python -m venv venv \
&& . venv/bin/activate \ && . venv/bin/activate \
&& pip install --no-cache-dir -r requirements.txt && 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 EXPOSE 8080

4
vehicles/admin.py
View File

@@ -6,7 +6,7 @@ from vehicles.models import *
class _vhc_admin(admin.ModelAdmin): class _vhc_admin(admin.ModelAdmin):
list_display = ('sName', 'nBases', 'nStatus', "bLucas", "bDrap") list_display = ('sName', 'nBases', 'nStatus', "bLucas")
ordering = ["nOrder"] ordering = ["nOrder"]
@@ -24,7 +24,7 @@ class _vhc_admin(admin.ModelAdmin):
'fields': ('sName', "nBases") 'fields': ('sName', "nBases")
}), }),
('Statut et équipement', { ('Statut et équipement', {
'fields': ('nStatus', 'bLucas', "bDrap") 'fields': ('nStatus', 'bLucas')
}), }),
('Informations diverses', { ('Informations diverses', {
'fields': ("nOrder", "nType") 'fields': ("nOrder", "nType")

2
vehicles/models.py
View File

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