Changeset 11 for trunk/EdcProject.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: EAN address as separate field.

File:

• trunk/EdcProject.pas (modified) (5 diffs)

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);