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

PR-45 Модификация редактирования профиля Заказчика

Browse Source 
Изменена форма редактирования Заказчика
remotes/origin/PR-45
booblegum 9 years ago
parent 8ec740939a
commit 54728c54b5
2 changed files with 90 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 168
      users/templates/user_profile_edit.html
  2. 6
      users/views.py

168
users/templates/user_profile_edit.html
Unescape View File

@ -3,10 +3,6 @@
{% load thumbnail %} {% load thumbnail %}
{% load sass_tags %} {% load sass_tags %}
{% block head_css %} {% 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='{% sass_src "lib/proekton-components/sass/components.sass" %}'>
<link rel='stylesheet' href='{% static "css/project_filter.css" %}'>{# other #} <link rel='stylesheet' href='{% static "css/project_filter.css" %}'>{# other #}
<link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'> <link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
@ -16,19 +12,16 @@
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% 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="container mainScore">
<div class="row mainContent"> <div class="row mainContent">
<form method="POST" enctype="multipart/form-data" novalidate> <form method="POST" enctype="multipart/form-data" novalidate>
{% csrf_token %} {% 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="col-lg-12">
<div class="row row-eq-height"> <div class="row row-eq-height">
<div class="col-lg-3 -live-image-avatar-upload-container"> <div class="col-lg-3 -live-image-avatar-upload-container">
@ -64,10 +57,19 @@
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="bottom-line"> <div class="bottom-line">
<span class="header"> {% if request.user.is_customer %}
Параметры заполнения прифоля влияют на фильтр поиска специалистов, ранжирования в списке <span class="header">
<i class="fa fa-question-circle-o" aria-hidden="true" title=""></i> Полное заполнение профиля влияет на количество откликиков исполнителей и “безопасную сделку”
</span> <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> </div>
</div> </div>
@ -116,88 +118,90 @@
</div> </div>
</div> </div>
</div> <!-- top --> </div> <!-- top -->
{% if request.user.is_contractor %}
<div class="row"> <div class="row">
<div style="padding-bottom: 10px" class="col-lg-12"> <div style="padding-bottom: 10px" class="col-lg-12">
<div class="row"> <div class="row">
<div class="col-lg-offset-3 col-lg-9"> <div class="col-lg-offset-3 col-lg-9">
<div class="top-line"> <div class="top-line">
<span class="header block-header"> <span class="header block-header">
Мой опыт работы в проектировании / дизайне / сопровождении проектной документации Мой опыт работы в проектировании / дизайне / сопровождении проектной документации
<i class="fa fa-question-circle-o" aria-hidden="true" title=""></i> <i class="fa fa-question-circle-o" aria-hidden="true" title=""></i>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-lg-12">
<div class="col-lg-12"> <div class="" id="select-box-1">
<div class="" id="select-box-1"> </div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-3">
<div class="vertical-child" id="select-box-2">
</div> </div>
</div> </div>
<div class="col-lg-3"> <div class="row">
<div class="vertical-child" id="select-box-3"> <div class="col-lg-3">
<div class="vertical-child" id="select-box-2">
</div>
</div> </div>
</div> <div class="col-lg-3">
<div class="col-lg-3"> <div class="vertical-child" id="select-box-3">
<div class="vertical-child" id="select-box-4"> </div>
</div> </div>
</div> <div class="col-lg-3">
<div class="col-lg-3"> <div class="vertical-child" id="select-box-4">
<div class="vertical-child" id="select-box-5"> </div>
</div> </div>
</div> <div class="col-lg-3">
</div> <div class="vertical-child" id="select-box-5">
<div class="row"> </div>
<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>
</div> <div class="row">
<div class="row"> <div class="col-lg-12">
<div class="col-lg-3"> <div class="selected-container horizontal" id="selected-spec">
<div class="vertical-child" id="sb-building-classification"> <input type="hidden" name="{{ form.contractor_specializations.html_name }}"
</div> value="{{ form.contractor_specializations.value }}">
<div class="vertical-child" id="sb-building-sub-classification"> </div>
</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>
<div class="col-lg-3"> <div class="row">
<div class="vertical-child" id="sb-construction-type"> <div class="col-lg-3">
</div> <div class="vertical-child" id="sb-building-classification">
<div class="selected-container" id="selected-construction-type"> </div>
<input type="hidden" name="{{ form.contractor_construction_types.html_name }}" <div class="vertical-child" id="sb-building-sub-classification">
value="{{ form.contractor_construction_types.value }}"> </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> <div class="col-lg-3">
<div class="col-lg-3"> <div class="vertical-child" id="sb-construction-type">
<div class="select-box-header vertical-child"> </div>
<span style="width: 180px" class="header">Требуется допуск (СРО)</span> <div class="selected-container" id="selected-construction-type">
<i class="fa fa-question-circle-o" aria-hidden="true" <input type="hidden"
title="bla-bla-bla..."></i> name="{{ form.contractor_construction_types.html_name }}"
value="{{ form.contractor_construction_types.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>
<div class="custom-check"> <div class="custom-check">
<div class="checked"></div> <div class="checked"></div>
<div style="display: none" class="not-checked"></div> <div style="display: none" class="not-checked"></div>
<input name="{{ form.cro.html_name }}" type="checkbox" hidden <input name="{{ form.cro.html_name }}" type="checkbox" hidden
{% if form.cro.value %} checked{% endif %}> {% if form.cro.value %} checked{% endif %}>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div> <!-- center -->
</div> <!-- center --> {% endif %}
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row"> <div class="row">
@ -205,7 +209,7 @@
<div class="top-line" style="padding-top: 15px"> <div class="top-line" style="padding-top: 15px">
<div class="btn-group toggle" role="group" aria-label="..."> <div class="btn-group toggle" role="group" aria-label="...">
<a style="z-index: 0" href="#" <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" role="button"
class="btn btn-default active">Общая информация</a> class="btn btn-default active">Общая информация</a>
<a href="#" <a href="#"
@ -229,7 +233,8 @@
</div> </div>
<input class="simple-select" placeholder="Выберите" <input class="simple-select" placeholder="Выберите"
value="{{ form.get_gender_display }}" readonly> 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 class="select-box-options" style="width: 100%; display: none">
<div style="min-width: inherit" class="box-wrapper"> <div style="min-width: inherit" class="box-wrapper">
<ul> <ul>
@ -250,7 +255,8 @@
</div> </div>
<input class="simple-select" placeholder="Выберите" <input class="simple-select" placeholder="Выберите"
value="{{ form.get_status_display }}" readonly> 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 class="select-box-options" style="width: 100%; display: none">
<div style="min-width: inherit" class="box-wrapper"> <div style="min-width: inherit" class="box-wrapper">
<ul> <ul>

6
users/views.py
Unescape View File

@ -130,13 +130,13 @@ class UserProfileEditViewFull(BaseMixin, View):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
context = self.get_context_data(**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) 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) 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) request.POST.setlist('contractor_construction_types', constructs)
form = self.form_class(request.POST, request=request, instance=request.user) form = self.form_class(request.POST, request=request, instance=request.user)

Write Preview
Loading…
Cancel
Save