diff --git a/handlers/reports-get/search.d.ts b/handlers/reports-get/search.d.ts index 4bcb65f6..2a4f791e 100644 --- a/handlers/reports-get/search.d.ts +++ b/handlers/reports-get/search.d.ts @@ -1,2 +1,4 @@ import type { Request, Response } from 'express'; -export default function handler(_request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/reports-get/search.js b/handlers/reports-get/search.js index 6142975f..aff44049 100644 --- a/handlers/reports-get/search.js +++ b/handlers/reports-get/search.js @@ -1,13 +1,15 @@ import { dateToString } from '@cityssm/utils-datetime'; import getCemeteries from '../../database/getCemeteries.js'; import { getBurialSiteStatuses, getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(_request, response) { +export default async function handler(request, response) { const rightNow = new Date(); + const reportTab = request.query.tab ?? 'workOrders'; const cemeteries = await getCemeteries(); const burialSiteTypes = await getBurialSiteTypes(); const burialSiteStatuses = await getBurialSiteStatuses(); response.render('report-search', { headTitle: 'Reports', + reportTab, burialSiteStatuses, burialSiteTypes, cemeteries, diff --git a/handlers/reports-get/search.ts b/handlers/reports-get/search.ts index 3aec6dc7..337b1711 100644 --- a/handlers/reports-get/search.ts +++ b/handlers/reports-get/search.ts @@ -9,17 +9,20 @@ import { } from '../../helpers/functions.cache.js' export default async function handler( - _request: Request, + request: Request, response: Response ): Promise { const rightNow = new Date() + const reportTab = request.query.tab ?? 'workOrders' + const cemeteries = await getCemeteries() const burialSiteTypes = await getBurialSiteTypes() const burialSiteStatuses = await getBurialSiteStatuses() response.render('report-search', { headTitle: 'Reports', + reportTab, burialSiteStatuses, burialSiteTypes, diff --git a/views/_menu-cemeteries.ejs b/views/_menu-cemeteries.ejs new file mode 100644 index 00000000..bce805fa --- /dev/null +++ b/views/_menu-cemeteries.ejs @@ -0,0 +1,56 @@ + \ No newline at end of file diff --git a/views/_menu-contracts.ejs b/views/_menu-contracts.ejs new file mode 100644 index 00000000..b9646bb7 --- /dev/null +++ b/views/_menu-contracts.ejs @@ -0,0 +1,56 @@ + \ No newline at end of file diff --git a/views/_menu-workOrders.ejs b/views/_menu-workOrders.ejs index 3896c724..76a5dfaf 100644 --- a/views/_menu-workOrders.ejs +++ b/views/_menu-workOrders.ejs @@ -9,7 +9,7 @@ aria-label="Work Order Search">
- +
Work Order Search
@@ -45,4 +45,29 @@ +

+ Reports +

+ \ No newline at end of file diff --git a/views/burialSite-search.ejs b/views/burialSite-search.ejs index 63df9e24..8ea0fc3b 100644 --- a/views/burialSite-search.ejs +++ b/views/burialSite-search.ejs @@ -1,126 +1,133 @@ <%- include('_header'); -%> - - -

- Find a Burial Site -

- -<% if (user.userProperties.canUpdate) { %> -
- - - Create a New Burial Site - +
+
+ <%- include('_menu-cemeteries'); -%>
-<% } %> +
+ -
-
- - -
-
- -
-
-
- + +
+
+ +
+
+
+ +
+ + + +
+
+ +
+
+
+
+
+ +
+
+ +
+ + + +
- - - -
-
-
-
-
-
- -
-
- +
+
+
+ +
+
+ +
+ + + +
+
+
+
+
+ +
+
+ +
+ + + +
- - -
-
+
-
-
-
- -
-
- -
- - - -
-
-
-
-
- -
-
- -
- - - -
-
-
-
- + +
+
-
- <%- include('_footerA'); -%> diff --git a/views/cemetery-search.ejs b/views/cemetery-search.ejs index 0bebae07..d6c1119e 100644 --- a/views/cemetery-search.ejs +++ b/views/cemetery-search.ejs @@ -1,59 +1,66 @@ <%- include('_header'); -%> - - -
+
+
+ <%- include('_menu-cemeteries'); -%> +
-

- Find a Cemetery -

-
-
- - - Export - -
-
+ -<% if (user.userProperties.canUpdate) { %> -
- - - Create a New Cemetery - -
-<% } %> - -
-
-
-
- - - - +
+
+

+ Find a Cemetery +

+
+
+ + + Export +
- -
-
+ <% if (user.userProperties.canUpdate) { %> +
+ + + Create a New Cemetery + +
+ <% } %> + +
+
+
+
+ + + + +
+
+
+
+ +
+
+
<%- include('_footerA'); -%> diff --git a/views/contract-search.ejs b/views/contract-search.ejs index 10455745..5980b4d2 100644 --- a/views/contract-search.ejs +++ b/views/contract-search.ejs @@ -1,175 +1,183 @@ <%- include('_header'); -%> - -

- Find a Contract -

- -<% if (user.userProperties.canUpdate) { %> -
- - - Create a New Contract - +
+
+ <%- include('_menu-contracts'); -%>
-<% } %> +
+ -
-
- - -
-
-
- -
-
- +

+ Find a Contract +

+ + <% if (user.userProperties.canUpdate) { %> +
+ + + Create a New Contract + +
+ <% } %> + +
+ + + +
+
+
+ +
+
+ +
+ + + +
- - -
-
-
-
-
- -
- - - - -
-
-
-
-
- -
-
- +
+
+ +
+ + + + +
- - -
-
-
-
-
-
-
- -
-
- +
+
+ +
+
+ +
+ + + +
- - -
-
-
- -
-
-
- +
+
+
+ +
+
+ +
+ + + +
- - -
-
- +
+ +
+
+
+ +
+ + + +
+
+ +
+
-
+ +
+
+
+ +
+
+ +
+ + + +
+
+
+
+
+ +
+
+ +
+ + + +
+
+
+
+ +
-
-
-
- -
-
- -
- - - -
-
-
-
-
- -
-
- -
- - - -
-
-
-
- - +
+
-
- <%- include('_footerA'); -%> diff --git a/views/funeralHome-search.ejs b/views/funeralHome-search.ejs index 5471dcc7..965ad393 100644 --- a/views/funeralHome-search.ejs +++ b/views/funeralHome-search.ejs @@ -1,59 +1,66 @@ <%- include('_header'); -%> - - -
+
+
+ <%- include('_menu-contracts'); -%> +
-

- Find a Funeral Home -

-
-
- - - Export - -
-
+ -<% if (user.userProperties.canUpdate) { %> -
- - - Create a New Funeral Home - -
-<% } %> - -
-
-
-
- - - - +
+
+

+ Find a Funeral Home +

+
+
+ + + Export +
- -
-
+ <% if (user.userProperties.canUpdate) { %> +
+ + + Create a New Funeral Home + +
+ <% } %> + +
+
+
+
+ + + + +
+
+
+
+ +
+
+
<%- include('_footerA'); -%> diff --git a/views/report-search.ejs b/views/report-search.ejs index 67c4aacc..595dbe0a 100644 --- a/views/report-search.ejs +++ b/views/report-search.ejs @@ -8,29 +8,33 @@ @@ -39,15 +43,23 @@ @@ -67,7 +79,7 @@
-
+

Work Order Reports

@@ -110,37 +122,63 @@
-