fix order of annotations in verification view

Author: timonegk

imagetagger/imagetagger/annotations/views.py

@@ -729,7 +729,7 @@ def load_filtered_set_annotations(request) -> Response:
 
     images = Image.objects.filter(image_set=imageset)
     annotations = Annotation.objects.filter(image__in=images,
-                                            annotation_type__active=True).order_by('image_id').select_related()
+                                            annotation_type__active=True).order_by('image__name', 'id').select_related()
     if annotation_type_id > -1:
         annotations = annotations.filter(annotation_type__id=annotation_type_id)
     if verified:

imagetagger/imagetagger/images/views.py

@@ -415,7 +415,7 @@ def view_imageset(request, image_set_id):
     all_annotation_types = AnnotationType.objects.filter(active=True)
     annotations = Annotation.objects.filter(
         image__in=images,
-        annotation_type__active=True).order_by("id")
+        annotation_type__active=True).order_by('image__name', 'id')
     annotation_types = AnnotationType.objects.filter(annotation__image__image_set=imageset, active=True).distinct()\
         .annotate(count=Count('annotation'),
                   in_image_count=Count('annotation', filter=Q(annotation__vector__isnull=False)),