Changeset 2 for trunk/FormMain.pas

Timestamp:

Apr 6, 2026, 9:37:07 AM (3 weeks ago)

Author:

chronos

Message:

• Added: Ignore generated files.
• Fixed: Date and time controls not working.

Location:

trunk

Files:

• . (modified) (1 prop)
• FormMain.pas (modified) (10 diffs)

trunk/FormMain.pas

@@ -53 +53 @@
     procedure ComboBoxPeriodSelect(Sender: TObject);
     procedure ComboBoxUnitSelect(Sender: TObject);
+    procedure DateEdit1Change(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -60 +61 @@
     procedure TabSheetDataShow(Sender: TObject);
     procedure TabSheetLogShow(Sender: TObject);
+    procedure TimeEdit1Change(Sender: TObject);
     procedure Translator1Translate(Sender: TObject);
   private
@@ -75 +77 @@
     procedure LoadConfig;
     procedure Report;
-    procedure ReloadListView;
+    procedure ReloadListViewOverview;
     procedure ReloadListViewData;
     procedure LoadOwners(FileName: string);
@@ -107 +109 @@
   SOwner = 'Owner';
   SShared = 'Shared';
+  SMeasured = 'Measured';
+  SResult = 'Result';
 
 { TFormMain }
@@ -169 +173 @@
 end;
 
+procedure TFormMain.DateEdit1Change(Sender: TObject);
+begin
+  IntervalTo := DateEdit1.Date + TimeOf(IntervalTo);
+  UpdateInterval;
+end;
+
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
@@ -189 +199 @@
 procedure TFormMain.TabSheetOverviewShow(Sender: TObject);
 begin
-  ReloadListView;
+  ReloadListViewOverview;
 end;
 
@@ -211 +221 @@
 begin
   Report;
+end;
+
+procedure TFormMain.TimeEdit1Change(Sender: TObject);
+begin
+  IntervalTo := DateOf(IntervalTo) + TimeEdit1.Time;
+  UpdateInterval;
 end;
 
@@ -278 +294 @@
   TotalIn, TotalOut: Double;
 begin
-  Memo1.Lines.Clear;
-  for I := 0 to Eans.Count - 1 do begin
-    Memo1.Lines.Add(SEAN + ': ' + Eans[I].Number);
-    Memo1.Lines.Add(SOwner + ': ' + Eans[I].Owner);
-    TotalIn := Eans[I].GetTotalIn(IntervalFrom, IntervalTo);
-    TotalOut := Eans[I].GetTotalOut(IntervalFrom, IntervalTo);
-    Memo1.Lines.Add('Total IN: ' + IntToStr(Trunc(TotalIn)));
-    Memo1.Lines.Add('Total OUT: ' + IntToStr(Trunc(TotalOut)));
-    if TotalIn <> 0 then
-    Memo1.Lines.Add(SShared + ': ' + IntToStr(Trunc(Eans[I].GetShared(IntervalFrom, IntervalTo))) + ' %');
-    Memo1.Lines.Add('');
-  end;
-end;
-
-procedure TFormMain.ReloadListView;
+  Memo1.Lines.BeginUpdate;
+  try
+    Memo1.Lines.Clear;
+    for I := 0 to Eans.Count - 1 do begin
+      Memo1.Lines.Add(SEAN + ': ' + Eans[I].Number);
+      Memo1.Lines.Add(SOwner + ': ' + Eans[I].Owner);
+      TotalIn := Eans[I].GetTotalIn(IntervalFrom, IntervalTo);
+      TotalOut := Eans[I].GetTotalOut(IntervalFrom, IntervalTo);
+      Memo1.Lines.Add(SMeasured + ': ' + IntToStr(Trunc(TotalIn)));
+      Memo1.Lines.Add(SResult + ': ' + IntToStr(Trunc(TotalOut)));
+      if TotalIn <> 0 then
+      Memo1.Lines.Add(SShared + ': ' + IntToStr(Trunc(Eans[I].GetShared(IntervalFrom, IntervalTo))) + ' %');
+      Memo1.Lines.Add('');
+    end;
+  finally
+    Memo1.Lines.EndUpdate;
+  end;
+end;
+
+procedure TFormMain.ReloadListViewOverview;
 var
   ListItem: TListItem;
@@ -305 +326 @@
       ListItem.SubItems.Add(Eans[I].Owner);
       ListItem.SubItems.Add(MeasureToStr(Eans[I].GetTotalIn(IntervalFrom, IntervalTo)));
+      ListItem.SubItems.Add(MeasureToStr(Eans[I].GetTotalOut(IntervalFrom, IntervalTo)));
       ListItem.SubItems.Add(IntToStr(Trunc(Eans[I].GetShared(IntervalFrom, IntervalTo))));
       ListItem.SubItems.Add(EanKindText[Eans[I].Kind]);
@@ -397 +419 @@
         TimeFrom := StrToDate(CSVDoc.Cells[0, R]) + StrToTime(CSVDoc.Cells[1, R]);
         TimeTo := StrToDate(CSVDoc.Cells[0, R]) + StrToTime(CSVDoc.Cells[2, R]);
-        if TryStrToFloat(CSVDoc.Cells[3 + C * 2, R], CellValueIn) and
-        TryStrToFloat(CSVDoc.Cells[3 + C * 2 + 1, R], CellValueOut) then begin
-          if EanKind = ekConsumption then begin
-            CellValueIn := -CellValueIn;
-            CellValueOut := -CellValueOut;
-          end;
-          Ean.Values.Add(TEanValue.Create(TimeFrom, CellValueIn, CellValueOut));
+
+        CellValueIn := 0;
+        if TryStrToFloat(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 EanKind = ekConsumption then CellValueOut := -CellValueOut;
+        end;
+
+        Ean.Values.Add(TEanValue.Create(TimeFrom, CellValueIn, CellValueOut));
       end;
     end;