Explorar o código

Cleared forms, re-wrote index page

Andrew Grant hai 5 meses
pai
achega
ea7a034721
Modificáronse 36 ficheiros con 12 adicións e 2278 borrados
  1. 3 3
      docs/push.txt
  2. 1 0
      src/main/java/scot/carricksoftware/grants/BaseEntity.java
  3. 1 1
      src/main/resources/application.properties
  4. 0 66
      src/main/resources/templates/census/form.html
  5. 0 69
      src/main/resources/templates/census/list.html
  6. 0 144
      src/main/resources/templates/censusentry/form.html
  7. 0 76
      src/main/resources/templates/censusentry/list.html
  8. 0 60
      src/main/resources/templates/certificates/birthCertificate/form.html
  9. 0 66
      src/main/resources/templates/certificates/birthCertificate/list.html
  10. 0 62
      src/main/resources/templates/certificates/deathCertificate/form.html
  11. 0 69
      src/main/resources/templates/certificates/deathCertificate/list.html
  12. 0 79
      src/main/resources/templates/certificates/divorceCertificate/form.html
  13. 0 68
      src/main/resources/templates/certificates/divorceCertificate/list.html
  14. 0 78
      src/main/resources/templates/certificates/marriageCertificate/form.html
  15. 0 68
      src/main/resources/templates/certificates/marriageCertificate/list.html
  16. 0 54
      src/main/resources/templates/country/form.html
  17. 0 67
      src/main/resources/templates/country/list.html
  18. 0 43
      src/main/resources/templates/images/image/form.html
  19. 0 69
      src/main/resources/templates/images/image/list.html
  20. 0 58
      src/main/resources/templates/images/personImage/form.html
  21. 0 69
      src/main/resources/templates/images/personImage/list.html
  22. 0 61
      src/main/resources/templates/images/placeImage/form.html
  23. 0 69
      src/main/resources/templates/images/placeImage/list.html
  24. 7 98
      src/main/resources/templates/index.html
  25. 0 64
      src/main/resources/templates/person/form.html
  26. 0 69
      src/main/resources/templates/person/list.html
  27. 0 71
      src/main/resources/templates/place/form.html
  28. 0 71
      src/main/resources/templates/place/list.html
  29. 0 66
      src/main/resources/templates/region/form.html
  30. 0 68
      src/main/resources/templates/region/list.html
  31. 0 43
      src/main/resources/templates/text/documentText/form.html
  32. 0 69
      src/main/resources/templates/text/documentText/list.html
  33. 0 58
      src/main/resources/templates/text/personText/form.html
  34. 0 70
      src/main/resources/templates/text/personText/list.html
  35. 0 61
      src/main/resources/templates/text/placeText/form.html
  36. 0 71
      src/main/resources/templates/text/placeText/list.html

+ 3 - 3
docs/push.txt

@@ -1,3 +1,3 @@
-git push https://github.com/carricksoft/grants.git HEAD:master
-git push git@github.com:carricksoft/grants.git HEAD:master
-git push http://git.carricksoftware.co.uk:3001/apg/grants.git
+git push https://github.com/carricksoft/grants-writer.git HEAD:master
+git push git@github.com:carricksoft/grants-writer.git HEAD:master
+git push http://git.carricksoftware.co.uk:3001/apg/grants-writer.git

+ 1 - 0
src/main/java/scot/carricksoftware/grants/BaseEntity.java

@@ -22,6 +22,7 @@ public class BaseEntity {
         this.id = id;
     }
 
+    @SuppressWarnings("unused")
     public Long getId() {
         return id;
     }

+ 1 - 1
src/main/resources/application.properties

@@ -1,5 +1,5 @@
 spring.application.name=grants-writer
-server.port=8086
+server.port=8088
 server.servlet.context-path=/grants-writer
 spring.mvc.format.date=dd-MM-yyyy
 spring.profiles.active=uat

+ 0 - 66
src/main/resources/templates/census/form.html

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-
-    <link rel="stylesheet" href="https://code.jquery.com/ui/1.14.1/themes/base/jquery-ui.css">
-    <script src="https://code.jquery.com/jquery-3.7.1.js"></script>
-    <script src="https://code.jquery.com/ui/1.14.1/jquery-ui.js"></script>
-    <!--suppress JSUnresolvedReference -->
-    <script>
-        $(function () {
-            $("#datepicker").datepicker({dateFormat: "dd-mm-yy"}).val();
-        });
-    </script>
-    <title>Grants - census form</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="censusCommand" type="scot.carricksoftware.grants.commands.census.CensusCommand"*/-->
-<!--/*@thymesVar id="place" type="scot.carricksoftware.grants.domains.places.Place"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info
-rounded-3 text-center p-4">
-    <form th:object="${censusCommand}" th:action="@{/census}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-md-3">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-            <div class="col-md-3">
-                <!-- >https://jqueryui.com/datepicker/-->
-                <label for="datepicker">Date</label>
-                <input class="form-control" id="datepicker" th:value="*{date}"
-                       th:field="*{date}" th:type="text">
-                <div th:if="${#fields.hasErrors('date')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('date')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/censuses}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 69
src/main/resources/templates/census/list.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>Grants - census list</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <!--/*@thymesVar id="census" type="scot.carricksoftware.grants.domains.census.Census"*/-->
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Censuses</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Place</th>
-                <th>Date</th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="census   : ${censuses}">
-                <td th:text="${census.id}">123</td>
-                <td th:text="${census.place.toString()}">123</td>
-                <td th:text="${#temporals.format(census.date, 'dd-MMM-yyyy')}"></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'census/' + ${census.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'census/' + ${census.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/censuses/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/censuses/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{census/new}"
-                            th:text="'New Census'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/censuses/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/censuses/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 144
src/main/resources/templates/censusentry/form.html

@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-
-    <title>Grants - Census Entry Form</title>
-</head>
-<body>
-<!--/*@thymesVar id="censusEntryCommand" type="scot.carricksoftware.grants.commands.census.CensusEntryCommand"*/-->
-<!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-<!--/*@thymesVar id="census" type="scot.carricksoftware.grants.domains.census.Census"*/-->
-
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info
-rounded-3 text-center p-4">
-    <form th:object="${censusEntryCommand}" th:action="@{/censusEntry}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-md-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="census">Census</label>
-                <div>
-                    <select id="census" style="width: 500px;" name="census" th:field="*{census}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="census : ${censuses}"
-                                th:value="${census.id}" th:text="${census.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('census')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('census')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-md-3" style="margin-right:20px;">
-                <label for="person">Person</label>
-                <div>
-                    <select id="person" style="width: 200px;" name="person" th:field="*{person}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('person')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('person')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <label for="name">Untracked Person<span style="color: rgb(255,0,0);">+</span></label>
-                <input class="form-control" id="name"
-                       th:field="*{name}" type="text" style="width: 200px;">
-                <div th:if="${#fields.hasErrors('name')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('name')}" th:text="${err}" style="width: 300px;"/>
-                    </ul>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <label for="relationship">Relationship to Head</label>
-                <div>
-                    <select id="relationship" style="width: 200px;" name="relationship" th:field="*{relationship}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="value : ${T(scot.carricksoftware.grants.enums.censusentry.CensusEntryRelationship).values()}"
-                                th:value="${value}" th:text="${value.label}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <label for="condition">Condition</label>
-                <div>
-                    <select id="condition" style="width: 200px;" name="condition" th:field="*{condition}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="value : ${T(scot.carricksoftware.grants.enums.censusentry.CensusEntryCondition).values()}"
-                                th:value="${value}" th:text="${value.label}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <label for="gaelic">Gaelic</label>
-                <div>
-                    <select id="gaelic" style="width: 200px;" name="gaelic" th:field="*{gaelic}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="value : ${T(scot.carricksoftware.grants.enums.censusentry.CensusEntryGaelic).values()}"
-                                th:value="${value}" th:text="${value.label}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <label for="worker">Worker</label>
-                <div>
-                    <select id="worker" style="width: 200px;" name="worker" th:field="*{worker}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="value : ${T(scot.carricksoftware.grants.enums.censusentry.CensusEntryWorker).values()}"
-                                th:value="${value}" th:text="${value.label}"></option>
-                    </select>
-                </div>
-            </div>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-md-2">
-                <label for="age">Age</label>
-                <input class="form-control" id="age"
-                       th:field="*{age}" type="text">
-            </div>
-            <div class="col-md-2">
-                <label for="whereBorn">Where Born</label>
-                <input class="form-control" id="whereBorn"
-                       th:field="*{whereBorn}" type="text">
-            </div>
-        </div>
-
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/censusEntries}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-        <h6><span style="color: rgb(255,0,0);">+</span><span>Not further recorded</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 76
src/main/resources/templates/censusentry/list.html

@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-    <title>Grants - Census Entry List</title>
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <!--/*@thymesVar id="censusEntry" type="scot.carricksoftware.grants.domains.census.CensusEntry"*/-->
-    <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-    <!--/*@thymesVar id="census" type="scot.carricksoftware.grants.domains.census.Census"*/-->
-
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Census Entries</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th
-                ><th>Person</th>
-                <th>Untracked Person</th>
-                <th>Census</th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="entry   : ${censusEntries}">
-                <td th:text="${entry.id}">123</td>
-                <td th:text="${entry.person}">123</td>
-                <td th:text="${entry.name}">123</td>
-                <td th:text="${entry.toString()}">123</td>
-
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'censusEntry/' + ${entry.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'censusEntry/' + ${entry.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/censusEntries/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/censusEntries/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{censusEntry/new}"
-                            th:text="'New Entry'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/censusEntries/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/censusEntries/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 60
src/main/resources/templates/certificates/birthCertificate/form.html

@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="birthCertificateCommand" type="scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand"*/-->
-<!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${birthCertificateCommand}" th:action="@{/birthCertificate}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="newBorn">Person</label>
-                <div>
-                    <select id="newBorn" style="width: 300px;" name="newBorn" th:field="*{newBorn}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('newBorn')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('newBorn')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/birthCertificates}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/static}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 66
src/main/resources/templates/certificates/birthCertificate/list.html

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <!--/*@thymesVar id="birthCertificate" type="scot.carricksoftware.grants.domains.certificates.BirthCertificate"*/-->
-    <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-    <h3>Birth Certificates</h3>
-    <table class="table table-striped table-bordered">
-        <thead class="table-dark">
-        <tr>
-            <th>ID</th>
-            <th>New Born</th>
-            <th></th>
-        </tr>
-        </thead>
-
-        <tr th:each="certificate   : ${birthCertificates}">
-
-            <td th:text="${certificate.id}">123</td>
-            <td th:text="${certificate.newBorn.toString()}">who</td>
-            <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="@{'/birthCertificate/' + ${certificate.id} + '/delete'}"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="@{'/birthCertificate/' + ${certificate.id} + '/edit'}"
-                       th:text="Edit"></a>
-                    </span></td>
-        </tr>
-        <tfoot>
-        <tr>
-            <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/birthCertificates/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/birthCertificates/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/birthCertificate/new}"
-                            th:text="'New Certificate'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/birthCertificates/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/birthCertificates/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-        </tr>
-        </tfoot>
-    </table>
-</div>
-</body>
-</html>
-

+ 0 - 62
src/main/resources/templates/certificates/deathCertificate/form.html

@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-</head>
-<body>
-<!--/*@thymesVar id="deathCertificateCommand" type="scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand"*/-->
-<!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${deathCertificateCommand}" th:action="@{/deathCertificate}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="deceased">Deceased</label>
-                <div>
-                    <select id="deceased" style="width: 300px;" name="deceased" th:field="*{deceased}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('deceased')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('deceased')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-                </div>
-                <div class="col-xs-2">
-                    <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                    <input class="form-control" id="id"
-                           th:field="*{id}" type="text" readonly>
-                </div>
-            </div>
-            <button type="submit" class="btn btn-primary">Commit</button>
-            <a class="btn btn-secondary" th:href="@{/deathCertificates}" th:text="${'List all'}">List all</a>
-            <a class="btn btn-success" th:href="@{/static}" th:text="${'Home'}">Home</a>
-            <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-
-
-</html>

+ 0 - 69
src/main/resources/templates/certificates/deathCertificate/list.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <!--/*@thymesVar id="deathCertificate" type="scot.carricksoftware.grants.domains.certificates.DeathCertificate"*/-->
-    <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Death Certificates</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Deceased</th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="certificate   : ${deathCertificates}">
-
-                <td th:text="${certificate.id}">123</td>
-                <td th:text="${certificate.deceased.toString()}">who</td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="@{'/deathCertificate/' + ${certificate.id} + '/delete'}"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="@{'/deathCertificate/' + ${certificate.id} + '/edit'}"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/deathCertificates/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/deathCertificates/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/deathCertificate/new}"
-                            th:text="'New Certificate'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/deathCertificates/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/deathCertificates/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 79
src/main/resources/templates/certificates/divorceCertificate/form.html

@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="marriageCertificateCommand" type="scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${divorceCertificateCommand}" th:action="@{/divorceCertificate}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="firstParty">First Party</label>
-                <div>
-                    <select id="firstParty" style="width: 300px;" name="firstParty" th:field="*{firstParty}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('firstParty')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('firstParty')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="secondParty">Second Party</label>
-                <div>
-                    <select id="secondParty" style="width: 300px;" name="secondParty" th:field="*{secondParty}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('secondParty')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('secondParty')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="form-group row justify-content-center">
-
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/divorceCertificates}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/static}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 68
src/main/resources/templates/certificates/divorceCertificate/list.html

@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <!--/*@thymesVar id="birthCertificate" type="scot.carricksoftware.grants.domains.certificates.BirthCertificate"*/-->
-    <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-    <h3>Divorce Certificates</h3>
-    <table class="table table-striped table-bordered">
-        <thead class="table-dark">
-        <tr>
-            <th>ID</th>
-            <th>First Party</th>
-            <th>Second Party</th>
-            <th></th>
-        </tr>
-        </thead>
-
-        <tr th:each="certificate   : ${divorceCertificates}">
-
-            <td th:text="${certificate.id}">123</td>
-            <td th:text="${certificate.firstParty.toString()}">123</td>
-            <td th:text="${certificate.secondParty.toString()}">123</td>
-            <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="@{'/divorceCertificate/' + ${certificate.id} + '/delete'}"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="@{'/divorceCertificate/' + ${certificate.id} + '/edit'}"
-                       th:text="Edit"></a>
-                    </span></td>
-        </tr>
-        <tfoot>
-        <tr>
-            <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/divorceCertificates/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/divorceCertificates/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/divorceCertificate/new}"
-                            th:text="'New Certificate'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/divorceCertificates/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/divorceCertificates/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-        </tr>
-        </tfoot>
-    </table>
-</div>
-</body>
-</html>
-

+ 0 - 78
src/main/resources/templates/certificates/marriageCertificate/form.html

@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="marriageCertificateCommand" type="scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${marriageCertificateCommand}" th:action="@{/marriageCertificate}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="bride">Bride</label>
-                <div>
-                    <select id="bride" style="width: 300px;" name="newBorn" th:field="*{bride}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('bride')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('bride')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="groom">Groom</label>
-                <div>
-                    <select id="groom" style="width: 300px;" name="groom" th:field="*{groom}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('groom')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('groom')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="form-group row justify-content-center">
-
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/marriageCertificates}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/static}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 68
src/main/resources/templates/certificates/marriageCertificate/list.html

@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <!--/*@thymesVar id="birthCertificate" type="scot.carricksoftware.grants.domains.certificates.BirthCertificate"*/-->
-    <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-    <h3>Marriage Certificates</h3>
-    <table class="table table-striped table-bordered">
-        <thead class="table-dark">
-        <tr>
-            <th>ID</th>
-            <th>Bride</th>
-            <th>Groom</th>
-            <th></th>
-        </tr>
-        </thead>
-
-        <tr th:each="certificate   : ${marriageCertificates}">
-
-            <td th:text="${certificate.id}">123</td>
-            <td th:text="${certificate.bride}">John Doe</td>
-            <td th:text="${certificate.groom}">John Doe</td>
-            <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="@{'/marriageCertificate/' + ${certificate.id} + '/delete'}"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="@{'/marriageCertificate/' + ${certificate.id} + '/edit'}"
-                       th:text="Edit"></a>
-                    </span></td>
-        </tr>
-        <tfoot>
-        <tr>
-            <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/marriageCertificates/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/marriageCertificates/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/marriageCertificate/new}"
-                            th:text="'New Certificate'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/marriageCertificates/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/marriageCertificates/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-        </tr>
-        </tfoot>
-    </table>
-</div>
-</body>
-</html>
-

+ 0 - 54
src/main/resources/templates/country/form.html

@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="countryCommand" type="scot.carricksoftware.grants.commands.places.countries.CountryCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info
-rounded-3 text-center p-4">
-    <form th:object="${countryCommand}" th:action="@{/country}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-3" style="margin-right:20px;">
-                <label for="name">Name</label>
-                <input class="form-control" id="name"
-                       th:field="*{name}" type="text">
-                <div th:if="${#fields.hasErrors('name')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('name')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/countries}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 67
src/main/resources/templates/country/list.html

@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Countries</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Last Name</th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="people   : ${persons}">
-                <!--/*@thymesVar id="country" type="scot.carricksoftware.grants.domains.places.Country"*/-->
-                <td th:text="${person.id}">123</td>
-                <td th:text="${person.lastName}"> First</td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'person/' + ${person.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'person/' + ${person.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/people/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/people/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{person/new}"
-                            th:text="'New Person'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/people/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/people/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 43
src/main/resources/templates/images/image/form.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - images</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="personCommand" type="scot.carricksoftware.grants.commands.people.PersonCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${imageCommand}" th:action="@{/image}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/people}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 69
src/main/resources/templates/images/image/list.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Images</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th></th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="image : ${images}">
-                <!--/*@thymesVar id="image" type="scot.carricksoftware.grants.domains.images.Image"*/-->
-                <td th:text="${image.id}">123</td>
-                <td></td>
-                <td></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'image/' + ${image.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'image/' + ${image.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/images/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/images/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{image/new}"
-                            th:text="'New Image'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/images/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/images/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 58
src/main/resources/templates/images/personImage/form.html

@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - images</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="personImageCommand" type="scot.carricksoftware.grants.commands.images.PersonImageCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${personImageCommand}" th:action="@{/personImage}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="person">Person</label>
-                <div>
-                    <select id="person" style="width: 300px;" name="person" th:field="*{person}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="person : ${people}"
-                                th:value="${person.id}" th:text="${person.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('person')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('person')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/personImages}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 69
src/main/resources/templates/images/personImage/list.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3> Person Images</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Person</th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="image : ${personImages}">
-                <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-                <td th:text="${image.id}">123</td>
-                <td th:text="${image.person.toString()}">123</td>
-                <td></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'personImage/' + ${image.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'personImage/' + ${image.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/personImages/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/personImages/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{personImage/new}"
-                            th:text="'New Person Image'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/personImages/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/personImages/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 61
src/main/resources/templates/images/placeImage/form.html

@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants Place Images</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="placeImageCommand" type="scot.carricksoftware.grants.commands.places.places.PlaceCommandImpl"*/-->
-<!--/*@thymesVar id="place" type="scot.carricksoftware.grants.domains.places.Place"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${placeImageCommand}" th:action="@{/placeImage}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-&nbsp;
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="place">Place</label>
-                <div>
-                    <select id="place" style="width: 300px;" name="place" th:field="*{place}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="place : ${places}"
-                                th:value="${place.id}" th:text="${place.toString()}"></option>
-                    </select>
-                    <div th:if="${#fields.hasErrors('place')}">
-                        <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('place')}" th:text="${err}"/>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/placeImages}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 69
src/main/resources/templates/images/placeImage/list.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>Place Images</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3> Place Images</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Place</th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="image : ${placeImages}">
-                <!--/*@thymesVar id="place" type="scot.carricksoftware.grants.domains.places.Place"*/-->
-                <td th:text="${image.id}">123</td>
-                <td th:text="${image.place.toString()}">123</td>
-                <td></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'placeImage/' + ${image.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'placeImage/' + ${image.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/placeImages/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/placeImages/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{placeImage/new}"
-                            th:text="'New Place Image'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/placeImages/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/placeImages/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 7 - 98
src/main/resources/templates/index.html

@@ -11,123 +11,32 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
           integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
 
-    <title>Grants Application - home page</title>
+    <title>Grants Application - writer home</title>
 </head>
 <body>
 
 <div th:insert="~{fragments/layout::banner}"></div>
 
-<div class="mx-auto" style="width:50%">
-    <h1 id="pageHeader">Available Functions</h1>
+<div class="mx-auto" style="width:50%;text-align:center;">
+    <h1 id="pageHeader">Writer Starter Page</h1>
     <table class="table table-bordered">
 
         <tbody>
         <tr>
             <td>
-
-            </td>
-            <td>
-                <a class="btn btn-primary btn-lg btn-block" href="people">People</a>
-            </td>
-            <td>
-                <a class="btn btn-primary btn-lg btn-block" href="places">Places</a>
-            </td>
-            <td>
-                <a class="btn btn-primary btn-lg btn-block" href="censuses">Censuses</a>
-            </td>
-            <td>
-                <a class="btn btn-primary btn-lg btn-block" href="images">Images</a>
-            </td>
-        </tr>
-        <tr>
-            <td>
-
-            </td>
-
-
-            <td>
-
+                <a class="btn btn-primary btn-lg btn-block" href="output">Specify Output</a>
             </td>
             <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="countries">Countries</a>
+                <a class="btn btn-primary btn-lg btn-block" href="Tex">Create Tex</a>
             </td>
             <td>
-                <a class="btn btn-primary btn-lg btn-block" href="censusEntries">Census Entries</a>
+                <a class="btn btn-primary btn-lg btn-block" href="pdf">Build Pdf</a>
             </td>
             <td>
-            <a class="btn btn-outline-secondary btn-sm btn-block" href="personImages">Person Images</a>
-                </td>
-            <td>
-
+                <a class="btn btn-primary btn-lg btn-block" href="print">Print</a>
             </td>
         </tr>
-        <tr>
-            <td>
 
-            </td>
-            <td>
-                <a class="btn btn-primary btn-sm btn-block" href="birthCertificates">Birth Certificates</a>
-            </td>
-            <td>
-                <!--suppress HtmlUnknownTarget -->
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="regions">Regions></a>
-            </td>
-            <td>
-            </td>
-            <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="placeImages">Place Images</a>
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-
-            </td>
-            <td>
-                <a class="btn btn-primary btn-sm btn-block" href="deathCertificates">Death Certificates</a>
-            </td>
-            <td>
-            </td>
-            <td>
-            </td>
-            <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="documentTexts">Document Texts</a>
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-
-            </td>
-            <td>
-                <a class="btn btn-primary btn-sm btn-block"
-                   href="marriageCertificates">Marriage Certificates</a>
-            </td>
-            <td>
-            </td>
-            <td>
-            </td>
-            <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="personTexts">Person Texts</a>
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-
-            </td>
-            <td>
-                <a class="btn btn-primary btn-sm btn-block"
-                   href="divorceCertificates">Divorce Certificates</a>
-            </td>
-            <td>
-            </td>
-            <td>
-            </td>
-            <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="placeTexts">Place Texts</a>
-            </td>
-        </tr>
         </tbody>
     </table>
 

+ 0 - 64
src/main/resources/templates/person/form.html

@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="personCommand" type="scot.carricksoftware.grants.commands.people.PersonCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info
-rounded-3 text-center p-4">
-    <form th:object="${personCommand}" th:action="@{/person}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-3" style="margin-right:20px;">
-                <label for="firstName">First Name</label>
-                <input class="form-control" id="firstName"
-                       th:field="*{firstName}" type="text">
-                <div th:if="${#fields.hasErrors('firstName')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('firstName')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-            <div class="col-xs-3 " style="margin-right:20px;">
-                <label for="lastName">Last Name</label>
-                <input class="form-control" id="lastName"
-                       th:field="*{lastName}" type="text">
-                <div th:if="${#fields.hasErrors('lastName')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('lastName')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/people}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 69
src/main/resources/templates/person/list.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>People</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>First Name</th>
-                <th>Last Name</th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="person : ${people}">
-                <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-                <td th:text="${person.id}">123</td>
-                <td th:text="${person.firstName}"> First</td>
-                <td th:text="${person.lastName}">Last</td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'person/' + ${person.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'person/' + ${person.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/people/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/people/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{person/new}"
-                            th:text="'New Person'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/people/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/people/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 71
src/main/resources/templates/place/form.html

@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="placeCommand" type="scot.carricksoftware.grants.commands.places.PlaceCommand"*/-->
-<!--/*@thymesVar id="region" type="scot.carricksoftware.grants.domains.places.Region"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info
-rounded-3 text-center p-4">
-    <form th:object="${placeCommand}" th:action="@{/place}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-3" style="margin-right:20px;">
-                <label for="name">Name</label>
-                <input class="form-control" id="name"
-                       th:field="*{name}" type="text">
-                <div th:if="${#fields.hasErrors('name')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('name')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-3" style="margin-right:20px;">
-                <label for="region">Region:</label>
-                <select id="region" name="region" th:field="*{region}"
-                        class="form-control" th:errorclass="has-error">
-                    <option th:value="${''}" th:text="${''}"></option>
-                    <option th:each="region : ${regions}"
-                            th:value="${region.id}" th:text="${region.name}"></option>
-                </select>
-                <div th:if="${#fields.hasErrors('region')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('region')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/places}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 71
src/main/resources/templates/place/list.html

@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <!--/*@thymesVar id="place" type="scot.carricksoftware.grants.domains.places.Place"*/-->
-    <!--/*@thymesVar id="country" type="scot.carricksoftware.grants.domains.places.Country"*/-->
-    <!--/*@thymesVar id="region" type="scot.carricksoftware.grants.domains.places.Region"*/-->
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Places</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Name</th>
-                <th>Region</th>
-                <th>Country</th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <tr th:each="place   : ${places}">
-
-                <td th:text="${place.id}">123</td>
-                <td th:text="${place.name}"> First</td>
-                <td th:text="${place.region != null} ? ${place.region.name}"></td>
-                <td th:text="${place.region.country != null} ? ${place.region.country.name}"></td>
-                <td><span>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'place/' + ${place.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/places/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/places/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{place/new}"
-                            th:text="'New Place'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/places/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/places/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 66
src/main/resources/templates/region/form.html

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - person</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="regionCommand" type="scot.carricksoftware.grants.commands.places.regions.RegionCommand"*/-->
-<!--/*@thymesVar id="country" type="scot.carricksoftware.grants.domains.places.Country"*/-->
-
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info
-rounded-3 text-center p-4">
-    <form th:object="${regionCommand}" th:action="@{/region}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-4">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" style="margin-right:50px;" readonly>
-            </div>
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="name">Name</label>
-                <input class="form-control" id="name"
-                       th:field="*{name}" type="text">
-                <div th:if="${#fields.hasErrors('name')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('name')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-            <div class="col-xs-4" style="margin-right:20px;">
-                <label for="country">Country</label>
-                <div>
-                    <select id="country" style="width: 300px;" name="country" th:field="*{country}">
-                        <option th:value="${''}" th:text="${''}"></option>
-                        <option th:each="country : ${countries}"
-                                th:value="${country.id}" th:text="${country.name}"></option>
-                    </select>
-                </div>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/regions}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 68
src/main/resources/templates/region/list.html

@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Regions</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Name</th>
-                <th>Country</th>
-                <th></th>
-            </thead>
-
-            <tr th:each="region   : ${regions}">
-                <!--/*@thymesVar id="country" type="scot.carricksoftware.grants.domains.places.Region"*/-->
-                <td th:text="${region.id}">123</td>
-                <td th:text="${region.name}"> First</td>
-                <td th:text="${region.country.name}"></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'region/' + ${region.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'region/' + ${region.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/regions/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/regions/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{region/new}"
-                            th:text="'New Region'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/regions/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/regions/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 43
src/main/resources/templates/text/documentText/form.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - images</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="documentTextCommand" type="scot.carricksoftware.grants.commands.text.DocumentTextCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${documentTextCommand}" th:action="@{/documentText}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/documentTexts}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 69
src/main/resources/templates/text/documentText/list.html

@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Document Texts</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th></th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <!--/*@thymesVar id="text" type="scot.carricksoftware.grants.domains.text.DocumentText"*/-->
-            <tr th:each="text : ${documentTexts}">
-                <td th:text="${text.id}">123</td>
-                <td></td>
-                <td></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'documentTexts/' + ${text.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'documentText/' + ${text.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/documentTexts/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/documentTexts/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/documentText/new}"
-                            th:text="'New Document Text'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/documentTexts/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/documentTexts/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 58
src/main/resources/templates/text/personText/form.html

@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - images</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="personTextCommand" type="scot.carricksoftware.grants.commands.text.PersonTextCommand"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${personTextCommand}" th:action="@{/personText}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-        <div class="col-xs-4" style="margin-right:20px;">
-            <label for="person">Person</label>
-            <div>
-                <select id="person" style="width: 300px;" name="person" th:field="*{person}">
-                    <option th:value="${''}" th:text="${''}"></option>
-                    <option th:each="person : ${people}"
-                            th:value="${person.id}" th:text="${person.toString()}"></option>
-                </select>
-                <div th:if="${#fields.hasErrors('person')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('person')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/personTexts}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 70
src/main/resources/templates/text/personText/list.html

@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>People </title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Person Texts</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Person</th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <!--/*@thymesVar id="text" type="scot.carricksoftware.grants.domains.text.PersonText"*/-->
-            <!--/*@thymesVar id="person" type="scot.carricksoftware.grants.domains.people.Person"*/-->
-            <tr th:each="text : ${personTexts}">
-                <td th:text="${text.id}">123</td>
-                <td th:text="${text.person.toString()}">123</td>
-                <td></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'personTexts/' + ${text.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'personText/' + ${text.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/personTexts/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/personTexts/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/personText/new}"
-                            th:text="'New Person Text'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/personTexts/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/personTexts/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-

+ 0 - 61
src/main/resources/templates/text/placeText/form.html

@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<!--suppress XmlHighlighting -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
-    <!-- Bootstrap CSS -->
-    <!--suppress SpellCheckingInspection -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
-          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-
-    <!--suppress SpellCheckingInspection -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-    <title>Grants - Place Texts</title>
-
-</head>
-<body>
-<!--/*@thymesVar id="placeTextCommand" type="scot.carricksoftware.grants.commands.text.PlaceTextCommand"*/-->
-<!--/*@thymesVar id="place" type="scot.carricksoftware.grants.domains.places.Place"*/-->
-<div th:insert="~{fragments/layout::banner}"></div>
-
-<div class="container border border-info rounded-3 text-center p-4">
-    <form th:object="${placeTextCommand}" th:action="@{/placeText}" method="post">
-        <div th:if="${#fields.hasErrors('*')}" class="alert alert-danger">
-            <p>Please Correct The Errors Below</p>
-        </div>
-        <div class="form-group row justify-content-center">
-            <div class="col-xs-2">
-                <label for="id">Database Id<span style="color: rgb(255,0,0);">*</span></label>
-                <input class="form-control" id="id"
-                       th:field="*{id}" type="text" readonly>
-            </div>
-        </div>
-
-        <div class="col-xs-4" style="margin-right:20px;">
-            <label for="place">Place</label>
-            <div>
-                <select id="place" style="width: 300px;" name="place" th:field="*{place}">
-                    <option th:value="${''}" th:text="${''}"></option>
-                    <option th:each="place : ${places}"
-                            th:value="${place.id}" th:text="${place.toString()}"></option>
-                </select>
-                <div th:if="${#fields.hasErrors('place')}">
-                    <ul class="text-danger">
-                        <li th:each="err : ${#fields.errors('place')}" th:text="${err}"/>
-                    </ul>
-                </div>
-            </div>
-        </div>
-
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/placeTexts}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
-    </form>
-</div>
-</body>
-</html>

+ 0 - 71
src/main/resources/templates/text/placeText/list.html

@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
-  ~ All rights reserved.
-  -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>Grants - Place Texts</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-</head>
-<body>
-<div th:insert="~{fragments/layout::banner}"></div>
-
-
-<div class="container text-center">
-    <div class="container border border-info
-                    rounded-3 text-center p-4">
-        <h3>Place Texts</h3>
-        <table class="table table-striped table-bordered">
-            <thead class="table-dark">
-            <tr>
-                <th>ID</th>
-                <th>Place</th>
-                <th></th>
-                <th></th>
-            </tr>
-            </thead>
-
-            <!--/*@thymesVar id="text" type="scot.carricksoftware.grants.domains.text.PlaceText"*/-->
-            <!--/*@thymesVar id="place" type="scot.carricksoftware.grants.domains.places.Place"*/-->
-
-            <tr th:each="text : ${placeTexts}">
-                <td th:text="${text.id}">123</td>
-                <td th:text="${text.place.toString()}">123</td>
-                <td></td>
-                <td><span>
-                        <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'placeTexts/' + ${text.id} + '/delete'"
-                           th:text="Delete"></a>
-                    <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'placedText/' + ${text.id} + '/edit'"
-                       th:text="Edit"></a>
-                    </span></td>
-            </tr>
-            <tfoot>
-            <tr>
-                <td colspan="4"><span>
-                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/placeTexts/rewind}"
-                           th:text="'<<'"></a>
-                         <a th:action="back" class="btn btn-secondary btn-sm"
-                            th:href="@{/placeTexts/prev}" th:text="'<'"></a>
-                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{/placeText/new}"
-                            th:text="'New Place Text'"></a>
-                         <a th:action="home" class="btn btn-success btn-sm"
-                            th:href="@{/}" th:text="'Home'"></a>
-                         <a th:action="forward" class="btn btn-secondary btn-sm"
-                            th:href="@{/personTexts/next}" th:text="'>'"></a>
-                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/placeTexts/ff}"
-                            th:text="'>>'"></a>
-                        </span></td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
-</body>
-</html>
-