From 4935a1bd7546f876c6f10d5a30764c2ca7a1b84d Mon Sep 17 00:00:00 2001
From: Cayo Puigdefabregas <cayo@ribaguifi.com>
Date: Tue, 30 Aug 2022 15:12:14 +0200
Subject: [PATCH] add phid in advanced search

---
 ereuse_devicehub/inventory/forms.py           |  8 +++-
 .../templates/inventory/search.html           | 43 ++++---------------
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 83d18ad9..ede98e95 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -110,7 +110,13 @@ class AdvancedSearchForm(FlaskForm):
             self.search(dhids)
 
     def search(self, dhids):
-        self.devices = Device.query.filter(Device.devicehub_id.in_(dhids))
+        query = Device.query.filter(Device.owner_id == g.user.id)
+        self.devices = query.join(Device.placeholder).filter(
+            or_(
+                Device.devicehub_id.in_(dhids),
+                Placeholder.phid.in_(dhids),
+            )
+        )
 
 
 class FilterForm(FlaskForm):
diff --git a/ereuse_devicehub/templates/inventory/search.html b/ereuse_devicehub/templates/inventory/search.html
index d996a1f3..06a4f42e 100644
--- a/ereuse_devicehub/templates/inventory/search.html
+++ b/ereuse_devicehub/templates/inventory/search.html
@@ -28,7 +28,7 @@
           </div>
         </div>
       </div>
-      {% if devices %}
+      {% if devices.count() %}
       <div class="card">
         <div class="card-body pt-3" style="min-height: 650px;">
           <!-- Bordered Tabs -->
@@ -178,42 +178,11 @@
                 </ul>
               </div>
 
-              <div class="btn-group dropdown m-1" uib-dropdown="">
-                <button id="btnUniqueID" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                    <i class="bi bi-tag"></i>
-                    Unique Identifiers (Tags)
-                </button>
-                <span class="d-none" id="unlinkTagAlertModal" data-bs-toggle="modal" data-bs-target="#unlinkTagErrorModal"></span>
-                <span class="d-none" id="addTagAlertModal" data-bs-toggle="modal" data-bs-target="#addingTagModal"></span>
-                <ul class="dropdown-menu" aria-labelledby="btnUniqueID">
-                  <li>
-                    <a href="javascript:addTag()" class="dropdown-item">
-                      <i class="bi bi-plus"></i>
-                      Add Unique Identifier to selected Device
-                    </a>
-                  </li>
-                  <li>
-                    <a href="javascript:removeTag()" class="dropdown-item">
-                      <i class="bi bi-x"></i>
-                      Remove Unique Identifier from selected Device
-                    </a>
-                  </li>
-                  <li>
-                    <a class="dropdown-item" href="{{ url_for('labels.label_list')}}">
-                      <i class="bi bi-tools"></i>
-                      Unique Identifier Management
-                    </a>
-                  </li>
-                </ul>
-              </div>
-
               <div class="btn-group dropdown m-1" uib-dropdown="">
                 <button id="btnTags" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                     <i class="bi bi-tag"></i>
                     Labels
                 </button>
-                <span class="d-none" id="unlinkTagAlertModal" data-bs-toggle="modal" data-bs-target="#unlinkTagErrorModal"></span>
-                <span class="d-none" id="addTagAlertModal" data-bs-toggle="modal" data-bs-target="#addingTagModal"></span>
                 <ul class="dropdown-menu" aria-labelledby="btnTags">
                   <li>
                     <form id="print_labels" method="post" action="{{ url_for('labels.print_labels') }}">
@@ -287,6 +256,8 @@
                       <th scope="col">Select</th>
                       <th scope="col">Title</th>
                       <th scope="col">DHID</th>
+                      <th scope="col">PHID</th>
+                      <th scope="col">Type</th>
                       <th scope="col">Unique Identifiers</th>
                       <th scope="col">Lifecycle Status</th>
                       <th scope="col">Allocated Status</th>
@@ -328,6 +299,12 @@
                           {{ dev.devicehub_id }}
                         </a>
                       </td>
+                      <td>
+                          {{ dev.binding and dev.binding.phid or dev.placeholder and dev.placeholder.phid  or '' }}
+                      </td>
+                      <td>
+                          {{ dev.is_abstract() }}
+                      </td>
                       <td>
                         {% for t in dev.tags | sort(attribute="id") %}
                          <a href="{{ url_for('labels.label_details', id=t.id)}}">{{ t.id }}</a>
@@ -392,14 +369,12 @@
     </div>
   </div>
 </section>
-{% include "inventory/addDevicestag.html" %}
 {% include "inventory/lot_delete_modal.html" %}
 {% include "inventory/actions.html" %}
 {% include "inventory/allocate.html" %}
 {% include "inventory/data_wipe.html" %}
 {% include "inventory/trade.html" %}
 {% include "inventory/alert_export_error.html" %}
-{% include "inventory/alert_unlink_tag_error.html" %}
 {% include "inventory/alert_lots_changes.html" %}
 
 <!-- Custom Code -->