Man hours uses subtotal

src/utils/modifier-registry.ts

@@ -12,6 +12,10 @@ export interface ModifierModule {
     calculateDisplay?: (modifier: Modifier, subScopeTotalWithMarkup: number, subScopeItems: EstimateItem[]) => number;
 }
 
+const getPreMarkupSubtotal = (items: EstimateItem[]) => {
+    return items.reduce((sum, item) => sum + item.quantity * item.unitPrice, 0);
+};
+
 const TaxModule: ModifierModule = {
     id: 'tax',
     name: 'Tax',
@@ -34,9 +38,11 @@ const ManHoursModule: ModifierModule = {
     defaultValueType: 'unit',
     defaultUnitLabel: 'factor',
     calculate: () => 0,
-    calculateDisplay: (m, base) => {
+    calculateDisplay: (m, _, items) => {
         const factor = m.value || 1;
-        return base / factor;
+        if (factor === 0) return 0;
+        const subtotal = getPreMarkupSubtotal(items);
+        return subtotal / factor;
     }
 };