-
+
{% include 'partials/inc-projects-results.html' %}
diff --git a/templates/partials/ajax_pagination.html b/templates/partials/ajax_pagination.html
index 9d70c78..ec190a6 100644
--- a/templates/partials/ajax_pagination.html
+++ b/templates/partials/ajax_pagination.html
@@ -2,7 +2,7 @@
{#function paginateTo(pageNum) {#}
{# const $form = $('#filter-form');#}
{# const postfix = "&page=" + pageNum;#}
-{# const $container = $('#contractorsBlock');#}
+{# const $container = $('#resultsBlock');#}
{##}
{# sendData($form, $container, pageNum);#}
{# modUrl($form, postfix);#}
diff --git a/templates/partials/header.html b/templates/partials/header.html
index e48fb27..e26e445 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -143,7 +143,7 @@
- Готовые проекты
+ Готовые проекты
{% endif %}
{% if request.user.is_customer %}
@@ -151,7 +151,7 @@
Поиск исполнителей
- Готовые проекты
+ Готовые проекты
{% endif %}
{% else %}
@@ -162,7 +162,7 @@
Поиск исполнителей
- Готовые проекты
+ Готовые проекты
{% endif %}
diff --git a/templates/partials/trash/header.html b/templates/partials/trash/header.html
index 9b9ea67..7eaf205 100644
--- a/templates/partials/trash/header.html
+++ b/templates/partials/trash/header.html
@@ -40,7 +40,7 @@
- Готовые проекты
+ Готовые проекты
{% endif %}
@@ -51,7 +51,7 @@
- Готовые проекты
+ Готовые проекты
{% endif %}
@@ -68,7 +68,7 @@
- Готовые проекты
+ Готовые проекты
diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html
index 1354799..5a0ae93 100644
--- a/users/templates/contractor_filter.html
+++ b/users/templates/contractor_filter.html
@@ -18,7 +18,7 @@
{% include 'partials/inc-contractors-filter.html' %}
-
+
{% include 'partials/inc-contractors-results.html' %}
diff --git a/users/templates/partials/inc-contractors-filter.html b/users/templates/partials/inc-contractors-filter.html
index 87fc9af..1f41cf0 100644
--- a/users/templates/partials/inc-contractors-filter.html
+++ b/users/templates/partials/inc-contractors-filter.html
@@ -40,7 +40,7 @@
diff --git a/webpack.config.js b/webpack.config.js
index 0d5fd1f..9d39712 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,6 +23,8 @@ module.exports = {
init_contractor_filter: "./assets/js/src/init_contractor_filter.js",
contractor_filter: "./assets/js/src/contractor_filter.js",
project_filter: "./assets/js/src/project_filter.js",
+ init_worksell_filter: "./assets/js/src/init_worksell_filter.js",
+ worksell_filter: "./assets/js/src/worksell_filter.js",
//portfolio
init_portfolio_create_edit: "./assets/js/src/init_portfolio_create_edit.js",
portfolio_create_edit: "./assets/js/src/portfolio_create_edit.js",
diff --git a/work_sell/templates/partials/inc-worksell-filter.html b/work_sell/templates/partials/inc-worksell-filter.html
new file mode 100644
index 0000000..1e2f7fe
--- /dev/null
+++ b/work_sell/templates/partials/inc-worksell-filter.html
@@ -0,0 +1,147 @@
+
\ No newline at end of file
diff --git a/work_sell/templates/partials/inc-worksell-results.html b/work_sell/templates/partials/inc-worksell-results.html
new file mode 100644
index 0000000..e6402dd
--- /dev/null
+++ b/work_sell/templates/partials/inc-worksell-results.html
@@ -0,0 +1,20 @@
+{% load sass_tags %}
+
+
+
+
+
+ {% for work in worksells %}
+ {#
#}
+ {% include 'partials/inc-worksell_card.html' %}
+ {#
#}
+ {% endfor %}
+
+
+
+
+
+
+ {% include 'partials/ajax_pagination.html' %}
+
+
\ No newline at end of file
diff --git a/work_sell/templates/partials/inc-worksell_card.html b/work_sell/templates/partials/inc-worksell_card.html
new file mode 100644
index 0000000..ed3d85c
--- /dev/null
+++ b/work_sell/templates/partials/inc-worksell_card.html
@@ -0,0 +1,19 @@
+{% load staticfiles %}
+{% load thumbnail %}
+{#/static/sass/elements/worksell_card.sass - стиль карточки отдельно#}
+
\ No newline at end of file
diff --git a/work_sell/templates/worksells_list.html b/work_sell/templates/trash/worksells_list.html
similarity index 100%
rename from work_sell/templates/worksells_list.html
rename to work_sell/templates/trash/worksells_list.html
diff --git a/work_sell/templates/worksell_filter.html b/work_sell/templates/worksell_filter.html
new file mode 100644
index 0000000..d2f0925
--- /dev/null
+++ b/work_sell/templates/worksell_filter.html
@@ -0,0 +1,39 @@
+{% extends 'partials/_base.html' %}
+{% load sass_tags %}
+{% load static %}
+{% block personal_css %}
+
+
+
+{% endblock %}
+
+{% block content %}
+
+
+
+
+ Поиск готовых проектов
+
+
+
+
+
+
+
+
+ {% include 'partials/inc-worksell-filter.html' %}
+
+
+
+
+ {% include 'partials/inc-worksell-results.html' %}
+
+
+
+
+{% endblock %}
+
+{% block personal_js %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/work_sell/urls.py b/work_sell/urls.py
index 0d9a947..8736eb8 100644
--- a/work_sell/urls.py
+++ b/work_sell/urls.py
@@ -17,7 +17,7 @@ from .views import (
app_name = 'work_sell'
urlpatterns = [
- urls.url(r'^$', WorkSellFilterView.as_view(), name='list'),
+ urls.url(r'^$', WorkSellFilterView.as_view(), name='filter'),
urls.url(r'^create/$', WorkSellCreateView.as_view(), name='create'),
urls.url(r'^upload/$', UploadView.as_view(), name='upload'),
urls.url(r'^(?P
\d+)/edit/$', WorkSellUpdateView.as_view(), name='edit'),
diff --git a/work_sell/views.py b/work_sell/views.py
index 6d74670..88ebd5f 100644
--- a/work_sell/views.py
+++ b/work_sell/views.py
@@ -27,7 +27,9 @@ from .models import WorkSell, Picture, WorkSellPhoto, WorkSellPhoto
from .forms import WorkSellForm, WorkSellFilterForm, ContractorWorkSellTrashForm
from .serialize import serialize
from .response import JSONResponse, response_mimetype
-
+from specializations.models import Specialization
+from common.models import Location
+from archilance import util
class PictureCreateView(CreateView):
model = Picture
@@ -74,62 +76,96 @@ class WorkSellsView(ListView):
class WorkSellFilterView(BaseMixin, View):
- template_name = 'worksells_list.html'
- form_class = WorkSellFilterForm
-
- def get(self, request, *args, **kwargs):
- form = self.form_class(request.GET, request=request)
- context = self.get_context_data(**_.merge({}, request.GET, kwargs))
- work_sells = WorkSell.objects
- if form.is_valid():
- keywords = form.cleaned_data.get('keywords')
- specialization = form.cleaned_data.get('specialization')
- building_classification = form.cleaned_data.get('building_classification')
- construction_type = form.cleaned_data.get('construction_type')
- location = form.cleaned_data.get('location')
-
- if keywords:
- keywords = tuple(filter(None, re.split(r'\s|,|;', keywords)))
-
- for k in keywords:
- work_sells = work_sells.filter(Q(name__icontains=k) | Q(description__icontains=k))
-
- if specialization:
- work_sells = work_sells.filter(
- specialization__lft__gte=specialization.lft,
- specialization__rght__lte=specialization.rght,
- )
-
- if building_classification:
- work_sells = work_sells.filter(building_classification=building_classification)
-
- if construction_type:
- work_sells = work_sells.filter(construction_type=construction_type)
-
- if location:
- work_sells = work_sells.filter(
- location__lft__gte=location.lft,
- location__rght__lte=location.rght,
- )
-
- paginator = Paginator(work_sells.all(), settings.PAGE_SIZE)
- page = request.GET.get('page')
-
+ template_name = 'worksell_filter.html'
+ # form_class = WorkSellFilterForm
+ include_template = 'partials/inc-worksell-results.html'
+ PROJECT_ORDER_CHOICES = ( # "Упорядочить по"...
+ ('name', 'названию'),
+ ('budget', 'цене'),
+ )
+
+ def set_filter(self, objects, request_data):
+ specialization = request_data.get('specialization')
+ keywords = request_data.get('keywords')
+ building_classification = request_data.get('building_classification')
+ construction_type = request_data.get('construction_type')
+ location = request_data.get('location')
+ el_format = request_data.get('el_format')
+
+ if keywords:
+ keywords = tuple(filter(None, re.split(r'\s|,|;', keywords)))
+
+ for k in keywords:
+ objects = objects.filter(Q(name__icontains=k.lower()) | Q(description__icontains=k.lower()))
+
+ if specialization:
+ query = util.build_query(specialization, Specialization,
+ 'specializations__lft__gte',
+ 'specializations__rght__lte')
+ objects = objects.filter(query)
+
+ if building_classification:
+ query = util.build_query(building_classification, BuildingClassfication,
+ 'building_classification__lft__gte',
+ 'building_classification__rght__lte')
+ objects = objects.filter(query)
+ #
+ if construction_type:
+ objects = objects.filter(construction_type__in=
+ tuple(filter(None, re.split(r'\s|,|;', construction_type))))
+ if location:
+ query = util.build_query(location, Location,
+ 'location__lft__gte',
+ 'location__rght__lte')
+ objects = objects.filter(query)
+
+ if el_format:
+ objects = objects.exclude(el_format=None)
+
+ return objects
+
+ def sort_by(self, objects, order_by):
+ if not order_by:
+ return objects
+ return objects.order_by(order_by)
+
+ def pagination(self, objects, page):
+ paginator = Paginator(objects, settings.PAGE_SIZE)
try:
- work_sells = paginator.page(page)
+ objects = paginator.page(page)
except PageNotAnInteger:
- work_sells = paginator.page(1)
+ objects = paginator.page(1)
except EmptyPage:
- work_sells = paginator.page(paginator.num_pages)
+ objects = paginator.page(paginator.num_pages)
+ return objects
+
+ def get_context(self, request):
+ context = request.dict()
+ worksells = WorkSell.objects.all()
+ worksells = self.set_filter(worksells, request)
+ num_results = worksells.count()
+ worksells = self.sort_by(worksells, request.get("order_by"))
+ worksells = self.pagination(worksells, request.get("page"))
+
+ has_additional_fields = bool(context.get("building_classification") or context.get(
+ "construction_type") or context.get("location") or context.get("cro"))
+ display_msg = 'Найдено %s проектов' % num_results if num_results > 0 else 'Ничего не найдено'
context.update({
- 'form': form,
- 'work_sells': work_sells,
+ 'choices': self.PROJECT_ORDER_CHOICES,
+ 'worksells': worksells,
'is_paginated': True,
- 'page_obj': work_sells,
+ 'display_msg': display_msg,
+ 'page_obj': worksells,
+ 'has_additional_fields': has_additional_fields
})
+ return context
- return render(request, self.template_name, context)
+ def get(self, request):
+ return render(request, self.template_name, self.get_context(request.GET))
+
+ def post(self, request):
+ return render(request, self.include_template, self.get_context(request.POST))
class WorkSellDetail(DetailView):
@@ -276,7 +312,7 @@ class WorkSellDeleteView(DeleteView):
template_name = 'worksell_delete.html'
def get_success_url(self):
- return reverse('work_sell:list')
+ return reverse('work_sell:filter')
class ContractorWorkSellTrashView(View):