Changeset 9 for trunk/FormMain.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/FormMain.pas (modified) (16 diffs)

trunk/FormMain.pas

@@ -41 +41 @@
     Label5: TLabel;
     Label6: TLabel;
-    ListView1: TListView;
-    ListView2: TListView;
+    ListViewOverview: TListView;
+    ListViewData: TListView;
+    ListViewSpotPrices: TListView;
     MainMenu1: TMainMenu;
     Memo1: TMemo;
@@ -55 +56 @@
     PersistentForm1: TPersistentForm;
     PopupMenuOverview: TPopupMenu;
+    TabSheetSpotPrices: TTabSheet;
     TabSheetOverview: TTabSheet;
     TabSheetData: TTabSheet;
@@ -83 +85 @@
     procedure TabSheetDataShow(Sender: TObject);
     procedure TabSheetLogShow(Sender: TObject);
+    procedure TabSheetSpotPricesShow(Sender: TObject);
     procedure TimeEdit1Change(Sender: TObject);
     procedure Translator1Translate(Sender: TObject);
@@ -91 +94 @@
     Period: TPeriod;
     ReportsDir: string;
+    SpotPricesDir: string;
     ProjectFileName: string;
     ShowResult: Boolean;
@@ -100 +104 @@
     procedure ReloadListViewOverview;
     procedure ReloadListViewData;
+    procedure ReloadListViewSpotPrices;
     procedure ReloadChart;
     function GetIntervalLength: TDateTime;
@@ -209 +214 @@
 procedure TFormMain.MenuItemImportReportsClick(Sender: TObject);
 begin
-  EdcProject.Import(ReportsDir);
+  EdcProject.ImportReports(ReportsDir);
 
   if (EdcProject.Eans.Count > 0) and (EdcProject.Eans[0].Values.Count > 0) then
@@ -219 +224 @@
 procedure TFormMain.MenuItemImportSpotPricesClick(Sender: TObject);
 begin
-  EdcProject.SpotPrices.LoadSpotPrices(StrToDate('1.4.2026'));
+  EdcProject.SpotPrices.Import(SpotPricesDir);
+  //EdcProject.SpotPrices.LoadSpotPricesFromWeb(StrToDate('1.4.2026'));
+  ShowActiveTab;
 end;
 
@@ -234 +241 @@
 procedure TFormMain.MenuItemRemoveClick(Sender: TObject);
 begin
-  if Assigned(ListView1.Selected) then
-    EdcProject.Eans.Remove(ListView1.Selected.Data);
+  if Assigned(ListViewOverview.Selected) then
+    EdcProject.Eans.Remove(ListViewOverview.Selected.Data);
   ReloadListViewOverview;
 end;
@@ -272 +279 @@
 end;
 
+procedure TFormMain.TabSheetSpotPricesShow(Sender: TObject);
+begin
+  ReloadListViewSpotPrices;
+end;
+
 procedure TFormMain.TimeEdit1Change(Sender: TObject);
 var
@@ -305 +317 @@
 function TFormMain.MeasureToStr(Value: Double): string;
 begin
-  Result := IntToStr(Trunc(MeasureToFloat(Value, GetIntervalLength * 24)));
+  Result := CurrToStr(MeasureToFloat(Value, GetIntervalLength * 24));
 end;
 
@@ -325 +337 @@
       Memo1.Lines.Add(SResult + ': ' + IntToStr(Trunc(TotalOut)));
       if TotalIn <> 0 then
-      Memo1.Lines.Add(SShared + ': ' + IntToStr(Trunc(GetShared(IntervalFrom, IntervalTo))) + ' %');
+      Memo1.Lines.Add(SShared + ': ' + IntToStr(Trunc(GetSharedPercent(IntervalFrom, IntervalTo))) + ' %');
       Memo1.Lines.Add('');
     end;
@@ -338 +350 @@
   I: Integer;
 begin
-  ListView1.BeginUpdate;
+  ListViewOverview.BeginUpdate;
   try
-    ListView1.Items.Clear;
+    ListViewOverview.Items.Clear;
     for I := 0 to EdcProject.Eans.Count - 1 do
     with EdcProject.Eans[I] do begin
-      ListItem := ListView1.Items.Add;
+      ListItem := ListViewOverview.Items.Add;
       ListItem.Caption := Number;
       ListItem.Data := EdcProject.Eans[I];
       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(MeasureToStr(GetShared(IntervalFrom, IntervalTo)));
+      ListItem.SubItems.Add(IntToStr(Trunc(GetSharedPercent(IntervalFrom, IntervalTo))));
       ListItem.SubItems.Add(EanKindText[Kind]);
       ListItem.SubItems.Add(FloatToStr(PriceLow));
       ListItem.SubItems.Add(FloatToStr(PriceHigh));
       ListItem.SubItems.Add(FloatToStr(PriceSpot));
-      ListItem.SubItems.Add(IntToStr(GetSavings(IntervalFrom, IntervalTo)));
+      ListItem.SubItems.Add(CurrToStr(GetPrice(IntervalFrom, IntervalTo, EdcProject.SpotPrices)));
+      ListItem.SubItems.Add(CurrToStr(GetSavings(IntervalFrom, IntervalTo, EdcProject.SpotPrices)));
+      ListItem.SubItems.Add(DistributionTariff);
     end;
   finally
-    ListView1.EndUpdate;
+    ListViewOverview.EndUpdate;
   end;
 end;
@@ -367 +381 @@
   Ean: TEan;
 begin
-  ListView2.Items.Clear;
+  ListViewData.Items.Clear;
   if ComboBoxEanData.ItemIndex = -1 then Exit;
   Ean := TEan(ComboBoxEanData.Items.Objects[ComboBoxEanData.ItemIndex]);
 
   if Assigned(Ean) then begin
-    ListView2.BeginUpdate;
+    ListViewData.BeginUpdate;
     try
       for I := 0 to Ean.Values.Count - 1 do
       with Ean.Values[I] do
       if (Time >= IntervalFrom) and (Time < IntervalTo) then begin
-        ListItem := ListView2.Items.Add;
+        ListItem := ListViewData.Items.Add;
         ListItem.Caption := DateTimeToStr(Time);
         ListItem.SubItems.Add(FloatToStr(ValueIn));
@@ -384 +398 @@
       end;
     finally
-      ListView2.EndUpdate;
-    end;
+      ListViewData.EndUpdate;
+    end;
+  end;
+end;
+
+procedure TFormMain.ReloadListViewSpotPrices;
+var
+  ListItem: TListItem;
+  I: Integer;
+begin
+  ListViewSpotPrices.Items.Clear;
+
+  ListViewSpotPrices.BeginUpdate;
+  try
+    for I := 0 to EdcProject.SpotPrices.Count - 1 do
+    with EdcProject.SpotPrices[I] do
+    if (Time >= IntervalFrom) and (Time < IntervalTo) then
+    begin
+      ListItem := ListViewSpotPrices.Items.Add;
+      ListItem.Caption := DateTimeToStr(Time);
+      ListItem.SubItems.Add(FloatToStr(Value));
+    end;
+  finally
+    ListViewSpotPrices.EndUpdate;
   end;
 end;
@@ -506 +542 @@
     Period := TPeriod(ReadIntegerWithDefault('Period', Integer(Period)));
     ReportsDir := ReadStringWithDefault('ReportsDir', ReportsDir);
+    SpotPricesDir := ReadStringWithDefault('SpotPricesDir', SpotPricesDir);
     ProjectFileName := ReadStringWithDefault('ProjectFileName', ProjectFileName);
     PageControl1.TabIndex := ReadIntegerWithDefault('ActiveTab', PageControl1.TabIndex);
@@ -528 +565 @@
     WriteInteger('Period', Integer(Period));
     WriteString('ReportsDir', ReportsDir);
+    WriteString('SpotPricesDir', SpotPricesDir);
     WriteString('ProjectFileName', ProjectFileName);
     WriteInteger('ActiveTab', PageControl1.TabIndex);