Changeset 10 for trunk/Ean.pas

Timestamp:

Apr 15, 2026, 9:35:17 AM (2 weeks ago)

Author:

chronos

Message:

• Added: Show spot total price above zero for EANs.

File:

• trunk/Ean.pas (modified) (5 diffs)

trunk/Ean.pas

@@ -47 +47 @@
     function GetSharedPercent(TimeFrom, TimeTo: TDateTime): Double;
     function GetSavings(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
-    function GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
+    function GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices; MinPrice: Currency): Currency;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
@@ -198 +198 @@
   I: Integer;
   SpotPrice: TSpotPrice;
+  SpotPriceIndex: Integer;
 begin
     if PriceLow = 0 then begin
@@ -203 +204 @@
     for I := 0 to Values.Count - 1 do
       if (Values[I].Time >= TimeFrom) and (Values[I].Time < TimeTo) then begin
-        SpotPrice := SpotPrices.SearchByTime(Values[I].Time);
-        if SpotPrice.Value <> 0 then
-          Result := Result + (Values[I].ValueIn - Values[I].ValueOut) * (SpotPrice.Value - PriceSpot);
+        SpotPriceIndex := SpotPrices.SearchByTime(Values[I].Time);
+        if SpotPriceIndex <> -1 then
+          Result := Result + (Values[I].ValueIn - Values[I].ValueOut) * (SpotPrices[SpotPriceIndex].Value - PriceSpot);
       end;
   end else begin
@@ -214 +215 @@
 end;
 
-function TEan.GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
-var
-  I: Integer;
-  SpotPrice: TSpotPrice;
+function TEan.GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices; MinPrice: Currency): Currency;
+var
+  I: Integer;
+  SpotPriceIndex: Integer;
+  SpotPrice: Currency;
 begin
   if PriceLow = 0 then begin
@@ -223 +225 @@
     for I := 0 to Values.Count - 1 do
       if (Values[I].Time >= TimeFrom) and (Values[I].Time < TimeTo) then begin
-        SpotPrice := SpotPrices.SearchByTime(Values[I].Time);
-        if SpotPrice.Value <> 0 then
-          Result := Result + Values[I].ValueIn * (SpotPrice.Value - PriceSpot);
+        SpotPriceIndex := SpotPrices.SearchByTime(Values[I].Time);
+        if (SpotPriceIndex <> -1) then begin
+          SpotPrice := SpotPrices[SpotPriceIndex].Value - PriceSpot;
+          if SpotPrice > MinPrice then
+            Result := Result + Values[I].ValueIn * SpotPrice;
+        end;
       end;
   end else Result := GetTotalIn(TimeFrom, TimeTo) * PriceLow;