diff --git a/api/urls.py b/api/urls.py index 81f751d..a414824 100755 --- a/api/urls.py +++ b/api/urls.py @@ -8,6 +8,7 @@ from .views import ( UserViewSet, MessageViewSet, StageViewSet, + NoteViewSet, ) @@ -20,5 +21,6 @@ router.register(r'realties', RealtyViewSet) router.register(r'specializations', SpecializationViewSet) router.register(r'users', UserViewSet) router.register(r'message', MessageViewSet) +router.register(r'note', NoteViewSet) urlpatterns = router.urls diff --git a/api/views.py b/api/views.py index a8d358d..11abebe 100755 --- a/api/views.py +++ b/api/views.py @@ -18,9 +18,9 @@ from common.models import Location from common.serializers import LocationSerializer from common.filters import LocationFilterSet -from chat.models import Message -from chat.serializers import MessageSerializer -from chat.filters import MessageFilterSet +from chat.models import Message, Notes +from chat.serializers import MessageSerializer, NoteSerializer +from chat.filters import MessageFilterSet, NoteFilterSet class StageViewSet(ModelViewSet): @@ -29,10 +29,6 @@ class StageViewSet(ModelViewSet): filter_class = StageFilterSet permission_classes = (permissions.IsAuthenticatedOrReadOnly,) - # def put(self, request, *args, **kwargs): - # # import code; code.interact(local=dict(globals(), **locals())) - # return super().update(request, *args, **kwargs) - class ProjectViewSet(ModelViewSet): queryset = Project.objects.all() @@ -40,6 +36,12 @@ class ProjectViewSet(ModelViewSet): filter_class = ProjectFilterSet +class NoteViewSet(ModelViewSet): + queryset = Notes.objects.all() + serializer_class = NoteSerializer + filter_class = NoteFilterSet + + class MessageViewSet(ModelViewSet): queryset = Message.objects.all() serializer_class = MessageSerializer @@ -57,14 +59,12 @@ class MessageViewSet(ModelViewSet): return queryset - class RealtyViewSet(ModelViewSet): queryset = Realty.objects.all() serializer_class = RealtySerializer filter_class = RealtyFilterSet - class SpecializationViewSet(ModelViewSet): queryset = Specialization.objects.root_nodes()[0].get_descendants() # queryset = Specialization.objects # Migrate with this enabled diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 79509db..2c61f25 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -52,6 +52,7 @@ LOCAL_APPS = [ 'users', 'reviews', 'chat', + 'wallets', ] INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS diff --git a/assets/css/extra.css b/assets/css/extra.css index 96bebd4..b058932 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -64,3 +64,7 @@ background-color: #00bb7b; font-size: 17px; } + +.textAreaBlock2 input[type="text"] { + margin: 0; +} diff --git a/chat/filters.py b/chat/filters.py index 63c24e0..727b598 100644 --- a/chat/filters.py +++ b/chat/filters.py @@ -1,6 +1,6 @@ from rest_framework_filters import FilterSet, RelatedFilter, AllLookupsFilter -from .models import Message +from .models import Message, Notes class MessageFilterSet(FilterSet): @@ -12,3 +12,13 @@ class MessageFilterSet(FilterSet): class Meta: model = Message + + +class NoteFilterSet(FilterSet): + text = AllLookupsFilter() + created = AllLookupsFilter() + sender = RelatedFilter('users.filters.UserFilterSet') + recipent = RelatedFilter('users.filters.UserFilterSet') + + class Meta: + model = Notes diff --git a/chat/serializers.py b/chat/serializers.py index e3b6146..3397e72 100644 --- a/chat/serializers.py +++ b/chat/serializers.py @@ -20,7 +20,16 @@ class MessageSerializer(ModelSerializer): ) -# class NotesSerializer(ModelSerializer): -# -# class Meta: -# model = Notes +class NoteSerializer(ModelSerializer): + + class Meta: + model = Notes + + fields = ( + 'text', + 'created', + 'order', + 'sender', + 'recipent', + ) + diff --git a/chat/templates/chat_contractor.html b/chat/templates/chat_contractor.html index 679a396..abaa9fb 100644 --- a/chat/templates/chat_contractor.html +++ b/chat/templates/chat_contractor.html @@ -8,6 +8,7 @@
Для заметок
сохранить