Changeset 9 for trunk/Ean.pas

Timestamp:

Apr 14, 2026, 12:57:08 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: Loading of spot prices and calculation prices for each EAN.

File:

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

trunk/Ean.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Generics.Collections, Generics.Defaults, DateUtils, DOM,
-  XML;
+  XML, SpotPrice;
 
 type
@@ -45 +45 @@
     function GetTotalOut(TimeFrom, TimeTo: TDateTime): Double;
     function GetShared(TimeFrom, TimeTo: TDateTime): Double;
-    function GetSavings(TimeFrom, TimeTo: TDateTime): Integer;
+    function GetSharedPercent(TimeFrom, TimeTo: TDateTime): Double;
+    function GetSavings(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
+    function GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
@@ -173 +175 @@
 var
   TotalIn: Double;
+  TotalOut: Double;
+begin
+  TotalIn := GetTotalIn(TimeFrom, TimeTo);
+  TotalOut := GetTotalOut(TimeFrom, TimeTo);
+  if TotalIn <> 0 then Result := TotalIn - TotalOut
+    else Result := 0;
+end;
+
+function TEan.GetSharedPercent(TimeFrom, TimeTo: TDateTime): Double;
+var
+  TotalIn: Double;
 begin
   TotalIn := GetTotalIn(TimeFrom, TimeTo);
@@ -179 +192 @@
 end;
 
-function TEan.GetSavings(TimeFrom, TimeTo: TDateTime): Integer;
+function TEan.GetSavings(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
 var
   TotalIn: Double;
   TotalOut: Double;
-begin
-  TotalIn := GetTotalIn(TimeFrom, TimeTo);
-  TotalOut := GetTotalOut(TimeFrom, TimeTo);
-  Result := Trunc((TotalIn - TotalOut) * PriceLow);
+  I: Integer;
+  SpotPrice: TSpotPrice;
+begin
+    if PriceLow = 0 then begin
+    Result := 0;
+    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);
+      end;
+  end else begin
+    TotalIn := GetTotalIn(TimeFrom, TimeTo);
+    TotalOut := GetTotalOut(TimeFrom, TimeTo);
+    Result := (TotalIn - TotalOut) * PriceLow;
+  end;
+end;
+
+function TEan.GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
+var
+  I: Integer;
+  SpotPrice: TSpotPrice;
+begin
+  if PriceLow = 0 then begin
+    Result := 0;
+    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);
+      end;
+  end else Result := GetTotalIn(TimeFrom, TimeTo) * PriceLow;
 end;