File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -250,6 +250,11 @@ object fmMain: TfmMain
250250 AutoFillColumns = True
251251 Color = clWindow
252252 Columns = <
253+ item
254+ Title.Caption = 'Task Name'
255+ Width = 339
256+ FieldName = 'task_name'
257+ end
253258 item
254259 MinSize = 9
255260 MaxSize = 201
@@ -278,7 +283,7 @@ object fmMain: TfmMain
278283 MaxSize = 99
279284 SizePriority = 2
280285 Title.Caption = 'Command'
281- Width = 508
286+ Width = 339
282287 FieldName = 'command'
283288 end
284289 item
@@ -312,7 +317,7 @@ object fmMain: TfmMain
312317 MinSize = 9
313318 MaxSize = 201
314319 Title.Caption = 'Connection String'
315- Width = 509
320+ Width = 339
316321 FieldName = 'connect_string'
317322 end>
318323 DataSource = dmPgEngine.dsTasks
Original file line number Diff line number Diff line change @@ -251,7 +251,7 @@ procedure TfmMain.acChainToolbarUpdate(Sender: TObject);
251251 acChainRefresh.Enabled := CanModify;
252252 tsChain.TabVisible := acChainDelete.Enabled;
253253 if acChainDelete.Enabled then
254- tsChain.Caption := ' Chain: ' + dmPgEngine.qryChains.FieldValues[ ' chain_name' ] ;
254+ tsChain.Caption := ' Chain: ' + dmPgEngine.qryChains.FieldByName( ' chain_name' ).AsString ;
255255end ;
256256
257257procedure TfmMain.acMoveTaskDownExecute (Sender: TObject);
@@ -351,6 +351,7 @@ procedure TfmMain.acTaskRefreshExecute(Sender: TObject);
351351procedure TfmMain.acTaskToolbarUpdate (Sender: TObject);
352352var
353353 CanModify: boolean;
354+ F: TField;
354355begin
355356 CanModify := dmPgEngine.IsConnected() and dmPgEngine.qryTasks.CanModify;
356357 acTaskAdd.Enabled := CanModify;
@@ -361,6 +362,15 @@ procedure TfmMain.acTaskToolbarUpdate(Sender: TObject);
361362 acTaskPost.Enabled := CanModify and (dmPgEngine.qryTasks.State in dsEditModes);
362363 acTaskCancel.Enabled := CanModify and (dmPgEngine.qryTasks.State in dsEditModes);
363364 acTaskRefresh.Enabled := CanModify;
365+ tsTask.TabVisible := acTaskEdit.Enabled;
366+ if tsTask.TabVisible then
367+ begin
368+ F := dmPgEngine.qryTasks.FieldByName(' task_name' );
369+ if not F.IsNull then
370+ tsTask.Caption := ' Task: ' + F.AsString
371+ else
372+ tsTask.Caption := ' Task: ' + LeftStr(dmPgEngine.qryTasks.FieldByName(' command' ).AsString, 50 );
373+ end ;
364374end ;
365375
366376procedure TfmMain.acConnectClick (Sender: TObject);
Original file line number Diff line number Diff line change @@ -123,6 +123,7 @@ object dmPgEngine: TdmPgEngine
123123 Transaction = transChains
124124 SQL.Strings = (
125125 'WITH RECURSIVE x ('
126+ ' task_name,'
126127 ' parent_id,'
127128 ' task_id,'
128129 ' command,'
@@ -133,6 +134,7 @@ object dmPgEngine: TdmPgEngine
133134 ' connect_string'
134135 ') AS ('
135136 ' SELECT'
137+ ' tc.task_name,'
136138 ' NULL::bigint,'
137139 ' tc.task_id,'
138140 ' tc.command,'
@@ -148,6 +150,7 @@ object dmPgEngine: TdmPgEngine
148150 ' AND tc.task_id = :"task_id"'
149151 ' UNION ALL'
150152 ' SELECT'
153+ ' tc.task_name,'
151154 ' tc.parent_id,'
152155 ' tc.task_id,'
153156 ' tc.command,'
@@ -166,6 +169,7 @@ object dmPgEngine: TdmPgEngine
166169 )
167170 InsertSQL.Strings = (
168171 'INSERT INTO timetable.task('
172+ ' task_name,'
169173 ' parent_id,'
170174 ' command,'
171175 ' kind,'
@@ -174,6 +178,7 @@ object dmPgEngine: TdmPgEngine
174178 ' autonomous,'
175179 ' database_connection'
176180 ') VALUES ('
181+ ' :"task_name",'
177182 ' :"parent_id",'
178183 ' :"command",'
179184 ' :"kind",'
@@ -185,13 +190,15 @@ object dmPgEngine: TdmPgEngine
185190 )
186191 UpdateSQL.Strings = (
187192 'UPDATE timetable.task SET ('
193+ ' task_name,'
188194 ' command,'
189195 ' kind,'
190196 ' run_as,'
191197 ' ignore_error,'
192198 ' autonomous,'
193199 ' database_connection'
194200 ' ) = ('
201+ ' :"task_name",'
195202 ' :"command",'
196203 ' :"kind",'
197204 ' :"run_as",'
You can’t perform that action at this time.
0 commit comments