Changeset 7 for trunk/Ean.pas

Timestamp:

Apr 13, 2026, 7:11:03 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: Store imported values in EdcProject.

File:

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

trunk/Ean.pas

@@ -17 +17 @@
     class function Create(Time: TDateTime; ValueIn, ValueOut: Single): TEanValue; static;
     function GetShared: Double;
+    procedure LoadFromXmlNode(Node: TDOMNode);
+    procedure SaveToXmlNode(Node: TDOMNode);
   end;
 
@@ -23 +25 @@
   TEanValues = class(TList<TEanValue>)
     function Comparer(constref Left, Right: TEanValue): Integer;
+    procedure LoadFromXmlNode(Node: TDOMNode);
+    procedure SaveToXmlNode(Node: TDOMNode);
   end;
 
@@ -51 +55 @@
   TEans = class(TObjectList<TEan>)
     function SearchByNumber(Number: string): TEan;
+    function SearchByOwner(Owner: string): TEan;
     procedure LoadToStrings(Strings: TStrings; AllowNone: Boolean = False);
     procedure LoadFromXmlNode(Node: TDOMNode);
@@ -64 +69 @@
   EansName = 'Eans';
   EanName = 'Ean';
+  EanValueName = 'EanValue';
+  EanValuesName = 'EanValues';
 
 
@@ -94 +101 @@
 end;
 
+procedure TEanValue.LoadFromXmlNode(Node: TDOMNode);
+begin
+  Time := ReadDateTime(Node, 'Time', Time);
+  ValueIn := ReadDouble(Node, 'ValueIn', ValueIn);
+  ValueOut := ReadDouble(Node, 'ValueOut', ValueOut);
+end;
+
+procedure TEanValue.SaveToXmlNode(Node: TDOMNode);
+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);
+end;
+
 { TEanValues }
 
@@ -99 +120 @@
 begin
   Result := CompareDateTime(Left.Time, Right.Time);
+end;
+
+procedure TEanValues.LoadFromXmlNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  EanValue: TEanValue;
+begin
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = EanValueName) do begin
+    EanValue.LoadFromXmlNode(Node2);
+    Add(EanValue);
+    Node2 := Node2.NextSibling;
+  end;
+end;
+
+procedure TEanValues.SaveToXmlNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do begin
+    Node2 := Node.OwnerDocument.CreateElement(EanValueName);
+    Items[I].SaveToXmlNode(Node2);
+    Node.AppendChild(Node2);
+  end;
 end;
 
@@ -133 +179 @@
 
 procedure TEan.LoadFromXmlNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
 begin
   Number := ReadString(Node, 'Number', Number);
@@ -140 +188 @@
   PriceHigh := ReadDouble(Node, 'PriceHigh', PriceHigh);
   PriceSpot := ReadDouble(Node, 'PriceSpot', PriceSpot);
+  Kind := TEanKind(ReadInteger(Node, 'Kind', Integer(Kind)));
+
+  NewNode := Node.FindNode(EanValuesName);
+  if Assigned(NewNode) then
+    Values.LoadFromXmlNode(NewNode);
 end;
 
 procedure TEan.SaveToXmlNode(Node: TDOMNode);
-begin
-  WriteString(Node, 'Number', Number);
-  WriteString(Node, 'Owner', Owner);
-  WriteString(Node, 'DistributionTariff', DistributionTariff);
-  WriteDouble(Node, 'PriceLow', PriceLow);
-  WriteDouble(Node, 'PriceHigh', PriceHigh);
-  WriteDouble(Node, 'PriceSpot', PriceSpot);
+var
+  NewNode: TDOMNode;
+begin
+  if Number <> '' then WriteString(Node, 'Number', Number);
+  if Owner <> '' then WriteString(Node, 'Owner', Owner);
+  if DistributionTariff <> '' then WriteString(Node, 'DistributionTariff', DistributionTariff);
+  if PriceLow <> 0 then WriteDouble(Node, 'PriceLow', PriceLow);
+  if PriceHigh <> 0 then WriteDouble(Node, 'PriceHigh', PriceHigh);
+  if PriceSpot <> 0 then WriteDouble(Node, 'PriceSpot', PriceSpot);
+  WriteInteger(Node, 'Kind', Integer(Kind));
+
+  if Values.Count > 0 then begin
+    NewNode := Node.OwnerDocument.CreateElement(EanValuesName);
+    Node.AppendChild(NewNode);
+    Values.SaveToXmlNode(NewNode);
+  end;
 end;
 
@@ -171 +233 @@
   I := 0;
   while (I < Count) and (Items[I].Number <> Number) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
+function TEans.SearchByOwner(Owner: string): TEan;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (Items[I].Owner <> Owner) do Inc(I);
   if I < Count then Result := Items[I]
     else Result := nil;