From 90c107b0f3fc2cef5a3f769b49540748b575805d Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Fri, 3 Feb 2023 12:44:20 -0500
Subject: [PATCH] show lot occupancy count on dashboard

---
 handlers/dashboard-get/dashboard.js         | 13 ++++++++++-
 handlers/dashboard-get/dashboard.ts         | 24 ++++++++++++++++++---
 helpers/lotOccupancyDB/getLotOccupancies.js |  4 ++--
 helpers/lotOccupancyDB/getLotOccupancies.ts | 10 +++++----
 public-scss/style.scss                      |  2 +-
 views/dashboard.ejs                         |  3 +++
 6 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/handlers/dashboard-get/dashboard.js b/handlers/dashboard-get/dashboard.js
index 93d40df2..3961a7d7 100644
--- a/handlers/dashboard-get/dashboard.js
+++ b/handlers/dashboard-get/dashboard.js
@@ -1,6 +1,7 @@
 import { dateToString } from '@cityssm/expressjs-server-js/dateTimeFns.js';
 import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js';
 import { getWorkOrders } from '../../helpers/lotOccupancyDB/getWorkOrders.js';
+import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js';
 export async function handler(_request, response) {
     const currentDateString = dateToString(new Date());
     const workOrderMilestones = await getWorkOrderMilestones({
@@ -16,10 +17,20 @@ export async function handler(_request, response) {
         limit: 1,
         offset: 0
     });
+    const lotOccupancyResults = await getLotOccupancies({
+        occupancyStartDateString: currentDateString
+    }, {
+        limit: 1,
+        offset: 0,
+        includeFees: false,
+        includeOccupants: false,
+        includeTransactions: false
+    });
     response.render('dashboard', {
         headTitle: 'Dashboard',
         workOrderMilestones,
-        workOrderCount: workOrderResults.count
+        workOrderCount: workOrderResults.count,
+        lotOccupancyCount: lotOccupancyResults.count
     });
 }
 export default handler;
diff --git a/handlers/dashboard-get/dashboard.ts b/handlers/dashboard-get/dashboard.ts
index 9dadba9e..27b5399f 100644
--- a/handlers/dashboard-get/dashboard.ts
+++ b/handlers/dashboard-get/dashboard.ts
@@ -4,8 +4,12 @@ import { dateToString } from '@cityssm/expressjs-server-js/dateTimeFns.js'
 
 import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'
 import { getWorkOrders } from '../../helpers/lotOccupancyDB/getWorkOrders.js'
+import { getLotOccupancies } from '../../helpers/lotOccupancyDB/getLotOccupancies.js'
 
-export async function handler(_request: Request, response: Response): Promise<void> {
+export async function handler(
+  _request: Request,
+  response: Response
+): Promise<void> {
   const currentDateString = dateToString(new Date())
 
   const workOrderMilestones = await getWorkOrderMilestones(
@@ -24,15 +28,29 @@ export async function handler(_request: Request, response: Response): Promise<vo
       workOrderOpenDateString: currentDateString
     },
     {
-      limit: 1,
+      limit: 1, // only using the count
       offset: 0
     }
   )
 
+  const lotOccupancyResults = await getLotOccupancies(
+    {
+      occupancyStartDateString: currentDateString
+    },
+    {
+      limit: 1, // only using the count
+      offset: 0,
+      includeFees: false,
+      includeOccupants: false,
+      includeTransactions: false
+    }
+  )
+
   response.render('dashboard', {
     headTitle: 'Dashboard',
     workOrderMilestones,
-    workOrderCount: workOrderResults.count
+    workOrderCount: workOrderResults.count,
+    lotOccupancyCount: lotOccupancyResults.count
   })
 }
 
diff --git a/helpers/lotOccupancyDB/getLotOccupancies.js b/helpers/lotOccupancyDB/getLotOccupancies.js
index a53b89ba..2dace040 100644
--- a/helpers/lotOccupancyDB/getLotOccupancies.js
+++ b/helpers/lotOccupancyDB/getLotOccupancies.js
@@ -3,9 +3,9 @@ import { dateIntegerToString, dateStringToInteger } from '@cityssm/expressjs-ser
 import * as configFunctions from '../functions.config.js';
 import { getOccupancyTypeById } from '../functions.cache.js';
 import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js';
+import { getLotOccupancyFees } from './getLotOccupancyFees.js';
+import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js';
 import { getLotNameWhereClause, getOccupancyTimeWhereClause, getOccupantNameWhereClause } from '../functions.sqlFilters.js';
-import getLotOccupancyFees from './getLotOccupancyFees.js';
-import getLotOccupancyTransactions from './getLotOccupancyTransactions.js';
 function buildWhereClause(filters) {
     let sqlWhereClause = ' where o.recordDelete_timeMillis is null';
     const sqlParameters = [];
diff --git a/helpers/lotOccupancyDB/getLotOccupancies.ts b/helpers/lotOccupancyDB/getLotOccupancies.ts
index a7b7a35a..61cf481d 100644
--- a/helpers/lotOccupancyDB/getLotOccupancies.ts
+++ b/helpers/lotOccupancyDB/getLotOccupancies.ts
@@ -11,16 +11,18 @@ import {
 import * as configFunctions from '../functions.config.js'
 
 import { getOccupancyTypeById } from '../functions.cache.js'
-import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js'
 
-import type * as recordTypes from '../../types/recordTypes'
+import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js'
+import { getLotOccupancyFees } from './getLotOccupancyFees.js'
+import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js'
+
 import {
   getLotNameWhereClause,
   getOccupancyTimeWhereClause,
   getOccupantNameWhereClause
 } from '../functions.sqlFilters.js'
-import getLotOccupancyFees from './getLotOccupancyFees.js'
-import getLotOccupancyTransactions from './getLotOccupancyTransactions.js'
+
+import type * as recordTypes from '../../types/recordTypes'
 
 interface GetLotOccupanciesFilters {
   lotId?: number | string
diff --git a/public-scss/style.scss b/public-scss/style.scss
index f54c9b98..ae04e4b9 100644
--- a/public-scss/style.scss
+++ b/public-scss/style.scss
@@ -224,4 +224,4 @@ span.button.is-static {
   &.is-visible-hover {
     visibility: visible !important;
   }
-}
\ No newline at end of file
+}
diff --git a/views/dashboard.ejs b/views/dashboard.ejs
index 44f3eb70..fb0a1a7f 100644
--- a/views/dashboard.ejs
+++ b/views/dashboard.ejs
@@ -155,6 +155,9 @@
                     <span class="fa-layers fa-4x fa-fw" aria-hidden="true">
                       <i class="fas fa-vector-square"></i>
                       <i class="fas fa-user" data-fa-transform="shrink-10"></i>
+                      <% if (lotOccupancyCount > 0) { %>
+                        <span class="fa-layers-counter has-background-success"><%= lotOccupancyCount %></span>
+                      <% } %>
                     </span>
                   </div>
                   <div class="media-content has-text-black">