Census Entries Mapping (2)

src/main/java/scot/carricksoftware/grants/constants/CensusMappingConstants.java

@@ -58,25 +58,25 @@ public class CensusMappingConstants {
     public static final String CENSUS_ENTRY_EDIT = "censusEntry/{id}/edit";
 
 
-    public static final String CENSUS_SELECTED_ENTRIES_LIST = "/censusSelectedEntries";
+    public static final String SELECTED_CENSUS_LIST = "/selectedCensusList";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_NEXT = "/censusSelectedEntries/next";
+    public static final String SELECTED_CENSUS_NEXT = "/selectedCensus/next";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_PREVIOUS = "/censusSelectedEntries/prev";
+    public static final String SELECTED_CENSUS_PREVIOUS = "/selectedCensus/prev";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_REWIND = "/censusSelectedEntries/rewind";
+    public static final String SELECTED_CENSUS_REWIND = "/selectedCensus/rewind";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_FF = "/censusSelectedEntries/ff";
+    public static final String SELECTED_CENSUS_FF = "/selectedCensus/ff";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_NEW = "/censusSelectedEntry/new";
+    public static final String SELECTED_CENSUS_NEW = "/selectedCensus/new";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_ENTRY = "/censusSelectedEntry";
+    public static final String SELECTED_CENSUS_ENTRY = "/selectedCensusEntry";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_SHOW = "/censusSelectedEntry/{id}/show";
+    public static final String SELECTED_CENSUS_SHOW = "/selectedCensusEntry/{id}/show";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_DELETE = "/censusSelectedEntry/{id}/delete";
+    public static final String SELECTED_CENSUS_DELETE = "/selectedCensus/{id}/delete";
     @SuppressWarnings({"unused"})
-    public static final String CENSUS_SELECTED_ENTRIES_EDIT = "censusSelectedEntry/{id}/edit";
+    public static final String SELECTED_CENSUS_EDIT = "selectedCensus/{id}/edit";
 
-    public static final String CENSUS_SELECTED_ENTRIES_ENTRIES = "/censusSelectedEntry/{id}/entries";
+    public static final String SELECTED_CENSUS_ENTRIES = "/selectedCensus/{id}/entries";
 }

src/main/java/scot/carricksoftware/grants/constants/ViewConstants.java

@@ -35,7 +35,7 @@ public class ViewConstants {
     public static final String CENSUS_ENTRY_LIST = "censusentry/list";
     public static final String CENSUS_ENTRY_FORM = "censusentry/form";
 
-    public static final String CENSUS_ENTRIES_LIST = "censusEntries/list";
+    public static final String SELECTED_CENUS_LIST = "selectedCensus/list";
 
     @SuppressWarnings("unused")
     public static final String BIRTH_CERTIFICATE_LIST = "certificates/birthCertificate/list";

src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusEntriesListController.java → src/main/java/scot/carricksoftware/grants/controllers/census/census/SelectedCensusListController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 
 @SuppressWarnings("unused")
 @Controller
-public interface CensusEntriesListController {
+public interface SelectedCensusListController {
 
     String getListPage(final Model model);
 

src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusEntriesListControllerImpl.java → src/main/java/scot/carricksoftware/grants/controllers/census/census/SelectedSelectedCensusListControllerImpl.java

@@ -19,22 +19,22 @@ import scot.carricksoftware.grants.services.census.census.CensusService;
 import static java.lang.Integer.max;
 
 @Controller
-public class CensusEntriesListControllerImpl implements CensusEntriesListController {
+public class SelectedSelectedCensusListControllerImpl implements SelectedCensusListController {
 
-    private static final Logger logger = LogManager.getLogger(CensusEntriesListControllerImpl.class);
+    private static final Logger logger = LogManager.getLogger(SelectedSelectedCensusListControllerImpl.class);
 
     private int currentPage = 0;
     private final ControllerHelper controllerHelper;
     private final CensusService censusService;
 
-    public CensusEntriesListControllerImpl(ControllerHelper controllerHelper,
-                                           CensusService censusService) {
+    public SelectedSelectedCensusListControllerImpl(ControllerHelper controllerHelper,
+                                                    CensusService censusService) {
         this.controllerHelper = controllerHelper;
         this.censusService = censusService;
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_LIST)
+    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_LIST)
     @Override
     public final String getListPage(final Model model) {
         logger.debug("PersonListControllerImpl::getCensusPage");
@@ -52,7 +52,7 @@ public class CensusEntriesListControllerImpl implements CensusEntriesListControl
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_NEXT)
+    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_NEXT)
     @Override
     public final String getNextPage(final Model model) {
         logger.debug("CensusEntriesListControllerImpl::getNextPage");
@@ -62,7 +62,7 @@ public class CensusEntriesListControllerImpl implements CensusEntriesListControl
 
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_PREVIOUS)
+    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_PREVIOUS)
     @Override
     public final String getPreviousPage(final Model model) {
         logger.debug("CensusEntriesListControllerImpl::getPreviousPage");
@@ -71,7 +71,7 @@ public class CensusEntriesListControllerImpl implements CensusEntriesListControl
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_REWIND)
+    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_REWIND)
     public final String getFirstPage(final Model model) {
         logger.debug("CensusEntriesListControllerImpl::getFirstPage");
         currentPage = 0;
@@ -79,7 +79,7 @@ public class CensusEntriesListControllerImpl implements CensusEntriesListControl
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_FF)
+    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_FF)
     public final String getLastPage(final Model model) {
         logger.debug("CensusEntriesListControllerImpl::getLastPage");
         long censusCount = censusService.count();
@@ -88,20 +88,20 @@ public class CensusEntriesListControllerImpl implements CensusEntriesListControl
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_DELETE)
+    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_DELETE)
     @Override
     public final String censusDelete(@PathVariable final String id) {
         logger.debug("CensusEntriesListControllerImpl::censusDelete");
         censusService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + CensusMappingConstants.CENSUS_SELECTED_ENTRIES_LIST;
+        return MappingConstants.REDIRECT + CensusMappingConstants.SELECTED_CENSUS_LIST;
     }
 
     @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.CENSUS_SELECTED_ENTRIES_ENTRIES)
+    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_ENTRIES)
     @Override
     public String censusEntriesEntries(@Valid @PathVariable final String id, Model model) {
         logger.debug("CensusEntriesListControllerImpl::censusEntriesEntries");
-        return ViewConstants.CENSUS_ENTRIES_LIST;
+        return ViewConstants.SELECTED_CENUS_LIST;
     }
 
 

src/main/resources/templates/census/list.html

@@ -42,7 +42,7 @@
                        th:href="'census/' + ${census.id} + '/edit'"
                        th:text="Edit"></a>
                      <a th:action="entries" class="btn btn-info btn-sm"
-                        th:href="'censusSelectedEntry/' + ${census.id} + '/entries'"
+                        th:href="'selectedCensus/' + ${census.id} + '/entries'"
                         th:text="Entries"></a>
                     </span></td>
             </tr>

src/main/resources/templates/censusentry/list.html → src/main/resources/templates/selectedCensus/list.html

@@ -23,7 +23,7 @@
 
     <div class="container border border-info
                     rounded-3 text-center p-4">
-        <h3>Census Entries</h3>
+        <h3>Census Entries for </h3>
         <table class="table table-striped table-bordered">
             <thead class="table-dark">
             <tr>