Changeset 10 for trunk

Timestamp:

Apr 15, 2026, 9:35:17 AM (2 weeks ago)

Author:

chronos

Message:

• Added: Show spot total price above zero for EANs.

Location:

trunk

Files:

• Ean.pas (modified) (5 diffs)
• FormMain.lfm (modified) (3 diffs)
• FormMain.lrj (modified) (1 diff)
• FormMain.pas (modified) (2 diffs)
• Languages/EdcStats.cs.po (modified) (1 diff)
• Languages/EdcStats.pot (modified) (1 diff)
• SpotPrice.pas (modified) (7 diffs)

trunk/Ean.pas

@@ -47 +47 @@
     function GetSharedPercent(TimeFrom, TimeTo: TDateTime): Double;
     function GetSavings(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
-    function GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
+    function GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices; MinPrice: Currency): Currency;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
@@ -198 +198 @@
   I: Integer;
   SpotPrice: TSpotPrice;
+  SpotPriceIndex: Integer;
 begin
     if PriceLow = 0 then begin
@@ -203 +204 @@
     for I := 0 to Values.Count - 1 do
       if (Values[I].Time >= TimeFrom) and (Values[I].Time < TimeTo) then begin
-        SpotPrice := SpotPrices.SearchByTime(Values[I].Time);
-        if SpotPrice.Value <> 0 then
-          Result := Result + (Values[I].ValueIn - Values[I].ValueOut) * (SpotPrice.Value - PriceSpot);
+        SpotPriceIndex := SpotPrices.SearchByTime(Values[I].Time);
+        if SpotPriceIndex <> -1 then
+          Result := Result + (Values[I].ValueIn - Values[I].ValueOut) * (SpotPrices[SpotPriceIndex].Value - PriceSpot);
       end;
   end else begin
@@ -214 +215 @@
 end;
 
-function TEan.GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices): Currency;
-var
-  I: Integer;
-  SpotPrice: TSpotPrice;
+function TEan.GetPrice(TimeFrom, TimeTo: TDateTime; SpotPrices: TSpotPrices; MinPrice: Currency): Currency;
+var
+  I: Integer;
+  SpotPriceIndex: Integer;
+  SpotPrice: Currency;
 begin
   if PriceLow = 0 then begin
@@ -223 +225 @@
     for I := 0 to Values.Count - 1 do
       if (Values[I].Time >= TimeFrom) and (Values[I].Time < TimeTo) then begin
-        SpotPrice := SpotPrices.SearchByTime(Values[I].Time);
-        if SpotPrice.Value <> 0 then
-          Result := Result + Values[I].ValueIn * (SpotPrice.Value - PriceSpot);
+        SpotPriceIndex := SpotPrices.SearchByTime(Values[I].Time);
+        if (SpotPriceIndex <> -1) then begin
+          SpotPrice := SpotPrices[SpotPriceIndex].Value - PriceSpot;
+          if SpotPrice > MinPrice then
+            Result := Result + Values[I].ValueIn * SpotPrice;
+        end;
       end;
   end else Result := GetTotalIn(TimeFrom, TimeTo) * PriceLow;

trunk/FormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 362
+  Left = 357
   Height = 884
-  Top = 356
+  Top = 351
   Width = 1203
   Caption = 'EDC Stats'
@@ -20 +20 @@
     Top = 56
     Width = 1176
-    ActivePage = TabSheetSpotPrices
+    ActivePage = TabSheetOverview
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 4
+    TabIndex = 0
     TabOrder = 0
     object TabSheetOverview: TTabSheet
@@ -83 +83 @@
           item
             Caption = 'Tariff'
+            Width = 100
+          end        
+          item
+            Caption = 'Price above zero [Kč]'
             Width = 100
           end>

trunk/FormMain.lrj

@@ -14 +14 @@
 {"hash":215185821,"name":"tformmain.listviewoverview.columns[10].caption","sourcebytes":[83,97,118,105,110,103,115,32,91,75,196,141,93],"value":"Savings [K\u010D]"},
 {"hash":94932934,"name":"tformmain.listviewoverview.columns[11].caption","sourcebytes":[84,97,114,105,102,102],"value":"Tariff"},
+{"hash":73101837,"name":"tformmain.listviewoverview.columns[12].caption","sourcebytes":[80,114,105,99,101,32,97,98,111,118,101,32,122,101,114,111,32,91,75,196,141,93],"value":"Price above zero [K\u010D]"},
 {"hash":21335,"name":"tformmain.tabsheetlog.caption","sourcebytes":[76,111,103],"value":"Log"},
 {"hash":4843668,"name":"tformmain.tabsheetchart.caption","sourcebytes":[67,104,97,114,116],"value":"Chart"},

trunk/FormMain.pas

@@ -224 +224 @@
 procedure TFormMain.MenuItemImportSpotPricesClick(Sender: TObject);
 begin
-  EdcProject.SpotPrices.Import(SpotPricesDir);
-  //EdcProject.SpotPrices.LoadSpotPricesFromWeb(StrToDate('1.4.2026'));
+  //EdcProject.SpotPrices.Import(SpotPricesDir);
+  EdcProject.SpotPrices.LoadFromWeb;
+
   ShowActiveTab;
 end;
@@ -366 +367 @@
       ListItem.SubItems.Add(FloatToStr(PriceHigh));
       ListItem.SubItems.Add(FloatToStr(PriceSpot));
-      ListItem.SubItems.Add(CurrToStr(GetPrice(IntervalFrom, IntervalTo, EdcProject.SpotPrices)));
+      ListItem.SubItems.Add(CurrToStr(GetPrice(IntervalFrom, IntervalTo, EdcProject.SpotPrices, Low(Integer))));
       ListItem.SubItems.Add(CurrToStr(GetSavings(IntervalFrom, IntervalTo, EdcProject.SpotPrices)));
       ListItem.SubItems.Add(DistributionTariff);
+      ListItem.SubItems.Add(CurrToStr(GetPrice(IntervalFrom, IntervalTo, EdcProject.SpotPrices, 0)));
     end;
   finally

trunk/Languages/EdcStats.cs.po

@@ -158 +158 @@
 msgstr "Tarif"
 
+#: tformmain.listviewoverview.columns[12].caption
+msgid "Price above zero [Kč]"
+msgstr "Cena nad nulou [Kč]"
+
 #: tformmain.listviewoverview.columns[1].caption
 msgctxt "tformmain.listviewoverview.columns[1].caption"

trunk/Languages/EdcStats.pot

@@ -148 +148 @@
 msgstr ""
 
+#: tformmain.listviewoverview.columns[12].caption
+msgid "Price above zero [Kč]"
+msgstr ""
+
 #: tformmain.listviewoverview.columns[1].caption
 msgctxt "tformmain.listviewoverview.columns[1].caption"

trunk/SpotPrice.pas

@@ -26 +26 @@
     procedure LoadSpotReport(FileName: string);
   public
+    procedure ClearInterval(IntervalFrom, IntervalTo: TDateTime);
     function GetBlock(var Text: string; StartText, EndText: string): string;
-    procedure LoadSpotPricesFromWeb(Date: TDate);
+    procedure LoadFromWebDate(Date: TDate);
+    procedure LoadFromWeb;
     procedure Import(Directory: string);
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
-    function SearchByTime(Time: TDateTime): TSpotPrice;
+    function SearchByTime(Time: TDateTime): Integer;
   end;
 
@@ -62 +64 @@
 end;
 
-procedure TSpotPrices.LoadSpotPricesFromWeb(Date: TDate);
+procedure TSpotPrices.LoadFromWebDate(Date: TDate);
 var
   URL: string;
@@ -73 +75 @@
   Value: Double;
 begin
-  Clear;
+  ClearInterval(Date, Date + 1);
+
   URL := 'https://spotovaelektrina.cz/denni-ceny/' + DateToStr(Date, XmlFormatSettings);
   with TFPHttpClient.Create(nil) do
@@ -102 +105 @@
 end;
 
+procedure TSpotPrices.LoadFromWeb;
+var
+  I: Integer;
+begin
+  for I := 1 to 15 do
+    LoadFromWebDate(StrToDate(IntToStr(I) + '.4.2026'));
+
+  Sort(TComparer<TSpotPrice>.Construct(Comparer));
+end;
+
 function TSpotPrices.FileNameFilter(FileName: string): Boolean;
 begin
@@ -134 +147 @@
 end;
 
+procedure TSpotPrices.ClearInterval(IntervalFrom, IntervalTo: TDateTime);
+var
+  I: Integer;
+begin
+  for I := Count - 1 downto 0 do
+    if (Items[I].Time >= IntervalFrom) and (Items[I].Time < IntervalTo) then
+      Delete(I);
+end;
+
 procedure TSpotPrices.Import(Directory: string);
 var
@@ -178 +200 @@
 end;
 
-function TSpotPrices.SearchByTime(Time: TDateTime): TSpotPrice;
+function TSpotPrices.SearchByTime(Time: TDateTime): Integer;
 var
   I: Integer;
@@ -184 +206 @@
   I := 0;
   while (I < Count) and (Items[I].Time <> Time) do Inc(I);
-  if I < Count then Result := Items[I]
-    else Result := TSpotPrice.Create(0, 0);
+  if I < Count then Result := I
+    else Result := -1;
 end;