';
+
+ });
+ var height = inbox.scrollHeight;
+ inbox.scrollTop = height;
+ }
+ });
+
+ $("#order-stages").html("");
+ $("#completeWork").hide();
+ $("#add-form-order-note").hide();
+ $("#reserveSpace").hide();
+ });
// Для заказов все вытащить
$('.order-block').on('click', function () {
diff --git a/chat/chat.py b/chat/chat.py
index 3d6ab48..57786f5 100644
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -24,12 +24,13 @@ class ChatHandler(websocket.WebSocketHandler):
waiters = set()
def open(self, *args, **kwargs):
- self.user_id = kwargs.get('user_id',1)
+ self.user_id = kwargs.get('user_id', 1)
self.waiters.add((self.user_id, self))
# @gen.coroutine
def on_message(self, message):
parsed = escape.json_decode(message)
+
if 'dummy' in parsed:
return
@@ -50,9 +51,10 @@ class ChatHandler(websocket.WebSocketHandler):
# order_id = data['data'].get('order_id')
# message = data['data'].get('msg', 'Этапы обновлены')
# answer_type = data['format_type']
- # waiters = tuple(w for c, w in self.waiters if c == recipent_id or c == sender_id)
+ # waiters = tuple(w for c, w in self.waiters if c == recipent_id)
# for waiter in waiters:
- # waiter.write_message({'msg': message, 'order_id': order_id, 'answer_type': answer_type})
+ # print(waiter)
+ # # waiter.write_message({'msg': message, 'order_id': order_id, 'answer_type': answer_type})
@gen.coroutine
def add_message(self, message_data):
@@ -127,7 +129,11 @@ class ChatHandler(websocket.WebSocketHandler):
if docs_links:
message += '
' + docs_links;
- waiters = tuple(w for c, w in self.waiters if c == recipent_id or c == sender_id)
+ if message_type:
+ waiters = tuple(w for c, w in self.waiters if c == recipent_id)
+ else:
+ waiters = tuple(w for c, w in self.waiters if c == recipent_id or c == sender_id)
+
for waiter in waiters:
waiter.write_message({'msg': message,
'msg_time': msg_time,
diff --git a/chat/serializers.py b/chat/serializers.py
index 31c153c..3a38ce3 100644
--- a/chat/serializers.py
+++ b/chat/serializers.py
@@ -63,7 +63,7 @@ class MessageSerializer(ModelSerializer):
out = obj.text
documents = obj.documents.all()
if len(documents)>0:
- documents_str = ' '.join(['Входящий файл: ' + doc.file.name + '' for doc in documents])
+ documents_str = ' '.join(['Приложенный файл. скачать: ' + doc.file.name + '' for doc in documents])
out += '