Browse Source

Countries list now showing countries in d/B

Andrew Grant 7 months ago
parent
commit
d9fb4e22d6

+ 3 - 0
docs/liquibase.txt

@@ -1,3 +1,6 @@
 First run only: mvn clean test liquibase:updateSQL
 
+liquibase clear-checksums --url=jdbc:mariadb://git.carricksoftware.co.uk:3306/grants_uat --username=apg --password=sjkis27
+
+
 Then:   mvn clean test liquibase:update

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

@@ -2,7 +2,7 @@ spring.application.name=grants
 server.port=8086
 server.servlet.context-path=/grants
 spring.mvc.format.date=dd-MM-yyyy
-spring.profiles.active=uat
+spring.profiles.active=dev
 logging.level.scot.carricksoftware=debug
 
 

+ 12 - 12
src/main/resources/templates/country/list.html

@@ -23,38 +23,38 @@
             <thead class="table-dark">
             <tr>
                 <th>ID</th>
-                <th>Last Name</th>
+                <th>Country</th>
                 <th></th>
             </tr>
             </thead>
 
-            <tr th:each="people   : ${persons}">
+            <tr th:each="country   : ${countries}">
                 <!--/*@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 th:text="${country.id}">123</td>
+                <td th:text="${country.name}"> First</td>
                 <td><span>
                         <a th:action="delete" class="btn btn-danger btn-sm" href=""
-                           th:href="'person/' + ${person.id} + '/delete'"
+                           th:href="'country/' + ${country.id} + '/delete'"
                            th:text="Delete"></a>
                     <a th:action="edit" class="btn btn-warning btn-sm"
-                       th:href="'person/' + ${person.id} + '/edit'"
+                       th:href="'country/' + ${country.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}"
+                        <a th:action="rewind" class="btn btn-secondary btn-sm" th:href="@{/countries/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>
+                            th:href="@{/countries/prev}" th:text="'<'"></a>
+                         <a th:action="new" class="btn btn-primary btn-sm" th:href="@{countries/new}"
+                            th:text="'New Country'"></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:href="@{/countries/next}" th:text="'>'"></a>
+                         <a th:action="end" class="btn btn-secondary btn-sm" th:href="@{/countries/ff}"
                             th:text="'>>'"></a>
                         </span></td>
             </tr>