Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into artur

assets/js/chat.js

@@ -184,7 +184,6 @@ function dialog (message, yesCallback, notCallback) {
         $("a[href='#tab1']").trigger('click');
     }
 
-
     // Информация о заказе
     $(".messageBlock").on('click','.full-order-info', function (e) {
         e.preventDefault();
@@ -322,6 +321,7 @@ function dialog (message, yesCallback, notCallback) {
 
     // Вытащить сообщения для конактов
     $('.user-block').on('click', function () {
+        var newCount = parseInt($("#count-tab-contact").text());
         var contactId = $(this).attr('data-id');
         location.hash = '#user' + contactId;
         $("#contact-chat-form #recipentContactId").val(contactId);
@@ -336,6 +336,9 @@ function dialog (message, yesCallback, notCallback) {
         var sumSenderRecipent = parseInt(userId) + parseInt(contactId);
 
         $("#message-chat-space").removeClass().addClass("contact-space" + sumSenderRecipent);
+        var currNewCount = parseInt($(".contact-count-" + sumSenderRecipent).text());
+        var resCount = newCount - currNewCount;
+        $("#count-tab-contact").text(newCount - currNewCount);
         $(".contact-count-" + sumSenderRecipent).text(0);
         var docList = document.getElementById('documentSpace');
         inbox.innerHTML = '';
@@ -758,6 +761,7 @@ function dialog (message, yesCallback, notCallback) {
         var related = $(e.relatedTarget);
         var relatedType = related.attr('data-review-type');
         $('input[name="type"]').filter('[value="'+ relatedType+'"]').prop("checked", true);
+        $("#text-new").val("");
     });
 
     // Добавление отзыва
@@ -776,15 +780,19 @@ function dialog (message, yesCallback, notCallback) {
             success: function (json) {
                 console.log(json);
                 $("#review-add").modal('hide');
-                //socket.send_stages_approve({
+                $("#leaveReview").hide();
-                //    "format_type": "approve_stages",
+                var currOrder = json.project;
-                //    "data": {
+                var currRecipent = json.target_user;
-                //        "sender_id": userId,
+
-                //        "recipent_id": '',
+                socket.send_stages_approve({
-                //        "order_id": '',
+                    "format_type": "approve_stages",
-                //        "msg": "Отзыв добавлен",
+                    "data": {
-                //    }
+                        "sender_id": userId,
-                //});
+                        "recipent_id": currRecipent,
+                        "order_id": currOrder,
+                        "msg": "Отзыв добавлен",
+                    }
+                });
             },
             error: function (e) {
                 console.log('error');
@@ -792,6 +800,99 @@ function dialog (message, yesCallback, notCallback) {
             }
         });
     });
+
+    // Нажимаем на кнопку архивные сообщения
+    $("#trashed-button").on('click',function(e){
+        e.preventDefault();
+        var state = $(this).attr('data-show');
+        var trashedOrderHtml = "";
+
+        if (state == 'true') {
+            $(this).attr('data-show','false');
+            $(this).text("Скрыть архивные заказы");
+
+            $("#archive-space").show();
+            $("#show-archive-label").show();
+
+            //$.ajax({
+            //    url: '/api/orders/',
+            //    type: 'GET',
+            //    dataType: 'json',
+            //    success: function (json) {
+            //        console.log(json.results);
+            //        $.each(json.results, function (i, v) {
+            //
+            //            var temp = '<div data-id="'+ v.id +'" class="trashedOrderBlock box-sizing"><span class="dimovChat"></span>' +
+            //                '<p class="titleOB">' + v.project.name + '</p><div class="hideOBB"><p class="pOB">' +
+            //                '<span>Исполнитель:</span>'+ v.contractor_name +' </p>' +
+            //                '<a href="#" class="linkChat11 full-order-info">' +
+            //                '<span class="glyphicon glyphicon-info-sign" aria-hidden="true">' +
+            //                '</span>Полное описание заказа </a></div></div>';
+            //
+            //            trashedOrderHtml += temp;
+            //        });
+            //        $("#trashed-orders").html(trashedOrderHtml);
+            //
+            //    },
+            //    error: function (e, jqxhr) {
+            //        console.log(e);
+            //    }
+            //});
+
+        }else {
+            $(this).attr('data-show','true');
+            $(this).text("Показать архивные заказы");
+            $("#archive-space").hide();
+            $("#show-archive-label").hide();
+        }
+
+
+    });
+
+    // Нажимаем на заказ в архмвных заказах
+    $(".messageBlock").on('click','.trashedOrderBlock',function(){
+        $("#chat-order-add").css("display", "none");
+        $('.order-block, .trashedOrderBlock').each(function () {
+            $(this).removeClass('orAct');
+        });
+        $(this).addClass('orAct');
+        var inbox = document.getElementById('message-chat-order-space');
+        var docList = document.getElementById('documentOrderSpace');
+        inbox.innerHTML = '';
+        docList.innerHTML = '';
+        var orderId = $(this).attr('data-id');
+        location.hash = '#order' + orderId;
+
+        $.ajax({
+            url: '/api/message',
+            type: 'GET',
+            data: {csrfmiddlewaretoken: csrftoken, 'order': orderId, 'team__isnull': 'true'},
+            dataType: 'json',
+            success: function (json) {
+                $.each(json.results, function (i, v) {
+                    var senderName = 'Вы';
+                    var className = 'youChat';
+
+                    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>';
+
+                });
+                var height = inbox.scrollHeight;
+                inbox.scrollTop = height;
+            }
+        });
+
+        $("#order-stages").html("");
+        $("#completeWork").hide();
+        $("#add-form-order-note").hide();
+        $("#reserveSpace").hide();
+    });
 });
 
 

assets/js/chat_contractor.js

@@ -78,6 +78,7 @@ $(function () {
             $(".stage-block-approve").each(function () {
                 var stageId = $(this).attr('data-id');
                 $.ajax({
+                    //async: false,
                     url: '/api/stages/' + stageId + '/',
                     type: 'PATCH',
                     beforeSend: function (xhr) {
@@ -107,8 +108,20 @@ $(function () {
                 }
             });
 
+            $('body').append('<div class="modal" id="popupOk" role="dialog" aria-labelledby="myModalLabel">' +
+            '<div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header">' +
+            '<button type="button" class="close" data-dismiss="modal" aria-label="Close">' +
+            '<span aria-hidden="true">&times;</span></button>' +
+            '<h4 class="modal-title" id="myModalLabel">Уведомление</h4>' +
+            '</div><div class="modal-body">Вы согласовали этапы</div>' +
+            '<div class="modal-footer">' +
+            '<button type="button" class="btn btn-default" data-dismiss="modal">ОК</button>' +
+            '</div></div></div></div>');
+            $('#popupOk').modal('show');
         }.bind(orderId, senderId, recipentId), caption);
 
+
+
     });
 
     // Отказаться от этапов
@@ -348,6 +361,15 @@ $(function () {
         location.hash = '#order' + orderId;
         var recipentId = $(this).attr('data-recipent-id');
         var projectId = $(this).attr('data-project-id');
+        var teamCurrentId = parseInt($(this).attr('data-team-id'));
+
+        if (teamCurrentId>0){
+            $("#fromTeamId").val(teamCurrentId);
+            $("#fromContractorId").val("");
+        }else {
+            $("#fromTeamId").val("")
+            $("#fromContractorId").val(userId);
+        }
 
         $("#chat-order-add #orderId").val(orderId);
         $("#add-form-order-note #orderNote").val(orderId);
@@ -534,9 +556,12 @@ $(function () {
             } else {
                 $("#completeWork").hide();
             }
-
+            if (!data.has_user_review) {
-                if ((stagesCompleted.length == stagesResults.length) && stagesCompleted.length > 0 && !data.has_user_review) {
+                if ((stagesCompleted.length == stagesResults.length) && stagesCompleted.length > 0) {
                     $("#leaveReview").show();
+                } else {
+                    $("#leaveReview").hide();
+                }
             }else{
                 $("#leaveReview").hide();
             }

assets/js/chat_customer.js

@@ -46,6 +46,12 @@ $(function () {
 
                 $("#choiceWayOrder").attr('data-stages-ids', stagesIds);
 
+                $("#stagesSelect").selectpicker({
+                    style: 'btn-info',
+                    size: 4
+                });
+
+
             }
         });
 
@@ -213,7 +219,7 @@ $(function () {
                     '</div></div>';
 
                 if (stage.close_contractor) {
-                    stageWork += '<div class="textAreaBlock2 FFD box-sizing disTab"><a href="#" class="closeStage" data-order-id="' + orderId + '" data-sender-id="{{ request.user.pk }}"' +
+                    stageWork += '<div class="textAreaBlock2 FFD box-sizing disTab"><a href="#" class="closeStage" data-order-id="' + orderId + '" data-sender-id="'+ userId +'"' +
                         ' data-recipent-id="' + recipentId + '" data-stage-id="' + stage.id + '">Закрыть этап ' + stage.pos + '</a></div>';
                 }
 
@@ -286,6 +292,7 @@ $(function () {
             $.ajax({
                 url: '/api/orders/' + currentOrderId + '/',
                 type: 'PATCH',
+
                 beforeSend: function (xhr) {
                     xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'))
                 },
@@ -305,6 +312,7 @@ $(function () {
             var _this = $(this);
             console.log($(this).serialize());
             $.ajax({
+                    async: false,
                     url: '/api/stages/',
                     type: 'POST',
                     beforeSend: function (xhr) {
@@ -335,6 +343,7 @@ $(function () {
             var currentStageId = parseInt($(this).attr('data-stage-id'));
             console.log($(this).serialize());
             $.ajax({
+                    async: false,
                     url: '/api/stages/' + currentStageId + '/',
                     type: 'PUT',
                     beforeSend: function (xhr) {
@@ -367,7 +376,17 @@ $(function () {
                 "msg": "Этапы для заказа " + currentOrderId + " изменены",
             }
         });
-        $.jGrowl("Этапы для заказа изменены и отправлены исполнителю", { life: 15000});
+        $('body').append('<div class="modal" id="popupOk" role="dialog" aria-labelledby="myModalLabel">' +
+            '<div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header">' +
+            '<button type="button" class="close" data-dismiss="modal" aria-label="Close">' +
+            '<span aria-hidden="true">&times;</span></button>' +
+            '<h4 class="modal-title" id="myModalLabel">Уведомление</h4>' +
+            '</div><div class="modal-body">Этапы отправлены исполнителю для согласования</div>' +
+            '<div class="modal-footer">' +
+            '<button type="button" class="btn btn-default" data-dismiss="modal">ОК</button>' +
+            '</div></div></div></div>');
+        $('#popupOk').modal('show');
+        //$.jGrowl("Этапы для заказа изменены и отправлены исполнителю", { life: 15000});
 
     });
 
@@ -410,97 +429,10 @@ $(function () {
         }
     });
 
-    // Нажимаем на кнопку архивные сообщения
-    $("#trashed-button").on('click',function(e){
-        e.preventDefault();
-        var state = $(this).attr('data-show');
-        var trashedOrderHtml = "";
-
-        if (state == 'true') {
-            $(this).attr('data-show','false');
-            $(this).text("Скрыть архивные заказы");
-
-            $.ajax({
-                url: '/api/orders/',
-                type: 'GET',
-                dataType: 'json',
-                success: function (json) {
-                    console.log(json.results);
-                    $.each(json.results, function (i, v) {
-
-                        var temp = '<div data-id="'+ v.id +'" class="trashedOrderBlock box-sizing"><span class="dimovChat"></span>' +
-                            '<p class="titleOB">' + v.project.name + '</p><div class="hideOBB"><p class="pOB">' +
-                            '<span>Исполнитель:</span>'+ v.contractor_name +' </p>' +
-                            '<a href="#" class="linkChat11 full-order-info">' +
-                            '<span class="glyphicon glyphicon-info-sign" aria-hidden="true">' +
-                            '</span>Полное описание заказа </a></div></div>';
-
-                        trashedOrderHtml += temp;
-                    });
-                    $("#trashed-orders").html(trashedOrderHtml);
-
-                },
-                error: function (e, jqxhr) {
-                    console.log(e);
-                }
-            });
-
-        }else {
-            $(this).attr('data-show','true');
-            $(this).text("Показать архивные заказы");
-            $("#trashed-orders").html("");
-        }
-
-
-    });
-
-    // Нажимаем на заказ в архмвных заказах
-    $(".messageBlock").on('click','.trashedOrderBlock',function(){
-        $("#chat-order-add").css("display", "none");
-        $('.order-block, .trashedOrderBlock').each(function () {
-            $(this).removeClass('orAct');
-        });
-        $(this).addClass('orAct');
-        var inbox = document.getElementById('message-chat-order-space');
-        var docList = document.getElementById('documentOrderSpace');
-        inbox.innerHTML = '';
-        docList.innerHTML = '';
-        var orderId = $(this).attr('data-id');
-        location.hash = '#order' + orderId;
-
-        $.ajax({
-            url: '/api/message',
-            type: 'GET',
-            data: {csrfmiddlewaretoken: csrftoken, 'order': orderId, 'team__isnull': 'true'},
-            dataType: 'json',
-            success: function (json) {
-                $.each(json.results, function (i, v) {
-                    var senderName = 'Вы';
-                    var className = 'youChat';
-
-                    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>';
-
-                });
-                var height = inbox.scrollHeight;
-                inbox.scrollTop = height;
-            }
-        });
-
-        $("#order-stages").html("");
-        $("#completeWork").hide();
-        $("#add-form-order-note").hide();
-        $("#reserveSpace").hide();
-    });
 
 // Для заказов все вытащить
     $('.order-block').on('click', function () {
+        var newCount = parseInt($("#count-tab-order").text());
         $("#chat-order-add").css("display", "block");
         $("#add-form-order-note").css("display", "block");
         $("#formsetStage").css("display", "block");
@@ -516,12 +448,22 @@ $(function () {
         var recipentId = $(this).attr('data-recipent-id');
         var secureOrder = $(this).attr('data-secure-deal');
         secureOrder = Boolean(secureOrder);
+
+        var teamCurrentId = parseInt($(this).attr('data-team-id'));
+
+        if (teamCurrentId>0){
+            $("#targetTeamId").val(teamCurrentId);
+            $("#targetContractorId").val("");
+        }else {
+            $("#targetTeamId").val("")
+            $("#targetContractorId").val(recipentId);
+        }
         $("#chat-order-add #orderId").val(orderId);
         $("#add-form-order-note #orderNote").val(orderId);
         $("#orderArbitrationId").val(orderId);
         $("#projectReviewId").val(projectId);
         $("#reserve-button").attr('data-order-id', orderId);
-        $("#targetContractorId").val(recipentId);
+
         $("#chat-order-add #recipentId").val(recipentId);
         $("#add-form-order-note #recipentNote").val(recipentId);
         $(".orderStagesInput").val(orderId);

chat/chat.py

@@ -30,6 +30,7 @@ class ChatHandler(websocket.WebSocketHandler):
     # @gen.coroutine
     def on_message(self, message):
         parsed = escape.json_decode(message)
+        print(parsed)
 
         if 'dummy' in parsed:
             return

chat/templates/chat_contractor.html

@@ -17,15 +17,15 @@
                         <ul class="nav nav-tabs nav-justified">
 
                             <li role="presentation">
-                                <a href="#tab1" data-toggle="tab">Личные<span class="count-tab">{{ contacts_users_count }}</span></a>
+                                <a href="#tab1" data-toggle="tab">Личные<span class="count-tab" id="count-tab-contact">{{ contacts_users_count }}</span></a>
                             </li>
 
                             <li role="presentation">
-                                <a href="#tab2" data-toggle="tab">Заказчики<span class="count-tab">{{ orders_ms_count }}</span></a>
+                                <a href="#tab2" data-toggle="tab">Заказчики<span class="count-tab" id="count-tab-order">{{ orders_ms_count }}</span></a>
                             </li>
 
                             <li role="presentation">
-                                <a href="#tab3" data-toggle="tab">Исполнители,Группы<span class="count-tab">{{ teams_ms_count }}</span></a>
+                                <a href="#tab3" data-toggle="tab">Исполнители,Группы<span class="count-tab" id="count-tab-team">{{ teams_ms_count }}</span></a>
                             </li>
 
                         </ul>
@@ -123,7 +123,7 @@
                             <p>Заказы</p>
                             {% for order in orders %}
                                 <div class="orderBlock box-sizing order-block" data-project-id="{{ order.project.id }}"
-                                    id="orderBlock{{ order.id }}" data-recipent-id="{{ order.project.customer.pk }}" data-id="{{ order.id }}">
+                                    id="orderBlock{{ order.id }}" data-team-id="{% if order.team %}{{ order.team.pk }}{% else %}0{% endif %}" data-recipent-id="{{ order.project.customer.pk }}" data-id="{{ order.id }}">
                                     <span class="dimovChat"></span>
                                     <p class="titleOB">{{ order }}</p>
                                     <div class="hideOBB">
@@ -136,6 +136,39 @@
                                     </div>
                                 </div>
                             {% endfor %}
+
+
+                            {% if archive_orders %}
+                                <div class="textAreaBlock2 FFD box-sizing disTab">
+                                <a href="#" data-show="true" id="trashed-button">Показать архивные заказы</a>
+                                </div>
+                                <p id="show-archive-label" style="display: none;">Архивные заказы</p>
+                                <div id="archive-space" style="display:none;">
+
+                                <div id="trashed-orders">
+                                    {% for order in archive_orders %}
+                                        <div data-id="{{ order.id }}" class="trashedOrderBlock box-sizing">
+                                            <span class="dimovChat"></span>
+                                            <p class="titleOB"> {{ order.project.name }}</p>
+                                            <div class="hideOBB"><p class="pOB">
+                                                <span>Исполнитель:
+                                                    {% if order.contractor %}
+                                                        {{ order.contractor.get_full_name }}
+                                                    {% else %}
+                                                        {{ order.team.name }}
+                                                    {% endif %}
+                                                </span>
+                                            </p>
+                                                <a href="#" class="linkChat11 full-order-info">
+                                                    <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
+                                                    Полное описание заказа
+                                                </a>
+                                            </div>
+                                        </div>
+                                    {% endfor %}
+                                </div>
+                                </div>
+                            {% endif %}
                         </div>
 
                     </div>

chat/templates/chat_customer.html

@@ -15,10 +15,12 @@
                     <div class="profileTabs2">
                         <ul class="nav nav-tabs nav-justified">
                             <li role="presentation">
-                                <a href="#tab1" data-toggle="tab">Личные<span class="count-tab">{{ contacts_users_count }}</span></a>
+                                <a href="#tab1" data-toggle="tab">Личные<span
+                                        class="count-tab" id="count-tab-contact">{{ contacts_users_count }}</span></a>
                             </li>
                             <li role="presentation">
-                                <a href="#tab2" data-toggle="tab">Исполнители<span class="count-tab">{{ orders_ms_count }}</span>
+                                <a href="#tab2" data-toggle="tab">Исполнители<span
+                                        class="count-tab" id="count-tab-order">{{ orders_ms_count }}</span>
                                 </a>
                             </li>
                         </ul>
@@ -33,7 +35,8 @@
                         <div class="messageBlock box-sizing disTab">
                             <p>Контакты</p>
                             {% for contact in contacts_users %}
-                                <div class="message messd user-block" id="userBlock{{ contact.pk }}" data-id="{{ contact.pk }}">
+                                <div class="message messd user-block" id="userBlock{{ contact.pk }}"
+                                     data-id="{{ contact.pk }}">
                                     <div class="imgMess">
                                         {% if contact.avatar %}
                                             {% thumbnail contact.avatar "60x60" crop="center" as im %}
@@ -71,7 +74,8 @@
                             <input type="hidden" value="{{ request.user.pk }}" name="senderId" id="senderContactId"/>
                             <input type="hidden" name="recipentId" id="recipentContactId">
                             <textarea id="chat" name="chat_message" class="box-sizing"></textarea>
-                            <p class="errorEmptyMessage" style="color: red;display:none;">Пустое сообщение нельзя отправить</p>
+                            <p class="errorEmptyMessage" style="color: red;display:none;">Пустое сообщение нельзя
+                                отправить</p>
 
                             <div class="bunChat">
                                 <div class="setChat box-sizing upload">
@@ -101,7 +105,8 @@
                             </ul>
                             <form id="add-form-contractor-note">
                                 <p>Для заметок</p>
-                             <input type="hidden" name="sender" id="senderNoteContractor" value="{{ request.user.pk }}"/>
+                                <input type="hidden" name="sender" id="senderNoteContractor"
+                                       value="{{ request.user.pk }}"/>
                                 <input type="hidden" name="recipent" id="recipentNoteContractor" value=""/>
                                 <textarea id="chat2" name="text"></textarea>
                                 <a href="#" id="add-note-contractor">сохранить</a>
@@ -121,8 +126,11 @@
                         <div class="messageBlock box-sizing disTab">
                             <p>Заказы</p>
                             {% for order in orders %}
-                                <div class="orderBlock box-sizing order-block" data-project-id="{{ order.id }}"
+                                <div class="orderBlock box-sizing order-block"
-                                     id="orderBlock{{ order.order.id }}" data-secure-deal="{% if order.order.secure %}true{% else %}false{% endif %}"
+                                     data-team-id="{% if order.order.team %}{{ order.order.team.pk }}{% else %}0{% endif %}"
+                                     data-project-id="{{ order.id }}"
+                                     id="orderBlock{{ order.order.id }}"
+                                     data-secure-deal="{% if order.order.secure %}true{% else %}false{% endif %}"
                                         {% if order.order.contractor %}
                                      data-recipent-id="{{ order.order.contractor.pk }}"
                                         {% else %}
@@ -151,13 +159,39 @@
                                 </div>
                             {% endfor %}
 
+
+
+                            {% if archive_projects %}
                                 <div class="textAreaBlock2 FFD box-sizing disTab">
                                 <a href="#" data-show="true" id="trashed-button">Показать архивные заказы</a>
                                 </div>
+                                <p id="show-archive-label" style="display: none;">Архивные заказы</p>
+                                <div id="archive-space" style="display:none;">
 
-                           <p id="show-archive-label">Архивные заказы</p>
+                                <div id="trashed-orders">
-                           <div id="trashed-orders"></div>
+                                    {% for proj in archive_projects %}
-
+                                        <div data-id="{{ proj.order.id }}" class="trashedOrderBlock box-sizing">
+                                            <span class="dimovChat"></span>
+                                            <p class="titleOB"> {{ proj.name }}</p>
+                                            <div class="hideOBB"><p class="pOB">
+                                                <span>Исполнитель:
+                                                    {% if proj.order.contractor %}
+                                                        {{ proj.order.contractor.get_full_name }}
+                                                    {% else %}
+                                                        {{ proj.order.team.name }}
+                                                    {% endif %}
+                                                </span>
+                                            </p>
+                                                <a href="#" class="linkChat11 full-order-info">
+                                                    <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
+                                                    Полное описание заказа
+                                                </a>
+                                            </div>
+                                        </div>
+                                    {% endfor %}
+                                </div>
+                                </div>
+                            {% endif %}
                         </div>
                     </div>
                     <div class="col-lg-6 commChat">
@@ -167,7 +201,8 @@
                             <input type="hidden" name="recipentId" id="recipentId">
                             <input type="hidden" name="orderId" id="orderId">
                             <textarea id="chat" class="box-sizing"></textarea>
-                            <p class="errorEmptyMessage" style="color: red;display:none;">Пустое сообщение нельзя отправить</p>
+                            <p class="errorEmptyMessage" style="color: red;display:none;">Пустое сообщение нельзя
+                                отправить</p>
                             <div class="bunChat">
                                 <div class="setChat box-sizing upload">
                                     <input type="file" name="file" id="upload-document-order">

chat/templates/reverse_stage_modal.html

@@ -37,7 +37,7 @@
                     </div>
 
                     <div class="col-lg-6">
-                        <select class="selectpicker -project-work-type-select-field" id="stagesSelect">
+                        <select id="stagesSelect">
                         </select>
                     </div>
                 </div>

chat/templates/review_add_modal.html

@@ -13,13 +13,13 @@
                     <div style="height: 250px;">
 {#                         <div class="searchF1 polsF1 polsFF radio-afer">#}
                         <div>
-                            <input type="radio" value="positive"
+                            <input style="opacity: 1;" type="radio" value="positive"
                                    name="type">Положительный
 
-                            <input type="radio" value="negative"
+                            <input style="opacity: 1;" type="radio" value="negative"
                                    name="type">Отрицательный
 
-                            <input type="radio" value="neutral"
+                            <input style="opacity: 1;" type="radio" value="neutral"
                                    name="type">Нейтральный
                         </div>
 
@@ -27,19 +27,19 @@
                              <p>Ваш отзыв</p>
                             <textarea id="text-new" name="text"></textarea>
                             {% if request.user.is_customer %}
-                                <input type="hidden" name="from_customer" value="{{ request.user.pk }}"/>
+                                <input type="hidden" name="from_customer" value="{{ request.user.pk }}">
                                 <input type="hidden" name="from_contractor">
                                 <input type="hidden" name="from_team">
-                                <input type="hidden" name="target_contractor" id="targetContractorId"/>
+                                <input type="hidden" name="target_contractor" id="targetContractorId">
                                 <input type="hidden" name="target_customer">
-                                <input type="hidden" name="target_team">
+                                <input type="hidden" name="target_team" id="targetTeamId">
                             {% else %}
-                                <input type="hidden" name="from_customer"/>
+                                <input type="hidden" name="from_customer">
-                                <input type="hidden" name="from_contractor" value="{{ request.user.pk }}">
+                                <input type="hidden" name="from_contractor" id="fromContractorId">
                                 <input type="hidden" name="target_customer" id="targetCustomerId">
                                 <input type="hidden" name="target_contractor">
                                 <input type="hidden" name="target_team">
-                                <input type="hidden" name="from_team">
+                                <input type="hidden" name="from_team" id="fromTeamId">
                             {% endif %}
                             <input type="hidden" name="project" id="projectReviewId"/>
                         </div>

chat/views.py

@@ -55,7 +55,7 @@ class ChatUserView(LoginRequiredMixin, View):
                 users_ids.append(int(user_id))
 
             contacts_users = User.objects.filter(pk__in=users_ids)
-
+            archive_projects = request.user.customer_projects.select_related('order').exclude(state='active')
             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)
             order_ids = [order.order.pk for order in orders]
@@ -72,6 +72,7 @@ class ChatUserView(LoginRequiredMixin, View):
                                                         'chat_messages': chat_messages,
                                                         'contacts_users_count': contacts_users_count,
                                                         'orders_ms_count': orders_ms_count,
+                                                        'archive_projects': archive_projects,
                                                         'orders': orders,
                                                         'transaction': transaction[0],
                                                         'YANDEX_MONEY': settings.YANDEX_MONEY,
@@ -86,7 +87,8 @@ class ChatUserView(LoginRequiredMixin, View):
                 teams = Team.objects.filter(contractors__id=request.user.pk).all()
                 team_orders = Order.objects.filter(team_id__in=[team.pk for team in teams]).all()
 
-            orders = Order.objects.filter(Q(contractor=request.user) | Q(team_id__in=team_ids)).filter(project__state='active').all()
+            orders = Order.objects.filter(Q(contractor=request.user) | Q(team_id__in=team_ids)).filter(project__state='active')
+            archive_orders = Order.objects.filter(Q(contractor=request.user) | Q(team_id__in=team_ids)).exclude(project__state='active')
             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)).\
                 filter(is_delete=False).distinct()
@@ -113,7 +115,6 @@ class ChatUserView(LoginRequiredMixin, View):
             orders_ms_count = request.user.new_messages.filter(message__order__in=orders, message__team__isnull=True).count()
             teams_ms_count = request.user.new_messages.filter(message__team__in=your_teams, message__order__isnull=True).count()
 
-
             self.template_name = 'chat_contractor.html'
             return render(request, self.template_name, {'orders': orders,
                                                         'contacts_users': contacts_users,
@@ -123,7 +124,7 @@ class ChatUserView(LoginRequiredMixin, View):
                                                         'chat_messages': chat_messages,
                                                         'team_orders': team_orders,
                                                         'your_teams': your_teams,
-
+                                                        'archive_orders': archive_orders,
                                                         })
 
 

reviews/serializers.py

@@ -1,15 +1,18 @@
 from rest_framework.serializers import ModelSerializer
+from rest_framework import serializers
 
 from .models import Review
 from users.serializers import UserSerializer, TeamSerializer
 
 
 class ReviewSerializer(ModelSerializer):
+    target_user = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = Review
 
         fields = (
+            'id',
             'text',
             'type',
             'created',
@@ -20,5 +23,14 @@ class ReviewSerializer(ModelSerializer):
             'target_customer',
             'target_contractor',
             'target_team',
+            'target_user',
         )
 
+    def get_target_user(self, obj):
+        if obj.target_customer:
+            return obj.target_customer.pk
+        elif obj.target_contractor:
+            return obj.target_contractor.pk
+        elif obj.target_team:
+            return obj.target_team.owner.pk
+

users/templatetags/user_tags.py

@@ -68,3 +68,18 @@ def get_new_count_for_contact(contact, current_user):
     return count
 
 
+@register.simple_tag
+def get_new_count_for_order(current_user, order_id):
+    count = current_user.new_messages.filter(message__order=order_id, message__team__isnull=True).count()
+    return count
+
+
+@register.simple_tag
+def get_new_count_for_team(current_user, team_id, order_id=None):
+    if order_id:
+        count = current_user.new_messages.filter(message__order=order_id, message__team=team_id).count()
+    else:
+        count = current_user.new_messages.filter(message__order__isnull=True, message__team=team_id).count()
+    return count
+
+