diff --git a/Reskreen/urls.py b/Reskreen/urls.py index b80a39e..0472f1a 100644 --- a/Reskreen/urls.py +++ b/Reskreen/urls.py @@ -19,6 +19,7 @@ from django.urls import path, include urlpatterns = [ path('admin/', admin.site.urls), path('collabs/', include('collabs.urls')), + path('vehicules/', include('vehicles.urls')), path('caldav/', include('mycaldav.urls')), #path('collabs_hour/', include('collabs.urls')), ] diff --git a/vehicles/admin.py b/vehicles/admin.py index fd6eb6b..1ad17e4 100644 --- a/vehicles/admin.py +++ b/vehicles/admin.py @@ -37,5 +37,5 @@ class _vhc_infos_admin(admin.ModelAdmin): -admin.site.register(vehicles_infos, _vhc_infos_admin) -admin.site.register(vehicles, _vhc_admin) +admin.site.register(Vehicles_infos, _vhc_infos_admin) +admin.site.register(Vehicles, _vhc_admin) diff --git a/vehicles/models.py b/vehicles/models.py index e1c612f..932cd09 100644 --- a/vehicles/models.py +++ b/vehicles/models.py @@ -21,7 +21,7 @@ TYPES_CHOICES = [ ] -class vehicles(models.Model): +class Vehicles(models.Model): sName = models.CharField("Indicatif", max_length=250) nBases = models.CharField('Basé à ', max_length=1, choices=BASES_CHOICES, default=1) nStatus = models.CharField('Statut', max_length=1, choices=STATUS_CHOICES, default=1) @@ -34,8 +34,8 @@ class vehicles(models.Model): verbose_name_plural = "véhicules" -class vehicles_infos(models.Model): - Vehicle = models.ForeignKey(vehicles, on_delete=models.CASCADE, verbose_name="Véhicule") +class Vehicles_infos(models.Model): + Vehicle = models.ForeignKey(Vehicles, on_delete=models.CASCADE, verbose_name="Véhicule") nType = models.CharField('Type', max_length=1, choices=TYPES_CHOICES, default=1) sTitle = models.CharField("Titre",max_length=250) sDesc = models.TextField("Description") diff --git a/vehicles/static/vehicles/images/ocvs_rtw_1.png b/vehicles/static/vehicles/images/ocvs_rtw_1.png new file mode 100644 index 0000000..6e2958c Binary files /dev/null and b/vehicles/static/vehicles/images/ocvs_rtw_1.png differ diff --git a/vehicles/static/vehicles/images/ocvs_rtw_2.png b/vehicles/static/vehicles/images/ocvs_rtw_2.png new file mode 100644 index 0000000..eee22a9 Binary files /dev/null and b/vehicles/static/vehicles/images/ocvs_rtw_2.png differ diff --git a/vehicles/static/vehicles/images/ocvs_rtw_3.png b/vehicles/static/vehicles/images/ocvs_rtw_3.png new file mode 100644 index 0000000..91d9a45 Binary files /dev/null and b/vehicles/static/vehicles/images/ocvs_rtw_3.png differ diff --git a/vehicles/static/vehicles/images/ocvs_rtw_4.png b/vehicles/static/vehicles/images/ocvs_rtw_4.png new file mode 100644 index 0000000..2bb002c Binary files /dev/null and b/vehicles/static/vehicles/images/ocvs_rtw_4.png differ diff --git a/vehicles/static/vehicles/style.css b/vehicles/static/vehicles/style.css new file mode 100644 index 0000000..c90f3ae --- /dev/null +++ b/vehicles/static/vehicles/style.css @@ -0,0 +1,15 @@ + .main_container{ + width: 100%; + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: space-between; + height: 350px; + } + .child{ + width: 350px; + color: green; + border: solid 1px black; + background-repeat: no-repeat, repeat; + background-size: contain; + } \ No newline at end of file diff --git a/vehicles/templates/vhc/vhc.html b/vehicles/templates/vhc/vhc.html new file mode 100644 index 0000000..7c0a37b --- /dev/null +++ b/vehicles/templates/vhc/vhc.html @@ -0,0 +1,26 @@ + +{% load static %} + + + + Title + + + +
+{% for vhc in list_vhc %} + {% with 'vehicles/images/ocvs_rtw_'|add:vhc.nStatus|add:'.png' as image_static %} +
+ + {{vhc.sName}} + + + +
+ {% endwith %} +{% endfor %} +
+ + + + \ No newline at end of file diff --git a/vehicles/urls.py b/vehicles/urls.py new file mode 100644 index 0000000..e4815ff --- /dev/null +++ b/vehicles/urls.py @@ -0,0 +1,15 @@ +from django.urls import path + + + +from . import views + + +app_name = "vehicles" +urlpatterns = [ + path('vhc', views.view_vhc, name='view_vhc'), + + + +] + diff --git a/vehicles/views.py b/vehicles/views.py index 91ea44a..58d4dbf 100644 --- a/vehicles/views.py +++ b/vehicles/views.py @@ -1,3 +1,17 @@ +from django.http import HttpResponse +from django.http import FileResponse from django.shortcuts import render +from django.views import generic +from django.template import loader +from django.views.decorators.clickjacking import xframe_options_exempt -# Create your views here. +from vehicles.models import * + +@xframe_options_exempt +def view_vhc(request): + template = loader.get_template("vhc/vhc.html") + context = {'list_vhc': Vehicles.objects.all()} + print("passs 1 ligne 12") + + + return HttpResponse(template.render(context,request))