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

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

Browse Source 
Reviewed-on: #23
This commit is contained in:
Brocas Mathieu
2025-01-24 00:09:13 +00:00
parent ba74891208 de757fd152
commit 5464f53e56
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -380,3 +380,6 @@ media/
db.sqlite3 db.sqlite3
/Reskreen/my.cnf /Reskreen/my.cnf
db.sqlite3 db.sqlite3
/config/my.cnf
/config/my_dev.cnf

2
requirements.txt
View File

@@ -4,7 +4,6 @@ asn1crypto==1.5.1
bleach==6.1.0 bleach==6.1.0
caldav==1.3.9 caldav==1.3.9
certifi==2024.7.4 certifi==2024.7.4
cffi==1.16.0
chardet==5.2.0 chardet==5.2.0
charset-normalizer==3.3.2 charset-normalizer==3.3.2
click==8.1.7 click==8.1.7
@@ -25,7 +24,6 @@ gunicorn==22.0.0
html5lib==1.1 html5lib==1.1
icalendar==5.0.13 icalendar==5.0.13
idna==3.7 idna==3.7
lxml==5.2.2
mysqlclient==2.2.4 mysqlclient==2.2.4
oscrypto==1.3.0 oscrypto==1.3.0
packaging==24.1 packaging==24.1

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") list_display = ('sName', 'nBases', 'nStatus', "bLucas", "bDrap")
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') 'fields': ('nStatus', 'bLucas', "bDrap")
}), }),
('Informations diverses', { ('Informations diverses', {
'fields': ("nOrder", "nType") 'fields': ("nOrder", "nType")

1
vehicles/models.py
View File

@@ -38,6 +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)
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)