Changeset 8 for trunk

Timestamp:

Apr 13, 2026, 11:12:39 PM (2 weeks ago)

Author:

chronos

Message:

• Fixed: Data tab populating and refreshing.
• Fixed: Used currency as decimal type for measured values instead inaccurate double type.

Location:

trunk

Files:

• Ean.pas (modified) (6 diffs)
• EdcProject.pas (modified) (2 diffs)
• FormMain.lfm (modified) (5 diffs)
• FormMain.lrj (modified) (2 diffs)
• FormMain.pas (modified) (4 diffs)
• Languages/EdcStats.cs.po (modified) (4 diffs)
• Languages/EdcStats.pot (modified) (2 diffs)
• Packages/Common/XML.pas (modified) (4 diffs)

trunk/Ean.pas

@@ -13 +13 @@
   TEanValue = record
     Time: TDateTime;
-    ValueIn: Single;
-    ValueOut: Single;
-    class function Create(Time: TDateTime; ValueIn, ValueOut: Single): TEanValue; static;
+    ValueIn: Currency;
+    ValueOut: Currency;
+    class function Create(Time: TDateTime; ValueIn, ValueOut: Currency): TEanValue; static;
     function GetShared: Double;
     procedure LoadFromXmlNode(Node: TDOMNode);
@@ -45 +45 @@
     function GetTotalOut(TimeFrom, TimeTo: TDateTime): Double;
     function GetShared(TimeFrom, TimeTo: TDateTime): Double;
+    function GetSavings(TimeFrom, TimeTo: TDateTime): Integer;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
@@ -87 +88 @@
 { TEanValue }
 
-class function TEanValue.Create(Time: TDateTime; ValueIn, ValueOut: Single
+class function TEanValue.Create(Time: TDateTime; ValueIn, ValueOut: Currency
   ): TEanValue;
 begin
@@ -104 +105 @@
 begin
   Time := ReadDateTime(Node, 'Time', Time);
-  ValueIn := ReadDouble(Node, 'ValueIn', ValueIn);
-  ValueOut := ReadDouble(Node, 'ValueOut', ValueOut);
+  ValueIn := ReadCurrency(Node, 'ValueIn', 0);
+  ValueOut := ReadCurrency(Node, 'ValueOut', 0);
 end;
 
@@ -111 +112 @@
 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);
+  if ValueIn <> 0 then WriteCurrency(Node, 'ValueIn', ValueIn);
+  if ValueOut <> 0 then WriteCurrency(Node, 'ValueOut', ValueOut);
 end;
 
@@ -176 +177 @@
   if TotalIn <> 0 then Result := (1 - GetTotalOut(TimeFrom, TimeTo) / TotalIn) * 100
     else Result := 0;
+end;
+
+function TEan.GetSavings(TimeFrom, TimeTo: TDateTime): Integer;
+var
+  TotalIn: Double;
+  TotalOut: Double;
+begin
+  TotalIn := GetTotalIn(TimeFrom, TimeTo);
+  TotalOut := GetTotalOut(TimeFrom, TimeTo);
+  Result := Trunc((TotalIn - TotalOut) * PriceLow);
 end;
 

trunk/EdcProject.pas

@@ -147 +147 @@
   TimeFrom: TDateTime;
   TimeTo: TDateTime;
-  CellValueIn: Double;
-  CellValueOut: Double;
+  CellValueIn: Currency;
+  CellValueOut: Currency;
   Ean: TEan;
   EanKind: TEanKind;
   Number: string;
+  A: Currency;
 begin
   CSVDoc := TCSVDocument.Create;
@@ -186 +187 @@
 
         CellValueIn := 0;
-        if TryStrToFloat(CSVDoc.Cells[3 + C * 2, R], CellValueIn) then begin
+        if TryStrToCurr(CSVDoc.Cells[3 + C * 2, R], CellValueIn) then begin
           if EanKind = ekConsumption then CellValueIn := -CellValueIn;
         end;
 
         CellValueOut := 0;
-        if TryStrToFloat(CSVDoc.Cells[3 + C * 2 + 1, R], CellValueOut) then begin
+        if TryStrToCurr(CSVDoc.Cells[3 + C * 2 + 1, R], CellValueOut) then begin
           if EanKind = ekConsumption then CellValueOut := -CellValueOut;
         end;

trunk/FormMain.lfm

@@ -20 +20 @@
     Top = 56
     Width = 1176
-    ActivePage = TabSheetOverview
+    ActivePage = TabSheetData
     Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 0
+    TabIndex = 3
     TabOrder = 0
     object TabSheetOverview: TTabSheet
@@ -62 +62 @@
           end        
           item
-            Caption = 'Low price'
-            Width = 100
-          end        
-          item
-            Caption = 'High price'
-            Width = 100
-          end        
-          item
-            Caption = 'Spot price'
-            Width = 135
+            Caption = 'Low price [Kč]'
+            Width = 100
+          end        
+          item
+            Caption = 'High price [Kč]'
+            Width = 100
+          end        
+          item
+            Caption = 'Spot price [Kč]'
+            Width = 100
+          end        
+          item
+            Caption = 'Savings [Kč]'
           end>
         PopupMenu = PopupMenuOverview
@@ -228 +231 @@
           item
             Caption = 'Time'
-            Width = 100
+            Width = 200
           end        
           item
@@ -235 +238 @@
           end        
           item
+            Caption = 'Result'
+            Width = 100
+          end        
+          item
             Caption = 'Shared [%]'
-            Width = 929
+            Width = 729
           end>
         ReadOnly = True
@@ -258 +265 @@
         Style = csDropDownList
         TabOrder = 1
-        OnSelect = ComboBoxEanSelect
+        OnSelect = ComboBoxEanDataSelect
       end
     end

trunk/FormMain.lrj

@@ -8 +8 @@
 {"hash":145998637,"name":"tformmain.listview1.columns[4].caption","sourcebytes":[83,104,97,114,101,100,32,91,37,93],"value":"Shared [%]"},
 {"hash":335940,"name":"tformmain.listview1.columns[5].caption","sourcebytes":[75,105,110,100],"value":"Kind"},
-{"hash":158850293,"name":"tformmain.listview1.columns[6].caption","sourcebytes":[76,111,119,32,112,114,105,99,101],"value":"Low price"},
-{"hash":175333445,"name":"tformmain.listview1.columns[7].caption","sourcebytes":[72,105,103,104,32,112,114,105,99,101],"value":"High price"},
-{"hash":108144885,"name":"tformmain.listview1.columns[8].caption","sourcebytes":[83,112,111,116,32,112,114,105,99,101],"value":"Spot price"},
+{"hash":237609437,"name":"tformmain.listview1.columns[6].caption","sourcebytes":[76,111,119,32,112,114,105,99,101,32,91,75,196,141,93],"value":"Low price [K\u010D]"},
+{"hash":221060461,"name":"tformmain.listview1.columns[7].caption","sourcebytes":[72,105,103,104,32,112,114,105,99,101,32,91,75,196,141,93],"value":"High price [K\u010D]"},
+{"hash":19813853,"name":"tformmain.listview1.columns[8].caption","sourcebytes":[83,112,111,116,32,112,114,105,99,101,32,91,75,196,141,93],"value":"Spot price [K\u010D]"},
+{"hash":215185821,"name":"tformmain.listview1.columns[9].caption","sourcebytes":[83,97,118,105,110,103,115,32,91,75,196,141,93],"value":"Savings [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"},
@@ -20 +21 @@
 {"hash":372789,"name":"tformmain.listview2.columns[0].caption","sourcebytes":[84,105,109,101],"value":"Time"},
 {"hash":193645956,"name":"tformmain.listview2.columns[1].caption","sourcebytes":[77,101,97,115,117,114,101,100],"value":"Measured"},
-{"hash":145998637,"name":"tformmain.listview2.columns[2].caption","sourcebytes":[83,104,97,114,101,100,32,91,37,93],"value":"Shared [%]"},
+{"hash":93105204,"name":"tformmain.listview2.columns[2].caption","sourcebytes":[82,101,115,117,108,116],"value":"Result"},
+{"hash":145998637,"name":"tformmain.listview2.columns[3].caption","sourcebytes":[83,104,97,114,101,100,32,91,37,93],"value":"Shared [%]"},
 {"hash":300570,"name":"tformmain.label4.caption","sourcebytes":[69,65,78,58],"value":"EAN:"},
 {"hash":19081,"name":"tformmain.comboboxperiod.text","sourcebytes":[68,97,121],"value":"Day"},

trunk/FormMain.pas

@@ -65 +65 @@
     procedure ButtonIntervalRightClick(Sender: TObject);
     procedure CheckBoxShowResultChange(Sender: TObject);
+    procedure ComboBoxEanDataSelect(Sender: TObject);
     procedure ComboBoxEanSelect(Sender: TObject);
     procedure ComboBoxPeriodSelect(Sender: TObject);
@@ -139 +140 @@
 end;
 
+procedure TFormMain.ComboBoxEanDataSelect(Sender: TObject);
+begin
+  ReloadListViewData;
+end;
+
 procedure TFormMain.ButtonIntervalRightClick(Sender: TObject);
 begin
@@ -348 +354 @@
       ListItem.SubItems.Add(FloatToStr(PriceHigh));
       ListItem.SubItems.Add(FloatToStr(PriceSpot));
+      ListItem.SubItems.Add(IntToStr(GetSavings(IntervalFrom, IntervalTo)));
     end;
   finally
@@ -367 +374 @@
     ListView2.BeginUpdate;
     try
-      for I := 0 to Ean.Values.Count - 1 do begin
+      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.Caption := DateTimeToStr(Ean.Values[I].Time);
-        ListItem.SubItems.Add(FloatToStr(Ean.Values[I].ValueIn));
-        ListItem.SubItems.Add(IntToStr(Trunc(Ean.Values[I].GetShared)));
+        ListItem.Caption := DateTimeToStr(Time);
+        ListItem.SubItems.Add(FloatToStr(ValueIn));
+        ListItem.SubItems.Add(FloatToStr(ValueOut));
+        ListItem.SubItems.Add(IntToStr(Trunc(GetShared)));
       end;
     finally

trunk/Languages/EdcStats.cs.po

@@ -154 +154 @@
 
 #: tformmain.listview1.columns[6].caption
-msgid "Low price"
-msgstr "Nízka cena"
+msgid "Low price [Kč]"
+msgstr "Nízká cena [Kč]"
 
 #: tformmain.listview1.columns[7].caption
-msgid "High price"
-msgstr "Vysoká cena"
+msgid "High price [Kč]"
+msgstr "Vysoká cena [Kč]"
 
 #: tformmain.listview1.columns[8].caption
-msgid "Spot price"
-msgstr "Spotová cena"
+msgid "Spot price [Kč]"
+msgstr "Spotová cena [Kč]"
+
+#: tformmain.listview1.columns[9].caption
+msgid "Savings [Kč]"
+msgstr "Úspory [Kč]"
 
 #: tformmain.listview2.columns[0].caption
@@ -177 +181 @@
 #: tformmain.listview2.columns[2].caption
 msgctxt "tformmain.listview2.columns[2].caption"
+msgid "Result"
+msgstr "Výsledek"
+
+#: tformmain.listview2.columns[3].caption
+msgctxt "tformmain.listview2.columns[3].caption"
 msgid "Shared [%]"
 msgstr "Sdíleno [%]"
@@ -182 +191 @@
 #: tformmain.menuitemfile.caption
 msgid "File"
-msgstr ""
+msgstr "Soubor"
 
 #: tformmain.menuitemimportreports.caption
 msgid "Import reports"
-msgstr ""
+msgstr "Import hlášení"
 
 #: tformmain.menuitemimportspotprices.caption
 msgctxt "tformmain.menuitemimportspotprices.caption"
 msgid "Import spot prices"
-msgstr ""
+msgstr "Import spotových cen"
 
 #: tformmain.menuitemload.caption
 msgid "Load"
-msgstr ""
+msgstr "Načíst"
 
 #: tformmain.menuitemremove.caption
 msgid "Remove"
-msgstr ""
+msgstr "Odstranit"
 
 #: tformmain.menuitemsave.caption
 msgid "Save"
-msgstr ""
+msgstr "Uložit"
 
 #: tformmain.menuitemtools.caption
-#, fuzzy
 msgctxt "tformmain.menuitemtools.caption"
 msgid "Tools"
@@ -227 +235 @@
 msgid "Overview"
 msgstr "Přehled"
-

trunk/Languages/EdcStats.pot

@@ -144 +144 @@
 
 #: tformmain.listview1.columns[6].caption
-msgid "Low price"
+msgid "Low price [Kč]"
 msgstr ""
 
 #: tformmain.listview1.columns[7].caption
-msgid "High price"
+msgid "High price [Kč]"
 msgstr ""
 
 #: tformmain.listview1.columns[8].caption
-msgid "Spot price"
+msgid "Spot price [Kč]"
+msgstr ""
+
+#: tformmain.listview1.columns[9].caption
+msgid "Savings [Kč]"
 msgstr ""
 
@@ -167 +171 @@
 #: tformmain.listview2.columns[2].caption
 msgctxt "tformmain.listview2.columns[2].caption"
+msgid "Result"
+msgstr ""
+
+#: tformmain.listview2.columns[3].caption
+msgctxt "tformmain.listview2.columns[3].caption"
 msgid "Shared [%]"
 msgstr ""

trunk/Packages/Common/XML.pas

@@ -15 +15 @@
 procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
 procedure WriteDouble(Node: TDOMNode; Name: string; Value: Double);
+procedure WriteCurrency(Node: TDOMNode; Name: string; Value: Currency);
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
@@ -21 +22 @@
 function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
 function ReadDouble(Node: TDOMNode; Name: string; DefaultValue: Double): Double;
+function ReadCurrency(Node: TDOMNode; Name: string; DefaultValue: Currency): Currency;
 procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
 
@@ -60 +62 @@
   if Assigned(NewNode) then
     Result := StrToFloat(string(NewNode.TextContent), XmlFormatSettings);
+end;
+
+function ReadCurrency(Node: TDOMNode; Name: string; DefaultValue: Currency
+  ): Currency;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToCurr(string(NewNode.TextContent), XmlFormatSettings);
 end;
 
@@ -247 +260 @@
 end;
 
+procedure WriteCurrency(Node: TDOMNode; Name: string; Value: Currency);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(CurrToStr(Value, XmlFormatSettings));
+  Node.AppendChild(NewNode);
+end;
+
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 var