Upgrade django add CWGC url

cmp/views.py

@@ -18,7 +18,8 @@
 from cmp.forms import editSoldierForm
 
 from .models import SoldierDeath
-
+
+from .models import SoldierDecoration
 
 import folium
 from django.views.generic import TemplateView
@@ -328,6 +329,10 @@ def soldier(request, soldier_id):
     # get or return a 404
     soldier = get_object_or_404(Soldier, pk=soldier_id)
 
+    # Soldier Decorations
+    soldierdecorations = SoldierDecoration.objects.filter(soldier=soldier)
+
+    # Soldier Deaths
     cemetery_map = None
     try:
         soldierdeath = SoldierDeath.objects.get(soldier=soldier)

requirements.in

@@ -1,8 +1,9 @@
-Django==4.2.7
+Django==5.0.0
 django-environ
 django-debug-toolbar
 django-extensions
 django-htmx
+django-storages
 pytest-django
 sentry-sdk
 pytest-cov # used to generate coverage report

requirements.txt

@@ -34,14 +34,15 @@ decorator==5.1.1
     # via
     #   ipdb
     #   ipython
-django==4.2.7
+django==5.0
     # via
     #   -r requirements.in
     #   crispy-bootstrap5
     #   django-crispy-forms
     #   django-debug-toolbar
     #   django-extensions
     #   django-htmx
+    #   django-storages
 django-crispy-forms==2.1
     # via
     #   -r requirements.in
@@ -54,6 +55,8 @@ django-extensions==3.2.3
     # via -r requirements.in
 django-htmx==1.16.0
     # via -r requirements.in
+django-storages==1.14.2
+    # via -r requirements.in
 executing==2.0.0
     # via stack-data
 flake8==6.1.0

templates/cmp/soldier.html

@@ -20,7 +20,9 @@ <h4>Soldier Record</h4>
       {% if soldier.soldierdecoration_set.all %}
           <tr><td colspan="2"><h5>Decoration Record:</h5></td></tr>
           {% for decoration in soldier.soldierdecoration_set.all %}
-             <tr><td>Decoration: </td><td>{{ decoration }} &#128240 (London Gazette: {{ decoration.gazette_issue }} Page: {{ decoration.gazette_page}} {{ decoration.gazette_date }}) </td></r>
+             <tr><td>Decoration: </td><td>{{ decoration }} <a href="{{ decoration.generate_gazette_url }}">(London Gazette: {{ decoration.gazette_issue }} Page: {{ decoration.gazette_page}} {{ decoration.gazette_date }}</a>) </td></r>
+
+
           {% endfor %}
       {% endif %}