eye candy

holgerflick · Dec 12, 2023 · da85307 · da85307
1 parent 7b6c957
commit da85307
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 12 deletions.
diff --git a/bpl/src/UDictionary.pas b/bpl/src/UDictionary.pas
@@ -13,6 +13,7 @@   TCSAdvStringGridDictionary = class;
   TCSControlDictionary = class;
   TCSDBGridColumnDictionary = class;
   TCSDBGridControlDictionary = class;
+  TCompanyDictionary = class;
   TCustomerDictionary = class;
   TDocumentDictionary = class;
   TInvoiceDictionary = class;
@@ -33,6 +34,8 @@   TTransactionDictionary = class;
 
   ICSDBGridControlDictionary = interface;
 
+  ICompanyDictionary = interface;
+
   ICustomerDictionary = interface;
 
   IDocumentDictionary = interface;
@@ -108,6 +111,14 @@   TTransactionDictionary = class;
     function Columns: ICSDBGridColumnDictionary;
   end;
 
+  ICompanyDictionary = interface(IAureliusEntityDictionary)
+    function Id: TLinqProjection;
+    function Name: TLinqProjection;
+    function AddressLine: TLinqProjection;
+    function CityZipLine: TLinqProjection;
+    function Logo: TLinqProjection;
+  end;
+
   ICustomerDictionary = interface(IAureliusEntityDictionary)
     function Address: TLinqProjection;
     function Email: TLinqProjection;
@@ -239,6 +250,15 @@   TCSDBGridControlDictionary = class(TAureliusEntityDictionary, ICSDBGridControl
     function Columns: ICSDBGridColumnDictionary;
   end;
 
+  TCompanyDictionary = class(TAureliusEntityDictionary, ICompanyDictionary)
+  public
+    function Id: TLinqProjection;
+    function Name: TLinqProjection;
+    function AddressLine: TLinqProjection;
+    function CityZipLine: TLinqProjection;
+    function Logo: TLinqProjection;
+  end;
+
   TCustomerDictionary = class(TAureliusEntityDictionary, ICustomerDictionary)
   public
     function Address: TLinqProjection;
@@ -317,6 +337,7 @@   TTransactionDictionary = class(TAureliusEntityDictionary, ITransactionDictiona
     function CSControl: ICSControlDictionary;
     function CSDBGridColumn: ICSDBGridColumnDictionary;
     function CSDBGridControl: ICSDBGridControlDictionary;
+    function Company: ICompanyDictionary;
     function Customer: ICustomerDictionary;
     function Document: IDocumentDictionary;
     function Invoice: IInvoiceDictionary;
@@ -334,6 +355,7 @@   TDefaultDictionary = class(TAureliusDictionary, IDefaultDictionary)
     function CSControl: ICSControlDictionary;
     function CSDBGridColumn: ICSDBGridColumnDictionary;
     function CSDBGridControl: ICSDBGridControlDictionary;
+    function Company: ICompanyDictionary;
     function Customer: ICustomerDictionary;
     function Document: IDocumentDictionary;
     function Invoice: IInvoiceDictionary;
@@ -583,6 +605,33 @@ function TCSDBGridControlDictionary.Columns: ICSDBGridColumnDictionary;
   Result := TCSDBGridColumnDictionary.Create(PropName('Columns'));
 end;
 
+{ TCompanyDictionary }
+
+function TCompanyDictionary.Id: TLinqProjection;
+begin
+  Result := Prop('Id');
+end;
+
+function TCompanyDictionary.Name: TLinqProjection;
+begin
+  Result := Prop('Name');
+end;
+
+function TCompanyDictionary.AddressLine: TLinqProjection;
+begin
+  Result := Prop('AddressLine');
+end;
+
+function TCompanyDictionary.CityZipLine: TLinqProjection;
+begin
+  Result := Prop('CityZipLine');
+end;
+
+function TCompanyDictionary.Logo: TLinqProjection;
+begin
+  Result := Prop('Logo');
+end;
+
 { TCustomerDictionary }
 
 function TCustomerDictionary.Address: TLinqProjection;
@@ -844,6 +893,11 @@ function TDefaultDictionary.CSDBGridControl: ICSDBGridControlDictionary;
   Result := TCSDBGridControlDictionary.Create;
 end;
 
+function TDefaultDictionary.Company: ICompanyDictionary;
+begin
+  Result := TCompanyDictionary.Create;
+end;
+
 function TDefaultDictionary.Customer: ICustomerDictionary;
 begin
   Result := TCustomerDictionary.Create;

diff --git a/bpl/src/UTransaction.pas b/bpl/src/UTransaction.pas
@@ -35,7 +35,7 @@ interface
 
 type
   [Automapping]
-  TTransactionKind = ( Income, Expense, All ); // all is used for filtering
+  TTransactionKind = ( Income, Expense, All ); // All is used for filtering
 
   [Entity]
   [Automapping]

diff --git a/vcl/src/FlixAccounting.dproj b/vcl/src/FlixAccounting.dproj
@@ -78,9 +78,9 @@
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
-        <VerInfo_Build>44</VerInfo_Build>
+        <VerInfo_Build>45</VerInfo_Build>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=FlixEngineering, LLC;FileDescription=$(MSBuildProjectName);FileVersion=0.0.1.44;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=Flix LLC Profit &amp; Loss;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=FlixEngineering, LLC;FileDescription=$(MSBuildProjectName);FileVersion=0.0.1.45;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=Flix LLC Profit &amp; Loss;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_Release>1</VerInfo_Release>
     </PropertyGroup>

diff --git a/vcl/src/forms/UFrmCustomer.pas b/vcl/src/forms/UFrmCustomer.pas
@@ -26,6 +26,7 @@ interface
   , System.Actions
 
   , Vcl.ActnList
+  , Vcl.Buttons
   , Vcl.Graphics
   , Vcl.Controls
   , Vcl.Forms

diff --git a/vcl/src/forms/UFrmMain.dfm b/vcl/src/forms/UFrmMain.dfm
@@ -1,15 +1,13 @@
 inherited FrmMain: TFrmMain
   BorderStyle = bsDialog
   ClientHeight = 151
-  ClientWidth = 809
+  ClientWidth = 771
   DoubleBuffered = True
   Font.Height = -12
   StyleElements = [seFont, seClient]
   OnShow = FormShow
-  ExplicitLeft = 3
-  ExplicitTop = 3
-  ExplicitWidth = 831
-  ExplicitHeight = 207
+  ExplicitWidth = 787
+  ExplicitHeight = 190
   TextHeight = 15
   object btnTransactions: TButton [0]
     Left = 114

diff --git a/vcl/src/forms/UFrmReportProfitLoss.dfm b/vcl/src/forms/UFrmReportProfitLoss.dfm
@@ -25,7 +25,6 @@ inherited FrmReportProfitLoss: TFrmReportProfitLoss
     BevelOuter = bvNone
     ShowCaption = False
     TabOrder = 0
-    ExplicitHeight = 585
     object Label1: TLabel
       Left = 0
       Top = 0
@@ -124,7 +123,6 @@ inherited FrmReportProfitLoss: TFrmReportProfitLoss
       BevelOuter = bvNone
       ShowCaption = False
       TabOrder = 2
-      ExplicitTop = 541
       object txtTotalIncome: TLabel
         AlignWithMargins = True
         Left = 3
@@ -155,7 +153,6 @@ inherited FrmReportProfitLoss: TFrmReportProfitLoss
     BevelOuter = bvNone
     ShowCaption = False
     TabOrder = 1
-    ExplicitHeight = 585
     object Label2: TLabel
       Left = 0
       Top = 0
@@ -254,7 +251,6 @@ inherited FrmReportProfitLoss: TFrmReportProfitLoss
       BevelOuter = bvNone
       ShowCaption = False
       TabOrder = 2
-      ExplicitTop = 541
       object txtTotalExpense: TLabel
         AlignWithMargins = True
         Left = 3