Changeset 5 for trunk/FormMain.pas

Timestamp:

Apr 13, 2026, 9:08:21 AM (2 weeks ago)

Author:

chronos

Message:

• Modified: Load Owners from XML file with additional information about prices.

File:

• trunk/FormMain.pas (modified) (8 diffs)

trunk/FormMain.pas

@@ -7 +7 @@
   EditBtn, TAGraph, TASeries, Generics.Collections, Generics.Defaults,
   DateUtils, Ean, Translator, ApplicationInfo, RegistryEx, PersistentForm,
-  Theme, Common;
+  Theme, Common, XML, DOM, XMLRead, XMLWrite;
 
 type
@@ -110 +110 @@
 
 uses
-  csvdocument;
+  csvdocument, BufferedFileStream;
 
 resourcestring
@@ -124 +124 @@
   SMonth = 'Month';
   SYear = 'Year';
+  SWrongFileFormat = 'Wrong file format';
 
 { TFormMain }
@@ -140 +141 @@
 
   Reports := TStringList.Create;
-  SearchFiles(Reports, ReportsDir, FileNameFilter);
-  for I := 0 to Reports.Count - 1 do
-    LoadEdcReport(Reports[I]);
-  Reports.Free;
+  try
+    SearchFiles(Reports, ReportsDir, FileNameFilter);
+    for I := 0 to Reports.Count - 1 do
+      LoadEdcReport(Reports[I]);
+  finally
+    Reports.Free;
+  end;
 
   for I := 0 to Eans.Count - 1 do
@@ -151 +155 @@
   CreateEan('', STotalConsumtion, ekConsumption);
 
-  IntervalTo := Eans[0].Values.Last.Time + 15 * OneMinute;
+  if (Eans.Count > 0) and (Eans[0].Values.Count > 0) then
+    IntervalTo := Eans[0].Values.Last.Time + 15 * OneMinute;
   UpdateInterval;
   UpdateInterface;
@@ -356 +361 @@
   try
     ListView1.Items.Clear;
-    for I := 0 to Eans.Count - 1 do begin
+    for I := 0 to Eans.Count - 1 do
+    with Eans[I] do begin
       ListItem := ListView1.Items.Add;
-      ListItem.Caption := Eans[I].Number;
-      ListItem.SubItems.Add(Eans[I].Owner);
-      ListItem.SubItems.Add(MeasureToStr(Eans[I].GetTotalIn(IntervalFrom, IntervalTo)));
-      ListItem.SubItems.Add(MeasureToStr(Eans[I].GetTotalOut(IntervalFrom, IntervalTo)));
-      ListItem.SubItems.Add(IntToStr(Trunc(Eans[I].GetShared(IntervalFrom, IntervalTo))));
-      ListItem.SubItems.Add(EanKindText[Eans[I].Kind]);
+      ListItem.Caption := Number;
+      ListItem.SubItems.Add(Owner);
+      ListItem.SubItems.Add(MeasureToStr(GetTotalIn(IntervalFrom, IntervalTo)));
+      ListItem.SubItems.Add(MeasureToStr(GetTotalOut(IntervalFrom, IntervalTo)));
+      ListItem.SubItems.Add(IntToStr(Trunc(GetShared(IntervalFrom, IntervalTo))));
+      ListItem.SubItems.Add(EanKindText[Kind]);
+      ListItem.SubItems.Add(FloatToStr(PriceLow));
+      ListItem.SubItems.Add(FloatToStr(PriceHigh));
+      ListItem.SubItems.Add(FloatToStr(PriceSpot));
     end;
   finally
@@ -397 +406 @@
 procedure TFormMain.LoadOwners(FileName: string);
 var
-  Owners: TStringList;
   Ean: TEan;
-  I: Integer;
-begin
-  Owners := TStringList.Create;
-  Owners.LoadFromFile(FileName);
+  Doc: TXMLDocument;
+  RootNode: TDOMNode;
+  NewNode: TDOMNode;
+  Node2: TDOMNode;
+const
+  EdcProjectName = 'EdcProject';
+  EansName = 'Eans';
+  EanName = 'Ean';
+begin
+  ReadXMLFile(Doc, FileName);
   Eans.Clear;
-  for I := 0 to Owners.Count - 1 do begin
-    Ean := TEan.Create;
-    Ean.Number := Owners.Names[I];
-    Ean.Owner := Owners.ValueFromIndex[I];
-    Eans.Add(Ean);
-  end;
-  Owners.Free;
+  with Doc do
+  try
+    if Doc.DocumentElement.NodeName <> EdcProjectName then
+      raise Exception.Create(SWrongFileFormat);
+    RootNode := Doc.DocumentElement;
+
+    NewNode := RootNode.FindNode(EansName);
+    if Assigned(NewNode) then begin
+      Node2 := NewNode.FirstChild;
+      while Assigned(Node2) and (Node2.NodeName = EanName) do begin
+        Ean := TEan.Create;
+        Ean.Number := ReadString(Node2, 'Number', '');
+        Ean.Owner := ReadString(Node2, 'Owner', '');
+        Ean.DistributionTariff := ReadString(Node2, 'DistributionTariff', '');
+        Ean.PriceLow := ReadDouble(Node2, 'PriceLow', 0);
+        Ean.PriceHigh := ReadDouble(Node2, 'PriceHigh', 0);
+        Ean.PriceSpot := ReadDouble(Node2, 'PriceSpot', 0);
+        Eans.Add(Ean);
+        Node2 := Node2.NextSibling;
+      end;
+    end;
+  finally
+    FreeAndNil(Doc);
+  end;
 end;
 
@@ -425 +456 @@
   EanKind: TEanKind;
   Number: string;
+  BufferedFileStream: TBufferedFileStream;
 begin
   CSVDoc := TCSVDocument.Create;
   try
     CSVDoc.Delimiter := ';';
+    //BufferedFileStream := TBufferedFileStream.Create(FileName, fmOpenRead);
+    //CSVDoc.LoadFromStream(BufferedFileStream);
     CSVDoc.LoadFromFile(FileName);
+    //BufferedFileStream.Free;
 
     for C := 0 to ((CSVDoc.ColCount[0] - 3) div 2) - 1 do begin