Now, you can also search for missions

georeferencing/admin.py

@@ -11,7 +11,7 @@
 
 
 class BatchAdmin(admin.ModelAdmin):
-    list_display = ('name', 'createdDateTime', 'images_count', 'result')
+    list_display = ('name', 'createdDateTime', 'numberImages')
     list_filter = ('createdDateTime',)
     search_fields = ('name',)
 
@@ -28,10 +28,16 @@ def get_urls(self):
     # Custom view to fetch data from an external API
     def fetch_api_data(self, request):
         feat_value = request.GET.get('feat', '')
+        mission = request.GET.get('mission', '')
         url = 'https://eol.jsc.nasa.gov/SearchPhotos/PhotosDatabaseAPI/PhotosDatabaseAPI.pl'
-        query = f'query=frames|feat|like|*{feat_value}*|images|directory|like|*large*'
+        query = 'query=images|directory|like|*large*'
+        if feat_value:
+            query = f'{query}|frames|feat|like|*{feat_value}'
+        elif mission:
+            query = f'{query}|frames|mission|like|*{mission}'
         key = config('NASA_API_KEY')
         urlRequest = f'{url}?{query}&return=frames|geon|frames|feat|images|directory|images|filename|frames|fclt|frames|pdate|frames|ptime|frames|lat|frames|lon&key={key}'
+        print(urlRequest)
 
 
         try:
@@ -55,11 +61,6 @@ def save_model(self, request, obj, form, change):
             obj.user = request.user
         obj.save()
 
-    def images_count(self, obj):
-        return Image.objects.filter(batch=obj).count()
-
-    images_count.short_description = '# Images'
-
 
 class ImageAdmin(admin.ModelAdmin):
     list_display = ('name', 'createdDateTime', 'geoattempts_count')

georeferencing/migrations/0026_batch_mission.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-10-11 22:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('georeferencing', '0025_batch_numberimages'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='batch',
+            name='mission',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+    ]

georeferencing/models.py

@@ -63,7 +63,10 @@ def __str__(self):
 class Batch(models.Model):
     name = models.CharField(max_length=100)
     createdDateTime = models.DateTimeField(auto_now_add=True)
+    # Search fields
     feat = models.CharField(max_length=100, blank = True, null = True)
+    mission = models.CharField(max_length=100, blank = True, null = True)
+
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     result = models.JSONField(default=dict, blank=True, null=True)
     numberImages = models.IntegerField(default=0)

georeferencing/templates/admin/georeferencing/batch/change_form.html

@@ -14,7 +14,8 @@
         $(document).ready(function() {
             $('#fetch-data-btn').on('click', function() {
                 var featValue = $('input[name="feat"]').val();
-                var requestUrl = '{{ fetch_api_url }}?feat=' + featValue;
+                var mission = $('input[name="mission"]').val();
+                var requestUrl = '{{ fetch_api_url }}?feat=' + featValue + '&mission=' + mission;
                 $.ajax({
                     url: requestUrl,
                     method: 'GET',