Fix net performance percentage of date ranges

apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@@ -822,8 +822,10 @@ export abstract class PortfolioCalculator {
           netPerformanceWithCurrencyEffectAtStartDate;
 
         if (historicalDataItem.totalInvestmentValueWithCurrencyEffect > 0) {
-          // The invested capital in the date range is the value at its start
+          // Add the gross performance at the start date of the range to the
-          // date: the investment plus the gross performance up to that date
+          // investment of each day. Thus the range starts with the value of
+          // its first day, and subsequent buy and sell activities stay
+          // included.
           timeWeightedInvestmentValuesWithCurrencyEffect.push(
             historicalDataItem.totalInvestmentValueWithCurrencyEffect +
               grossPerformanceWithCurrencyEffectAtStartDate
@@ -838,19 +840,18 @@ export abstract class PortfolioCalculator {
 
         chart.push({
           ...historicalDataItem,
-          netPerformance:
+          netPerformance: netPerformanceSinceStartDate,
-            historicalDataItem.netPerformance - netPerformanceAtStartDate,
           netPerformanceWithCurrencyEffect:
             netPerformanceWithCurrencyEffectSinceStartDate,
           netPerformanceInPercentage:
-            timeWeightedInvestmentValue === 0
+            timeWeightedInvestmentValue > 0
-              ? 0
+              ? netPerformanceSinceStartDate / timeWeightedInvestmentValue
-              : netPerformanceSinceStartDate / timeWeightedInvestmentValue,
+              : 0,
           netPerformanceInPercentageWithCurrencyEffect:
-            timeWeightedInvestmentValue === 0
+            timeWeightedInvestmentValue > 0
-              ? 0
+              ? netPerformanceWithCurrencyEffectSinceStartDate /
-              : netPerformanceWithCurrencyEffectSinceStartDate /
                 timeWeightedInvestmentValue
+              : 0
         });
       }
     }