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__/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/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__/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/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/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__/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/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/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__/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/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/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__/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/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/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__/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/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/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__/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__/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/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/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__/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/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__/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/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/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__/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/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/0003_auto_20210520_1454.py b/apps/service/migrations/0003_auto_20210520_1454.py new file mode 100644 index 0000000..79163a2 --- /dev/null +++ b/apps/service/migrations/0003_auto_20210520_1454.py @@ -0,0 +1,29 @@ +# Generated by Django 3.0.2 on 2021-05-20 19:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('service', '0002_booking_users'), + ] + + operations = [ + migrations.AddField( + model_name='pay', + name='type_pay', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypePay'), + ), + migrations.AddField( + model_name='service', + name='type_service', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeService'), + ), + migrations.AlterField( + model_name='booking', + name='services', + field=models.ManyToManyField(blank=True, related_name='service', to='service.Service'), + ), + ] 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/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/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__/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/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/0003_auto_20210520_1454.py b/apps/service/migrations/0003_auto_20210520_1454.py new file mode 100644 index 0000000..79163a2 --- /dev/null +++ b/apps/service/migrations/0003_auto_20210520_1454.py @@ -0,0 +1,29 @@ +# Generated by Django 3.0.2 on 2021-05-20 19:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('service', '0002_booking_users'), + ] + + operations = [ + migrations.AddField( + model_name='pay', + name='type_pay', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypePay'), + ), + migrations.AddField( + model_name='service', + name='type_service', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeService'), + ), + migrations.AlterField( + model_name='booking', + name='services', + field=models.ManyToManyField(blank=True, related_name='service', to='service.Service'), + ), + ] 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__/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/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/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__/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/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/0003_auto_20210520_1454.py b/apps/service/migrations/0003_auto_20210520_1454.py new file mode 100644 index 0000000..79163a2 --- /dev/null +++ b/apps/service/migrations/0003_auto_20210520_1454.py @@ -0,0 +1,29 @@ +# Generated by Django 3.0.2 on 2021-05-20 19:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('service', '0002_booking_users'), + ] + + operations = [ + migrations.AddField( + model_name='pay', + name='type_pay', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypePay'), + ), + migrations.AddField( + model_name='service', + name='type_service', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeService'), + ), + migrations.AlterField( + model_name='booking', + name='services', + field=models.ManyToManyField(blank=True, related_name='service', to='service.Service'), + ), + ] 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__/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__/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/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/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__/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/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/0003_auto_20210520_1454.py b/apps/service/migrations/0003_auto_20210520_1454.py new file mode 100644 index 0000000..79163a2 --- /dev/null +++ b/apps/service/migrations/0003_auto_20210520_1454.py @@ -0,0 +1,29 @@ +# Generated by Django 3.0.2 on 2021-05-20 19:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('service', '0002_booking_users'), + ] + + operations = [ + migrations.AddField( + model_name='pay', + name='type_pay', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypePay'), + ), + migrations.AddField( + model_name='service', + name='type_service', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeService'), + ), + migrations.AlterField( + model_name='booking', + name='services', + field=models.ManyToManyField(blank=True, related_name='service', to='service.Service'), + ), + ] 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__/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__/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/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/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__/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/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/0003_auto_20210520_1454.py b/apps/service/migrations/0003_auto_20210520_1454.py new file mode 100644 index 0000000..79163a2 --- /dev/null +++ b/apps/service/migrations/0003_auto_20210520_1454.py @@ -0,0 +1,29 @@ +# Generated by Django 3.0.2 on 2021-05-20 19:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('service', '0002_booking_users'), + ] + + operations = [ + migrations.AddField( + model_name='pay', + name='type_pay', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypePay'), + ), + migrations.AddField( + model_name='service', + name='type_service', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='service.TypeService'), + ), + migrations.AlterField( + model_name='booking', + name='services', + field=models.ManyToManyField(blank=True, related_name='service', to='service.Service'), + ), + ] 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__/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/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)