From d2ef084ed8433b4a47dbbdf70d0c54ecad161556 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Mon, 22 Aug 2016 10:25:34 +0300
Subject: [PATCH] Fixes

---
 templates/partials/base.html                  |  4 +-
 .../customer_profile_open_projects.html       | 48 ++++++++++---------
 .../customer_profile_trashed_projects.html    | 45 +++++++++--------
 .../partials/customer_profile_info_block.html | 18 +++----
 4 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/templates/partials/base.html b/templates/partials/base.html
index 4918bd8..4fdd01b 100644
--- a/templates/partials/base.html
+++ b/templates/partials/base.html
@@ -37,9 +37,9 @@
     {% endfor %}
 {% endif %}
 
-<div style="position: absolute; left: 0; top: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50">
+<div ondblclick="$(this).css('display', 'none')" style="position: absolute; left: 0; bottom: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50">
     {{ request.user }}<br>
-
+    
     {% if request.user.is_authenticated %}
         <b>PK:</b> {{ request.user.pk }}<br>
         <b>Groups:</b> {{ request.user.groups.all }}
diff --git a/users/templates/customer_profile_open_projects.html b/users/templates/customer_profile_open_projects.html
index 1c060a1..8cbab81 100644
--- a/users/templates/customer_profile_open_projects.html
+++ b/users/templates/customer_profile_open_projects.html
@@ -29,11 +29,13 @@
                     </div>
                 </div>
                 
-                <div class="col-lg-3 col-lg-offset-1">
-                    <p class="addWork add-work-new">
-                        <a href="{% url 'projects:customer-project-create' %}">Разместить заказ</a>
-                    </p>
-                </div>
+                {% if request.user.is_customer %}
+                    <div class="col-lg-3 col-lg-offset-1">
+                        <p class="addWork add-work-new">
+                            <a href="{% url 'projects:customer-project-create' %}">Разместить заказ</a>
+                        </p>
+                    </div>
+                {% endif %}
             </div>
             
             <div class="projectsBlock new-pro-block disTab">
@@ -50,9 +52,9 @@
                             </ul>
                             
                             <ul class="color-menu">
-                                <li><a href="#">Новые: 0</a></li>
-                                <li><a href="#">Кандидаты: 0</a></li>
-                                <li><a href="#">Отказал: 0</a></li>
+                                <li><a href="#">Новые: {{ proj.answers.count|sub:proj.candidates.count }}</a></li>
+                                <li><a href="#">Кандидаты: {{ proj.candidates.count }}</a></li>
+                                <li><a href="#">Отказал: {{ proj.rejected_answers_count }}</a></li>
                             </ul>
                             
                             <p class="textPro">
@@ -62,7 +64,7 @@
                             <ul class="listPro">
                                 <li>{{ proj.created}}</li>
                                 <li>0</li>
-                                <li>0</li>
+                                <li>{{ proj.answers.count }}</li>
                                 <li>{{ customer.get_full_name }}</li>
                             </ul>
                         </div>
@@ -72,19 +74,21 @@
                                 {{ proj.budget }} <i class="fa fa-rub"></i>
                             </p>
                             
-                            <ul>
-                                <li>
-                                    <a href='{% url 'projects:customer-project-edit' pk=proj.pk %}?back={{ request.path }}'>Редактировать</a>
-                                </li>
-                                
-                                <li>
-                                    <form action="{% url 'projects:customer-project-trash' pk=proj.pk %}" method="POST" novalidate>
-                                        {% csrf_token %}
-                                        <input type="hidden" name="next" value="{{ request.path }}">
-                                        <a href="#" onclick="$(this).closest('form').submit(); return false">Переместить в корзину</a>
-                                    </form>
-                                </li>
-                            </ul>
+                            {% if request.user == proj.customer %}
+                                <ul>
+                                    <li>
+                                        <a href='{% url 'projects:customer-project-edit' pk=proj.pk %}?back={{ request.path }}'>Редактировать</a>
+                                    </li>
+                                    
+                                    <li>
+                                        <form action="{% url 'projects:customer-project-trash' pk=proj.pk %}" method="POST" novalidate>
+                                            {% csrf_token %}
+                                            <input type="hidden" name="next" value="{{ request.path }}">
+                                            <a href="#" onclick="$(this).closest('form').submit(); return false">Переместить в корзину</a>
+                                        </form>
+                                    </li>
+                                </ul>
+                            {% endif %}
                         </div>
                     </div>
                 {% endfor %}
diff --git a/users/templates/customer_profile_trashed_projects.html b/users/templates/customer_profile_trashed_projects.html
index e5e221b..0fc09d0 100644
--- a/users/templates/customer_profile_trashed_projects.html
+++ b/users/templates/customer_profile_trashed_projects.html
@@ -56,10 +56,10 @@
                                     {{ proj.created}}
                                 </li>
                                 <li>
-                                    523
+                                    0
                                 </li>
                                 <li>
-                                    523
+                                    {{ proj.answers.count }}
                                 </li>
                                 <li>
                                     {{ customer.get_full_name }}
@@ -70,25 +70,28 @@
                             <p class="cenaPro">
                                 {{ proj.budget }} <i class="fa fa-rub"></i>
                             </p>
-                            <ul>
-                                <li>
-                                    <form action="{% url 'projects:customer-project-restore' pk=proj.pk %}" method="POST">
-                                        {% csrf_token %}
-                                        <input type="hidden" name="next" value="{{ request.path }}">
-                                        
-                                        <a href='#' onclick="$(this).closest('form').submit(); return false">Восстановить из корзины</a>
-                                    </form>
-                                </li>
-                                
-                                <li>
-                                    <form action="{% url 'projects:customer-project-delete' pk=proj.pk %}" method="POST">
-                                        {% csrf_token %}
-                                        <input type="hidden" name="next" value="{{ request.path }}">
-                                        
-                                        <a href='#' onclick="$(this).closest('form').submit(); return false">Удалить навсегда</a>
-                                    </form>
-                                </li>
-                            </ul>
+                            
+                            {% if request.user == proj.customer %}
+                                <ul>
+                                    <li>
+                                        <form action="{% url 'projects:customer-project-restore' pk=proj.pk %}" method="POST">
+                                            {% csrf_token %}
+                                            <input type="hidden" name="next" value="{{ request.path }}">
+                                            
+                                            <a href='#' onclick="$(this).closest('form').submit(); return false">Восстановить из корзины</a>
+                                        </form>
+                                    </li>
+                                    
+                                    <li>
+                                        <form action="{% url 'projects:customer-project-delete' pk=proj.pk %}" method="POST">
+                                            {% csrf_token %}
+                                            <input type="hidden" name="next" value="{{ request.path }}">
+                                            
+                                            <a href='#' onclick="$(this).closest('form').submit(); return false">Удалить навсегда</a>
+                                        </form>
+                                    </li>
+                                </ul>
+                            {% endif %}
                         </div>
                     </div>
 				{% endfor %}
diff --git a/users/templates/partials/customer_profile_info_block.html b/users/templates/partials/customer_profile_info_block.html
index 6261c42..dc0cb45 100644
--- a/users/templates/partials/customer_profile_info_block.html
+++ b/users/templates/partials/customer_profile_info_block.html
@@ -41,21 +41,21 @@
             <ul class="nav nav-tabs nav-justified">
                 {% url 'users:customer-profile-open-projects' pk=pk as a %}
                 {% url 'users:customer-profile-trashed-projects' pk=pk as a2 %}
-                {% url 'users:customer-profile-current-projects' pk=pk as b %}
+{#                {% url 'users:customer-profile-current-projects' pk=pk as b %}#}
                 {% url 'users:customer-profile-reviews' pk=pk as c %}
                 
                 <li role="presentation" {% if request.path == a or request.path == a2 %}class="active"{% endif %}>
                     <a href="{{ a }}">Открытые проекты</a>
                 </li>
                 
-                <li role="presentation" {% if request.path == b %}class="active"{% endif %}>
-                    <a href="{{ b }}">Текущие проекты</a>
-                    
-                    <div class="roundsCount">
-                        <div class="countR">0</div>
-                        <div class="countG">0</div>
-                    </div>
-                </li>
+{#                <li role="presentation" {% if request.path == b %}class="active"{% endif %}>#}
+{#                    <a href="{{ b }}">Текущие проекты</a>#}
+{#                    #}
+{#                    <div class="roundsCount">#}
+{#                        <div class="countR">0</div>#}
+{#                        <div class="countG">0</div>#}
+{#                    </div>#}
+{#                </li>#}
                 
                 <li role="presentation" {% if request.path == c %}class="active"{% endif %}>
                     <a href="{{ c }}">Отзывы</a>