Changeset 8 for trunk/Ean.pas

Timestamp:

Apr 13, 2026, 11:12:39 PM (2 weeks ago)

Author:

chronos

Message:

• Fixed: Data tab populating and refreshing.
• Fixed: Used currency as decimal type for measured values instead inaccurate double type.

File:

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

trunk/Ean.pas

@@ -13 +13 @@
   TEanValue = record
     Time: TDateTime;
-    ValueIn: Single;
-    ValueOut: Single;
-    class function Create(Time: TDateTime; ValueIn, ValueOut: Single): TEanValue; static;
+    ValueIn: Currency;
+    ValueOut: Currency;
+    class function Create(Time: TDateTime; ValueIn, ValueOut: Currency): TEanValue; static;
     function GetShared: Double;
     procedure LoadFromXmlNode(Node: TDOMNode);
@@ -45 +45 @@
     function GetTotalOut(TimeFrom, TimeTo: TDateTime): Double;
     function GetShared(TimeFrom, TimeTo: TDateTime): Double;
+    function GetSavings(TimeFrom, TimeTo: TDateTime): Integer;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
@@ -87 +88 @@
 { TEanValue }
 
-class function TEanValue.Create(Time: TDateTime; ValueIn, ValueOut: Single
+class function TEanValue.Create(Time: TDateTime; ValueIn, ValueOut: Currency
   ): TEanValue;
 begin
@@ -104 +105 @@
 begin
   Time := ReadDateTime(Node, 'Time', Time);
-  ValueIn := ReadDouble(Node, 'ValueIn', ValueIn);
-  ValueOut := ReadDouble(Node, 'ValueOut', ValueOut);
+  ValueIn := ReadCurrency(Node, 'ValueIn', 0);
+  ValueOut := ReadCurrency(Node, 'ValueOut', 0);
 end;
 
@@ -111 +112 @@
 begin
   if Time <> 0 then WriteDateTime(Node, 'Time', Time);
-  if ValueIn <> 0 then WriteDouble(Node, 'ValueIn', ValueIn);
-  if ValueOut <> 0 then WriteDouble(Node, 'ValueOut', ValueOut);
+  if ValueIn <> 0 then WriteCurrency(Node, 'ValueIn', ValueIn);
+  if ValueOut <> 0 then WriteCurrency(Node, 'ValueOut', ValueOut);
 end;
 
@@ -176 +177 @@
   if TotalIn <> 0 then Result := (1 - GetTotalOut(TimeFrom, TimeTo) / TotalIn) * 100
     else Result := 0;
+end;
+
+function TEan.GetSavings(TimeFrom, TimeTo: TDateTime): Integer;
+var
+  TotalIn: Double;
+  TotalOut: Double;
+begin
+  TotalIn := GetTotalIn(TimeFrom, TimeTo);
+  TotalOut := GetTotalOut(TimeFrom, TimeTo);
+  Result := Trunc((TotalIn - TotalOut) * PriceLow);
 end;