Merge pull request #132 from gm3dmo/soldier1

soldier1
gm3dmo · Dec 18, 2023 · a15a5cc · a15a5cc
2 parents bd24b5f + 61bc196
commit a15a5cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cmp/views.py b/cmp/views.py
@@ -17,6 +17,8 @@
 from .models import Soldier
 from cmp.forms import editSoldierForm
 
+import folium
+
 
 def powcamps(request):
     powcamps = PowCamp.objects.all()

diff --git a/templates/cmp/soldier.html b/templates/cmp/soldier.html
@@ -3,7 +3,9 @@
 {% block title %}Soldier{% endblock %}
 {% block content %}
 
-<h1>Soldier Record</h1>
+<center><h3>Corps of Military Police</h3></center>
+
+<h4>Soldier Record</h4>
 
 <table class="table table-hover table-bordered table-lg">
   <thead class="thead-dark">
@@ -16,9 +18,9 @@ <h1>Soldier Record</h1>
       <tr><td>Notes:</td><td>{{ soldier.notes }}</td></tr>
 
       {% if soldier.soldierdecoration_set.all %}
-          <tr><td colspan="2"><h4>Decorations Record:</h4></td></tr>
+          <tr><td colspan="2"><h5>Decoration Record:</h5></td></tr>
           {% for decoration in soldier.soldierdecoration_set.all %}
-             <tr><td>decoration: </td><td>{{ decoration }}</td></tr>
+             <tr><td>Decoration: </td><td>{{ decoration }} &#128240 (London Gazette: {{ decoration.gazette_issue }} Page: {{ decoration.gazette_page}} {{ decoration.gazette_date }}) </td></r>
           {% endfor %}
       {% endif %}
 
@@ -36,8 +38,8 @@ <h1>Soldier Record</h1>
          <tr><td>Date of Death:</td><td>{{ soldier.soldierdeath.date }}</td></tr>
          <tr><td>Company:</td><td>{{ soldier.soldierdeath.company }}</td></tr>
          <tr><td>Cemetery:</td><td>{{ soldier.soldierdeath.cemetery }}</td></tr>
+         <tr><td>Cemetery:</td><td>{{ soldier.soldierdeath.country }}</td></tr>
          <tr><td colspan="2">Map</td></tr>
-         <tr><td colspan="2">A map goes here</tr>
       {% endif %}