diff --git a/projects/models.py b/projects/models.py
index 5b1ae47..3a97c1c 100644
--- a/projects/models.py
+++ b/projects/models.py
@@ -2,6 +2,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.db.models import Q
+from django.core.exceptions import ValidationError
from django.utils import timezone
from hitcount.models import HitCountMixin
from mptt.models import TreeForeignKey
@@ -262,7 +263,7 @@ class Stage(models.Model):
name = models.CharField(max_length=255)
order = models.ForeignKey(Order, related_name='stages')
result = models.CharField(max_length=255)
- term = models.DateField(validators=[validate_term])
+ term = models.DateField()
term_type = models.CharField(max_length=10, choices=TERM_TYPES, default='hour')
status = models.CharField(choices=STATUSES, max_length=30, default='not_agreed')
created = models.DateTimeField(default=timezone.now)
@@ -275,12 +276,17 @@ class Stage(models.Model):
def __str__(self):
return self.name
- # def clean(self, *args, **kwargs):
- # super().clean(*args, **kwargs)
- #
- # def save(self, *args, **kwargs):
- # # self.full_clean()
- # super().save(*args, **kwargs)
+ def clean(self, *args, **kwargs):
+ pass
+ # stage_last = self.__class__.objects.filter(order=self.order).order_by('-pos')[:1]
+ # if stage_last:
+ # stage_last = stage_last[0]
+ # if stage_last.term > self.term:
+ # raise ValidationError({'term':'Дата не должна быть меньше даты предыдущео этапа'})
+
+ def save(self, *args, **kwargs):
+ self.full_clean()
+ super().save(*args, **kwargs)
class Meta:
ordering = ['pos']
diff --git a/projects/serializers.py b/projects/serializers.py
index e17b96d..3ffbe97 100755
--- a/projects/serializers.py
+++ b/projects/serializers.py
@@ -79,6 +79,16 @@ class RealtySerializer(ModelSerializer):
class StageSerializer(ModelSerializer):
term = serializers.DateField(format="%d.%m.%Y", input_formats=['%d.%m.%Y',])
+ def validate(self, data):
+ if hasattr(data, 'pos') and data['pos'] > 1:
+ pos = data['pos'] -1
+ stage_last = Stage.objects.filter(order=data['order'], pos=pos)
+ if stage_last:
+ stage_last = stage_last[0]
+ if stage_last.term > data['term']:
+ raise serializers.ValidationError({'term':'Дата не должна быть меньше даты предыдущео этапа'})
+ return data
+
class Meta:
model = Stage
diff --git a/templates/partials/base.html b/templates/partials/base.html
index 75da402..6530a3f 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -86,7 +86,7 @@
if ((queryString.indexOf('/chat') != 0) && (queryString.indexOf('/users/contractor-office/510/work-projects') != 0)) {
domain = domain.replace(':' + port, '');
- var url = 'ws://' + domain + ':8888/chat/' + userId + '/';
+ var url = 'ws://' + domain + '/chat/' + userId + '/';
var sock = new WebSocket(url);
var intervalId;
sock.onopen = function () {
diff --git a/users/models.py b/users/models.py
index 3e95239..e21612e 100644
--- a/users/models.py
+++ b/users/models.py
@@ -11,7 +11,7 @@ import pydash as _; _.map = _.map_; _.filter = _.filter_
from archilance import util
from specializations.models import Specialization
-
+# from chat.models import NewMessage
GENDERS = (
@@ -238,7 +238,7 @@ class Team(models.Model):
specializations = TreeManyToManyField(Specialization, related_name='teams', blank=True)
contractors = models.ManyToManyField(User, limit_choices_to={'groups__name': 'Исполнители'}, related_name ='teams', blank=True)
rating = models.FloatField(default=0.0)
-
+
def __str__(self):
return self.name
@@ -247,6 +247,7 @@ class Team(models.Model):
verbose_name_plural = 'Команды'
+
class TeamInvitation(models.Model):
contractor1 = models.ForeignKey(User, related_name='invites')
contractor2 = models.ForeignKey(User, related_name='invited_by')
diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html
index adc7804..b6785a2 100644
--- a/users/templates/contractor_office.html
+++ b/users/templates/contractor_office.html
@@ -2,42 +2,44 @@
{% load specializtions_tags %}
{% load thumbnail %}
-
+{% load user_tags %}
{% block content %}
{% include 'partials/modals/add_team_member.html' %}
{% include 'partials/header.html' %}
-
+
-
+
{% include 'partials/contractor_profile_tabs.html' %}
-
+
-
+
{% if contractor.team %}
-
+
-
+
-
+
-
+
-
+
-
+
@@ -258,116 +284,117 @@
{% block js_block %}
Личный кабинет
{% if contractor.team %}
{{ contractor.team.name }}
- 0
+ {% get_new_count_message contractor.team request.user %}
{% else %}
-
-
+
{% for team in contractor.teams.all %}
{{ team.name }}
+ {% get_new_count_message team request.user %}
{% endfor %}
-
+
-
+
@@ -75,22 +78,25 @@
-
+
{% if contractor.avatar %}
{% thumbnail contractor.avatar "265x264" crop="center" as im %}
- 
+
{% endthumbnail %}
{% else %}
- 
+
{% endif %}
+
{% endif %}
-
+
добавить участника
-
+
Состав группы
- + {% for c in contractor.team.contractors.all %} {% empty %} @@ -115,31 +121,33 @@
-
+
-
+
{{ contractor.get_location }}
- + - + - +Свободен
{% specialization_team_widget contractor.team.pk %}
-
+
{% ratings_team_widget contractor.team.pk %}
-
+
{% if contractor.cro %}
-
+
@@ -148,7 +156,7 @@
{% endif %}
{% for review in reviews %}
{% endif %}
-
+
{% include 'partials/footer.html' %}
@@ -226,15 +244,23 @@
-
+
{% if review.project.deal_type == 'secure_deal' %}
Безопасная сделка
{% endif %}
-
+
- положительный отзыв
+
+ {% if review.type == 'positive' %}
+ Положительный отзыв
+ {% elif review.type == 'negative' %}
+ Отрицательный отзыв
+ {% else %}
+ Нейтральный отзыв
+ {% endif %}
+
-
+
{{ review.text|safe }}
@@ -250,7 +276,7 @@