Skip to content

Commit

Permalink
chore: apply generic pagination on owners listing
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabiengo
Fabien authored and fabiengo committed Dec 4, 2024
1 parent 6cf691f commit 0c4962c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 68 deletions.
8 changes: 0 additions & 8 deletions dossierfacile-bo/src/main/java/fr/gouv/bo/controller/BOOwnerController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import fr.dossierfacile.common.entity.Owner;
import fr.gouv.bo.dto.Pager;
import fr.gouv.bo.mapper.OwnerMapper;
import fr.gouv.bo.model.owner.OwnerModel;
import fr.gouv.bo.service.OwnerService;
Expand All @@ -23,12 +22,9 @@
@Controller
@RequestMapping(value = "/bo/owners")
public class BOOwnerController {

private static final int BUTTONS_TO_SHOW = 5;
private static final String INITIAL_PAGE = "1";
private static final String INITIAL_PAGE_SIZE = "50";
private static final int[] PAGE_SIZES = {50, 100};

@Autowired
private OwnerService ownerService;
@Autowired
Expand All @@ -49,14 +45,10 @@ public String index(Model model,
owners = ownerService.findAllPageable(pageable);
}

Pager pager = new Pager(owners.getTotalPages(), owners.getNumber(), BUTTONS_TO_SHOW);

model.addAttribute("ownerEmail", email.orElse(""));
model.addAttribute("owners", owners);
model.addAttribute("pageSize", pageable.getPageSize());
model.addAttribute("selectedPageSize", pageable.getPageSize());
model.addAttribute("pageSizes", PAGE_SIZES);
model.addAttribute("pager", pager);

return "bo/owners";
}
Expand Down
62 changes: 2 additions & 60 deletions dossierfacile-bo/src/main/resources/templates/bo/owners.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,36 +21,7 @@
</form>
</div>
<div class="row table-nav mt-4">
<div class="mb-3 col-md-1">
<select class="form-select form-control pagination pageSizeSelect" th:field="*{selectedPageSize}" data-url="/bo/owners">
<option th:each="pageSize : ${pageSizes}" th:text="${pageSize}" th:value="${pageSize}"
th:selected="${pageSize} == ${selectedPageSize}"></option>
</select>
</div>
<div th:if="${owners.totalPages != 1}" class="mb-3 col-md-11 pagination-centered">
<ul class="pagination">
<li class="page-item" th:classappend="${owners.number == 0} ? disabled">
<a class="page-link" th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=1, ownerEmail=${ownerEmail})}">&laquo;</a>
</li>
<li class="page-item" th:classappend="${owners.number == 0} ? disabled">
<a class="page-link"
th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${owners.number}, ownerEmail=${ownerEmail})}">&larr;</a>
</li>
<li class="page-item" th:classappend="${owners.number == (page - 1)} ? 'active pointer-disabled'"
th:each="page : ${#numbers.sequence(pager.startPage, pager.endPage)}">
<a class="page-link" th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${page}, ownerEmail=${ownerEmail})}"
th:text="${page}"></a>
</li>
<li class="page-item" th:classappend="${owners.number + 1 == owners.totalPages} ? disabled">
<a class="page-link"
th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${owners.number + 2}, ownerEmail=${ownerEmail})}">&rarr;</a>
</li>
<li class="page-item" th:classappend="${owners.number + 1 == owners.totalPages} ? disabled">
<a class="page-link"
th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${owners.totalPages}, ownerEmail=${ownerEmail})}">&raquo;</a>
</li>
</ul>
</div>
<div th:replace="~{bo/fragments/pagination :: pagination (items=${owners}, paramKey='ownerEmail', paramValue=${ownerEmail}, pageSizes=${pageSizes}, endpoint='/bo/owners')}"></div>
</div>
</div>
<div class="container-lg">
Expand Down Expand Up @@ -83,36 +54,7 @@
</table>
</div>
<div class="row table-nav">
<div class="mb-3 col-md-1">
<select class="form-select form-control pagination pageSizeSelect" th:field="*{selectedPageSize}" data-url="/bo/owners">
<option th:each="pageSize : ${pageSizes}" th:text="${pageSize}" th:value="${pageSize}"
th:selected="${pageSize} == ${selectedPageSize}"></option>
</select>
</div>
<div th:if="${owners.totalPages != 1}" class="mb-3 col-md-11 pagination-centered">
<ul class="pagination">
<li th:class="${owners.number == 0} ? disabled">
<a class="page-link" th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=1, ownerEmail=${ownerEmail})}">&laquo;</a>
</li>
<li th:class="${owners.number == 0} ? disabled">
<a class="page-link"
th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${owners.number}, ownerEmail=${ownerEmail})}">&larr;</a>
</li>
<li th:class="${owners.number == (page - 1)} ? 'active pointer-disabled'"
th:each="page : ${#numbers.sequence(pager.startPage, pager.endPage)}">
<a class="page-link" th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${page}, ownerEmail=${ownerEmail})}"
th:text="${page}"></a>
</li>
<li th:class="${owners.number + 1 == owners.totalPages} ? disabled">
<a class="page-link"
th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${owners.number + 2}, ownerEmail=${ownerEmail})}">&rarr;</a>
</li>
<li th:class="${owners.number + 1 == owners.totalPages} ? disabled">
<a class="page-link"
th:href="@{/bo/owners(pageSize=${selectedPageSize}, page=${owners.totalPages}, ownerEmail=${ownerEmail})}">&raquo;</a>
</li>
</ul>
</div>
<div th:replace="~{bo/fragments/pagination :: pagination (items=${owners}, paramKey='ownerEmail', paramValue=${ownerEmail}, pageSizes=${pageSizes}, endpoint='/bo/owners')}"></div>
</div>
</div>
</div>
Expand Down

0 comments on commit 0c4962c

Please sign in to comment.