-
+
Контакты
{% for contact in contacts_users %}
-
- {% include 'contact-info.html' %}
+ {% include 'contact-info.html' %}
-
+
-
+
Заказы
{% for order in orders %}
-
+ {% endif %} data-id="{{ order.order.id }}">
{{ order }}
{% endfor %}
-
-
Архивные заказы
-
-
+ {% if archive_projects %}
+
+
Архивные заказы
+
+
+
+ {% for proj in archive_projects %}
+
+
+
{{ proj.name }}
+
+ Исполнитель:
+ {% if proj.order.contractor %}
+ {{ proj.order.contractor.get_full_name }}
+ {% else %}
+ {{ proj.order.team.name }}
+ {% endif %}
+
+
+
+
+ Полное описание заказа
+
+
+
+ {% endfor %}
+
+
+ {% endif %}
+
@@ -167,11 +201,12 @@
-
Пустое сообщение нельзя отправить
+
Пустое сообщение нельзя
+ отправить
-
+
- {% include 'reverse_stage_modal.html' %}
+ {% include 'reverse_stage_modal.html' %}
-
-
3 / Выполнение работы
-
- Процесс выполнения задания в заказе до получения
+
+
3 / Выполнение работы
+
+ Процесс выполнения задания в заказе до получения
заказчиком итогового результата работы.
-
+
-
+
+
Прикрепленные документы
+
+
+ Распечатать с помощью ресурса
+
+
{#
#}
- Положительный
- Отрицательный
- Нейтральный
@@ -27,19 +27,19 @@
Ваш отзыв
{% if request.user.is_customer %}
-
+
-
+
-
+
{% else %}
-
-
+
+
-
+
{% endif %}
diff --git a/chat/views.py b/chat/views.py
index 7dde354..e78ab5f 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -55,7 +55,7 @@ class ChatUserView(LoginRequiredMixin, View):
users_ids.append(int(user_id))
contacts_users = User.objects.filter(pk__in=users_ids)
-
+ archive_projects = request.user.customer_projects.select_related('order').exclude(state='active')
chat_messages = Message.objects.filter(Q(sender=request.user.pk) | Q(recipent=request.user.pk))
orders = request.user.customer_projects.select_related('order').filter(state='active').exclude(order__contractor__isnull=True, order__team__isnull=True)
order_ids = [order.order.pk for order in orders]
@@ -72,6 +72,7 @@ class ChatUserView(LoginRequiredMixin, View):
'chat_messages': chat_messages,
'contacts_users_count': contacts_users_count,
'orders_ms_count': orders_ms_count,
+ 'archive_projects': archive_projects,
'orders': orders,
'transaction': transaction[0],
'YANDEX_MONEY': settings.YANDEX_MONEY,
@@ -86,7 +87,8 @@ class ChatUserView(LoginRequiredMixin, View):
teams = Team.objects.filter(contractors__id=request.user.pk).all()
team_orders = Order.objects.filter(team_id__in=[team.pk for team in teams]).all()
- orders = Order.objects.filter(Q(contractor=request.user) | Q(team_id__in=team_ids)).filter(project__state='active').all()
+ orders = Order.objects.filter(Q(contractor=request.user) | Q(team_id__in=team_ids)).filter(project__state='active')
+ archive_orders = Order.objects.filter(Q(contractor=request.user) | Q(team_id__in=team_ids)).exclude(project__state='active')
contractor_contacts = Message.objects.values_list('sender_id', 'recipent_id').filter(
Q(recipent_id=request.user.pk) | Q(sender_id=request.user.pk)).filter(Q(team_id=None)).\
filter(is_delete=False).distinct()
@@ -113,7 +115,6 @@ class ChatUserView(LoginRequiredMixin, View):
orders_ms_count = request.user.new_messages.filter(message__order__in=orders, message__team__isnull=True).count()
teams_ms_count = request.user.new_messages.filter(message__team__in=your_teams, message__order__isnull=True).count()
-
self.template_name = 'chat_contractor.html'
return render(request, self.template_name, {'orders': orders,
'contacts_users': contacts_users,
@@ -123,7 +124,7 @@ class ChatUserView(LoginRequiredMixin, View):
'chat_messages': chat_messages,
'team_orders': team_orders,
'your_teams': your_teams,
-
+ 'archive_orders': archive_orders,
})
diff --git a/reviews/serializers.py b/reviews/serializers.py
index edaa702..e985c86 100644
--- a/reviews/serializers.py
+++ b/reviews/serializers.py
@@ -1,15 +1,18 @@
from rest_framework.serializers import ModelSerializer
+from rest_framework import serializers
from .models import Review
from users.serializers import UserSerializer, TeamSerializer
class ReviewSerializer(ModelSerializer):
+ target_user = serializers.SerializerMethodField(read_only=True)
class Meta:
model = Review
fields = (
+ 'id',
'text',
'type',
'created',
@@ -20,5 +23,14 @@ class ReviewSerializer(ModelSerializer):
'target_customer',
'target_contractor',
'target_team',
+ 'target_user',
)
+ def get_target_user(self, obj):
+ if obj.target_customer:
+ return obj.target_customer.pk
+ elif obj.target_contractor:
+ return obj.target_contractor.pk
+ elif obj.target_team:
+ return obj.target_team.owner.pk
+
diff --git a/users/templatetags/user_tags.py b/users/templatetags/user_tags.py
index 49d3e23..630c813 100644
--- a/users/templatetags/user_tags.py
+++ b/users/templatetags/user_tags.py
@@ -68,3 +68,18 @@ def get_new_count_for_contact(contact, current_user):
return count
+@register.simple_tag
+def get_new_count_for_order(current_user, order_id):
+ count = current_user.new_messages.filter(message__order=order_id, message__team__isnull=True).count()
+ return count
+
+
+@register.simple_tag
+def get_new_count_for_team(current_user, team_id, order_id=None):
+ if order_id:
+ count = current_user.new_messages.filter(message__order=order_id, message__team=team_id).count()
+ else:
+ count = current_user.new_messages.filter(message__order__isnull=True, message__team=team_id).count()
+ return count
+
+