refactor/model-to-fields-and-dao-to-model

Author: Cesar4D

Package/DelphiAIDeveloper.dpk

@@ -66,9 +66,9 @@ contains
   DelphiAIDev.DefaultsQuestions.View in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.View.pas' {DelphiAIDevDefaultsQuestionsView},
   DelphiAIDev.Utils.ListView in '..\Src\Utils\DelphiAIDev.Utils.ListView.pas',
   DelphiAIDev.Utils.GetIniPositionStr in '..\Src\Utils\DelphiAIDev.Utils.GetIniPositionStr.pas',
-  DelphiAIDev.DefaultsQuestions.Model in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Model.pas',
+  DelphiAIDev.DefaultsQuestions.Fields in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Fields.pas',
   DelphiAIDev.DefaultsQuestions.Interfaces in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Interfaces.pas',
-  DelphiAIDev.DefaultsQuestions.Dao in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Dao.pas',
+  DelphiAIDev.DefaultsQuestions.Model in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Model.pas',
   DelphiAIDev.DefaultsQuestions.AddEdit.View in '..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.AddEdit.View.pas' {DelphiAIDevDefaultsQuestionsAddEditView};
 
 end.

Package/DelphiAIDeveloper.dproj

@@ -169,9 +169,9 @@
         </DCCReference>
         <DCCReference Include="..\Src\Utils\DelphiAIDev.Utils.ListView.pas"/>
         <DCCReference Include="..\Src\Utils\DelphiAIDev.Utils.GetIniPositionStr.pas"/>
-        <DCCReference Include="..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Model.pas"/>
+        <DCCReference Include="..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Fields.pas"/>
         <DCCReference Include="..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Interfaces.pas"/>
-        <DCCReference Include="..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Dao.pas"/>
+        <DCCReference Include="..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.Model.pas"/>
         <DCCReference Include="..\Src\DefaultsQuestions\DelphiAIDev.DefaultsQuestions.AddEdit.View.pas">
             <Form>DelphiAIDevDefaultsQuestionsAddEditView</Form>
             <FormType>dfm</FormType>

Src/DefaultsQuestions/DelphiAIDev.DefaultsQuestions.AddEdit.View.pas

@@ -13,7 +13,7 @@ interface
   Vcl.Menus,
   Vcl.ComCtrls,
   DelphiAIDev.Types,
-  DelphiAIDev.DefaultsQuestions.Model;
+  DelphiAIDev.DefaultsQuestions.Fields;
 
 type
   TDelphiAIDevDefaultsQuestionsAddEditView = class(TForm)
@@ -39,11 +39,11 @@   TDelphiAIDevDefaultsQuestionsAddEditView = class(TForm)
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
   private
-    FModel: TDelphiAIDevDefaultsQuestionsModel;
+    FFields: TDelphiAIDevDefaultsQuestionsFields;
     procedure MenuMasterLoad;
     procedure MenuMasterClear;
   public
-    property Model: TDelphiAIDevDefaultsQuestionsModel read FModel write FModel;
+    property Fields: TDelphiAIDevDefaultsQuestionsFields read FFields write FFields;
   end;
 
 implementation
@@ -52,7 +52,7 @@ implementation
   DelphiAIDev.Consts,
   DelphiAIDev.Utils,
   DelphiAIDev.Utils.OTA,
-  DelphiAIDev.DefaultsQuestions.Dao;
+  DelphiAIDev.DefaultsQuestions.Model;
 
 {$R *.dfm}
 
@@ -70,10 +70,10 @@ procedure TDelphiAIDevDefaultsQuestionsAddEditView.FormDestroy(Sender: TObject);
 
 procedure TDelphiAIDevDefaultsQuestionsAddEditView.FormShow(Sender: TObject);
 begin
-  mmQuestion.Lines.Text := FModel.Question;
-  edtOrder.Text := FModel.Order.Tostring;
-  ckVisible.Checked := FModel.Visible;
-  ckCodeOnly.Checked := FModel.CodeOnly;
+  mmQuestion.Lines.Text := FFields.Question;
+  edtOrder.Text := FFields.Order.Tostring;
+  ckVisible.Checked := FFields.Visible;
+  ckCodeOnly.Checked := FFields.CodeOnly;
 
   Self.MenuMasterLoad;
   mmQuestion.SetFocus;
@@ -82,12 +82,12 @@ procedure TDelphiAIDevDefaultsQuestionsAddEditView.FormShow(Sender: TObject);
 procedure TDelphiAIDevDefaultsQuestionsAddEditView.MenuMasterClear;
 var
   I: Integer;
-  LModel: TDelphiAIDevDefaultsQuestionsModel;
+  LFields: TDelphiAIDevDefaultsQuestionsFields;
 begin
   for I := Pred(cBoxMenuMaster.Items.Count) downto 0 do
   begin
-    LModel := TDelphiAIDevDefaultsQuestionsModel(cBoxMenuMaster.Items.Objects[I]);
-    LModel.Free;
+    LFields := TDelphiAIDevDefaultsQuestionsFields(cBoxMenuMaster.Items.Objects[I]);
+    LFields.Free;
   end;
   cBoxMenuMaster.Items.Clear;
 end;
@@ -101,24 +101,24 @@ procedure TDelphiAIDevDefaultsQuestionsAddEditView.MenuMasterLoad;
   cBoxMenuMaster.Items.AddObject('None', nil);
 
   LItemIndexDefault := 0;
-  TDelphiAIDevDefaultsQuestionsDao.New.ReadData(
-    procedure(AModel: TDelphiAIDevDefaultsQuestionsModel)
+  TDelphiAIDevDefaultsQuestionsModel.New.ReadData(
+    procedure(AFields: TDelphiAIDevDefaultsQuestionsFields)
     var
-      LModel: TDelphiAIDevDefaultsQuestionsModel;
+      LFields: TDelphiAIDevDefaultsQuestionsFields;
       LItemIndex: Integer;
     begin
-      //if(AModel.Kind <> TC4DWizardOpenExternalKind.MenuMasterOnly)then
+      //if(AFields.Kind <> TC4DWizardOpenExternalKind.MenuMasterOnly)then
       //  Exit;
 
-      LModel := TDelphiAIDevDefaultsQuestionsModel.Create;
-      LModel.Guid := AModel.Guid;
-      LModel.Question := AModel.Question;
-      LItemIndex := cBoxMenuMaster.Items.AddObject(LModel.Question, LModel);
+      LFields := TDelphiAIDevDefaultsQuestionsFields.Create;
+      LFields.Guid := AFields.Guid;
+      LFields.Question := AFields.Question;
+      LItemIndex := cBoxMenuMaster.Items.AddObject(LFields.Question, LFields);
 
-      //if (FModel.IdParent > 0)and(FModel.IdParent = LModel.IdParent) then
+      //if (FFields.IdParent > 0)and(FFields.IdParent = LFields.IdParent) then
       //  LItemIndexDefault := LItemIndex;
 
-      if(FModel.GuidMenuMaster = LModel.Guid)then
+      if(FFields.GuidMenuMaster = LFields.Guid)then
         LItemIndexDefault := LItemIndex;
     end
     );
@@ -137,17 +137,17 @@ procedure TDelphiAIDevDefaultsQuestionsAddEditView.btnConfirmClick(Sender: TObje
   if Trim(mmQuestion.Lines.Text).IsEmpty then
     TUtils.ShowMsgAndAbort('No informed Description', mmQuestion);
 
-  FModel.Question := mmQuestion.Lines.Text;
-  FModel.Order := StrToIntDef(edtOrder.Text, 0);
-  FModel.Visible := ckVisible.Checked;
-  FModel.CodeOnly := ckCodeOnly.Checked;
+  FFields.Question := mmQuestion.Lines.Text;
+  FFields.Order := StrToIntDef(edtOrder.Text, 0);
+  FFields.Visible := ckVisible.Checked;
+  FFields.CodeOnly := ckCodeOnly.Checked;
 
-  FModel.GuidMenuMaster := '';
+  FFields.GuidMenuMaster := '';
   if(cBoxMenuMaster.ItemIndex >= 0)then
-    if(TDelphiAIDevDefaultsQuestionsModel(cBoxMenuMaster.Items.Objects[cBoxMenuMaster.ItemIndex]) <> nil)then
-      FModel.GuidMenuMaster := TDelphiAIDevDefaultsQuestionsModel(cBoxMenuMaster.Items.Objects[cBoxMenuMaster.ItemIndex]).Guid;
+    if(TDelphiAIDevDefaultsQuestionsFields(cBoxMenuMaster.Items.Objects[cBoxMenuMaster.ItemIndex]) <> nil)then
+      FFields.GuidMenuMaster := TDelphiAIDevDefaultsQuestionsFields(cBoxMenuMaster.Items.Objects[cBoxMenuMaster.ItemIndex]).Guid;
 
-  TDelphiAIDevDefaultsQuestionsDao.New.SaveOrEditData(FModel);
+  TDelphiAIDevDefaultsQuestionsModel.New.SaveOrEditData(FFields);
 
   Self.Close;
   Self.ModalResult := mrOK;