diff --git a/public/javascripts/burialSite.search.js b/public/javascripts/burialSite.search.js
index 8fd0a58d..85cf7ee7 100644
--- a/public/javascripts/burialSite.search.js
+++ b/public/javascripts/burialSite.search.js
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const sunrise = exports.sunrise;
const searchFilterFormElement = document.querySelector('#form--searchFilters');
const searchResultsContainerElement = document.querySelector('#container--searchResults');
- const limit = Number.parseInt(document.querySelector('#searchFilter--limit').value, 10);
+ const limitElement = document.querySelector('#searchFilter--limit');
const offsetElement = document.querySelector('#searchFilter--offset');
function renderBurialSites(rawResponseJSON) {
const responseJSON = rawResponseJSON;
@@ -51,7 +51,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
`;
// eslint-disable-next-line no-unsanitized/method
- searchResultsContainerElement.insertAdjacentHTML('beforeend', sunrise.getSearchResultsPagerHTML(limit, responseJSON.offset, responseJSON.count));
+ searchResultsContainerElement.insertAdjacentHTML('beforeend', sunrise.getSearchResultsPagerHTML(Number.parseInt(limitElement.value, 10), responseJSON.offset, responseJSON.count));
searchResultsContainerElement
.querySelector('table')
?.append(resultsTbodyElement);
@@ -72,11 +72,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
getBurialSites();
}
function previousAndGetBurialSites() {
- offsetElement.value = Math.max(Number.parseInt(offsetElement.value, 10) - limit, 0).toString();
+ offsetElement.value = Math.max(Number.parseInt(offsetElement.value, 10) -
+ Number.parseInt(limitElement.value, 10), 0).toString();
getBurialSites();
}
function nextAndGetBurialSites() {
- offsetElement.value = (Number.parseInt(offsetElement.value, 10) + limit).toString();
+ offsetElement.value = (Number.parseInt(offsetElement.value, 10) +
+ Number.parseInt(limitElement.value, 10)).toString();
getBurialSites();
}
const filterElements = searchFilterFormElement.querySelectorAll('input, select');
diff --git a/public/javascripts/burialSite.search.ts b/public/javascripts/burialSite.search.ts
index 34e677a5..cddf17f9 100644
--- a/public/javascripts/burialSite.search.ts
+++ b/public/javascripts/burialSite.search.ts
@@ -18,10 +18,10 @@ declare const exports: Record
'#container--searchResults'
) as HTMLElement
- const limit = Number.parseInt(
- (document.querySelector('#searchFilter--limit') as HTMLInputElement).value,
- 10
- )
+ const limitElement = document.querySelector(
+ '#searchFilter--limit'
+ ) as HTMLSelectElement
+
const offsetElement = document.querySelector(
'#searchFilter--offset'
) as HTMLInputElement
@@ -95,7 +95,7 @@ declare const exports: Record
searchResultsContainerElement.insertAdjacentHTML(
'beforeend',
sunrise.getSearchResultsPagerHTML(
- limit,
+ Number.parseInt(limitElement.value, 10),
responseJSON.offset,
responseJSON.count
)
@@ -134,7 +134,8 @@ declare const exports: Record
function previousAndGetBurialSites(): void {
offsetElement.value = Math.max(
- Number.parseInt(offsetElement.value, 10) - limit,
+ Number.parseInt(offsetElement.value, 10) -
+ Number.parseInt(limitElement.value, 10),
0
).toString()
getBurialSites()
@@ -142,7 +143,8 @@ declare const exports: Record
function nextAndGetBurialSites(): void {
offsetElement.value = (
- Number.parseInt(offsetElement.value, 10) + limit
+ Number.parseInt(offsetElement.value, 10) +
+ Number.parseInt(limitElement.value, 10)
).toString()
getBurialSites()
}
diff --git a/public/javascripts/contract.search.js b/public/javascripts/contract.search.js
index 2689d226..97b06ec4 100644
--- a/public/javascripts/contract.search.js
+++ b/public/javascripts/contract.search.js
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const sunrise = exports.sunrise;
const searchFilterFormElement = document.querySelector('#form--searchFilters');
const searchResultsContainerElement = document.querySelector('#container--searchResults');
- const limit = Number.parseInt(document.querySelector('#searchFilter--limit').value, 10);
+ const limitElement = document.querySelector('#searchFilter--limit');
const offsetElement = document.querySelector('#searchFilter--offset');
// eslint-disable-next-line complexity
function renderContracts(rawResponseJSON) {
@@ -129,7 +129,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
.querySelector('table')
?.append(resultsTbodyElement);
// eslint-disable-next-line no-unsanitized/method
- searchResultsContainerElement.insertAdjacentHTML('beforeend', sunrise.getSearchResultsPagerHTML(limit, responseJSON.offset, responseJSON.count));
+ searchResultsContainerElement.insertAdjacentHTML('beforeend', sunrise.getSearchResultsPagerHTML(Number.parseInt(limitElement.value, 10), responseJSON.offset, responseJSON.count));
searchResultsContainerElement
.querySelector("button[data-page='previous']")
?.addEventListener('click', previousAndGetContracts);
@@ -147,11 +147,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
getContracts();
}
function previousAndGetContracts() {
- offsetElement.value = Math.max(Number.parseInt(offsetElement.value, 10) - limit, 0).toString();
+ offsetElement.value = Math.max(Number.parseInt(offsetElement.value, 10) -
+ Number.parseInt(limitElement.value, 10), 0).toString();
getContracts();
}
function nextAndGetContracts() {
- offsetElement.value = (Number.parseInt(offsetElement.value, 10) + limit).toString();
+ offsetElement.value = (Number.parseInt(offsetElement.value, 10) +
+ Number.parseInt(limitElement.value, 10)).toString();
getContracts();
}
const filterElements = searchFilterFormElement.querySelectorAll('input, select');
diff --git a/public/javascripts/contract.search.ts b/public/javascripts/contract.search.ts
index 58e72020..a9dbcba9 100644
--- a/public/javascripts/contract.search.ts
+++ b/public/javascripts/contract.search.ts
@@ -18,10 +18,9 @@ declare const exports: Record
'#container--searchResults'
) as HTMLElement
- const limit = Number.parseInt(
- (document.querySelector('#searchFilter--limit') as HTMLInputElement).value,
- 10
- )
+ const limitElement = document.querySelector(
+ '#searchFilter--limit'
+ ) as HTMLSelectElement
const offsetElement = document.querySelector(
'#searchFilter--offset'
@@ -202,7 +201,7 @@ declare const exports: Record
searchResultsContainerElement.insertAdjacentHTML(
'beforeend',
sunrise.getSearchResultsPagerHTML(
- limit,
+ Number.parseInt(limitElement.value, 10),
responseJSON.offset,
responseJSON.count
)
@@ -237,7 +236,8 @@ declare const exports: Record
function previousAndGetContracts(): void {
offsetElement.value = Math.max(
- Number.parseInt(offsetElement.value, 10) - limit,
+ Number.parseInt(offsetElement.value, 10) -
+ Number.parseInt(limitElement.value, 10),
0
).toString()
getContracts()
@@ -245,7 +245,8 @@ declare const exports: Record
function nextAndGetContracts(): void {
offsetElement.value = (
- Number.parseInt(offsetElement.value, 10) + limit
+ Number.parseInt(offsetElement.value, 10) +
+ Number.parseInt(limitElement.value, 10)
).toString()
getContracts()
}
diff --git a/views/burialSite-search.ejs b/views/burialSite-search.ejs
index 8ea0fc3b..be54ebe1 100644
--- a/views/burialSite-search.ejs
+++ b/views/burialSite-search.ejs
@@ -17,25 +17,45 @@
-
- Find a Burial Site
-
-
- <% if (user.userProperties.canUpdate) { %>
-
+
-
+
diff --git a/views/contract-search.ejs b/views/contract-search.ejs
index 5980b4d2..74237e52 100644
--- a/views/contract-search.ejs
+++ b/views/contract-search.ejs
@@ -20,25 +20,45 @@
-
- Find a Contract
-
-
- <% if (user.userProperties.canUpdate) { %>
-
-
-
- Create a New Contract
-
+
+
-
+