Merge pull request #1916 from bcgov/dev

Dev

Author: JamesPasta

applications/Unity.AutoUI/package-lock.json

@@ -0,0 +1,17 @@
+<Project>
+  
+  <PropertyGroup>
+    <!-- Suppress NU1701 warnings for Microsoft.Extensions.Compliance.Abstractions -->
+    <!-- This package works correctly with .NET 9.0 despite targeting older frameworks -->
+    <!-- Suppress MSB3277 warnings for EntityFrameworkCore.Relational version conflicts -->
+    <!-- These conflicts don't cause runtime issues in this solution -->
+    <NoWarn>$(NoWarn);NU1701;MSB3277</NoWarn>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <!-- Explicitly reference compatible version to avoid transitive dependency warnings -->
+    <PackageReference Include="Microsoft.Extensions.Compliance.Abstractions" Version="9.5.0" />
+
+  </ItemGroup>
+  
+</Project>

applications/Unity.GrantManager/Directory.Build.props

@@ -105,37 +105,36 @@ $(function () {
         handleEditDatagridRowModalResult(response);
     });
 
+    // Function to calculate sum for a specific column
+    function calculateColumnSum(table, columnIndex) {
+        let total = 0;
+        table.column(columnIndex).data().each(function (value) {
+            // Remove currency symbols and commas for numeric check
+            let cleanedValue = value.replace(/[^\d.-]/g, '');
+            if (isNumeric(cleanedValue)) {
+                total += parseFloat(cleanedValue);
+            }
+        });
+        return total;
+    }
+
     // Function to update totals
     function updateTotals(table, fieldId) {
         // Iterate through each input field that has the id pattern 'total-{key}'
         $('#summary-' + fieldId + ' input[id^="total-"]').each(function () {
             let inputId = $(this).attr('id');
             let key = inputId.replace('total-', '');
-            let total = 0;
-            let headerFound = false;
-
+            
             // Find the corresponding column in the DataTable by matching the key
-            table.columns().header().each(function (header, index) {
-                if ($(header).text() === key) {
-                    headerFound = true;
-                    // Sum up all numeric values in the column
-                    table.column(index).data().each(function (value, rowIndex) {
-                        // Remove currency symbols and commas for numeric check
-                        let cleanedValue = value.replace(/[^\d.-]/g, '');
-
-                        if (isNumeric(cleanedValue)) {
-                            total += parseFloat(cleanedValue);
-                        }
-                    });
-                }
-            });
-
-            // Update the input field with the calculated total only if the header is found 
-            if (headerFound) {
+            let columnIndex = getColumnIndex(table, key);
+            
+            if (columnIndex !== -1) {
+                let total = calculateColumnSum(table, columnIndex);
+                
+                // Update the input field with the calculated total
                 if ($(this).data('field-type') === 'Currency') {
                     $(this).val(formatCurrency(total));
-                }
-                else {
+                } else {
                     $(this).val(total);
                 }
             }
@@ -278,23 +277,33 @@ $(function () {
         return availableOptions;
     }
 
+    // Function to configure action buttons for a table cell
+    function configureActionButtonForCell(cell) {
+        cell.innerHTML = getEditRowButtonTemplate(); // Add edit button to each cell
+
+        // Attach click event handler to the newly added button 
+        $(cell).find('.row-edit-btn').on('click', function () {
+            let button = this; // `this` refers to the button element 
+            editDataRow(button);
+        });
+    }
+
+    // Function to setup the actions column
+    function setupActionsColumn(table, columnIndex) {
+        table.column(columnIndex).header().innerHTML = 'Actions'; // Update column header if needed
+        table.column(columnIndex).nodes().each(function (cell) {
+            configureActionButtonForCell(cell);
+        });
+    }
+
     function configureTable(table, fieldId) {
         // Move buttons to custom container
         table.buttons().container().prependTo(`#btn-container-${fieldId}`);
 
         // Add edit buttons to the last column (Actions)
         table.columns().every(function (index) {
             if (index === table.columns().count() - 1) { // Check if it is the last column
-                table.column(index).header().innerHTML = 'Actions'; // Update column header if needed
-                table.column(index).nodes().each(function (cell) {
-                    cell.innerHTML = getEditRowButtonTemplate(); // Add edit button to each cell
-
-                    // Attach click event handler to the newly added button 
-                    $(cell).find('.row-edit-btn').on('click', function () {
-                        let button = this; // `this` refers to the button element 
-                        editDataRow(button);
-                    });
-                });
+                setupActionsColumn(table, index);
             }
         });
     }