From 1fceffc29352d91cf98f2f452efe784a591c441d Mon Sep 17 00:00:00 2001 From: kdeterme Date: Mon, 17 Aug 2026 14:57:28 +0200 Subject: [PATCH] feat: add inspection cancellation functionality with automatic asset compliance state recalculation --- loko/assets/static/assets/inspection_map.js | 6 +- .../assets/components/asset_inspections.html | 69 ++++++- loko/inspections/admin.py | 17 ++ .../0007_alter_inspection_result_status.py | 18 ++ loko/inspections/models.py | 179 +++++++++++++----- .../components/inspection_form_modal.html | 2 + .../inspections/inspections_list.html | 78 +++++++- loko/inspections/tests.py | 117 ++++++++++++ loko/inspections/urls.py | 1 + loko/inspections/views.py | 54 +++++- 10 files changed, 481 insertions(+), 60 deletions(-) create mode 100644 loko/inspections/migrations/0007_alter_inspection_result_status.py diff --git a/loko/assets/static/assets/inspection_map.js b/loko/assets/static/assets/inspection_map.js index e10d2f1..1e61c50 100644 --- a/loko/assets/static/assets/inspection_map.js +++ b/loko/assets/static/assets/inspection_map.js @@ -322,6 +322,7 @@ 'non_compliant', '#fd7e14', 'damaged', '#dc3545', 'missing', '#212529', + 'cancelled', '#6c757d', '#6c757d' ], 'circle-stroke-width': 2, @@ -380,10 +381,11 @@ `; inspectionsList.forEach((insp, index) => { + const isCancelled = insp.is_cancelled || (insp.result_status === 'cancelled'); html += ` -
+
- ${escapeHtml(insp.result_status_display || '')} + ${escapeHtml(insp.result_status_display || '')} ${escapeHtml(insp.date || '')} diff --git a/loko/assets/templates/assets/components/asset_inspections.html b/loko/assets/templates/assets/components/asset_inspections.html index cf93ca8..a440c95 100644 --- a/loko/assets/templates/assets/components/asset_inspections.html +++ b/loko/assets/templates/assets/components/asset_inspections.html @@ -40,7 +40,7 @@ {% for insp in inspections %} - + {{ insp.inspection_date|date:"d/m/Y H:i" }} @@ -91,6 +91,14 @@
+ {% if insp.is_cancelled %} +
+ +
+ {% translate "Inspection annulée" %} — {% translate "Cette inspection a été annulée et n'est plus prise en compte dans la conformité active de la cible." %} +
+
+ {% endif %}
  • {% translate "Équipement cible" %} @@ -149,9 +157,18 @@
    {% can_edit_inspection insp request.user as user_can_edit %} {% if user_can_edit %} - + {% if insp.is_cancelled %} + + {% else %} + + {% endif %} + {% endif %}
    @@ -253,5 +270,49 @@ document.addEventListener('DOMContentLoaded', function() { {% endif %} + + {% include "inspections/components/edit_inspection_modal.html" %} diff --git a/loko/inspections/admin.py b/loko/inspections/admin.py index cb62d18..86ee8dd 100644 --- a/loko/inspections/admin.py +++ b/loko/inspections/admin.py @@ -7,6 +7,20 @@ class InspectionDocumentInline(admin.TabularInline): extra = 0 +@admin.action(description="Marquer comme annulée(s)") +def make_cancelled(modeladmin, request, queryset): + for obj in queryset: + obj.result_status = 'cancelled' + obj.save() + + +@admin.action(description="Rétablir comme conforme(s)") +def make_compliant(modeladmin, request, queryset): + for obj in queryset: + obj.result_status = 'compliant' + obj.save() + + @admin.register(Inspection) class InspectionAdmin(admin.ModelAdmin): list_display = ( @@ -25,6 +39,7 @@ class InspectionAdmin(admin.ModelAdmin): ) raw_id_fields = ("inspector", "mission_intervention", "checked_intervention") inlines = [InspectionDocumentInline] + actions = [make_cancelled, make_compliant] @admin.register(ParkingSpotInspection) @@ -39,6 +54,7 @@ class ParkingSpotInspectionAdmin(admin.ModelAdmin): search_fields = ("notes", "inspector__username", "inspector__first_name", "inspector__last_name") raw_id_fields = ("inspector", "mission_intervention", "checked_intervention") inlines = [InspectionDocumentInline] + actions = [make_cancelled, make_compliant] @admin.register(GiepInspection) @@ -52,6 +68,7 @@ class GiepInspectionAdmin(admin.ModelAdmin): search_fields = ("notes", "inspector__username", "inspector__first_name", "inspector__last_name") raw_id_fields = ("inspector", "mission_intervention", "checked_intervention") inlines = [InspectionDocumentInline] + actions = [make_cancelled, make_compliant] @admin.register(InspectionDocument) diff --git a/loko/inspections/migrations/0007_alter_inspection_result_status.py b/loko/inspections/migrations/0007_alter_inspection_result_status.py new file mode 100644 index 0000000..79b246f --- /dev/null +++ b/loko/inspections/migrations/0007_alter_inspection_result_status.py @@ -0,0 +1,18 @@ +# Generated by Django 6.0.7 on 2026-08-17 12:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inspections', '0006_alter_inspection_apply_changes_to_asset'), + ] + + operations = [ + migrations.AlterField( + model_name='inspection', + name='result_status', + field=models.CharField(choices=[('compliant', 'Conforme'), ('non_compliant', 'Non conforme'), ('damaged', 'Endommagé'), ('missing', 'Absent / Retiré'), ('cancelled', 'Annulé')], default='compliant', max_length=50, verbose_name='Résultat du contrôle'), + ), + ] diff --git a/loko/inspections/models.py b/loko/inspections/models.py index 4df893b..cf1d3c2 100644 --- a/loko/inspections/models.py +++ b/loko/inspections/models.py @@ -37,6 +37,13 @@ INSPECTION_RESULT_CONFIG = { 'icon': 'bi-dash-circle-fill', 'color_hex': '#212529', }, + 'cancelled': { + 'label': _('Annulé'), + 'badge_class': 'bg-secondary text-white', + 'btn_class': 'btn-outline-secondary', + 'icon': 'bi-slash-circle', + 'color_hex': '#6c757d', + }, } INSPECTION_RESULT_CHOICES = tuple( @@ -147,6 +154,10 @@ class Inspection(models.Model): def is_cross_check(self): return self.checked_intervention_id is not None + @property + def is_cancelled(self): + return self.result_status == 'cancelled' + def can_edit(self, user): from .permissions import can_edit_inspection return can_edit_inspection(user, self) @@ -158,38 +169,96 @@ class Inspection(models.Model): target_asset = self.asset modified = False - if hasattr(target_asset, 'last_inspection_date'): - target_asset.last_inspection_date = self.inspection_date - modified = True + if self.is_cancelled: + # Recalculer l'état de l'asset à partir de la dernière inspection active restante + latest_active = Inspection.objects.filter( + asset_content_type=self.asset_content_type, + asset_object_id=self.asset_object_id + ).exclude(result_status='cancelled').exclude(pk=self.pk).order_by('-inspection_date').first() - if hasattr(target_asset, 'inspection_status'): - try: - setattr(target_asset, 'inspection_status', self.result_status) - modified = True - except AttributeError: - pass + if latest_active: + if hasattr(target_asset, 'last_inspection_date'): + target_asset.last_inspection_date = latest_active.inspection_date + modified = True - if hasattr(target_asset, 'validation_status'): - target_asset.validation_status = 'validated' - modified = True + if hasattr(target_asset, 'inspection_status'): + try: + setattr(target_asset, 'inspection_status', latest_active.result_status) + modified = True + except AttributeError: + pass - if hasattr(target_asset, 'is_compliant'): - if self.result_status in ('non_compliant', 'damaged', 'missing'): - target_asset.is_compliant = False - if hasattr(target_asset, 'non_compliance_reason') and self.notes: - target_asset.non_compliance_reason = self.notes + if hasattr(target_asset, 'validation_status'): + target_asset.validation_status = 'validated' + modified = True + + if hasattr(target_asset, 'is_compliant'): + if latest_active.result_status in ('non_compliant', 'damaged', 'missing'): + target_asset.is_compliant = False + if hasattr(target_asset, 'non_compliance_reason'): + target_asset.non_compliance_reason = latest_active.notes or '' + else: + target_asset.is_compliant = True + if hasattr(target_asset, 'non_compliance_reason'): + target_asset.non_compliance_reason = None + modified = True + + if latest_active.verified_obsolescence and hasattr(target_asset, 'obsolescence'): + target_asset.obsolescence = latest_active.verified_obsolescence + modified = True else: - target_asset.is_compliant = True - if hasattr(target_asset, 'non_compliance_reason'): - target_asset.non_compliance_reason = None - modified = True + if hasattr(target_asset, 'last_inspection_date'): + target_asset.last_inspection_date = None + modified = True - if self.verified_obsolescence and hasattr(target_asset, 'obsolescence'): - target_asset.obsolescence = self.verified_obsolescence - modified = True + if hasattr(target_asset, 'inspection_status'): + try: + setattr(target_asset, 'inspection_status', 'unknown') + modified = True + except AttributeError: + pass - if modified: - target_asset.save() + if hasattr(target_asset, 'is_compliant'): + target_asset.is_compliant = True + if hasattr(target_asset, 'non_compliance_reason'): + target_asset.non_compliance_reason = None + modified = True + + if modified: + target_asset.save() + else: + if hasattr(target_asset, 'last_inspection_date'): + target_asset.last_inspection_date = self.inspection_date + modified = True + + if hasattr(target_asset, 'inspection_status'): + try: + setattr(target_asset, 'inspection_status', self.result_status) + modified = True + except AttributeError: + pass + + if hasattr(target_asset, 'validation_status'): + target_asset.validation_status = 'validated' + modified = True + + if hasattr(target_asset, 'is_compliant'): + if self.result_status in ('non_compliant', 'damaged', 'missing'): + target_asset.is_compliant = False + if hasattr(target_asset, 'non_compliance_reason') and self.notes: + target_asset.non_compliance_reason = self.notes + else: + target_asset.is_compliant = True + if hasattr(target_asset, 'non_compliance_reason'): + target_asset.non_compliance_reason = None + modified = True + + if self.verified_obsolescence and hasattr(target_asset, 'obsolescence'): + target_asset.obsolescence = self.verified_obsolescence + modified = True + + if modified: + target_asset.save() @property def status_badge_class(self): @@ -391,23 +460,47 @@ class ParkingSpotInspection(Inspection): if self.apply_physical_counts_to_asset and self.asset: target_asset = self.asset modified = False - if self.verified_standard_stand_count is not None and hasattr(target_asset, 'standard_stand_count'): - target_asset.standard_stand_count = self.verified_standard_stand_count - modified = True - if self.verified_cargo_stand_count is not None and hasattr(target_asset, 'cargo_stand_count'): - target_asset.cargo_stand_count = self.verified_cargo_stand_count - modified = True - if self.verified_drop_off_stand_count is not None and hasattr(target_asset, 'drop_off_stand_count'): - target_asset.drop_off_stand_count = self.verified_drop_off_stand_count - modified = True - if self.verified_has_scooter_drop_zone is not None and hasattr(target_asset, 'has_scooter_drop_zone'): - target_asset.has_scooter_drop_zone = self.verified_has_scooter_drop_zone - modified = True - if self.verified_marking_quality and hasattr(target_asset, 'marking_quality'): - target_asset.marking_quality = self.verified_marking_quality - modified = True - if modified: - target_asset.save() + if not self.is_cancelled: + if self.verified_standard_stand_count is not None and hasattr(target_asset, 'standard_stand_count'): + target_asset.standard_stand_count = self.verified_standard_stand_count + modified = True + if self.verified_cargo_stand_count is not None and hasattr(target_asset, 'cargo_stand_count'): + target_asset.cargo_stand_count = self.verified_cargo_stand_count + modified = True + if self.verified_drop_off_stand_count is not None and hasattr(target_asset, 'drop_off_stand_count'): + target_asset.drop_off_stand_count = self.verified_drop_off_stand_count + modified = True + if self.verified_has_scooter_drop_zone is not None and hasattr(target_asset, 'has_scooter_drop_zone'): + target_asset.has_scooter_drop_zone = self.verified_has_scooter_drop_zone + modified = True + if self.verified_marking_quality and hasattr(target_asset, 'marking_quality'): + target_asset.marking_quality = self.verified_marking_quality + modified = True + if modified: + target_asset.save() + else: + latest_active_ps = ParkingSpotInspection.objects.filter( + asset_content_type=self.asset_content_type, + asset_object_id=self.asset_object_id + ).exclude(result_status='cancelled').exclude(pk=self.pk).order_by('-inspection_date').first() + if latest_active_ps and latest_active_ps.apply_physical_counts_to_asset: + if latest_active_ps.verified_standard_stand_count is not None and hasattr(target_asset, 'standard_stand_count'): + target_asset.standard_stand_count = latest_active_ps.verified_standard_stand_count + modified = True + if latest_active_ps.verified_cargo_stand_count is not None and hasattr(target_asset, 'cargo_stand_count'): + target_asset.cargo_stand_count = latest_active_ps.verified_cargo_stand_count + modified = True + if latest_active_ps.verified_drop_off_stand_count is not None and hasattr(target_asset, 'drop_off_stand_count'): + target_asset.drop_off_stand_count = latest_active_ps.verified_drop_off_stand_count + modified = True + if latest_active_ps.verified_has_scooter_drop_zone is not None and hasattr(target_asset, 'has_scooter_drop_zone'): + target_asset.has_scooter_drop_zone = latest_active_ps.verified_has_scooter_drop_zone + modified = True + if latest_active_ps.verified_marking_quality and hasattr(target_asset, 'marking_quality'): + target_asset.marking_quality = latest_active_ps.verified_marking_quality + modified = True + if modified: + target_asset.save() class GiepInspection(Inspection): diff --git a/loko/inspections/templates/inspections/components/inspection_form_modal.html b/loko/inspections/templates/inspections/components/inspection_form_modal.html index 6f0bbe5..2895fee 100644 --- a/loko/inspections/templates/inspections/components/inspection_form_modal.html +++ b/loko/inspections/templates/inspections/components/inspection_form_modal.html @@ -42,6 +42,7 @@
    {% for choice in INSPECTION_RESULT_CHOICES_CONFIG %} + {% if choice.code != 'cancelled' %}
    + {% endif %} {% endfor %}
    diff --git a/loko/inspections/templates/inspections/inspections_list.html b/loko/inspections/templates/inspections/inspections_list.html index 89cbb42..e4aad71 100644 --- a/loko/inspections/templates/inspections/inspections_list.html +++ b/loko/inspections/templates/inspections/inspections_list.html @@ -5,6 +5,17 @@ {% block extra_css %} + {% endblock %} {% block content %} @@ -112,7 +123,7 @@ {% for insp in inspections %}
    -
    @@ -171,6 +182,14 @@
    + {% if insp.is_cancelled %} +
    + +
    + {% translate "Inspection annulée" %} — {% translate "Cette inspection a été annulée et n'est plus prise en compte dans la conformité active de la cible." %} +
    +
    + {% endif %} {% if insp.asset %}
    @@ -292,9 +311,18 @@
    {% can_edit_inspection insp request.user as user_can_edit %} {% if user_can_edit %} - + {% if insp.is_cancelled %} + + {% else %} + + {% endif %} + {% endif %}
    @@ -678,6 +706,48 @@ document.addEventListener('DOMContentLoaded', function() { }, 150); } }); + + window.handleToggleCancelInspection = function(inspectionId, action) { + const confirmMsg = action === 'cancel' + ? "{% translate 'Êtes-vous sûr de vouloir annuler cette inspection ?' %}" + : "{% translate 'Êtes-vous sûr de vouloir rétablir cette inspection ?' %}"; + if (!confirm(confirmMsg)) return; + + let cookieValue = null; + if (document.cookie && document.cookie !== '') { + const cookies = document.cookie.split(';'); + for (let i = 0; i < cookies.length; i++) { + const cookie = cookies[i].trim(); + if (cookie.substring(0, 10) === 'csrftoken=') { + cookieValue = decodeURIComponent(cookie.substring(10)); + break; + } + } + } + + const formData = new FormData(); + formData.append('action', action); + + fetch(`/inspections/api/${inspectionId}/toggle-cancel/`, { + method: 'POST', + headers: { + 'X-CSRFToken': cookieValue + }, + body: formData + }) + .then(res => res.json()) + .then(data => { + if (data.success) { + window.location.reload(); + } else { + alert(data.error || "{% translate 'Une erreur est survenue.' %}"); + } + }) + .catch(err => { + console.error(err); + alert("{% translate 'Erreur de communication avec le serveur.' %}"); + }); + }; }); diff --git a/loko/inspections/tests.py b/loko/inspections/tests.py index 90c2f5f..e8ab2a9 100644 --- a/loko/inspections/tests.py +++ b/loko/inspections/tests.py @@ -379,3 +379,120 @@ class InspectionModelAndViewsTestCase(TestCase): self.assertIn(insp_parking, inspections_parking) self.assertNotIn(insp_water, inspections_parking) + def test_toggle_cancel_inspection_api(self): + self.client.login(username='inspector_user', password='password123') + insp = Inspection.objects.create( + asset_content_type=self.spot_ct, + asset_object_id=self.spot.id, + inspector=self.user, + result_status='compliant' + ) + self.assertFalse(insp.is_cancelled) + + # Cancel inspection + url = reverse('inspections:toggle_cancel_inspection_api', kwargs={'inspection_id': insp.id}) + resp = self.client.post(url, {'action': 'cancel'}) + self.assertEqual(resp.status_code, 200) + data = resp.json() + self.assertTrue(data['success']) + self.assertTrue(data['is_cancelled']) + self.assertEqual(data['result_status'], 'cancelled') + + insp.refresh_from_db() + self.assertTrue(insp.is_cancelled) + self.assertEqual(insp.result_status, 'cancelled') + self.assertEqual(insp.status_badge_class, 'bg-secondary text-white') + + # Restore inspection + resp_restore = self.client.post(url, {'action': 'restore'}) + self.assertEqual(resp_restore.status_code, 200) + data_restore = resp_restore.json() + self.assertTrue(data_restore['success']) + self.assertFalse(data_restore['is_cancelled']) + self.assertEqual(data_restore['result_status'], 'compliant') + + insp.refresh_from_db() + self.assertFalse(insp.is_cancelled) + self.assertEqual(insp.result_status, 'compliant') + + def test_toggle_cancel_inspection_permissions(self): + other_user = User.objects.create_user( + username='stranger_user', + password='password123' + ) + insp = Inspection.objects.create( + asset_content_type=self.spot_ct, + asset_object_id=self.spot.id, + inspector=self.user, + result_status='compliant' + ) + + url = reverse('inspections:toggle_cancel_inspection_api', kwargs={'inspection_id': insp.id}) + + # Stranger cannot cancel + self.client.login(username='stranger_user', password='password123') + resp = self.client.post(url, {'action': 'cancel'}) + self.assertEqual(resp.status_code, 403) + insp.refresh_from_db() + self.assertEqual(insp.result_status, 'compliant') + + # Superuser can cancel + other_user.is_superuser = True + other_user.save() + resp_admin = self.client.post(url, {'action': 'cancel'}) + self.assertEqual(resp_admin.status_code, 200) + insp.refresh_from_db() + self.assertEqual(insp.result_status, 'cancelled') + + def test_asset_compliance_recalculation_on_cancellation(self): + self.client.login(username='inspector_user', password='password123') + + # 1st inspection (compliant) + date1 = timezone.now() - timezone.timedelta(days=2) + insp1 = Inspection.objects.create( + asset_content_type=self.spot_ct, + asset_object_id=self.spot.id, + inspector=self.user, + inspection_date=date1, + result_status='compliant', + apply_changes_to_asset=True + ) + self.spot.refresh_from_db() + self.assertEqual(self.spot.inspection_status, 'compliant') + self.assertTrue(self.spot.is_compliant) + + # 2nd inspection (damaged) + date2 = timezone.now() + insp2 = Inspection.objects.create( + asset_content_type=self.spot_ct, + asset_object_id=self.spot.id, + inspector=self.user, + inspection_date=date2, + result_status='damaged', + notes="Arceau cassé", + apply_changes_to_asset=True + ) + self.spot.refresh_from_db() + self.assertEqual(self.spot.inspection_status, 'damaged') + self.assertFalse(self.spot.is_compliant) + self.assertEqual(self.spot.non_compliance_reason, "Arceau cassé") + + # Cancel 2nd inspection -> asset should fall back to 1st inspection (compliant) + url2 = reverse('inspections:toggle_cancel_inspection_api', kwargs={'inspection_id': insp2.id}) + self.client.post(url2, {'action': 'cancel'}) + + self.spot.refresh_from_db() + self.assertEqual(self.spot.inspection_status, 'compliant') + self.assertTrue(self.spot.is_compliant) + self.assertIsNone(self.spot.non_compliance_reason) + self.assertEqual(self.spot.last_inspection_date, date1) + + # Cancel 1st inspection -> no active inspections remain, reset to default + url1 = reverse('inspections:toggle_cancel_inspection_api', kwargs={'inspection_id': insp1.id}) + self.client.post(url1, {'action': 'cancel'}) + + self.spot.refresh_from_db() + self.assertEqual(self.spot.inspection_status, 'unknown') + self.assertIsNone(self.spot.last_inspection_date) + + diff --git a/loko/inspections/urls.py b/loko/inspections/urls.py index acb369d..c1502d3 100644 --- a/loko/inspections/urls.py +++ b/loko/inspections/urls.py @@ -9,6 +9,7 @@ urlpatterns = [ path('api/create/', views.create_inspection_api, name='create_inspection_api'), path('api//detail/', views.get_inspection_detail_api, name='get_inspection_detail_api'), path('api//update/', views.update_inspection_api, name='update_inspection_api'), + path('api//toggle-cancel/', views.toggle_cancel_inspection_api, name='toggle_cancel_inspection_api'), path('api/document//delete/', views.delete_inspection_document_api, name='delete_inspection_document_api'), path('api/geojson/', views.inspections_geojson, name='inspections_geojson'), diff --git a/loko/inspections/views.py b/loko/inspections/views.py index 38e00e2..cb21875 100644 --- a/loko/inspections/views.py +++ b/loko/inspections/views.py @@ -460,6 +460,7 @@ def get_inspection_detail_api(request, inspection_id): 'notes': leaf.notes or '', 'verified_obsolescence': leaf.verified_obsolescence or '', 'apply_changes_to_asset': leaf.apply_changes_to_asset, + 'is_cancelled': leaf.is_cancelled, 'inspection_date': leaf.inspection_date.strftime('%d/%m/%Y %H:%M') if leaf.inspection_date else '', 'created_at': leaf.created_at.strftime('%d/%m/%Y %H:%M') if leaf.created_at else '', 'updated_at': leaf.updated_at.strftime('%d/%m/%Y %H:%M') if leaf.updated_at else '', @@ -600,6 +601,42 @@ def delete_inspection_document_api(request, document_id): return JsonResponse({'success': True, 'document_id': document_id}) +@login_required +@require_POST +def toggle_cancel_inspection_api(request, inspection_id): + """ + API endpoint pour annuler ou rétablir une inspection. + Seuls l'auteur et les administrateurs ont le droit d'annuler/rétablir une inspection. + """ + inspection_obj = get_object_or_404(Inspection, pk=inspection_id) + inspection = inspection_obj.detailed_inspection + + if not inspection.can_edit(request.user): + return JsonResponse({ + 'success': False, + 'error': str(_("Permission refusée. Seuls l'auteur de l'inspection et les administrateurs peuvent la modifier.")) + }, status=403) + + action = request.POST.get('action') # 'cancel', 'restore', ou toggle automatique si non spécifié + if action == 'cancel' or (action is None and not inspection.is_cancelled): + inspection.result_status = 'cancelled' + elif action == 'restore' or (action is None and inspection.is_cancelled): + target_status = request.POST.get('result_status', 'compliant') + inspection.result_status = target_status if target_status != 'cancelled' else 'compliant' + + inspection.save() + + return JsonResponse({ + 'success': True, + 'inspection_id': inspection.id, + 'is_cancelled': inspection.is_cancelled, + 'result_status': inspection.result_status, + 'result_status_display': str(inspection.get_result_status_display()), + 'status_badge_class': inspection.status_badge_class, + 'status_icon': inspection.status_icon, + 'status_btn_class': inspection.status_btn_class, + 'message': str(_("L'inspection a été annulée avec succès.")) if inspection.is_cancelled else str(_("L'inspection a été rétablie avec succès.")) + }) @login_required @@ -709,8 +746,9 @@ def inspections_geojson(request): if not geojson_str or not insp_list: continue - latest_insp = insp_list[0] - target_obj = latest_insp.asset + active_insps = [i for i in insp_list if i.result_status != 'cancelled'] + top_insp = active_insps[0] if active_insps else insp_list[0] + target_obj = top_insp.asset inspections_data = [] for insp in insp_list: @@ -729,6 +767,8 @@ def inspections_geojson(request): 'result_status': insp.result_status, 'result_status_display': insp.get_result_status_display(), 'status_badge_class': insp.status_badge_class, + 'status_icon': insp.status_icon, + 'is_cancelled': insp.is_cancelled, 'nature_display': insp.get_nature_display(), 'inspector_name': get_short_name(insp.inspector) if insp.inspector else '-', 'inspector_role_display': insp.get_inspector_role_display() if insp.inspector_role else '', @@ -740,7 +780,6 @@ def inspections_geojson(request): 'documents': docs_data, }) - feature = { 'type': 'Feature', 'geometry': json.loads(geojson_str), @@ -749,10 +788,11 @@ def inspections_geojson(request): 'object_id': asset_id, 'model_name': ct.model, 'spot_type': getattr(target_obj, 'spot_type', None) if target_obj else None, - 'target_display': latest_insp.target_display, - 'latest_result_status': latest_insp.result_status, - 'latest_result_status_display': latest_insp.get_result_status_display(), - 'latest_status_badge_class': latest_insp.status_badge_class, + 'target_display': top_insp.target_display, + 'latest_result_status': top_insp.result_status, + 'latest_result_status_display': top_insp.get_result_status_display(), + 'latest_status_badge_class': top_insp.status_badge_class, + 'is_cancelled': top_insp.is_cancelled, 'inspections_count': len(inspections_data), 'inspections': inspections_data, }