diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/user/__pycache__/apps.cpython-37.pyc b/apps/user/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..c1d1aeb --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/user/__pycache__/apps.cpython-37.pyc b/apps/user/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..c1d1aeb --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-37.pyc b/apps/user/__pycache__/models.cpython-37.pyc index ad6db3a..e6e6d4b 100644 --- a/apps/user/__pycache__/models.cpython-37.pyc +++ b/apps/user/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/user/__pycache__/apps.cpython-37.pyc b/apps/user/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..c1d1aeb --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-37.pyc b/apps/user/__pycache__/models.cpython-37.pyc index ad6db3a..e6e6d4b 100644 --- a/apps/user/__pycache__/models.cpython-37.pyc +++ b/apps/user/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/user/migrations/.gitignore b/apps/user/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/user/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/user/__pycache__/apps.cpython-37.pyc b/apps/user/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..c1d1aeb --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-37.pyc b/apps/user/__pycache__/models.cpython-37.pyc index ad6db3a..e6e6d4b 100644 --- a/apps/user/__pycache__/models.cpython-37.pyc +++ b/apps/user/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/user/migrations/.gitignore b/apps/user/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/user/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/user/migrations/0001_initial.py b/apps/user/migrations/0001_initial.py deleted file mode 100644 index b1aa65f..0000000 --- a/apps/user/migrations/0001_initial.py +++ /dev/null @@ -1,80 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -import django.contrib.auth.models -import django.contrib.auth.validators -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0011_update_proxy_permissions'), - ] - - operations = [ - migrations.CreateModel( - name='Gender', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeId', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Region', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.IntegerField()), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=100)), - ('region', models.CharField(max_length=100)), - ('active', models.BooleanField(blank=True, null=True)), - ('govern', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='governed', to='user.Region')), - ], - ), - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), - ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), - ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), - ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), - ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), - ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('photo', models.ImageField(blank=True, null=True, upload_to='logos/')), - ('notification_token', models.CharField(blank=True, max_length=100, null=True)), - ('gender', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Gender')), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('region', models.ManyToManyField(blank=True, related_name='city', to='user.Region')), - ('type_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), - ], - options={ - 'verbose_name': 'user', - 'verbose_name_plural': 'users', - 'abstract': False, - }, - managers=[ - ('objects', django.contrib.auth.models.UserManager()), - ], - ), - ] diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/user/__pycache__/apps.cpython-37.pyc b/apps/user/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..c1d1aeb --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-37.pyc b/apps/user/__pycache__/models.cpython-37.pyc index ad6db3a..e6e6d4b 100644 --- a/apps/user/__pycache__/models.cpython-37.pyc +++ b/apps/user/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/user/migrations/.gitignore b/apps/user/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/user/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/user/migrations/0001_initial.py b/apps/user/migrations/0001_initial.py deleted file mode 100644 index b1aa65f..0000000 --- a/apps/user/migrations/0001_initial.py +++ /dev/null @@ -1,80 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -import django.contrib.auth.models -import django.contrib.auth.validators -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0011_update_proxy_permissions'), - ] - - operations = [ - migrations.CreateModel( - name='Gender', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeId', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Region', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.IntegerField()), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=100)), - ('region', models.CharField(max_length=100)), - ('active', models.BooleanField(blank=True, null=True)), - ('govern', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='governed', to='user.Region')), - ], - ), - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), - ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), - ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), - ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), - ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), - ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('photo', models.ImageField(blank=True, null=True, upload_to='logos/')), - ('notification_token', models.CharField(blank=True, max_length=100, null=True)), - ('gender', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Gender')), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('region', models.ManyToManyField(blank=True, related_name='city', to='user.Region')), - ('type_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), - ], - options={ - 'verbose_name': 'user', - 'verbose_name_plural': 'users', - 'abstract': False, - }, - managers=[ - ('objects', django.contrib.auth.models.UserManager()), - ], - ), - ] diff --git a/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b9eca65..0000000 --- a/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/user/__pycache__/apps.cpython-37.pyc b/apps/user/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..c1d1aeb --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-37.pyc b/apps/user/__pycache__/models.cpython-37.pyc index ad6db3a..e6e6d4b 100644 --- a/apps/user/__pycache__/models.cpython-37.pyc +++ b/apps/user/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/user/migrations/.gitignore b/apps/user/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/user/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/user/migrations/0001_initial.py b/apps/user/migrations/0001_initial.py deleted file mode 100644 index b1aa65f..0000000 --- a/apps/user/migrations/0001_initial.py +++ /dev/null @@ -1,80 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -import django.contrib.auth.models -import django.contrib.auth.validators -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0011_update_proxy_permissions'), - ] - - operations = [ - migrations.CreateModel( - name='Gender', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeId', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Region', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.IntegerField()), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=100)), - ('region', models.CharField(max_length=100)), - ('active', models.BooleanField(blank=True, null=True)), - ('govern', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='governed', to='user.Region')), - ], - ), - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), - ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), - ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), - ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), - ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), - ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('photo', models.ImageField(blank=True, null=True, upload_to='logos/')), - ('notification_token', models.CharField(blank=True, max_length=100, null=True)), - ('gender', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Gender')), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('region', models.ManyToManyField(blank=True, related_name='city', to='user.Region')), - ('type_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), - ], - options={ - 'verbose_name': 'user', - 'verbose_name_plural': 'users', - 'abstract': False, - }, - managers=[ - ('objects', django.contrib.auth.models.UserManager()), - ], - ), - ] diff --git a/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b9eca65..0000000 --- a/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/user/models.py b/apps/user/models.py index 438a8f2..4236063 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -28,6 +28,6 @@ class User(AbstractUser): photo = models.ImageField(blank=True, null=True, upload_to='logos/') gender = models.ForeignKey(Gender, null=True, blank=True, on_delete=models.PROTECT) - region = models.ManyToManyField(to=Region, blank=True, related_name="city") + city = models.ForeignKey(Region, null=True, blank=True, on_delete=models.PROTECT) notification_token = models.CharField(max_length=100, blank=True, null=True) type_id = models.ForeignKey(TypeId, blank=True, null=True, on_delete=models.PROTECT) diff --git a/apps/hotel/__pycache__/apps.cpython-37.pyc b/apps/hotel/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..1bf23ef --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-37.pyc b/apps/hotel/__pycache__/models.cpython-37.pyc index a49c99f..f9a34f7 100644 --- a/apps/hotel/__pycache__/models.cpython-37.pyc +++ b/apps/hotel/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/hotel/apps.py b/apps/hotel/apps.py index f3b7bf0..86374ad 100644 --- a/apps/hotel/apps.py +++ b/apps/hotel/apps.py @@ -2,4 +2,4 @@ class HotelConfig(AppConfig): - name = 'hotel' + name = 'apps.hotel' diff --git a/apps/hotel/migrations/.gitignore b/apps/hotel/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/hotel/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/hotel/migrations/0001_initial.py b/apps/hotel/migrations/0001_initial.py deleted file mode 100644 index 7939644..0000000 --- a/apps/hotel/migrations/0001_initial.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion -import hotelApi.tricks - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Executive', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=100)), - ('identification', models.CharField(max_length=60)), - ('name', models.CharField(blank=True, max_length=60, null=True)), - ('last_name', models.CharField(blank=True, max_length=70, null=True)), - ('phone', models.CharField(blank=True, max_length=40, null=True)), - ('direction', models.CharField(max_length=150)), - ('email', models.CharField(blank=True, max_length=100, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Hotel', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=60)), - ('name', models.CharField(max_length=60)), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('phone', models.CharField(blank=True, max_length=50, null=True)), - ('email', models.CharField(blank=True, max_length=70, null=True)), - ('logo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('logos/'))), - ('direction', models.CharField(max_length=100)), - ('reference', models.CharField(blank=True, max_length=100, null=True)), - ('barrio', models.CharField(blank=True, max_length=50, null=True)), - ('latitude', models.FloatField(blank=True, null=True)), - ('longitude', models.FloatField(blank=True, null=True)), - ('active', models.BooleanField(blank=True, null=True)), - ('available', models.BooleanField(default=True)), - ('terms', models.BooleanField(blank=True, null=True)), - ('open_time', models.CharField(blank=True, max_length=100, null=True)), - ('close_time', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='TypeRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=150)), - ('description', models.TextField(blank=True, null=True)), - ('active', models.BooleanField(default=True)), - ('price', models.FloatField(blank=True, null=True)), - ('discount', models.FloatField(blank=True, null=True)), - ('photo', models.ImageField(blank=True, null=True, upload_to=hotelApi.tricks.UploadToPathAndRename('room/'))), - ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='hotel.Hotel')), - ('type_room', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.TypeRoom')), - ], - ), - ] diff --git a/apps/hotel/migrations/0002_auto_20210430_1019.py b/apps/hotel/migrations/0002_auto_20210430_1019.py deleted file mode 100644 index 5964b60..0000000 --- a/apps/hotel/migrations/0002_auto_20210430_1019.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('user', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='hotel', - name='admin', - field=models.ManyToManyField(blank=True, related_name='administrator', to=settings.AUTH_USER_MODEL), - ), - migrations.AddField( - model_name='hotel', - name='executive', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='hotel.Executive'), - ), - migrations.AddField( - model_name='hotel', - name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Region'), - ), - migrations.AddField( - model_name='executive', - name='type_id', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId'), - ), - ] diff --git a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b661c6c..0000000 --- a/apps/hotel/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc b/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc deleted file mode 100644 index 3adc242..0000000 --- a/apps/hotel/migrations/__pycache__/0002_auto_20210430_1019.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index dad0f66..432a164 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -5,18 +5,6 @@ from hotelApi.tricks import UploadToPathAndRename, compress -class Executive(models.Model): - code = models.CharField(max_length=100) - identification = models.CharField(max_length=60) - name = models.CharField(max_length=60, blank=True, null=True) - last_name = models.CharField(max_length=70, blank=True, null=True) - phone = models.CharField(max_length=40, blank=True, null=True, ) - direction = models.CharField(max_length=150) - email = models.CharField(max_length=100, blank=True, null=True) - type_id = models.ForeignKey(TypeId, null=True, blank=True, on_delete=models.PROTECT) - active = models.BooleanField(blank=True, null=True) - - class Hotel(models.Model): admin = models.ManyToManyField(User, blank=True, related_name='administrator') code = models.CharField(max_length=60) @@ -36,7 +24,6 @@ terms = models.BooleanField(blank=True, null=True) open_time = models.CharField(max_length=100, null=True, blank=True) close_time = models.CharField(max_length=100, null=True, blank=True) - executive = models.ForeignKey(Executive, null=True, blank=True, on_delete=models.PROTECT) class TypeRoom(models.Model): diff --git a/apps/hotel/serializer.py b/apps/hotel/serializer.py index 4602d74..c9a9339 100644 --- a/apps/hotel/serializer.py +++ b/apps/hotel/serializer.py @@ -1,12 +1,6 @@ from rest_framework import serializers -from apps.hotel.models import Executive, Hotel, TypeRoom, Room - - -class ExecutiveSerializer(serializers.ModelSerializer): - class Meta: - model = Executive - fields = '__all__' +from apps.hotel.models import Hotel, TypeRoom, Room class HotelSerializer(serializers.ModelSerializer): diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 18c5b95..47834bd 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,10 +1,9 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import ExecutiveViewSet, HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet router = routers.DefaultRouter() -router.register(r'executive', ExecutiveViewSet) router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) diff --git a/apps/hotel/views.py b/apps/hotel/views.py index b76b951..da07a05 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,11 +1,6 @@ from rest_framework import viewsets -from apps.hotel.models import Executive, Hotel, TypeRoom, Room -from apps.hotel.serializer import ExecutiveSerializer, HotelSerializer, TypeRoomSerializer, RoomSerializer - - -class ExecutiveViewSet(viewsets.ModelViewSet): - queryset = Executive.objects.all() - serializer_class = ExecutiveSerializer +from apps.hotel.models import Hotel, TypeRoom, Room +from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer class HotelViewSet(viewsets.ModelViewSet): diff --git a/apps/service/__pycache__/apps.cpython-37.pyc b/apps/service/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..6c87ed8 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-37.pyc b/apps/service/__pycache__/models.cpython-37.pyc index d9e989f..1baf96f 100644 --- a/apps/service/__pycache__/models.cpython-37.pyc +++ b/apps/service/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/service/apps.py b/apps/service/apps.py index 9728199..faabebe 100644 --- a/apps/service/apps.py +++ b/apps/service/apps.py @@ -2,4 +2,4 @@ class ServiceConfig(AppConfig): - name = 'service' + name = 'apps.service' diff --git a/apps/service/migrations/.gitignore b/apps/service/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/service/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/service/migrations/0001_initial.py b/apps/service/migrations/0001_initial.py deleted file mode 100644 index 765470c..0000000 --- a/apps/service/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('hotel', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Booking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateTimeField(blank=True, null=True)), - ('end_date', models.DateTimeField(blank=True, null=True)), - ('description', models.TextField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ('discount', models.FloatField(default=0.0)), - ('rooms', models.ManyToManyField(blank=True, related_name='room', to='hotel.Room')), - ('services', models.ManyToManyField(blank=True, related_name='service', to='hotel.Room')), - ], - ), - migrations.CreateModel( - name='Service', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('description', models.TextField(blank=True, null=True)), - ('price', models.FloatField(default=0.0)), - ], - ), - migrations.CreateModel( - name='TypePay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeReservation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Pay', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(blank=True, max_length=200, null=True)), - ('date', models.DateTimeField(blank=True, null=True)), - ('value', models.FloatField(default=0.0)), - ('booking', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.Booking')), - ], - ), - migrations.AddField( - model_name='booking', - name='type_reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeReservation'), - ), - ] diff --git a/apps/service/migrations/0002_booking_users.py b/apps/service/migrations/0002_booking_users.py deleted file mode 100644 index c4f6a92..0000000 --- a/apps/service/migrations/0002_booking_users.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('service', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='booking', - name='users', - field=models.ManyToManyField(blank=True, related_name='user', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index aa79c13..0000000 --- a/apps/service/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc b/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc deleted file mode 100644 index 4e90b5d..0000000 --- a/apps/service/migrations/__pycache__/0002_booking_users.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/service/models.py b/apps/service/models.py index 60514d1..4587816 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -1,5 +1,5 @@ from django.db import models -from apps.hotel.models import Room +from apps.hotel.models import Room, Hotel from apps.user.models import User @@ -19,6 +19,9 @@ name = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) price = models.FloatField(default=0.0) + included = models.BooleanField(default=True) + type_service = models.ForeignKey(TypeService, null=True, blank=True, on_delete=models.PROTECT) + hotel = models.ForeignKey(Hotel, null=True, blank=True, on_delete=models.PROTECT) class Booking(models.Model): @@ -31,7 +34,7 @@ type_reservation = models.ForeignKey(TypeReservation, null=True, blank=True, on_delete=models.PROTECT) users = models.ManyToManyField(User, blank=True, related_name='user') rooms = models.ManyToManyField(Room, blank=True, related_name='room') - services = models.ManyToManyField(Room, blank=True, related_name='service') + services = models.ManyToManyField(Service, blank=True, related_name='service') class TypePay(models.Model): @@ -45,3 +48,4 @@ date = models.DateTimeField(blank=True, null=True) value = models.FloatField(default=0.0) booking = models.ForeignKey(Booking, null=True, blank=True, on_delete=models.PROTECT) + type_pay = models.ForeignKey(TypePay, null=True, blank=True, on_delete=models.PROTECT) diff --git a/apps/user/__pycache__/apps.cpython-37.pyc b/apps/user/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..c1d1aeb --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-37.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-37.pyc b/apps/user/__pycache__/models.cpython-37.pyc index ad6db3a..e6e6d4b 100644 --- a/apps/user/__pycache__/models.cpython-37.pyc +++ b/apps/user/__pycache__/models.cpython-37.pyc Binary files differ diff --git a/apps/user/migrations/.gitignore b/apps/user/migrations/.gitignore new file mode 100644 index 0000000..e839540 --- /dev/null +++ b/apps/user/migrations/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!__init__.py \ No newline at end of file diff --git a/apps/user/migrations/0001_initial.py b/apps/user/migrations/0001_initial.py deleted file mode 100644 index b1aa65f..0000000 --- a/apps/user/migrations/0001_initial.py +++ /dev/null @@ -1,80 +0,0 @@ -# Generated by Django 3.0.2 on 2021-04-30 15:19 - -import django.contrib.auth.models -import django.contrib.auth.validators -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0011_update_proxy_permissions'), - ] - - operations = [ - migrations.CreateModel( - name='Gender', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='TypeId', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=50)), - ('active', models.BooleanField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Region', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.IntegerField()), - ('name', models.CharField(max_length=100)), - ('acronym', models.CharField(max_length=100)), - ('region', models.CharField(max_length=100)), - ('active', models.BooleanField(blank=True, null=True)), - ('govern', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='governed', to='user.Region')), - ], - ), - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), - ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), - ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), - ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), - ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), - ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('photo', models.ImageField(blank=True, null=True, upload_to='logos/')), - ('notification_token', models.CharField(blank=True, max_length=100, null=True)), - ('gender', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.Gender')), - ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), - ('region', models.ManyToManyField(blank=True, related_name='city', to='user.Region')), - ('type_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='user.TypeId')), - ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), - ], - options={ - 'verbose_name': 'user', - 'verbose_name_plural': 'users', - 'abstract': False, - }, - managers=[ - ('objects', django.contrib.auth.models.UserManager()), - ], - ), - ] diff --git a/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc b/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc deleted file mode 100644 index b9eca65..0000000 --- a/apps/user/migrations/__pycache__/0001_initial.cpython-37.pyc +++ /dev/null Binary files differ diff --git a/apps/user/models.py b/apps/user/models.py index 438a8f2..4236063 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -28,6 +28,6 @@ class User(AbstractUser): photo = models.ImageField(blank=True, null=True, upload_to='logos/') gender = models.ForeignKey(Gender, null=True, blank=True, on_delete=models.PROTECT) - region = models.ManyToManyField(to=Region, blank=True, related_name="city") + city = models.ForeignKey(Region, null=True, blank=True, on_delete=models.PROTECT) notification_token = models.CharField(max_length=100, blank=True, null=True) type_id = models.ForeignKey(TypeId, blank=True, null=True, on_delete=models.PROTECT) diff --git a/hotelApi/__pycache__/settings.cpython-37.pyc b/hotelApi/__pycache__/settings.cpython-37.pyc index ac6cd45..fc5030b 100644 --- a/hotelApi/__pycache__/settings.cpython-37.pyc +++ b/hotelApi/__pycache__/settings.cpython-37.pyc Binary files differ