From 6713ec6cf0446c0b504956f45af1680940e36349 Mon Sep 17 00:00:00 2001 From: kittapath Date: Mon, 4 Nov 2024 18:00:35 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20response=20probat?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CommandRepository.cs | 4 +- .../Reports/ProbationReportRepository.cs | 956 +++++++++--------- .../Responses/EvaluateAssignResponse.cs | 2 +- .../EvaluateChairmanAssignResponse.cs | 2 +- .../Responses/EvaluateRecordAssignResponse.cs | 2 +- .../Responses/EvaluateResultAssignResponse.cs | 2 +- .../Responses/PassProbationResponse.cs | 2 +- .../Responses/ProbationAssignResponse.cs | 2 +- .../Controllers/PlacementOfficerController.cs | 127 +-- 9 files changed, 539 insertions(+), 560 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index 176037cf..c8d51fca 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -927,7 +927,7 @@ namespace BMA.EHR.Application.Repositories.Commands response = JsonConvert.DeserializeObject(result); var seq = 1; - foreach (var d in response!.data) + foreach (var d in response!.result) { var _baseAPI = _configuration["API"]; var _apiUrl = $"{_baseAPI}/org/profile/profileid/position/{d.person.id}"; @@ -994,7 +994,7 @@ namespace BMA.EHR.Application.Repositories.Commands response = JsonConvert.DeserializeObject(result); var seq = 1; - foreach (var d in response!.data) + foreach (var d in response!.result) { var _baseAPI = _configuration["API"]; var _apiUrl = $"{_baseAPI}/org/profile/profileid/position/{d.person.id}"; diff --git a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs index 4871892a..c4f3fe8c 100644 --- a/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs @@ -57,23 +57,23 @@ namespace BMA.EHR.Application.Repositories.Reports var result = await res.Content.ReadAsStringAsync(); probation_assign = JsonConvert.DeserializeObject(result); - if (probation_assign.data != null) + if (probation_assign.result != null) { - var jobs = probation_assign.data.jobs.Select(x => new + var jobs = probation_assign.result.jobs.Select(x => new { id = string.IsNullOrEmpty(x.id.ToString()) ? string.Empty : x.id.ToString().ToThaiNumber(), activity_desc = string.IsNullOrEmpty(x.activity_desc) ? string.Empty : x.activity_desc.ToThaiNumber(), goal_desc = string.IsNullOrEmpty(x.goal_desc) ? string.Empty : x.goal_desc.ToThaiNumber(), }).ToList(); - var knowledges = probation_assign.data.knowledges.Select(x => new + var knowledges = probation_assign.result.knowledges.Select(x => new { id = string.IsNullOrEmpty(x.id.ToString()) ? string.Empty : x.id.ToString().ToThaiNumber(), title = string.IsNullOrEmpty(x.title) ? string.Empty : x.title.ToThaiNumber(), description = string.IsNullOrEmpty(x.description) ? string.Empty : x.description.ToThaiNumber(), }).ToList(); - var competencys = probation_assign.data.competencys.Select(x => new + var competencys = probation_assign.result.competencys.Select(x => new { name = string.IsNullOrEmpty(x.name) ? string.Empty : x.name.ToThaiNumber(), level = string.IsNullOrEmpty(x.level) ? string.Empty : x.level.ToThaiNumber(), @@ -82,7 +82,7 @@ namespace BMA.EHR.Application.Repositories.Reports : (Regex.Replace(x.description, "<.*?>", string.Empty)).Replace(" ", " ").ToString().ToThaiNumber(), }).ToList(); - var outputs = probation_assign.data.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(), indicator_desc = string.IsNullOrEmpty(x.indicator_desc) ? string.Empty : x.indicator_desc.ToThaiNumber(), @@ -92,30 +92,30 @@ namespace BMA.EHR.Application.Repositories.Reports return new { - Name = string.IsNullOrEmpty(probation_assign.data.profile.name) ? "-" : probation_assign.data.profile.name, - Position = string.IsNullOrEmpty(probation_assign.data.profile.Position) ? "-" : probation_assign.data.profile.Position, - Department = string.IsNullOrEmpty(probation_assign.data.profile.Department) ? "-" : probation_assign.data.profile.Department, - OrganizationOrganization = string.IsNullOrEmpty(probation_assign.data.profile.OrganizationOrganization) ? "-" : probation_assign.data.profile.OrganizationOrganization, - Oc = string.IsNullOrEmpty(probation_assign.data.profile.Oc) ? "-" : probation_assign.data.profile.Oc, - DateStart = string.IsNullOrEmpty(probation_assign.data.assign.date_start.ToString()) ? "-" : probation_assign.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - DateFinish = string.IsNullOrEmpty(probation_assign.data.assign.date_finish.ToString()) ? "-" : probation_assign.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), - NameMentor1 = probation_assign.data.mentors.Count > 0 ? probation_assign.data.mentors[0].name : "-", - DateMentor1 = probation_assign.data.mentors.Count > 0 ? probation_assign.data.mentors[0].dated.ToThaiFullDate().ToString().ToThaiNumber() : "-", - PositionMentor1 = probation_assign.data.mentors.Count > 0 ? probation_assign.data.mentors[0].Position : "-", - NameMentor2 = probation_assign.data.mentors.Count > 1 ? probation_assign.data.mentors[1].name : "-", - DateMentor2 = probation_assign.data.mentors.Count > 1 ? probation_assign.data.mentors[1].dated.ToThaiFullDate().ToString().ToThaiNumber() : "-", - PositionMentor2 = probation_assign.data.mentors.Count > 1 ? probation_assign.data.mentors[1].Position : "-", - NameCommander = string.IsNullOrEmpty(probation_assign.data.commander.name) ? "-" : probation_assign.data.commander.name, - DateCommander = string.IsNullOrEmpty(probation_assign.data.commander.dated.ToString()) ? "-" : probation_assign.data.commander.dated.ToThaiFullDate().ToString().ToThaiNumber(), - PositionCommander = string.IsNullOrEmpty(probation_assign.data.commander.Position) ? "-" : probation_assign.data.commander.Position, + Name = string.IsNullOrEmpty(probation_assign.result.profile.name) ? "-" : probation_assign.result.profile.name, + Position = string.IsNullOrEmpty(probation_assign.result.profile.Position) ? "-" : probation_assign.result.profile.Position, + Department = string.IsNullOrEmpty(probation_assign.result.profile.Department) ? "-" : probation_assign.result.profile.Department, + OrganizationOrganization = string.IsNullOrEmpty(probation_assign.result.profile.OrganizationOrganization) ? "-" : probation_assign.result.profile.OrganizationOrganization, + Oc = string.IsNullOrEmpty(probation_assign.result.profile.Oc) ? "-" : probation_assign.result.profile.Oc, + DateStart = string.IsNullOrEmpty(probation_assign.result.assign.date_start.ToString()) ? "-" : probation_assign.result.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(probation_assign.result.assign.date_finish.ToString()) ? "-" : probation_assign.result.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + NameMentor1 = probation_assign.result.mentors.Count > 0 ? probation_assign.result.mentors[0].name : "-", + DateMentor1 = probation_assign.result.mentors.Count > 0 ? probation_assign.result.mentors[0].dated.ToThaiFullDate().ToString().ToThaiNumber() : "-", + PositionMentor1 = probation_assign.result.mentors.Count > 0 ? probation_assign.result.mentors[0].Position : "-", + NameMentor2 = probation_assign.result.mentors.Count > 1 ? probation_assign.result.mentors[1].name : "-", + DateMentor2 = probation_assign.result.mentors.Count > 1 ? probation_assign.result.mentors[1].dated.ToThaiFullDate().ToString().ToThaiNumber() : "-", + PositionMentor2 = probation_assign.result.mentors.Count > 1 ? probation_assign.result.mentors[1].Position : "-", + NameCommander = string.IsNullOrEmpty(probation_assign.result.commander.name) ? "-" : probation_assign.result.commander.name, + DateCommander = string.IsNullOrEmpty(probation_assign.result.commander.dated.ToString()) ? "-" : probation_assign.result.commander.dated.ToThaiFullDate().ToString().ToThaiNumber(), + PositionCommander = string.IsNullOrEmpty(probation_assign.result.commander.Position) ? "-" : probation_assign.result.commander.Position, Jobs = jobs, Knowledges = knowledges, Competencys = competencys, Outputs = outputs, - OtherDesc = string.IsNullOrEmpty(probation_assign.data.assign.other_desc) ? "-" : probation_assign.data.assign.other_desc, - Other4Desc = string.IsNullOrEmpty(probation_assign.data.assign.other4_desc) ? "-" : probation_assign.data.assign.other4_desc, - Other5No1Desc = string.IsNullOrEmpty(probation_assign.data.assign.other5_no1_desc) ? "-" : probation_assign.data.assign.other5_no1_desc, - Other5No2Desc = string.IsNullOrEmpty(probation_assign.data.assign.other5_no2_desc) ? "-" : probation_assign.data.assign.other5_no2_desc, + OtherDesc = string.IsNullOrEmpty(probation_assign.result.assign.other_desc) ? "-" : probation_assign.result.assign.other_desc, + Other4Desc = string.IsNullOrEmpty(probation_assign.result.assign.other4_desc) ? "-" : probation_assign.result.assign.other4_desc, + Other5No1Desc = string.IsNullOrEmpty(probation_assign.result.assign.other5_no1_desc) ? "-" : probation_assign.result.assign.other5_no1_desc, + Other5No2Desc = string.IsNullOrEmpty(probation_assign.result.assign.other5_no2_desc) ? "-" : probation_assign.result.assign.other5_no2_desc, }; } else @@ -140,254 +140,254 @@ namespace BMA.EHR.Application.Repositories.Reports var result = await res.Content.ReadAsStringAsync(); evaluate_record = JsonConvert.DeserializeObject(result); - if (evaluate_record.data != null) + if (evaluate_record.result != null) { - var orientation = evaluate_record.data.evaluate.orientation == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var self_learning = evaluate_record.data.evaluate.self_learning == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var training_seminar = evaluate_record.data.evaluate.training_seminar == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var other_training = evaluate_record.data.evaluate.other_training == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var orientation = evaluate_record.result.evaluate.orientation == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var self_learning = evaluate_record.result.evaluate.self_learning == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var training_seminar = evaluate_record.result.evaluate.training_seminar == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var other_training = evaluate_record.result.evaluate.other_training == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var expects = evaluate_record.data.evaluate != null && evaluate_record.data.evaluate.achievements.Count > 0 + var expects = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0 ? new { - col1 = evaluate_record.data.evaluate.achievements[0].evaluate_expect_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.achievements[0].evaluate_expect_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.achievements[0].evaluate_expect_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.achievements[0].evaluate_expect_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.achievements[0].evaluate_expect_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.achievements[0].evaluate_expect_level.col5 == "/" ? "✓" : string.Empty, } : null; - var outputs = evaluate_record.data.evaluate != null && evaluate_record.data.evaluate.achievements.Count > 0 + var outputs = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0 ? new { - col1 = evaluate_record.data.evaluate.achievements[0].evaluate_output_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.achievements[0].evaluate_output_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.achievements[0].evaluate_output_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.achievements[0].evaluate_output_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.achievements[0].evaluate_output_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.achievements[0].evaluate_output_level.col5 == "/" ? "✓" : string.Empty, } : null; - var knows = evaluate_record.data.evaluate != null + var knows = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.knowledge_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.knowledge_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.knowledge_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.knowledge_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.knowledge_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.knowledge_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.knowledge_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.knowledge_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.knowledge_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.knowledge_level.col5 == "/" ? "✓" : string.Empty, } : null; - var skills = evaluate_record.data.evaluate != null + var skills = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.skill_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.skill_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.skill_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.skill_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.skill_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.skill_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.skill_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.skill_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.skill_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.skill_level.col5 == "/" ? "✓" : string.Empty, } : null; - var competencys = evaluate_record.data.evaluate != null + var competencys = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.competency_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.competency_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.competency_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.competency_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.competency_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.competency_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.competency_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.competency_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.competency_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.competency_level.col5 == "/" ? "✓" : string.Empty, } : null; - var learns = evaluate_record.data.evaluate != null + var learns = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.learn_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.learn_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.learn_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.learn_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.learn_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.learn_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.learn_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.learn_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.learn_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.learn_level.col5 == "/" ? "✓" : string.Empty, } : null; - var applys = evaluate_record.data.evaluate != null + var applys = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.apply_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.apply_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.apply_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.apply_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.apply_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.apply_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.apply_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.apply_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.apply_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.apply_level.col5 == "/" ? "✓" : string.Empty, } : null; - var achievementOthers = evaluate_record.data.evaluate != null + var achievementOthers = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.achievement_other_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.achievement_other_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.achievement_other_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.achievement_other_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.achievement_other_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.achievement_other_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.achievement_other_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.achievement_other_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.achievement_other_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.achievement_other_level.col5 == "/" ? "✓" : string.Empty, } : null; - var conducts1 = evaluate_record.data.evaluate != null + var conducts1 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.conduct1_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.conduct1_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.conduct1_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.conduct1_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.conduct1_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.conduct1_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.conduct1_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.conduct1_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.conduct1_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.conduct1_level.col5 == "/" ? "✓" : string.Empty, } : null; - var conducts2 = evaluate_record.data.evaluate != null + var conducts2 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.conduct2_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.conduct2_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.conduct2_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.conduct2_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.conduct2_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.conduct2_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.conduct2_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.conduct2_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.conduct2_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.conduct2_level.col5 == "/" ? "✓" : string.Empty, } : null; - var conducts3 = evaluate_record.data.evaluate != null + var conducts3 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.conduct3_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.conduct3_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.conduct3_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.conduct3_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.conduct3_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.conduct3_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.conduct3_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.conduct3_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.conduct3_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.conduct3_level.col5 == "/" ? "✓" : string.Empty, } : null; - var conducts4 = evaluate_record.data.evaluate != null + var conducts4 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.conduct4_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.conduct4_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.conduct4_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.conduct4_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.conduct4_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.conduct4_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.conduct4_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.conduct4_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.conduct4_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.conduct4_level.col5 == "/" ? "✓" : string.Empty, } : null; - var morals1 = evaluate_record.data.evaluate != null + var morals1 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.moral1_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.moral1_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.moral1_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.moral1_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.moral1_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.moral1_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.moral1_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.moral1_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.moral1_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.moral1_level.col5 == "/" ? "✓" : string.Empty, } : null; - var morals2 = evaluate_record.data.evaluate != null + var morals2 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.moral2_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.moral2_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.moral2_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.moral2_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.moral2_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.moral2_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.moral2_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.moral2_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.moral2_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.moral2_level.col5 == "/" ? "✓" : string.Empty, } : null; - var morals3 = evaluate_record.data.evaluate != null + var morals3 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.moral3_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.moral3_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.moral3_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.moral3_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.moral3_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.moral3_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.moral3_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.moral3_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.moral3_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.moral3_level.col5 == "/" ? "✓" : string.Empty, } : null; - var disciplines1 = evaluate_record.data.evaluate != null + var disciplines1 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.discipline1_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.discipline1_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.discipline1_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.discipline1_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.discipline1_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.discipline1_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.discipline1_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.discipline1_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.discipline1_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.discipline1_level.col5 == "/" ? "✓" : string.Empty, } : null; - var disciplines2 = evaluate_record.data.evaluate != null + var disciplines2 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.discipline2_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.discipline2_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.discipline2_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.discipline2_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.discipline2_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.discipline2_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.discipline2_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.discipline2_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.discipline2_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.discipline2_level.col5 == "/" ? "✓" : string.Empty, } : null; - var disciplines3 = evaluate_record.data.evaluate != null + var disciplines3 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.discipline3_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.discipline3_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.discipline3_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.discipline3_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.discipline3_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.discipline3_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.discipline3_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.discipline3_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.discipline3_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.discipline3_level.col5 == "/" ? "✓" : string.Empty, } : null; - var disciplines4 = evaluate_record.data.evaluate != null + var disciplines4 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.discipline4_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.discipline4_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.discipline4_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.discipline4_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.discipline4_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.discipline4_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.discipline4_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.discipline4_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.discipline4_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.discipline4_level.col5 == "/" ? "✓" : string.Empty, } : null; - var disciplines5 = evaluate_record.data.evaluate != null + var disciplines5 = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.discipline5_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.discipline5_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.discipline5_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.discipline5_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.discipline5_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.discipline5_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.discipline5_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.discipline5_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.discipline5_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.discipline5_level.col5 == "/" ? "✓" : string.Empty, } : null; - var behaviorOthers = evaluate_record.data.evaluate != null + var behaviorOthers = evaluate_record.result.evaluate != null ? new { - col1 = evaluate_record.data.evaluate.behavior_other_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_record.data.evaluate.behavior_other_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_record.data.evaluate.behavior_other_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_record.data.evaluate.behavior_other_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_record.data.evaluate.behavior_other_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_record.result.evaluate.behavior_other_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_record.result.evaluate.behavior_other_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_record.result.evaluate.behavior_other_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_record.result.evaluate.behavior_other_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_record.result.evaluate.behavior_other_level.col5 == "/" ? "✓" : string.Empty, } : null; return new { - DirectorName = string.IsNullOrEmpty(evaluate_record.data.director.name) ? string.Empty : evaluate_record.data.director.name, - DirectorPosition = string.IsNullOrEmpty(evaluate_record.data.director.Position) ? string.Empty : evaluate_record.data.director.Position, - DirectorDated = string.IsNullOrEmpty(evaluate_record.data.evaluate.sign_dated.ToString()) ? "-" : evaluate_record.data.evaluate.sign_dated.ToThaiFullDate().ToString().ToThaiNumber(), - Name = string.IsNullOrEmpty(evaluate_record.data.experimentee.name) ? string.Empty : evaluate_record.data.experimentee.name, - Position = string.IsNullOrEmpty(evaluate_record.data.experimentee.Position) ? string.Empty : evaluate_record.data.experimentee.Position, - Department = string.IsNullOrEmpty(evaluate_record.data.experimentee.Department) ? string.Empty : evaluate_record.data.experimentee.Department, - Organization = string.IsNullOrEmpty(evaluate_record.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_record.data.experimentee.OrganizationOrganization, - Oc = string.IsNullOrEmpty(evaluate_record.data.experimentee.Oc) ? string.Empty : evaluate_record.data.experimentee.Oc, - DateStart = string.IsNullOrEmpty(evaluate_record.data.assign.date_start.ToString()) ? "-" : evaluate_record.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - DateFinish = string.IsNullOrEmpty(evaluate_record.data.assign.date_finish.ToString()) ? "-" : evaluate_record.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), - No = evaluate_record.data.evaluate.no = string.IsNullOrEmpty(evaluate_record.data.evaluate.no) ? string.Empty : evaluate_record.data.evaluate.no.ToThaiNumber(), - EvaluateDateStart = string.IsNullOrEmpty(evaluate_record.data.evaluate.date_start.ToString()) ? string.Empty : evaluate_record.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - EvaluateDateFinish = string.IsNullOrEmpty(evaluate_record.data.evaluate.date_finish.ToString()) ? string.Empty : evaluate_record.data.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), - Role = evaluate_record.data.evaluate.role == "mentor" ? "ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ" : "ผู้บังคับบัญชา", + DirectorName = string.IsNullOrEmpty(evaluate_record.result.director.name) ? string.Empty : evaluate_record.result.director.name, + DirectorPosition = string.IsNullOrEmpty(evaluate_record.result.director.Position) ? string.Empty : evaluate_record.result.director.Position, + DirectorDated = string.IsNullOrEmpty(evaluate_record.result.evaluate.sign_dated.ToString()) ? "-" : evaluate_record.result.evaluate.sign_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Name = string.IsNullOrEmpty(evaluate_record.result.experimentee.name) ? string.Empty : evaluate_record.result.experimentee.name, + Position = string.IsNullOrEmpty(evaluate_record.result.experimentee.Position) ? string.Empty : evaluate_record.result.experimentee.Position, + Department = string.IsNullOrEmpty(evaluate_record.result.experimentee.Department) ? string.Empty : evaluate_record.result.experimentee.Department, + Organization = string.IsNullOrEmpty(evaluate_record.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_record.result.experimentee.OrganizationOrganization, + Oc = string.IsNullOrEmpty(evaluate_record.result.experimentee.Oc) ? string.Empty : evaluate_record.result.experimentee.Oc, + DateStart = string.IsNullOrEmpty(evaluate_record.result.assign.date_start.ToString()) ? "-" : evaluate_record.result.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(evaluate_record.result.assign.date_finish.ToString()) ? "-" : evaluate_record.result.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + No = evaluate_record.result.evaluate.no = string.IsNullOrEmpty(evaluate_record.result.evaluate.no) ? string.Empty : evaluate_record.result.evaluate.no.ToThaiNumber(), + EvaluateDateStart = string.IsNullOrEmpty(evaluate_record.result.evaluate.date_start.ToString()) ? string.Empty : evaluate_record.result.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_record.result.evaluate.date_finish.ToString()) ? string.Empty : evaluate_record.result.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + Role = evaluate_record.result.evaluate.role == "mentor" ? "ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ" : "ผู้บังคับบัญชา", Expects = expects, - ExpectDesc = evaluate_record.data.evaluate != null && evaluate_record.data.evaluate.achievements.Count > 0 - ? evaluate_record.data.evaluate.achievements[0].evaluate_expect_desc + ExpectDesc = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0 + ? evaluate_record.result.evaluate.achievements[0].evaluate_expect_desc : string.Empty, Outputs = outputs, - OutputDesc = evaluate_record.data.evaluate != null && evaluate_record.data.evaluate.achievements.Count > 0 - ? evaluate_record.data.evaluate.achievements[0].evaluate_output_desc + OutputDesc = evaluate_record.result.evaluate != null && evaluate_record.result.evaluate.achievements.Count > 0 + ? evaluate_record.result.evaluate.achievements[0].evaluate_output_desc : string.Empty, - AchievementOtherDesc = evaluate_record.data.evaluate.achievement_other_desc, - AchievementStrengthDesc = evaluate_record.data.evaluate.achievement_strength_desc, - AchievementImproveDesc = evaluate_record.data.evaluate.achievement_improve_desc, - BehaviorOtherDesc = evaluate_record.data.evaluate.behavior_other_desc, - BehaviorStrengthDesc = evaluate_record.data.evaluate.behavior_strength_desc, - BehaviorImproveDesc = evaluate_record.data.evaluate.behavior_improve_desc, + AchievementOtherDesc = evaluate_record.result.evaluate.achievement_other_desc, + AchievementStrengthDesc = evaluate_record.result.evaluate.achievement_strength_desc, + AchievementImproveDesc = evaluate_record.result.evaluate.achievement_improve_desc, + BehaviorOtherDesc = evaluate_record.result.evaluate.behavior_other_desc, + BehaviorStrengthDesc = evaluate_record.result.evaluate.behavior_strength_desc, + BehaviorImproveDesc = evaluate_record.result.evaluate.behavior_improve_desc, Knows = knows, Skills = skills, Competencys = competencys, @@ -435,173 +435,173 @@ namespace BMA.EHR.Application.Repositories.Reports var result = await res.Content.ReadAsStringAsync(); evaluate_assign = JsonConvert.DeserializeObject(result); - if (evaluate_assign.data != null) + if (evaluate_assign.result != null) { var knows = new { - col1 = evaluate_assign.data.evaluate.knowledge_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.knowledge_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.knowledge_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.knowledge_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.knowledge_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.knowledge_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.knowledge_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.knowledge_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.knowledge_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.knowledge_level.col5 == "/" ? "✓" : string.Empty, }; var skills = new { - col1 = evaluate_assign.data.evaluate.skill_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.skill_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.skill_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.skill_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.skill_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.skill_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.skill_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.skill_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.skill_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.skill_level.col5 == "/" ? "✓" : string.Empty, }; var competencys = new { - col1 = evaluate_assign.data.evaluate.competency_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.competency_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.competency_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.competency_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.competency_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.competency_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.competency_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.competency_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.competency_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.competency_level.col5 == "/" ? "✓" : string.Empty, }; var learns = new { - col1 = evaluate_assign.data.evaluate.learn_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.learn_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.learn_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.learn_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.learn_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.learn_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.learn_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.learn_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.learn_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.learn_level.col5 == "/" ? "✓" : string.Empty, }; var applys = new { - col1 = evaluate_assign.data.evaluate.apply_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.apply_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.apply_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.apply_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.apply_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.apply_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.apply_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.apply_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.apply_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.apply_level.col5 == "/" ? "✓" : string.Empty, }; var success = new { - col1 = evaluate_assign.data.evaluate.success_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.success_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.success_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.success_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.success_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.success_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.success_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.success_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.success_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.success_level.col5 == "/" ? "✓" : string.Empty, }; var achievementOthers = new { - col1 = evaluate_assign.data.evaluate.achievement_other_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.achievement_other_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.achievement_other_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.achievement_other_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.achievement_other_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.achievement_other_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.achievement_other_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.achievement_other_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.achievement_other_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.achievement_other_level.col5 == "/" ? "✓" : string.Empty, }; var conducts = new { - col1_1 = evaluate_assign.data.evaluate.conduct1_level.col1 == "/" ? "✓" : string.Empty, - col2_1 = evaluate_assign.data.evaluate.conduct1_level.col2 == "/" ? "✓" : string.Empty, - col3_1 = evaluate_assign.data.evaluate.conduct1_level.col3 == "/" ? "✓" : string.Empty, - col4_1 = evaluate_assign.data.evaluate.conduct1_level.col4 == "/" ? "✓" : string.Empty, - col5_1 = evaluate_assign.data.evaluate.conduct1_level.col5 == "/" ? "✓" : string.Empty, + col1_1 = evaluate_assign.result.evaluate.conduct1_level.col1 == "/" ? "✓" : string.Empty, + col2_1 = evaluate_assign.result.evaluate.conduct1_level.col2 == "/" ? "✓" : string.Empty, + col3_1 = evaluate_assign.result.evaluate.conduct1_level.col3 == "/" ? "✓" : string.Empty, + col4_1 = evaluate_assign.result.evaluate.conduct1_level.col4 == "/" ? "✓" : string.Empty, + col5_1 = evaluate_assign.result.evaluate.conduct1_level.col5 == "/" ? "✓" : string.Empty, - col1_2 = evaluate_assign.data.evaluate.conduct2_level.col1 == "/" ? "✓" : string.Empty, - col2_2 = evaluate_assign.data.evaluate.conduct2_level.col2 == "/" ? "✓" : string.Empty, - col3_2 = evaluate_assign.data.evaluate.conduct2_level.col3 == "/" ? "✓" : string.Empty, - col4_2 = evaluate_assign.data.evaluate.conduct2_level.col4 == "/" ? "✓" : string.Empty, - col5_2 = evaluate_assign.data.evaluate.conduct2_level.col5 == "/" ? "✓" : string.Empty, + col1_2 = evaluate_assign.result.evaluate.conduct2_level.col1 == "/" ? "✓" : string.Empty, + col2_2 = evaluate_assign.result.evaluate.conduct2_level.col2 == "/" ? "✓" : string.Empty, + col3_2 = evaluate_assign.result.evaluate.conduct2_level.col3 == "/" ? "✓" : string.Empty, + col4_2 = evaluate_assign.result.evaluate.conduct2_level.col4 == "/" ? "✓" : string.Empty, + col5_2 = evaluate_assign.result.evaluate.conduct2_level.col5 == "/" ? "✓" : string.Empty, - col1_3 = evaluate_assign.data.evaluate.conduct3_level.col1 == "/" ? "✓" : string.Empty, - col2_3 = evaluate_assign.data.evaluate.conduct3_level.col2 == "/" ? "✓" : string.Empty, - col3_3 = evaluate_assign.data.evaluate.conduct3_level.col3 == "/" ? "✓" : string.Empty, - col4_3 = evaluate_assign.data.evaluate.conduct3_level.col4 == "/" ? "✓" : string.Empty, - col5_3 = evaluate_assign.data.evaluate.conduct3_level.col5 == "/" ? "✓" : string.Empty, + col1_3 = evaluate_assign.result.evaluate.conduct3_level.col1 == "/" ? "✓" : string.Empty, + col2_3 = evaluate_assign.result.evaluate.conduct3_level.col2 == "/" ? "✓" : string.Empty, + col3_3 = evaluate_assign.result.evaluate.conduct3_level.col3 == "/" ? "✓" : string.Empty, + col4_3 = evaluate_assign.result.evaluate.conduct3_level.col4 == "/" ? "✓" : string.Empty, + col5_3 = evaluate_assign.result.evaluate.conduct3_level.col5 == "/" ? "✓" : string.Empty, - col1_4 = evaluate_assign.data.evaluate.conduct4_level.col1 == "/" ? "✓" : string.Empty, - col2_4 = evaluate_assign.data.evaluate.conduct4_level.col2 == "/" ? "✓" : string.Empty, - col3_4 = evaluate_assign.data.evaluate.conduct4_level.col3 == "/" ? "✓" : string.Empty, - col4_4 = evaluate_assign.data.evaluate.conduct4_level.col4 == "/" ? "✓" : string.Empty, - col5_4 = evaluate_assign.data.evaluate.conduct4_level.col5 == "/" ? "✓" : string.Empty, + col1_4 = evaluate_assign.result.evaluate.conduct4_level.col1 == "/" ? "✓" : string.Empty, + col2_4 = evaluate_assign.result.evaluate.conduct4_level.col2 == "/" ? "✓" : string.Empty, + col3_4 = evaluate_assign.result.evaluate.conduct4_level.col3 == "/" ? "✓" : string.Empty, + col4_4 = evaluate_assign.result.evaluate.conduct4_level.col4 == "/" ? "✓" : string.Empty, + col5_4 = evaluate_assign.result.evaluate.conduct4_level.col5 == "/" ? "✓" : string.Empty, }; var morals = new { - col1_1 = evaluate_assign.data.evaluate.moral1_level.col1 == "/" ? "✓" : string.Empty, - col2_1 = evaluate_assign.data.evaluate.moral1_level.col2 == "/" ? "✓" : string.Empty, - col3_1 = evaluate_assign.data.evaluate.moral1_level.col3 == "/" ? "✓" : string.Empty, - col4_1 = evaluate_assign.data.evaluate.moral1_level.col4 == "/" ? "✓" : string.Empty, - col5_1 = evaluate_assign.data.evaluate.moral1_level.col5 == "/" ? "✓" : string.Empty, + col1_1 = evaluate_assign.result.evaluate.moral1_level.col1 == "/" ? "✓" : string.Empty, + col2_1 = evaluate_assign.result.evaluate.moral1_level.col2 == "/" ? "✓" : string.Empty, + col3_1 = evaluate_assign.result.evaluate.moral1_level.col3 == "/" ? "✓" : string.Empty, + col4_1 = evaluate_assign.result.evaluate.moral1_level.col4 == "/" ? "✓" : string.Empty, + col5_1 = evaluate_assign.result.evaluate.moral1_level.col5 == "/" ? "✓" : string.Empty, - col1_2 = evaluate_assign.data.evaluate.moral2_level.col1 == "/" ? "✓" : string.Empty, - col2_2 = evaluate_assign.data.evaluate.moral2_level.col2 == "/" ? "✓" : string.Empty, - col3_2 = evaluate_assign.data.evaluate.moral2_level.col3 == "/" ? "✓" : string.Empty, - col4_2 = evaluate_assign.data.evaluate.moral2_level.col4 == "/" ? "✓" : string.Empty, - col5_2 = evaluate_assign.data.evaluate.moral2_level.col5 == "/" ? "✓" : string.Empty, + col1_2 = evaluate_assign.result.evaluate.moral2_level.col1 == "/" ? "✓" : string.Empty, + col2_2 = evaluate_assign.result.evaluate.moral2_level.col2 == "/" ? "✓" : string.Empty, + col3_2 = evaluate_assign.result.evaluate.moral2_level.col3 == "/" ? "✓" : string.Empty, + col4_2 = evaluate_assign.result.evaluate.moral2_level.col4 == "/" ? "✓" : string.Empty, + col5_2 = evaluate_assign.result.evaluate.moral2_level.col5 == "/" ? "✓" : string.Empty, - col1_3 = evaluate_assign.data.evaluate.moral3_level.col1 == "/" ? "✓" : string.Empty, - col2_3 = evaluate_assign.data.evaluate.moral3_level.col2 == "/" ? "✓" : string.Empty, - col3_3 = evaluate_assign.data.evaluate.moral3_level.col3 == "/" ? "✓" : string.Empty, - col4_3 = evaluate_assign.data.evaluate.moral3_level.col4 == "/" ? "✓" : string.Empty, - col5_3 = evaluate_assign.data.evaluate.moral3_level.col5 == "/" ? "✓" : string.Empty, + col1_3 = evaluate_assign.result.evaluate.moral3_level.col1 == "/" ? "✓" : string.Empty, + col2_3 = evaluate_assign.result.evaluate.moral3_level.col2 == "/" ? "✓" : string.Empty, + col3_3 = evaluate_assign.result.evaluate.moral3_level.col3 == "/" ? "✓" : string.Empty, + col4_3 = evaluate_assign.result.evaluate.moral3_level.col4 == "/" ? "✓" : string.Empty, + col5_3 = evaluate_assign.result.evaluate.moral3_level.col5 == "/" ? "✓" : string.Empty, }; var disciplines = new { - col1_1 = evaluate_assign.data.evaluate.discipline1_level.col1 == "/" ? "✓" : string.Empty, - col2_1 = evaluate_assign.data.evaluate.discipline1_level.col2 == "/" ? "✓" : string.Empty, - col3_1 = evaluate_assign.data.evaluate.discipline1_level.col3 == "/" ? "✓" : string.Empty, - col4_1 = evaluate_assign.data.evaluate.discipline1_level.col4 == "/" ? "✓" : string.Empty, - col5_1 = evaluate_assign.data.evaluate.discipline1_level.col5 == "/" ? "✓" : string.Empty, + col1_1 = evaluate_assign.result.evaluate.discipline1_level.col1 == "/" ? "✓" : string.Empty, + col2_1 = evaluate_assign.result.evaluate.discipline1_level.col2 == "/" ? "✓" : string.Empty, + col3_1 = evaluate_assign.result.evaluate.discipline1_level.col3 == "/" ? "✓" : string.Empty, + col4_1 = evaluate_assign.result.evaluate.discipline1_level.col4 == "/" ? "✓" : string.Empty, + col5_1 = evaluate_assign.result.evaluate.discipline1_level.col5 == "/" ? "✓" : string.Empty, - col1_2 = evaluate_assign.data.evaluate.discipline2_level.col1 == "/" ? "✓" : string.Empty, - col2_2 = evaluate_assign.data.evaluate.discipline2_level.col2 == "/" ? "✓" : string.Empty, - col3_2 = evaluate_assign.data.evaluate.discipline2_level.col3 == "/" ? "✓" : string.Empty, - col4_2 = evaluate_assign.data.evaluate.discipline2_level.col4 == "/" ? "✓" : string.Empty, - col5_2 = evaluate_assign.data.evaluate.discipline2_level.col5 == "/" ? "✓" : string.Empty, + col1_2 = evaluate_assign.result.evaluate.discipline2_level.col1 == "/" ? "✓" : string.Empty, + col2_2 = evaluate_assign.result.evaluate.discipline2_level.col2 == "/" ? "✓" : string.Empty, + col3_2 = evaluate_assign.result.evaluate.discipline2_level.col3 == "/" ? "✓" : string.Empty, + col4_2 = evaluate_assign.result.evaluate.discipline2_level.col4 == "/" ? "✓" : string.Empty, + col5_2 = evaluate_assign.result.evaluate.discipline2_level.col5 == "/" ? "✓" : string.Empty, - col1_3 = evaluate_assign.data.evaluate.discipline3_level.col1 == "/" ? "✓" : string.Empty, - col2_3 = evaluate_assign.data.evaluate.discipline3_level.col2 == "/" ? "✓" : string.Empty, - col3_3 = evaluate_assign.data.evaluate.discipline3_level.col3 == "/" ? "✓" : string.Empty, - col4_3 = evaluate_assign.data.evaluate.discipline3_level.col4 == "/" ? "✓" : string.Empty, - col5_3 = evaluate_assign.data.evaluate.discipline3_level.col5 == "/" ? "✓" : string.Empty, + col1_3 = evaluate_assign.result.evaluate.discipline3_level.col1 == "/" ? "✓" : string.Empty, + col2_3 = evaluate_assign.result.evaluate.discipline3_level.col2 == "/" ? "✓" : string.Empty, + col3_3 = evaluate_assign.result.evaluate.discipline3_level.col3 == "/" ? "✓" : string.Empty, + col4_3 = evaluate_assign.result.evaluate.discipline3_level.col4 == "/" ? "✓" : string.Empty, + col5_3 = evaluate_assign.result.evaluate.discipline3_level.col5 == "/" ? "✓" : string.Empty, - col1_4 = evaluate_assign.data.evaluate.discipline4_level.col1 == "/" ? "✓" : string.Empty, - col2_4 = evaluate_assign.data.evaluate.discipline4_level.col2 == "/" ? "✓" : string.Empty, - col3_4 = evaluate_assign.data.evaluate.discipline4_level.col3 == "/" ? "✓" : string.Empty, - col4_4 = evaluate_assign.data.evaluate.discipline4_level.col4 == "/" ? "✓" : string.Empty, - col5_4 = evaluate_assign.data.evaluate.discipline4_level.col5 == "/" ? "✓" : string.Empty, + col1_4 = evaluate_assign.result.evaluate.discipline4_level.col1 == "/" ? "✓" : string.Empty, + col2_4 = evaluate_assign.result.evaluate.discipline4_level.col2 == "/" ? "✓" : string.Empty, + col3_4 = evaluate_assign.result.evaluate.discipline4_level.col3 == "/" ? "✓" : string.Empty, + col4_4 = evaluate_assign.result.evaluate.discipline4_level.col4 == "/" ? "✓" : string.Empty, + col5_4 = evaluate_assign.result.evaluate.discipline4_level.col5 == "/" ? "✓" : string.Empty, - col1_5 = evaluate_assign.data.evaluate.discipline5_level.col1 == "/" ? "✓" : string.Empty, - col2_5 = evaluate_assign.data.evaluate.discipline5_level.col2 == "/" ? "✓" : string.Empty, - col3_5 = evaluate_assign.data.evaluate.discipline5_level.col3 == "/" ? "✓" : string.Empty, - col4_5 = evaluate_assign.data.evaluate.discipline5_level.col4 == "/" ? "✓" : string.Empty, - col5_5 = evaluate_assign.data.evaluate.discipline5_level.col5 == "/" ? "✓" : string.Empty, + col1_5 = evaluate_assign.result.evaluate.discipline5_level.col1 == "/" ? "✓" : string.Empty, + col2_5 = evaluate_assign.result.evaluate.discipline5_level.col2 == "/" ? "✓" : string.Empty, + col3_5 = evaluate_assign.result.evaluate.discipline5_level.col3 == "/" ? "✓" : string.Empty, + col4_5 = evaluate_assign.result.evaluate.discipline5_level.col4 == "/" ? "✓" : string.Empty, + col5_5 = evaluate_assign.result.evaluate.discipline5_level.col5 == "/" ? "✓" : string.Empty, }; var behaviorOthers = new { - col1 = evaluate_assign.data.evaluate.behavior_other_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.behavior_other_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.behavior_other_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.behavior_other_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.behavior_other_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.behavior_other_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.behavior_other_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.behavior_other_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.behavior_other_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.behavior_other_level.col5 == "/" ? "✓" : string.Empty, }; - var orientation = evaluate_assign.data.evaluate.orientation = evaluate_assign.data.evaluate.orientation == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var self_learning = evaluate_assign.data.evaluate.self_learning = evaluate_assign.data.evaluate.self_learning == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var training_seminar = evaluate_assign.data.evaluate.training_seminar = evaluate_assign.data.evaluate.training_seminar == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; - var other_training = evaluate_assign.data.evaluate.other_training = evaluate_assign.data.evaluate.other_training == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var orientation = evaluate_assign.result.evaluate.orientation = evaluate_assign.result.evaluate.orientation == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var self_learning = evaluate_assign.result.evaluate.self_learning = evaluate_assign.result.evaluate.self_learning == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var training_seminar = evaluate_assign.result.evaluate.training_seminar = evaluate_assign.result.evaluate.training_seminar == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; + var other_training = evaluate_assign.result.evaluate.other_training = evaluate_assign.result.evaluate.other_training == "1" ? "🗹 ดำเนินการแล้ว ☐ ยังไม่ได้ดำเนินการ" : "☐ ดำเนินการแล้ว 🗹 ยังไม่ได้ดำเนินการ"; return new { - No = string.IsNullOrEmpty(evaluate_assign.data.evaluate.no.ToString()) ? string.Empty : evaluate_assign.data.evaluate.no.ToString().ToThaiNumber(), - EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "-" : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_finish.ToString()) ? "-" : evaluate_assign.data.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), - Name = string.IsNullOrEmpty(evaluate_assign.data.experimentee.name) ? string.Empty : evaluate_assign.data.experimentee.name, - Position = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Position) ? string.Empty : evaluate_assign.data.experimentee.Position, - Department = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Department) ? string.Empty : evaluate_assign.data.experimentee.Department, - Organization = string.IsNullOrEmpty(evaluate_assign.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.data.experimentee.OrganizationOrganization, - Oc = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Oc) ? string.Empty : evaluate_assign.data.experimentee.Oc, - DateStart = string.IsNullOrEmpty(evaluate_assign.data.assign.date_start.ToString()) ? "-" : evaluate_assign.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - DateFinish = string.IsNullOrEmpty(evaluate_assign.data.assign.date_finish.ToString()) ? "-" : evaluate_assign.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), - CommanderName = string.IsNullOrEmpty(evaluate_assign.data.commander.name) ? string.Empty : evaluate_assign.data.commander.name, - CommanderPosition = string.IsNullOrEmpty(evaluate_assign.data.commander.Position) ? string.Empty : evaluate_assign.data.commander.Position, - CommanderDated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.sign_dated.ToString()) ? "-" : evaluate_assign.data.evaluate.sign_dated.ToThaiFullDate().ToString().ToThaiNumber(), - BehaviorStrengthDesc = evaluate_assign.data.evaluate.behavior_strength_desc, - BehaviorImproveDesc = evaluate_assign.data.evaluate.behavior_improve_desc, + No = string.IsNullOrEmpty(evaluate_assign.result.evaluate.no.ToString()) ? string.Empty : evaluate_assign.result.evaluate.no.ToString().ToThaiNumber(), + EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_start.ToString()) ? "-" : evaluate_assign.result.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_finish.ToString()) ? "-" : evaluate_assign.result.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + Name = string.IsNullOrEmpty(evaluate_assign.result.experimentee.name) ? string.Empty : evaluate_assign.result.experimentee.name, + Position = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Position) ? string.Empty : evaluate_assign.result.experimentee.Position, + Department = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Department) ? string.Empty : evaluate_assign.result.experimentee.Department, + Organization = string.IsNullOrEmpty(evaluate_assign.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.result.experimentee.OrganizationOrganization, + Oc = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Oc) ? string.Empty : evaluate_assign.result.experimentee.Oc, + DateStart = string.IsNullOrEmpty(evaluate_assign.result.assign.date_start.ToString()) ? "-" : evaluate_assign.result.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(evaluate_assign.result.assign.date_finish.ToString()) ? "-" : evaluate_assign.result.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + CommanderName = string.IsNullOrEmpty(evaluate_assign.result.commander.name) ? string.Empty : evaluate_assign.result.commander.name, + CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.Position) ? string.Empty : evaluate_assign.result.commander.Position, + CommanderDated = string.IsNullOrEmpty(evaluate_assign.result.evaluate.sign_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.sign_dated.ToThaiFullDate().ToString().ToThaiNumber(), + BehaviorStrengthDesc = evaluate_assign.result.evaluate.behavior_strength_desc, + BehaviorImproveDesc = evaluate_assign.result.evaluate.behavior_improve_desc, Knows = knows, Skills = skills, Competencys = competencys, @@ -609,12 +609,12 @@ namespace BMA.EHR.Application.Repositories.Reports Applys = applys, Success = success, AchievementOthers = achievementOthers, - AchievementOtherDesc = evaluate_assign.data.evaluate.achievement_other_desc, + AchievementOtherDesc = evaluate_assign.result.evaluate.achievement_other_desc, Conducts = conducts, Morals = morals, Disciplines = disciplines, BehaviorOthers = behaviorOthers, - BehaviorOtherDesc = evaluate_assign.data.evaluate.behavior_other_desc, + BehaviorOtherDesc = evaluate_assign.result.evaluate.behavior_other_desc, Orientation = orientation, SelfLearning = self_learning, TrainingSeminar = training_seminar, @@ -643,210 +643,210 @@ namespace BMA.EHR.Application.Repositories.Reports var result = await res.Content.ReadAsStringAsync(); evaluate_assign = JsonConvert.DeserializeObject(result); - if (evaluate_assign.data != null) + if (evaluate_assign.result != null) { var knowledge_level = new { - col1 = evaluate_assign.data.evaluate.knowledge_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.knowledge_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.knowledge_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.knowledge_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.knowledge_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.knowledge_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.knowledge_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.knowledge_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.knowledge_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.knowledge_level.col5 == "/" ? "✓" : string.Empty, }; var apply_level = new { - col1 = evaluate_assign.data.evaluate.apply_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.apply_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.apply_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.apply_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.apply_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.apply_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.apply_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.apply_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.apply_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.apply_level.col5 == "/" ? "✓" : string.Empty, }; var success_level = new { - col1 = evaluate_assign.data.evaluate.success_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.success_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.success_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.success_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.success_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.success_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.success_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.success_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.success_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.success_level.col5 == "/" ? "✓" : string.Empty, }; var achievement_other_level = new { - col1 = evaluate_assign.data.evaluate.achievement_other_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.achievement_other_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.achievement_other_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.achievement_other_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.achievement_other_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.achievement_other_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.achievement_other_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.achievement_other_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.achievement_other_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.achievement_other_level.col5 == "/" ? "✓" : string.Empty, }; var conduct_level = new { - col1_1 = evaluate_assign.data.evaluate.conduct1_level.col1 == "/" ? "✓" : string.Empty, - col2_1 = evaluate_assign.data.evaluate.conduct1_level.col2 == "/" ? "✓" : string.Empty, - col3_1 = evaluate_assign.data.evaluate.conduct1_level.col3 == "/" ? "✓" : string.Empty, - col4_1 = evaluate_assign.data.evaluate.conduct1_level.col4 == "/" ? "✓" : string.Empty, - col5_1 = evaluate_assign.data.evaluate.conduct1_level.col5 == "/" ? "✓" : string.Empty, + col1_1 = evaluate_assign.result.evaluate.conduct1_level.col1 == "/" ? "✓" : string.Empty, + col2_1 = evaluate_assign.result.evaluate.conduct1_level.col2 == "/" ? "✓" : string.Empty, + col3_1 = evaluate_assign.result.evaluate.conduct1_level.col3 == "/" ? "✓" : string.Empty, + col4_1 = evaluate_assign.result.evaluate.conduct1_level.col4 == "/" ? "✓" : string.Empty, + col5_1 = evaluate_assign.result.evaluate.conduct1_level.col5 == "/" ? "✓" : string.Empty, - col1_2 = evaluate_assign.data.evaluate.conduct2_level.col1 == "/" ? "✓" : string.Empty, - col2_2 = evaluate_assign.data.evaluate.conduct2_level.col2 == "/" ? "✓" : string.Empty, - col3_2 = evaluate_assign.data.evaluate.conduct2_level.col3 == "/" ? "✓" : string.Empty, - col4_2 = evaluate_assign.data.evaluate.conduct2_level.col4 == "/" ? "✓" : string.Empty, - col5_2 = evaluate_assign.data.evaluate.conduct2_level.col5 == "/" ? "✓" : string.Empty, + col1_2 = evaluate_assign.result.evaluate.conduct2_level.col1 == "/" ? "✓" : string.Empty, + col2_2 = evaluate_assign.result.evaluate.conduct2_level.col2 == "/" ? "✓" : string.Empty, + col3_2 = evaluate_assign.result.evaluate.conduct2_level.col3 == "/" ? "✓" : string.Empty, + col4_2 = evaluate_assign.result.evaluate.conduct2_level.col4 == "/" ? "✓" : string.Empty, + col5_2 = evaluate_assign.result.evaluate.conduct2_level.col5 == "/" ? "✓" : string.Empty, - col1_3 = evaluate_assign.data.evaluate.conduct3_level.col1 == "/" ? "✓" : string.Empty, - col2_3 = evaluate_assign.data.evaluate.conduct3_level.col2 == "/" ? "✓" : string.Empty, - col3_3 = evaluate_assign.data.evaluate.conduct3_level.col3 == "/" ? "✓" : string.Empty, - col4_3 = evaluate_assign.data.evaluate.conduct3_level.col4 == "/" ? "✓" : string.Empty, - col5_3 = evaluate_assign.data.evaluate.conduct3_level.col5 == "/" ? "✓" : string.Empty, + col1_3 = evaluate_assign.result.evaluate.conduct3_level.col1 == "/" ? "✓" : string.Empty, + col2_3 = evaluate_assign.result.evaluate.conduct3_level.col2 == "/" ? "✓" : string.Empty, + col3_3 = evaluate_assign.result.evaluate.conduct3_level.col3 == "/" ? "✓" : string.Empty, + col4_3 = evaluate_assign.result.evaluate.conduct3_level.col4 == "/" ? "✓" : string.Empty, + col5_3 = evaluate_assign.result.evaluate.conduct3_level.col5 == "/" ? "✓" : string.Empty, - col1_4 = evaluate_assign.data.evaluate.conduct4_level.col1 == "/" ? "✓" : string.Empty, - col2_4 = evaluate_assign.data.evaluate.conduct4_level.col2 == "/" ? "✓" : string.Empty, - col3_4 = evaluate_assign.data.evaluate.conduct4_level.col3 == "/" ? "✓" : string.Empty, - col4_4 = evaluate_assign.data.evaluate.conduct4_level.col4 == "/" ? "✓" : string.Empty, - col5_4 = evaluate_assign.data.evaluate.conduct4_level.col5 == "/" ? "✓" : string.Empty, + col1_4 = evaluate_assign.result.evaluate.conduct4_level.col1 == "/" ? "✓" : string.Empty, + col2_4 = evaluate_assign.result.evaluate.conduct4_level.col2 == "/" ? "✓" : string.Empty, + col3_4 = evaluate_assign.result.evaluate.conduct4_level.col3 == "/" ? "✓" : string.Empty, + col4_4 = evaluate_assign.result.evaluate.conduct4_level.col4 == "/" ? "✓" : string.Empty, + col5_4 = evaluate_assign.result.evaluate.conduct4_level.col5 == "/" ? "✓" : string.Empty, }; var moral_level = new { - col1_1 = evaluate_assign.data.evaluate.moral1_level.col1 == "/" ? "✓" : string.Empty, - col2_1 = evaluate_assign.data.evaluate.moral1_level.col2 == "/" ? "✓" : string.Empty, - col3_1 = evaluate_assign.data.evaluate.moral1_level.col3 == "/" ? "✓" : string.Empty, - col4_1 = evaluate_assign.data.evaluate.moral1_level.col4 == "/" ? "✓" : string.Empty, - col5_1 = evaluate_assign.data.evaluate.moral1_level.col5 == "/" ? "✓" : string.Empty, + col1_1 = evaluate_assign.result.evaluate.moral1_level.col1 == "/" ? "✓" : string.Empty, + col2_1 = evaluate_assign.result.evaluate.moral1_level.col2 == "/" ? "✓" : string.Empty, + col3_1 = evaluate_assign.result.evaluate.moral1_level.col3 == "/" ? "✓" : string.Empty, + col4_1 = evaluate_assign.result.evaluate.moral1_level.col4 == "/" ? "✓" : string.Empty, + col5_1 = evaluate_assign.result.evaluate.moral1_level.col5 == "/" ? "✓" : string.Empty, - col1_2 = evaluate_assign.data.evaluate.moral2_level.col1 == "/" ? "✓" : string.Empty, - col2_2 = evaluate_assign.data.evaluate.moral2_level.col2 == "/" ? "✓" : string.Empty, - col3_2 = evaluate_assign.data.evaluate.moral2_level.col3 == "/" ? "✓" : string.Empty, - col4_2 = evaluate_assign.data.evaluate.moral2_level.col4 == "/" ? "✓" : string.Empty, - col5_2 = evaluate_assign.data.evaluate.moral2_level.col5 == "/" ? "✓" : string.Empty, + col1_2 = evaluate_assign.result.evaluate.moral2_level.col1 == "/" ? "✓" : string.Empty, + col2_2 = evaluate_assign.result.evaluate.moral2_level.col2 == "/" ? "✓" : string.Empty, + col3_2 = evaluate_assign.result.evaluate.moral2_level.col3 == "/" ? "✓" : string.Empty, + col4_2 = evaluate_assign.result.evaluate.moral2_level.col4 == "/" ? "✓" : string.Empty, + col5_2 = evaluate_assign.result.evaluate.moral2_level.col5 == "/" ? "✓" : string.Empty, - col1_3 = evaluate_assign.data.evaluate.moral3_level.col1 == "/" ? "✓" : string.Empty, - col2_3 = evaluate_assign.data.evaluate.moral3_level.col2 == "/" ? "✓" : string.Empty, - col3_3 = evaluate_assign.data.evaluate.moral3_level.col3 == "/" ? "✓" : string.Empty, - col4_3 = evaluate_assign.data.evaluate.moral3_level.col4 == "/" ? "✓" : string.Empty, - col5_3 = evaluate_assign.data.evaluate.moral3_level.col5 == "/" ? "✓" : string.Empty, + col1_3 = evaluate_assign.result.evaluate.moral3_level.col1 == "/" ? "✓" : string.Empty, + col2_3 = evaluate_assign.result.evaluate.moral3_level.col2 == "/" ? "✓" : string.Empty, + col3_3 = evaluate_assign.result.evaluate.moral3_level.col3 == "/" ? "✓" : string.Empty, + col4_3 = evaluate_assign.result.evaluate.moral3_level.col4 == "/" ? "✓" : string.Empty, + col5_3 = evaluate_assign.result.evaluate.moral3_level.col5 == "/" ? "✓" : string.Empty, }; var discipline_level = new { - col1_1 = evaluate_assign.data.evaluate.discipline1_level.col1 == "/" ? "✓" : string.Empty, - col2_1 = evaluate_assign.data.evaluate.discipline1_level.col2 == "/" ? "✓" : string.Empty, - col3_1 = evaluate_assign.data.evaluate.discipline1_level.col3 == "/" ? "✓" : string.Empty, - col4_1 = evaluate_assign.data.evaluate.discipline1_level.col4 == "/" ? "✓" : string.Empty, - col5_1 = evaluate_assign.data.evaluate.discipline1_level.col5 == "/" ? "✓" : string.Empty, + col1_1 = evaluate_assign.result.evaluate.discipline1_level.col1 == "/" ? "✓" : string.Empty, + col2_1 = evaluate_assign.result.evaluate.discipline1_level.col2 == "/" ? "✓" : string.Empty, + col3_1 = evaluate_assign.result.evaluate.discipline1_level.col3 == "/" ? "✓" : string.Empty, + col4_1 = evaluate_assign.result.evaluate.discipline1_level.col4 == "/" ? "✓" : string.Empty, + col5_1 = evaluate_assign.result.evaluate.discipline1_level.col5 == "/" ? "✓" : string.Empty, - col1_2 = evaluate_assign.data.evaluate.discipline2_level.col1 == "/" ? "✓" : string.Empty, - col2_2 = evaluate_assign.data.evaluate.discipline2_level.col2 == "/" ? "✓" : string.Empty, - col3_2 = evaluate_assign.data.evaluate.discipline2_level.col3 == "/" ? "✓" : string.Empty, - col4_2 = evaluate_assign.data.evaluate.discipline2_level.col4 == "/" ? "✓" : string.Empty, - col5_2 = evaluate_assign.data.evaluate.discipline2_level.col5 == "/" ? "✓" : string.Empty, + col1_2 = evaluate_assign.result.evaluate.discipline2_level.col1 == "/" ? "✓" : string.Empty, + col2_2 = evaluate_assign.result.evaluate.discipline2_level.col2 == "/" ? "✓" : string.Empty, + col3_2 = evaluate_assign.result.evaluate.discipline2_level.col3 == "/" ? "✓" : string.Empty, + col4_2 = evaluate_assign.result.evaluate.discipline2_level.col4 == "/" ? "✓" : string.Empty, + col5_2 = evaluate_assign.result.evaluate.discipline2_level.col5 == "/" ? "✓" : string.Empty, - col1_3 = evaluate_assign.data.evaluate.discipline3_level.col1 == "/" ? "✓" : string.Empty, - col2_3 = evaluate_assign.data.evaluate.discipline3_level.col2 == "/" ? "✓" : string.Empty, - col3_3 = evaluate_assign.data.evaluate.discipline3_level.col3 == "/" ? "✓" : string.Empty, - col4_3 = evaluate_assign.data.evaluate.discipline3_level.col4 == "/" ? "✓" : string.Empty, - col5_3 = evaluate_assign.data.evaluate.discipline3_level.col5 == "/" ? "✓" : string.Empty, + col1_3 = evaluate_assign.result.evaluate.discipline3_level.col1 == "/" ? "✓" : string.Empty, + col2_3 = evaluate_assign.result.evaluate.discipline3_level.col2 == "/" ? "✓" : string.Empty, + col3_3 = evaluate_assign.result.evaluate.discipline3_level.col3 == "/" ? "✓" : string.Empty, + col4_3 = evaluate_assign.result.evaluate.discipline3_level.col4 == "/" ? "✓" : string.Empty, + col5_3 = evaluate_assign.result.evaluate.discipline3_level.col5 == "/" ? "✓" : string.Empty, - col1_4 = evaluate_assign.data.evaluate.discipline4_level.col1 == "/" ? "✓" : string.Empty, - col2_4 = evaluate_assign.data.evaluate.discipline4_level.col2 == "/" ? "✓" : string.Empty, - col3_4 = evaluate_assign.data.evaluate.discipline4_level.col3 == "/" ? "✓" : string.Empty, - col4_4 = evaluate_assign.data.evaluate.discipline4_level.col4 == "/" ? "✓" : string.Empty, - col5_4 = evaluate_assign.data.evaluate.discipline4_level.col5 == "/" ? "✓" : string.Empty, + col1_4 = evaluate_assign.result.evaluate.discipline4_level.col1 == "/" ? "✓" : string.Empty, + col2_4 = evaluate_assign.result.evaluate.discipline4_level.col2 == "/" ? "✓" : string.Empty, + col3_4 = evaluate_assign.result.evaluate.discipline4_level.col3 == "/" ? "✓" : string.Empty, + col4_4 = evaluate_assign.result.evaluate.discipline4_level.col4 == "/" ? "✓" : string.Empty, + col5_4 = evaluate_assign.result.evaluate.discipline4_level.col5 == "/" ? "✓" : string.Empty, - col1_5 = evaluate_assign.data.evaluate.discipline5_level.col1 == "/" ? "✓" : string.Empty, - col2_5 = evaluate_assign.data.evaluate.discipline5_level.col2 == "/" ? "✓" : string.Empty, - col3_5 = evaluate_assign.data.evaluate.discipline5_level.col3 == "/" ? "✓" : string.Empty, - col4_5 = evaluate_assign.data.evaluate.discipline5_level.col4 == "/" ? "✓" : string.Empty, - col5_5 = evaluate_assign.data.evaluate.discipline5_level.col5 == "/" ? "✓" : string.Empty, + col1_5 = evaluate_assign.result.evaluate.discipline5_level.col1 == "/" ? "✓" : string.Empty, + col2_5 = evaluate_assign.result.evaluate.discipline5_level.col2 == "/" ? "✓" : string.Empty, + col3_5 = evaluate_assign.result.evaluate.discipline5_level.col3 == "/" ? "✓" : string.Empty, + col4_5 = evaluate_assign.result.evaluate.discipline5_level.col4 == "/" ? "✓" : string.Empty, + col5_5 = evaluate_assign.result.evaluate.discipline5_level.col5 == "/" ? "✓" : string.Empty, }; var behavior_other_level = new { - col1 = evaluate_assign.data.evaluate.behavior_other_level.col1 == "/" ? "✓" : string.Empty, - col2 = evaluate_assign.data.evaluate.behavior_other_level.col2 == "/" ? "✓" : string.Empty, - col3 = evaluate_assign.data.evaluate.behavior_other_level.col3 == "/" ? "✓" : string.Empty, - col4 = evaluate_assign.data.evaluate.behavior_other_level.col4 == "/" ? "✓" : string.Empty, - col5 = evaluate_assign.data.evaluate.behavior_other_level.col5 == "/" ? "✓" : string.Empty, + col1 = evaluate_assign.result.evaluate.behavior_other_level.col1 == "/" ? "✓" : string.Empty, + col2 = evaluate_assign.result.evaluate.behavior_other_level.col2 == "/" ? "✓" : string.Empty, + col3 = evaluate_assign.result.evaluate.behavior_other_level.col3 == "/" ? "✓" : string.Empty, + col4 = evaluate_assign.result.evaluate.behavior_other_level.col4 == "/" ? "✓" : string.Empty, + col5 = evaluate_assign.result.evaluate.behavior_other_level.col5 == "/" ? "✓" : string.Empty, }; - var achievement_score = evaluate_assign.data.evaluate.achievement_score != null - ? evaluate_assign.data.evaluate.achievement_score.ToThaiNumber() + var achievement_score = evaluate_assign.result.evaluate.achievement_score != null + ? evaluate_assign.result.evaluate.achievement_score.ToThaiNumber() : string.Empty; - var behavior_score = evaluate_assign.data.evaluate.behavior_score != null - ? evaluate_assign.data.evaluate.behavior_score.ToThaiNumber() + var behavior_score = evaluate_assign.result.evaluate.behavior_score != null + ? evaluate_assign.result.evaluate.behavior_score.ToThaiNumber() : string.Empty; - var sum_score = evaluate_assign.data.evaluate.sum_score != null - ? evaluate_assign.data.evaluate.sum_score.ToThaiNumber() + var sum_score = evaluate_assign.result.evaluate.sum_score != null + ? evaluate_assign.result.evaluate.sum_score.ToThaiNumber() : string.Empty; - var achievement_percent = evaluate_assign.data.evaluate.achievement_percent != null - ? evaluate_assign.data.evaluate.achievement_percent.ToThaiNumber() + var achievement_percent = evaluate_assign.result.evaluate.achievement_percent != null + ? evaluate_assign.result.evaluate.achievement_percent.ToThaiNumber() : string.Empty; - var behavior_percent = evaluate_assign.data.evaluate.behavior_percent != null - ? evaluate_assign.data.evaluate.behavior_percent.ToThaiNumber() + var behavior_percent = evaluate_assign.result.evaluate.behavior_percent != null + ? evaluate_assign.result.evaluate.behavior_percent.ToThaiNumber() : string.Empty; - var sum_percent = evaluate_assign.data.evaluate.sum_percent != null - ? evaluate_assign.data.evaluate.sum_percent.ToThaiNumber() + var sum_percent = evaluate_assign.result.evaluate.sum_percent != null + ? evaluate_assign.result.evaluate.sum_percent.ToThaiNumber() : string.Empty; - var develop_orientation_score = evaluate_assign.data.evaluate.develop_orientation_score != null - ? evaluate_assign.data.evaluate.develop_orientation_score.ToThaiNumber() + var develop_orientation_score = evaluate_assign.result.evaluate.develop_orientation_score != null + ? evaluate_assign.result.evaluate.develop_orientation_score.ToThaiNumber() : string.Empty; - var develop_self_learning_score = evaluate_assign.data.evaluate.develop_self_learning_score != null - ? evaluate_assign.data.evaluate.develop_self_learning_score.ToThaiNumber() + var develop_self_learning_score = evaluate_assign.result.evaluate.develop_self_learning_score != null + ? evaluate_assign.result.evaluate.develop_self_learning_score.ToThaiNumber() : string.Empty; - var develop_training_seminar_score = evaluate_assign.data.evaluate.develop_training_seminar_score != null - ? evaluate_assign.data.evaluate.develop_training_seminar_score.ToThaiNumber() + var develop_training_seminar_score = evaluate_assign.result.evaluate.develop_training_seminar_score != null + ? evaluate_assign.result.evaluate.develop_training_seminar_score.ToThaiNumber() : string.Empty; - var develop_other_training_score = evaluate_assign.data.evaluate.develop_other_training_score != null - ? evaluate_assign.data.evaluate.develop_other_training_score.ToThaiNumber() + var develop_other_training_score = evaluate_assign.result.evaluate.develop_other_training_score != null + ? evaluate_assign.result.evaluate.develop_other_training_score.ToThaiNumber() : string.Empty; - var develop_total_score = evaluate_assign.data.evaluate.develop_total_score != null - ? evaluate_assign.data.evaluate.develop_total_score.ToThaiNumber() + var develop_total_score = evaluate_assign.result.evaluate.develop_total_score != null + ? evaluate_assign.result.evaluate.develop_total_score.ToThaiNumber() : string.Empty; - var develop_orientation_percent = evaluate_assign.data.evaluate.develop_orientation_percent != null - ? evaluate_assign.data.evaluate.develop_orientation_percent.ToThaiNumber() + var develop_orientation_percent = evaluate_assign.result.evaluate.develop_orientation_percent != null + ? evaluate_assign.result.evaluate.develop_orientation_percent.ToThaiNumber() : string.Empty; - var develop_self_learning_percent = evaluate_assign.data.evaluate.develop_self_learning_percent != null - ? evaluate_assign.data.evaluate.develop_self_learning_percent.ToThaiNumber() + var develop_self_learning_percent = evaluate_assign.result.evaluate.develop_self_learning_percent != null + ? evaluate_assign.result.evaluate.develop_self_learning_percent.ToThaiNumber() : string.Empty; - var develop_training_seminar_percent = evaluate_assign.data.evaluate.develop_training_seminar_percent != null - ? evaluate_assign.data.evaluate.develop_training_seminar_percent.ToThaiNumber() + var develop_training_seminar_percent = evaluate_assign.result.evaluate.develop_training_seminar_percent != null + ? evaluate_assign.result.evaluate.develop_training_seminar_percent.ToThaiNumber() : string.Empty; - var develop_other_training_percent = evaluate_assign.data.evaluate.develop_other_training_percent != null - ? evaluate_assign.data.evaluate.develop_other_training_percent.ToThaiNumber() + var develop_other_training_percent = evaluate_assign.result.evaluate.develop_other_training_percent != null + ? evaluate_assign.result.evaluate.develop_other_training_percent.ToThaiNumber() : string.Empty; - var develop_total_percent = evaluate_assign.data.evaluate.develop_total_percent != null - ? evaluate_assign.data.evaluate.develop_total_percent.ToThaiNumber() + var develop_total_percent = evaluate_assign.result.evaluate.develop_total_percent != null + ? evaluate_assign.result.evaluate.develop_total_percent.ToThaiNumber() : string.Empty; return new { - No = string.IsNullOrEmpty(evaluate_assign.data.evaluate.no.ToString()) ? string.Empty : evaluate_assign.data.evaluate.no.ToString().ToThaiNumber(), - EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "-" : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_finish.ToString()) ? "-" : evaluate_assign.data.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), - Name = string.IsNullOrEmpty(evaluate_assign.data.experimentee.name) ? string.Empty : evaluate_assign.data.experimentee.name, - Position = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Position) ? string.Empty : evaluate_assign.data.experimentee.Position, - Department = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Department) ? string.Empty : evaluate_assign.data.experimentee.Department, - Organization = string.IsNullOrEmpty(evaluate_assign.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.data.experimentee.OrganizationOrganization, - Oc = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Oc) ? string.Empty : evaluate_assign.data.experimentee.Oc, - DateStart = string.IsNullOrEmpty(evaluate_assign.data.assign.date_start.ToString()) ? "-" : evaluate_assign.data.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - DateFinish = string.IsNullOrEmpty(evaluate_assign.data.assign.date_finish.ToString()) ? "-" : evaluate_assign.data.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + No = string.IsNullOrEmpty(evaluate_assign.result.evaluate.no.ToString()) ? string.Empty : evaluate_assign.result.evaluate.no.ToString().ToThaiNumber(), + EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_start.ToString()) ? "-" : evaluate_assign.result.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_finish.ToString()) ? "-" : evaluate_assign.result.evaluate.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), + Name = string.IsNullOrEmpty(evaluate_assign.result.experimentee.name) ? string.Empty : evaluate_assign.result.experimentee.name, + Position = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Position) ? string.Empty : evaluate_assign.result.experimentee.Position, + Department = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Department) ? string.Empty : evaluate_assign.result.experimentee.Department, + Organization = string.IsNullOrEmpty(evaluate_assign.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.result.experimentee.OrganizationOrganization, + Oc = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Oc) ? string.Empty : evaluate_assign.result.experimentee.Oc, + DateStart = string.IsNullOrEmpty(evaluate_assign.result.assign.date_start.ToString()) ? "-" : evaluate_assign.result.assign.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + DateFinish = string.IsNullOrEmpty(evaluate_assign.result.assign.date_finish.ToString()) ? "-" : evaluate_assign.result.assign.date_finish.ToThaiFullDate().ToString().ToThaiNumber(), Knows = knowledge_level, Applys = apply_level, Success = success_level, AchievementOthers = achievement_other_level, - AchievementOtherDesc = evaluate_assign.data.evaluate.achievement_other_desc, + AchievementOtherDesc = evaluate_assign.result.evaluate.achievement_other_desc, Conducts = conduct_level, Morals = moral_level, Disciplines = discipline_level, BehaviorOthers = behavior_other_level, - BehaviorOtherDesc = evaluate_assign.data.evaluate.behavior_other_desc, + BehaviorOtherDesc = evaluate_assign.result.evaluate.behavior_other_desc, AchievementScore = achievement_score, BehaviorScore = behavior_score, SumScore = sum_score, AchievementPercent = achievement_percent, BehaviorPercent = behavior_percent, SumPercent = sum_percent, - AchievementResult1 = evaluate_assign.data.evaluate.achievement_result == 1 ? "✓" : string.Empty, - AchievementResult2 = evaluate_assign.data.evaluate.achievement_result == 1 ? string.Empty : "✓", - BehaviorResult1 = evaluate_assign.data.evaluate.behavior_result == 1 ? "✓" : string.Empty, - BehaviorResult2 = evaluate_assign.data.evaluate.behavior_result == 1 ? string.Empty : "✓", + AchievementResult1 = evaluate_assign.result.evaluate.achievement_result == 1 ? "✓" : string.Empty, + AchievementResult2 = evaluate_assign.result.evaluate.achievement_result == 1 ? string.Empty : "✓", + BehaviorResult1 = evaluate_assign.result.evaluate.behavior_result == 1 ? "✓" : string.Empty, + BehaviorResult2 = evaluate_assign.result.evaluate.behavior_result == 1 ? string.Empty : "✓", DevelopOrientationScore = develop_orientation_score, DevelopSelfLearningScore = develop_self_learning_score, DevelopTrainingSeminarScore = develop_training_seminar_score, @@ -857,19 +857,19 @@ namespace BMA.EHR.Application.Repositories.Reports DevelopTrainingSeminarPercent = develop_training_seminar_percent, DevelopOtherTrainingPercent = develop_other_training_percent, DevelopTotalPercent = develop_total_percent, - DevelopResult1 = evaluate_assign.data.evaluate.develop_result == 1 ? "✓" : string.Empty, - DevelopResult2 = evaluate_assign.data.evaluate.develop_result == 0 ? "✓" : string.Empty, - EvaluateResult1 = evaluate_assign.data.evaluate.evaluate_result == 1 ? "🗹" : "☐", - EvaluateResult2 = evaluate_assign.data.evaluate.evaluate_result == 1 ? "☐" : "🗹", - ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name, - ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position, - ChairmanDated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.chairman_dated.ToString()) ? "-" : evaluate_assign.data.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), - Director1Name = string.IsNullOrEmpty(evaluate_assign.data.director1.name) ? string.Empty : evaluate_assign.data.director1.name, - Director1Position = string.IsNullOrEmpty(evaluate_assign.data.director1.Position) ? string.Empty : evaluate_assign.data.director1.Position, - Director1Dated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.data.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(), - Director2Name = string.IsNullOrEmpty(evaluate_assign.data.director2.name) ? string.Empty : evaluate_assign.data.director2.name, - Director2Position = string.IsNullOrEmpty(evaluate_assign.data.director2.Position) ? string.Empty : evaluate_assign.data.director2.Position, - Director2Dated = string.IsNullOrEmpty(evaluate_assign.data.evaluate.director2_dated.ToString()) ? "-" : evaluate_assign.data.evaluate.director2_dated.ToThaiFullDate().ToString().ToThaiNumber(), + DevelopResult1 = evaluate_assign.result.evaluate.develop_result == 1 ? "✓" : string.Empty, + DevelopResult2 = evaluate_assign.result.evaluate.develop_result == 0 ? "✓" : string.Empty, + EvaluateResult1 = evaluate_assign.result.evaluate.evaluate_result == 1 ? "🗹" : "☐", + EvaluateResult2 = evaluate_assign.result.evaluate.evaluate_result == 1 ? "☐" : "🗹", + ChairmanName = string.IsNullOrEmpty(evaluate_assign.result.chairman.name) ? string.Empty : evaluate_assign.result.chairman.name, + ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.result.chairman.Position) ? string.Empty : evaluate_assign.result.chairman.Position, + ChairmanDated = string.IsNullOrEmpty(evaluate_assign.result.evaluate.chairman_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Director1Name = string.IsNullOrEmpty(evaluate_assign.result.director1.name) ? string.Empty : evaluate_assign.result.director1.name, + Director1Position = string.IsNullOrEmpty(evaluate_assign.result.director1.Position) ? string.Empty : evaluate_assign.result.director1.Position, + Director1Dated = string.IsNullOrEmpty(evaluate_assign.result.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Director2Name = string.IsNullOrEmpty(evaluate_assign.result.director2.name) ? string.Empty : evaluate_assign.result.director2.name, + Director2Position = string.IsNullOrEmpty(evaluate_assign.result.director2.Position) ? string.Empty : evaluate_assign.result.director2.Position, + Director2Dated = string.IsNullOrEmpty(evaluate_assign.result.evaluate.director2_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.director2_dated.ToThaiFullDate().ToString().ToThaiNumber(), }; } else @@ -894,60 +894,60 @@ namespace BMA.EHR.Application.Repositories.Reports var result = await res.Content.ReadAsStringAsync(); evaluate_assign = JsonConvert.DeserializeObject(result); - if (evaluate_assign.data != null) + if (evaluate_assign.result != null) { - var expandMonth = string.IsNullOrEmpty(evaluate_assign.data.evaluate.expand_month.ToString()) ? string.Empty : evaluate_assign.data.evaluate.expand_month.ToString().ToThaiNumber(); - var developComplete1 = evaluate_assign.data.evaluate.develop_complete == 1 + var expandMonth = string.IsNullOrEmpty(evaluate_assign.result.evaluate.expand_month.ToString()) ? string.Empty : evaluate_assign.result.evaluate.expand_month.ToString().ToThaiNumber(); + var developComplete1 = evaluate_assign.result.evaluate.develop_complete == 1 ? "🗹" : "☐"; - var developComplete2 = evaluate_assign.data.evaluate.develop_complete == 0 + var developComplete2 = evaluate_assign.result.evaluate.develop_complete == 0 ? "🗹" : "☐"; - var passResult1 = evaluate_assign.data.evaluate.pass_result == 1 + var passResult1 = evaluate_assign.result.evaluate.pass_result == 1 ? "🗹 ไม่ต่ำกว่ามาตรฐานที่กำหนดเห็น ควรให้รับราชการต่อไป" : "☐ ไม่ต่ำกว่ามาตรฐานที่กำหนดเห็น ควรให้รับราชการต่อไป"; - var passResult2 = evaluate_assign.data.evaluate.pass_result == 2 + var passResult2 = evaluate_assign.result.evaluate.pass_result == 2 ? "🗹 ต่ำกว่ามาตรฐานที่กำหนดเห็นควรให้ออกราชการต่อไป" : "☐ ต่ำกว่ามาตรฐานที่กำหนดเห็นควรให้ออกราชการต่อไป"; - var passResult3 = evaluate_assign.data.evaluate.pass_result == 3 + var passResult3 = evaluate_assign.result.evaluate.pass_result == 3 ? $"🗹 เห็นควรให้ขยายเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก {expandMonth} เดือน" : "☐ เห็นควรให้ขยายเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก.....เดือน"; - var passResult = evaluate_assign.data.evaluate.pass_result == 1 + var passResult = evaluate_assign.result.evaluate.pass_result == 1 ? "เห็นควรให้รับราชการต่อไป" - : evaluate_assign.data.evaluate.pass_result == 2 + : evaluate_assign.result.evaluate.pass_result == 2 ? "เห็นควรให้ออกจากราชการ" : $"เห็นควรให้ขยายเวลาทดลองปฏิบัติหน้าที่ราชการต่อไปอีก {expandMonth} เดือน"; CultureInfo provider = new CultureInfo("en-US"); DateTime date_start = DateTime.MinValue, date_finish = DateTime.MinValue; - if (evaluate_assign.data.assign.date_start != string.Empty && evaluate_assign.data.assign.date_finish != string.Empty) + if (evaluate_assign.result.assign.date_start != string.Empty && evaluate_assign.result.assign.date_finish != string.Empty) { - date_start = DateTime.Parse(evaluate_assign.data.assign.date_start, provider); - date_finish = DateTime.Parse(evaluate_assign.data.assign.date_finish, provider); + date_start = DateTime.Parse(evaluate_assign.result.assign.date_start, provider); + date_finish = DateTime.Parse(evaluate_assign.result.assign.date_finish, provider); } var dateStart_ = date_start.ToThaiFullDate().ToString().ToThaiNumber(); var dateFinish_ = date_finish.ToThaiFullDate().ToString().ToThaiNumber(); return new { - EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "-" : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.data.evaluate.date_start.ToString()) ? "-" : evaluate_assign.data.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), - Position = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Position) ? string.Empty : evaluate_assign.data.experimentee.Position, - Department = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Department) ? string.Empty : evaluate_assign.data.experimentee.Department, - Organization = string.IsNullOrEmpty(evaluate_assign.data.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.data.experimentee.OrganizationOrganization, - Oc = string.IsNullOrEmpty(evaluate_assign.data.experimentee.Oc) ? string.Empty : evaluate_assign.data.experimentee.Oc, - Reason = string.IsNullOrEmpty(evaluate_assign.data.evaluate.reson) ? string.Empty : evaluate_assign.data.evaluate.reson, + EvaluateDateStart = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_start.ToString()) ? "-" : evaluate_assign.result.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + EvaluateDateFinish = string.IsNullOrEmpty(evaluate_assign.result.evaluate.date_start.ToString()) ? "-" : evaluate_assign.result.evaluate.date_start.ToThaiFullDate().ToString().ToThaiNumber(), + Position = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Position) ? string.Empty : evaluate_assign.result.experimentee.Position, + Department = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Department) ? string.Empty : evaluate_assign.result.experimentee.Department, + Organization = string.IsNullOrEmpty(evaluate_assign.result.experimentee.OrganizationOrganization) ? string.Empty : evaluate_assign.result.experimentee.OrganizationOrganization, + Oc = string.IsNullOrEmpty(evaluate_assign.result.experimentee.Oc) ? string.Empty : evaluate_assign.result.experimentee.Oc, + Reason = string.IsNullOrEmpty(evaluate_assign.result.evaluate.reson) ? string.Empty : evaluate_assign.result.evaluate.reson, ExpandMonth = expandMonth, - ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name, - ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position, - ChairmanDate = string.IsNullOrEmpty(evaluate_assign.data.evaluate.chairman_dated.ToString()) ? "-" : evaluate_assign.data.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), - CommanderName = string.IsNullOrEmpty(evaluate_assign.data.commander.name) ? string.Empty : evaluate_assign.data.commander.name, - CommanderPosition = string.IsNullOrEmpty(evaluate_assign.data.commander.Position) ? string.Empty : evaluate_assign.data.commander.Position, - CommanderDate = string.IsNullOrEmpty(evaluate_assign.data.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.data.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(), - Name = evaluate_assign.data.experimentee.name, - RoundNo = evaluate_assign.data.assign.round_no.ToString().ToThaiNumber(), - DateStart = evaluate_assign.data.assign.date_start != string.Empty ? dateStart_ : "-", - DateFinish = evaluate_assign.data.assign.date_finish != string.Empty ? dateFinish_ : "-", + ChairmanName = string.IsNullOrEmpty(evaluate_assign.result.chairman.name) ? string.Empty : evaluate_assign.result.chairman.name, + ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.result.chairman.Position) ? string.Empty : evaluate_assign.result.chairman.Position, + ChairmanDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.chairman_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(), + CommanderName = string.IsNullOrEmpty(evaluate_assign.result.commander.name) ? string.Empty : evaluate_assign.result.commander.name, + CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.Position) ? string.Empty : evaluate_assign.result.commander.Position, + CommanderDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.result.evaluate.director1_dated.ToThaiFullDate().ToString().ToThaiNumber(), + Name = evaluate_assign.result.experimentee.name, + RoundNo = evaluate_assign.result.assign.round_no.ToString().ToThaiNumber(), + DateStart = evaluate_assign.result.assign.date_start != string.Empty ? dateStart_ : "-", + DateFinish = evaluate_assign.result.assign.date_finish != string.Empty ? dateFinish_ : "-", Develop1 = developComplete1, Develop2 = developComplete2, PassResult1 = passResult1, diff --git a/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs index 8c9bc4a1..a1dc9e7f 100644 --- a/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateAssignResponse.cs @@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses public class EvaluateAssignResponse { public bool successful { get; set; } - public Data data { get; set; } + public Data result { get; set; } public class Data { diff --git a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs index e48a05e4..33ffa03e 100644 --- a/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateChairmanAssignResponse.cs @@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses public class EvaluateChairmanAssignResponse { public bool successful { get; set; } - public Data data { get; set; } + public Data result { get; set; } public class Data { diff --git a/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs index 21993ed6..023a75c2 100644 --- a/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateRecordAssignResponse.cs @@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses public class EvaluateRecordAssignResponse { public bool successful { get; set; } - public Data data { get; set; } + public Data result { get; set; } public class Data { diff --git a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs index 1729e46c..b3343c77 100644 --- a/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs +++ b/BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs @@ -5,7 +5,7 @@ namespace BMA.EHR.Application.Responses public class EvaluateResultAssignResponse { public bool successful { get; set; } - public Data data { get; set; } + public Data result { get; set; } public class Data { diff --git a/BMA.EHR.Application/Responses/PassProbationResponse.cs b/BMA.EHR.Application/Responses/PassProbationResponse.cs index b1938786..75c9ca38 100644 --- a/BMA.EHR.Application/Responses/PassProbationResponse.cs +++ b/BMA.EHR.Application/Responses/PassProbationResponse.cs @@ -4,7 +4,7 @@ { public bool successful { get; set; } - public List data { get; set; } = new(); + public List result { get; set; } = new(); } public class DataResponse diff --git a/BMA.EHR.Application/Responses/ProbationAssignResponse.cs b/BMA.EHR.Application/Responses/ProbationAssignResponse.cs index e780c42c..88314d87 100644 --- a/BMA.EHR.Application/Responses/ProbationAssignResponse.cs +++ b/BMA.EHR.Application/Responses/ProbationAssignResponse.cs @@ -3,7 +3,7 @@ public class ProbationAssignResponse { public bool successful { get; set; } - public Data data { get; set; } + public Data result { get; set; } public class Data { diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index fc8ee0cd..f1c56e0c 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -80,12 +80,13 @@ namespace BMA.EHR.Placement.Service.Controllers { return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); } + var rootId = ""; var child1Id = ""; var child2Id = ""; var child3Id = ""; var child4Id = ""; - var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position"; + var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position-act-main"; using (var client = new HttpClient()) { client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); @@ -93,80 +94,58 @@ namespace BMA.EHR.Placement.Service.Controllers var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); var _res = await client.SendAsync(_req); var _result = await _res.Content.ReadAsStringAsync(); + if (_res.IsSuccessStatusCode) + { + var org = JsonConvert.DeserializeObject(_result); + rootId = org.result.rootId == null ? "" : org.result.rootId; + child1Id = org.result.child1Id == null ? "" : org.result.child1Id; + child2Id = org.result.child2Id == null ? "" : org.result.child2Id; + child3Id = org.result.child3Id == null ? "" : org.result.child3Id; + child4Id = org.result.child4Id == null ? "" : org.result.child4Id; - var org = JsonConvert.DeserializeObject(_result); - - if (org == null || org.result == null) - return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404); - rootId = org.result.rootId == null ? "" : org.result.rootId; - child1Id = org.result.child1Id == null ? "" : org.result.child1Id; - child2Id = org.result.child2Id == null ? "" : org.result.child2Id; - child3Id = org.result.child3Id == null ? "" : org.result.child3Id; - child4Id = org.result.child4Id == null ? "" : org.result.child4Id; - - var placementOfficers = await _context.PlacementOfficers.AsQueryable() - .OrderByDescending(x => x.CreatedAt) - .Where(x => PlacementAdmin == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))) - .Select(p => new - { - p.Id, - p.citizenId, - p.profileId, - p.prefix, - p.firstName, - p.lastName, - p.rootOld, - p.rootOldId, - p.rootShortNameOld, - p.child1Old, - p.child1OldId, - p.child1ShortNameOld, - p.child2Old, - p.child2OldId, - p.child2ShortNameOld, - p.child3Old, - p.child3OldId, - p.child3ShortNameOld, - p.child4Old, - p.child4OldId, - p.child4ShortNameOld, - p.PositionOld, - p.posMasterNoOld, - p.posTypeOldId, - p.posTypeNameOld, - p.posLevelOldId, - p.posLevelNameOld, - p.CreatedAt, - p.Reason, - p.Status, - p.DateStart, - p.DateEnd, - p.Organization, - p.OrganizationPositionOld, - p.IsActive, - }) - .ToListAsync(); - - // if (keyword != "") - // { - // var data = placementOfficers.Where(x => - // (x.prefix != null && x.prefix.Contains(keyword)) || - // (x.firstName != null && x.firstName.Contains(keyword)) || - // (x.lastName != null && x.lastName.Contains(keyword)) || - // (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) || - // (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) || - // (x.PositionOld != null && x.PositionOld.Contains(keyword)) || - // (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) || - // (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) || - // (x.Organization != null && x.Organization.Contains(keyword))) - // .OrderByDescending(x => x.CreatedAt) - // .Skip((page - 1) * pageSize) - // .Take(pageSize) - // .ToList(); - - // placementOfficers = data; - // } - + var placementOfficers = await _context.PlacementOfficers.AsQueryable() + .OrderByDescending(x => x.CreatedAt) + .Where(x => org.result.isOfficer == true ? true : (rootId == "" ? true : (child1Id == "" ? x.rootOldId == rootId : (child2Id == "" ? x.child1OldId == child1Id : (child3Id == "" ? x.child2OldId == child2Id : (child4Id == "" ? x.child3OldId == child3Id : x.child4OldId == child4Id)))))) + .Select(p => new + { + p.Id, + p.citizenId, + p.profileId, + p.prefix, + p.firstName, + p.lastName, + p.rootOld, + p.rootOldId, + p.rootShortNameOld, + p.child1Old, + p.child1OldId, + p.child1ShortNameOld, + p.child2Old, + p.child2OldId, + p.child2ShortNameOld, + p.child3Old, + p.child3OldId, + p.child3ShortNameOld, + p.child4Old, + p.child4OldId, + p.child4ShortNameOld, + p.PositionOld, + p.posMasterNoOld, + p.posTypeOldId, + p.posTypeNameOld, + p.posLevelOldId, + p.posLevelNameOld, + p.CreatedAt, + p.Reason, + p.Status, + p.DateStart, + p.DateEnd, + p.Organization, + p.OrganizationPositionOld, + p.IsActive, + }) + .ToListAsync(); + } return Success(placementOfficers); } }