Merge pull request #25 from cybertec-postgresql/24_task_add

[+] implement task adding to a chain, closes #24

Author: pashagolub

forms/fmmain.lfm

@@ -105,6 +105,7 @@ object fmMain: TfmMain
       ShowHint = True
       TabOrder = 0
       OnDrawColumnCell = gridTasksDrawColumnCell
+      OnSelectEditor = gridTasksSelectEditor
     end
     object splitDetails: TSplitter
       Cursor = crVSplit
@@ -308,6 +309,8 @@ object fmMain: TfmMain
       Align = alTop
       ClientHeight = 42
       ClientWidth = 1506
+      ParentShowHint = False
+      ShowHint = True
       TabOrder = 1
       object toolbarMain: TToolBar
         Left = 1
@@ -795,6 +798,7 @@ object fmMain: TfmMain
       Category = 'Tasks'
       Caption = 'acTaskDelete'
       DisableIfNoHandler = False
+      Hint = 'Delete selected task'
       ImageIndex = 4
       OnExecute = acTaskDeleteExecute
       OnUpdate = acTaskToolbarUpdate
@@ -812,6 +816,7 @@ object fmMain: TfmMain
       Category = 'Tasks'
       Caption = 'acTaskEdit'
       DisableIfNoHandler = False
+      Hint = 'Edit selected task'
       ImageIndex = 5
       OnExecute = acTaskEditExecute
       OnUpdate = acTaskToolbarUpdate
@@ -820,6 +825,7 @@ object fmMain: TfmMain
       Category = 'Tasks'
       Caption = 'acTaskPost'
       DisableIfNoHandler = False
+      Hint = 'Save changes to selected task'
       ImageIndex = 6
       OnExecute = acTaskPostExecute
       OnUpdate = acTaskToolbarUpdate
@@ -828,6 +834,7 @@ object fmMain: TfmMain
       Category = 'Tasks'
       Caption = 'acTaskCancel'
       DisableIfNoHandler = False
+      Hint = 'Cancel changes to selected task'
       ImageIndex = 7
       OnExecute = acTaskCancelExecute
       OnUpdate = acTaskToolbarUpdate
@@ -836,6 +843,7 @@ object fmMain: TfmMain
       Category = 'Tasks'
       Caption = 'acTaskRefresh'
       DisableIfNoHandler = False
+      Hint = 'Refresh tasks for selected chain'
       ImageIndex = 8
       OnExecute = acTaskRefreshExecute
       OnUpdate = acTaskToolbarUpdate
@@ -844,41 +852,47 @@ object fmMain: TfmMain
       Category = 'Chains'
       Caption = 'acChainAdd'
       DisableIfNoHandler = False
+      Hint = 'Add new chain'
       ImageIndex = 3
       OnExecute = acChainAddExecute
       OnUpdate = acChainToolbarUpdate
     end
     object acChainDelete: TAction
       Category = 'Chains'
       Caption = 'acChainDelete'
+      Hint = 'Delete selected chain'
       ImageIndex = 4
       OnExecute = acChainDeleteExecute
       OnUpdate = acChainToolbarUpdate
     end
     object acChainEdit: TAction
       Category = 'Chains'
       Caption = 'acChainEdit'
+      Hint = 'Edit selected chain'
       ImageIndex = 5
       OnExecute = acChainEditExecute
       OnUpdate = acChainToolbarUpdate
     end
     object acChainPost: TAction
       Category = 'Chains'
       Caption = 'acChainPost'
+      Hint = 'Save changes in selected chain'
       ImageIndex = 6
       OnExecute = acChainPostExecute
       OnUpdate = acChainToolbarUpdate
     end
     object acChainCancel: TAction
       Category = 'Chains'
       Caption = 'acChainCancel'
+      Hint = 'Cancel changes in selected chain'
       ImageIndex = 7
       OnExecute = acChainCancelExecute
       OnUpdate = acChainToolbarUpdate
     end
     object acChainRefresh: TAction
       Category = 'Chains'
       Caption = 'acChainRefresh'
+      Hint = 'Refresh chain list from database'
       ImageIndex = 8
       OnExecute = acChainRefreshExecute
       OnUpdate = acChainToolbarUpdate

forms/fmmain.pas

@@ -86,6 +86,8 @@   TfmMain = class(TForm)
     procedure gridChainsTitleClick(Column: TColumn);
     procedure gridTasksDrawColumnCell(Sender: TObject; const Rect: TRect;
       DataCol: integer; Column: TColumn; State: TGridDrawState);
+    procedure gridTasksSelectEditor(Sender: TObject; Column: TColumn;
+      var Editor: TWinControl);
     procedure miCloseClick(Sender: TObject);
   private
     FLastColumn: TColumn; //last sorted grid column
@@ -195,6 +197,17 @@ procedure TfmMain.gridTasksDrawColumnCell(Sender: TObject; const Rect: TRect;
   imglGrids.Draw(gridTasks.Canvas, aLeft, aTop, ImgIdx);
 end;
 
+procedure TfmMain.gridTasksSelectEditor(Sender: TObject; Column: TColumn;
+  var Editor: TWinControl);
+begin
+  if Column.FieldName = 'kind' then
+    with Editor as TCustomComboBox do
+    begin
+      Style := csDropDownList;
+      AutoDropDown := True;
+    end;
+end;
+
 procedure TfmMain.miCloseClick(Sender: TObject);
 begin
   Close();
@@ -288,8 +301,8 @@ procedure TfmMain.acTaskToolbarUpdate(Sender: TObject);
 begin
   CanModify := dmPgEngine.IsConnected() and dmPgEngine.qryTasks.CanModify;
   acTaskAdd.Enabled := CanModify;
-  acMoveTaskUp.Enabled := CanModify and not dmPgEngine.qryTasks.BOF;
-  acMoveTaskDown.Enabled := CanModify and not dmPgEngine.qryTasks.EOF;
+  acMoveTaskUp.Enabled := CanModify and (dmPgEngine.qryTasks.RecNo > 1);
+  acMoveTaskDown.Enabled := CanModify and (dmPgEngine.qryTasks.RecNo < dmPgEngine.qryTasks.RecordCount);
   acTaskDelete.Enabled := CanModify and
     (not (dmPgEngine.qryTasks.BOF and dmPgEngine.qryTasks.EOF));
   acTaskEdit.Enabled := CanModify and not (dmPgEngine.qryTasks.State in dsEditModes);

udatamodule.lfm

@@ -32,21 +32,21 @@ object dmPgEngine: TdmPgEngine
     AfterClose = qryChainsAfterClose
     AfterDelete = qryChainsAfterDelete
     AfterInsert = qryChainsAfterInsert
-    AfterPost = qryChainsAfterPost
+    AfterPost = qryAfterPost
     BeforeDelete = qryChainsBeforeDelete
     Database = PQConn
     Transaction = transChains
     SQL.Strings = (
       'SELECT'
       '  chain_id,'
       '  task_id,'
-      '  chain_name :: varchar(255) as chain_name,'
-      '  COALESCE(run_at, ''* * * * *'') :: varchar(100) as run_at,'
+      '  chain_name,'
+      '  COALESCE(run_at, ''* * * * *'') as run_at,'
       '  max_instances,'
       '  live,'
       '  self_destruct,'
       '  exclusive_execution,'
-      '  client_name :: varchar(100) as client_name,'
+      '  client_name,'
       '  timeout,'
       '  max_instances'
       'FROM timetable.chain'
@@ -114,6 +114,11 @@ object dmPgEngine: TdmPgEngine
     IndexName = 'DEFAULT_ORDER'
     MaxIndexesCount = 4
     FieldDefs = <>
+    AfterInsert = qryTasksAfterInsert
+    AfterOpen = qryTasksAfterOpen
+    AfterPost = qryAfterPost
+    AfterRefresh = qryTasksAfterOpen
+    BeforePost = qryTasksBeforePost
     Database = PQConn
     Transaction = transChains
     SQL.Strings = (
@@ -160,11 +165,23 @@ object dmPgEngine: TdmPgEngine
       '    x'
     )
     InsertSQL.Strings = (
-      'INSERT INTO timetable.task'
-      '(parent_id, task_name, kind, command, run_as, database_connection, ignore_error, autonomous, timeout)'
-      'VALUES'
-      '(0, '''',''SQL'', '''', '''', '''', false, false, 0)'
-      ''
+      'INSERT INTO timetable.task('
+      '    parent_id,'
+      '    command,'
+      '    kind,'
+      '    run_as,'
+      '    ignore_error,'
+      '    autonomous,'
+      '    database_connection'
+      ') VALUES ('
+      '    :"parent_id",'
+      '    :"command",'
+      '    :"kind",'
+      '    :"run_as",'
+      '    :"ignore_error",'
+      '    :"autonomous",'
+      '    :"connect_string"'
+      ')'
     )
     Options = [sqoKeepOpenOnCommit, sqoAutoApplyUpdates, sqoAutoCommit, sqoRefreshUsingSelect]
     Params = <    

udatamodule.pas

@@ -24,9 +24,13 @@   TdmPgEngine = class(TDataModule)
     procedure qryChainsAfterClose(DataSet: TDataSet);
     procedure qryChainsAfterDelete(DataSet: TDataSet);
     procedure qryChainsAfterInsert(DataSet: TDataSet);
-    procedure qryChainsAfterPost(DataSet: TDataSet);
+    procedure qryAfterPost(DataSet: TDataSet);
     procedure qryChainsBeforeDelete(DataSet: TDataSet);
+    procedure qryTasksAfterInsert(DataSet: TDataSet);
+    procedure qryTasksAfterOpen(DataSet: TDataSet);
+    procedure qryTasksBeforePost(DataSet: TDataSet);
   private
+    FLastTaskID: integer;
   public
     procedure Connect;
     procedure Disconnect;
@@ -80,14 +84,18 @@ procedure TdmPgEngine.qryChainsAfterInsert(DataSet: TDataSet);
   end;
 end;
 
-procedure TdmPgEngine.qryChainsAfterPost(DataSet: TDataSet);
+procedure TdmPgEngine.qryAfterPost(DataSet: TDataSet);
 var
-  c: variant;
+  FldVal: variant;
+  FldName: string;
   Q: TSQLQuery;
+const
+  FldNames: array[boolean] of string = ('chain_name', 'parent_id');
 begin
   Q := DataSet as TSQLQuery;
+  FldName := FldNames[Q = qryTasks];
   Q.IndexName := '';
-  c := DataSet.FieldValues['chain_name'];
+  FldVal := DataSet.FieldValues[FldName];
   try
     Q.ApplyUpdates;
     DataSet.Refresh;
@@ -98,15 +106,38 @@ procedure TdmPgEngine.qryChainsAfterPost(DataSet: TDataSet);
       Q.CancelUpdates;
      end;
   end;
-  DataSet.Locate('chain_name', c, []);
-  fmMain.MainForm.UpdateSortIndication(nil);
+  DataSet.Locate(FldName, FldVal, []);
+  if Q = qryChains then
+    fmMain.MainForm.UpdateSortIndication(nil);
 end;
 
 procedure TdmPgEngine.qryChainsBeforeDelete(DataSet: TDataSet);
 begin
   if MessageDlg('Delete confirmation',
     'Are you sure you want delete current chain?', mtWarning, [mbOK, mbCancel], 0) = mrCancel then
-  Abort;
+  Abort();
+end;
+
+procedure TdmPgEngine.qryTasksAfterInsert(DataSet: TDataSet);
+begin
+  with DataSet do
+  begin
+    FieldByName('parent_id').AsInteger := FLastTaskID;
+    FieldByName('kind').AsString := 'SQL';
+    FieldByName('ignore_error').AsBoolean := False;
+    FieldByName('autonomous').AsBoolean := False;
+  end;
+end;
+
+procedure TdmPgEngine.qryTasksAfterOpen(DataSet: TDataSet);
+begin
+  DataSet.Last();
+  FLastTaskID := DataSet.FieldByName('task_id').AsInteger;
+end;
+
+procedure TdmPgEngine.qryTasksBeforePost(DataSet: TDataSet);
+begin
+  if DataSet.FieldByName('command').IsNull then Abort();
 end;
 
 procedure TdmPgEngine.Connect;