From 37a24fe3ec5e4e35013842518ab90c3ad829d56a Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Tue, 8 Nov 2016 16:59:43 +0300
Subject: [PATCH] Trademark update

---
 trademark/lib/poiskznakov.py                        |  2 +-
 trademark/templates/trademark/search_detail.html    |  8 ++++++++
 trademark/templates/trademark/trademark_detail.html | 10 ++++++++++
 trademark/views.py                                  |  4 +++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/trademark/lib/poiskznakov.py b/trademark/lib/poiskznakov.py
index 79d52e9..d65c514 100644
--- a/trademark/lib/poiskznakov.py
+++ b/trademark/lib/poiskznakov.py
@@ -34,7 +34,7 @@ class TrademarkSearchAPI():
             'search_string': keyword,
             'databases': [21],
             'use_translit': 'true',
-            'skip_expired': 'false',
+            'skip_expired': 'true',
         }
 
         if similarity < 100:
diff --git a/trademark/templates/trademark/search_detail.html b/trademark/templates/trademark/search_detail.html
index 264708a..af294ca 100644
--- a/trademark/templates/trademark/search_detail.html
+++ b/trademark/templates/trademark/search_detail.html
@@ -41,6 +41,14 @@
             </li>
         {% endfor %}
         </ul>
+        {% if identity_expired %}
+            <h2>Не действующие товарные знаки «{{ keyword.request|title }}»</h2>
+            <ul class="trademark-search-results list-inline list-unstyled">
+            {% for tm in identity_expired %}
+                 {% include 'trademark/search_list_item.html' with tm=tm %}
+            {% endfor %}
+            </ul>
+        {% endif %}
 
         {% if nice_busy.count < 45 %}
         {% include 'trademark/nice_block_busy.html' with keyword=keyword.request nice_busy=nice_busy products_busy=products_busy %}
diff --git a/trademark/templates/trademark/trademark_detail.html b/trademark/templates/trademark/trademark_detail.html
index 3abf951..b1993e7 100644
--- a/trademark/templates/trademark/trademark_detail.html
+++ b/trademark/templates/trademark/trademark_detail.html
@@ -15,6 +15,16 @@
             <li class='col-xs-6'>
                 <h2>Регистрация <nobr>{{ tm.registration_at }}</nobr></h2>
                 <p>Номер свидетельства № {{ tm.cert_id }}</p>
+                {% if tm.status == 'Acting' %}
+                    {% if tm.expiration_at %}
+                    <p>Действует до {{ tm.expiration_at }}</p>
+                    {% else %}
+                    <p><strong>Действует</strong></p>
+                    {% endif %}
+                {% else %}
+                    <p><strong>Не действует</strong></p>
+                {% endif %}
+
             </li>
         </ul>
 
diff --git a/trademark/views.py b/trademark/views.py
index 7b012b2..1badf97 100644
--- a/trademark/views.py
+++ b/trademark/views.py
@@ -25,8 +25,10 @@ class SearchDetailView(generic.DetailView):
         self.get_object().save()
 
         identity = self.get_object().searches.filter(similarity=146)[0]
-        identity_results = identity.results.all()
+        identity_results = identity.results.filter(status='Acting')
+        identity_expired_results = identity.results.all().exclude(status='Acting')
         context['identity'] = identity_results
+        context['identity_expired'] = identity_expired_results
         identity_ids = identity_results.values_list('id', flat=True)
         nice_busy_ids = identity_results.values_list('nices__nice_id', flat=True).distinct()