@@ -56,8 +57,8 @@
diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html
index 629f840..c8728f3 100644
--- a/chat/templates/chat_customer.html
+++ b/chat/templates/chat_customer.html
@@ -1,6 +1,7 @@
{% extends 'partials/base.html' %}
{% load staticfiles %}
{% load thumbnail %}
+{% load user_tags %}
{% block content %}
{% include 'partials/header.html' %}
@@ -14,10 +15,11 @@
@@ -52,7 +54,9 @@
Контакты
-
0
+
+ {% get_new_count_for_contact contact request.user %}
+
Удалить контакт
diff --git a/chat/views.py b/chat/views.py
index 4ccaf25..97bdb24 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -53,12 +53,14 @@ class ChatUserView(LoginRequiredMixin, View):
users_ids.append(b)
if user_id:
users_ids.append(int(user_id))
+ print(users_ids)
contacts_users = User.objects.filter(pk__in=users_ids)
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)
transaction = Transaction.objects.get_or_create(customer=request.user, type='reservation', complete=False)
self.template_name = 'chat_customer.html'
+
return render(request, self.template_name, {'contacts_users': contacts_users,
'chat_messages': chat_messages,
'orders': orders,
diff --git a/projects/migrations/0037_auto_20160919_1126.py b/projects/migrations/0037_auto_20160919_1126.py
new file mode 100644
index 0000000..0e1c166
--- /dev/null
+++ b/projects/migrations/0037_auto_20160919_1126.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-19 08:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('projects', '0036_auto_20160917_2135'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='project',
+ name='work_type',
+ field=models.IntegerField(choices=[(1, 'Проектирование'), (2, 'Проверка документации'), (3, 'Устранение замечаний в проекте')], default=1),
+ ),
+ ]
diff --git a/ratings/migrations/0002_historyrating_type.py b/ratings/migrations/0002_historyrating_type.py
new file mode 100644
index 0000000..99caa6c
--- /dev/null
+++ b/ratings/migrations/0002_historyrating_type.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-19 08:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ratings', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='historyrating',
+ name='type',
+ field=models.CharField(choices=[('OCCUPANCY_PROFILE', 'occupancy_profile'), ('SECURE_DEAL', 'secure_deal'), ('REVIEW', 'review'), ('MONEY_SPENT', 'money_spent'), ('PUBLICATION_PROJECT', 'publication_project'), ('VISIT_SITE', 'visit_site'), ('CHOICE_CONTRACTOR', 'choice_contractor')], default='review', max_length=50),
+ ),
+ ]
diff --git a/ratings/models.py b/ratings/models.py
index a231776..a9613a2 100644
--- a/ratings/models.py
+++ b/ratings/models.py
@@ -5,11 +5,21 @@ from specializations.models import Specialization
class HistoryRating(models.Model):
+ TYPES_HISTORY_RATING = (
+ ('OCCUPANCY_PROFILE', 'occupancy_profile'),
+ ('SECURE_DEAL', 'secure_deal'),
+ ('REVIEW', 'review'),
+ ('MONEY_SPENT', 'money_spent'),
+ ('PUBLICATION_PROJECT', 'publication_project'),
+ ('VISIT_SITE', 'visit_site'),
+ ('CHOICE_CONTRACTOR', 'choice_contractor'),
+ )
user = models.ForeignKey(User, related_name='history_ratings', null=True, blank=True)
team = models.ForeignKey(Team, related_name='history_ratings', null=True, blank=True)
rating = models.IntegerField(default=0)
created = models.DateTimeField(default=timezone.now)
description = models.TextField(blank=True)
+ type = models.CharField(max_length=50, choices=TYPES_HISTORY_RATING, default='review')
def __str__(self):
return '{0}'.format(self.rating)
diff --git a/users/models.py b/users/models.py
index e21612e..9dc2437 100644
--- a/users/models.py
+++ b/users/models.py
@@ -171,7 +171,8 @@ class User(AbstractBaseUser, PermissionsMixin):
return self.email
def get_full_name(self):
- return self.first_name + ' ' + self.last_name
+ full_name = self.first_name + ' ' + self.last_name
+ return full_name or self.username
def get_profile_image(self):
return self.avatar
diff --git a/users/templatetags/user_tags.py b/users/templatetags/user_tags.py
index 6fb5513..048f621 100644
--- a/users/templatetags/user_tags.py
+++ b/users/templatetags/user_tags.py
@@ -60,3 +60,10 @@ def count_new_message_orders(context, user):
def get_new_count_message(team_pk,user=None):
count = NewMessage.objects.filter(user=user, message__team=team_pk, message__order__isnull=True).count()
return count
+
+@register.simple_tag
+def get_new_count_for_contact(contact, current_user):
+ count = current_user.new_messages.filter(message__sender=contact).count()
+ return count
+
+