Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions web/Areas/CTS/Controllers/CourseController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -224,18 +224,14 @@ public async Task<ActionResult<List<SessionCompetencyDto>>> AddSessionCompetency
return checkResult;
}

foreach (var levelId in sessionComp.LevelIds)
{
var newSessionComp = new SessionCompetency()
{
CompetencyId = sessionComp.CompetencyId,
SessionId = sessionComp.SessionId,
LevelId = levelId,
RoleId = sessionComp.RoleId,
Order = sessionComp.Order ?? 0
};
context.Add(newSessionComp);
}
context.AddRange(sessionComp.LevelIds.Select(levelId => new SessionCompetency()
{
CompetencyId = sessionComp.CompetencyId,
SessionId = sessionComp.SessionId,
LevelId = levelId,
RoleId = sessionComp.RoleId,
Order = sessionComp.Order ?? 0
}));
await context.SaveChangesAsync();

var sessionComps = await context.SessionCompetencies
Expand Down Expand Up @@ -270,18 +266,14 @@ public async Task<ActionResult<List<SessionCompetencyDto>>> UpdateSessionCompete
{
context.Remove(r);
}
foreach (var l in toAdd)
context.AddRange(toAdd.Select(l => new SessionCompetency()
{
var newSessionComp = new SessionCompetency()
{
CompetencyId = sessionComp.CompetencyId,
SessionId = sessionComp.SessionId,
LevelId = l,
RoleId = sessionComp.RoleId,
Order = sessionComp.Order ?? 0
};
context.Add(newSessionComp);
}
CompetencyId = sessionComp.CompetencyId,
SessionId = sessionComp.SessionId,
LevelId = l,
RoleId = sessionComp.RoleId,
Order = sessionComp.Order ?? 0
}));
await context.SaveChangesAsync();
await trans.CommitAsync();
}
Expand Down
10 changes: 6 additions & 4 deletions web/Areas/Directory/Models/IndividualSearchResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ public void LookupEmailHost(Classes.SQLContext.AAUDContext context)
// Sanitize MailId to prevent SQL injection in OPENQUERY (which doesn't support parameters)
var safeMailId = MailId.Replace("'", "''");
var query = $"SELECT * FROM OPENQUERY(UCDMothra,'SELECT (USERPART || ''@'' || HOSTPART) AS USERATHOST FROM MOTHRA.MAILIDS WHERE MAILID = ''{safeMailId}'' AND MAILSTATUS = ''A'' AND MAILTYPE = ''P''')";
var results = context.Database.SqlQueryRaw<string>(query).ToList();
foreach (var r in results)
var hosts = context.Database.SqlQueryRaw<string>(query)
.AsEnumerable()
.Select(r => r.Split("@")[^1])
.ToList();
if (hosts.Count > 0)
{
var parts = r.Split("@");
EmailHost = parts[^1];
EmailHost = hosts[^1];
}
}
}
Expand Down
Loading