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

#ARC-16 fixes

Browse Source
remotes/origin/PR-39
Mukhtar 10 years ago
parent 6df50085d1
commit dee5da9c56
7 changed files with 83 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      assets/js/chat.js
  2. 34
      chat/templates/chat_contractor.html
  3. 51
      chat/templates/chat_customer.html
  4. 8
      chat/templates/reverse_stage_modal.html
  5. 21
      chat/templates/review_add_modal.html
  6. 1
      chat/views.py
  7. 2
      projects/admin.py

4
assets/js/chat.js
Unescape View File

@ -100,12 +100,14 @@ function csrfSafeMethod(method) {
$(function () {
setTimeout(function () {
$(".user-block").first().trigger('click');
}, 10);
setTimeout(function () {
$(".order-block").first().trigger('click');
$(".order-block").last().trigger('click');
$("a[href='#tab2']").trigger('click');
}, 100);

34
chat/templates/chat_contractor.html
Unescape View File

@ -175,6 +175,13 @@
</div>
<div class="closeChat closeChat1" id="leaveReview" style="display: none;">
<a href="#" data-toggle="modal" data-target="#review-add">
Закрыть проект<br>и оставить отзыв
</a>
</div>
<div class="textAreaBlock2 box-sizing disTab">
<ul class="notes-block">
</ul>
@ -475,8 +482,12 @@
var stagesInWork = [];
var stagesResults = data.stages;
var statusNotAgreed = false;
var stagesCompleted = [];
if (stagesResults.length > 0) {
$.each(stagesResults, function (i, v) {
if (v.status == "completed"){
stagesCompleted.push(v);
}
if(v.status == "not_agreed"){
statusNotAgreed = true;
}
@ -490,10 +501,12 @@
stagesInWork.push(v);
}
if (v.is_paid) {
stagesReservedHtml += '<li class="reserved">Сумма за этап ' + v.pos + '.Зарезервирована.</li>';
} else {
stagesReservedHtml += '<li class="unreserved">Сумма за этап ' + v.pos + '.Не зарезервирована.</li>';
if(data.secure) {
if (v.is_paid) {
stagesReservedHtml += '<li class="reserved">Сумма за этап ' + v.pos + '.Зарезервирована.</li>';
} else {
stagesReservedHtml += '<li class="unreserved">Сумма за этап ' + v.pos + '.Не зарезервирована.</li>';
}
}
htmlInbox += '<div data-id="' + v.id + '" class="numberStepp box-sizing stage-block-approve"><div class="insetNumStepp">' +
@ -509,9 +522,14 @@
}
}
$("#order-stages").html(htmlInbox);
$(".stages-paid").html(stagesReservedHtml);
if(data.secure) {
$("#reserveSpace").show();
} else {
$("#reserveSpace").hide();
}
if (stagesInWork.length > 0){
$("#completeWork").show();
@ -531,6 +549,10 @@
}else{
$("#completeWork").hide();
}
if(stagesCompleted.length == stagesResults.length){
$("#leaveReview").show();
}
});
@ -592,8 +614,6 @@
});
});
// Вытащить сообщения для конактов
$('.user-block').on('click', function () {
var userId = $(this).attr('data-id');

51
chat/templates/chat_customer.html
Unescape View File

@ -105,7 +105,7 @@
<div class="messageBlock box-sizing disTab">
<p>Заказы</p>
{% for order in orders %}
<div class="orderBlock box-sizing order-block"
<div class="orderBlock box-sizing order-block" data-project-id="{{ order.id }}"
id="orderBlock{{ order.order.id }}" data-secure-deal="{% if order.order.secure %}true{% else %}false{% endif %}" data-recipent-id="{{ order.order.contractor.pk }}" data-id="{{ order.order.id }}">
<span class="dimovChat"></span>
<p class="titleOB">{{ order }}</p>
@ -183,7 +183,11 @@
</div>
</div>
<div class="closeChat closeChat1" id="leaveReview" style="display: none;">
<a href="#" data-toggle="modal" data-target="#review-add">
Закрыть проект<br>и оставить отзыв
</a>
</div>
<div class="textAreaBlock2 box-sizing disTab">
<p>Для заметок</p>
@ -192,13 +196,6 @@
</div>
<div class="closeChat closeChat1" id="leaveReview" style="display: none;">
<a href="#" data-toggle="modal" data-target="#review-add">
Закрыть проект<br>и оставить отзыв
</a>
</div>
<!-- Review add -->
{% include 'review_add_modal.html' %}
@ -230,10 +227,9 @@
var csrftoken = getCookie('csrftoken');
$("#reserve-button").on("click",function(e) {
e.preventDefault();
e.preventDefault();
$("#reserve-stage-modal").modal('show');
var orderId = $(this).attr('data-order-id');
$.ajax({
url: '/api/stages/',
type: 'GET',
@ -244,11 +240,13 @@
var totalSum = 0;
var stagesIds = '';
$.each(json.results, function (i, v) {
console.log(v.cost);
totalSum += parseInt(v.cost);
outputValues += '<option data-stage-sum="' + v.cost + '" value="'+ v.id +'">' + v.name + '</option>';
stagesIds += v.id + ';'
if((v.status == 'in_process') && (!v.is_paid)) {
totalSum += parseInt(v.cost);
outputValues += '<option data-stage-sum="' + v.cost + '" value="' + v.id + '">' + v.name + '</option>';
stagesIds += v.id + ';'
}
});
$("#stagesSelect").html(outputValues);
$(".totalSum").text(totalSum);
$("#choiceWayOrder").val(totalSum)
@ -293,7 +291,6 @@
type: 'GET',
data:{csrfmiddlewaretoken: csrftoken},
dataType: 'json',
}).then(function(data){
var stagesResults = data.stages;
var stageCount = stagesResults.length;
@ -321,8 +318,12 @@
var statusNotAgreed = true;
var stagesInWork = [];
var stagesPaidProcess = [];
var stagesCompleted = [];
$.each(stagesResults, function (i, v) {
if (v.status == "completed"){
stagesCompleted.push(v);
}
if(!data.secure){
if(v.status == "in_process") {
stagesInWork.push(v);
@ -347,7 +348,7 @@
htmlInbox += '<div class="numberStepp box-sizing"><div class="insetNumStepp">' +
'<p class="titleNumStepp"><span>Этап ' + v.pos + '</span>' + v.name + '</p>' +
'<p class="textNumStepp">Результаты этапа:' + v.result + '</p><div>' +
'<p>до Дата</p><span>' + v.cost + '<i class="fa fa-rub"></i></span>' +
'<p>до '+ v.term +'</p><span>' + v.cost + '<i class="fa fa-rub"></i></span>' +
'</div></div></div>';
}
@ -377,7 +378,7 @@
var stage = stagesInWork[0];
var stageWork = '<p>В работе '+ stage.name +'</p> ' +
'<p>Результат этапа : '+ stage.result +'</p>' +
'<p>Срок сдачи 25.08.2016 <b>' + stage.cost + 'р.</b></p>';
'<p>Срок сдачи '+ stage.term +'<b>' + stage.cost + 'р.</b></p>';
if (stage.close_contractor){
stageWork += '<a href="#" class="closeStage" data-order-id="'+ orderId + '" data-sender-id="{{ request.user.pk }}"' +
@ -385,6 +386,17 @@
}
$("#stagesWork").html(stageWork);
}
if (!data.secure){
$("#reserveSpace").hide();
}
if(stagesCompleted.length == stagesResults.length){
$("#leaveReview").show();
console.log("Все этапы завершены");
}
});
}
@ -536,11 +548,12 @@
$(this).addClass('orAct');
var orderId = $(this).attr('data-id');
var projectId = $(this).attr('data-project-id');
var recipentId = $(this).attr('data-recipent-id');
var secureOrder = $(this).attr('data-secure-deal');
secureOrder = Boolean(secureOrder);
$("#chat-order-add #orderId").val(orderId);
$("#projectReviewId").val(orderId);
$("#projectReviewId").val(projectId);
$("#reserve-button").attr('data-order-id', orderId);
$("#targetContractorId").val(recipentId);
$("#chat-order-add #recipentId").val(recipentId);

8
chat/templates/reverse_stage_modal.html
Unescape View File

@ -48,20 +48,20 @@
<div class="modal-body">
<div style="height: 150px;">
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Кол-во денег {{ transaction.pk }} </p>
<input type="text" name="sum" id="stageSumPay">
<input type="hidden" name="sum" id="stageSumPay">
<input type='hidden' name='shopId' value='{{ YANDEX_MONEY.shop_id }}'>
<input type='hidden' name='scid' value='{{ YANDEX_MONEY.scid }}'>
<input type='hidden' name='customerNumber' value='{{ user_score.pk }}'>
<input type='hidden' name='paymentType' value='AC'>
<input type='hidden' name='transactionId' value='{{ transaction.pk }}'>
<input type='text' name='stagesId' id='stagesIds' value=''>
<input type='hidden' name='stagesId' id='stagesIds' value=''>
</div>
<button type="submit" class="btn btn-primary btn-lg btn-block">Пополнить</button>
</div>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary">Пополнить</button>
</div>
</form>

21
chat/templates/review_add_modal.html
Unescape View File

@ -24,13 +24,22 @@
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Ваш отзыв</p>
<textarea id="text-new" name="text"></textarea>
<input type="hidden" name="from_customer" value="{{ request.user.pk }}"/>
<input type="hidden" name="target_contractor" id="targetContractorId"/>
<input type="hidden" name="project" id="projectReviewId"/>
{% if request.user.is_customer %}
<input type="text" name="from_customer" value="{{ request.user.pk }}"/>
<input type="hidden" name="from_contractor">
<input type="hidden" name="from_team">
<input type="text" name="target_contractor" id="targetContractorId"/>
<input type="text" name="target_customer">
{% else %}
<input type="hidden" name="from_customer"/>
<input type="hidden" name="from_contractor" value="{{ request.user.pk }}">
<input type="text" name="target_customer">
<input type="hidden" name="from_team">
{% endif %}
<input type="text" name="project" id="projectReviewId"/>
<input type="hidden" name="target_team">
<input type="hidden" name="target_customer">
<input type="hidden" name="from_contractor">
<input type="hidden" name="from_team">
</div>
</div>
</div>

1
chat/views.py
Unescape View File

@ -16,6 +16,7 @@ class ChatUserView(LoginRequiredMixin, View):
template_name = ''
def get(self, request, *args, **kwargs):
print(request.path)
# import code; code.interact(local=dict(globals(), **locals()))
user_id = request.GET.get('user_id',None)
if request.user.is_customer():

2
projects/admin.py
Unescape View File

@ -33,7 +33,7 @@ class ProjectAdmin(admin.ModelAdmin):
class StageAdmin(admin.ModelAdmin):
list_display = ('name','status','pos','order',)
list_display = ('name','status','pos','order','is_paid',)
admin.site.register(Answer)

Write Preview
Loading…
Cancel
Save