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 8b31da9..c47db01 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ 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.