From 769078f261e2879bd23d42f1192c85729cd6ccbf Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Sat, 18 Dec 2021 18:56:14 +0100 Subject: [PATCH] =?UTF-8?q?s=C3=A9paration=20des=20application=20pols=20et?= =?UTF-8?q?=20vehicles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Reskreen/settings.py | 1 + db.sqlite3 | Bin 155648 -> 159744 bytes polls/admin.py | 3 +- polls/migrations/0003_delete_vehicles.py | 16 +++++++++ polls/models.py | 21 ------------ rh/__init__.py | 0 rh/admin.py | 3 ++ rh/apps.py | 6 ++++ rh/migrations/__init__.py | 0 rh/models.py | 3 ++ rh/tests.py | 3 ++ rh/views.py | 3 ++ vehicles/__init__.py | 0 vehicles/admin.py | 3 ++ vehicles/apps.py | 6 ++++ vehicles/migrations/0001_initial.py | 40 +++++++++++++++++++++++ vehicles/migrations/__init__.py | 0 vehicles/models.py | 23 +++++++++++++ vehicles/tests.py | 3 ++ vehicles/views.py | 3 ++ 20 files changed, 115 insertions(+), 22 deletions(-) create mode 100644 polls/migrations/0003_delete_vehicles.py create mode 100644 rh/__init__.py create mode 100644 rh/admin.py create mode 100644 rh/apps.py create mode 100644 rh/migrations/__init__.py create mode 100644 rh/models.py create mode 100644 rh/tests.py create mode 100644 rh/views.py create mode 100644 vehicles/__init__.py create mode 100644 vehicles/admin.py create mode 100644 vehicles/apps.py create mode 100644 vehicles/migrations/0001_initial.py create mode 100644 vehicles/migrations/__init__.py create mode 100644 vehicles/models.py create mode 100644 vehicles/tests.py create mode 100644 vehicles/views.py diff --git a/Reskreen/settings.py b/Reskreen/settings.py index 24a685d..3000718 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -38,6 +38,7 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'polls.apps.PollsConfig', + 'vehicles.apps.VehiclesConfig', ] MIDDLEWARE = [ diff --git a/db.sqlite3 b/db.sqlite3 index 8b31da926c2fe5932ad71361b317f9bdd2506208..c47db013cb281ab34cf12b7397f91be7b1021d8a 100644 GIT binary patch delta 1914 zcma)7U2NM_6!ux1xVF>Yl&($N5#lCI)BG(?vMf!8wuUa!DwU?CDT0S7fA(mmH0cu4 z^@%nJA?VPcvV?g-8}NXTn8XNDhD1fh3)1#7AvB-^F^LDBfQbj5C}1aXnzbEZ$;ZCu zp6|Qoo_qA&wJmb(9{I+R?jVL?cKKDG_=YXNG)N;WhJHccp_}M4 zbOo)Wi-<#WD2%K!sTQ$^X&f_|R5tb7Psv`JI$CaH73bpDHE#WiNX$$cI*s}r{ZIN^ z`WyOp^{?qyWXgX1Y7Y)}pqF#}#a1ocy*Rjl-cuo0!<$`57oOX#oAVJIY(S?ut_61( zaqt4wplnNKbO46{P%3R>CRE?Oy)mV7w}D3baPRDQVnYJ0fv=(tzw} z2pvJa2q6+_x_0EPz1_uXH2}1`Ze4ZjtXqd-snNQ%*X>B%+Nz!(ze#Dju~#Kx9LzX8 zD*rjhAzAw%2PdKSWfUThdAh#9dazln^N&uKUPF7Rm&xDB%?<yagGzlvmvNFnJaMoih4}R_H#-`pBEO2rDTpva^Z95j)k(m1LJHH zPsO5%7&AG2I`#}>IWT4q*Q!EhVdB#d3AZq#me%SP$4kCbgfSF?S3pS1M|0o`2Rg0I z)DqDrrebYt>D%`yM)g5mIgu0cytJ8uL38;uU(Q+>fnO1r>3D*fo}Zd>GnP!Opsdb` z7swu+Feju-g7|tzpOzD11y1>MmK!-+nB{ayZky7m&(AvADL7$%iAxJIha66F!bFKz zN7_18Vkcmpc)B4O(uV~Y>fYU0Q%EG=BG_juk&}ec>xCDsduq~*+6S{dq!wzRQU>XA z5g220pB5%lEaqG3J8G##cn@m96wHI}L{MjpJH*fFekq*+v$URuPo=dC1ZrDZxCYX* zSqM^O3_@>Bw)%PsnvL zMMmTsV7sGZ*saCD?xm%hcfm}!u4+nrL+x6Kx}P0sKn{>Q1=4W0Aj<9Fw8;oh zaGwmeQg4&S+MC;OKKAhzZm8kxp+Av9xvemRVlb=xTB_Yk_fYMA{E)!_a)sCaM*jeU C@JuoQ delta 747 zcmZWnT}V@L6#t)l=k9iOooy{w4fHy%)$(IEKPo>m*Ia21S8fG8#HQP2PUhxUnQwkT zkVRw{yaa(#4^a?gm$(HHSFtD^#NS3X<^Vfj`g*v8fj za@Y?=@_0S0tFs=c$|zeqV!_|~*) ziew#iX}?y-M7RhtABR`^>I%I*;F8{C?v*p*kSj06p^P1}2#h^14~9A=A#M9%zDs;oKU=?smgSXJ2buQcQ{c;c!S`1oLZtTi<{O5OZT8%1cU5dpM3Z9gPUiHs_&gyW7xJ9) z`#9%6B6rA{YOHs1iBz8$7kjuXsoq39CB~%g%xtT-!RKw-uBbi12`>3X6!IM{Vry)` z$+e}^Nv=5%;+ik`{jTcDZHKv?Gr~u9@_bf-WmRbfhmE5+&8p*z(BXT& erZcNLf%=2yP5-w7uie^;V(D5&buB=d&3^&pX59q< diff --git a/polls/admin.py b/polls/admin.py index 8cf0ac9..6092488 100644 --- a/polls/admin.py +++ b/polls/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin -from polls.models import Question, Choice, Vehicles +from polls.models import Question, Choice +from vehicles.models import * # Register your models here. diff --git a/polls/migrations/0003_delete_vehicles.py b/polls/migrations/0003_delete_vehicles.py new file mode 100644 index 0000000..4d26d05 --- /dev/null +++ b/polls/migrations/0003_delete_vehicles.py @@ -0,0 +1,16 @@ +# Generated by Django 4.0 on 2021-12-18 17:54 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('polls', '0002_rename_questionid_choice_question'), + ] + + operations = [ + migrations.DeleteModel( + name='Vehicles', + ), + ] diff --git a/polls/models.py b/polls/models.py index 7105dfc..d391de6 100644 --- a/polls/models.py +++ b/polls/models.py @@ -1,31 +1,10 @@ import datetime from django.db import models -from django.conf import settings from django.utils import timezone # Create your models here. -class Vehicles(models.Model): - sName = models.CharField (max_length=250) - bEnabled = models.BooleanField( default=0 ) - -class Vhc_problems(models.Model): - Vehicle = models.ForeignKey( Vehicles, on_delete=models.CASCADE) - sTitle = models.CharField( max_length=250) - sDesc = models.TextField() - bEnabled = models.BooleanField( default=1) - dtStart = models.DateTimeField() - dtEnd = models.DateTimeField() - sAuthor = models.CharField( max_length=120) - Author = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.DO_NOTHING ) - dtUpdated = models.DateTimeField('date updated') - dtCreated = models.DateTimeField('date published') - - - - - class Question(models.Model): question_txt = models.CharField( max_length=250) pub_date = models.DateTimeField('date published') diff --git a/rh/__init__.py b/rh/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/rh/admin.py b/rh/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/rh/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/rh/apps.py b/rh/apps.py new file mode 100644 index 0000000..c377f74 --- /dev/null +++ b/rh/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class RhConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'rh' diff --git a/rh/migrations/__init__.py b/rh/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/rh/models.py b/rh/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/rh/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/rh/tests.py b/rh/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/rh/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/rh/views.py b/rh/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/rh/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/vehicles/__init__.py b/vehicles/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vehicles/admin.py b/vehicles/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/vehicles/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/vehicles/apps.py b/vehicles/apps.py new file mode 100644 index 0000000..a32e145 --- /dev/null +++ b/vehicles/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class VehiclesConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'vehicles' diff --git a/vehicles/migrations/0001_initial.py b/vehicles/migrations/0001_initial.py new file mode 100644 index 0000000..9054c64 --- /dev/null +++ b/vehicles/migrations/0001_initial.py @@ -0,0 +1,40 @@ +# Generated by Django 4.0 on 2021-12-18 17:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='Vehicles', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sName', models.CharField(max_length=250)), + ('bEnabled', models.BooleanField(default=0)), + ], + ), + migrations.CreateModel( + name='Vhc_problems', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sTitle', models.CharField(max_length=250)), + ('sDesc', models.TextField()), + ('bEnabled', models.BooleanField(default=1)), + ('dtStart', models.DateTimeField()), + ('dtEnd', models.DateTimeField()), + ('sAuthor', models.CharField(max_length=120)), + ('dtUpdated', models.DateTimeField(verbose_name='date updated')), + ('dtCreated', models.DateTimeField(verbose_name='date published')), + ('Author', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user')), + ('Vehicle', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vehicles.vehicles')), + ], + ), + ] diff --git a/vehicles/migrations/__init__.py b/vehicles/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vehicles/models.py b/vehicles/models.py new file mode 100644 index 0000000..545a04e --- /dev/null +++ b/vehicles/models.py @@ -0,0 +1,23 @@ +import datetime + +from django.db import models +from django.conf import settings +from django.utils import timezone + + +class Vehicles(models.Model): + sName = models.CharField (max_length=250) + bEnabled = models.BooleanField( default=0 ) + +class Vhc_problems(models.Model): + Vehicle = models.ForeignKey( Vehicles, on_delete=models.CASCADE) + sTitle = models.CharField( max_length=250) + sDesc = models.TextField() + bEnabled = models.BooleanField( default=1) + dtStart = models.DateTimeField() + dtEnd = models.DateTimeField() + sAuthor = models.CharField( max_length=120) + Author = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.DO_NOTHING ) + dtUpdated = models.DateTimeField('date updated') + dtCreated = models.DateTimeField('date published') + diff --git a/vehicles/tests.py b/vehicles/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/vehicles/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/vehicles/views.py b/vehicles/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/vehicles/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.