From a74c7e131f922fa4192cba46f2eac43b31c497f5 Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Fri, 5 Aug 2016 17:16:31 +0300 Subject: [PATCH 1/9] #ARC-10 Add managements command and template tags for contractor --- chat/templates/chat.js | 1366 ++++++++--------- chat/templates/chat_customer.html | 5 - ratings/__init__.py | 1 + .../management}/__init__.py | 0 ratings/management/commands/__init__.py | 0 .../management/commands/recalculation_spec.py | 23 + ratings/models.py | 5 +- .../templatetags/specializations_widget.html | 9 + ratings/templatetags/__init__.py | 0 .../templatetags/specializtions_tags.py | 9 +- .../templatetags/specializations_widget.html | 21 - users/templates/contractor_profile.html | 12 - 12 files changed, 721 insertions(+), 730 deletions(-) rename {specializations/templatetags => ratings/management}/__init__.py (100%) create mode 100644 ratings/management/commands/__init__.py create mode 100644 ratings/management/commands/recalculation_spec.py create mode 100644 ratings/templates/templatetags/specializations_widget.html create mode 100644 ratings/templatetags/__init__.py rename {specializations => ratings}/templatetags/specializtions_tags.py (69%) delete mode 100644 specializations/templates/templatetags/specializations_widget.html diff --git a/chat/templates/chat.js b/chat/templates/chat.js index f40e51a..1afb936 100644 --- a/chat/templates/chat.js +++ b/chat/templates/chat.js @@ -1,683 +1,683 @@ - // - // function csrfSafeMethod(method) { - // // these HTTP methods do not require CSRF protection - // return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method)); - // } - // - // var SocketHandler = function () { - // var userId = {{ request.user.pk }}; - // var url = 'ws://127.0.0.1:8888/chat/' + userId + '/'; - // var sock = new WebSocket(url); - // var intervalId; - // sock.onopen = function () { - // console.log("Start connect"); - // intervalId = setInterval(function () { - // sock.send('{"dummy": 1}'); - // }, 150000); - // }; - // sock.onmessage = function (event) { - // console.log(event.data); - // var message = JSON.parse(event.data); - // var inbox; - // - // if (message.answer_type == 'contact' || message.answer_type == 'add_message_contact') { - // inbox = document.getElementById('message-chat-space'); - // } else if (message.answer_type == 'order' || message.answer_type == 'add_message_order') { - // inbox = document.getElementById('message-chat-order-space'); - // } else if(message.answer_type == 'add_message_team'){ - // inbox = document.getElementById('message-chat-team-space'); - // } - // console.log(message.answer_type); - // console.log(message.msg); - // - // inbox.innerHTML += '
' + - // '

ВЫ

13.0.2016
' + - // '

' + message.msg + '

'; - // }; - // - // this.send_contact_message = function (userId) { - // var data = { - // "format_type": "add_message", - // "user_id": userId - // } - // sock.send(JSON.stringify(data)); - // console.log(data); - // }; - // - // this.add_team_message = function(messageData){ - // - // console.log(messageData); - // sock.send(JSON.stringify(messageData)); - // } - // - // this.add_contact_message = function (messageData) { - // console.log(messageData); - // sock.send(JSON.stringify(messageData)); - // }; - // - // this.send_message = function (form) { - // var elements = form.elements; - // var data = {}; - // var i = 0; - // for (var i; i < elements.length; i++) { - // if (elements[i].name == 'message') { - // data[elements[i].name] = elements[i].value; - // } - // } - // sock.send(JSON.stringify(data)); - // var textareaMessage = document.getElementById("message"); - // textareaMessage.value = ""; - // } - // - // } - // - // $(function () { - // var currentChatUser = {{ request.user.pk }}; - // var socket = new SocketHandler(); - // var form = document.getElementById('message_form'); - // var csrftoken = getCookie('csrftoken'); - // - // setTimeout(function(){ - // $(".user-block").first().trigger('click'); - // }, 10); - // - // setTimeout(function(){ - // $(".order-block").first().trigger('click'); - // }, 100); - // - // setTimeout(function(){ - // $(".team-order-block").first().trigger('click'); - // }, 1000); - // - // - // var url = '/work_sell/basic/'; - // $('#upload-document-team').fileupload({ - // url: url, - // crossDomain: false, - // beforeSend: function (xhr, settings) { - // $('#progress .progress-bar').css( - // 'width', - // '0%' - // ); - // if (!csrfSafeMethod(settings.type)) { - // xhr.setRequestHeader("X-CSRFToken", csrftoken); - // } - // }, - // dataType: 'json', - // done: function (e, data) {; - // $.each(data.result.files, function (index, file) { - // var currentValue = $("#documentSendIds").val(); - // currentValue += file.id + ';'; - // $("#documentSendIds").val(currentValue); - // var htmlImg = '

'+ file.name+'

'; - // var document_send = $(htmlImg).appendTo("#document-send"); - // }); - // }, - // progressall: function (e, data) { - // var progress = parseInt(data.loaded / data.total * 100, 10); - // $('#progress .progress-bar').css( - // 'width', - // progress + '%' - // ); - // } - // }).prop('disabled', !$.support.fileInput) - // .parent().addClass($.support.fileInput ? undefined : 'disabled'); - // - // - // $("#approve-stages").on('click', function(){ - // $(".stage-block-approve").each(function(){ - // var stageId = $(this).attr('data-id'); - // }); - // }); - // - // $(".team-chat-user").on('click',function(e){ - // e.stopPropagation(); - // var recipentId = $(this).attr('data-id'); - // $("#team-chat-form #recipentId").val(recipentId); - // }); - // - // $(".team-order-block").on('click', function(){ - // - // $('.team-order-block').each(function () { - // $(this).removeClass('orAct'); - // }); - // $(this).addClass('orAct'); - // - // var teamId = $(this).attr('data-team-id'); - // var orderId = $(this).attr('data-order-id'); - // $("#team-chat-form #teamId").val(teamId); - // $("#team-chat-form #orderId").val(orderId); - // - // var inbox = document.getElementById('message-chat-team-space'); - // inbox.innerHTML = ''; - // - // $.ajax({ - // url: '/api/message', - // type: 'GET', - // data: {csrfmiddlewaretoken: csrftoken, 'team': teamId,'order': orderId}, - // dataType: 'json', - // success: function (json) { - // $.each(json.results, function (i, v) { - // var senderName = 'Вы'; - // var className = 'youChat'; - // if (v.sender.id !== currentChatUser) { - // senderName = v.sender.username; - // className = ''; - // } - // inbox.innerHTML += '
' + - // '

' + senderName + '

' + v.created + '
' + - // '

' + v.text + '

'; - // }); - // } - // }); - // - // }); - // - // // Вытащить сообщения для чата заказа - // $('.order-block').on('click', function () { - // $('.order-block').each(function () { - // $(this).removeClass('orAct'); - // }); - // $(this).addClass('orAct'); - // - // var orderId = $(this).attr('data-id'); - // var recipentId = $(this).attr('data-recipent-id'); - // $("#chat-contractor-order #orderId").val(orderId); - // $("#add-form-order-note #orderNote").val(orderId); - // - // $("#chat-contractor-order #recipentOrderId").val(recipentId); - // $("#add-form-order-note #recipentNote").val(recipentId); - // - // var inbox = document.getElementById('message-chat-order-space'); - // inbox.innerHTML = ''; - // - // $.ajax({ - // url: '/api/message', - // type: 'GET', - // data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, - // dataType: 'json', - // success: function (json) { - // $.each(json.results, function (i, v) { - // var senderName = 'Вы'; - // var className = 'youChat'; - // if (v.sender.id !== currentChatUser) { - // senderName = v.sender.username; - // className = ''; - // } - // inbox.innerHTML += '
' + - // '

' + senderName + '

' + v.created + '
' + - // '

' + v.text + '

'; - // }); - // } - // }); - // - // $.ajax({ - // url: '/api/note/', - // type: 'GET', - // data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, - // dataType: 'json', - // success: function (json) { - // console.log(json.results); - // var noteHtmlInbox = ''; - // $.each(json.results, function (i, v) { - // noteHtmlInbox += '
  • '+ v.text +'
  • '; - // - // }); - // $(".notes-block").html(noteHtmlInbox); - // } - // }); - // - // $.ajax({ - // url: '/api/stages/', - // type: 'GET', - // data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, - // dataType: 'json', - // success: function (json) { - // console.log(json.results); - // var htmlInbox = ""; - // var stagesReservedHtml = ""; - // if (json.results.length > 0) { - // - // $.each(json.results, function (i, v) { - // if(v.is_paid){ - // stagesReservedHtml += '
  • Сумма за этап '+ i +'.Зарезервирована.
    • '; - // }else{ - // stagesReservedHtml += '
  • Сумма за этап '+ i +'.Не зарезервирована.
    • '; - // } - // htmlInbox += '
    ' + - // '

    Этап ' + v.pos + '' + v.name + '

    ' + - // '

    Результаты этапа:' + v.result + '

    ' + - // '

    '+ v.status+'

    ' + v.cost + '
    '; - // }); - // htmlInbox += '
    согласовать
    '; - // - // } - // $("#order-stages").html(htmlInbox); - // $(".stages-paid").html(stagesReservedHtml); - // - // } - // }); - // - // }); - // - // $('#add-note-button').on('click', function(){ - // $.ajax({ - // url: '/api/note/', - // type: 'POST', - // beforeSend: function (xhr) { - // xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken')) - // }, - // data:$("#add-form-order-note").serialize(), - // dataType: 'json', - // success: function (json) { - // console.log(json); - // $("#add-form-order-note #chat2").val(""); - // - // }, - // error: function(e){ - // console.log('error'); - // console.log(e); - // } - // }); - // }); - // - // // Вытащить сообщения для конактов - // $('.user-block').on('click', function () { - // var userId = $(this).attr('data-id'); - // $("#contact-chat-form #recipentId").val(userId); - // var inbox = document.getElementById('message-chat-space'); - // inbox.innerHTML = ''; - // $.ajax({ - // url: '/api/message', - // type: 'GET', - // data: { - // csrfmiddlewaretoken: csrftoken, - // 'operand': 'in', - // 'sender_id': currentChatUser, - // 'recipent_id': userId - // }, - // dataType: 'json', - // success: function (json) { - // $.each(json.results, function (i, v) { - // console.log(v.sender.id); - // var senderName = 'Вы'; - // var className = 'youChat'; - // if (v.sender.id == userId) { - // senderName = v.sender.username; - // className = ''; - // } - // inbox.innerHTML += '
    ' + - // '

    ' + senderName + '

    ' + v.created + '
    ' + - // '

    ' + v.text + '

    '; - // }); - // } - // }); - // - // }); - // - // //Добавить сообщение для исполнителей в группе - // $("#add-team-chat-message").on('click', function(){ - // var chatMessage = $("#team-chat-form #chatText").val(); - // var recipentId = $("#team-chat-form #recipentId").val(); - // var senderId = $("#team-chat-form #senderId").val(); - // var teamId = $("#team-chat-form #teamId").val(); - // var orderId = $("#team-chat-form #orderId").val(); - // - // var documentSendIds = $("#documentSendIds").val(); - // console.log(documentSendIds); - // var teamDocumentIds = documentSendIds.split(';'); - // teamDocumentIds.pop(); - // console.log(teamDocumentIds); - // socket.add_team_message({ - // "format_type": "add_message_team", - // "data": { - // "sender_id": senderId, - // "recipent_id": recipentId, - // "chat_message": chatMessage, - // "team_id": teamId, - // "order_id": orderId, - // } - // }); - // - // - // - // $("#team-chat-form #chatText").val(""); - // }); - // - // // Добавить сообщение для контакта - // $('#contact-chat-add-message').on('click', function () { - // var chatMessage = $("#chat").val(); - // var recipentId = $("#recipentId").val(); - // var senderId = $("#senderId").val(); - // - // socket.add_contact_message({ - // "format_type": "add_message_contact", - // "data": { - // "sender_id": senderId, - // "recipent_id": recipentId, - // "chat_message": chatMessage, - // } - // }); - // - // var inbox = $('#message-chat-space').html(); - // $('#message-chat-space').html(inbox + '
    ' + - // '

    Вы

    Сейчас
    ' + - // '

    ' + chatMessage + '

    '); - // - // $("#chat").val(""); - // }); - // - // $('#order-chat-add-message').on('click', function () { - // var chatMessage = $("#chat-contractor-order #chat").val(); - // var recipentId = $("#chat-contractor-order #recipentOrderId").val(); - // var senderId = $("#chat-contractor-order #senderOrderId").val(); - // var orderId = $("#chat-contractor-order #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-contractor-order #chat").val(""); - // - // }); - // - // }); - // - // - //$(function () { - // var currentChatUser = {{ request.user.pk }}; - // var socket = new SocketHandler(); - // var form = document.getElementById('message_form'); - // var csrftoken = getCookie('csrftoken'); - // setTimeout(function(){ - // $(".user-block").first().trigger('click'); - // }, 10); - // - // setTimeout(function(){ - // $(".order-block").first().trigger('click'); - // }, 100); - // - // $("#order-stages").on('click', "#addStagesForm", function(){ - // $(".new-stages-form").each(function(i,v){ - // console.log($(this).serialize()); - // alert($(this).serialize()); - // - // $.ajax({ - // url: '/api/stages/', - // type: 'POST', - // beforeSend: function (xhr) { - // xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken')) - // }, - // data:$(this).serialize(), - // dataType: 'json', - // success: function (json) { - // console.log(json); - // }, - // error: function(e){ - // console.log('error'); - // console.log(e); - // } - // }); - // - // }); - // }); - // - // $('#order-stages-tab').on('change', '#countStage', function(){ - // var countStage = parseInt($(this).val()); - // var updateFormStages = $(".update-stages-form"); - // - // alert(updateFormStages.length); - // alert(typeof updateFormStages.length); - // var limitCount = countStage + 1; - // for (var i = 2; i < limitCount; i++) { - // var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form"); - // $("#stage1").after(stageCopy); - // } - // }); - // - // $('.order-block').on('click', function () { - // $("#chat-order-add").css("display", "block"); - // $("#formsetStage").css("display","block"); - // - // $('.order-block').each(function () { - // $(this).removeClass('orAct'); - // }); - // - // $(this).addClass('orAct'); - // var orderId = $(this).attr('data-id'); - // var recipentId = $(this).attr('data-recipent-id'); - // $("#chat-order-add #orderId").val(orderId); - // $("#chat-order-add #recipentId").val(recipentId); - // $(".orderStagesInput").val(orderId); - // var inbox = document.getElementById('message-chat-order-space'); - // inbox.innerHTML = ''; - // $.ajax({ - // url: '/api/message', - // type: 'GET', - // data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, - // dataType: 'json', - // success: function (json) { - // $.each(json.results, function (i, v) { - // var senderName = 'Вы'; - // var className = 'youChat'; - // - // if (v.sender.id !== currentChatUser) { - // senderName = v.sender.username; - // className = ''; - // } - // - // inbox.innerHTML += '
    ' + - // '

    ' + senderName + '

    ' + v.created + '
    ' + - // '

    ' + v.text + '

    '; - // }); - // } - // }); - // - // $.ajax({ - // url: '/api/stages/', - // type: 'GET', - // data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, - // dataType: 'json', - // success: function (json) { - // var stageCount = json.results.length; - // if (stageCount == 0){ - // stageCountVal = 1; - // }else{ - // stageCountVal = stageCount; - // } - // - // var htmlInbox = ""; - // - // var htmlInboxStage = '

    Какое кол-во этапов подразумевает работа? ' + - // '

    '; - // - // if (stageCount == 0){ - // htmlInboxStage += '
    ' + - // '

    Этап 1

    ' + - // '' + - // '' + - // ' />' + - // '' + - // '' + - // '
    '; - // } - // var statusNotAgreed = true; - // $.each(json.results, function (i, v) { - // if (v.status == "not_agreed") { - // htmlInbox += '
    ' + - // '

    Этап

    ' + - // '' + - // '' + - // '' + - // '' + - // '' + - // '
    '; - // } else { - // statusNotAgreed = false; - // htmlInboxStage = ""; - // htmlInbox += '
    ' + - // '

    Этап ' + v.pos + '' + v.name + '

    ' + - // '

    Результаты этапа:' + v.result + '

    ' + - // '

    до 16.03.2015

    ' + v.cost + '
    '; - // - // } - // }); - // - // if (statusNotAgreed) { - // htmlInbox += '
    Перейти в режим безопасной сделки' + - // '
    ' + - // 'отправить на согласование
    '; - // } - // htmlInbox = htmlInboxStage + htmlInbox; - // $("#order-stages").html(htmlInbox); - // } - // }); - // - // - // }); - // - // // Вытащить сообщения для конактов - // $('.user-block').on('click', function () { - // var userId = $(this).attr('data-id'); - // $("#contact-chat-form #recipentId").val(userId); - // var inbox = document.getElementById('message-chat-space'); - // inbox.innerHTML = ''; - // $.ajax({ - // url: '/api/message', - // type: 'GET', - // data: { - // csrfmiddlewaretoken: csrftoken, - // 'operand': 'in', - // 'sender_id': currentChatUser, - // 'recipent_id': userId - // }, - // 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 += '
    ' + - // '

    ' + senderName + '

    ' + v.created + '
    ' + - // '

    ' + v.text + '

    '; - // }); - // } - // }); - // - // }); - // - // $('#contact-chat-add-message').on('click', function () { - // var chatMessage = $("#chat").val(); - // var recipentId = $("#recipentId").val(); - // var senderId = $("#senderId").val(); - // - // socket.add_contact_message({ - // "format_type": "add_message_contact", - // "data": { - // "sender_id": senderId, - // "recipent_id": recipentId, - // "chat_message": chatMessage, - // } - // }); - // - // $("#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 SocketHandler = function () { - // var url = 'ws://127.0.0.1:8888/chat/' + userId + '/'; - // var sock = new WebSocket(url); - // var intervalId; - // sock.onopen = function () { - // console.log("Start connect"); - // intervalId = setInterval(function () { - // sock.send('{"dummy": 1}'); - // }, 150); - // }; - // sock.onmessage = function (event) { - // console.log(event.data); - // var message = JSON.parse(event.data); - // var inbox; - // if (message.answer_type == 'contact') { - // inbox = document.getElementById('message-chat-space'); - // } else if (message.answer_type == 'order' || message.answer_type == 'add_order') { - // inbox = document.getElementById('message-chat-order-space') - // } - // inbox.innerHTML += '
    ' + - // '

    Иванов

    13.0.2016
    ' + - // '

    ' + message.msg + '

    '; - // - // }; - // - // this.send_order_message = function (orderId) { - // var data = { - // "format_type": "order_message", - // "order_id": orderId - // } - // sock.send(JSON.stringify(data)); - // console.log(data); - // }; - // - // this.send_contact_message = function (userId) { - // var data = { - // "format_type": "add_message", - // "user_id": userId - // } - // sock.send(JSON.stringify(data)); - // console.log(data); - // }; - // - // this.add_contact_message = function (messageData) { - // console.log(messageData); - // sock.send(JSON.stringify(messageData)); - // }; - // - // this.send_message = function (form) { - // var elements = form.elements; - // var data = {}; - // var i = 0; - // for (var i; i < elements.length; i++) { - // if (elements[i].name == 'message') { - // data[elements[i].name] = elements[i].value; - // } - // } - // sock.send(JSON.stringify(data)); - // var textareaMessage = document.getElementById("message"); - // textareaMessage.value = ""; - // - // } - // } - // + + function csrfSafeMethod(method) { + // these HTTP methods do not require CSRF protection + return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method)); + } + + var SocketHandler = function () { + var userId = {{ request.user.pk }}; + var url = 'ws://127.0.0.1:8888/chat/' + userId + '/'; + var sock = new WebSocket(url); + var intervalId; + sock.onopen = function () { + console.log("Start connect"); + intervalId = setInterval(function () { + sock.send('{"dummy": 1}'); + }, 150000); + }; + sock.onmessage = function (event) { + console.log(event.data); + var message = JSON.parse(event.data); + var inbox; + + if (message.answer_type == 'contact' || message.answer_type == 'add_message_contact') { + inbox = document.getElementById('message-chat-space'); + } else if (message.answer_type == 'order' || message.answer_type == 'add_message_order') { + inbox = document.getElementById('message-chat-order-space'); + } else if(message.answer_type == 'add_message_team'){ + inbox = document.getElementById('message-chat-team-space'); + } + console.log(message.answer_type); + console.log(message.msg); + + inbox.innerHTML += '
    ' + + '

    ВЫ

    13.0.2016
    ' + + '

    ' + message.msg + '

    '; + }; + + this.send_contact_message = function (userId) { + var data = { + "format_type": "add_message", + "user_id": userId + } + sock.send(JSON.stringify(data)); + console.log(data); + }; + + this.add_team_message = function(messageData){ + + console.log(messageData); + sock.send(JSON.stringify(messageData)); + } + + this.add_contact_message = function (messageData) { + console.log(messageData); + sock.send(JSON.stringify(messageData)); + }; + + this.send_message = function (form) { + var elements = form.elements; + var data = {}; + var i = 0; + for (var i; i < elements.length; i++) { + if (elements[i].name == 'message') { + data[elements[i].name] = elements[i].value; + } + } + sock.send(JSON.stringify(data)); + var textareaMessage = document.getElementById("message"); + textareaMessage.value = ""; + } + + } + + $(function () { + var currentChatUser = {{ request.user.pk }}; + var socket = new SocketHandler(); + var form = document.getElementById('message_form'); + var csrftoken = getCookie('csrftoken'); + + setTimeout(function(){ + $(".user-block").first().trigger('click'); + }, 10); + + setTimeout(function(){ + $(".order-block").first().trigger('click'); + }, 100); + + setTimeout(function(){ + $(".team-order-block").first().trigger('click'); + }, 1000); + + + var url = '/work_sell/basic/'; + $('#upload-document-team').fileupload({ + url: url, + crossDomain: false, + beforeSend: function (xhr, settings) { + $('#progress .progress-bar').css( + 'width', + '0%' + ); + if (!csrfSafeMethod(settings.type)) { + xhr.setRequestHeader("X-CSRFToken", csrftoken); + } + }, + dataType: 'json', + done: function (e, data) {; + $.each(data.result.files, function (index, file) { + var currentValue = $("#documentSendIds").val(); + currentValue += file.id + ';'; + $("#documentSendIds").val(currentValue); + var htmlImg = '

    '+ file.name+'

    '; + var document_send = $(htmlImg).appendTo("#document-send"); + }); + }, + progressall: function (e, data) { + var progress = parseInt(data.loaded / data.total * 100, 10); + $('#progress .progress-bar').css( + 'width', + progress + '%' + ); + } + }).prop('disabled', !$.support.fileInput) + .parent().addClass($.support.fileInput ? undefined : 'disabled'); + + + $("#approve-stages").on('click', function(){ + $(".stage-block-approve").each(function(){ + var stageId = $(this).attr('data-id'); + }); + }); + + $(".team-chat-user").on('click',function(e){ + e.stopPropagation(); + var recipentId = $(this).attr('data-id'); + $("#team-chat-form #recipentId").val(recipentId); + }); + + $(".team-order-block").on('click', function(){ + + $('.team-order-block').each(function () { + $(this).removeClass('orAct'); + }); + $(this).addClass('orAct'); + + var teamId = $(this).attr('data-team-id'); + var orderId = $(this).attr('data-order-id'); + $("#team-chat-form #teamId").val(teamId); + $("#team-chat-form #orderId").val(orderId); + + var inbox = document.getElementById('message-chat-team-space'); + inbox.innerHTML = ''; + + $.ajax({ + url: '/api/message', + type: 'GET', + data: {csrfmiddlewaretoken: csrftoken, 'team': teamId,'order': orderId}, + dataType: 'json', + success: function (json) { + $.each(json.results, function (i, v) { + var senderName = 'Вы'; + var className = 'youChat'; + if (v.sender.id !== currentChatUser) { + senderName = v.sender.username; + className = ''; + } + inbox.innerHTML += '
    ' + + '

    ' + senderName + '

    ' + v.created + '
    ' + + '

    ' + v.text + '

    '; + }); + } + }); + + }); + + // Вытащить сообщения для чата заказа + $('.order-block').on('click', function () { + $('.order-block').each(function () { + $(this).removeClass('orAct'); + }); + $(this).addClass('orAct'); + + var orderId = $(this).attr('data-id'); + var recipentId = $(this).attr('data-recipent-id'); + $("#chat-contractor-order #orderId").val(orderId); + $("#add-form-order-note #orderNote").val(orderId); + + $("#chat-contractor-order #recipentOrderId").val(recipentId); + $("#add-form-order-note #recipentNote").val(recipentId); + + var inbox = document.getElementById('message-chat-order-space'); + inbox.innerHTML = ''; + + $.ajax({ + url: '/api/message', + type: 'GET', + data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, + dataType: 'json', + success: function (json) { + $.each(json.results, function (i, v) { + var senderName = 'Вы'; + var className = 'youChat'; + if (v.sender.id !== currentChatUser) { + senderName = v.sender.username; + className = ''; + } + inbox.innerHTML += '
    ' + + '

    ' + senderName + '

    ' + v.created + '
    ' + + '

    ' + v.text + '

    '; + }); + } + }); + + $.ajax({ + url: '/api/note/', + type: 'GET', + data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, + dataType: 'json', + success: function (json) { + console.log(json.results); + var noteHtmlInbox = ''; + $.each(json.results, function (i, v) { + noteHtmlInbox += '
  • '+ v.text +'
  • '; + + }); + $(".notes-block").html(noteHtmlInbox); + } + }); + + $.ajax({ + url: '/api/stages/', + type: 'GET', + data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, + dataType: 'json', + success: function (json) { + console.log(json.results); + var htmlInbox = ""; + var stagesReservedHtml = ""; + if (json.results.length > 0) { + + $.each(json.results, function (i, v) { + if(v.is_paid){ + stagesReservedHtml += '
  • Сумма за этап '+ i +'.Зарезервирована.
    • '; + }else{ + stagesReservedHtml += '
  • Сумма за этап '+ i +'.Не зарезервирована.
    • '; + } + htmlInbox += '
    ' + + '

    Этап ' + v.pos + '' + v.name + '

    ' + + '

    Результаты этапа:' + v.result + '

    ' + + '

    '+ v.status+'

    ' + v.cost + '
    '; + }); + htmlInbox += '
    согласовать
    '; + + } + $("#order-stages").html(htmlInbox); + $(".stages-paid").html(stagesReservedHtml); + + } + }); + + }); + + $('#add-note-button').on('click', function(){ + $.ajax({ + url: '/api/note/', + type: 'POST', + beforeSend: function (xhr) { + xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken')) + }, + data:$("#add-form-order-note").serialize(), + dataType: 'json', + success: function (json) { + console.log(json); + $("#add-form-order-note #chat2").val(""); + + }, + error: function(e){ + console.log('error'); + console.log(e); + } + }); + }); + + // Вытащить сообщения для конактов + $('.user-block').on('click', function () { + var userId = $(this).attr('data-id'); + $("#contact-chat-form #recipentId").val(userId); + var inbox = document.getElementById('message-chat-space'); + inbox.innerHTML = ''; + $.ajax({ + url: '/api/message', + type: 'GET', + data: { + csrfmiddlewaretoken: csrftoken, + 'operand': 'in', + 'sender_id': currentChatUser, + 'recipent_id': userId + }, + dataType: 'json', + success: function (json) { + $.each(json.results, function (i, v) { + console.log(v.sender.id); + var senderName = 'Вы'; + var className = 'youChat'; + if (v.sender.id == userId) { + senderName = v.sender.username; + className = ''; + } + inbox.innerHTML += '
    ' + + '

    ' + senderName + '

    ' + v.created + '
    ' + + '

    ' + v.text + '

    '; + }); + } + }); + + }); + + //Добавить сообщение для исполнителей в группе + $("#add-team-chat-message").on('click', function(){ + var chatMessage = $("#team-chat-form #chatText").val(); + var recipentId = $("#team-chat-form #recipentId").val(); + var senderId = $("#team-chat-form #senderId").val(); + var teamId = $("#team-chat-form #teamId").val(); + var orderId = $("#team-chat-form #orderId").val(); + + var documentSendIds = $("#documentSendIds").val(); + console.log(documentSendIds); + var teamDocumentIds = documentSendIds.split(';'); + teamDocumentIds.pop(); + console.log(teamDocumentIds); + socket.add_team_message({ + "format_type": "add_message_team", + "data": { + "sender_id": senderId, + "recipent_id": recipentId, + "chat_message": chatMessage, + "team_id": teamId, + "order_id": orderId, + } + }); + + + + $("#team-chat-form #chatText").val(""); + }); + + // Добавить сообщение для контакта + $('#contact-chat-add-message').on('click', function () { + var chatMessage = $("#chat").val(); + var recipentId = $("#recipentId").val(); + var senderId = $("#senderId").val(); + + socket.add_contact_message({ + "format_type": "add_message_contact", + "data": { + "sender_id": senderId, + "recipent_id": recipentId, + "chat_message": chatMessage, + } + }); + + var inbox = $('#message-chat-space').html(); + $('#message-chat-space').html(inbox + '
    ' + + '

    Вы

    Сейчас
    ' + + '

    ' + chatMessage + '

    '); + + $("#chat").val(""); + }); + + $('#order-chat-add-message').on('click', function () { + var chatMessage = $("#chat-contractor-order #chat").val(); + var recipentId = $("#chat-contractor-order #recipentOrderId").val(); + var senderId = $("#chat-contractor-order #senderOrderId").val(); + var orderId = $("#chat-contractor-order #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-contractor-order #chat").val(""); + + }); + + }); + + + $(function () { + var currentChatUser = {{ request.user.pk }}; + var socket = new SocketHandler(); + var form = document.getElementById('message_form'); + var csrftoken = getCookie('csrftoken'); + setTimeout(function(){ + $(".user-block").first().trigger('click'); + }, 10); + + setTimeout(function(){ + $(".order-block").first().trigger('click'); + }, 100); + + $("#order-stages").on('click', "#addStagesForm", function(){ + $(".new-stages-form").each(function(i,v){ + console.log($(this).serialize()); + alert($(this).serialize()); + + $.ajax({ + url: '/api/stages/', + type: 'POST', + beforeSend: function (xhr) { + xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken')) + }, + data:$(this).serialize(), + dataType: 'json', + success: function (json) { + console.log(json); + }, + error: function(e){ + console.log('error'); + console.log(e); + } + }); + + }); + }); + + $('#order-stages-tab').on('change', '#countStage', function(){ + var countStage = parseInt($(this).val()); + var updateFormStages = $(".update-stages-form"); + + alert(updateFormStages.length); + alert(typeof updateFormStages.length); + var limitCount = countStage + 1; + for (var i = 2; i < limitCount; i++) { + var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form"); + $("#stage1").after(stageCopy); + } + }); + + $('.order-block').on('click', function () { + $("#chat-order-add").css("display", "block"); + $("#formsetStage").css("display","block"); + + $('.order-block').each(function () { + $(this).removeClass('orAct'); + }); + + $(this).addClass('orAct'); + var orderId = $(this).attr('data-id'); + var recipentId = $(this).attr('data-recipent-id'); + $("#chat-order-add #orderId").val(orderId); + $("#chat-order-add #recipentId").val(recipentId); + $(".orderStagesInput").val(orderId); + var inbox = document.getElementById('message-chat-order-space'); + inbox.innerHTML = ''; + $.ajax({ + url: '/api/message', + type: 'GET', + data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, + dataType: 'json', + success: function (json) { + $.each(json.results, function (i, v) { + var senderName = 'Вы'; + var className = 'youChat'; + + if (v.sender.id !== currentChatUser) { + senderName = v.sender.username; + className = ''; + } + + inbox.innerHTML += '
    ' + + '

    ' + senderName + '

    ' + v.created + '
    ' + + '

    ' + v.text + '

    '; + }); + } + }); + + $.ajax({ + url: '/api/stages/', + type: 'GET', + data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, + dataType: 'json', + success: function (json) { + var stageCount = json.results.length; + if (stageCount == 0){ + stageCountVal = 1; + }else{ + stageCountVal = stageCount; + } + + var htmlInbox = ""; + + var htmlInboxStage = '

    Какое кол-во этапов подразумевает работа? ' + + '

    '; + + if (stageCount == 0){ + htmlInboxStage += '
    ' + + '

    Этап 1

    ' + + '' + + '' + + ' />' + + '' + + '' + + '
    '; + } + var statusNotAgreed = true; + $.each(json.results, function (i, v) { + if (v.status == "not_agreed") { + htmlInbox += '
    ' + + '

    Этап

    ' + + '' + + '' + + '' + + '' + + '' + + '
    '; + } else { + statusNotAgreed = false; + htmlInboxStage = ""; + htmlInbox += '
    ' + + '

    Этап ' + v.pos + '' + v.name + '

    ' + + '

    Результаты этапа:' + v.result + '

    ' + + '

    до 16.03.2015

    ' + v.cost + '
    '; + + } + }); + + if (statusNotAgreed) { + htmlInbox += '
    Перейти в режим безопасной сделки' + + '
    ' + + 'отправить на согласование
    '; + } + htmlInbox = htmlInboxStage + htmlInbox; + $("#order-stages").html(htmlInbox); + } + }); + + + }); + + // Вытащить сообщения для конактов + $('.user-block').on('click', function () { + var userId = $(this).attr('data-id'); + $("#contact-chat-form #recipentId").val(userId); + var inbox = document.getElementById('message-chat-space'); + inbox.innerHTML = ''; + $.ajax({ + url: '/api/message', + type: 'GET', + data: { + csrfmiddlewaretoken: csrftoken, + 'operand': 'in', + 'sender_id': currentChatUser, + 'recipent_id': userId + }, + 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 += '
    ' + + '

    ' + senderName + '

    ' + v.created + '
    ' + + '

    ' + v.text + '

    '; + }); + } + }); + + }); + + $('#contact-chat-add-message').on('click', function () { + var chatMessage = $("#chat").val(); + var recipentId = $("#recipentId").val(); + var senderId = $("#senderId").val(); + + socket.add_contact_message({ + "format_type": "add_message_contact", + "data": { + "sender_id": senderId, + "recipent_id": recipentId, + "chat_message": chatMessage, + } + }); + + $("#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 SocketHandler = function () { + var url = 'ws://127.0.0.1:8888/chat/' + userId + '/'; + var sock = new WebSocket(url); + var intervalId; + sock.onopen = function () { + console.log("Start connect"); + intervalId = setInterval(function () { + sock.send('{"dummy": 1}'); + }, 150); + }; + sock.onmessage = function (event) { + console.log(event.data); + var message = JSON.parse(event.data); + var inbox; + if (message.answer_type == 'contact') { + inbox = document.getElementById('message-chat-space'); + } else if (message.answer_type == 'order' || message.answer_type == 'add_order') { + inbox = document.getElementById('message-chat-order-space') + } + inbox.innerHTML += '
    ' + + '

    Иванов

    13.0.2016
    ' + + '

    ' + message.msg + '

    '; + + }; + + this.send_order_message = function (orderId) { + var data = { + "format_type": "order_message", + "order_id": orderId + } + sock.send(JSON.stringify(data)); + console.log(data); + }; + + this.send_contact_message = function (userId) { + var data = { + "format_type": "add_message", + "user_id": userId + } + sock.send(JSON.stringify(data)); + console.log(data); + }; + + this.add_contact_message = function (messageData) { + console.log(messageData); + sock.send(JSON.stringify(messageData)); + }; + + this.send_message = function (form) { + var elements = form.elements; + var data = {}; + var i = 0; + for (var i; i < elements.length; i++) { + if (elements[i].name == 'message') { + data[elements[i].name] = elements[i].value; + } + } + sock.send(JSON.stringify(data)); + var textareaMessage = document.getElementById("message"); + textareaMessage.value = ""; + + } + } + diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 296a404..a805400 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -248,7 +248,6 @@ $("#order-stages").on('click', "#addStagesForm", function(){ $(".new-stages-form").each(function(i,v){ console.log($(this).serialize()); - alert($(this).serialize()); $.ajax({ url: '/api/stages/', @@ -273,9 +272,6 @@ $('#order-stages-tab').on('change', '#countStage', function(){ var countStage = parseInt($(this).val()); var updateFormStages = $(".update-stages-form"); - - alert(updateFormStages.length); - alert(typeof updateFormStages.length); var limitCount = countStage + 1; for (var i = 2; i < limitCount; i++) { var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form"); @@ -457,7 +453,6 @@ }); var userId = '{{ request.user.pk }}'; - var SocketHandler = function () { var url = 'ws://127.0.0.1:8888/chat/' + userId + '/'; var sock = new WebSocket(url); diff --git a/ratings/__init__.py b/ratings/__init__.py index e69de29..f9d7f74 100644 --- a/ratings/__init__.py +++ b/ratings/__init__.py @@ -0,0 +1 @@ +default_app_config = 'ratings.apps.RatingsConfig' diff --git a/specializations/templatetags/__init__.py b/ratings/management/__init__.py similarity index 100% rename from specializations/templatetags/__init__.py rename to ratings/management/__init__.py diff --git a/ratings/management/commands/__init__.py b/ratings/management/commands/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ratings/management/commands/recalculation_spec.py b/ratings/management/commands/recalculation_spec.py new file mode 100644 index 0000000..ffe92db --- /dev/null +++ b/ratings/management/commands/recalculation_spec.py @@ -0,0 +1,23 @@ +from django.core.management import BaseCommand +from specializations.models import Specialization +from ratings.models import SpecializationRating +from users.models import User + + +class Command(BaseCommand): + def handle(self, *args, **options): + SpecializationRating.objects.all().delete() + contractors = User.contractor_objects.order_by('-contractor_rating') + specializations = Specialization.objects.all() + for spec in specializations: + i = 0 + for contractor in contractors: + if spec in contractor.contractor_specializations.all(): + i += 1 + spec_rating = SpecializationRating() + spec_rating.position = i + spec_rating.user = contractor + spec_rating.specialization = spec + spec_rating.save() + + print('The End') diff --git a/ratings/models.py b/ratings/models.py index 4db1001..e5dd042 100644 --- a/ratings/models.py +++ b/ratings/models.py @@ -3,6 +3,7 @@ from django.utils import timezone from users.models import User, Team from specializations.models import Specialization + class HistoryRating(models.Model): user = models.ForeignKey(User, related_name='history_ratings', null=True, blank=True) team = models.ForeignKey(Team, related_name='history_ratings', null=True, blank=True) @@ -25,12 +26,10 @@ class SpecializationRating(models.Model): position = models.PositiveIntegerField(default=0) def __str__(self): - return self.position + return '{0}'.format(self.pk) class Meta: verbose_name = 'Рейтинг специализаций' verbose_name_plural = 'Рейтинги специализаций' - - diff --git a/ratings/templates/templatetags/specializations_widget.html b/ratings/templates/templatetags/specializations_widget.html new file mode 100644 index 0000000..c8a1175 --- /dev/null +++ b/ratings/templates/templatetags/specializations_widget.html @@ -0,0 +1,9 @@ +
    +

    Специализации:

    + {% for spec in specializations %} +
    + {{ spec.specialization.name }} + {{ spec.position }}-й +
    + {% endfor %} +
    diff --git a/ratings/templatetags/__init__.py b/ratings/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/specializations/templatetags/specializtions_tags.py b/ratings/templatetags/specializtions_tags.py similarity index 69% rename from specializations/templatetags/specializtions_tags.py rename to ratings/templatetags/specializtions_tags.py index 8f067c9..b54bec1 100644 --- a/specializations/templatetags/specializtions_tags.py +++ b/ratings/templatetags/specializtions_tags.py @@ -2,18 +2,15 @@ from django import template from archilance import util from users.models import User - +from ratings.models import SpecializationRating register = template.Library() @register.inclusion_tag('templatetags/specializations_widget.html', takes_context=True) def specialization_widget(context, user_id): + user_id = int(user_id) - user = util.get_or_none(User, pk=user_id) - if user: - specializations = user.contractor_specializations.all() - else: - specializations = None + specializations = SpecializationRating.objects.select_related('specialization').filter(user_id=user_id) return { 'specializations': specializations, 'user_id': user_id, diff --git a/specializations/templates/templatetags/specializations_widget.html b/specializations/templates/templatetags/specializations_widget.html deleted file mode 100644 index 97aa3e2..0000000 --- a/specializations/templates/templatetags/specializations_widget.html +++ /dev/null @@ -1,21 +0,0 @@ -
    -

    Специализации:

    - {% for spec in specializations %} -
    - {{ spec }} - 2-й -
    - {% endfor %} -
    -{#
    #} -{#

    #} -{# Специализации:#} -{#

    #} -{#
    #} -{# Интерьеры#} -{#
    #} -{# #} -{#
    #} -{# Визуализация/3D#} -{#
    #} -{#
    #} diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index 3788420..2131095 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -28,18 +28,6 @@ -
  • - - редактировать профиль - - -
    • -
  • - - редактировать профиль - - -
    • {% endif %} {% if contractor.pk != user.id %} From 2594d6ccdf08a29bc54a84a5bad04ba7abb140d6 Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Fri, 5 Aug 2016 19:58:00 +0300 Subject: [PATCH 2/9] #ARC-10 add historyraiting --- ratings/management/commands/recalculation_rating.py | 10 ++++++++++ ratings/templatetags/specializtions_tags.py | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 ratings/management/commands/recalculation_rating.py diff --git a/ratings/management/commands/recalculation_rating.py b/ratings/management/commands/recalculation_rating.py new file mode 100644 index 0000000..b1a6e00 --- /dev/null +++ b/ratings/management/commands/recalculation_rating.py @@ -0,0 +1,10 @@ +from django.core.management import BaseCommand +from specializations.models import Specialization +from ratings.models import HistoryRating +from users.models import User + + +class Command(BaseCommand): + def handle(self, *args, **options): + contractors = User.contractor_objects.all() + diff --git a/ratings/templatetags/specializtions_tags.py b/ratings/templatetags/specializtions_tags.py index b54bec1..f446cb7 100644 --- a/ratings/templatetags/specializtions_tags.py +++ b/ratings/templatetags/specializtions_tags.py @@ -8,7 +8,6 @@ register = template.Library() @register.inclusion_tag('templatetags/specializations_widget.html', takes_context=True) def specialization_widget(context, user_id): - user_id = int(user_id) specializations = SpecializationRating.objects.select_related('specialization').filter(user_id=user_id) return { From ed2aabc7869c0f0b57de29e11399cb82c4506f36 Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Sun, 7 Aug 2016 22:04:20 +0300 Subject: [PATCH 3/9] #ARC-10 Update recalculation_spec.py --- ratings/management/commands/recalculation_spec.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ratings/management/commands/recalculation_spec.py b/ratings/management/commands/recalculation_spec.py index ffe92db..d3fcf81 100644 --- a/ratings/management/commands/recalculation_spec.py +++ b/ratings/management/commands/recalculation_spec.py @@ -5,6 +5,7 @@ from users.models import User class Command(BaseCommand): + def handle(self, *args, **options): SpecializationRating.objects.all().delete() contractors = User.contractor_objects.order_by('-contractor_rating') From 2cb80e7f1d3d33e0f21ea0ae926af38dcdd153ab Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Mon, 8 Aug 2016 19:58:28 +0300 Subject: [PATCH 4/9] #ARC-10 Add management for ratings --- archilance/settings/base.py | 2 +- chat/testapp.py | 4 +- chat/views.py | 7 + common/migrations/0004_auto_20160808_1557.py | 29 ++ common/models.py | 2 + projects/forms.py | 9 + projects/templatetags/__init__.py | 0 projects/templatetags/projects_tags.py | 10 - projects/urls.py | 2 + projects/views.py | 24 +- .../commands/recalculation_rating.py | 17 +- .../management/commands/recalculation_spec.py | 41 +- ratings/models.py | 2 +- .../templatetags/ratings_widget.html | 13 - ratings/templatetags/specializtions_tags.py | 25 +- templates/partials/header.html | 37 +- users/admin.py | 11 +- users/migrations/0007_auto_20160808_1557.py | 25 + users/models.py | 3 +- users/templates/contractor_office.html | 465 +++++++++--------- users/templates/contractor_profile.html | 33 +- users/templates/user_profile_edit.html | 4 +- users/templates/worksell_create_form.html | 7 +- users/urls.py | 2 + users/views.py | 17 +- work_sell/forms.py | 10 + work_sell/models.py | 4 + work_sell/templates/worksells_list.html | 8 +- work_sell/urls.py | 2 + work_sell/views.py | 46 +- 30 files changed, 528 insertions(+), 333 deletions(-) create mode 100644 common/migrations/0004_auto_20160808_1557.py delete mode 100644 projects/templatetags/__init__.py delete mode 100644 projects/templatetags/projects_tags.py rename {projects => ratings}/templates/templatetags/ratings_widget.html (52%) create mode 100644 users/migrations/0007_auto_20160808_1557.py diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 9b25660..0600cb5 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -111,7 +111,7 @@ WSGI_APPLICATION = 'archilance.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'archilance', + 'NAME': 'archilance2', 'USER': 'postgres', 'PASSWORD': 'postgres', 'HOST': 'localhost', diff --git a/chat/testapp.py b/chat/testapp.py index 8d245d3..0922d45 100644 --- a/chat/testapp.py +++ b/chat/testapp.py @@ -66,7 +66,7 @@ class ChatHandler(websocket.WebSocketHandler): order_value = "NULL" if order_id is None else order_id insert_sql = "INSERT INTO chat_message (id,text,created, sender_id,recipent_id, private_type,team_id, order_id) " \ - "VALUES (DEFAULT,'{0}',NOW(),{1},{2},{3},{4},{5})".format(message, sender_id, recipent_id, private_type, team_value,order_value) + "VALUES (DEFAULT,'{0}',NOW(),{1},{2},{3},{4},{5})".format(message, sender_id, recipent_id, private_type, team_value,order_value) yield self.db.execute(insert_sql) waiters = tuple(w for c, w in self.waiters if c == recipent_id or c == sender_id) @@ -92,7 +92,7 @@ if __name__ == '__main__': ioloop = IOLoop.instance() application.db = momoko.Pool( - dsn='dbname=archilance user=postgres password=postgres host=localhost', + dsn='dbname=archilance2 user=postgres password=postgres host=localhost', size=1, ioloop=ioloop, ) diff --git a/chat/views.py b/chat/views.py index 6c1d6d5..5c1aba6 100644 --- a/chat/views.py +++ b/chat/views.py @@ -12,6 +12,8 @@ class ChatUserView(View): template_name = '' def get(self, request, *args, **kwargs): + # import code; code.interact(local=dict(globals(), **locals())) + user_id = request.GET.get('user_id',None) if request.user.is_authenticated() and request.user.is_customer(): customer_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() @@ -23,6 +25,9 @@ class ChatUserView(View): users_ids.append(a) if b != request.user.pk: users_ids.append(b) + if user_id: + users_ids.append(int(user_id)) + # import code; code.interact(local=dict(globals(), **locals())) contacts_users = User.objects.filter(pk__in=users_ids) chat_messages = Message.objects.filter(Q(sender=request.user.pk) | Q(recipent=request.user.pk)) @@ -42,6 +47,8 @@ class ChatUserView(View): users_ids.append(a) if b != request.user.pk: users_ids.append(b) + if user_id: + users_ids.append(int(user_id)) 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') diff --git a/common/migrations/0004_auto_20160808_1557.py b/common/migrations/0004_auto_20160808_1557.py new file mode 100644 index 0000000..7475fcd --- /dev/null +++ b/common/migrations/0004_auto_20160808_1557.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-08 12:57 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('common', '0003_auto_20160729_1747'), + ] + + operations = [ + migrations.AddField( + model_name='settings', + name='recalculation_rating_time', + field=models.TimeField(default=datetime.datetime(2016, 8, 8, 12, 57, 41, 160156, tzinfo=utc)), + preserve_default=False, + ), + migrations.AddField( + model_name='settings', + name='recalculation_spec_time', + field=models.TimeField(default=datetime.datetime(2016, 8, 8, 12, 57, 52, 905906, tzinfo=utc)), + preserve_default=False, + ), + ] diff --git a/common/models.py b/common/models.py index 95ca414..6557b55 100644 --- a/common/models.py +++ b/common/models.py @@ -40,6 +40,8 @@ class Settings(models.Model): document_send_email = models.EmailField(max_length=100, default="muhtarzubanchi05@gmail.com") document_send_description = models.TextField(blank=True) document_send_time_remove = models.IntegerField(default=14) + recalculation_spec_time = models.TimeField() + recalculation_rating_time = models.TimeField() def __str__(self): return 'Настройки сайта' diff --git a/projects/forms.py b/projects/forms.py index b678c56..2f2bfb0 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -235,6 +235,15 @@ class CustomerProjectTrashForm(forms.Form): self.fields['pk'].queryset = self.req.user.projects.filter(state='active') +class ContractorPortfolioTrashForm(forms.Form): + pk = forms.ModelChoiceField(queryset=Portfolio.objects.none()) + + def __init__(self, *args, **kwargs): + self.request = kwargs.pop('request') + super().__init__(*args, **kwargs) + self.fields['pk'].queryset = self.request.user.portfolios.all() + + class CustomerProjectRestoreForm(forms.Form): pk = forms.ModelChoiceField(queryset=Project.objects.none()) diff --git a/projects/templatetags/__init__.py b/projects/templatetags/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/projects/templatetags/projects_tags.py b/projects/templatetags/projects_tags.py deleted file mode 100644 index b82c290..0000000 --- a/projects/templatetags/projects_tags.py +++ /dev/null @@ -1,10 +0,0 @@ -from django import template - -register = template.Library() - -@register.inclusion_tag("templatetags/ratings_widget.html", takes_context=True) -def ratings_widget(context, user_id, class_name=None): - ratings = user_id - return { - 'ratings': ratings, - } diff --git a/projects/urls.py b/projects/urls.py index 4e3a9b1..c16f654 100644 --- a/projects/urls.py +++ b/projects/urls.py @@ -14,6 +14,7 @@ from .views import ( ProjectComparisonView, ProjectFilterView, ProjectDetailWithContractorAnswerView, + ContractorPortfolioTrashView, ) app_name = 'projects' @@ -25,6 +26,7 @@ urlpatterns = [ urls.url(r'^create/$', CustomerProjectCreateView.as_view(), name='customer-project-create'), urls.url(r'^(?P\d+)/edit/$', CustomerProjectEditView.as_view(), name='customer-project-edit'), urls.url(r'^(?P\d+)/trash/$', CustomerProjectTrashView.as_view(), name='customer-project-trash'), + urls.url(r'^portfolio/(?P\d+)/trash/$', ContractorPortfolioTrashView.as_view(), name='contractor-portfolio-trash'), urls.url(r'^(?P\d+)/restore/$', CustomerProjectRestoreView.as_view(), name='customer-project-restore'), urls.url(r'^(?P\d+)/delete/$', CustomerProjectDeleteView.as_view(), name='customer-project-delete'), diff --git a/projects/views.py b/projects/views.py index d7cecf1..5849bf0 100644 --- a/projects/views.py +++ b/projects/views.py @@ -15,7 +15,7 @@ import pydash as _; _.map = _.map_; _.filter = _.filter_ import re from .mixins import LastAccessMixin -from .models import Project, ProjectFile, Portfolio, Candidate, Answer, AnswerFile, Realty, Order +from .models import Project, ProjectFile, Portfolio, PortfolioPhoto,Candidate, Answer, AnswerFile, Realty, Order from archilance.mixins import BaseMixin from users.models import User from work_sell.models import Picture @@ -31,6 +31,7 @@ from .forms import ( ProjectFilterForm, ProjectFilterRealtyForm, RealtyForm, + ContractorPortfolioTrashForm, ) @@ -353,6 +354,21 @@ class CustomerProjectEditView(BaseMixin, View): return render(request, self.template_name, context) +class ContractorPortfolioTrashView(View): + form_class = ContractorPortfolioTrashForm + + def post(self,request, *args, **kwargs): + form = self.form_class(_.merge({}, request.POST, kwargs), request=request) + if form.is_valid(): + portfolio = form.cleaned_data.get('pk') + portfolio.delete() + messages.info(request, 'Портфолио удален') + else: + messages.info(request, 'Произошла ошибка: 
    {msg}
    '.format(msg=pformat(form.errors))) + + redirect_to = request.POST.get('next') + return redirect(redirect_to) + class CustomerProjectTrashView(View): form_class = CustomerProjectTrashForm @@ -483,4 +499,10 @@ class ContractorPortfolioUpdateView(UpdateView): return reverse('proje') +from django.views.generic import DeleteView +class PortfolioDelete(DeleteView): + model = Portfolio + success_url = reverse_lazy('users:contractor-profile') + + # import code; code.interact(local=dict(globals(), **locals())) diff --git a/ratings/management/commands/recalculation_rating.py b/ratings/management/commands/recalculation_rating.py index b1a6e00..d9383eb 100644 --- a/ratings/management/commands/recalculation_rating.py +++ b/ratings/management/commands/recalculation_rating.py @@ -1,10 +1,23 @@ from django.core.management import BaseCommand +from django.db.models import Sum from specializations.models import Specialization from ratings.models import HistoryRating -from users.models import User +from users.models import User,Team class Command(BaseCommand): + def handle(self, *args, **options): - contractors = User.contractor_objects.all() + users = User.objects.filter(is_superuser=False) + for user in users: + current_rating_info = HistoryRating.objects.filter(user_id=user.pk).aggregate(Sum('rating')) + current_rating = current_rating_info['rating__sum'] or 0 + user.rating = current_rating + user.save() + teams = Team.objects.all() + for team in teams: + current_rating_info = HistoryRating.objects.filter(team_id=team.pk).aggregate(Sum('rating')) + current_rating = current_rating_info['rating__sum'] or 0 + team.rating = current_rating + team.save() diff --git a/ratings/management/commands/recalculation_spec.py b/ratings/management/commands/recalculation_spec.py index d3fcf81..518ffa2 100644 --- a/ratings/management/commands/recalculation_spec.py +++ b/ratings/management/commands/recalculation_spec.py @@ -1,24 +1,35 @@ from django.core.management import BaseCommand from specializations.models import Specialization from ratings.models import SpecializationRating -from users.models import User +from users.models import User, Team class Command(BaseCommand): def handle(self, *args, **options): - SpecializationRating.objects.all().delete() - contractors = User.contractor_objects.order_by('-contractor_rating') - specializations = Specialization.objects.all() - for spec in specializations: - i = 0 - for contractor in contractors: - if spec in contractor.contractor_specializations.all(): - i += 1 - spec_rating = SpecializationRating() - spec_rating.position = i - spec_rating.user = contractor - spec_rating.specialization = spec - spec_rating.save() + users = User.objects.values('pk', 'rating').filter(is_superuser=False).order_by('-rating') + teams = Team.objects.values('pk', 'rating').order_by('-rating') + result_list = [] - print('The End') + for user in users: + result_list.append([user['rating'], 'user', user['pk']]) + + for team in teams: + result_list.append([team['rating'], 'team',team['pk'] ]) + + print(sorted(result_list)) + # SpecializationRating.objects.all().delete() + # contractors = User.contractor_objects.order_by('-rating') + # specializations = Specialization.objects.all() + # for spec in specializations: + # i = 0 + # for contractor in contractors: + # if spec in contractor.contractor_specializations.all(): + # i += 1 + # spec_rating = SpecializationRating() + # spec_rating.position = i + # spec_rating.user = contractor + # spec_rating.specialization = spec + # spec_rating.save() + # + # print('The End') diff --git a/ratings/models.py b/ratings/models.py index e5dd042..375907b 100644 --- a/ratings/models.py +++ b/ratings/models.py @@ -12,7 +12,7 @@ class HistoryRating(models.Model): description = models.TextField(blank=True) def __str__(self): - return self.rating + return '{0}'.format(self.rating) class Meta: verbose_name = 'История рейтинга' diff --git a/projects/templates/templatetags/ratings_widget.html b/ratings/templates/templatetags/ratings_widget.html similarity index 52% rename from projects/templates/templatetags/ratings_widget.html rename to ratings/templates/templatetags/ratings_widget.html index e689a34..fe7f745 100644 --- a/projects/templates/templatetags/ratings_widget.html +++ b/ratings/templates/templatetags/ratings_widget.html @@ -10,16 +10,3 @@ - -{##} - diff --git a/ratings/templatetags/specializtions_tags.py b/ratings/templatetags/specializtions_tags.py index f446cb7..65649b0 100644 --- a/ratings/templatetags/specializtions_tags.py +++ b/ratings/templatetags/specializtions_tags.py @@ -1,7 +1,7 @@ from django import template from archilance import util -from users.models import User +from users.models import User, Team from ratings.models import SpecializationRating register = template.Library() @@ -14,3 +14,26 @@ def specialization_widget(context, user_id): 'specializations': specializations, 'user_id': user_id, } + +def specialization_team_widget(context, team_id): + team_id = int(team_id) + specializations = [] + return { + 'specializations': specializations, + } + + + +@register.inclusion_tag("templatetags/ratings_widget.html", takes_context=True) +def ratings_widget(context, user_id, class_name=None): + ratings = User.objects.get(pk=user_id).rating + return { + 'ratings': ratings, + } + +@register.inclusion_tag("templatetags/ratings_widget.html", takes_context=True) +def ratings_team_widget(context, team_id): + ratings = Team.objects.get(pk=team_id).rating + return { + 'ratings': ratings, + } diff --git a/templates/partials/header.html b/templates/partials/header.html index 63a2064..253d922 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -7,7 +7,7 @@
    - + {% if request.user.is_authenticated %}
    {% endif %} - + {% if request.user.is_authenticated %}
    {% if request.user.is_contractor %} - {% thumbnail request.user.avatar "75x75" crop="center" as im %} - profile-image - {% endthumbnail %} + {% if request.user.avatar %} + {% thumbnail request.user.avatar "75x75" crop="center" as im %} + profile-image + {% endthumbnail %} + {% else %} + profile-image + {% endif %} {% elif request.user.is_customer %} - {% thumbnail request.user.avatar "75x75" crop="center" as im %} - profile-image - {% endthumbnail %} + {% if request.user.avatar %} + {% thumbnail request.user.avatar "75x75" crop="center" as im %} + profile-image + {% endthumbnail %} + {% else %} + profile-image + {% endif %} {% endif %}
    - +
    -
      @@ -117,7 +126,7 @@
    - + {% if request.user.is_contractor %}
    diff --git a/users/admin.py b/users/admin.py index 1890f01..ca8f03e 100644 --- a/users/admin.py +++ b/users/admin.py @@ -5,13 +5,20 @@ from .models import User, Team, UserFinancialInfo, ContractorResume, ContractorR class UserAdmin(admin.ModelAdmin): readonly_fields = ('pk',) - list_display = ('username', 'email', 'get_groups', 'cro', 'is_active',) + list_display = ('username', 'email', 'get_groups', 'cro', 'is_active', 'rating',) + ordering = ('-rating',) def get_groups(self, obj): return ', '.join(g.name for g in obj.groups.all()) + +class TeamAdmin(admin.ModelAdmin): + list_display = ('name', 'rating', 'owner',) + ordering = ('-rating',) + + admin.site.register(User, UserAdmin) admin.site.register(UserFinancialInfo) -admin.site.register(Team) +admin.site.register(Team, TeamAdmin) admin.site.register(ContractorResume) admin.site.register(ContractorResumeFiles) diff --git a/users/migrations/0007_auto_20160808_1557.py b/users/migrations/0007_auto_20160808_1557.py new file mode 100644 index 0000000..95cf4cc --- /dev/null +++ b/users/migrations/0007_auto_20160808_1557.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-08 12:57 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0006_auto_20160805_1442'), + ] + + operations = [ + migrations.RenameField( + model_name='user', + old_name='contractor_rating', + new_name='rating', + ), + migrations.AddField( + model_name='team', + name='rating', + field=models.FloatField(default=0.0), + ), + ] diff --git a/users/models.py b/users/models.py index 9dd7cd0..a3d995c 100644 --- a/users/models.py +++ b/users/models.py @@ -120,7 +120,7 @@ class User(AbstractBaseUser, PermissionsMixin): avatar = models.ImageField(upload_to='users/avatars/', blank=True) contractor_answers = GenericRelation('projects.Answer') - contractor_rating = models.FloatField(default=0.0) + rating = models.FloatField(default=0.0) contractor_resume = models.OneToOneField(ContractorResume, related_name='contractor', blank=True, null=True) contractor_specializations = TreeManyToManyField(Specialization, related_name='contractors', blank=True) contractor_status = models.CharField(default='free', max_length=20, choices=STATUSES) @@ -189,6 +189,7 @@ class Team(models.Model): owner = models.OneToOneField(User, related_name='team', blank=True, null=True) 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 diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index debb866..803aac4 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -1,87 +1,98 @@ {% extends 'partials/base.html' %} {% load staticfiles %} +{% load specializtions_tags %} {% load thumbnail %} {% block content %} {% include 'partials/header.html' %} - -
    -
    -
    -

    Личный кабинет

    -
    - -
    - +
    + +
    +
    + + + {% if not contractor.is_owner_team %} + {% endif %} -
    - - - -
    - -
    -
    -
    +
    + + + +
    + +
    +
    +
    {% thumbnail contractor.avatar "265x264" crop="center" as im %} @@ -89,219 +100,183 @@ {% endthumbnail %}
    - +
    добавить участника - +

    Состав группы

    {% for p in participants %} - -
    -
    - {% thumbnail p.avatar "60x60" crop="center" as im %} - mess-image - {% endthumbnail %} -
    +
    -

    - {{ p.get_full_name }} -

    - - Программист -
    +
    + {% thumbnail p.avatar "60x60" crop="center" as im %} + mess-image + {% endthumbnail %} +
    + +

    + {{ p.get_full_name }} +

    + + Программист +
    {% endfor %}
    - -
    -
    -

    - {{ contractor.team }} -

    -

    Россия, Москва

    -{#

    На сайте 8 лет и 3 месяца

    #} -

    На сайте {{ contractor.team.created }}

    -

    - Кол-во человек: {{participants_count}} -

    -

    - Выполненных проектов: 0 -

    -
    Свободен
    - написать сообщение -
    - -
    -
    -

    - Специализации: -

    -
    - Интерьеры - 2-й -
    -
    - Визуализация/3D - 45-й -
    -
    - Экстерьеры - 10-й -
    -
    - Архитектура - 3-й -
    -
    - 3D Моделирование - 100-й -
    -
    -
    - -
    - - -
    -
    -

    Есть допуск СРО

    -
    -
    -
    - - - - -
    -
    - -
    -
    - -
    -
    - -
    - {% for p in portfolios %} + +
    -
    -
    -
    -
    -
    -
    -

    {{ p.name }}

    -
    - -
    - -
    -     -
    - -
    -
    -
    +

    + {{ contractor.team }} +

    +

    Россия, Москва

    + {#

    На сайте 8 лет и 3 месяца

    #} +

    На сайте {{ contractor.team.created }}

    +

    + Кол-во человек: {{ participants_count }} +

    +

    + Выполненных проектов: 0 +

    +
    Свободен
    + написать сообщение
    - {% endfor %} +
    + {% specialization_widget contractor.pk %}
    -
    -
    - показать еще +
    + {% if contractor.team %} + {% ratings_team_widget contractor.team.pk %} + {% endif %} +
    +
    +

    Есть допуск СРО

    -
    -
    - {% for ws in work_sells %} -
    -
    -
    -
    +
    +
    + +
    +
    + +
    +
    + +
    + {% for p in portfolios %} +
    +
    +
    +
    +
    -
    -
    - {{ ws.budget }} +
    +

    {{ p.name }}

    +
    + +
    + +
    +     +
    + +
    -
    -

    {{ ws }}

    + {% endfor %} -
    +
    + +
    +
    + показать еще
    - {% endfor %} +
    -
    -
    - показать еще + +
    + +
    + {% for ws in work_sells %} +
    +
    +
    +
    +
    +
    +
    + {{ ws.budget }} +
    +
    +
    +
    +

    {{ ws }}

    + +
    +
    + {% endfor %} +
    +
    +
    + показать еще +
    -
    -
    -
    -
    -

    - Иванов Петр Иванович -

    +
    +
    +
    +

    + Иванов Петр Иванович +

    Безопасная сделка -
    - - - - - - положительный отзыв -
    -

    - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum +

    + + + + + + положительный отзыв +
    +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum -

    +

    +
    -
    -
    - - {% include 'partials/footer.html' %} -
    -
    +
    + + {% include 'partials/footer.html' %} +
    +
    {% endblock %} diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index bdae073..38d52e8 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -1,6 +1,5 @@ {% extends 'partials/base.html' %} -{% load projects_tags %} {% load specializtions_tags %} {% load thumbnail %} @@ -29,7 +28,7 @@ {% endif %} - {% if contractor.pk != user.id %} + {% if contractor.pk != request.user.pk and request.user.is_contractor %}
  • @@ -37,22 +36,26 @@
    • + {% endif %} + {% if contractor.pk != request.user.pk %}
  • - + написать сообщение
    • + {% endif %} + {% if request.user.is_customer %}
  • предложить заказ
    • - {% endif %} +
    @@ -147,7 +150,12 @@
    - +
    + {% csrf_token %} + + +
    +
    @@ -188,13 +196,17 @@ {% for ws in user.work_sell.all %}
    -
    + + {% thumbnail ws.get_cover "224x224" crop="center" as im %} +
    + {% endthumbnail %} +
    {{ ws.budget }} +
    @@ -207,7 +219,12 @@
    - +
    + {% csrf_token %} + + +
    +
    diff --git a/users/templates/user_profile_edit.html b/users/templates/user_profile_edit.html index c3ec3e0..7086ada 100644 --- a/users/templates/user_profile_edit.html +++ b/users/templates/user_profile_edit.html @@ -22,7 +22,9 @@
    - profile-image + {% if form.avatar.value %} + profile-image + {% endif %}
    diff --git a/users/templates/worksell_create_form.html b/users/templates/worksell_create_form.html index ac4258d..bfd400d 100644 --- a/users/templates/worksell_create_form.html +++ b/users/templates/worksell_create_form.html @@ -41,7 +41,7 @@

    Бюджет{{ worksell_form.budget.errors.as_text }}

    - +
    {{ worksell_form.currency}} @@ -53,7 +53,7 @@

    Срок выполнения{{ worksell_form.budget.errors.as_text }}

    - +
    {{ worksell_form.term_type }} @@ -76,7 +76,8 @@
    - + +
    diff --git a/users/urls.py b/users/urls.py index 083a4fb..13ed1d3 100755 --- a/users/urls.py +++ b/users/urls.py @@ -14,6 +14,7 @@ from .views import ( UserFinancialInfoEditView, UserListView, UserProfileEditView, + TeamCreateView, ) @@ -31,6 +32,7 @@ urlpatterns = [ urls.url(r'^customers/(?P\d+)/reviews/$', CustomerProfileReviewsView.as_view(), name='customer-profile-reviews'), urls.url(r'^contractors/$', ContractorFilterView.as_view(), name='contractor-filter'), + urls.url(r'^contractors/team/create/$', TeamCreateView.as_view(), name='team-create'), urls.url(r'^contractors/(?P\d+)/$', ContractorProfileDetailView.as_view(), name='contractor-profile'), urls.url(r'^contractor-office/(?P\d+)/$', ContractorOfficeDetailView.as_view(), name='contractor-office'), diff --git a/users/views.py b/users/views.py index 000cf7b..e7a5396 100644 --- a/users/views.py +++ b/users/views.py @@ -365,8 +365,9 @@ class ContractorOfficeDetailView(DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context['form_team'] = TeamForm + participants = [] if self.object.is_owner_team(): - participants = self.object.team.users.all() + participants = self.object.team.contractors.all() user_ids = [p.pk for p in participants] context['participants'] = participants context['participants_count'] = len(participants) @@ -484,6 +485,20 @@ class CustomerProfileCurrentProjectsView(BaseMixin, DetailView): context_object_name = 'customer' + +class TeamCreateView(View): + form_class = TeamForm + + def post(self, request, *args, **kwargs): + form = self.form_class(request.POST) + # import code; code.interact(local=dict(globals(), **locals())) + if form.is_valid(): + instance = form.save(commit=False) + instance.owner = request.user + instance.save() + return redirect('users:contractor-office', pk=request.user.pk) + + class CustomerProfileReviewsView(BaseMixin, View): template_name = 'customer_profile_reviews.html' diff --git a/work_sell/forms.py b/work_sell/forms.py index aed9a74..57a4012 100644 --- a/work_sell/forms.py +++ b/work_sell/forms.py @@ -4,6 +4,16 @@ from common.models import Location from .models import WorkSell +class ContractorWorkSellTrashForm(forms.Form): + pk = forms.ModelChoiceField(queryset=WorkSell.objects.none()) + + def __init__(self, *args, **kwargs): + self.request = kwargs.pop('request') + super().__init__(*args, **kwargs) + + self.fields['pk'].queryset = self.request.user.work_sell.all() + + class WorkSellForm(forms.ModelForm): class Meta: diff --git a/work_sell/models.py b/work_sell/models.py index 81ba51d..2a89cae 100644 --- a/work_sell/models.py +++ b/work_sell/models.py @@ -31,6 +31,10 @@ class WorkSell(models.Model): def is_author_for_work(self): pass + def get_cover(self): + photo = self.photos.first() + return photo and photo.img + class Meta: ordering = ['-created'] verbose_name = 'Готовая работа' diff --git a/work_sell/templates/worksells_list.html b/work_sell/templates/worksells_list.html index bbb975b..47e7d70 100644 --- a/work_sell/templates/worksells_list.html +++ b/work_sell/templates/worksells_list.html @@ -118,7 +118,7 @@
    - {% thumbnail work.img "265x265" crop="center" as im %} + {% thumbnail work.get_cover "265x265" crop="center" as im %}
    @@ -126,13 +126,14 @@
    - {{ work.budget }} + {{ work.budget }}

    {{ work }}

    - + + {% if request.user.pk == work.contractor.pk %}
    @@ -145,6 +146,7 @@
    + {% endif %}
    {% endfor %} diff --git a/work_sell/urls.py b/work_sell/urls.py index 29399e9..b6ecdb8 100644 --- a/work_sell/urls.py +++ b/work_sell/urls.py @@ -10,6 +10,7 @@ from .views import ( work_sell_create, BasicCreateView, PictureCreateView, + ContractorWorkSellTrashView, ) @@ -21,6 +22,7 @@ urlpatterns = [ urls.url(r'^upload/$', UploadView.as_view(), name='upload'), urls.url(r'^(?P\d+)/edit/$',WorkSellUpdateView.as_view(), name='edit'), urls.url(r'^(?P\d+)/delete/$',WorkSellDeleteView.as_view(), name='delete'), + urls.url(r'^(?P\d+)/trash/$', ContractorWorkSellTrashView.as_view(), name='contractor-worksell-trash'), urls.url(r'^test/$', work_sell_create, name='test'), urls.url(r'^basic/$', BasicCreateView.as_view(), name='upload-basic'), urls.url(r'^new/$', PictureCreateView.as_view(), name='upload-new'), diff --git a/work_sell/views.py b/work_sell/views.py index 56d2c81..c9878dc 100644 --- a/work_sell/views.py +++ b/work_sell/views.py @@ -1,13 +1,20 @@ import json -from django.shortcuts import render +import pydash as _; + +_.map = _.map_; +_.filter = _.filter_ +from pprint import pprint, pformat +from django.shortcuts import render, redirect +from django.contrib import messages from django.core.urlresolvers import reverse from django.http import JsonResponse, HttpResponse -from django.views.generic import ListView, DetailView, CreateView, View,\ +from django.core.files.base import ContentFile +from django.views.generic import ListView, DetailView, CreateView, View, \ UpdateView, DeleteView, TemplateView from projects.models import BuildingClassfication, ConstructionType -from .models import WorkSell, Picture -from .forms import WorkSellForm +from .models import WorkSell, Picture, WorkSellPhoto +from .forms import WorkSellForm, ContractorWorkSellTrashForm from .serialize import serialize from .response import JSONResponse, response_mimetype @@ -37,7 +44,7 @@ class WorkSellsView(ListView): model = WorkSell template_name = 'worksells_list.html' # paginate_by = 20 - paginate_by = 1 + paginate_by = 18 def get_form_kwargs(self, **kwargs): kwargs = super().get_form_kwargs @@ -72,6 +79,15 @@ def work_sell_create(request): if form.is_valid(): instance = form.save(commit=False) instance.save() + images_ids = request.POST.get('images-ids').split(';')[:-1] + for pk in images_ids: + picture = Picture.objects.get(pk=pk) + temp_file = ContentFile(picture.file.read()) + temp_file.name = picture.file.name + w_photo = WorkSellPhoto() + w_photo.img = temp_file + w_photo.worksell = instance + w_photo.save() data = {'status': 'ok'} else: data = {'status': 'no', 'form_errors': form.errors} @@ -101,13 +117,27 @@ class WorkSellDeleteView(DeleteView): return reverse('work_sell:list') +class ContractorWorkSellTrashView(View): + form_class = ContractorWorkSellTrashForm + + def post(self, request, *args, **kwargs): + form = self.form_class(_.merge({}, request.POST, kwargs), request=request) + if form.is_valid(): + worksell = form.cleaned_data.get('pk') + worksell.delete() + messages.info(request, 'Готовая работа удалена') + else: + messages.info(request, 'Произошла ошибка: 
    {msg}
    '.format(msg=pformat(form.errors))) + + redirect_to = request.POST.get('next') + return redirect(redirect_to) + class UploadView(View): template_name = 'upload.html' def get(self, request, *args, **kwargs): - return render(request,self.template_name) - + return render(request, self.template_name) class JSONResponseMixin(object): @@ -125,5 +155,3 @@ class JSONResponseMixin(object): class JSONView(JSONResponseMixin, TemplateView): def render_to_response(self, context, **response_kwargs): return self.render_to_json_response(context, **response_kwargs) - - From 7c39828a4fffb78c7c0a05e30639991fa06c935f Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Tue, 9 Aug 2016 12:03:54 +0300 Subject: [PATCH 5/9] #ARC-7 Add score detail view for users --- archilance/settings/base.py | 2 +- archilance/urls.py | 1 + chat/testapp.py | 2 +- .../management/commands/recalculation_spec.py | 42 +++++++----- ratings/templatetags/specializtions_tags.py | 3 +- templates/partials/header.html | 20 ++---- users/templates/contractor_office.html | 2 +- .../partials/customer_profile_info_block.html | 4 +- wallets/templates/score-detail.html | 65 +++++++++++++++++++ wallets/urls.py | 9 +++ wallets/views.py | 8 ++- 11 files changed, 117 insertions(+), 41 deletions(-) create mode 100644 wallets/templates/score-detail.html create mode 100755 wallets/urls.py diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 0600cb5..9b25660 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -111,7 +111,7 @@ WSGI_APPLICATION = 'archilance.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'archilance2', + 'NAME': 'archilance', 'USER': 'postgres', 'PASSWORD': 'postgres', 'HOST': 'localhost', diff --git a/archilance/urls.py b/archilance/urls.py index 8680ab6..373a2a1 100644 --- a/archilance/urls.py +++ b/archilance/urls.py @@ -15,6 +15,7 @@ urlpatterns = [ url(r'^work_sell/', include('work_sell.urls')), url(r'^test/$', TemplateView.as_view(template_name='test.html'), name='test'), url(r'^projects/', include('projects.urls')), + url(r'^wallets/', include('wallets.urls')), url(r'^chat/', include('chat.urls')), url(r'^specializations/', include('specializations.urls')), url(r'^users/', include('users.urls')), diff --git a/chat/testapp.py b/chat/testapp.py index 0922d45..fe64028 100644 --- a/chat/testapp.py +++ b/chat/testapp.py @@ -92,7 +92,7 @@ if __name__ == '__main__': ioloop = IOLoop.instance() application.db = momoko.Pool( - dsn='dbname=archilance2 user=postgres password=postgres host=localhost', + dsn='dbname=archilance user=postgres password=postgres host=localhost', size=1, ioloop=ioloop, ) diff --git a/ratings/management/commands/recalculation_spec.py b/ratings/management/commands/recalculation_spec.py index 518ffa2..acfb5d5 100644 --- a/ratings/management/commands/recalculation_spec.py +++ b/ratings/management/commands/recalculation_spec.py @@ -15,21 +15,29 @@ class Command(BaseCommand): result_list.append([user['rating'], 'user', user['pk']]) for team in teams: - result_list.append([team['rating'], 'team',team['pk'] ]) + result_list.append([team['rating'], 'team', team['pk'] ]) - print(sorted(result_list)) - # SpecializationRating.objects.all().delete() - # contractors = User.contractor_objects.order_by('-rating') - # specializations = Specialization.objects.all() - # for spec in specializations: - # i = 0 - # for contractor in contractors: - # if spec in contractor.contractor_specializations.all(): - # i += 1 - # spec_rating = SpecializationRating() - # spec_rating.position = i - # spec_rating.user = contractor - # spec_rating.specialization = spec - # spec_rating.save() - # - # print('The End') + result_list = list(reversed(sorted(result_list))) + SpecializationRating.objects.all().delete() + specializations = Specialization.objects.all() + for spec in specializations: + i = 0 + for res in result_list: + if 'user' in res[1]: + user = User.objects.get(pk=res[2]) + team = None + specializations_current = user.contractor_specializations.all() + else: + team = Team.objects.get(pk=res[2]) + user = None + specializations_current = team.specializations.all() + + if spec in specializations_current: + i += 1 + spec_rating = SpecializationRating() + spec_rating.position = i + spec_rating.user = user + spec_rating.team = team + spec_rating.specialization = spec + spec_rating.save() + print('The end') diff --git a/ratings/templatetags/specializtions_tags.py b/ratings/templatetags/specializtions_tags.py index 65649b0..b79e82c 100644 --- a/ratings/templatetags/specializtions_tags.py +++ b/ratings/templatetags/specializtions_tags.py @@ -15,9 +15,10 @@ def specialization_widget(context, user_id): 'user_id': user_id, } +@register.inclusion_tag('templatetags/specializations_widget.html', takes_context=True) def specialization_team_widget(context, team_id): team_id = int(team_id) - specializations = [] + specializations = SpecializationRating.objects.select_related('specialization').filter(team_id=team_id) return { 'specializations': specializations, } diff --git a/templates/partials/header.html b/templates/partials/header.html index 253d922..2e2c01f 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -100,28 +100,16 @@
  • - - Сообщения - - + Сообщения
  • - - Счет - - + Счет
  • - - Настройки - - + Настройки
  • - - FAQ - - + FAQ
    • diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 803aac4..4b495d7 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -150,7 +150,7 @@
    - {% specialization_widget contractor.pk %} + {% specialization_team_widget contractor.team.pk %}
    diff --git a/users/templates/partials/customer_profile_info_block.html b/users/templates/partials/customer_profile_info_block.html index bbb1c08..1c74fc5 100644 --- a/users/templates/partials/customer_profile_info_block.html +++ b/users/templates/partials/customer_profile_info_block.html @@ -1,6 +1,4 @@ -{% load projects_tags %} - - +{% load specializtions_tags %}
    diff --git a/wallets/templates/score-detail.html b/wallets/templates/score-detail.html new file mode 100644 index 0000000..a7c8d38 --- /dev/null +++ b/wallets/templates/score-detail.html @@ -0,0 +1,65 @@ +{% extends 'partials/base.html' %} + +{% load staticfiles %} +{% load thumbnail %} +{% block content %} + + +{% include 'partials/header.html' %} +
    +
    +
    +

    Ваш счет

    +
    +
    +
    +
    +

    35 000

    +
    + пополнить +
    +
    + вывести средства +
    + + + + + + + + + + + + + + + + + + + +
    ДатаОписаниеПоступление/СписаниеБаланс
    23.01.2016 + Оплата этапа 1 по заказу «Сложный долгий заказ» + + +35 000 + + + 53 000 + +
    23.01.2016 + Оплата этапа 1 по заказу «Сложный долгий заказ» + + +35 000 + + + 53 000 + +
    +
    +
    + {% include 'partials/footer.html' %} +
    +
    +{% endblock %} diff --git a/wallets/urls.py b/wallets/urls.py new file mode 100755 index 0000000..b0726e5 --- /dev/null +++ b/wallets/urls.py @@ -0,0 +1,9 @@ +from django.conf import urls +from django.conf.urls import include +from .views import ScoreDetailView + +app_name = 'wallets' + +urlpatterns = [ + urls.url(r'^score/(?P\d+)/$', ScoreDetailView.as_view(), name='score-detail'), +] diff --git a/wallets/views.py b/wallets/views.py index 91ea44a..01de4ce 100644 --- a/wallets/views.py +++ b/wallets/views.py @@ -1,3 +1,9 @@ from django.shortcuts import render +from django.views.generic import DetailView +from users.models import User + + +class ScoreDetailView(DetailView): + model = User + template_name = 'score-detail.html' -# Create your views here. From 833491f8c14002c9705148234bf9b6024d872e75 Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Tue, 9 Aug 2016 19:57:40 +0300 Subject: [PATCH 6/9] #ARC-7 Add email send for accountant in signals.py --- archilance/settings/base.py | 2 +- chat/testapp.py | 2 +- .../0005_settings_accountant_send_email.py | 20 +++ common/models.py | 1 + common/views.py | 2 +- users/mixins.py | 6 + wallets/admin.py | 14 +- wallets/forms.py | 13 ++ .../migrations/0004_invoicehistory_balance.py | 20 +++ wallets/migrations/0005_auto_20160809_1727.py | 43 +++++ wallets/models.py | 28 ++- wallets/signals.py | 20 +++ wallets/templates/score-detail.html | 169 ++++++++++++------ wallets/templates/send_for_accountant.html | 1 + wallets/templates/send_for_accountant.txt | 2 + wallets/urls.py | 5 +- wallets/views.py | 66 ++++++- 17 files changed, 348 insertions(+), 66 deletions(-) create mode 100644 common/migrations/0005_settings_accountant_send_email.py create mode 100644 wallets/forms.py create mode 100644 wallets/migrations/0004_invoicehistory_balance.py create mode 100644 wallets/migrations/0005_auto_20160809_1727.py create mode 100644 wallets/signals.py create mode 100644 wallets/templates/send_for_accountant.html create mode 100644 wallets/templates/send_for_accountant.txt diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 9b25660..0600cb5 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -111,7 +111,7 @@ WSGI_APPLICATION = 'archilance.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'archilance', + 'NAME': 'archilance2', 'USER': 'postgres', 'PASSWORD': 'postgres', 'HOST': 'localhost', diff --git a/chat/testapp.py b/chat/testapp.py index fe64028..0922d45 100644 --- a/chat/testapp.py +++ b/chat/testapp.py @@ -92,7 +92,7 @@ if __name__ == '__main__': ioloop = IOLoop.instance() application.db = momoko.Pool( - dsn='dbname=archilance user=postgres password=postgres host=localhost', + dsn='dbname=archilance2 user=postgres password=postgres host=localhost', size=1, ioloop=ioloop, ) diff --git a/common/migrations/0005_settings_accountant_send_email.py b/common/migrations/0005_settings_accountant_send_email.py new file mode 100644 index 0000000..01ac195 --- /dev/null +++ b/common/migrations/0005_settings_accountant_send_email.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-09 16:56 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('common', '0004_auto_20160808_1557'), + ] + + operations = [ + migrations.AddField( + model_name='settings', + name='accountant_send_email', + field=models.EmailField(default='muhtarzubanchi05@gmail.com', max_length=100), + ), + ] diff --git a/common/models.py b/common/models.py index 6557b55..e05368f 100644 --- a/common/models.py +++ b/common/models.py @@ -38,6 +38,7 @@ class MainPage(models.Model): class Settings(models.Model): time_notification = models.IntegerField(default=180) document_send_email = models.EmailField(max_length=100, default="muhtarzubanchi05@gmail.com") + accountant_send_email = models.EmailField(max_length=100, default="muhtarzubanchi05@gmail.com") document_send_description = models.TextField(blank=True) document_send_time_remove = models.IntegerField(default=14) recalculation_spec_time = models.TimeField() diff --git a/common/views.py b/common/views.py index 8460409..104893b 100644 --- a/common/views.py +++ b/common/views.py @@ -46,7 +46,7 @@ class PrintDocumentCreate(BaseMixin, View): } - settings = Settings.objects.all().first().doc + settings = Settings.objects.all().first() subject, from_email, to = 'Заявка на распечатку', 'mukhtar@mukhtar', settings.document_send_email text_content = render_to_string('document_email.txt', ctx_dict) html_content = get_template('document_email.html').render(ctx_dict) diff --git a/users/mixins.py b/users/mixins.py index 6bf0e1b..a1bb811 100644 --- a/users/mixins.py +++ b/users/mixins.py @@ -12,3 +12,9 @@ class CheckForUserMixin(object): else: return HttpResponseForbidden('403 Forbidden') return super().dispatch(request, *args, **kwargs) + + +class OwnershipMixin(object): + + def dispatch(self, request, *args, **kwargs): + pass diff --git a/wallets/admin.py b/wallets/admin.py index aeb721a..ce2eb8f 100644 --- a/wallets/admin.py +++ b/wallets/admin.py @@ -1,5 +1,15 @@ from django.contrib import admin -from .models import InvoiceHistory +from .models import InvoiceHistory, WithDraw -admin.site.register(InvoiceHistory) + +class InvoiceHistoryAdmin(admin.ModelAdmin): + list_display = ('comment', 'sum', 'user','balance',) + + +class WithDrawAdmin(admin.ModelAdmin): + list_display = ('sum','created','user',) + + +admin.site.register(InvoiceHistory, InvoiceHistoryAdmin) +admin.site.register(WithDraw, WithDrawAdmin) diff --git a/wallets/forms.py b/wallets/forms.py new file mode 100644 index 0000000..3e871f3 --- /dev/null +++ b/wallets/forms.py @@ -0,0 +1,13 @@ +from django import forms +from .models import WithDraw + + +class WithDrawForm(forms.ModelForm): + + class Meta: + model = WithDraw + fields = ( + 'sum', + 'yandex_card', + 'user', + ) diff --git a/wallets/migrations/0004_invoicehistory_balance.py b/wallets/migrations/0004_invoicehistory_balance.py new file mode 100644 index 0000000..cf9840d --- /dev/null +++ b/wallets/migrations/0004_invoicehistory_balance.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-09 09:22 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wallets', '0003_auto_20160729_1209'), + ] + + operations = [ + migrations.AddField( + model_name='invoicehistory', + name='balance', + field=models.DecimalField(decimal_places=0, default=0, max_digits=10), + ), + ] diff --git a/wallets/migrations/0005_auto_20160809_1727.py b/wallets/migrations/0005_auto_20160809_1727.py new file mode 100644 index 0000000..f27f3ca --- /dev/null +++ b/wallets/migrations/0005_auto_20160809_1727.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-09 14:27 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('wallets', '0004_invoicehistory_balance'), + ] + + operations = [ + migrations.CreateModel( + name='WithDraw', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('sum', models.DecimalField(decimal_places=0, max_digits=10)), + ('created', models.DateTimeField(default=django.utils.timezone.now)), + ('yandex_card', models.CharField(max_length=30)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='with_draw', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name_plural': 'Заявки на вывод средств', + 'ordering': ('-created',), + 'verbose_name': 'Заявка на вывод средств', + }, + ), + migrations.AlterModelOptions( + name='invoicehistory', + options={'ordering': ('-created',), 'verbose_name': 'Счет(История)', 'verbose_name_plural': 'Счет(История)'}, + ), + migrations.AlterField( + model_name='invoicehistory', + name='type', + field=models.CharField(blank=True, max_length=20, null=True), + ), + ] diff --git a/wallets/models.py b/wallets/models.py index b815ccd..06b01c7 100644 --- a/wallets/models.py +++ b/wallets/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.db.models import Sum from django.utils import timezone from users.models import User @@ -14,13 +15,36 @@ class InvoiceHistory(models.Model): comment = models.TextField(blank=True) created = models.DateTimeField(default=timezone.now) sum = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True) - type = models.CharField(max_length=20) + balance = models.DecimalField(max_digits=10, decimal_places=0, default=0) + type = models.CharField(max_length=20, blank=True, null=True) user = models.ForeignKey(User, related_name='invoice_history') def __str__(self): - return self.pk + return self.comment + + def save(self, *args, **kwargs): + if self.pk is None: + current_sum_info = InvoiceHistory.objects.filter(user=self.user).aggregate(Sum('sum')) + current_sum = current_sum_info['sum__sum'] or 0 + self.balance = current_sum + self.sum + super().save(*args, **kwargs) class Meta: verbose_name = 'Счет(История)' verbose_name_plural = 'Счет(История)' + ordering = ('-created',) + + +class WithDraw(models.Model): + sum = models.DecimalField(max_digits=10, decimal_places=0) + created = models.DateTimeField(default=timezone.now) + yandex_card = models.CharField(max_length=30) + user = models.ForeignKey(User, related_name='with_draw') + def __str__(self): + return self.yandex_card + + class Meta: + verbose_name = 'Заявка на вывод средств' + verbose_name_plural = 'Заявки на вывод средств' + ordering = ('-created',) diff --git a/wallets/signals.py b/wallets/signals.py new file mode 100644 index 0000000..3afa521 --- /dev/null +++ b/wallets/signals.py @@ -0,0 +1,20 @@ +from django.db.models.signals import post_save +from django.dispatch import receiver +from django.core.mail import send_mail, EmailMultiAlternatives +from django.template.loader import get_template, render_to_string + +from .models import WithDraw + + +@receiver(post_save, sender=WithDraw) +def send_for_accountant(sender, instance, created, **kwargs): + + if created: + ctx_dict = { + 'username': instance.user.username, + } + subject, from_email, to = 'Заявка на распечатку', 'mukhtar@mukhtar', 'muhtarzubanchi05@gmail.com' + text_content = render_to_string('send_for_accountant.txt', ctx_dict) + html_content = get_template('send_for_accountant.html').render(ctx_dict) + msg = EmailMultiAlternatives(subject, text_content, from_email, [to]) + msg.send() diff --git a/wallets/templates/score-detail.html b/wallets/templates/score-detail.html index a7c8d38..8e679fe 100644 --- a/wallets/templates/score-detail.html +++ b/wallets/templates/score-detail.html @@ -5,61 +5,122 @@ {% block content %} -{% include 'partials/header.html' %} -
    -
    -
    -

    Ваш счет

    -
    -
    -
    -
    -

    35 000

    -
    - пополнить -
    -
    - вывести средства -
    - - - - - - - - - - - - - - - - - - - -
    ДатаОписаниеПоступление/СписаниеБаланс
    23.01.2016 - Оплата этапа 1 по заказу «Сложный долгий заказ» - - +35 000 - - - 53 000 - -
    23.01.2016 - Оплата этапа 1 по заказу «Сложный долгий заказ» - - +35 000 - - - 53 000 - -
    -
    -
    + {% include 'partials/header.html' %} +
    +
    +
    +

    Ваш счет

    +
    +
    +
    +
    +

    {{ user_score_balance }}

    + + {% if user_score.is_customer %} +
    + пополнить +
    + {% endif %} + +
    + вывести средства +
    + + + + + + + + + + + + {% for history in user_score.invoice_history.all %} + + + + + + + {% endfor %} +
    ДатаОписаниеПоступление/СписаниеБаланс
    {{ history.created }} + {{ history.comment }} + + {{ history.sum }} + + + {{ history.balance }} + +
    +
    +
    {% include 'partials/footer.html' %}
    {% endblock %} + +{% block js_block %} + +{% endblock %} diff --git a/wallets/templates/send_for_accountant.html b/wallets/templates/send_for_accountant.html new file mode 100644 index 0000000..c0bf334 --- /dev/null +++ b/wallets/templates/send_for_accountant.html @@ -0,0 +1 @@ +Заявка на вывод средств от {{ username }}! diff --git a/wallets/templates/send_for_accountant.txt b/wallets/templates/send_for_accountant.txt new file mode 100644 index 0000000..3921dd7 --- /dev/null +++ b/wallets/templates/send_for_accountant.txt @@ -0,0 +1,2 @@ +Заявка на распечатку от {{ username }}! + diff --git a/wallets/urls.py b/wallets/urls.py index b0726e5..bbbe2e1 100755 --- a/wallets/urls.py +++ b/wallets/urls.py @@ -1,9 +1,10 @@ from django.conf import urls -from django.conf.urls import include -from .views import ScoreDetailView +from .views import ScoreDetailView, WithDrawCreate app_name = 'wallets' urlpatterns = [ urls.url(r'^score/(?P\d+)/$', ScoreDetailView.as_view(), name='score-detail'), + urls.url(r'^withdraw/create/$', WithDrawCreate.as_view(), name='withdraw-create'), + ] diff --git a/wallets/views.py b/wallets/views.py index 01de4ce..76776cd 100644 --- a/wallets/views.py +++ b/wallets/views.py @@ -1,9 +1,69 @@ -from django.shortcuts import render -from django.views.generic import DetailView +from django.http import JsonResponse +from django.contrib import messages +from django.db.models import Sum +from django.views.generic import DetailView, CreateView from users.models import User +from users.mixins import CheckForUserMixin +from .models import InvoiceHistory, WithDraw +from .forms import WithDrawForm -class ScoreDetailView(DetailView): +class ScoreDetailView(CheckForUserMixin, DetailView): model = User template_name = 'score-detail.html' + context_object_name = 'user_score' + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + user_score_balance = InvoiceHistory.objects.filter(user=self.get_object()).aggregate(Sum('sum')) + context['user_score_balance'] = user_score_balance['sum__sum'] or 0 + context['form'] = WithDrawForm + return context + + +class AjaxableResponseMixin(object): + def form_invalid(self, form): + response = super().form_invalid(form) + if self.request.is_ajax(): + return JsonResponse(form.errors, status=400) + else: + return response + + def form_valid(self, form): + # import code; code.interact(local=dict(globals(), **locals())) + response = super(AjaxableResponseMixin, self).form_valid(form) + if self.request.is_ajax(): + messages.info(self.request, 'Ваша заявка на вывод средств принята!') + data = { + 'pk': self.object.pk, + 'status': 'ok', + } + return JsonResponse(data) + else: + return response + + +# class WithDrawCreate(AjaxableResponseMixin, CreateView): +# model = WithDraw +# form_class = WithDrawForm +# success_url = '/' + +class WithDrawCreate(CreateView): + model = WithDraw + form_class = WithDrawForm + + def form_valid(self, form): + if self.request.is_ajax(): + self.object = form.save() + messages.info(self.request, 'Ваша заявка на вывод средств принята!') + data = { + 'pk': self.object.pk, + 'status': 'ok', + } + return JsonResponse(data) + return super().form_valid(form) + + def form_invalid(self, form): + if self.request.is_ajax(): + return JsonResponse(form.errors, status=400) + return super().form_invalid(form) From 6c9ec6bf64b8dbdbf38852c87896152aaf4af819 Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Wed, 10 Aug 2016 17:55:40 +0300 Subject: [PATCH 7/9] #ARC-27 Fixes reviews bugs --- chat/templates/chat_customer.html | 215 +++++++++++++----- chat/views.py | 2 +- projects/templates/project_detail.html | 57 ++--- projects/views.py | 2 +- .../templatetags/ratings_widget.html | 2 +- ratings/templatetags/specializtions_tags.py | 1 + templates/registration/login.html | 44 ++-- users/views.py | 16 +- work_sell/templates/worksell_detail.html | 6 +- 9 files changed, 216 insertions(+), 129 deletions(-) diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index a805400..3220cc2 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -237,6 +237,69 @@ var socket = new SocketHandler(); var form = document.getElementById('message_form'); var csrftoken = getCookie('csrftoken'); + + function getStages(orderId){ + + $.ajax({ + url: '/api/stages/', + type: 'GET', + data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, + dataType: 'json', + success: function (json) { + var stageCount = json.results.length; + if (stageCount == 0){ + stageCountVal = 1; + }else{ + stageCountVal = stageCount; + } + + var htmlInbox = ""; + + var htmlInboxStage = '

    Какое кол-во этапов подразумевает работа? ' + + '

    '; + + if (stageCount == 0){ + htmlInboxStage += '
    ' + + '

    Этап 1

    ' + + '' + + '' + + ' />' + + '' + + '' + + '
    '; + } + var statusNotAgreed = true; + $.each(json.results, function (i, v) { + if (v.status == "not_agreed") { + htmlInbox += '
    ' + + '

    Этап

    ' + + '' + + '' + + '' + + '' + + '' + + '
    '; + } else { + statusNotAgreed = false; + htmlInboxStage = ""; + htmlInbox += '
    ' + + '

    Этап ' + v.pos + '' + v.name + '

    ' + + '

    Результаты этапа:' + v.result + '

    ' + + '

    до 16.03.2015

    ' + v.cost + '
    '; + + } + }); + + if (statusNotAgreed) { + htmlInbox += '
    Перейти в режим безопасной сделки' + + '
    ' + + 'отправить на согласование
    '; + } + htmlInbox = htmlInboxStage + htmlInbox; + $("#order-stages").html(htmlInbox); + } + }); + } setTimeout(function(){ $(".user-block").first().trigger('click'); }, 10); @@ -245,7 +308,8 @@ $(".order-block").first().trigger('click'); }, 100); - $("#order-stages").on('click', "#addStagesForm", function(){ + $("#order-stages").on('click', "#addStagesForm", function(e){ + e.preventDefault(); $(".new-stages-form").each(function(i,v){ console.log($(this).serialize()); @@ -259,6 +323,7 @@ dataType: 'json', success: function (json) { console.log(json); + }, error: function(e){ console.log('error'); @@ -267,6 +332,30 @@ }); }); + + $(".update-stages-form").each(function(i,v){ + $.ajax({ + url: '/api/stages/' + currentStageId + '/', + type: 'PUT', + beforeSend: function(xhr){ + xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken')) + }, + data: $(this).serialize(), + dataType:'json', + success: function(json){ + console.log(json); + }, + + + }) + }); + + + var currentOrderId = $(this).attr('data-order-id'); + currentOrderId = parseInt(currentOrderId); + getStages(currentOrderId); + + }); $('#order-stages-tab').on('change', '#countStage', function(){ @@ -317,65 +406,67 @@ } }); - $.ajax({ - url: '/api/stages/', - type: 'GET', - data: {csrfmiddlewaretoken: csrftoken, 'order': orderId}, - dataType: 'json', - success: function (json) { - var stageCount = json.results.length; - if (stageCount == 0){ - stageCountVal = 1; - }else{ - stageCountVal = stageCount; - } - - var htmlInbox = ""; - - var htmlInboxStage = '

    Какое кол-во этапов подразумевает работа? ' + - '

    '; - - if (stageCount == 0){ - htmlInboxStage += '
    ' + - '

    Этап 1

    ' + - '' + - '' + - ' />' + - '' + - '' + - '
    '; - } - var statusNotAgreed = true; - $.each(json.results, function (i, v) { - if (v.status == "not_agreed") { - htmlInbox += '
    ' + - '

    Этап

    ' + - '' + - '' + - '' + - '' + - '' + - '
    '; - } else { - statusNotAgreed = false; - htmlInboxStage = ""; - htmlInbox += '
    ' + - '

    Этап ' + v.pos + '' + v.name + '

    ' + - '

    Результаты этапа:' + v.result + '

    ' + - '

    до 16.03.2015

    ' + v.cost + '
    '; - - } - }); - - if (statusNotAgreed) { - htmlInbox += '
    Перейти в режим безопасной сделки' + - '
    ' + - 'отправить на согласование
    '; - } - htmlInbox = htmlInboxStage + htmlInbox; - $("#order-stages").html(htmlInbox); - } - }); + getStages(orderId); + +{# $.ajax({#} +{# url: '/api/stages/',#} +{# type: 'GET',#} +{# data: {csrfmiddlewaretoken: csrftoken, 'order': orderId},#} +{# dataType: 'json',#} +{# success: function (json) {#} +{# var stageCount = json.results.length;#} +{# if (stageCount == 0){#} +{# stageCountVal = 1;#} +{# }else{#} +{# stageCountVal = stageCount;#} +{# }#} +{##} +{# var htmlInbox = "";#} +{##} +{# var htmlInboxStage = '

    Какое кол-во этапов подразумевает работа? ' +#} +{# '

    ';#} +{##} +{# if (stageCount == 0){#} +{# htmlInboxStage += '
    ' +#} +{# '

    Этап 1

    ' +#} +{# '' +#} +{# '' +#} +{# ' />' +#} +{# '' +#} +{# '' +#} +{# '
    ';#} +{# }#} +{# var statusNotAgreed = true;#} +{# $.each(json.results, function (i, v) {#} +{# if (v.status == "not_agreed") {#} +{# htmlInbox += '
    ' +#} +{# '

    Этап

    ' +#} +{# '' +#} +{# '' +#} +{# '' +#} +{# '' +#} +{# '' +#} +{# '
    ';#} +{# } else {#} +{# statusNotAgreed = false;#} +{# htmlInboxStage = "";#} +{# htmlInbox += '
    ' +#} +{# '

    Этап ' + v.pos + '' + v.name + '

    ' +#} +{# '

    Результаты этапа:' + v.result + '

    ' +#} +{# '

    до 16.03.2015

    ' + v.cost + '
    ';#} +{##} +{# }#} +{# });#} +{##} +{# if (statusNotAgreed) {#} +{# htmlInbox += '
    Перейти в режим безопасной сделки' +#} +{# '
    ' +#} +{# 'отправить на согласование
    ';#} +{# }#} +{# htmlInbox = htmlInboxStage + htmlInbox;#} +{# $("#order-stages").html(htmlInbox);#} +{# }#} +{# });#} }); @@ -452,6 +543,10 @@ }); + + + + var userId = '{{ request.user.pk }}'; var SocketHandler = function () { var url = 'ws://127.0.0.1:8888/chat/' + userId + '/'; diff --git a/chat/views.py b/chat/views.py index 5c1aba6..6484f04 100644 --- a/chat/views.py +++ b/chat/views.py @@ -54,7 +54,7 @@ class ChatUserView(View): 'created') if request.user.is_owner_team(): - team_orders = request.user.team.team_orders.all() + team_orders = request.user.team.orders.all() self.template_name = 'chat_contractor.html' return render(request, self.template_name, {'orders': orders, diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index 99cce29..fa93c9d 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -1,7 +1,8 @@ {% extends 'partials/base.html' %} {% load humanize %} - +{% load thumbnail %} +{% load specializtions_tags %} {% block content %} {% include 'partials/header.html' %} @@ -311,8 +312,7 @@ {% elif request.user.is_contractor %} - - +
    @@ -415,11 +415,7 @@ {% elif request.user.is_customer %} - - - - - +

    Исполнители

    @@ -449,62 +445,48 @@

    Новые исполнители

    - - - - - - - - - - + + {% for answer_p in project.answers.all %}
    - execitor-image + {% thumbnail answer_p.author.avatar "126x125" crop="center" as im %} + execitor-image + {% endthumbnail %}

    - Иванов Петр Иванович [ivanov_petr] + {{ answer_p.author.get_full_name }} [{{ answer_p.author.username }}]

    На сайте 8 лет и 3 месяца

    Свободен
    - + {% ratings_widget answer_p.author.pk 'restList2' %} + {% if answer_p.author.cro %}

    Есть допуск СРО

    + {% endif %}

    Цена: - 35 000 + {{ answer_p.budget }}

    - Срок: 3 недели + Срок: {{ answer_p.term }} of {{ answer_p.term_type }}

    -

    Опубликован: 22.04.2016

    +

    Опубликован: {{ answer_p.created | date:"M d, Y" }}

    Кандидат - + предложить проект @@ -545,7 +527,7 @@

    - Иванов Петр Иванович + Иванов Петр Иванович

    13.01.2016 / 21:05 @@ -565,7 +547,7 @@

    - Иванов Петр Иванович + Иванов Петр Иванович

    13.01.2016 / 21:05 @@ -581,6 +563,7 @@
    + {% endfor %} {% endif %} diff --git a/projects/views.py b/projects/views.py index 5849bf0..7b4c5c3 100644 --- a/projects/views.py +++ b/projects/views.py @@ -175,7 +175,7 @@ class ProjectFilterView(BaseMixin, View): '
    {realty_form}
    ' ).format(realty_form=pformat(realty_form.errors))) - + # import code; code.interact(local=dict(globals(), **locals())) paginator = Paginator(projects.all(), settings.PAGE_SIZE) page = request.GET.get('page') diff --git a/ratings/templates/templatetags/ratings_widget.html b/ratings/templates/templatetags/ratings_widget.html index fe7f745..35d53ae 100644 --- a/ratings/templates/templatetags/ratings_widget.html +++ b/ratings/templates/templatetags/ratings_widget.html @@ -1,4 +1,4 @@ -
      +
      • Рейтинг: {{ ratings }}
      • Безопасные сделки: 0
      • diff --git a/ratings/templatetags/specializtions_tags.py b/ratings/templatetags/specializtions_tags.py index b79e82c..ba41ca1 100644 --- a/ratings/templatetags/specializtions_tags.py +++ b/ratings/templatetags/specializtions_tags.py @@ -30,6 +30,7 @@ def ratings_widget(context, user_id, class_name=None): ratings = User.objects.get(pk=user_id).rating return { 'ratings': ratings, + 'class_name': class_name } @register.inclusion_tag("templatetags/ratings_widget.html", takes_context=True) diff --git a/templates/registration/login.html b/templates/registration/login.html index b4d02ba..b155cc5 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,24 +1,32 @@ {% extends 'partials/base.html' %} {% block content %} -
        -

        Вход на сайт

        -
        -
        - {{ form.errors }} - {% csrf_token %} -
        - -
        -
        - -
        -
        - -
        + {% include 'partials/header.html' %} +
        +
        +
        +

        Вход на сайт

        +
        +
        + {{ form.errors }} + {% csrf_token %} +
        + +
        +
        + +
        +
        + +
        - + + +
        + {% include 'partials/footer.html' %} +
        +
        -
        {% endblock %} -a + diff --git a/users/views.py b/users/views.py index e7a5396..951c541 100644 --- a/users/views.py +++ b/users/views.py @@ -226,13 +226,13 @@ class ContractorFilterView(BaseMixin, View): if get_teams: - teams = Team.objects.filter(Q(users__cro=cro) | Q(owner__cro=cro)) + teams = Team.objects.filter(Q(contractors__cro=cro) | Q(owner__cro=cro)) if specialization: teams = teams.filter( ( - Q(users__contractor_specializations__lft__gte=specialization.lft) - & Q(users__contractor_specializations__rght__lte=specialization.rght) + Q(contractors__contractor_specializations__lft__gte=specialization.lft) + & Q(contractors__contractor_specializations__rght__lte=specialization.rght) ) | ( Q(owner__contractor_specializations__lft__gte=specialization.lft) & Q(owner__contractor_specializations__rght__lte=specialization.rght) @@ -242,8 +242,8 @@ class ContractorFilterView(BaseMixin, View): if location: teams = teams.filter( ( - Q(users__location__lft__gte=location.lft) - & Q(users__location__rght__lte=location.rght) + Q(contractors__location__lft__gte=location.lft) + & Q(contractors__location__rght__lte=location.rght) ) | ( Q(owner__location__lft__gte=location.lft) & Q(owner__location__rght__lte=location.rght) @@ -252,19 +252,19 @@ class ContractorFilterView(BaseMixin, View): if work_type: teams = teams.filter( - Q(users__orders__project__work_type=work_type) + Q(contractors__orders__project__work_type=work_type) | Q(owner__orders__project__work_type=work_type), ) if build_classif: teams = teams.filter( - Q(users__orders__project__realty__building_classification=build_classif) + Q(contractors__orders__project__realty__building_classification=build_classif) | Q(owner__orders__project__realty__building_classification=build_classif), ) if constr_type: teams = teams.filter( - Q(users__orders__project__realty__construction_type=constr_type) + Q(contractors__orders__project__realty__construction_type=constr_type) | Q(owner__orders__project__realty__construction_type=constr_type), ) diff --git a/work_sell/templates/worksell_detail.html b/work_sell/templates/worksell_detail.html index a3ca0dd..f4e71d0 100644 --- a/work_sell/templates/worksell_detail.html +++ b/work_sell/templates/worksell_detail.html @@ -65,8 +65,8 @@
        - -
        +шь +
        {% for photo in object.photos.all %}
        {% endfor %} @@ -74,7 +74,7 @@
        -
        +
        {% for photo in object.photos.all %}
        {% endfor %} From c2da36a4f01b738bf347e4ef68e153fc185ede60 Mon Sep 17 00:00:00 2001 From: PekopT Date: Wed, 10 Aug 2016 18:02:34 +0300 Subject: [PATCH 8/9] gunicorn file --- archilance/settings/gunicorn.conf.py | 9 +++++++++ archilance/wsgi.py | 2 +- requirements/base.txt | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 archilance/settings/gunicorn.conf.py diff --git a/archilance/settings/gunicorn.conf.py b/archilance/settings/gunicorn.conf.py new file mode 100644 index 0000000..84788b2 --- /dev/null +++ b/archilance/settings/gunicorn.conf.py @@ -0,0 +1,9 @@ +bind = '127.0.0.1:8046' +workers = 3 +user = "www-data" +reload = True + +try: + from local_gunicorn import * +except ImportError: + pass diff --git a/archilance/wsgi.py b/archilance/wsgi.py index 69856cf..1286ecd 100644 --- a/archilance/wsgi.py +++ b/archilance/wsgi.py @@ -11,7 +11,7 @@ from django.core.wsgi import get_wsgi_application from django.template.base import Variable import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "archilance.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "archilance.settings.prod") application = get_wsgi_application() diff --git a/requirements/base.txt b/requirements/base.txt index cfc10d3..0e1edab 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -38,3 +38,4 @@ sqlparse==0.1.19 tornado==4.3 natsort django-mathfilters +gunicorn==19.6.0 From 67a1d918ee59aafcb8f3a6184d74f4fbe149bb7d Mon Sep 17 00:00:00 2001 From: Mukhtar Date: Wed, 10 Aug 2016 18:14:33 +0300 Subject: [PATCH 9/9] #ARC-27 database dbname rename fix --- archilance/settings/base.py | 2 +- chat/templates/chat_customer.html | 12 +++++++++--- chat/testapp.py | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 0600cb5..9b25660 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -111,7 +111,7 @@ WSGI_APPLICATION = 'archilance.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'archilance2', + 'NAME': 'archilance', 'USER': 'postgres', 'PASSWORD': 'postgres', 'HOST': 'localhost', diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 3220cc2..5f8f066 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -272,7 +272,7 @@ $.each(json.results, function (i, v) { if (v.status == "not_agreed") { htmlInbox += '
        ' + - '

        Этап

        ' + + '

        Этап

        ' + '' + '' + '' + @@ -334,6 +334,8 @@ }); $(".update-stages-form").each(function(i,v){ + var currentStageId = parseInt($(this).attr('data-order-id')); + alert(currentStageId); $.ajax({ url: '/api/stages/' + currentStageId + '/', type: 'PUT', @@ -345,10 +347,14 @@ success: function(json){ console.log(json); }, + error: function(e){ + console.log('error'); + console.log(e); + } + }); + }); - }) - }); var currentOrderId = $(this).attr('data-order-id'); diff --git a/chat/testapp.py b/chat/testapp.py index 0922d45..fe64028 100644 --- a/chat/testapp.py +++ b/chat/testapp.py @@ -92,7 +92,7 @@ if __name__ == '__main__': ioloop = IOLoop.instance() application.db = momoko.Pool( - dsn='dbname=archilance2 user=postgres password=postgres host=localhost', + dsn='dbname=archilance user=postgres password=postgres host=localhost', size=1, ioloop=ioloop, )