Changeset 40 for trunk/Application/UDataTypes.pas

Timestamp:

Mar 9, 2012, 8:11:13 AM (12 years ago)

Author:

chronos

Message:

• Added: Remember last password in login dialog.
• Fixed: Some Add, Edit, View, Select dialog display.

File:

• trunk/Application/UDataTypes.pas (modified) (22 diffs)

trunk/Application/UDataTypes.pas

@@ -14 +14 @@
 
   TDataType = class
+    Name: string;
     CustomType: Integer;
     Control: TWinControl;
@@ -23 +24 @@
     procedure SetDefault; virtual;
     function GetStringValue: string; virtual;
+    constructor Create; virtual;
   end;
 
@@ -37 +39 @@
     procedure Load(CellValue: string); override;
     procedure LoadDef(CustomType: Integer); override;
+    constructor Create; override;
   end;
 
@@ -49 +52 @@
     function GetControlValue(Control: TWinControl): string; override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -60 +64 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -71 +76 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -86 +92 @@
     procedure Load(CellValue: string); override;
     procedure LoadDef(ACustomType: Integer); override;
+    constructor Create; override;
   end;
 
@@ -99 +106 @@
     procedure Load(CellValue: string); override;
     procedure LoadDef(ACustomType: Integer); override;
+    constructor Create; override;
   end;
 
@@ -112 +120 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -123 +132 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -136 +146 @@
     procedure SetupControl(Control: TWinControl); override;
     procedure Load(CellValue: string); override;
+    constructor Create; override;
   end;
 
@@ -144 +155 @@
 
 uses
-  USqlDatabase, USystem, UCore, UItemSelect;
+  USqlDatabase, USystem, UCore, UItemSelect, UMainForm;
 
 function GetDataType(ACustomType: Integer): TDataType;
@@ -216 +227 @@
 end;
 
+constructor TDataTypeDateTime.Create;
+begin
+  inherited Create;
+  Name := 'DateType';
+end;
+
 { TDataTypeRelationMany }
 
 function TDataTypeRelationMany.CreateControl(Owner: TComponent): TWinControl;
 begin
-  Result:=inherited CreateControl(Owner);
+  Result := inherited CreateControl(Owner);
 end;
 
@@ -260 +277 @@
 end;
 
+constructor TDataTypeRelationMany.Create;
+begin
+  inherited Create;
+  Name := 'RelationMany';
+end;
+
 { TDataTypeRelationOne }
 
 procedure TDataTypeRelationOne.ButtonClickExecute(Sender: TObject);
-begin
-  ItemSelectForm.ObjectId := ObjectId;
-  ItemSelectForm.ShowModal;
-  TEditButton(Control).Text := IntToStr(ItemSelectForm.SelectedId)
+var
+  NewSelectForm: TItemSelectForm;
+begin
+  try
+    NewSelectForm := TItemSelectForm.Create(MainForm);
+    NewSelectForm.ObjectId := ObjectId;
+    NewSelectForm.ShowModal;
+    TEditButton(Control).Text := IntToStr(NewSelectForm.SelectedId)
+  finally
+    ItemSelectForm.Free;
+  end;
 end;
 
@@ -309 +339 @@
 end;
 
+constructor TDataTypeRelationOne.Create;
+begin
+  inherited Create;
+  Name := 'RelationOne';
+end;
+
 
 { TDataTypePassword }
@@ -327 +363 @@
 end;
 
+constructor TDataTypePassword.Create;
+begin
+  inherited Create;
+  Name := 'Password';
+end;
+
 { TDataTypeFloat }
 
@@ -349 +391 @@
 end;
 
+constructor TDataTypeFloat.Create;
+begin
+  inherited Create;
+  Name := 'Float';
+end;
+
 { TDataTypeDateTime }
 
@@ -371 +419 @@
 end;
 
+constructor TDataTypeDate.Create;
+begin
+  inherited Create;
+  Name := 'Date';
+end;
+
 { TDataTypeBoolean }
 
@@ -391 +445 @@
 begin
   Value := Boolean(StrToInt(CellValue));
+end;
+
+constructor TDataTypeBoolean.Create;
+begin
+  inherited Create;
+  Name := 'Boolean';
 end;
 
@@ -422 +482 @@
 end;
 
+constructor TDataTypeNumber.Create;
+begin
+  inherited Create;
+  Name := 'Number';
+end;
+
 { TDataTypeString }
 
@@ -444 +510 @@
 end;
 
+constructor TDataTypeString.Create;
+begin
+  inherited Create;
+  Name := 'String';
+end;
+
 { TDataType }
 
@@ -481 +553 @@
 end;
 
+constructor TDataType.Create;
+begin
+  inherited;
+end;
+
 end.