Changeset 2 for trunk

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.lfm (modified) (4 diffs)
• FormMain.lrj (modified) (1 diff)
• FormMain.pas (modified) (10 diffs)
• Languages (modified) (1 prop)
• Languages/EdcStats.cs.po (modified) (2 diffs)
• Languages/EdcStats.pot (modified) (2 diffs)
• Packages/Common (modified) (1 prop)
• Packages/csvdocument (modified) (1 prop)

trunk/FormMain.lfm

@@ -46 +46 @@
           item
             Caption = 'EAN'
-            Width = 100
+            Width = 200
           end        
           item
@@ -57 +57 @@
           end        
           item
+            Caption = 'Result'
+            Width = 100
+          end        
+          item
             Caption = 'Shared [%]'
-            Width = 100
+            Width = 635
           end        
           item
             Caption = 'Kind'
-            Width = 635
           end>
         ReadOnly = True
@@ -241 +244 @@
     MaxLength = 0
     TabOrder = 3
+    OnChange = TimeEdit1Change
   end
   object DateEdit1: TDateEdit
@@ -253 +257 @@
     MaxLength = 0
     TabOrder = 4
+    OnChange = DateEdit1Change
   end
   object ButtonIntervalRight: TButton

trunk/FormMain.lrj

@@ -6 +6 @@
 {"hash":5694658,"name":"tformmain.listview1.columns[1].caption","sourcebytes":[79,119,110,101,114],"value":"Owner"},
 {"hash":193645956,"name":"tformmain.listview1.columns[2].caption","sourcebytes":[77,101,97,115,117,114,101,100],"value":"Measured"},
-{"hash":145998637,"name":"tformmain.listview1.columns[3].caption","sourcebytes":[83,104,97,114,101,100,32,91,37,93],"value":"Shared [%]"},
-{"hash":335940,"name":"tformmain.listview1.columns[4].caption","sourcebytes":[75,105,110,100],"value":"Kind"},
+{"hash":93105204,"name":"tformmain.listview1.columns[3].caption","sourcebytes":[82,101,115,117,108,116],"value":"Result"},
+{"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":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

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

trunk/Languages/EdcStats.cs.po

@@ -25 +25 @@
 msgstr "EAN"
 
+#: formmain.smeasured
+msgctxt "formmain.smeasured"
+msgid "Measured"
+msgstr "Měřeno"
+
 #: formmain.sowner
 msgctxt "formmain.sowner"
 msgid "Owner"
 msgstr "Vlastník"
+
+#: formmain.sresult
+msgctxt "formmain.sresult"
+msgid "Result"
+msgstr "Výsledek"
 
 #: formmain.sshared
@@ -101 +111 @@
 #: tformmain.listview1.columns[3].caption
 msgctxt "tformmain.listview1.columns[3].caption"
+msgid "Result"
+msgstr "Výsledek"
+
+#: tformmain.listview1.columns[4].caption
+msgctxt "tformmain.listview1.columns[4].caption"
 msgid "Shared [%]"
 msgstr "Sdíleno [%]"
 
-#: tformmain.listview1.columns[4].caption
+#: tformmain.listview1.columns[5].caption
+msgctxt "tformmain.listview1.columns[5].caption"
 msgid "Kind"
 msgstr "Druh"

trunk/Languages/EdcStats.pot

@@ -15 +15 @@
 msgstr ""
 
+#: formmain.smeasured
+msgctxt "formmain.smeasured"
+msgid "Measured"
+msgstr ""
+
 #: formmain.sowner
 msgctxt "formmain.sowner"
 msgid "Owner"
+msgstr ""
+
+#: formmain.sresult
+msgctxt "formmain.sresult"
+msgid "Result"
 msgstr ""
 
@@ -91 +101 @@
 #: tformmain.listview1.columns[3].caption
 msgctxt "tformmain.listview1.columns[3].caption"
+msgid "Result"
+msgstr ""
+
+#: tformmain.listview1.columns[4].caption
+msgctxt "tformmain.listview1.columns[4].caption"
 msgid "Shared [%]"
 msgstr ""
 
-#: tformmain.listview1.columns[4].caption
+#: tformmain.listview1.columns[5].caption
+msgctxt "tformmain.listview1.columns[5].caption"
 msgid "Kind"
 msgstr ""