Merge pull request #204 from gm3dmo/fixsoldiertable

Fixing the table display

cmp/views.py

@@ -568,17 +568,16 @@ def soldier(request, soldier_id):
     context = { "soldier": soldier, "cemetery_map":  cemetery_map  }
     return render(request, "cmp/soldier.html", context)
 
-
 def index(request):
-    post = request.POST
-    if post:
-        try:
-            search_term = str(post.get("name"))
-        except ValueError:
-            print("woo")
-
-        surname = request.POST.get('name')
+    if request.method == 'POST':
+        surname = request.POST.get('name', '')
         soldiers = Soldier.objects.filter(surname__icontains=surname).order_by('surname')
-        return render(request, 'cmp/soldier-results.html', {'soldiers': soldiers})
+
+        # Pagination
+        paginator = Paginator(soldiers, 10)  # Show 10 soldiers per page
+        page_number = request.GET.get('page')
+        page_obj = paginator.get_page(page_number)
+
+        return render(request, 'cmp/soldier-results.html', {'page_obj': page_obj})
     else:
         return render(request, 'cmp/index.html')

templates/cmp/soldier-results.html

@@ -4,7 +4,7 @@
 <br>
 {% block content %}
 
-{% if soldiers %}   
+{% if page_obj %}   
 <br>
 <table class="content-table">
     <thead>

templates/cmp/soldier.html

@@ -3,11 +3,11 @@
 {% block title %}Soldier{% endblock %}
 {% block content %}
 
-<div style="padding-bottom: 12px;">
+<div class="center-content" style="padding-bottom: 12px;">
   <img src="{% static 'cmp/cmp-masthead.svg' %}" style="width:350px; height:auto;" alt="The badge of the Royal Military Police">
-</div>
 
-<center><h3>Corps of Military Police</h3></center>
+<h3>Corps of Military Police</h3>
+</div>
 
 <h4>Soldier Record</h4>