timesheetMaxAgeDays filter

Author: dangowans

eslint.config.js

@@ -11,6 +11,7 @@ export const config = defineConfig(configCityssm, {
                         ...cspellWords,
                         'timesheet',
                         'worktech',
+                        'dateadd',
                         'rtrim',
                         // Column name abbreviations
                         'accomp',

eslint.config.ts

@@ -15,6 +15,7 @@ export const config = defineConfig(configCityssm, {
             'timesheet',
             'worktech',
 
+            'dateadd',
             'rtrim',
 
             // Column name abbreviations

queries/employees/getTimesheetBatchEntries.d.ts

@@ -5,6 +5,7 @@ export declare const getTimesheetBatchEntriesLimit = 2000;
 export interface GetTimesheetBatchEntriesFilters {
     employeeNumber?: string;
     timesheetDate?: DateString;
+    timesheetMaxAgeDays?: number;
     activityId?: string;
     jobId?: string;
     workOrderNumber?: string;

queries/employees/getTimesheetBatchEntries.js

@@ -41,6 +41,9 @@ export async function getTimesheetBatchEntries(mssqlConfig, filters) {
     if (filters.timesheetDate !== undefined) {
         sql += ' AND [DateTime] = @timesheetDate';
     }
+    if (filters.timesheetMaxAgeDays !== undefined) {
+        sql += ' AND [DateTime] >= DATEADD(day, -1 * @timesheetMaxAgeDays, CAST(GETDATE() AS date))';
+    }
     if (filters.jobId !== undefined) {
         sql += ' AND [ExJob_ID] = @jobId';
     }
@@ -57,6 +60,7 @@ export async function getTimesheetBatchEntries(mssqlConfig, filters) {
     const result = (await request
         .input('employeeNumber', filters.employeeNumber)
         .input('timesheetDate', filters.timesheetDate)
+        .input('timesheetMaxAgeDays', filters.timesheetMaxAgeDays)
         .input('jobId', filters.jobId)
         .input('activityId', filters.activityId)
         .input('workOrderNumber', filters.workOrderNumber)

queries/employees/getTimesheetBatchEntries.ts

@@ -7,7 +7,9 @@ export const getTimesheetBatchEntriesLimit = 2000
 
 export interface GetTimesheetBatchEntriesFilters {
   employeeNumber?: string
+
   timesheetDate?: DateString
+  timesheetMaxAgeDays?: number
 
   activityId?: string
   jobId?: string
@@ -56,6 +58,7 @@ export async function getTimesheetBatchEntries(
     where transType = 'Time Sheets'
       and type = 'Employee'
   `
+
   if (filters.employeeNumber !== undefined) {
     sql += ' AND [Item_ID] = @employeeNumber'
   }
@@ -64,6 +67,10 @@ export async function getTimesheetBatchEntries(
     sql += ' AND [DateTime] = @timesheetDate'
   }
 
+  if (filters.timesheetMaxAgeDays !== undefined) {
+    sql += ' AND [DateTime] >= DATEADD(day, -1 * @timesheetMaxAgeDays, CAST(GETDATE() AS date))'
+  }
+
   if (filters.jobId !== undefined) {
     sql += ' AND [ExJob_ID] = @jobId'
   }
@@ -85,6 +92,7 @@ export async function getTimesheetBatchEntries(
   const result = (await request
     .input('employeeNumber', filters.employeeNumber)
     .input('timesheetDate', filters.timesheetDate)
+    .input('timesheetMaxAgeDays', filters.timesheetMaxAgeDays)
     .input('jobId', filters.jobId)
     .input('activityId', filters.activityId)
     .input('workOrderNumber', filters.workOrderNumber)

test/employees.test.js

@@ -60,6 +60,20 @@ await describe('queries/employees', async () => {
                 assert.strictEqual(timesheetBatchEntry.timesheetDateString, timesheetDateString);
             }
         });
+        await it('Retrieves timesheet batch entries by max age days', async () => {
+            const timesheetMaxAgeDays = 90;
+            const timesheetBatchEntries = await getTimesheetBatchEntries(mssqlConfig, {
+                timesheetMaxAgeDays
+            });
+            assert.ok(timesheetBatchEntries.length > 0);
+            const currentDate = new Date();
+            for (const timesheetBatchEntry of timesheetBatchEntries) {
+                const timesheetDate = timesheetBatchEntry.timesheetDate;
+                const ageInDays = Math.floor((currentDate.getTime() - timesheetDate.getTime()) /
+                    (1000 * 60 * 60 * 24));
+                assert.ok(ageInDays <= timesheetMaxAgeDays);
+            }
+        });
         await it('Retrieves timesheet batch entries by job ID', async () => {
             const timesheetBatchEntries = await getTimesheetBatchEntries(mssqlConfig, {
                 jobId: validJobId

test/employees.test.ts

@@ -12,7 +12,12 @@ import { getEmployeePayCodes } from '../queries/employees/getEmployeePayCodes.js
 import { getTimeCodes } from '../queries/employees/getTimeCodes.js'
 import { getTimesheetBatchEntries } from '../queries/employees/getTimesheetBatchEntries.js'
 
-import { mssqlConfig, validActivityId, validEmployeeNumber, validJobId } from './config.js'
+import {
+  mssqlConfig,
+  validActivityId,
+  validEmployeeNumber,
+  validJobId
+} from './config.js'
 
 Debug.enable(DEBUG_ENABLE_NAMESPACES)
 
@@ -72,10 +77,7 @@ await describe('queries/employees', async () => {
           validEmployeeNumber
         )
 
-        assert.strictEqual(
-          timesheetBatchEntry.timesheetHours,
-          timesheetHours
-        )
+        assert.strictEqual(timesheetBatchEntry.timesheetHours, timesheetHours)
       }
     })
 
@@ -104,27 +106,48 @@ await describe('queries/employees', async () => {
       }
     })
 
-    await it('Retrieves timesheet batch entries by job ID', async () => {
+    await it('Retrieves timesheet batch entries by max age days', async () => {
+      const timesheetMaxAgeDays = 90
 
       const timesheetBatchEntries = await getTimesheetBatchEntries(
         mssqlConfig,
         {
-          jobId: validJobId
+          timesheetMaxAgeDays
         }
       )
 
       assert.ok(timesheetBatchEntries.length > 0)
 
+      const currentDate = new Date()
+
       for (const timesheetBatchEntry of timesheetBatchEntries) {
-        assert.strictEqual(
-          timesheetBatchEntry.jobId,
-          validJobId
+        const timesheetDate = timesheetBatchEntry.timesheetDate as Date
+
+        const ageInDays = Math.floor(
+          (currentDate.getTime() - timesheetDate.getTime()) /
+            (1000 * 60 * 60 * 24)
         )
+
+        assert.ok(ageInDays <= timesheetMaxAgeDays)
       }
     })
 
-    await it('Retrieves timesheet batch entries by activity ID', async () => {
+    await it('Retrieves timesheet batch entries by job ID', async () => {
+      const timesheetBatchEntries = await getTimesheetBatchEntries(
+        mssqlConfig,
+        {
+          jobId: validJobId
+        }
+      )
 
+      assert.ok(timesheetBatchEntries.length > 0)
+
+      for (const timesheetBatchEntry of timesheetBatchEntries) {
+        assert.strictEqual(timesheetBatchEntry.jobId, validJobId)
+      }
+    })
+
+    await it('Retrieves timesheet batch entries by activity ID', async () => {
       const timesheetBatchEntries = await getTimesheetBatchEntries(
         mssqlConfig,
         {
@@ -135,10 +158,7 @@ await describe('queries/employees', async () => {
       assert.ok(timesheetBatchEntries.length > 0)
 
       for (const timesheetBatchEntry of timesheetBatchEntries) {
-        assert.strictEqual(
-          timesheetBatchEntry.activityId,
-          validActivityId
-        )
+        assert.strictEqual(timesheetBatchEntry.activityId, validActivityId)
       }
     })
   })