|
|
@@ -5,6 +5,7 @@
|
|
|
|
|
|
package scot.carricksoftware.grants.controllers.census.selectedcensus;
|
|
|
|
|
|
+import jakarta.validation.Valid;
|
|
|
import org.apache.logging.log4j.LogManager;
|
|
|
import org.apache.logging.log4j.Logger;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
@@ -39,7 +40,7 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
|
|
|
@GetMapping(CensusMappingConstants.SELECTED_CENSUS_LIST)
|
|
|
@Override
|
|
|
public final String getListPage(final Model model) {
|
|
|
- logger.debug("PersonListControllerImpl::getCensusEntryPage");
|
|
|
+ logger.debug("SelectedCensusListControllerImpl::getCensusEntryPage");
|
|
|
currentPage = 0;
|
|
|
return sendAttributesAndReturn(model);
|
|
|
}
|
|
|
@@ -55,7 +56,7 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
|
|
|
@GetMapping(CensusMappingConstants.SELECTED_CENSUS_NEXT)
|
|
|
@Override
|
|
|
public final String getNextPage(final Model model) {
|
|
|
- logger.debug("CensusEntryListControllerImpl::getNextPage");
|
|
|
+ logger.debug("SelectedCensusListControllerImpl::getNextPage");
|
|
|
currentPage++;
|
|
|
return sendAttributesAndReturn(model);
|
|
|
}
|
|
|
@@ -64,7 +65,7 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
|
|
|
@GetMapping(CensusMappingConstants.SELECTED_CENSUS_PREVIOUS)
|
|
|
@Override
|
|
|
public final String getPreviousPage(final Model model) {
|
|
|
- logger.debug("CensusEntryListControllerImpl::getPreviousPage");
|
|
|
+ logger.debug("SelectedCensusListControllerImpl::getPreviousPage");
|
|
|
currentPage = max(0, currentPage - 1);
|
|
|
return sendAttributesAndReturn(model);
|
|
|
}
|
|
|
@@ -72,16 +73,16 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
|
|
|
@SuppressWarnings("SameReturnValue")
|
|
|
@GetMapping(CensusMappingConstants.SELECTED_CENSUS_REWIND)
|
|
|
public final String getFirstPage(final Model model) {
|
|
|
- logger.debug("CensusEntryListControllerImpl::getFirstPage");
|
|
|
+ logger.debug("SelectedCensusListControllerImpl::getFirstPage");
|
|
|
currentPage = 0;
|
|
|
return sendAttributesAndReturn(model);
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("SameReturnValue")
|
|
|
+
|
|
|
@GetMapping(CensusMappingConstants.SELECTED_CENSUS_FF)
|
|
|
@Override
|
|
|
public final String getLastPage(final Model model) {
|
|
|
- logger.debug("CensusEntryListControllerImpl::getLastPage");
|
|
|
+ logger.debug("SelectedCensusListControllerImpl:getLastPage");
|
|
|
long censusEntryCount = censusEntryService.count();
|
|
|
currentPage = (int) (censusEntryCount / ApplicationConstants.DEFAULT_PAGE_SIZE);
|
|
|
return sendAttributesAndReturn(model);
|
|
|
@@ -92,11 +93,19 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
|
|
|
@GetMapping(CensusMappingConstants.SELECTED_CENSUS_DELETE)
|
|
|
@Override
|
|
|
public final String censusEntryDelete(@PathVariable final String id) {
|
|
|
- logger.debug("CensusEntryListControllerImpl::censusEntryDelete");
|
|
|
+ logger.debug("SelectedCensusListControllerImpl::censusEntryDelete");
|
|
|
censusEntryService.deleteById(Long.valueOf(id));
|
|
|
return MappingConstants.REDIRECT + CensusMappingConstants.SELECTED_CENSUS_LIST;
|
|
|
}
|
|
|
|
|
|
+ @SuppressWarnings("SameReturnValue")
|
|
|
+ @GetMapping(CensusMappingConstants.SELECTED_CENSUS_ENTRIES)
|
|
|
+ public final String censusEntryList(@Valid @PathVariable final String id, Model model) {
|
|
|
+ logger.debug("");
|
|
|
+ model.addAttribute(AttributeConstants.CENSUS, censusEntryService.findById(Long.valueOf(id)));
|
|
|
+ return ViewConstants.SELECTED_CENSUS_LIST;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public int getPageNumber() {
|
|
|
return currentPage;
|