From 10032e036aa72918b4211746b7777a49bfd2bbd3 Mon Sep 17 00:00:00 2001
From: PekopT <alex@brilliantov.me>
Date: Mon, 29 Aug 2016 11:28:31 +0300
Subject: [PATCH] various

---
 templates/partials/header.html                |  3 +++
 users/templates/user_financial_info_edit.html | 11 +++++++----
 users/views.py                                | 17 ++++++++---------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/templates/partials/header.html b/templates/partials/header.html
index 248cd94..99be311 100644
--- a/templates/partials/header.html
+++ b/templates/partials/header.html
@@ -89,18 +89,21 @@
                                 <span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
                             </button>
                             <ul class="dropdown-menu menu-drop-new">
+                                {% if request.user.is_contractor %}
                                 <li class="icon_mm1">
                                     <a href="{% url 'auth_login' %}">
                                         Войти заказчиком
                                         <span></span>
                                     </a>
                                 </li>
+                                {% else %}
                                 <li class="icon_mm2">
                                     <a href="{% url 'auth_login' %}">
                                         Войти исполнителем
                                         <span></span>
                                     </a>
                                 </li>
+                                {% endif %}
                                 <li class="icon_mm3">
                                     <a href="{% url 'chat:chat-user' %}">Сообщения<span></span></a>
                                 </li>
diff --git a/users/templates/user_financial_info_edit.html b/users/templates/user_financial_info_edit.html
index fdf4d5f..51f1721 100644
--- a/users/templates/user_financial_info_edit.html
+++ b/users/templates/user_financial_info_edit.html
@@ -106,7 +106,7 @@
                                 <input type="text" class="searchInp box-sizing" value="{{ fin_info_form.fio.value }}" name="{{ fin_info_form.fio.html_name }}">
                             </div>
                             <div class="col-lg-3">
-                                <input type="text" class="box-sizing surr surr2 datepicker" value="{{ fin_info_form.date_of_birth.value }}" name="{{ fin_info_form.date_of_birth.html_name }}">
+                                <input type="text" class="box-sizing surr surr2 datepicker" value="{{ fin_info_form.date_of_birth.value|date:"d.m.Y" }}" name="{{ fin_info_form.date_of_birth.html_name }}">
                             </div>
                             <div class="col-lg-3">
                                 <input type="text" class="box-sizing surr surr2" value="{{ fin_info_form.phone.value }}" name="{{ fin_info_form.phone.html_name }}">
@@ -165,7 +165,7 @@
                                 <input type="text" value="{{ fin_info_form.subdivision_code.value }}" class="box-sizing surr surr2" placeholder="0033" name="{{ fin_info_form.subdivision_code.html_name }}">
                             </div>
                             <div class="col-lg-3">
-                                <input type="text" value="{{ fin_info_form.passport_issue_date.value }}" name="{{ fin_info_form.passport_issue_date.html_name }}" class="box-sizing surr surr2 datepicker" placeholder="11.12.1994">
+                                <input type="text" value="{{ fin_info_form.passport_issue_date.value|date:"d.m.Y" }}" name="{{ fin_info_form.passport_issue_date.html_name }}" class="box-sizing surr surr2 datepicker" placeholder="11.12.1994">
                             </div>
                         </div>
                         
@@ -207,8 +207,11 @@
                                 <input type="text" value="{{ fin_info_form.credit_card_number.value }}" class="box-sizing surr surr2" name="{{ fin_info_form.credit_card_number.html_name }}">
                             </div>
                             <div class="col-lg-3">
-                                {{ fin_info_form.passport_scan.value }}
-                                
+                                {% if fin_info_form.passport_scan.value %}
+{#                                  {{ fin_info_form.passport_scan.value }}#}
+                                  Скан-копия загружена
+                                {% endif %}
+
                                 <div class="upload2 up-l1 take-new">
                                     <input type="file" name="{{ fin_info_form.passport_scan.html_name }}">
                                     <p>Прикрепить файл</p>
diff --git a/users/views.py b/users/views.py
index 4b50b4b..eba8e72 100644
--- a/users/views.py
+++ b/users/views.py
@@ -188,8 +188,6 @@ class ContractorFilterView(BaseMixin, View):
             
             context.update({'last_party_types': last_party_types})
             
-            
-            
             if get_contractors:
                 contractors = User.contractor_objects.all()
                 
@@ -216,9 +214,7 @@ class ContractorFilterView(BaseMixin, View):
                 
                 if constr_type:
                     contractors = contractors.filter(orders__project__realty__construction_type=constr_type)
-            
-            
-            
+
             if get_teams:
                 teams = Team.objects.all()
                 
@@ -278,7 +274,6 @@ class ContractorFilterView(BaseMixin, View):
                 count = coll.count()
                 display_msg = 'Найдено %s групп' % count if count > 0 else 'Ничего не найдено'
             
-            
             order_by = form.cleaned_data.get('order_by')
             last_order_by = form.cleaned_data.get('last_order_by')
             reverse_order = form.cleaned_data.get('reverse_order')
@@ -421,9 +416,13 @@ class ContractorOfficeProjectsView(BaseMixin, View):
         
         private_open_projects = tuple(a.project for a in contractor.contractor_answers.filter(project__state='active', rejected=False))
         private_archived_projects = tuple(a.project for a in contractor.contractor_answers.filter(project__state='active', rejected=True))
-        
-        team_open_projects = tuple(a.project for a in contractor.team.answers.filter(project__state='active', rejected=False))
-        team_archived_projects = tuple(a.project for a in contractor.team.answers.filter(project__state='active', rejected=True))
+
+        try:
+            team_open_projects = tuple(a.project for a in contractor.team.answers.filter(project__state='active', rejected=False))
+            team_archived_projects = tuple(a.project for a in contractor.team.answers.filter(project__state='active', rejected=True))
+        except:
+            team_open_projects = ()
+            team_archived_projects = ()
         
         context['all_project_count'] = \
             len(private_open_projects) + len(private_archived_projects) + \