fergalmoran/SilkierQuartz
1
0
Fork 0
mirror of https://github.com/fergalmoran/SilkierQuartz.git synced 2025-12-22 09:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145 from wuuer/mydev

Browse Source 
更新
This commit is contained in:
MysticBoy
2023-04-04 11:54:00 +08:00
committed by GitHub
parent 8fc189a811 0f6172ce4b
commit 8c26891f99
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SilkierQuartz/Controllers/JobsController.cs
View File

@@ -118,6 +118,9 @@ namespace SilkierQuartz.Controllers
jobModel.Description = job.Description;
jobModel.Recovery = job.RequestsRecovery;
jobModel.Concurrent = !job.ConcurrentExecutionDisallowed;
jobModel.Persist = job.PersistJobDataAfterExecution;
jobModel.Durable = job.Durable;
if (clone)
jobModel.JobName += " - Copy";
@@ -158,6 +161,9 @@ namespace SilkierQuartz.Controllers
.WithDescription(jobModel.Description)
.SetJobData(jobDataMap.GetQuartzJobDataMap())
.RequestRecovery(jobModel.Recovery)
.StoreDurably(jobModel.Durable)
.DisallowConcurrentExecution(jobModel.Concurrent)
.PersistJobDataAfterExecution(jobModel.Persist)
.Build();
}

7
src/SilkierQuartz/Models/JobViewModel.cs
View File

@@ -37,6 +37,13 @@ namespace SilkierQuartz.Models
public string Description { get; set; }
public bool Recovery { get; set; }
public bool Concurrent { get; set; }
public bool Durable { get; set; }
public bool Persist { get; set; }
public void Validate(ICollection<ValidationError> errors) => ModelValidator.ValidateObject(this, errors, nameof(JobViewModel.Job));
}

2
src/SilkierQuartz/SilkierQuartz.csproj
View File

@@ -68,7 +68,7 @@
<ItemGroup>
<PackageReference Include="Handlebars.Net" Version="1.11.5" />
<PackageReference Include="JsonSubTypes" Version="1.8.0" />
<PackageReference Include="Quartz" Version="3.3.3" />
<PackageReference Include="Quartz" Version="3.6.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6'">

31
src/SilkierQuartz/Views/Jobs/Edit.hbs
View File

@@ -60,18 +60,37 @@
{{>DropdownOptions items=TypeList selected=Type}}
</select>
</div>
<div class="field accept-error">
<label>Description</label>
<textarea rows="2" name="job[description]">{{Description}}</textarea>
</div>
<div class="field accept-error">
<div class="ui checkbox">
<input name="job[recovery]" type="checkbox" value="True" {{Checked Recovery}} />
<label>Requests Recovery</label>
<div class="two fields">
<div class="field accept-error">
<div class="ui checkbox">
<input name="job[durable]" type="checkbox" value="True" {{Checked durable}} />
<label>Durable</label>
</div>
</div>
<div class="field accept-error">
<div class="ui checkbox">
<input name="job[recovery]" type="checkbox" value="True" {{Checked Recovery}} />
<label>Requests Recovery</label>
</div>
</div>
<div class="field accept-error">
<div class="ui checkbox">
<input name="job[concurrent]" type="checkbox" value="True" {{Checked concurrent}} />
<label>Concurrent</label>
</div>
</div>
<div class="field accept-error">
<div class="ui checkbox">
<input name="job[persist]" type="checkbox" value="True" {{Checked persist}} />
<label>Persist</label>
</div>
</div>
</div>
</div>
{{/with}}
<h3 class="ui dividing header">Job Data Map</h3>