Changeset 11 for trunk

Timestamp:

Apr 15, 2026, 10:17:17 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: EAN address as separate field.

Location:

trunk

Files:

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

trunk/Ean.pas

@@ -36 +36 @@
     Number: string;
     Owner: string;
+    Address: string;
     DistributionTariff: string;
     PriceLow: Double;
@@ -58 +59 @@
   TEans = class(TObjectList<TEan>)
     function SearchByNumber(Number: string): TEan;
-    function SearchByOwner(Owner: string): TEan;
+    function SearchByOwnerKind(Owner: string; Kind: TEanKind): TEan;
     procedure LoadToStrings(Strings: TStrings; AllowNone: Boolean = False);
     procedure LoadFromXmlNode(Node: TDOMNode);
@@ -241 +242 @@
   Number := ReadString(Node, 'Number', Number);
   Owner := ReadString(Node, 'Owner', Owner);
+  Address := ReadString(Node, 'Address', Address);
   DistributionTariff := ReadString(Node, 'DistributionTariff', DistributionTariff);
   PriceLow := ReadDouble(Node, 'PriceLow', PriceLow);
@@ -258 +260 @@
   if Number <> '' then WriteString(Node, 'Number', Number);
   if Owner <> '' then WriteString(Node, 'Owner', Owner);
+  if Address <> '' then WriteString(Node, 'Address', Address);
   if DistributionTariff <> '' then WriteString(Node, 'DistributionTariff', DistributionTariff);
   if PriceLow <> 0 then WriteDouble(Node, 'PriceLow', PriceLow);
@@ -294 +297 @@
 end;
 
-function TEans.SearchByOwner(Owner: string): TEan;
+function TEans.SearchByOwnerKind(Owner: string; Kind: TEanKind): TEan;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (Items[I].Owner <> Owner) do Inc(I);
+  while (I < Count) and ((Items[I].Owner <> Owner) or (Items[I].Kind <> Kind)) do Inc(I);
   if I < Count then Result := Items[I]
     else Result := nil;
@@ -308 +311 @@
   I: Integer;
   Shift: Integer;
+  Text: string;
 begin
   if AllowNone then Shift := 1 else Shift := 0;
@@ -315 +319 @@
     while Strings.Count < Count + Shift do Strings.Add('');
     for I := 0 to Count - 1 do begin
-      Strings[I + Shift] := Items[I].Number + ' (' + Items[I].Owner + ')';
+      Text := EanKindText[Items[I].Kind];
+      if Items[I].Address <> '' then Text := Items[I].Address + ', ' + Text;
+      if Items[I].Owner <> '' then Text := Items[I].Owner + ', ' + Text;
+      Text := Items[I].Number + ' (' + Text + ')';
+      Strings[I + Shift] := Text;
       Strings.Objects[I + Shift] := Items[I];
     end;

trunk/EdcProject.pas

@@ -14 +14 @@
   TEdcProject = class
   private
-    procedure CreateEan(Number, Owner: string; Kind: TEanKind);
+    procedure CreateEan(Number, Owner, Address: string; Kind: TEanKind);
     function FileNameFilter(FileName: string): Boolean;
     procedure LoadEdcReport(FileName: string);
@@ -32 +32 @@
 resourcestring
   SWrongFileFormat = 'Wrong file format';
-  STotalSupply = 'Total supply';
-  STotalConsumtion = 'Total consumption';
+  STotal = 'Total';
 
 const
@@ -63 +62 @@
     Eans[I].Values.Sort(TComparer<TEanValue>.Construct(Eans[I].Values.Comparer));
 
-  CreateEan('', STotalSupply, ekSupply);
-  CreateEan('', STotalConsumtion, ekConsumption);
+  CreateEan('', STotal, '', ekSupply);
+  CreateEan('', STotal, '', ekConsumption);
 end;
 
@@ -203 +202 @@
 end;
 
-procedure TEdcProject.CreateEan(Number, Owner: string; Kind: TEanKind);
+procedure TEdcProject.CreateEan(Number, Owner, Address: string; Kind: TEanKind);
 var
   Ean: TEan;
@@ -212 +211 @@
   Value: TEanValue;
 begin
-  Ean := Eans.SearchByOwner(Owner);
+  Ean := Eans.SearchByOwnerKind(Owner, Kind);
   if not Assigned(Ean) then begin
     Ean := TEan.Create;
     Ean.Number := Number;
     Ean.Owner := Owner;
+    Ean.Address := Address;
     Ean.Kind := Kind;
     Eans.Add(Ean);

trunk/FormMain.lfm

@@ -43 +43 @@
           item
             Caption = 'Owner'
-            Width = 200
+            Width = 100
+          end        
+          item
+            Caption = 'Address'
+            Width = 100
+          end        
+          item
+            Caption = 'Kind'
+            Width = 100
           end        
           item
@@ -55 +63 @@
           item
             Caption = 'Shared [%]'
-            Width = 100
-          end        
-          item
-            Caption = 'Kind'
             Width = 100
           end        

trunk/FormMain.lrj

@@ -4 +4 @@
 {"hash":18782,"name":"tformmain.listviewoverview.columns[0].caption","sourcebytes":[69,65,78],"value":"EAN"},
 {"hash":5694658,"name":"tformmain.listviewoverview.columns[1].caption","sourcebytes":[79,119,110,101,114],"value":"Owner"},
-{"hash":193645956,"name":"tformmain.listviewoverview.columns[2].caption","sourcebytes":[77,101,97,115,117,114,101,100],"value":"Measured"},
-{"hash":94275764,"name":"tformmain.listviewoverview.columns[3].caption","sourcebytes":[83,104,97,114,101,100],"value":"Shared"},
-{"hash":145998637,"name":"tformmain.listviewoverview.columns[4].caption","sourcebytes":[83,104,97,114,101,100,32,91,37,93],"value":"Shared [%]"},
-{"hash":335940,"name":"tformmain.listviewoverview.columns[5].caption","sourcebytes":[75,105,110,100],"value":"Kind"},
-{"hash":237609437,"name":"tformmain.listviewoverview.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.listviewoverview.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.listviewoverview.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":118092989,"name":"tformmain.listviewoverview.columns[9].caption","sourcebytes":[80,114,105,99,101,32,91,75,196,141,93],"value":"Price [K\u010D]"},
-{"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":128683235,"name":"tformmain.listviewoverview.columns[2].caption","sourcebytes":[65,100,100,114,101,115,115],"value":"Address"},
+{"hash":335940,"name":"tformmain.listviewoverview.columns[3].caption","sourcebytes":[75,105,110,100],"value":"Kind"},
+{"hash":193645956,"name":"tformmain.listviewoverview.columns[4].caption","sourcebytes":[77,101,97,115,117,114,101,100],"value":"Measured"},
+{"hash":94275764,"name":"tformmain.listviewoverview.columns[5].caption","sourcebytes":[83,104,97,114,101,100],"value":"Shared"},
+{"hash":145998637,"name":"tformmain.listviewoverview.columns[6].caption","sourcebytes":[83,104,97,114,101,100,32,91,37,93],"value":"Shared [%]"},
+{"hash":237609437,"name":"tformmain.listviewoverview.columns[7].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.listviewoverview.columns[8].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.listviewoverview.columns[9].caption","sourcebytes":[83,112,111,116,32,112,114,105,99,101,32,91,75,196,141,93],"value":"Spot price [K\u010D]"},
+{"hash":118092989,"name":"tformmain.listviewoverview.columns[10].caption","sourcebytes":[80,114,105,99,101,32,91,75,196,141,93],"value":"Price [K\u010D]"},
+{"hash":215185821,"name":"tformmain.listviewoverview.columns[11].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[12].caption","sourcebytes":[84,97,114,105,102,102],"value":"Tariff"},
+{"hash":73101837,"name":"tformmain.listviewoverview.columns[13].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

@@ -360 +360 @@
       ListItem.Data := EdcProject.Eans[I];
       ListItem.SubItems.Add(Owner);
+      ListItem.SubItems.Add(Address);
+      ListItem.SubItems.Add(EanKindText[Kind]);
       ListItem.SubItems.Add(MeasureToStr(GetTotalIn(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));

trunk/Languages/EdcStats.cs.po

@@ -20 +20 @@
 msgstr "Výrobní"
 
-#: edcproject.stotalconsumtion
-msgctxt "edcproject.stotalconsumtion"
-msgid "Total consumption"
-msgstr "Celková spotřeba"
-
-#: edcproject.stotalsupply
-msgctxt "edcproject.stotalsupply"
-msgid "Total supply"
-msgstr "Celková výroba"
+#: edcproject.stotal
+msgid "Total"
+msgstr "Celkem"
 
 #: edcproject.swrongfileformat
@@ -151 +145 @@
 #: tformmain.listviewoverview.columns[10].caption
 msgctxt "tformmain.listviewoverview.columns[10].caption"
+msgid "Price [Kč]"
+msgstr "Cena [Kč]"
+
+#: tformmain.listviewoverview.columns[11].caption
+msgctxt "tformmain.listviewoverview.columns[11].caption"
 msgid "Savings [Kč]"
-msgstr "Úspory [Kč]"
-
-#: tformmain.listviewoverview.columns[11].caption
+msgstr "Úspora [Kč]"
+
+#: tformmain.listviewoverview.columns[12].caption
+msgctxt "tformmain.listviewoverview.columns[12].caption"
 msgid "Tariff"
-msgstr "Tarif"
-
-#: tformmain.listviewoverview.columns[12].caption
+msgstr "Tarif [Kč]"
+
+#: tformmain.listviewoverview.columns[13].caption
+msgctxt "tformmain.listviewoverview.columns[13].caption"
 msgid "Price above zero [Kč]"
 msgstr "Cena nad nulou [Kč]"
@@ -169 +170 @@
 #: tformmain.listviewoverview.columns[2].caption
 msgctxt "tformmain.listviewoverview.columns[2].caption"
-msgid "Measured"
-msgstr "Měřeno"
+msgid "Address"
+msgstr "Adresa"
 
 #: tformmain.listviewoverview.columns[3].caption
 msgctxt "tformmain.listviewoverview.columns[3].caption"
+msgid "Kind"
+msgstr "Druh"
+
+#: tformmain.listviewoverview.columns[4].caption
+msgctxt "tformmain.listviewoverview.columns[4].caption"
+msgid "Measured"
+msgstr "Měřeno [%]"
+
+#: tformmain.listviewoverview.columns[5].caption
+msgctxt "tformmain.listviewoverview.columns[5].caption"
 msgid "Shared"
 msgstr "Sdíleno"
 
-#: tformmain.listviewoverview.columns[4].caption
-msgctxt "tformmain.listviewoverview.columns[4].caption"
+#: tformmain.listviewoverview.columns[6].caption
+msgctxt "tformmain.listviewoverview.columns[6].caption"
 msgid "Shared [%]"
 msgstr "Sdíleno [%]"
 
-#: tformmain.listviewoverview.columns[5].caption
-msgctxt "tformmain.listviewoverview.columns[5].caption"
-msgid "Kind"
-msgstr "Druh"
-
-#: tformmain.listviewoverview.columns[6].caption
-msgctxt "tformmain.listviewoverview.columns[6].caption"
+#: tformmain.listviewoverview.columns[7].caption
+msgctxt "tformmain.listviewoverview.columns[7].caption"
 msgid "Low price [Kč]"
 msgstr "Nízká cena [Kč]"
 
-#: tformmain.listviewoverview.columns[7].caption
-msgctxt "tformmain.listviewoverview.columns[7].caption"
+#: tformmain.listviewoverview.columns[8].caption
+msgctxt "tformmain.listviewoverview.columns[8].caption"
 msgid "High price [Kč]"
 msgstr "Vysoká cena [Kč]"
 
-#: tformmain.listviewoverview.columns[8].caption
-msgctxt "tformmain.listviewoverview.columns[8].caption"
+#: tformmain.listviewoverview.columns[9].caption
+msgctxt "tformmain.listviewoverview.columns[9].caption"
 msgid "Spot price [Kč]"
 msgstr "Spotová cena [Kč]"
-
-#: tformmain.listviewoverview.columns[9].caption
-msgctxt "tformmain.listviewoverview.columns[9].caption"
-msgid "Price [Kč]"
-msgstr "Cena [Kč]"
 
 #: tformmain.listviewspotprices.columns[0].caption

trunk/Languages/EdcStats.pot

@@ -10 +10 @@
 msgstr ""
 
-#: edcproject.stotalconsumtion
-msgctxt "edcproject.stotalconsumtion"
-msgid "Total consumption"
-msgstr ""
-
-#: edcproject.stotalsupply
-msgctxt "edcproject.stotalsupply"
-msgid "Total supply"
+#: edcproject.stotal
+msgid "Total"
 msgstr ""
 
@@ -141 +135 @@
 #: tformmain.listviewoverview.columns[10].caption
 msgctxt "tformmain.listviewoverview.columns[10].caption"
+msgid "Price [Kč]"
+msgstr ""
+
+#: tformmain.listviewoverview.columns[11].caption
+msgctxt "tformmain.listviewoverview.columns[11].caption"
 msgid "Savings [Kč]"
 msgstr ""
 
-#: tformmain.listviewoverview.columns[11].caption
+#: tformmain.listviewoverview.columns[12].caption
+msgctxt "tformmain.listviewoverview.columns[12].caption"
 msgid "Tariff"
 msgstr ""
 
-#: tformmain.listviewoverview.columns[12].caption
+#: tformmain.listviewoverview.columns[13].caption
+msgctxt "tformmain.listviewoverview.columns[13].caption"
 msgid "Price above zero [Kč]"
 msgstr ""
@@ -159 +160 @@
 #: tformmain.listviewoverview.columns[2].caption
 msgctxt "tformmain.listviewoverview.columns[2].caption"
-msgid "Measured"
+msgid "Address"
 msgstr ""
 
 #: tformmain.listviewoverview.columns[3].caption
 msgctxt "tformmain.listviewoverview.columns[3].caption"
-msgid "Shared"
+msgid "Kind"
 msgstr ""
 
 #: tformmain.listviewoverview.columns[4].caption
 msgctxt "tformmain.listviewoverview.columns[4].caption"
-msgid "Shared [%]"
+msgid "Measured"
 msgstr ""
 
 #: tformmain.listviewoverview.columns[5].caption
 msgctxt "tformmain.listviewoverview.columns[5].caption"
-msgid "Kind"
+msgid "Shared"
 msgstr ""
 
 #: tformmain.listviewoverview.columns[6].caption
 msgctxt "tformmain.listviewoverview.columns[6].caption"
-msgid "Low price [Kč]"
+msgid "Shared [%]"
 msgstr ""
 
 #: tformmain.listviewoverview.columns[7].caption
 msgctxt "tformmain.listviewoverview.columns[7].caption"
-msgid "High price [Kč]"
+msgid "Low price [Kč]"
 msgstr ""
 
 #: tformmain.listviewoverview.columns[8].caption
 msgctxt "tformmain.listviewoverview.columns[8].caption"
-msgid "Spot price [Kč]"
+msgid "High price [Kč]"
 msgstr ""
 
 #: tformmain.listviewoverview.columns[9].caption
 msgctxt "tformmain.listviewoverview.columns[9].caption"
-msgid "Price [Kč]"
+msgid "Spot price [Kč]"
 msgstr ""