diff --git a/src/iLoan.Rules.Web/Components/Pages/AddCoreRuleCriterion.razor b/src/iLoan.Rules.Web/Components/Pages/AddCoreRuleCriterion.razor
index 1fd1fab..5f51c37 100644
--- a/src/iLoan.Rules.Web/Components/Pages/AddCoreRuleCriterion.razor
+++ b/src/iLoan.Rules.Web/Components/Pages/AddCoreRuleCriterion.razor
@@ -20,8 +20,9 @@
+
diff --git a/src/iLoan.Rules.Web/Components/Pages/CoreRules.razor b/src/iLoan.Rules.Web/Components/Pages/CoreRules.razor
index 5b08be6..31471a5 100644
--- a/src/iLoan.Rules.Web/Components/Pages/CoreRules.razor
+++ b/src/iLoan.Rules.Web/Components/Pages/CoreRules.razor
@@ -4,146 +4,135 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- GridDeleteButtonClick(args, coreRule)) @onclick:stopPropagation="true" />
-
-
-
-
+
+
+
+
+
-
+
- CoreRuleCriteriaAddButtonClick(args, coreRuleChild))/>
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CoreRuleCriteriaDeleteButtonClick(args, coreRuleCriterionChild)) @onclick:stopPropagation="true" />
-
-
-
+
+
+
+
+
+ @(coreRuleCriterionChild.Property + " " + coreRuleCriterionChild.Comparison + " " + coreRuleCriterionChild.Value)
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- CoreRuleCriteriaOperatorsAddButtonClick(args,coreRuleChild)) />
+
-
-
-
-
-
-
-
-
-
-
-
- CoreRuleCriteriaOperatorsDeleteButtonClick(args, coreRuleCriteriaOperatorChild)) @onclick:stopPropagation="true" />
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/iLoan.Rules.Web/Components/Pages/EditCoreRuleCriterion.razor b/src/iLoan.Rules.Web/Components/Pages/EditCoreRuleCriterion.razor
index 504cdfe..97cd684 100644
--- a/src/iLoan.Rules.Web/Components/Pages/EditCoreRuleCriterion.razor
+++ b/src/iLoan.Rules.Web/Components/Pages/EditCoreRuleCriterion.razor
@@ -22,6 +22,7 @@
+
diff --git a/src/iLoan.Rules.Web/Services/RuleFileGeneratorService.cs b/src/iLoan.Rules.Web/Services/RuleFileGeneratorService.cs
index 9946003..30849a3 100644
--- a/src/iLoan.Rules.Web/Services/RuleFileGeneratorService.cs
+++ b/src/iLoan.Rules.Web/Services/RuleFileGeneratorService.cs
@@ -2,20 +2,11 @@
namespace ILoan.Rules.Web.Services;
-public class RuleFileGeneratorService
+public class RuleFileGeneratorService(RulesContext context, IConfiguration configuration)
{
- private readonly RulesContext _context;
- private readonly int _startRuleId;
- private int _startSeq;
- private readonly string _root;
-
- public RuleFileGeneratorService(RulesContext context, IConfiguration configuration)
- {
- _context = context;
- _startRuleId = configuration.GetValue("Parameters:StartRuleId");
- _startSeq = configuration.GetValue("Parameters:StartSeqNo");
- _root = configuration.GetValue("Parameters:GeneratorRoot");
- }
+ private readonly int _startRuleId = configuration.GetValue("Parameters:StartRuleId");
+ private int _startSeq = configuration.GetValue("Parameters:StartSeqNo");
+ private readonly string _root = configuration.GetValue("Parameters:GeneratorRoot");
public async Task GenerateRuleFilesAsync()
{
@@ -25,13 +16,13 @@ public class RuleFileGeneratorService
if (!Directory.Exists(_root)) Directory.CreateDirectory(_root);
}
- var rules = await _context.CoreRules
- .Include(r => r.CoreRuleCriteria)
- .Include(r => r.CoreRuleCriteriaOperators)
- .Where(rule => rule.ID >= _startRuleId)
- .ToListAsync();
+ var rules = await context.CoreRules
+ .Include(r => r.CoreRuleCriteria)
+ .Include(r => r.CoreRuleCriteriaOperators)
+ .Where(rule => rule.ID >= _startRuleId)
+ .ToListAsync();
- foreach (var rule in rules.OrderBy(x => x.ID))
+ foreach (var rule in rules.Where(r => r.ID is >= 511 and <= 513).OrderBy(x => x.ID))
{
var fileName = $"V2.{_startSeq:000}__{rule.WorkItemId}_Rules_{rule.ID}_{rule.Title}.sql";
@@ -90,7 +81,7 @@ INSERT INTO core.""Core_RuleCriteria"" (
sqlBuilder.AppendLine($@"
INSERT INTO core.""Core_RuleCriteriaOperator"" (
""ID"", ""RuleID"", ""Operator""
-) OVERRIDING SYSTEM VALUE (
+) OVERRIDING SYSTEM VALUE VALUES (
{coreRuleCriteriaOperator.ID}, {coreRuleCriteriaOperator.RuleID}, '{EscapeSingleQuote(coreRuleCriteriaOperator.Operator1)}'
);
");
diff --git a/src/iLoan.Rules.Web/Services/RulesService.cs b/src/iLoan.Rules.Web/Services/RulesService.cs
index f218c54..948d945 100644
--- a/src/iLoan.Rules.Web/Services/RulesService.cs
+++ b/src/iLoan.Rules.Web/Services/RulesService.cs
@@ -193,7 +193,7 @@ public partial class RulesService(IDbContextFactory factory, Navig
public async Task> GetCoreRules(Query query = null)
{
var context = await factory.CreateDbContextAsync();
- var items = context.CoreRules.AsQueryable();
+ var items = context.CoreRules.OrderBy(r=>r.ID).AsQueryable();
if (query != null)
diff --git a/src/iLoan.Rules.Web/appsettings.json b/src/iLoan.Rules.Web/appsettings.json
index 5d086b7..c217931 100644
--- a/src/iLoan.Rules.Web/appsettings.json
+++ b/src/iLoan.Rules.Web/appsettings.json
@@ -18,7 +18,7 @@
},
"Parameters": {
"GeneratorRoot": "C:\\iloan\\iloan-base-dev\\migrations",
- "StartSeqNo": 117,
+ "StartSeqNo": 137,
"StartRuleId": 480
}
}
\ No newline at end of file