+
+
+
-
-
-
-
-{% endblock %}
-{% block js_block %}
-
+
+
{% endblock %}
+
+{% block personal_js %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/users/templates/partials/inc-contractors-filter.html b/users/templates/partials/inc-contractors-filter.html
new file mode 100644
index 0000000..87fc9af
--- /dev/null
+++ b/users/templates/partials/inc-contractors-filter.html
@@ -0,0 +1,154 @@
+
diff --git a/users/templates/partials/inc-contractors-results.html b/users/templates/partials/inc-contractors-results.html
new file mode 100644
index 0000000..ffe292d
--- /dev/null
+++ b/users/templates/partials/inc-contractors-results.html
@@ -0,0 +1,196 @@
+{% load common_tags %}
+{% load specializtions_tags %}
+{% load thumbnail %}
+{% load i18n %}
+
+
+
+{% for object in objects %}
+ {% if object|class_name == 'Team' %}
+ {% with team=object %}
+
+
+
+
+
+
+
+
+ {% specialization_team_widget team_id=team.pk %}
+
+
+
+
+ {% ratings_team_widget team.pk 'restList2' %}
+
+
+
+
+
+ {% for portf in team.portfolios.all|slice:':4' %}
+
+ {% endfor %}
+
+
+ {% endwith %}
+ {% elif object|class_name == 'User' %}
+ {% with contractor=object %}
+
+
+
+
+
+
+
+
+ {% specialization_widget user_id=contractor.pk %}
+
+
+
+
+ {% ratings_widget contractor.pk 'restList2' %}
+
+ {% if contractor.cro %}
+
+ {% endif %}
+
+
+ {% for portf in contractor.portfolios.all|slice:':4' %}
+
+ {% endfor %}
+
+
+ {% endwith %}
+ {% endif %}
+{% endfor %}
+
+
+ {% include 'partials/ajax_pagination.html' %}
+
+
\ No newline at end of file
diff --git a/users/templates/partials/inc-contractors-sort_by.html b/users/templates/partials/inc-contractors-sort_by.html
new file mode 100644
index 0000000..e69de29
diff --git a/users/templates/trash/contractor_filter.html b/users/templates/trash/contractor_filter.html
new file mode 100644
index 0000000..b4752f3
--- /dev/null
+++ b/users/templates/trash/contractor_filter.html
@@ -0,0 +1,521 @@
+{% extends 'partials/base.html' %}
+
+{% load common_tags %}
+{% load specializtions_tags %}
+{% load thumbnail %}
+{% load i18n %}
+
+{% block content %}
+ {% include 'partials/modals/project_selection.html' %}
+ {% include 'partials/header.html' %}
+
+
+
+
+
+
{% if display_msg %}{{ display_msg }}{% else %}Поиск исполнителей{% endif %}
+
+
+
+
+
+
+
+ {% for obj in coll %}
+ {% if obj|class_name == 'Team' %}
+ {% with team=obj %}
+
+
+
+
+
+
+
+
+ {% specialization_team_widget team_id=team.pk %}
+
+
+
+
+ {% ratings_team_widget team.pk 'restList2' %}
+
+
+
+
+
+
+ {% if TEMPLATE_DEBUG %}
+
+
######## Team owner #########
Specializations: {{ team.owner.contractor_specializations.all }}
Location: {{ team.owner.location }}
Build. classif-s: {% for o in team.owner.orders.all %}{{ o.project.realty.building_classification }}, {% endfor %}
Constr. types: {% for o in team.owner.orders.all %}{{ o.project.realty.construction_type }}, {% endfor %}
CRO: {{ team.owner.cro }}
Work types: {% for o in team.owner.orders.all %}{{ o.project.work_type }}, {% endfor %}
######## Team users #########
Specializations: {% for u in team.users.all %}{{ u.contractor_specializations.all }}, {% endfor %}
Location: {% for u in team.users.all %}{{ u.location }}, {% endfor %}
Build. classif-s: {% for u in team.users.all %}{% for o in u.orders.all %}{{ o.project.realty.building_classification }}, {% endfor %}; {% endfor %}
Constr. types: {% for u in team.users.all %}{% for o in u.orders.all %}{{ o.project.realty.construction_type }}, {% endfor %}; {% endfor %}
CRO: {% for u in team.users.all %}{{ u.cro }}, {% endfor %}
Work types: {% for u in team.users.all %}{% for o in u.orders.all %}{{ o.project.work_type }}, {% endfor %}; {% endfor %}
+
+ {% endif %}
+
+
+
+ {% for portf in team.portfolios.all|slice:':4' %}
+
+ {% endfor %}
+
+
+ {% endwith %}
+ {% elif obj|class_name == 'User' %}
+ {% with contractor=obj %}
+
+
+
+
+
+
+
+
+ {% specialization_widget user_id=contractor.pk %}
+
+
+
+
+ {% ratings_widget contractor.pk 'restList2' %}
+
+ {% if contractor.cro %}
+
+ {% endif %}
+
+
+
+ {% if TEMPLATE_DEBUG %}
+
+
Specializations: {{ contractor.contractor_specializations.all }}
Location: {{ contractor.location }}
Build. classif-s: {% for o in contractor.orders.all %}{{ o.project.realty.building_classification }}, {% endfor %}
Constr. types: {% for o in contractor.orders.all %}{{ o.project.realty.construction_type }}, {% endfor %}
CRO: {{ contractor.cro }}
Work types: {% for o in contractor.orders.all %}{{ o.project.work_type }}, {% endfor %}
+
+ {% endif %}
+
+
+ {% for portf in contractor.portfolios.all|slice:':4' %}
+
+ {% endfor %}
+
+
+ {% endwith %}
+ {% endif %}
+ {% endfor %}
+
+
+
+ {% include 'partials/pagination.html' %}
+
+
+
+ {% include 'partials/footer.html' %}
+
+
+{% endblock %}
+
+{% block js_block %}
+
+{% endblock %}
diff --git a/users/views.py b/users/views.py
index 9465589..5599beb 100644
--- a/users/views.py
+++ b/users/views.py
@@ -24,11 +24,13 @@ from .models import User, Team, ContractorResume, ContractorResumeFiles, TeamInv
from archilance import util
from archilance.mixins import BaseMixin
from common.mixins import ContractorRequiredMixin, NoCsrfMixin
+from common.models import Location
from projects.forms import PortfolioForm
-from projects.models import Order, Realty, Project
+from projects.models import Order, Realty, Project, BuildingClassfication, ConstructionType
from reviews.models import Review
from work_sell.forms import WorkSellForm
from work_sell.models import Picture
+from specializations.models import Specialization
from .helpers import get_projects_grouped
@@ -249,188 +251,359 @@ class UserFinancialInfoEditView(BaseMixin, View):
return render(request, self.template_name, context)
+# class ContractorFilterViewOld(BaseMixin, View):
+# template_name = 'contractor_filter.html'
+# form_class = ContractorFilterForm
+#
+# def get(self, request, *args, **kwargs):
+# form = self.form_class(request.GET, request=request)
+# context = self.get_context_data(**_.merge({}, request.GET, kwargs))
+# coll = []
+#
+# if form.is_valid():
+# contractors = teams = None
+# contr_count = team_count = None
+# get_contractors = get_teams = None
+# ord = None
+#
+# cro = form.cleaned_data.get('cro')
+# specialization = form.cleaned_data.get('specialization')
+# location = form.cleaned_data.get('location')
+# work_type = form.cleaned_data.get('work_type')
+# build_classif = form.cleaned_data.get('building_classification')
+# constr_type = form.cleaned_data.get('construction_type')
+#
+# party_types = form.cleaned_data.get('party_types')
+# last_party_types = form.cleaned_data.get('last_party_types')
+#
+# if party_types == 'all':
+# get_contractors = get_teams = True
+# elif party_types == 'contractors':
+# get_contractors = True
+# elif party_types == 'teams':
+# get_teams = True
+# elif not party_types:
+# if last_party_types == 'contractors':
+# get_contractors = True
+# elif last_party_types == 'teams':
+# get_teams = True
+# else:
+# get_contractors = get_teams = True
+#
+# if party_types:
+# last_party_types = party_types
+#
+# context.update({'last_party_types': last_party_types})
+#
+# if get_contractors:
+# contractors = User.contractor_objects.all()
+#
+# if cro:
+# contractors = contractors.filter(cro=cro)
+#
+# if specialization:
+# contractors = contractors.filter(
+# contractor_specializations__lft__gte=specialization.lft,
+# contractor_specializations__rght__lte=specialization.rght,
+# )
+#
+# if location:
+# contractors = contractors.filter(
+# location__lft__gte=location.lft,
+# location__rght__lte=location.rght,
+# )
+#
+# if work_type:
+# contractors = contractors.filter(orders__project__work_type=work_type)
+#
+# if build_classif:
+# contractors = contractors.filter(Q(orders__project__realty__building_classification=build_classif) |
+# Q(contractor_building_classifications=build_classif))
+#
+# if constr_type:
+# contractors = contractors.filter(Q(orders__project__realty__construction_type=constr_type) |
+# Q(contractor_construction_types=constr_type))
+#
+# if get_teams:
+# teams = Team.objects.all()
+#
+# if cro:
+# teams = teams.filter(Q(contractors__cro=cro) | Q(owner__cro=cro))
+#
+# if specialization:
+# teams = teams.filter(
+# (
+# Q(contractors__contractor_specializations__lft__gte=specialization.lft)
+# & Q(contractors__contractor_specializations__rght__lte=specialization.rght)
+# ) | (
+# Q(owner__contractor_specializations__lft__gte=specialization.lft)
+# & Q(owner__contractor_specializations__rght__lte=specialization.rght)
+# ),
+# )
+#
+# if location:
+# teams = teams.filter(
+# (
+# Q(contractors__location__lft__gte=location.lft)
+# & Q(contractors__location__rght__lte=location.rght)
+# ) | (
+# Q(owner__location__lft__gte=location.lft)
+# & Q(owner__location__rght__lte=location.rght)
+# ),
+# )
+#
+# if work_type:
+# teams = teams.filter(
+# Q(contractors__orders__project__work_type=work_type)
+# | Q(owner__orders__project__work_type=work_type),
+# )
+#
+# if build_classif:
+# teams = teams.filter(
+# Q(contractors__orders__project__realty__building_classification=build_classif)
+# | Q(owner__orders__project__realty__building_classification=build_classif),
+# )
+#
+# if constr_type:
+# teams = teams.filter(
+# Q(contractors__orders__project__realty__construction_type=constr_type)
+# | Q(owner__orders__project__realty__construction_type=constr_type),
+# )
+#
+# if get_contractors and get_teams:
+# coll = tuple(itertools.chain(contractors.distinct(), teams.distinct()))
+# count = len(coll)
+# display_msg = 'Найдено %s элементов' % count if count > 0 else 'Ничего не найдено'
+# elif get_contractors:
+# coll = contractors.distinct()
+# count = coll.count()
+# display_msg = 'Найдено %s исполнителей' % count if count > 0 else 'Ничего не найдено'
+# elif get_teams:
+# coll = teams.distinct()
+# count = coll.count()
+# display_msg = 'Найдено %s групп' % count if count > 0 else 'Ничего не найдено'
+#
+# order_by = form.cleaned_data.get('order_by')
+# last_order_by = form.cleaned_data.get('last_order_by')
+# reverse_order = form.cleaned_data.get('reverse_order')
+#
+# if order_by:
+# reverse_order = not reverse_order if order_by == last_order_by else False
+# ord = order_by
+# last_order_by = ord
+# elif last_order_by:
+# ord = last_order_by
+#
+# if ord:
+# if ord == 'name':
+# coll = natsort.natsorted(coll, key=lambda obj: getattr(obj, 'username', None) or obj.name,
+# reverse=reverse_order)
+# elif ord == 'created':
+# coll = natsort.natsorted(coll, key=lambda obj: obj.created, reverse=reverse_order)
+#
+# context.update({
+# 'last_order_by': last_order_by,
+# 'reverse_order': reverse_order,
+# })
+# else:
+# display_msg = 'Пожалуйста, введите корректные данные'
+#
+# if form.errors:
+# messages.info(request, (
+# '
Произошла ошибка (form)
'
+# '
{form}'
+# ).format(form=pformat(form.errors)))
+#
+# paginator = Paginator(coll, settings.PAGE_SIZE)
+# page = request.GET.get('page')
+#
+# try:
+# coll = paginator.page(page)
+# except PageNotAnInteger:
+# coll = paginator.page(1)
+# except EmptyPage:
+# coll = paginator.page(paginator.num_pages)
+#
+# context.update({
+# 'form': form,
+# 'coll': coll,
+# 'is_paginated': True,
+# 'page_obj': coll,
+# 'display_msg': display_msg,
+# })
+#
+# return render(request, self.template_name, context)
+
+# TODO: не работает сортировка по reviews(не получилось создать отзывы) и views(не нашел счетчик просмотров)
class ContractorFilterView(BaseMixin, View):
template_name = 'contractor_filter.html'
+ include_template = 'partials/inc-contractors-results.html'
form_class = ContractorFilterForm
-
- def get(self, request, *args, **kwargs):
- form = self.form_class(request.GET, request=request)
- context = self.get_context_data(**_.merge({}, request.GET, kwargs))
- coll = []
-
- if form.is_valid():
- contractors = teams = None
- contr_count = team_count = None
- get_contractors = get_teams = None
- ord = None
-
- cro = form.cleaned_data.get('cro')
- specialization = form.cleaned_data.get('specialization')
- location = form.cleaned_data.get('location')
- work_type = form.cleaned_data.get('work_type')
- build_classif = form.cleaned_data.get('building_classification')
- constr_type = form.cleaned_data.get('construction_type')
-
- party_types = form.cleaned_data.get('party_types')
- last_party_types = form.cleaned_data.get('last_party_types')
-
- if party_types == 'all':
- get_contractors = get_teams = True
- elif party_types == 'contractors':
- get_contractors = True
- elif party_types == 'teams':
- get_teams = True
- elif not party_types:
- if last_party_types == 'contractors':
- get_contractors = True
- elif last_party_types == 'teams':
- get_teams = True
- else:
- get_contractors = get_teams = True
-
- if party_types:
- last_party_types = party_types
-
- context.update({'last_party_types': last_party_types})
-
- if get_contractors:
- contractors = User.contractor_objects.all()
-
- if cro:
- contractors = contractors.filter(cro=cro)
-
- if specialization:
- contractors = contractors.filter(
- contractor_specializations__lft__gte=specialization.lft,
- contractor_specializations__rght__lte=specialization.rght,
- )
-
- if location:
- contractors = contractors.filter(
- location__lft__gte=location.lft,
- location__rght__lte=location.rght,
- )
-
- if work_type:
- contractors = contractors.filter(orders__project__work_type=work_type)
-
- if build_classif:
- contractors = contractors.filter(Q(orders__project__realty__building_classification=build_classif) |
- Q(contractor_building_classifications=build_classif))
-
- if constr_type:
- contractors = contractors.filter(Q(orders__project__realty__construction_type=constr_type) |
- Q(contractor_construction_types=constr_type))
-
- if get_teams:
- teams = Team.objects.all()
-
- if cro:
- teams = teams.filter(Q(contractors__cro=cro) | Q(owner__cro=cro))
-
- if specialization:
- teams = teams.filter(
- (
- Q(contractors__contractor_specializations__lft__gte=specialization.lft)
- & Q(contractors__contractor_specializations__rght__lte=specialization.rght)
- ) | (
- Q(owner__contractor_specializations__lft__gte=specialization.lft)
- & Q(owner__contractor_specializations__rght__lte=specialization.rght)
- ),
- )
-
- if location:
- teams = teams.filter(
- (
- Q(contractors__location__lft__gte=location.lft)
- & Q(contractors__location__rght__lte=location.rght)
- ) | (
- Q(owner__location__lft__gte=location.lft)
- & Q(owner__location__rght__lte=location.rght)
- ),
- )
-
- if work_type:
- teams = teams.filter(
- Q(contractors__orders__project__work_type=work_type)
- | Q(owner__orders__project__work_type=work_type),
- )
-
- if build_classif:
- teams = teams.filter(
- Q(contractors__orders__project__realty__building_classification=build_classif)
- | Q(owner__orders__project__realty__building_classification=build_classif),
- )
-
- if constr_type:
- teams = teams.filter(
- Q(contractors__orders__project__realty__construction_type=constr_type)
- | Q(owner__orders__project__realty__construction_type=constr_type),
- )
-
- if get_contractors and get_teams:
- coll = tuple(itertools.chain(contractors.distinct(), teams.distinct()))
- count = len(coll)
- display_msg = 'Найдено %s элементов' % count if count > 0 else 'Ничего не найдено'
- elif get_contractors:
- coll = contractors.distinct()
- count = coll.count()
- display_msg = 'Найдено %s исполнителей' % count if count > 0 else 'Ничего не найдено'
- elif get_teams:
- coll = teams.distinct()
- count = coll.count()
- display_msg = 'Найдено %s групп' % count if count > 0 else 'Ничего не найдено'
-
- order_by = form.cleaned_data.get('order_by')
- last_order_by = form.cleaned_data.get('last_order_by')
- reverse_order = form.cleaned_data.get('reverse_order')
-
- if order_by:
- reverse_order = not reverse_order if order_by == last_order_by else False
- ord = order_by
- last_order_by = ord
- elif last_order_by:
- ord = last_order_by
-
- if ord:
- if ord == 'name':
- coll = natsort.natsorted(coll, key=lambda obj: getattr(obj, 'username', None) or obj.name,
- reverse=reverse_order)
- elif ord == 'created':
- coll = natsort.natsorted(coll, key=lambda obj: obj.created, reverse=reverse_order)
-
- context.update({
- 'last_order_by': last_order_by,
- 'reverse_order': reverse_order,
- })
- else:
- display_msg = 'Пожалуйста, введите корректные данные'
-
- if form.errors:
- messages.info(request, (
- '
Произошла ошибка (form)
'
- '
{form}'
- ).format(form=pformat(form.errors)))
-
- paginator = Paginator(coll, settings.PAGE_SIZE)
- page = request.GET.get('page')
-
+ PROJECT_ORDER_CHOICES = ( # "Упорядочить по"...
+ ('name', 'названию'),
+ ('created', 'дате размещения'),
+ ('views', 'просмотрам'),
+ ('reviews', 'Отзывам'),
+ ('rating', 'Рейтингу'),
+ )
+
+ def set_teams_filter(self, objects, request_data):
+ specialization = request_data.get('specialization')
+ building_classification = request_data.get('building_classification')
+ construction_type = request_data.get('construction_type')
+ location = request_data.get('location')
+ cro = request_data.get('cro')
+ if specialization:
+ query_contractors = util.build_query(specialization, Specialization,
+ 'contractors__contractor_specializations__lft__gte',
+ 'contractors__contractor_specializations__rght__lte')
+ query_owner = util.build_query(specialization, Specialization,
+ 'owner__contractor_specializations__lft__gte',
+ 'owner__contractor_specializations__rght__lte')
+ objects = objects.filter(query_contractors | query_owner)
+
+ if building_classification:
+ query_contractors = util.build_query(building_classification, BuildingClassfication,
+ 'contractors__contractor_building_classifications')
+ query_owner = util.build_query(building_classification, BuildingClassfication,
+ 'owner__contractor_building_classifications')
+ objects = objects.filter(query_contractors | query_owner)
+
+ if construction_type:
+ query_contractors = util.build_query(construction_type, ConstructionType,
+ 'contractors__contractor_construction_types')
+ query_owner = util.build_query(construction_type, ConstructionType,
+ 'owner__contractor_construction_types')
+ objects = objects.filter(query_contractors | query_owner)
+
+ if location:
+ query_contractors = util.build_query(location, Location,
+ 'contractors__location__lft__gte',
+ 'contractors__location__rght__lte')
+ query_owner = util.build_query(construction_type, Location,
+ 'owner__location__lft__gte',
+ 'owner__location__rght__lte',)
+ objects = objects.filter(query_contractors | query_owner)
+
+ if cro:
+ objects = objects.filter(Q(contractors__cro=cro) | Q(owner__cro=cro))
+
+ return objects
+
+ def set_contractors_filter(self, objects, request_data):
+ specialization = request_data.get('specialization')
+ building_classification = request_data.get('building_classification')
+ construction_type = request_data.get('construction_type')
+ location = request_data.get('location')
+ cro = request_data.get('cro')
+ if specialization:
+ query = util.build_query(specialization, Specialization,
+ 'contractor_specializations__lft__gte', 'contractor_specializations__rght__lte')
+ objects = objects.filter(query)
+
+ if building_classification:
+ query = util.build_query(building_classification, BuildingClassfication,
+ 'contractor_building_classifications__lft__gte',
+ 'contractor_building_classifications__rght__lte')
+ objects = objects.filter(query)
+
+ if construction_type:
+ objects = objects.filter(contractor_construction_types__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 cro:
+ objects = objects.filter(cro=True)
+ return objects
+
+ def contractors_sort_by(self, contractors, order_by):
+ if order_by == 'name':
+ contractors = contractors.order_by('username')
+ if order_by == 'created':
+ contractors = contractors.order_by('created')
+ if order_by == 'views':
+ pass
+ if order_by == 'reviews':
+ pass
+ if order_by == 'rating':
+ contractors = contractors.order_by('rating')
+ return contractors
+
+ def teams_sort_by(self, teams, order_by):
+ if order_by == 'name':
+ teams = teams.order_by('name')
+ if order_by == 'created':
+ teams = teams.order_by('created')
+ if order_by == 'views':
+ pass
+ if order_by == 'reviews':
+ pass
+ if order_by == 'rating':
+ teams = teams.order_by('rating')
+ return teams
+
+ def pagination(self, objects, page):
+ paginator = Paginator(objects, settings.PAGE_SIZE)
+ # print("pag page = ", page)
try:
- coll = paginator.page(page)
+ objects = paginator.page(page)
except PageNotAnInteger:
- coll = paginator.page(1)
+ objects = paginator.page(1)
except EmptyPage:
- coll = paginator.page(paginator.num_pages)
+ objects = paginator.page(paginator.num_pages)
+ return objects
+
+ def get_context(self, request_data):
+ context = request_data.dict()
+ contractors = User.contractor_objects.all()
+ teams = Team.objects.all()
+ print(request_data)
+ party_types = request_data.get("party_types")
+ order_by = request_data.get("order_by")
+ print("order_by = ", order_by)
+
+ if party_types == 'teams':
+ objects = self.set_teams_filter(teams, request_data).distinct()
+ objects = self.teams_sort_by(objects, order_by)
+ count = objects.count()
+ display_msg = 'Найдено %s групп' % count if count > 0 else 'Ничего не найдено'
+ elif party_types == 'contractors':
+ objects = self.set_contractors_filter(contractors, request_data).distinct()
+ objects = self.contractors_sort_by(objects, order_by)
+ count = objects.count()
+ display_msg = 'Найдено %s исполнителей' % count if count > 0 else 'Ничего не найдено'
+ else:
+ teams = self.set_teams_filter(teams, request_data)
+ teams = self.teams_sort_by(teams, order_by)
+ contractors = self.set_contractors_filter(contractors, request_data)
+ contractors = self.contractors_sort_by(contractors, order_by)
+ objects = tuple(itertools.chain(contractors.distinct(), teams.distinct()))
+ count = len(objects)
+ display_msg = 'Найдено %s элементов' % count if count > 0 else 'Ничего не найдено'
+
+ # objects = self.sort_by(objects, order_by)
+ objects = self.pagination(objects, request_data.get("page"))
context.update({
- 'form': form,
- 'coll': coll,
+ 'choices': self.PROJECT_ORDER_CHOICES,
+ 'objects': objects,
'is_paginated': True,
- 'page_obj': coll,
'display_msg': display_msg,
+ 'page_obj': objects,
+ # 'num_results': num_results,
+ # '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 ContractorProfileView(BaseMixin, DetailView):
@@ -915,7 +1088,7 @@ class CustomerProfileReviewsView(BaseMixin, View):
# @Add fast
num_current_projects = customer.customer_projects.filter(state='active').exclude(order__contractor__isnull=True,
- order__team__isnull=True).count()
+ order__team__isnull=True).count()
context.update({
'reviews': reviews,
diff --git a/webpack.config.js b/webpack.config.js
index 2ca09b1..c08c003 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -18,7 +18,12 @@ module.exports = {
home_page: "./assets/js/src/home_page.js",
//profile
customer_profile: "./assets/js/src/customer_profile.js",
- user_profile_edit: "./assets/js/src/user_profile_edit.js"
+ user_profile_edit: "./assets/js/src/user_profile_edit.js",
+ //filters/search
+ 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",
+
},