From 0573c4e99c4e90a8c007a18b9737ab05709b20c2 Mon Sep 17 00:00:00 2001 From: clonbg Date: Mon, 20 Feb 2023 05:10:30 +0100 Subject: [PATCH] Tablas hechas --- README.md | 4 ++++ authentication/admin.py | 8 +------- authentication/models.py | 2 +- comparte/admin.py | 3 ++- comparte/migrations/0001_initial.py | 26 ++++++++++++++++++++++++++ comparte/models.py | 12 +++++++++++- compra/admin.py | 3 ++- compra/migrations/0001_initial.py | 26 ++++++++++++++++++++++++++ compra/models.py | 11 ++++++++++- item/admin.py | 3 ++- item/migrations/0001_initial.py | 21 +++++++++++++++++++++ item/models.py | 7 ++++++- lista/admin.py | 3 ++- lista/migrations/0001_initial.py | 21 +++++++++++++++++++++ lista/models.py | 7 ++++++- 15 files changed, 141 insertions(+), 16 deletions(-) create mode 100644 comparte/migrations/0001_initial.py create mode 100644 compra/migrations/0001_initial.py create mode 100644 item/migrations/0001_initial.py create mode 100644 lista/migrations/0001_initial.py diff --git a/README.md b/README.md index 18d28ef..eea4cc0 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,7 @@ Lista de la compra #### Commit 5 - 00:53:00 + +#### Commit 6 + +- 01:12:28 diff --git a/authentication/admin.py b/authentication/admin.py index 73b6440..e7ec47e 100644 --- a/authentication/admin.py +++ b/authentication/admin.py @@ -1,10 +1,4 @@ from django.contrib import admin from authentication.models import User - -@admin.register(User) -class UserAdmin(admin.ModelAdmin): - pass - - -# Register your models here. +admin.site.register(User) diff --git a/authentication/models.py b/authentication/models.py index ce13671..b2ee065 100644 --- a/authentication/models.py +++ b/authentication/models.py @@ -36,4 +36,4 @@ class User(AbstractUser): REQUIRED_FIELDS = [] def __str__(self): - return f"" diff --git a/comparte/admin.py b/comparte/admin.py index 8c38f3f..4c9c746 100644 --- a/comparte/admin.py +++ b/comparte/admin.py @@ -1,3 +1,4 @@ from django.contrib import admin +from comparte.models import Comparte -# Register your models here. +admin.site.register(Comparte) diff --git a/comparte/migrations/0001_initial.py b/comparte/migrations/0001_initial.py new file mode 100644 index 0000000..3147ab2 --- /dev/null +++ b/comparte/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# Generated by Django 4.1.7 on 2023-02-20 03:49 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('lista', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Comparte', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('lista', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='lista.lista')), + ('usuario', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/comparte/models.py b/comparte/models.py index 71a8362..cc99b37 100644 --- a/comparte/models.py +++ b/comparte/models.py @@ -1,3 +1,13 @@ from django.db import models +from django.contrib.auth import get_user_model +from lista.models import Lista -# Create your models here. +User = get_user_model() + + +class Comparte(models.Model): + usuario = models.ForeignKey(User, on_delete=models.CASCADE) + lista = models.ForeignKey(Lista, on_delete=models.CASCADE) + + def __str__(self): + return f"{self.usuario} - {self.lista}" diff --git a/compra/admin.py b/compra/admin.py index 8c38f3f..ecfbc9d 100644 --- a/compra/admin.py +++ b/compra/admin.py @@ -1,3 +1,4 @@ from django.contrib import admin +from compra.models import Compra -# Register your models here. +admin.site.register(Compra) diff --git a/compra/migrations/0001_initial.py b/compra/migrations/0001_initial.py new file mode 100644 index 0000000..a9f7faf --- /dev/null +++ b/compra/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# Generated by Django 4.1.7 on 2023-02-20 04:05 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('item', '0001_initial'), + ('lista', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Compra', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('cantidad', models.PositiveIntegerField(default=1)), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='item.item')), + ('lista', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='lista.lista')), + ], + ), + ] diff --git a/compra/models.py b/compra/models.py index 71a8362..aed3fde 100644 --- a/compra/models.py +++ b/compra/models.py @@ -1,3 +1,12 @@ from django.db import models +from lista.models import Lista +from item.models import Item -# Create your models here. + +class Compra(models.Model): + lista = models.ForeignKey(Lista, on_delete=models.CASCADE) + item = models.ForeignKey(Item, on_delete=models.CASCADE) + cantidad = models.PositiveIntegerField(default=1) + + def __str__(self): + return f"{self.lista} - {self.item}" diff --git a/item/admin.py b/item/admin.py index 8c38f3f..961cd89 100644 --- a/item/admin.py +++ b/item/admin.py @@ -1,3 +1,4 @@ from django.contrib import admin +from item.models import Item -# Register your models here. +admin.site.register(Item) diff --git a/item/migrations/0001_initial.py b/item/migrations/0001_initial.py new file mode 100644 index 0000000..b4f7f0d --- /dev/null +++ b/item/migrations/0001_initial.py @@ -0,0 +1,21 @@ +# Generated by Django 4.1.7 on 2023-02-20 03:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Item', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('nombre', models.CharField(max_length=120)), + ], + ), + ] diff --git a/item/models.py b/item/models.py index 71a8362..a6ea114 100644 --- a/item/models.py +++ b/item/models.py @@ -1,3 +1,8 @@ from django.db import models -# Create your models here. + +class Item(models.Model): + nombre = models.CharField(max_length=120, null=False, blank=False) + + def __str__(self): + return f"<{self.nombre}>" diff --git a/lista/admin.py b/lista/admin.py index 8c38f3f..cd383f5 100644 --- a/lista/admin.py +++ b/lista/admin.py @@ -1,3 +1,4 @@ from django.contrib import admin +from lista.models import Lista -# Register your models here. +admin.site.register(Lista) diff --git a/lista/migrations/0001_initial.py b/lista/migrations/0001_initial.py new file mode 100644 index 0000000..2db07f0 --- /dev/null +++ b/lista/migrations/0001_initial.py @@ -0,0 +1,21 @@ +# Generated by Django 4.1.7 on 2023-02-20 03:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Lista', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('nombre', models.CharField(max_length=200)), + ], + ), + ] diff --git a/lista/models.py b/lista/models.py index 71a8362..e347987 100644 --- a/lista/models.py +++ b/lista/models.py @@ -1,3 +1,8 @@ from django.db import models -# Create your models here. + +class Lista(models.Model): + nombre = models.CharField(max_length=200, null=False, blank=False) + + def __str__(self): + return f"<{self.nombre}>"