add timesheetHours filter

Author: dangowans

queries/employees/getTimesheetBatchEntries.d.ts

@@ -8,6 +8,7 @@ export interface GetTimesheetBatchEntriesFilters {
     activityId?: string;
     jobId?: string;
     workOrderNumber?: string;
+    timesheetHours?: number;
 }
 /**
  * Retrieves timesheet batch entries based on provided filters.

queries/employees/getTimesheetBatchEntries.js

@@ -50,13 +50,17 @@ export async function getTimesheetBatchEntries(mssqlConfig, filters) {
     if (filters.workOrderNumber !== undefined) {
         sql += ' AND [WONOS] = @workOrderNumber';
     }
+    if (filters.timesheetHours !== undefined) {
+        sql += ' AND [Qty] = @timesheetHours';
+    }
     sql += ' order by [BatchSysID] desc, [SeqNo]';
     const result = (await request
         .input('employeeNumber', filters.employeeNumber)
         .input('timesheetDate', filters.timesheetDate)
         .input('jobId', filters.jobId)
         .input('activityId', filters.activityId)
         .input('workOrderNumber', filters.workOrderNumber)
+        .input('timesheetHours', filters.timesheetHours)
         .query(sql));
     return result.recordset;
 }

queries/employees/getTimesheetBatchEntries.ts

@@ -12,6 +12,8 @@ export interface GetTimesheetBatchEntriesFilters {
   activityId?: string
   jobId?: string
   workOrderNumber?: string
+
+  timesheetHours?: number
 }
 
 /**
@@ -74,6 +76,10 @@ export async function getTimesheetBatchEntries(
     sql += ' AND [WONOS] = @workOrderNumber'
   }
 
+  if (filters.timesheetHours !== undefined) {
+    sql += ' AND [Qty] = @timesheetHours'
+  }
+
   sql += ' order by [BatchSysID] desc, [SeqNo]'
 
   const result = (await request
@@ -82,6 +88,7 @@ export async function getTimesheetBatchEntries(
     .input('jobId', filters.jobId)
     .input('activityId', filters.activityId)
     .input('workOrderNumber', filters.workOrderNumber)
+    .input('timesheetHours', filters.timesheetHours)
     .query(sql)) as mssql.IResult<TimesheetBatchEntry>
 
   return result.recordset

test/employees.test.js

@@ -36,13 +36,16 @@ await describe('queries/employees', async () => {
         });
     });
     await describe('getTimesheetBatchEntries()', async () => {
-        await it('Retrieves timesheet batch entries by employee number', async () => {
+        await it('Retrieves timesheet batch entries by employee number and hours', async () => {
+            const timesheetHours = 8;
             const timesheetBatchEntries = await getTimesheetBatchEntries(mssqlConfig, {
-                employeeNumber: validEmployeeNumber
+                employeeNumber: validEmployeeNumber,
+                timesheetHours
             });
             assert.ok(timesheetBatchEntries.length > 0);
             for (const timesheetBatchEntry of timesheetBatchEntries) {
                 assert.strictEqual(timesheetBatchEntry.employeeNumber, validEmployeeNumber);
+                assert.strictEqual(timesheetBatchEntry.timesheetHours, timesheetHours);
             }
         });
         await it('Retrieves timesheet batch entries by employee number and date', async () => {

test/employees.test.ts

@@ -53,11 +53,14 @@ await describe('queries/employees', async () => {
   })
 
   await describe('getTimesheetBatchEntries()', async () => {
-    await it('Retrieves timesheet batch entries by employee number', async () => {
+    await it('Retrieves timesheet batch entries by employee number and hours', async () => {
+      const timesheetHours = 8
+
       const timesheetBatchEntries = await getTimesheetBatchEntries(
         mssqlConfig,
         {
-          employeeNumber: validEmployeeNumber
+          employeeNumber: validEmployeeNumber,
+          timesheetHours
         }
       )
 
@@ -68,6 +71,11 @@ await describe('queries/employees', async () => {
           timesheetBatchEntry.employeeNumber,
           validEmployeeNumber
         )
+
+        assert.strictEqual(
+          timesheetBatchEntry.timesheetHours,
+          timesheetHours
+        )
       }
     })