From 54728c54b5f9644793df3943e88b78aff27bec98 Mon Sep 17 00:00:00 2001
From: booblegum <booblegum42@gmail.com>
Date: Thu, 22 Dec 2016 12:24:03 +0300
Subject: [PATCH] =?UTF-8?q?PR-45=20=D0=9C=D0=BE=D0=B4=D0=B8=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F=20=D0=97=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=D1=87=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Изменена форма редактирования Заказчика
---
 users/templates/user_profile_edit.html | 168 +++++++++++++------------
 users/views.py                         |   6 +-
 2 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/users/templates/user_profile_edit.html b/users/templates/user_profile_edit.html
index f87db85..82d1fe5 100644
--- a/users/templates/user_profile_edit.html
+++ b/users/templates/user_profile_edit.html
@@ -3,10 +3,6 @@
 {% load thumbnail %}
 {% load sass_tags %}
 {% block head_css %}
-{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/fonts.css" %}'>#}
-{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/selected-container.css" %}'>#}
-{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/editable-container.css" %}'>#}
-{#    <link rel='stylesheet' href='{% static "lib/proekton-components/css/select-box.css" %}'>#}
     <link rel='stylesheet' href='{% sass_src "lib/proekton-components/sass/components.sass" %}'>
     <link rel='stylesheet' href='{% static "css/project_filter.css" %}'>{#  other  #}
     <link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
@@ -16,19 +12,16 @@
 
 {% block content %}
     {% include 'partials/header.html' %}
-    {#                            {% if request.user.is_customer %}#}
-    {#                                <input type="hidden" name="next"#}
-    {#                                       value="{% url 'users:customer-profile-open-projects' pk=pk %}">#}
-    {#                            {% elif request.user.is_contractor %}#}
-    {#                                <input type="hidden" name="next" value="{% url 'users:contractor-profile' pk=pk %}">#}
-    {#                            {% endif %}#}
-
     <div class="container mainScore">
-
         <div class="row mainContent">
             <form method="POST" enctype="multipart/form-data" novalidate>
                 {% csrf_token %}
-                <input type="hidden" name="next" value="{% url 'users:contractor-profile' pk=pk %}">
+                {% if request.user.is_customer %}
+                    <input type="hidden" name="next" value="{% url 'users:customer-profile' pk=pk %}">
+                {% else %}
+                    <input type="hidden" name="next" value="{% url 'users:contractor-profile' pk=pk %}">
+                {% endif %}
+
                 <div class="col-lg-12">
                     <div class="row row-eq-height">
                         <div class="col-lg-3 -live-image-avatar-upload-container">
@@ -64,10 +57,19 @@
                             <div class="row">
                                 <div class="col-lg-12">
                                     <div class="bottom-line">
-                                    <span class="header">
-                                        Параметры заполнения прифоля влияют на фильтр поиска специалистов, ранжирования в списке
-                                        <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
-                                    </span>
+                                        {% if request.user.is_customer %}
+                                            <span class="header">
+                                                Полное заполнение профиля влияет на количество откликиков исполнителей и “безопасную сделку”
+                                                <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
+                                            </span>
+                                        {% else %}
+                                            <span class="header">
+                                                Параметры заполнения прифоля влияют на фильтр поиска специалистов, ранжирования в списке
+                                                <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
+                                            </span>
+                                        {% endif %}
+
+
                                     </div>
                                 </div>
                             </div>
@@ -116,88 +118,90 @@
                             </div>
                         </div>
                     </div> <!-- top -->
-
-                    <div class="row">
-                        <div style="padding-bottom: 10px" class="col-lg-12">
-                            <div class="row">
-                                <div class="col-lg-offset-3 col-lg-9">
-                                    <div class="top-line">
+                    {% if request.user.is_contractor %}
+                        <div class="row">
+                            <div style="padding-bottom: 10px" class="col-lg-12">
+                                <div class="row">
+                                    <div class="col-lg-offset-3 col-lg-9">
+                                        <div class="top-line">
                                 <span class="header block-header">
                                     Мой опыт работы в проектировании / дизайне / сопровождении проектной документации
                                     <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
                                 </span>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-lg-12">
-                                    <div class="" id="select-box-1">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-lg-3">
-                                    <div class="vertical-child" id="select-box-2">
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <div class="" id="select-box-1">
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="col-lg-3">
-                                    <div class="vertical-child" id="select-box-3">
+                                <div class="row">
+                                    <div class="col-lg-3">
+                                        <div class="vertical-child" id="select-box-2">
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="col-lg-3">
-                                    <div class="vertical-child" id="select-box-4">
+                                    <div class="col-lg-3">
+                                        <div class="vertical-child" id="select-box-3">
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="col-lg-3">
-                                    <div class="vertical-child" id="select-box-5">
+                                    <div class="col-lg-3">
+                                        <div class="vertical-child" id="select-box-4">
+                                        </div>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-lg-12">
-                                    <div class="selected-container horizontal" id="selected-spec">
-                                        <input type="hidden" name="{{ form.contractor_specializations.html_name }}"
-                                               value="{{ form.contractor_specializations.value }}">
+                                    <div class="col-lg-3">
+                                        <div class="vertical-child" id="select-box-5">
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-lg-3">
-                                    <div class="vertical-child" id="sb-building-classification">
-                                    </div>
-                                    <div class="vertical-child" id="sb-building-sub-classification">
-                                    </div>
-                                    <div class="selected-container" id="selected-building-classification">
-                                        <input type="hidden"
-                                               name="{{ form.contractor_building_classifications.html_name }}"
-                                               value="{{ form.contractor_building_classifications.value }}">
+                                <div class="row">
+                                    <div class="col-lg-12">
+                                        <div class="selected-container horizontal" id="selected-spec">
+                                            <input type="hidden" name="{{ form.contractor_specializations.html_name }}"
+                                                   value="{{ form.contractor_specializations.value }}">
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="col-lg-3">
-                                    <div class="vertical-child" id="sb-construction-type">
-                                    </div>
-                                    <div class="selected-container" id="selected-construction-type">
-                                        <input type="hidden" name="{{ form.contractor_construction_types.html_name }}"
-                                               value="{{ form.contractor_construction_types.value }}">
+                                <div class="row">
+                                    <div class="col-lg-3">
+                                        <div class="vertical-child" id="sb-building-classification">
+                                        </div>
+                                        <div class="vertical-child" id="sb-building-sub-classification">
+                                        </div>
+                                        <div class="selected-container" id="selected-building-classification">
+                                            <input type="hidden"
+                                                   name="{{ form.contractor_building_classifications.html_name }}"
+                                                   value="{{ form.contractor_building_classifications.value }}">
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="col-lg-3">
-                                    <div class="select-box-header vertical-child">
-                                        <span style="width: 180px" class="header">Требуется допуск (СРО)</span>
-                                        <i class="fa fa-question-circle-o" aria-hidden="true"
-                                           title="bla-bla-bla..."></i>
+                                    <div class="col-lg-3">
+                                        <div class="vertical-child" id="sb-construction-type">
+                                        </div>
+                                        <div class="selected-container" id="selected-construction-type">
+                                            <input type="hidden"
+                                                   name="{{ form.contractor_construction_types.html_name }}"
+                                                   value="{{ form.contractor_construction_types.value }}">
+                                        </div>
                                     </div>
+                                    <div class="col-lg-3">
+                                        <div class="select-box-header vertical-child">
+                                            <span style="width: 180px" class="header">Требуется допуск (СРО)</span>
+                                            <i class="fa fa-question-circle-o" aria-hidden="true"
+                                               title="bla-bla-bla..."></i>
+                                        </div>
 
-                                    <div class="custom-check">
-                                        <div class="checked"></div>
-                                        <div style="display: none" class="not-checked"></div>
-                                        <input name="{{ form.cro.html_name }}" type="checkbox" hidden
-                                                {% if form.cro.value %} checked{% endif %}>
+                                        <div class="custom-check">
+                                            <div class="checked"></div>
+                                            <div style="display: none" class="not-checked"></div>
+                                            <input name="{{ form.cro.html_name }}" type="checkbox" hidden
+                                                    {% if form.cro.value %} checked{% endif %}>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                    </div> <!-- center -->
+                        </div> <!-- center -->
+                    {% endif %}
                     <div class="row">
                         <div class="col-lg-12">
                             <div class="row">
@@ -205,7 +209,7 @@
                                     <div class="top-line" style="padding-top: 15px">
                                         <div class="btn-group toggle" role="group" aria-label="...">
                                             <a style="z-index: 0" href="#"
-{#                                            <a style="z-index: 0" href="{% url 'users:user-profile-edit' pk=pk %}"#}
+                                                    {#                                            <a style="z-index: 0" href="{% url 'users:user-profile-edit' pk=pk %}"#}
                                                role="button"
                                                class="btn btn-default active">Общая информация</a>
                                             <a href="#"
@@ -229,7 +233,8 @@
                                         </div>
                                         <input class="simple-select" placeholder="Выберите"
                                                value="{{ form.get_gender_display }}" readonly>
-                                        <input type="hidden" name="{{ form.gender.html_name }}" value="{{ form.gender.value }}">
+                                        <input type="hidden" name="{{ form.gender.html_name }}"
+                                               value="{{ form.gender.value }}">
                                         <div class="select-box-options" style="width: 100%; display: none">
                                             <div style="min-width: inherit" class="box-wrapper">
                                                 <ul>
@@ -250,7 +255,8 @@
                                         </div>
                                         <input class="simple-select" placeholder="Выберите"
                                                value="{{ form.get_status_display }}" readonly>
-                                        <input type="hidden" name="{{ form.contractor_status.html_name }}" value="{{ form.contractor_status.value }}">
+                                        <input type="hidden" name="{{ form.contractor_status.html_name }}"
+                                               value="{{ form.contractor_status.value }}">
                                         <div class="select-box-options" style="width: 100%; display: none">
                                             <div style="min-width: inherit" class="box-wrapper">
                                                 <ul>
diff --git a/users/views.py b/users/views.py
index cc32c27..ef064c6 100644
--- a/users/views.py
+++ b/users/views.py
@@ -130,13 +130,13 @@ class UserProfileEditViewFull(BaseMixin, View):
     def post(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
 
-        specs = tuple(filter(None, re.split(r'\s|,|;', request.POST.get('contractor_specializations'))))
+        specs = tuple(filter(None, re.split(r'\s|,|;', request.POST.get('contractor_specializations', ''))))
         request.POST.setlist('contractor_specializations', specs)
 
-        builds = tuple(filter(None, re.split(r'\s|,|;', request.POST.get('contractor_building_classifications'))))
+        builds = tuple(filter(None, re.split(r'\s|,|;', request.POST.get('contractor_building_classifications', ''))))
         request.POST.setlist('contractor_building_classifications', builds)
 
-        constructs = tuple(filter(None, re.split(r'\s|,|;', request.POST.get('contractor_construction_types'))))
+        constructs = tuple(filter(None, re.split(r'\s|,|;', request.POST.get('contractor_construction_types', ''))))
         request.POST.setlist('contractor_construction_types', constructs)
 
         form = self.form_class(request.POST, request=request, instance=request.user)