Changeset 3 for trunk/Car.pas

Timestamp:

Jun 2, 2023, 10:06:55 PM (18 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Improved summary calculation.
• Added: Parsing rent car initial odometer.

File:

• trunk/Car.pas (moved) (moved from trunk/UCar.pas ) (20 diffs)

trunk/Car.pas

@@ -1 @@
-unit UCar;
+unit Car;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, Generics.Collections, Generics.Defaults, DateUtils,
-  UPrefixMultiplier;
+  PrefixMultiplier;
 
 type
@@ -47 +47 @@
     Distance: Double;
     Consumption: Double;
+    Odometer: Integer;
     function GetEmission: Double;
     function GetFuel: Double;
@@ -66 +67 @@
     function GetPrice: Double;
     function GetPriceWithFuel: Double;
+    function GetAverageOdometer: Integer;
   end;
 
@@ -94 +96 @@
   end;
 
+  { TSummaryYear }
+
   TSummaryYear = class
     Year: Integer;
@@ -100 +104 @@
     Distance: Double;
     RentCount: Integer;
-    CompanyCount: Integer;
+    Companies: TCompanies;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -118 +124 @@
   EngineTypeUnit: array[TEngineType] of string = ('', 'l', 'l', 'Wh',
     'g', 'g');
+  DistanceUnits: array[TEngineType] of Integer = (1, 100, 100, 1, 100, 100);
+
+function Explode(Separator: string; Data: string): TStringArray;
+var
+  Index: Integer;
+begin
+  Result := Default(TStringArray);
+  repeat
+    Index := Pos(Separator, Data);
+    if Index > 0 then begin
+      SetLength(Result, Length(Result) + 1);
+      Result[High(Result)] := Copy(Data, 1, Index - 1);
+      Delete(Data, 1, Index + Length(Separator) - 1);
+    end else Break;
+  until False;
+  if Data <> '' then begin
+    SetLength(Result, Length(Result) + 1);
+    Result[High(Result)] := Data;
+  end;
+end;
 
 function Trim(const S: string; What: Char): string; overload;
@@ -132 +158 @@
 end;
 
+{ TSummaryYear }
+
+constructor TSummaryYear.Create;
+begin
+  Companies := TCompanies.Create(False);
+end;
+
+destructor TSummaryYear.Destroy;
+begin
+  FreeAndNil(Companies);
+  inherited;
+end;
+
 { TSummaryYears }
 
@@ -201 +240 @@
     Result := Result + Rents[I].PriceWithFuel;
   end;
+end;
+
+function TCompany.GetAverageOdometer: Integer;
+var
+  I: Integer;
+  Count: Integer;
+begin
+  Result := 0;
+  Count := 0;
+  for I := 0 to Rents.Count - 1 do
+  if Rents[I].Odometer > 0 then begin
+    Result := Result + Rents[I].Odometer;
+    Inc(Count);
+  end;
+  if Count > 0 then
+    Result := Result div Count;
 end;
 
@@ -219 +274 @@
 function TRent.GetFuel: Double;
 begin
-  Result := Distance * Consumption;
+  Result := Distance / DistanceUnits[Car.EngineType] * Consumption;
 end;
 
@@ -316 +371 @@
   ValueDouble: Double;
   ValueDate: TDateTime;
-  Years: TSummaryYear;
+  Parts: TStringArray;
+  Part: string;
+  Odometer: Integer;
+  InBetween: string;
+  LeftIndex: Integer;
+  RightIndex: Integer;
 const
   DistanceText = '* Vzdálenost:';
@@ -331 +391 @@
   DateText = '* Datum:';
   BrandText = '* Značka:';
+  TableLineStartText = '| ';
+  TableLineCellSeparator = '||';
 begin
   Lines := TStringList.Create;
@@ -346 +408 @@
     if Line.StartsWith(DistanceText) then begin
       Line := Copy(Line, Length(DistanceText) + 1, MaxInt);
-      if (Pos('(', Line) > 0) and (Pos(')', Line) > 0) then
-        Line := Copy(Line, 1, Pos('(', Line) - 1) + Copy(Line, Pos(')', Line) + 1, MaxInt);
+      LeftIndex := Pos('(', Line);
+      RightIndex := Pos(')', Line);
+      if (LeftIndex > 0) and (RightIndex > 0) then begin
+        InBetween := Copy(Line, LeftIndex + 1, RightIndex - LeftIndex - 1);
+        if Pos('-', InBetween) > 0 then InBetween := Copy(InBetween, Pos('-', InBetween) + 1, MaxInt);
+        if TryStrToInt(Trim(InBetween), Odometer) then
+          Rent.Odometer := Odometer;
+        Line := Copy(Line, 1, LeftIndex - 1) + Copy(Line, RightIndex + 1, MaxInt);
+      end;
       if Pos(DistanceUnit, Line) > 0 then
         Line := Trim(Copy(Line, 1, Pos(DistanceUnit, Line) - 1));
@@ -430 +499 @@
       Company.Rents.Add(Rent);
       Rent.Company := Company;
+    end else
+    if Line.StartsWith(TableLineStartText) then begin
+      Parts := Explode(TableLineCellSeparator, Line);
+      if Length(Parts) > 4 then begin
+        Part := Parts[4];
+        Part := Trim(Part);
+        if TryStrToInt(Part, Odometer) and (Rent.Odometer = 0) then
+          Rent.Odometer := Odometer;
+      end;
     end else begin
 //      Line := Trim(Line);
@@ -487 +565 @@
     SummaryYear.PriceWithFuel := SummaryYear.PriceWithFuel + PriceWithFuel;
     Inc(SummaryYear.RentCount);
+    if SummaryYear.Companies.IndexOf(Company) = -1 then
+      SummaryYear.Companies.Add(Company);
   end;
 
@@ -509 +589 @@
       FloatToStr(PriceWithFuel) + ' || ' +
       FloatToStr(Distance) + ' || ' + IntToStr(RentCount) + ' || ' +
-      IntToStr(CompanyCount));
+      IntToStr(Companies.Count));
     if I < SummaryYears.Count - 1 then AddLine('|-');
   end;
@@ -517 +597 @@
   AddLine('==Auta==');
   AddLine('{| class="wikitable sortable"');
-  AddLine('! Jméno !! Půjčení !! Průměrná spotřeba');
+  AddLine('! Jméno !! Půjčení !! Průměrná spotřeba !! Typ paliva');
   AddLine('|-');
   for I := 0 to Cars.Count - 1 do
-  with Cars[I] do begin
+  with TCar(Cars[I]) do begin
     AddLine('| ' + Name + ' || ' + IntToStr(Rents.Count) + ' || ' +
-      FloatToStr(Round(GetConsumption * 100) / 100));
+      FloatToStr(Round(GetConsumption * 100) / 100) + ' || ' + EngineTypeText[EngineType]);
     if I < Cars.Count - 1 then AddLine('|-');
   end;
@@ -530 +610 @@
   AddLine('==Půjčovny==');
   AddLine('{| class="wikitable sortable"');
-  AddLine('! Jméno !! Půjčení !! Celkem cena [Kč] !! Celkem cena s palivem [Kč]');
+  AddLine('! Jméno !! Půjčení !! Celkem cena [Kč] !! Celkem cena s palivem [Kč] !! Průměrně odometr [Km]');
   AddLine('|-');
   for I := 0 to Companies.Count - 1 do
   with TCompany(Companies[I]) do begin
     AddLine('| ' + Name + ' || ' + IntToStr(Rents.Count) + ' || ' +
-      FloatToStr(GetPrice) + ' || ' + FloatToStr(GetPriceWithFuel));
+      FloatToStr(GetPrice) + ' || ' + FloatToStr(GetPriceWithFuel) + ' || ' +
+      IntToStr(GetAverageOdometer));
     if I < Companies.Count - 1 then AddLine('|-');
   end;
@@ -543 +624 @@
   AddLine('==Zápůjčky==');
   AddLine('{| class="wikitable sortable"');
-  AddLine('! Datum !! Auto !! Půjčovna !! Cena celkem [Kč] !! Celkem cena s palivem [Kč] !! Spotřeba [l/100 km] !! Vzdálenost [km] !! Typ paliva || Energie');
+  AddLine('! Datum !! Auto !! Půjčovna !! Cena celkem [Kč] !! Celkem cena s palivem [Kč] !! Vzdálenost [km] !! Spotřeba !! Typ paliva || Energie');
   AddLine('|-');
   for I := 0 to Rents.Count - 1 do
@@ -552 +633 @@
       CompanyName + ' || ' + FloatToStr(Price) + ' || ' +
       FloatToStr(PriceWithFuel) + ' || ' +
-      FloatToStr(Consumption) + ' || ' + FloatToStr(Distance) + ' || ' +
+      FloatToStr(Distance) + ' || ' + FloatToStr(Consumption) + ' || ' +
       EngineTypeText[Car.EngineType] + ' || ' + FloatToStr(GetFuel));
     if I < Rents.Count - 1 then AddLine('|-');