diff --git a/chat/templates/dialog_delete.html b/chat/templates/dialog_delete.html
new file mode 100644
index 0000000..d030d91
--- /dev/null
+++ b/chat/templates/dialog_delete.html
@@ -0,0 +1,16 @@
+
diff --git a/chat/views.py b/chat/views.py
index b6f49fd..6ffe399 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -77,7 +77,8 @@ class ChatUserView(LoginRequiredMixin, View):
orders = Order.objects.filter(Q(contractor=request.user) | Q(team_id__in=team_ids)).all()
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)).distinct()
+ Q(recipent_id=request.user.pk) | Q(sender_id=request.user.pk)).filter(Q(team_id=None)).\
+ filter(is_delete=False).distinct()
users_ids = []
for msg in contractor_contacts:
a, b = msg
@@ -91,7 +92,7 @@ class ChatUserView(LoginRequiredMixin, View):
chat_messages = Message.objects.filter(Q(sender=request.user.pk) | Q(recipent=request.user.pk)).order_by(
'created')
- your_teams = teams
+ your_teams = Team.objects.filter(Q(contractors__id=request.user.pk) | Q(owner=request.user))
self.template_name = 'chat_contractor.html'
return render(request, self.template_name, {'orders': orders,
'contacts_users': contacts_users,
@@ -106,8 +107,8 @@ def messages_delete(request):
sender = request.POST.get('sender_id')
recipent = request.POST.get('recipent_id')
queryset = Message.objects.all()
- # queryset = queryset.filter(Q(sender__in=[sender,recipent]),Q(recipent__in=[sender,recipent]))
- # queryset.delete()
+ queryset = queryset.filter(Q(sender__in=[sender, recipent]), Q(recipent__in=[sender, recipent]))
+ queryset.update(is_delete=True)
data = {'status': 'ok'}
return HttpResponse(json.dumps(data), content_type='application/json')
else:
diff --git a/projects/apps.py b/projects/apps.py
index 5c57f09..95e9770 100644
--- a/projects/apps.py
+++ b/projects/apps.py
@@ -5,5 +5,6 @@ from django.apps import AppConfig
class ProjectsConfig(AppConfig):
name = 'projects'
-
+ def ready(self):
+ import projects.signals
diff --git a/projects/migrations/0028_stage_approve_time.py b/projects/migrations/0028_stage_approve_time.py
new file mode 100644
index 0000000..61af72e
--- /dev/null
+++ b/projects/migrations/0028_stage_approve_time.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-08 08:17
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('projects', '0027_auto_20160907_1658'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='stage',
+ name='approve_time',
+ field=models.DateTimeField(default=datetime.datetime(2016, 9, 8, 8, 17, 17, 715320, tzinfo=utc)),
+ preserve_default=False,
+ ),
+ ]
diff --git a/projects/migrations/0029_auto_20160908_1159.py b/projects/migrations/0029_auto_20160908_1159.py
new file mode 100644
index 0000000..ec83334
--- /dev/null
+++ b/projects/migrations/0029_auto_20160908_1159.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-08 08:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('projects', '0028_stage_approve_time'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='stage',
+ name='approve_time',
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ ]
diff --git a/projects/models.py b/projects/models.py
index ccf519c..aa8c6b3 100644
--- a/projects/models.py
+++ b/projects/models.py
@@ -258,6 +258,7 @@ class Stage(models.Model):
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)
+ approve_time = models.DateTimeField(null=True, blank=True)
pos = models.IntegerField(default=0, null=True, blank=True)
is_paid = models.BooleanField(default=False)
close_contractor = models.BooleanField(default=False)
diff --git a/projects/signals.py b/projects/signals.py
index b056dda..9a84217 100644
--- a/projects/signals.py
+++ b/projects/signals.py
@@ -1,8 +1,12 @@
from django.core.signals import request_finished
+from django.db.models.signals import post_save
+from django.utils import timezone
from django.dispatch import receiver
-from .models import Project
+from .models import Stage
-@receiver(request_finished)
-def add_project_test(sender, **kwargs):
- pr = Project.objects.create(name='Test', price=100, user=2, spec=2)
- pr.save()
\ No newline at end of file
+
+@receiver(post_save, sender=Stage)
+def set_approve_time(sender, instance, created, **kwargs):
+ if instance.status == 'in_process' and not instance.approve_time:
+ instance.approve_time = timezone.now()
+ instance.save()
diff --git a/templates/home.html b/templates/home.html
index 44fded1..a0f08a1 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -12,33 +12,35 @@
-
-
- {% if request.user.is_authenticated and request.user.is_contractor %}
-
Я исполнитель
+
+
+ {% if request.user.is_authenticated and request.user.is_customer %}
+
Я заказчик
{% else %}
-
Я исполнитель
+
Я заказчик
{% endif %}
- {{ main_settings.contractor_text|safe }}
+ {{ main_settings.customer_text|safe }}
-
-
- {% if request.user.is_authenticated and request.user.is_customer %}
-
Я заказчик
+
+ {% if request.user.is_authenticated and request.user.is_contractor %}
+
Я исполнитель
{% else %}
-
Я заказчик
+
Я исполнитель
{% endif %}
- {{ main_settings.customer_text|safe }}
+ {{ main_settings.contractor_text|safe }}
+
+
diff --git a/templates/partials/base.html b/templates/partials/base.html
index 6d947d1..3ba3260 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -96,6 +96,7 @@
sock.send('{"dummy": 1}');
}, 15000);
};
+
sock.onmessage = function (event) {
var notificationData = JSON.parse(event.data);
console.log(notificationData);
@@ -108,7 +109,6 @@
$.jGrowl("Вам пришло новое сообщение!
" + outMessage, { life: 15000});
};
-
this.add_message = function (messageData) {
sock.send(JSON.stringify(messageData));
};
@@ -116,7 +116,6 @@
};
var userId = '{{ request.user.pk }}';
-
if (userId) {
var socketMain = new SocketHandlerMain(userId);
}
diff --git a/templates/partials/header.html b/templates/partials/header.html
index 4e15491..d5f778f 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -21,7 +21,7 @@
-