Changeset 7 for trunk

Timestamp:

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

Author:

chronos

Message:

• Modified: Store imported values in EdcProject.

Location:

trunk

Files:

• Ean.pas (modified) (9 diffs)
• EdcProject.pas (modified) (10 diffs)
• FormMain.lfm (modified) (4 diffs)
• FormMain.lrj (modified) (1 diff)
• FormMain.pas (modified) (11 diffs)
• Languages/EdcStats.cs.po (modified) (2 diffs)
• Languages/EdcStats.pot (modified) (1 diff)
• Packages/Common/XML.pas (modified) (1 diff)
• SpotPrice.pas (modified) (1 diff)

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;

trunk/EdcProject.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Generics.Collections, Generics.Defaults, XML, DateUtils,
-  fphttpclient, opensslsockets, Ean, DOM, XMLRead, XMLWrite, Common, CsvDocument,
+  Ean, DOM, XMLRead, XMLWrite, Common, CsvDocument,
   SpotPrice;
 
@@ -48 +48 @@
   I: Integer;
 begin
+  for I := 0 to Eans.Count - 1 do
+    Eans[I].Values.Clear;
+
   Reports := TStringList.Create;
   try
@@ -59 +62 @@
   for I := 0 to Eans.Count - 1 do
     Eans[I].Values.Sort(TComparer<TEanValue>.Construct(Eans[I].Values.Comparer));
+
 
   CreateEan('', STotalSupply, ekSupply);
@@ -102 +106 @@
     AppendChild(RootNode);
 
-    NewNode := RootNode.OwnerDocument.CreateElement(EansName);
-    RootNode.AppendChild(NewNode);
-    Eans.SaveToXmlNode(NewNode);
-
-    NewNode := RootNode.OwnerDocument.CreateElement(SpotPricesName);
-    RootNode.AppendChild(NewNode);
-    SpotPrices.SaveToXmlNode(NewNode);
+    if Eans.Count > 0 then begin
+      NewNode := RootNode.OwnerDocument.CreateElement(EansName);
+      RootNode.AppendChild(NewNode);
+      Eans.SaveToXmlNode(NewNode);
+    end;
+
+    if SpotPrices.Count > 0 then begin
+      NewNode := RootNode.OwnerDocument.CreateElement(SpotPricesName);
+      RootNode.AppendChild(NewNode);
+      SpotPrices.SaveToXmlNode(NewNode);
+    end;
 
     if ExtractFileDir(FileName) <> '' then
@@ -136 +144 @@
   C: Integer;
   CSVDoc: TCSVDocument;
+  Date: TDateTime;
   TimeFrom: TDateTime;
   TimeTo: TDateTime;
@@ -147 +156 @@
   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
@@ -172 +178 @@
       Ean.Kind := EanKind;
 
+      Ean.Values.Capacity := Ean.Values.Count + CSVDoc.RowCount;
+
       for R := 1 to CSVDoc.RowCount - 1 do begin
-        TimeFrom := StrToDate(CSVDoc.Cells[0, R]) + StrToTime(CSVDoc.Cells[1, R]);
-        TimeTo := StrToDate(CSVDoc.Cells[0, R]) + StrToTime(CSVDoc.Cells[2, R]);
+        Date := StrToDate(CSVDoc.Cells[0, R]);
+        TimeFrom := Date + StrToTime(CSVDoc.Cells[1, R]);
+        TimeTo := Date + StrToTime(CSVDoc.Cells[2, R]);
 
         CellValueIn := 0;
@@ -203 +212 @@
   Value: TEanValue;
 begin
-  Ean := TEan.Create;
-  Ean.Number := Number;
-  Ean.Owner := Owner;
-  Ean.Kind := Kind;
+  Ean := Eans.SearchByOwner(Owner);
+  if not Assigned(Ean) then begin
+    Ean := TEan.Create;
+    Ean.Number := Number;
+    Ean.Owner := Owner;
+    Ean.Kind := Kind;
+    Eans.Add(Ean);
+  end;
+
+  Ean.Values.Clear;
 
   Values := TDictionary<TDateTime, TEanValue>.Create;
@@ -223 +238 @@
 
   ValuesArray := Values.ToArray;
+  Ean.Values.Capacity := Values.Count;
   for I := 0 to Values.Count - 1 do begin
     Ean.Values.Add(TEanValue.Create(ValuesArray[I].Key, ValuesArray[I].Value.ValueIn, ValuesArray[I].Value.ValueOut));
@@ -229 +245 @@
 
   Values.Free;
-
-  Eans.Add(Ean);
 end;
 

trunk/FormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 372
+  Left = 367
   Height = 884
-  Top = 366
+  Top = 361
   Width = 1203
   Caption = 'EDC Stats'
@@ -11 +11 @@
   LCLVersion = '4.6.0.0'
   WindowState = wsMaximized
+  OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -72 +73 @@
             Width = 135
           end>
+        PopupMenu = PopupMenuOverview
         ReadOnly = True
         RowSelect = True
@@ -384 +386 @@
     Left = 216
     Top = 376
-    object MenuItem1: TMenuItem
+    object MenuItemFile: TMenuItem
+      Caption = 'File'
+      object MenuItemLoad: TMenuItem
+        Caption = 'Load'
+        OnClick = MenuItemLoadClick
+      end
+      object MenuItemSave: TMenuItem
+        Caption = 'Save'
+        OnClick = MenuItemSaveClick
+      end
+    end
+    object MenuItemTools: TMenuItem
       Caption = 'Tools'
-      object MenuItem2: TMenuItem
-        Caption = 'Load reports'
-        OnClick = MenuItem2Click
-      end
-      object MenuItem3: TMenuItem
-        Caption = 'Load spot prices'
-        OnClick = MenuItem3Click
-      end
+      object MenuItemImportReports: TMenuItem
+        Caption = 'Import reports'
+        OnClick = MenuItemImportReportsClick
+      end
+      object MenuItemImportSpotPrices: TMenuItem
+        Caption = 'Import spot prices'
+        OnClick = MenuItemImportSpotPricesClick
+      end
+    end
+  end
+  object PopupMenuOverview: TPopupMenu
+    Left = 506
+    Top = 274
+    object MenuItemRemove: TMenuItem
+      Caption = 'Remove'
+      OnClick = MenuItemRemoveClick
     end
   end

trunk/FormMain.lrj

@@ -27 +27 @@
 {"hash":60,"name":"tformmain.buttonintervalleft.caption","sourcebytes":[60],"value":"<"},
 {"hash":6049914,"name":"tformmain.label5.caption","sourcebytes":[85,110,105,116,58],"value":"Unit:"},
-{"hash":5989939,"name":"tformmain.menuitem1.caption","sourcebytes":[84,111,111,108,115],"value":"Tools"},
-{"hash":234102723,"name":"tformmain.menuitem2.caption","sourcebytes":[76,111,97,100,32,114,101,112,111,114,116,115],"value":"Load reports"},
-{"hash":17275603,"name":"tformmain.menuitem3.caption","sourcebytes":[76,111,97,100,32,115,112,111,116,32,112,114,105,99,101,115],"value":"Load spot prices"}
+{"hash":315429,"name":"tformmain.menuitemfile.caption","sourcebytes":[70,105,108,101],"value":"File"},
+{"hash":341364,"name":"tformmain.menuitemload.caption","sourcebytes":[76,111,97,100],"value":"Load"},
+{"hash":366789,"name":"tformmain.menuitemsave.caption","sourcebytes":[83,97,118,101],"value":"Save"},
+{"hash":5989939,"name":"tformmain.menuitemtools.caption","sourcebytes":[84,111,111,108,115],"value":"Tools"},
+{"hash":212990659,"name":"tformmain.menuitemimportreports.caption","sourcebytes":[73,109,112,111,114,116,32,114,101,112,111,114,116,115],"value":"Import reports"},
+{"hash":67557683,"name":"tformmain.menuitemimportspotprices.caption","sourcebytes":[73,109,112,111,114,116,32,115,112,111,116,32,112,114,105,99,101,115],"value":"Import spot prices"},
+{"hash":93079237,"name":"tformmain.menuitemremove.caption","sourcebytes":[82,101,109,111,118,101],"value":"Remove"}
 ]}

trunk/FormMain.pas

@@ -7 +7 @@
   EditBtn, Menus, TAGraph, TASeries, Generics.Collections, Generics.Defaults,
   DateUtils, Ean, Translator, ApplicationInfo, RegistryEx, PersistentForm,
-  Theme, Common, XML, DOM, XMLRead, EdcProject;
+  Theme, Common, XML, EdcProject;
 
 type
@@ -45 +45 @@
     MainMenu1: TMainMenu;
     Memo1: TMemo;
-    MenuItem1: TMenuItem;
-    MenuItem2: TMenuItem;
-    MenuItem3: TMenuItem;
+    MenuItemRemove: TMenuItem;
+    MenuItemLoad: TMenuItem;
+    MenuItemSave: TMenuItem;
+    MenuItemTools: TMenuItem;
+    MenuItemImportReports: TMenuItem;
+    MenuItemImportSpotPrices: TMenuItem;
+    MenuItemFile: TMenuItem;
     PageControl1: TPageControl;
     PersistentForm1: TPersistentForm;
+    PopupMenuOverview: TPopupMenu;
     TabSheetOverview: TTabSheet;
     TabSheetData: TTabSheet;
@@ -64 +69 @@
     procedure ComboBoxUnitSelect(Sender: TObject);
     procedure DateEdit1Change(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
-    procedure MenuItem2Click(Sender: TObject);
-    procedure MenuItem3Click(Sender: TObject);
+    procedure MenuItemImportReportsClick(Sender: TObject);
+    procedure MenuItemImportSpotPricesClick(Sender: TObject);
+    procedure MenuItemLoadClick(Sender: TObject);
+    procedure MenuItemRemoveClick(Sender: TObject);
+    procedure MenuItemSaveClick(Sender: TObject);
     procedure TabSheetOverviewShow(Sender: TObject);
     procedure TabSheetChartShow(Sender: TObject);
@@ -81 +90 @@
     Period: TPeriod;
     ReportsDir: string;
-    OwnersFileName: string;
+    ProjectFileName: string;
     ShowResult: Boolean;
     EdcProject: TEdcProject;
-    procedure LoadReports;
     function MeasureToFloat(Value: Double; Interval: Double): Double;
     function MeasureToStr(Value: Double): string;
@@ -110 +118 @@
 {$R *.lfm}
 
-uses
-  csvdocument, BufferedFileStream;
-
 resourcestring
   SEAN = 'EAN';
@@ -174 +179 @@
 end;
 
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+end;
+
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
@@ -189 +198 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  LoadReports;
-end;
-
-procedure TFormMain.MenuItem2Click(Sender: TObject);
-begin
-  LoadReports;
-end;
-
-procedure TFormMain.MenuItem3Click(Sender: TObject);
+  MenuItemLoad.Click;
+end;
+
+procedure TFormMain.MenuItemImportReportsClick(Sender: TObject);
+begin
+  EdcProject.Import(ReportsDir);
+
+  if (EdcProject.Eans.Count > 0) and (EdcProject.Eans[0].Values.Count > 0) then
+    IntervalTo := EdcProject.Eans[0].Values.Last.Time + 15 * OneMinute;
+  UpdateInterval;
+  UpdateInterface;
+end;
+
+procedure TFormMain.MenuItemImportSpotPricesClick(Sender: TObject);
 begin
   EdcProject.SpotPrices.LoadSpotPrices(StrToDate('1.4.2026'));
+end;
+
+procedure TFormMain.MenuItemLoadClick(Sender: TObject);
+begin
+  EdcProject.LoadFromFile(ProjectFileName);
+
+  if (EdcProject.Eans.Count > 0) and (EdcProject.Eans[0].Values.Count > 0) then
+    IntervalTo := EdcProject.Eans[0].Values.Last.Time + 15 * OneMinute;
+  UpdateInterval;
+  UpdateInterface;
+end;
+
+procedure TFormMain.MenuItemRemoveClick(Sender: TObject);
+begin
+  if Assigned(ListView1.Selected) then
+    EdcProject.Eans.Remove(ListView1.Selected.Data);
+  ReloadListViewOverview;
+end;
+
+procedure TFormMain.MenuItemSaveClick(Sender: TObject);
+begin
+  EdcProject.SaveToFile(ProjectFileName);
 end;
 
@@ -248 +284 @@
   ComboBoxPeriod.Items[Integer(prYear)] := SYear;
   Ean.Translate;
-end;
-
-procedure TFormMain.LoadReports;
-begin
-  EdcProject.LoadFromFile(OwnersFileName);
-  EdcProject.Import(ReportsDir);
-
-  if (EdcProject.Eans.Count > 0) and (EdcProject.Eans[0].Values.Count > 0) then
-    IntervalTo := EdcProject.Eans[0].Values.Last.Time + 15 * OneMinute;
-  UpdateInterval;
-  UpdateInterface;
 end;
 
@@ -314 +339 @@
       ListItem := ListView1.Items.Add;
       ListItem.Caption := Number;
+      ListItem.Data := EdcProject.Eans[I];
       ListItem.SubItems.Add(Owner);
       ListItem.SubItems.Add(MeasureToStr(GetTotalIn(IntervalFrom, IntervalTo)));
@@ -470 +496 @@
     Period := TPeriod(ReadIntegerWithDefault('Period', Integer(Period)));
     ReportsDir := ReadStringWithDefault('ReportsDir', ReportsDir);
-    OwnersFileName := ReadStringWithDefault('OwnersFileName', OwnersFileName);
+    ProjectFileName := ReadStringWithDefault('ProjectFileName', ProjectFileName);
     PageControl1.TabIndex := ReadIntegerWithDefault('ActiveTab', PageControl1.TabIndex);
     ShowResult := ReadBoolWithDefault('ShowResult', ShowResult);
@@ -492 +518 @@
     WriteInteger('Period', Integer(Period));
     WriteString('ReportsDir', ReportsDir);
-    WriteString('OwnersFileName', OwnersFileName);
+    WriteString('ProjectFileName', ProjectFileName);
     WriteInteger('ActiveTab', PageControl1.TabIndex);
     WriteBool('ShowResult', ShowResult);

trunk/Languages/EdcStats.cs.po

@@ -180 +180 @@
 msgstr "Sdíleno [%]"
 
-#: tformmain.menuitem1.caption
+#: tformmain.menuitemfile.caption
+msgid "File"
+msgstr ""
+
+#: tformmain.menuitemimportreports.caption
+msgid "Import reports"
+msgstr ""
+
+#: tformmain.menuitemimportspotprices.caption
+msgctxt "tformmain.menuitemimportspotprices.caption"
+msgid "Import spot prices"
+msgstr ""
+
+#: tformmain.menuitemload.caption
+msgid "Load"
+msgstr ""
+
+#: tformmain.menuitemremove.caption
+msgid "Remove"
+msgstr ""
+
+#: tformmain.menuitemsave.caption
+msgid "Save"
+msgstr ""
+
+#: tformmain.menuitemtools.caption
+#, fuzzy
+msgctxt "tformmain.menuitemtools.caption"
 msgid "Tools"
 msgstr "Nástroje"
-
-#: tformmain.menuitem2.caption
-msgid "Load reports"
-msgstr "Načíst reporty"
-
-#: tformmain.menuitem3.caption
-msgid "Load spot prices"
-msgstr "Načíst spotové ceny"
 
 #: tformmain.tabsheetchart.caption
@@ -208 +227 @@
 msgid "Overview"
 msgstr "Přehled"
+

trunk/Languages/EdcStats.pot

@@ -170 +170 @@
 msgstr ""
 
-#: tformmain.menuitem1.caption
+#: tformmain.menuitemfile.caption
+msgid "File"
+msgstr ""
+
+#: tformmain.menuitemimportreports.caption
+msgid "Import reports"
+msgstr ""
+
+#: tformmain.menuitemimportspotprices.caption
+msgctxt "tformmain.menuitemimportspotprices.caption"
+msgid "Import spot prices"
+msgstr ""
+
+#: tformmain.menuitemload.caption
+msgid "Load"
+msgstr ""
+
+#: tformmain.menuitemremove.caption
+msgid "Remove"
+msgstr ""
+
+#: tformmain.menuitemsave.caption
+msgid "Save"
+msgstr ""
+
+#: tformmain.menuitemtools.caption
+msgctxt "tformmain.menuitemtools.caption"
 msgid "Tools"
-msgstr ""
-
-#: tformmain.menuitem2.caption
-msgid "Load reports"
-msgstr ""
-
-#: tformmain.menuitem3.caption
-msgid "Load spot prices"
 msgstr ""
 

trunk/Packages/Common/XML.pas

@@ -243 +243 @@
 begin
   NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
-  NewNode.TextContent := DOMString(FloatToStr(Value));
+  NewNode.TextContent := DOMString(FloatToStr(Value, XmlFormatSettings));
   Node.AppendChild(NewNode);
 end;

trunk/SpotPrice.pas

@@ -65 +65 @@
   Value: Double;
 begin
+  Clear;
   URL := 'https://spotovaelektrina.cz/denni-ceny/' + DateToStr(Date, XmlFormatSettings);
   with TFPHttpClient.Create(nil) do