Only show site visit with default data source (#4028)

kartoza · Jun 28, 2024 · efcd1b5 · efcd1b5
1 parent 3b4f3f6
commit efcd1b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/bims/templates/site_visit/site_visit_list.html b/bims/templates/site_visit/site_visit_list.html
@@ -187,12 +187,6 @@ <h5 style="margin-top: 20px;">Filters</h5>
                                id="site_code" placeholder="" name="site_code" value="{% if site_code %}{{ site_code }}{% else %}{% endif %}"
                                required>
                     </div>
-                    <div class="filter-title">Source Collection</div>
-                    <div class="filter-value">
-                        <select class="form-control form-control-sm source-collection-select">
-                            <option>All</option>
-                        </select>
-                    </div>
                     <div class="filter-title">Module</div>
                     <div class="filter-value">
                         <select class="form-control form-control-sm module-select">
@@ -221,7 +215,6 @@ <h5 style="margin-top: 20px;">Filters</h5>
                         <th scope="col" style="width:10em">Site code <i class="fa fa-arrow-up order-button" aria-hidden="true" data-order="site__site_code"></i> <i class="fa fa-arrow-down order-button" aria-hidden="true" data-order="-site__site_code"></i></th>
                         <th scope="col" style="width:20em">Site description <i class="fa fa-arrow-up order-button" aria-hidden="true" data-order="site__site_description"></i> <i class="fa fa-arrow-down order-button" aria-hidden="true" data-order="-site__site_description"></i></th>
                         <th scope="col">Sampling date <i class="fa fa-arrow-up order-button" aria-hidden="true" data-order="date"></i> <i class="fa fa-arrow-down order-button" aria-hidden="true" data-order="-date"></i></th>
-                        <th scope="col">Source collection</th>
                         <th scope="col">Owner</th>
                         <th scope="col">Total occurrences <i class="fa fa-arrow-up order-button" aria-hidden="true" data-order="total"></i> <i class="fa fa-arrow-down order-button" aria-hidden="true" data-order="-total"></i></th>
                         <th scope="col">Actions</th>
@@ -247,8 +240,6 @@ <h5 style="margin-top: 20px;">Filters</h5>
                                 {% endif %}
                             </td>
                             <td>{{ site_visit.date|date:'Y-m-d' }}</td>
-                            <td>
-                                {% if site_visit.source_collection %}{{ site_visit.source_collection|upper }}{% endif %}</td>
                             <td>
                                 {% if site_visit.source_collection.upper != 'GBIF' %}
                                     <a href="/profile/{{ site_visit.owner.username }}/">{{ site_visit.owner.get_full_name }}</a>

diff --git a/bims/views/site_visit/list.py b/bims/views/site_visit/list.py
@@ -3,9 +3,11 @@
 
 from django.contrib.sites.models import Site
 from django.views.generic.list import ListView
-from django.db.models import Count, Q
+from django.db.models import Count, Q, Prefetch
 from django.contrib.auth import get_user_model
 from django.db.models import Subquery, OuterRef
+from preferences import preferences
+
 from bims.models.survey import Survey
 from bims.enums.ecosystem_type import (
     ECOSYSTEM_RIVER,
@@ -45,10 +47,13 @@ def get_queryset(self):
             order = search_filters['o']
             del search_filters['o']
 
-        # Base queryset
+        default_data_source = preferences.SiteSetting.default_data_source
+
         qs = super(SiteVisitListView, self).get_queryset().filter(
-            Q(biological_collection_record__isnull=False) |
-            Q(chemical_collection_record__isnull=False)
+            Q(biological_collection_record__isnull=False,
+                biological_collection_record__source_collection=default_data_source
+            ) |
+            Q(chemical_collection_record__isnull=False),
         )
 
         if search_filters:
@@ -80,7 +85,6 @@ def get_queryset(self):
                 del search_filters['validated']
 
             if search_filters:
-                search = CollectionSearch(search_filters)
                 self.collection_results = search.process_search()
                 qs = qs.filter(
                     id__in=self.collection_results.values('survey')