This commit is contained in:
parent
322d4218bc
commit
549bbfcf52
2 changed files with 11 additions and 0 deletions
|
|
@ -82,6 +82,15 @@ namespace BMA.EHR.Application.Repositories.Reports
|
||||||
: (Regex.Replace(x.description, "<.*?>", string.Empty)).Replace(" ", " ").ToString().ToThaiNumber(),
|
: (Regex.Replace(x.description, "<.*?>", string.Empty)).Replace(" ", " ").ToString().ToThaiNumber(),
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
|
var competencyGroups = probation_assign.result.competency_groups.Select(x => new
|
||||||
|
{
|
||||||
|
name = string.IsNullOrEmpty(x.name) ? string.Empty : x.name.ToThaiNumber(),
|
||||||
|
level = string.IsNullOrEmpty(x.level) ? string.Empty : x.level.ToThaiNumber(),
|
||||||
|
description = string.IsNullOrEmpty(x.description)
|
||||||
|
? string.Empty
|
||||||
|
: (Regex.Replace(x.description, "<.*?>", string.Empty)).Replace(" ", " ").ToString().ToThaiNumber(),
|
||||||
|
}).ToList();
|
||||||
|
|
||||||
var outputs = probation_assign.result.outputs.Select(x => new
|
var outputs = probation_assign.result.outputs.Select(x => new
|
||||||
{
|
{
|
||||||
id = string.IsNullOrEmpty(x.id.ToString()) ? string.Empty : x.id.ToString().ToThaiNumber(),
|
id = string.IsNullOrEmpty(x.id.ToString()) ? string.Empty : x.id.ToString().ToThaiNumber(),
|
||||||
|
|
@ -126,6 +135,7 @@ namespace BMA.EHR.Application.Repositories.Reports
|
||||||
Jobs = jobs,
|
Jobs = jobs,
|
||||||
Knowledges = knowledges,
|
Knowledges = knowledges,
|
||||||
Competencys = competencys,
|
Competencys = competencys,
|
||||||
|
CompetencyGroups = competencyGroups,
|
||||||
Outputs = outputs,
|
Outputs = outputs,
|
||||||
Skills = skills,
|
Skills = skills,
|
||||||
Laws = laws,
|
Laws = laws,
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
public List<Job> jobs { get; set; }
|
public List<Job> jobs { get; set; }
|
||||||
public List<Knowledge> knowledges { get; set; }
|
public List<Knowledge> knowledges { get; set; }
|
||||||
public List<Competency> competencys { get; set; }
|
public List<Competency> competencys { get; set; }
|
||||||
|
public List<Competency> competency_groups { get; set; }
|
||||||
public List<Output> outputs { get; set; }
|
public List<Output> outputs { get; set; }
|
||||||
public List<Law> laws { get; set; }
|
public List<Law> laws { get; set; }
|
||||||
public List<Skill> skills { get; set; }
|
public List<Skill> skills { get; set; }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue