mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#ARC-11 add changes for views

Browse Source
remotes/origin/setup
Mukhtar 10 years ago
parent f2ef7363a8
commit f3564ee943
5 changed files with 418 additions and 338 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      api/views.py
  2. 69
      chat/templates/chat_contractor.html
  3. 86
      chat/templates/chat_customer.html
  4. 40
      chat/views.py
  5. 2
      templates/home.html

5
api/views.py
Unescape View File

@ -39,11 +39,10 @@ class MessageViewSet(ModelViewSet):
search_param = self.request.query_params.get('operand', None) search_param = self.request.query_params.get('operand', None)
recipent_id = self.request.query_params.get('recipent_id', None) recipent_id = self.request.query_params.get('recipent_id', None)
sender_id = self.request.query_params.get('sender_id', None) sender_id = self.request.query_params.get('sender_id', None)
# queryset = queryset.filter(Q(sender=self.request.user.pk) | Q(recipent=self.request.user.pk))
# import code; code.interact(local=dict(globals(), **locals()))
if search_param: if search_param:
# import code; code.interact(local=dict(globals(), **locals())) # import code; code.interact(local=dict(globals(), **locals()))
queryset = queryset.filter(Q(sender=self.request.user.pk) | Q(recipent=self.request.user.pk)) if search_param == 'in':
queryset = queryset.filter(Q(sender__in=[sender_id,recipent_id]),Q(recipent__in=[sender_id,recipent_id])).order_by('created')
return queryset return queryset

69
chat/templates/chat_contractor.html
Unescape View File

@ -1,11 +1,12 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% load thumbnail %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container mainScore"> <div class="container mainScore">
<div class="row"> <div class="row">
<div class="col-lg-12 allProjects"> <div class="col-lg-12 allProjects">
<h1>Чат {{ request.user }}</h1> <h1>Чат {{ request.user }} {{ request.user.pk }}</h1>
</div> </div>
<div class="btnReadyBlock disTab"> <div class="btnReadyBlock disTab">
<div class="triangle1"></div> <div class="triangle1"></div>
@ -33,20 +34,19 @@
<div class="col-lg-3 wrMessages"> <div class="col-lg-3 wrMessages">
<div class="messageBlock box-sizing disTab"> <div class="messageBlock box-sizing disTab">
<p>Контакты</p> <p>Контакты</p>
{% for contact in contractor_contacts %} {% for contact in contacts_users %}
<div class="message messd user-block" data-id="{% if request.user.pk == contact.recipent_id %}{{ contact.sender_id }} {% else %}{{ contact.recipent_id}}{% endif %}"> <div class="message messd user-block" data-id="{{ contact.pk }}">
<div class="imgMess"> <div class="imgMess">
<img src="{% static 'img/mess.png' %}" alt="mess-image"> {% thumbnail contact.avatar "60x60" crop="center" as im %}
<img src="{{ im.url }}" alt="mess-image">
{% endthumbnail %}
</div> </div>
<p class="nameMess"> <p class="nameMess">
<a href="#">{{ contact.recipent_id__first_name }} {{ contact.recipent_id__last_name }}</a> <a href="#">{{ contact.username }}{{ contact.username }}{{ contact.first_name }} {{ contact.last_name }}</a>
</p> </p>
<a href="javascript:void(0)" class="conMess">Контакты</a> <a href="javascript:void(0)" class="conMess">Контакты</a>
<span>0</span> <span>0</span>
<a>Recipent_id {{ contact.recipent_id }}</a>
<a>Sender_id {{ contact.sender_id }}</a>
<a>Current {{ request.user.pk }}</a>
<a href="javascript:void(0)" class="deleteMess"> <a href="javascript:void(0)" class="deleteMess">
Удалить контакт Удалить контакт
</a> </a>
@ -57,10 +57,11 @@
</div> </div>
<div class="col-lg-6 commChat" id="contact-chat"> <div class="col-lg-6 commChat" id="contact-chat">
<div id="message-chat-space"> <div id="message-chat-space">
</div> </div>
<form id="contact-chat-form"> <form id="contact-chat-form">
<input type="text" value="{{ request.user.pk }}" name="senderId" id="senderId" /> <input type="hidden" value="{{ request.user.pk }}" name="senderId" id="senderId" />
<input type="text" value="" name="recipentId" id="recipentId" /> <input type="hidden" value="" name="recipentId" id="recipentId" />
<textarea id="chat" name="chat_message" class="box-sizing"></textarea> <textarea id="chat" name="chat_message" class="box-sizing"></textarea>
<div class="bunChat"> <div class="bunChat">
@ -137,7 +138,7 @@
<div class="messageBlock box-sizing disTab"> <div class="messageBlock box-sizing disTab">
<p>Заказы</p> <p>Заказы</p>
{% for order in orders %} {% for order in orders %}
<div class="orderBlock box-sizing order-block" data-id="{{ order.id }}"> <div class="orderBlock box-sizing order-block" data-recipent-id="{{ order.project.customer.pk }}" data-id="{{ order.id }}">
<span class="dimovChat"></span> <span class="dimovChat"></span>
<p class="titleOB"> <p class="titleOB">
{{ order }} {{ order }}
@ -161,15 +162,15 @@
</div> </div>
<div class="col-lg-6 commChat"> <div class="col-lg-6 commChat">
<div id="message-chat-order-space"> <div id="message-chat-order-space">
{% for msg in chat_messages %} {# {% for msg in chat_messages %}#}
<div class="col-lg-12 insetCommChat {% if msg.sender.pk == request.user.pk %}youChat{% endif %}"> {# <div class="col-lg-12 insetCommChat {% if msg.sender.pk == request.user.pk %}youChat{% endif %}">#}
<div class="topCommChat"> {# <div class="topCommChat">#}
<p class="nameCommChat {% if msg.sender.pk == request.user.pk %}greenNCC{% endif %}">{{ msg.sender.get_full_name }}</p> {# <p class="nameCommChat {% if msg.sender.pk == request.user.pk %}greenNCC{% endif %}">{{ msg.sender.get_full_name }}</p>#}
<span>{{ msg.created }}</span> {# <span>{{ msg.created }}</span>#}
</div> {# </div>#}
<p class="textCommChat">{{ msg }}</p> {# <p class="textCommChat">{{ msg }}</p>#}
</div> {# </div>#}
{% endfor %} {# {% endfor %}#}
</div> </div>
<form id="chat-contractor-order"> <form id="chat-contractor-order">
<input type="text" id="orderId" /> <input type="text" id="orderId" />
@ -364,6 +365,7 @@ var SocketHandler = function () {
}; };
sock.onmessage = function (event) { sock.onmessage = function (event) {
console.log(event.data); console.log(event.data);
alert(event.data);
var message = JSON.parse(event.data); var message = JSON.parse(event.data);
var inbox = document.getElementById('message-chat-space'); var inbox = document.getElementById('message-chat-space');
inbox.innerHTML += '<div class="col-lg-12 insetCommChat"><div class="topCommChat">' + inbox.innerHTML += '<div class="col-lg-12 insetCommChat"><div class="topCommChat">' +
@ -404,6 +406,7 @@ var SocketHandler = function () {
} }
$(function () { $(function () {
var currentChatUser = {{ request.user.pk }};
var socket = new SocketHandler(); var socket = new SocketHandler();
var form = document.getElementById('message_form'); var form = document.getElementById('message_form');
var csrftoken = getCookie('csrftoken'); var csrftoken = getCookie('csrftoken');
@ -411,7 +414,9 @@ $(function () {
// Вытащить сообщения для чата заказа // Вытащить сообщения для чата заказа
$('.order-block').on('click', function () { $('.order-block').on('click', function () {
var orderId = $(this).attr('data-id'); var orderId = $(this).attr('data-id');
var recipentId = $(this).attr('data-recipent-id');
$("#chat-contractor-order #orderId").val(orderId); $("#chat-contractor-order #orderId").val(orderId);
$("#chat-contractor-order #recipentId").val(recipentId);
var inbox = document.getElementById('message-chat-order-space'); var inbox = document.getElementById('message-chat-order-space');
inbox.innerHTML = ''; inbox.innerHTML = '';
$.ajax({ $.ajax({
@ -439,14 +444,21 @@ $(function () {
$.ajax({ $.ajax({
url: '/api/message', url: '/api/message',
type: 'GET', type: 'GET',
data: {csrfmiddlewaretoken: csrftoken, 'recipent__id': userId}, data: {csrfmiddlewaretoken: csrftoken, 'operand': 'in', 'sender_id':currentChatUser,'recipent_id': userId},
dataType: 'json', dataType: 'json',
success: function (json) { success: function (json) {
$.each(json.results, function (i, v) { $.each(json.results, function (i, v) {
console.log(v.sender.id); console.log(v.sender.id);
console.log(v.recipent.id); var senderName = 'Вы';
inbox.innerHTML += '<div class="col-lg-12 insetCommChat"><div class="topCommChat">' + var className = 'youChat';
'<p class="nameCommChat">Иванов</p> <span>13.0.2016</span></div>' + if(v.sender.id == userId){
senderName = v.sender.username;
className = '';
}
inbox.innerHTML += '<div class="col-lg-12 insetCommChat '+ className+'"><div class="topCommChat">' +
'<p class="nameCommChat">'+ senderName +'</p> <span>'+ v.created +'</span></div>' +
'<p class="textCommChat">' + v.text + '</p></div>'; '<p class="textCommChat">' + v.text + '</p></div>';
}); });
} }
@ -469,14 +481,15 @@ $(function () {
} }
}); });
var inbox = $('#message-chat-space').html();
$('#message-chat-space').html(inbox + '<div class="col-lg-12 insetCommChat"><div class="topCommChat">' +
'<p class="nameCommChat">Вы</p> <span>Сейчас</span></div>' +
'<p class="textCommChat">' + chatMessage +'</p></div>');
$("#chat").val(""); $("#chat").val("");
}); });
}); });
</script> </script>
{% endblock %} {% endblock %}

86
chat/templates/chat_customer.html
Unescape View File

@ -1,5 +1,6 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load staticfiles %} {% load staticfiles %}
{% load thumbnail %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container mainScore"> <div class="container mainScore">
@ -27,14 +28,15 @@
<div class="col-lg-3 wrMessages"> <div class="col-lg-3 wrMessages">
<div class="messageBlock box-sizing disTab"> <div class="messageBlock box-sizing disTab">
<p>Контакты</p> <p>Контакты</p>
{% for contact in customer_contacts %} {% for contact in contacts_users %}
<div class="message messd user-block" data-id="{{ contact.pk }}">
<div class="message messd user-block" data-id="{{ contact.recipent_id}}">
<div class="imgMess"> <div class="imgMess">
<img src="{% static 'img/mess.png' %}" alt="mess-image"> {% thumbnail contact.avatar "60x60" crop="center" as im %}
<img src="{{ im.url }}" alt="mess-image">
{% endthumbnail %}
</div> </div>
<p class="nameMess"> <p class="nameMess">
<a href="#">Тестовый контакт</a> <a href="#">{{ contact.username }} {{ contact.username }}</a>
</p> </p>
<a href="javascript:void(0)" class="conMess">Контакты</a> <a href="javascript:void(0)" class="conMess">Контакты</a>
<span>0</span> <span>0</span>
@ -127,7 +129,8 @@
<div class="messageBlock box-sizing disTab"> <div class="messageBlock box-sizing disTab">
<p>Заказы</p> <p>Заказы</p>
{% for order in orders %} {% for order in orders %}
<div class="orderBlock box-sizing order-block" data-id="{{ order.order.id }}"> <div class="orderBlock box-sizing order-block"
data-recipent-id="{{ order.order.contractor.pk }}" data-id="{{ order.order.id }}">
<span class="dimovChat"></span> <span class="dimovChat"></span>
<p class="titleOB"> <p class="titleOB">
{{ order }} {{ order }}
@ -162,7 +165,7 @@
{% endfor %} {% endfor %}
</div> </div>
<form id="chat-order-add"> <form id="chat-order-add">
<input type="text" name="senderId" value="{{ request.user.pk }}"/> <input type="text" name="senderId" id="senderId" value="{{ request.user.pk }}"/>
<input type="text" name="recipentId" id="recipentId" value=""/> <input type="text" name="recipentId" id="recipentId" value=""/>
<input type="text" name="orderId" id="orderId" value=""/> <input type="text" name="orderId" id="orderId" value=""/>
<textarea id="chat" class="box-sizing"></textarea> <textarea id="chat" class="box-sizing"></textarea>
@ -173,7 +176,7 @@
Не более 10 файлов с общим объемом 500мб Не более 10 файлов с общим объемом 500мб
</span> </span>
</div> </div>
<a href="javascript:void(0)">отправить</a> <a href="javascript:void(0)" id="order-chat-add-message">отправить</a>
</div> </div>
</form> </form>
</div> </div>
@ -199,19 +202,33 @@
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
var currentChatUser = {{ request.user.pk }};
var socket = new SocketHandler(); var socket = new SocketHandler();
var form = document.getElementById('message_form'); var form = document.getElementById('message_form');
var csrftoken = getCookie('csrftoken'); var csrftoken = getCookie('csrftoken');
$('.order-block').on('click', function () { $('.order-block').on('click', function () {
var orderId = $(this).attr('data-id'); var orderId = $(this).attr('data-id');
var recipentId = $(this).attr('data-recipent-id');
$("#chat-order-add #orderId").val(orderId); $("#chat-order-add #orderId").val(orderId);
alert(orderId); $("#chat-order-add #recipentId").val(recipentId);
var inbox = document.getElementById('message-chat-order-space'); var inbox = document.getElementById('message-chat-order-space');
inbox.innerHTML = ''; inbox.innerHTML = '';
{# socket.send_order_message(orderId);#}
});
$.ajax({
url: '/api/message',
type: 'GET',
data: {csrfmiddlewaretoken: csrftoken, 'order': orderId},
dataType: 'json',
success: function (json) {
$.each(json.results, function (i, v) {
inbox.innerHTML += '<div class="col-lg-12 insetCommChat"><div class="topCommChat">' +
'<p class="nameCommChat">Иванов</p> <span>13.0.2016</span></div>' +
'<p class="textCommChat">' + v.text + '</p></div>';
});
}
});
});
// Вытащить сообщения для конактов // Вытащить сообщения для конактов
@ -223,14 +240,23 @@
$.ajax({ $.ajax({
url: '/api/message', url: '/api/message',
type: 'GET', type: 'GET',
data: {csrfmiddlewaretoken: csrftoken, 'recipent__id': userId}, data: {
csrfmiddlewaretoken: csrftoken,
'operand': 'in',
'sender_id': currentChatUser,
'recipent_id': userId
},
dataType: 'json', dataType: 'json',
success: function (json) { success: function (json) {
$.each(json.results, function (i, v) { $.each(json.results, function (i, v) {
console.log(v.sender.id); var senderName = 'Вы';
console.log(v.recipent.id); var className = 'youChat';
inbox.innerHTML += '<div class="col-lg-12 insetCommChat"><div class="topCommChat">' + if (v.sender.id == userId) {
'<p class="nameCommChat">Иванов</p> <span>13.0.2016</span></div>' + senderName = v.sender.username;
className = '';
}
inbox.innerHTML += '<div class="col-lg-12 insetCommChat ' + className + '"><div class="topCommChat">' +
'<p class="nameCommChat">' + senderName + '</p> <span>' + v.created + '</span></div>' +
'<p class="textCommChat">' + v.text + '</p></div>'; '<p class="textCommChat">' + v.text + '</p></div>';
}); });
} }
@ -254,6 +280,30 @@
$("#chat").val(""); $("#chat").val("");
}); });
$('#order-chat-add-message').on('click', function () {
var chatMessage = $("#chat-order-add #chat").val();
var recipentId = $("#chat-order-add #recipentId").val();
var senderId = $("#chat-order-add #senderId").val();
var orderId = $("#chat-order-add #orderId").val();
socket.add_contact_message({
"format_type": "add_message_order",
"data": {
"sender_id": senderId,
"recipent_id": recipentId,
"chat_message": chatMessage,
"order_id": orderId,
}
});
$("#chat-order-add #chat").val("");
});
}); });
var userId = '{{ request.user.pk }}'; var userId = '{{ request.user.pk }}';
@ -264,7 +314,9 @@
var intervalId; var intervalId;
sock.onopen = function () { sock.onopen = function () {
console.log("Start connect"); console.log("Start connect");
intervalId = setInterval(function(){sock.send('{"dummy": 1}');}, 150); intervalId = setInterval(function () {
sock.send('{"dummy": 1}');
}, 150);
}; };
sock.onmessage = function (event) { sock.onmessage = function (event) {
console.log(event.data); console.log(event.data);

40
chat/views.py
Unescape View File

@ -3,6 +3,7 @@ from django.views.generic import View
from django.db.models import Q from django.db.models import Q
from .models import Message from .models import Message
from users.models import User
class ChatUserView(View): class ChatUserView(View):
@ -10,25 +11,40 @@ class ChatUserView(View):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
if request.user.is_authenticated() and request.user.is_customer(): if request.user.is_authenticated() and request.user.is_customer():
customer_contacts = Message.objects.values('sender_id','recipent_id').\ customer_contacts = Message.objects.values_list('sender_id', 'recipent_id'). \
filter(Q(recipent_id=request.user.pk) | Q(sender_id=request.user.pk)).distinct() filter(Q(recipent_id=request.user.pk) | Q(sender_id=request.user.pk)).distinct()
users_ids = []
for msg in customer_contacts:
a, b = msg
if a != request.user.pk:
users_ids.append(a)
if b != request.user.pk:
users_ids.append(b)
contacts_users = User.objects.filter(pk__in=users_ids)
chat_messages = Message.objects.filter(Q(sender=request.user.pk) | Q(recipent=request.user.pk)) chat_messages = Message.objects.filter(Q(sender=request.user.pk) | Q(recipent=request.user.pk))
orders = request.user.projects.select_related('order').all() orders = request.user.projects.select_related('order').all()
self.template_name = 'chat_customer.html' self.template_name = 'chat_customer.html'
return render(request, self.template_name, {'customer_contacts': customer_contacts, return render(request, self.template_name, {'contacts_users': contacts_users,
'chat_messages': chat_messages, 'chat_messages': chat_messages,
'orders': orders}) 'orders': orders})
else: else:
orders = request.user.orders.all() orders = request.user.orders.all()
# contractor_contacts = request.user.sender_messages.values('recipent_id').distinct('recipent_id').\ contractor_contacts = Message.objects.values_list('sender_id', 'recipent_id').filter(
# values('recipent_id__email', 'recipent_id__first_name', 'recipent_id__last_name', 'recipent_id__id') Q(recipent_id=request.user.pk) | Q(sender_id=request.user.pk)).distinct()
contractor_contacts = Message.objects.values('sender_id','recipent_id').\ users_ids = []
filter(Q(recipent_id=request.user.pk)| Q(sender_id=request.user.pk)).distinct() for msg in contractor_contacts:
a, b = msg
chat_messages = Message.objects.filter(Q(sender=request.user.pk) | Q(recipent=request.user.pk)).order_by('created') if a != request.user.pk:
users_ids.append(a)
if b != request.user.pk:
users_ids.append(b)
contacts_users = User.objects.filter(pk__in=users_ids)
chat_messages = Message.objects.filter(Q(sender=request.user.pk) | Q(recipent=request.user.pk)).order_by(
'created')
self.template_name = 'chat_contractor.html' self.template_name = 'chat_contractor.html'
return render(request, self.template_name, {'orders': orders, return render(request, self.template_name, {'orders': orders,
'contractor_contacts': contractor_contacts, 'contacts_users': contacts_users,
'chat_messages': chat_messages}) 'chat_messages': chat_messages
})

2
templates/home.html
Unescape View File

@ -50,7 +50,7 @@
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<a class="popup-youtube" href="https://www.youtube.com/watch?v=WjhmB0JlCTo"> <a class="popup-youtube" href="{{ main_settings.video_code }}">
<div class="youtube"></div> <div class="youtube"></div>
</a> </a>

Write Preview
Loading…
Cancel
Save