diff --git a/assets/css/main.css b/assets/css/main.css index ff529f7..a48b044 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -5977,7 +5977,7 @@ a.linkS2[data-target="#withdraw-money"]{ margin-top: 0px; } .changeBlock { - /*min-height: 650px;*/ + min-height: 500px; display: table; padding: 143px 20px 120px 20px; } diff --git a/assets/js/chat.js b/assets/js/chat.js index 0be9e0f..0cb86cd 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -29,7 +29,7 @@ window.confirm = function (message, callback, caption) { var SocketHandler = function () { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; + var url = 'ws://' + domain + '/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () { diff --git a/projects/forms.py b/projects/forms.py index b53ba53..74bca1e 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -35,8 +35,10 @@ class ProjectFilterForm(forms.ModelForm): fields = ( 'cro', - 'specialization', 'work_type', + + 'realty', + 'specialization', ) widgets = { diff --git a/projects/serializers.py b/projects/serializers.py index 8c97bdd..33ffff6 100755 --- a/projects/serializers.py +++ b/projects/serializers.py @@ -67,11 +67,12 @@ class RealtySerializer(ModelSerializer): model = Realty fields = ( + 'id', + 'name', + 'building_classification', 'construction_type', - 'id', 'location', - 'name', 'user', ) diff --git a/projects/templates/project_filter.html b/projects/templates/project_filter.html index 4b85d61..722bdf5 100644 --- a/projects/templates/project_filter.html +++ b/projects/templates/project_filter.html @@ -185,7 +185,7 @@ {% if project.realty and project.realty.name %} {% endif %} diff --git a/projects/views.py b/projects/views.py index ab3f3eb..862a1a3 100644 --- a/projects/views.py +++ b/projects/views.py @@ -289,6 +289,7 @@ class ProjectFilterView(BaseMixin, View): cro = form.cleaned_data.get('cro') work_type = form.cleaned_data.get('work_type') specialization = form.cleaned_data.get('specialization') + realty = form.cleaned_data.get('realty') building_classification = realty_form.cleaned_data.get('building_classification') construction_type = realty_form.cleaned_data.get('construction_type') @@ -323,6 +324,9 @@ class ProjectFilterView(BaseMixin, View): realty__location__lft__gte=location.lft, realty__location__rght__lte=location.rght, ) + + if realty: + projects = projects.filter(realty=realty) order_by = form.cleaned_data.get('order_by') last_order_by = form.cleaned_data.get('last_order_by') diff --git a/templates/partials/base.html b/templates/partials/base.html index d57fb43..9211d34 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -86,7 +86,7 @@ if ((queryString.indexOf('/chat') != 0) && (queryString.indexOf('/users/contractor-office/510/work-projects') != 0)) { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; + var url = 'ws://' + domain + '/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () {