-
- 
-
-
- - {{ team.name }} + + + + + {% for obj in coll %} + {% if obj|class_name == 'Team' %} + {% with team=obj %} +
+
+
+
+
+
+
+
+ -
+
- + + смотреть профиль + + +
- + + предложить проект + + +
- + + написать сообщение + + +
+
+
-
-
- + Специализации:
- -Свободен
-
-
-
-
- -
-
- - - смотреть профиль - - -
- - - предложить проект - - -
- - - написать сообщение - - -
-
-
+
-
-
- - Специализации: -
-
- Интерьеры
- 2-й
-
+
+ Интерьеры
+ 2-й
+
+
+ Визуализация/3D
+ 45-й
+
+
+ Экстерьеры
+ 10-й
+
+
- Визуализация/3D
- 45-й
+ Архитектура
+ 3-й
- Экстерьеры
- 10-й
-
-
-
-
- Архитектура
- 3-й
-
-
- 3D Моделирование
- 100-й
-
+ 3D Моделирование
+ 100-й
-
+
+
+ -
-
- Рейтинг: 1245 -
- Безопасные сделки: 5 -
- - Отзывы: - + 385 - 0 - - 0 - - -
-
-
+ Есть допуск СРО
-
+
-
+
- Рейтинг: 1245 +
- Безопасные сделки: 5 +
- + Отзывы: + + 385 + 0 + - 0 + + +
+
+
-
-
-
-{# {% if TEMPLATE_DEBUG %}#}
-{# Есть допуск СРО
#}
-{#
#}
-{# {% endif %}#}
-
- ######## 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 %}
- {% for portf in team.portfolios.all|slice:':4' %}
-
+
+
+ {% if TEMPLATE_DEBUG %}
+
-
-
- {% endfor %}
+
-
-
-
-
-
-
+
+ {% endif %}
+
+
+ ######## 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 %}
+ {% for portf in team.portfolios.all|slice:':4' %}
+
- {% endwith %}
- {% elif obj|class_name == 'User' %}
- {% with contractor=obj %}
-
+
+
+ {% endfor %}
+
+
+
+
+
+
-
+ {% endwith %}
+ {% elif obj|class_name == 'User' %}
+ {% with contractor=obj %}
+
+
+
+
+
diff --git a/users/templates/partials/customer_profile_info_block.html b/users/templates/partials/customer_profile_info_block.html
index 0f9b96e..64617ac 100644
--- a/users/templates/partials/customer_profile_info_block.html
+++ b/users/templates/partials/customer_profile_info_block.html
@@ -1,4 +1,6 @@
-{% load staticfiles %}
+{% load projects_tags %}
+
+
+
+
+
+ -
+
- + + смотреть профиль + + +
- + + предложить проект + + +
- + + написать сообщение + + +
+
+
+
-
-
- + Специализации:
- -Свободен
-
-
-
-
- -
-
- - - смотреть профиль - - -
- - - предложить проект - - -
- - - написать сообщение - - -
-
{% endfor %}
diff --git a/users/templates/customer_profile_trashed_projects.html b/users/templates/customer_profile_trashed_projects.html
index 4be67cb..e5e221b 100644
--- a/users/templates/customer_profile_trashed_projects.html
+++ b/users/templates/customer_profile_trashed_projects.html
@@ -11,21 +11,19 @@
-
+
-
-
- - Специализации: -
-
- Интерьеры
- 2-й
-
+
+ Интерьеры
+ 2-й
+
+
+ Визуализация/3D
+ 45-й
+
+
+ Экстерьеры
+ 10-й
+
+
- Визуализация/3D
- 45-й
+ Архитектура
+ 3-й
- Экстерьеры
- 10-й
-
-
-
-
- Архитектура
- 3-й
-
-
- 3D Моделирование
- 100-й
-
+ 3D Моделирование
+ 100-й
-
+
+
+ -
-
- Рейтинг: 1245 -
- Безопасные сделки: 5 -
- - Отзывы: - + 385 - 0 - - 0 - - -
-
-
+ Есть допуск СРО
-
+
+ {% endwith %}
+ {% endif %}
+ {% endfor %}
+
+
+ -
+
- Рейтинг: 1245 +
- Безопасные сделки: 5 +
- + Отзывы: + + 385 + 0 + - 0 + + +
+
+
-
-
-{# {% if TEMPLATE_DEBUG %}#}
-{# Есть допуск СРО
#}
-{#
#}
-{# {% endif %}#}
-
- 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 %}
#}
-{#
- {% for portf in contractor.portfolios.all|slice:':4' %}
-
+
+
+ {% if TEMPLATE_DEBUG %}
+
-
-
- {% endfor %}
+
-
-
-
-
-
-
+
+ {% endif %}
+
+ 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 %}
+ {% for portf in contractor.portfolios.all|slice:':4' %}
+
- {% endwith %}
- {% endif %}
- {% endfor %}
-
-
-
+
+
+ {% endfor %}
+
+
+
+
+
+
- {% include 'partials/pagination.html' %}
-
-
+
+ {% include 'partials/pagination.html' %}
+
{% include 'partials/footer.html' %}
diff --git a/users/templates/customer_profile_open_projects.html b/users/templates/customer_profile_open_projects.html
index 69157cd..1c060a1 100644
--- a/users/templates/customer_profile_open_projects.html
+++ b/users/templates/customer_profile_open_projects.html
@@ -1,7 +1,6 @@
{% extends 'partials/base.html' %}
-{% load staticfiles %}
-
+
{% block content %}
{% include 'partials/header.html' %}
@@ -9,36 +8,35 @@
{% include 'partials/customer_profile_info_block.html' %}
-
-
{{ review.text }}{% if TEMPLATE_DEBUG %}. {% lorem %}{% endif %}
+{{ review.text }}
-
+
@@ -34,6 +32,7 @@
{% for proj in projects %}
+
+
@@ -94,6 +93,10 @@
{% endfor %}
+ {% include 'partials/pagination.html' %}
+
{% include 'partials/footer.html' %}
@@ -11,16 +13,15 @@
- {{ object.get_full_name }} [ivanov_petr] + {{ customer.get_full_name }} [{{ customer.username }}]
-{{ object.location.name }}
- +{{ customer.location.name }}
+
- {% load projects_tags %}
- {% ratings_widget customer.pk %}
+ {% ratings_widget customer.pk %}
diff --git a/users/templatetags/user_tags.py b/users/templatetags/user_tags.py
index 3bae815..be8033c 100644
--- a/users/templatetags/user_tags.py
+++ b/users/templatetags/user_tags.py
@@ -7,6 +7,7 @@ def has_group(user, group_name):
groups = user.groups.all().values_list('name', flat=True)
return True if group_name in groups else False
+
@register.simple_tag
def test():
return 'Hello there'
diff --git a/users/views.py b/users/views.py
index 98b5286..1da9d36 100644
--- a/users/views.py
+++ b/users/views.py
@@ -13,16 +13,23 @@ import itertools
import natsort
import pydash as _; _.map = _.map_; _.filter = _.filter_
-from .forms import UserEditForm, ContractorFilterForm, ContractorFinancicalInfoForm
from .mixins import CheckForUserMixin
from .models import User, Team, ContractorFinancialInfo
+from archilance import util
from archilance.mixins import BaseMixin
-from common.utils import get_or_none
from projects.forms import PortfolioForm
+from projects.models import Project
from reviews.models import Review
from specializations.models import Specialization
from work_sell.forms import WorkSellForm
+from .forms import (
+ ContractorFilterForm,
+ ContractorFinancicalInfoForm,
+ CustomerProfileProjectRealtyForm,
+ UserEditForm,
+)
+
def send_mail_test(request):
send_mail('Subject here', 'Here is the message.Mukhtar hello ', '', ['muhtarzubanchi05@gmail.com'], fail_silently=False)
@@ -244,26 +251,100 @@ class ContractorOfficeDetailView(DetailView):
context_object_name = 'contractor'
-class CustomerProfileOpenProjectsView(BaseMixin, DetailView):
- model = User
+class CustomerProfileOpenProjectsView(BaseMixin, View):
template_name = 'customer_profile_open_projects.html'
- context_object_name = 'customer'
+ form_class = CustomerProfileProjectRealtyForm
- def get_context_data(self, **kwargs):
- c = super().get_context_data(**kwargs)
- c['projects'] = self.object.projects.filter(state='active')
- return c
+ def get(self, request, *args, **kwargs):
+ context = self.get_context_data(**_.merge({}, request.GET, kwargs))
+ customer = get_object_or_404(User.customer_objects, pk=kwargs.get('pk'))
+ form = self.form_class(request.GET, request=request, customer=customer)
+ projects = customer.projects.filter(state='active')
+
+ if form.is_valid():
+ realty = form.cleaned_data.get('realty')
+
+ if realty:
+ projects = projects.filter(realty=realty)
+ else:
+ if form.errors:
+ messages.info(request, (
+ '
-
- Произошла ошибка (form)
' + '{form}'
+ ).format(form=pformat(form.errors)))
+
+ paginator = Paginator(projects, settings.PAGE_SIZE)
+ page = request.GET.get('page')
+
+ try:
+ projects = paginator.page(page)
+ except PageNotAnInteger:
+ projects = paginator.page(1)
+ except EmptyPage:
+ projects = paginator.page(paginator.num_pages)
+
+ context.update({
+ 'form': form,
+
+ 'projects': projects,
+ 'customer': customer,
+
+ 'open_project_count': projects.paginator.count,
+ 'trashed_project_count': customer.projects.filter(state='trashed').count(),
+
+ 'is_paginated': True,
+ 'page_obj': projects,
+ })
+
+ return render(request, self.template_name, context)
-class CustomerProfileTrashedProjectsView(BaseMixin, DetailView):
- model = User
+class CustomerProfileTrashedProjectsView(BaseMixin, View):
template_name = 'customer_profile_trashed_projects.html'
- context_object_name = 'customer'
+ form_class = CustomerProfileProjectRealtyForm
- def get_context_data(self, **kwargs):
- c = super().get_context_data(**kwargs)
- c['projects'] = self.object.projects.filter(state='trashed')
- return c
+ def get(self, request, *args, **kwargs):
+ context = self.get_context_data(**_.merge({}, request.GET, kwargs))
+ customer = get_object_or_404(User.customer_objects, pk=kwargs.get('pk'))
+ form = self.form_class(request.GET, request=request, customer=customer)
+ projects = customer.projects.filter(state='trashed')
+
+ if form.is_valid():
+ realty = form.cleaned_data.get('realty')
+
+ if realty:
+ projects = projects.filter(realty=realty)
+ else:
+ if form.errors:
+ messages.info(request, (
+ 'Произошла ошибка (form)
' + '{form}'
+ ).format(form=pformat(form.errors)))
+
+ paginator = Paginator(projects, settings.PAGE_SIZE)
+ page = request.GET.get('page')
+
+ try:
+ projects = paginator.page(page)
+ except PageNotAnInteger:
+ projects = paginator.page(1)
+ except EmptyPage:
+ projects = paginator.page(paginator.num_pages)
+
+ context.update({
+ 'form': form,
+
+ 'projects': projects,
+ 'customer': customer,
+
+ 'open_project_count': customer.projects.filter(state='active').count(),
+ 'trashed_project_count': projects.paginator.count,
+
+ 'is_paginated': True,
+ 'page_obj': projects,
+ })
+
+ return render(request, self.template_name, context)
class CustomerProfileCurrentProjectsView(BaseMixin, DetailView):
@@ -319,7 +400,7 @@ class ContractorProfileEditView(CheckForUserMixin, View):
def get(self, request, *args, **kwargs):
instance = get_object_or_404(User, pk=request.user.pk)
form = self.form_class(instance=instance)
- root = get_or_none(Specialization, name='_root')
+ root = util.get_or_none(Specialization, name='_root')
nodes = root.get_descendants('lft')
return render(request, self.template_name, {'form': form, 'nodes': nodes})
diff --git a/work_sell/templates/worksells_list.html b/work_sell/templates/worksells_list.html
index 5a4ed00..bbb975b 100644
--- a/work_sell/templates/worksells_list.html
+++ b/work_sell/templates/worksells_list.html
@@ -1,8 +1,10 @@
{% extends 'partials/base.html' %}
+
{% load staticfiles %}
{% load thumbnail %}
{% block content %}
+
{% include 'partials/header.html' %}
@@ -108,83 +110,50 @@
- {% for work in object_list %}
-
-
-
- {% thumbnail work.img "265x265" crop="center" as im %}
-
-
-
- {% endthumbnail %}
-
-
-
- {{ work.budget }}
+
+
+
+
+ {% for work in object_list %}
+
+
+
+
+
+
+ {% thumbnail work.img "265x265" crop="center" as im %}
+
+ {% endfor %}
+
+
+ {% endthumbnail %}
+
+
+
-
+ {{ work.budget }}
-
+ {{ work }}
+
+
-
-
-
-
-{# {% if is_paginated %}#}
-{# {{ work }}
- - {% endfor %} -#}
-{# #}
-{#
#}
-{# {% endif %}#}
-
-
-
- {% include 'partials/pagination.html' %}
-
-
+
+ {% include 'partials/pagination.html' %}
+
{% include 'partials/footer.html' %}