Merge branch 'master' of https://bitbucket.org/PekopT/archilance into artur

chat/templates/chat_contractor.html

@@ -101,7 +101,7 @@
                                     <p class="titleOB">{{ order }}</p>
                                     <div class="hideOBB">
                                         <p class="pOB"><span>Исполнитель:</span> {{ request.user.get_full_name }}</p>
-                                        <p class="pOB"><span>Чаты:</span> Иванов, Петров</p>
+
                                         <a href="javascript:void(0)" class="linkChat11">
                                             <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
                                             Полное описание заказа

chat/templates/chat_customer.html

@@ -299,7 +299,7 @@
                                     '<p>Этап <span class="stage-span-id">1</span></p><form class="new-stages-form" id="stage-form">' +
                                     '<label for="">Название</label><input class="form-control" name="name" type="text"  />' +
                                     '<label for="">Цена</label><input class="form-control" name="cost" type="text"  />' +
-                                    '<input class="form-control" name="order" type="text" value="' + orderId + '" class="orderStagesInput"/> />' +
+                                    '<input class="form-control" name="order" type="hidden" value="' + orderId + '" class="orderStagesInput"/>' +
                                     '<label for="">Срок</label><input class="form-control" name="term" type="text" />' +
                                     '<label for="">Результат</label><input class="form-control" name="result" type="text"  />' +
                                     '</form></div>';
@@ -400,11 +400,19 @@
 
             $('#order-stages-tab').on('change', '#countStage', function () {
                 var countStage = parseInt($(this).val());
+                var currentCountStage = $(".numberStepp").length;
+                alert(countStage);
+                alert(currentCountStage);
+
                 var updateFormStages = $(".update-stages-form");
                 var limitCount = countStage + 1;
                 for (var i = 2; i < limitCount; i++) {
                     var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form");
+                    stageCopy.find('.stage-span-id').html(i);
+                    //var j = i-1;
+                   // var prevStage = "#stage" + j;
                     $("#stage1").after(stageCopy);
+
                 }
             });
 

projects/templates/contractor_portfolio_edit.html

@@ -90,8 +90,9 @@
 
         </div>
         <div class="searchF1 polsF1 polsFF links-filter">
-                <input class="btn-submit-link" type="submit" value="Сохранить проект">
-                <input class="btn-submit-link" type="button" value="Отмена">
+                <input type="submit" value="Сохранить" class="btn-submit-link add_file_to_port">
+                <a href="{% url 'users:contractor-profile' request.user.pk %}" class="btn-submit-link add_file_to_port">Отмена</a>
+
 
             </div>
 

users/templates/contractor_profile.html

@@ -148,7 +148,7 @@
                         {% endif %}
 
                         <div class="galleryWork2 disTab">
-                            {% for p in user.portfolios.all %}
+                            {% for p in contractor.portfolios.all %}
                                 <div class="col-lg-4">
                                     <div class="insetCol box-sizing disTab">
                                         <div class="imgGal"
@@ -158,6 +158,7 @@
                                     </div>
                                     <div class="insetCol2 box-sizing disTab">
                                         <p>{{ p.name }}</p>
+                                        {% if request.user.pk == contractor.pk %}
                                         <div class="buttonsImg" disTab>
                                             <a href="{% url 'projects:contractor-portfolio-edit' p.pk %}">
                                                 <div class="insetBI insetBI1">
@@ -176,6 +177,7 @@
 
                                             </div>
                                         </div>
+                                        {% endif %}
                                     </div>
                                 </div>
                             {% endfor %}
@@ -212,7 +214,7 @@
                         {% endif %}
 
                         <div class="galleryWork2 disTab">
-                            {% for ws in user.work_sell.all %}
+                            {% for ws in contractor.work_sell.all %}
                                 <div class="col-lg-4">
                                     <div class="insetCol box-sizing disTab">
                                         <a href="{% url 'work_sell:detail' ws.pk %}">
@@ -233,6 +235,7 @@
                                     </div>
                                     <div class="insetCol2 box-sizing disTab">
                                         <p>{{ ws }}</p>
+                                        {% if request.user.pk == contractor.pk %}
                                         <div class="buttonsImg" disTab>
                                             <div class="insetBI insetBI1">
                                                 <a href="{% url 'work_sell:edit' ws.pk %}">
@@ -251,6 +254,7 @@
 
                                             </div>
                                         </div>
+                                        {% endif %}
                                     </div>
                                 </div>
                             {% endfor %}
@@ -285,14 +289,14 @@
                             </div>
                             <div class="col-lg-9">
                                 <div class="top-summary">
-                                    <p class="name-summ">{{ user.get_full_name }}</p>
+                                    <p class="name-summ">{{ contractor.get_full_name }}</p>
                                     <div id="resume-success"></div>
                                     {% if contractor.contractor_resume.resume_file %}
                                         <a style="display:{% if contractor.contractor_resume.resume_file %}block{% else %}none{% endif %};"href="{% if contractor.contractor_resume.resume_file %}{{ contractor.contractor_resume.resume_file.url }}{% endif %}"
                                            class="download-summ">скачать резюме</a>
                                     {% endif %}
                                     <p class="who-summ">
-                                                                                Мужчина, 24 года, {{ user.date_of_birth }}#}
+                                                                                {{ contractor.gender }},  {{ contractor.date_of_birth }}
                                     </p>
                                     <div class="list-summ-block">
                                         <div class="col-lg-4">

work_sell/views.py

@@ -11,7 +11,7 @@ from django.contrib import messages
 from django.db.models import Q
 from django.core.urlresolvers import reverse
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-from django.http import JsonResponse, HttpResponse
+from django.http import JsonResponse, HttpResponse, HttpResponseForbidden
 from django.core.files.base import ContentFile
 from django.views.generic import ListView, DetailView, CreateView, View, \
     UpdateView, DeleteView, TemplateView
@@ -86,7 +86,7 @@ class WorkSellFilterView(BaseMixin,View):
                 keywords = tuple(filter(None, re.split(r'\s|,|;', keywords)))
 
                 for k in keywords:
-                    work_sells = work_sells.filter(Q(name__icontains=k) | Q(text__icontains=k))
+                    work_sells = work_sells.filter(Q(name__icontains=k) | Q(description__icontains=k))
 
             if specialization:
                 work_sells = work_sells.filter(
@@ -127,9 +127,6 @@ class WorkSellFilterView(BaseMixin,View):
         return render(request, self.template_name, context)
 
 
-
-
-
 class WorkSellDetail(DetailView):
     model = WorkSell
     template_name = 'worksell_detail.html'
@@ -174,6 +171,12 @@ class WorkSellUpdateView(UpdateView):
     form_class = WorkSellForm
     template_name = 'worksell_edit.html'
 
+    def dispatch(self, request, *args, **kwargs):
+        # import code; code.interact(local=dict(globals(), **locals()))
+        if self.get_object().contractor_id != request.user.pk:
+            return HttpResponseForbidden('403 Forbidden')
+        return super().dispatch(request, *args, **kwargs)
+
     def get_success_url(self):
         return reverse('work_sell:list')