From 9301e2cf08492ac31460b13e5389d8f61a87fd76 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Thu, 12 Mar 2020 16:38:14 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=94=E0=B8=B9?= =?UTF-8?q?=E0=B8=87=E0=B9=88=E0=B8=B2=E0=B8=A2=E0=B8=82=E0=B8=B6=E0=B9=89?= =?UTF-8?q?=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/rep_family/rep_familyService.cs | 6 +++--- .../rep_leave_summary/rep_leave_summaryService.cs | 4 ++-- Models/rep_leave_total/rep_leave_totalService.cs | 4 ++-- .../rep_position_salaryService.cs | 6 +++--- Models/rep_samana/rep_samanaService.cs | 4 ++-- .../rep_study_history/rep_study_historyService.cs | 8 ++++---- .../rep_working_type/Irep_working_typeService.cs | 1 - Models/rep_working_type/rep_working_typeService.cs | 14 ++------------ Views/rep_familyView/rep_family_report.cshtml | 3 +++ .../rep_leave_summary_report.cshtml | 2 ++ .../rep_leave_total_report.cshtml | 2 ++ .../rep_position_salary_report.cshtml | 3 +++ Views/rep_samanaView/rep_samana_report.cshtml | 2 ++ .../rep_study_history_report.cshtml | 4 ++++ .../rep_working_type_report.cshtml | 2 ++ 15 files changed, 36 insertions(+), 29 deletions(-) diff --git a/Models/rep_family/rep_familyService.cs b/Models/rep_family/rep_familyService.cs index 7e29c41..9a364ea 100644 --- a/Models/rep_family/rep_familyService.cs +++ b/Models/rep_family/rep_familyService.cs @@ -33,9 +33,9 @@ namespace TodoAPI2.Models public rep_familyWithSelectionViewModel GetBlankItem() { var i = new rep_familyWithSelectionViewModel(); - i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) select x).ToList(); - i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList(); - i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList(); + i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) orderby x.fullname select x).ToList(); + i.item_position_id = (from x in ext.GetPositionForReport() orderby x.external_name select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); i.item_relation_id = (from x in ext.GetRelationshipForReport() select x).ToList(); diff --git a/Models/rep_leave_summary/rep_leave_summaryService.cs b/Models/rep_leave_summary/rep_leave_summaryService.cs index f86c2c6..13beb6b 100644 --- a/Models/rep_leave_summary/rep_leave_summaryService.cs +++ b/Models/rep_leave_summary/rep_leave_summaryService.cs @@ -34,8 +34,8 @@ namespace TodoAPI2.Models { var i = new rep_leave_summaryWithSelectionViewModel(); i.item_fiscal_year = (from x in ext.GetFiscalYear() select x).ToList(); - i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList(); - i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); + i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) orderby x.fullname select x).ToList(); return i; } diff --git a/Models/rep_leave_total/rep_leave_totalService.cs b/Models/rep_leave_total/rep_leave_totalService.cs index 70ab788..1418364 100644 --- a/Models/rep_leave_total/rep_leave_totalService.cs +++ b/Models/rep_leave_total/rep_leave_totalService.cs @@ -33,8 +33,8 @@ namespace TodoAPI2.Models public rep_leave_totalWithSelectionViewModel GetBlankItem() { var i = new rep_leave_totalWithSelectionViewModel(); - i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) select x).ToList(); - i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList(); + i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) orderby x.fullname select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); return i; diff --git a/Models/rep_position_salary/rep_position_salaryService.cs b/Models/rep_position_salary/rep_position_salaryService.cs index 013c8a7..79d84d4 100644 --- a/Models/rep_position_salary/rep_position_salaryService.cs +++ b/Models/rep_position_salary/rep_position_salaryService.cs @@ -34,9 +34,9 @@ namespace TodoAPI2.Models public rep_position_salaryWithSelectionViewModel GetBlankItem() { var i = new rep_position_salaryWithSelectionViewModel(); - i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) select x).ToList(); - i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList(); - i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList(); + i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) orderby x.fullname select x).ToList(); + i.item_position_id = (from x in ext.GetPositionForReport() orderby x.external_name select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); return i; diff --git a/Models/rep_samana/rep_samanaService.cs b/Models/rep_samana/rep_samanaService.cs index 5fea444..3741a15 100644 --- a/Models/rep_samana/rep_samanaService.cs +++ b/Models/rep_samana/rep_samanaService.cs @@ -33,8 +33,8 @@ namespace TodoAPI2.Models public rep_samanaWithSelectionViewModel GetBlankItem() { var i = new rep_samanaWithSelectionViewModel(); - i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) select x).ToList(); - i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList(); + i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) orderby x.fullname select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); return i; } diff --git a/Models/rep_study_history/rep_study_historyService.cs b/Models/rep_study_history/rep_study_historyService.cs index 63577dd..bc7566d 100644 --- a/Models/rep_study_history/rep_study_historyService.cs +++ b/Models/rep_study_history/rep_study_historyService.cs @@ -33,10 +33,10 @@ namespace TodoAPI2.Models public rep_study_historyWithSelectionViewModel GetBlankItem() { var i = new rep_study_historyWithSelectionViewModel(); - i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) select x).ToList(); - i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList(); - i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList(); - i.item_study_level_id = (from x in ext.GetEducationForReport() select x).ToList(); + i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) orderby x.fullname select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); + i.item_position_id = (from x in ext.GetPositionForReport() orderby x.external_name select x).ToList(); + i.item_study_level_id = (from x in ext.GetEducationForReport() orderby x.external_name select x).ToList(); return i; diff --git a/Models/rep_working_type/Irep_working_typeService.cs b/Models/rep_working_type/Irep_working_typeService.cs index 00f2970..2ac9846 100644 --- a/Models/rep_working_type/Irep_working_typeService.cs +++ b/Models/rep_working_type/Irep_working_typeService.cs @@ -13,7 +13,6 @@ namespace TodoAPI2.Models public interface Irep_working_typeService { - rep_working_typeWithSelectionViewModel GetWithSelection(Guid id); rep_working_typeWithSelectionViewModel GetBlankItem(); diff --git a/Models/rep_working_type/rep_working_typeService.cs b/Models/rep_working_type/rep_working_typeService.cs index be17884..1a6a4c8 100644 --- a/Models/rep_working_type/rep_working_typeService.cs +++ b/Models/rep_working_type/rep_working_typeService.cs @@ -57,21 +57,11 @@ namespace TodoAPI2.Models #region Query Functions - public rep_working_typeWithSelectionViewModel GetWithSelection(Guid id) - { - var entity = _repository.Get(id); - var i = Mapper.Map(entity); - i.item_employee_id = emp.GetListByemployee_type(null, null); - i.item_org_id = ext.GetDepartmentDataForReport(); - - - return i; - } public rep_working_typeWithSelectionViewModel GetBlankItem() { var i = new rep_working_typeWithSelectionViewModel(); - i.item_employee_id = emp.GetListByemployee_type(null, null); - i.item_org_id = ext.GetDepartmentDataForReport(); + i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) orderby x.fullname select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); return i; diff --git a/Views/rep_familyView/rep_family_report.cshtml b/Views/rep_familyView/rep_family_report.cshtml index bb9e114..1d25ac3 100644 --- a/Views/rep_familyView/rep_family_report.cshtml +++ b/Views/rep_familyView/rep_family_report.cshtml @@ -63,6 +63,9 @@ $(document).ready(function () { rep_family_InitialForm(); SetupValidationRemark("s_rep_family"); + $("#s_rep_family_employee_id").select2(); + $("#s_rep_family_position_id").select2(); + $("#s_rep_family_org_id").select2(); }); } diff --git a/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml b/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml index 793b436..6d51e70 100644 --- a/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml +++ b/Views/rep_leave_summaryView/rep_leave_summary_report.cshtml @@ -59,6 +59,8 @@ $(document).ready(function () { rep_leave_summary_InitialForm(); SetupValidationRemark("s_rep_leave_summary"); + $("#s_rep_leave_summary_org_id").select2(); + $("#s_rep_leave_summary_employee_id").select2(); }); } diff --git a/Views/rep_leave_totalView/rep_leave_total_report.cshtml b/Views/rep_leave_totalView/rep_leave_total_report.cshtml index 4b50882..fae6377 100644 --- a/Views/rep_leave_totalView/rep_leave_total_report.cshtml +++ b/Views/rep_leave_totalView/rep_leave_total_report.cshtml @@ -67,6 +67,8 @@ $(document).ready(function () { rep_leave_total_InitialForm(); SetupValidationRemark("s_rep_leave_total"); + $("#s_rep_leave_total_employee_id").select2(); + $("#s_rep_leave_total_org_id").select2(); }); } diff --git a/Views/rep_position_salaryView/rep_position_salary_report.cshtml b/Views/rep_position_salaryView/rep_position_salary_report.cshtml index bdd1498..56a0904 100644 --- a/Views/rep_position_salaryView/rep_position_salary_report.cshtml +++ b/Views/rep_position_salaryView/rep_position_salary_report.cshtml @@ -59,6 +59,9 @@ $(document).ready(function () { rep_position_salary_InitialForm(); SetupValidationRemark("s_rep_position_salary"); + $("#s_rep_position_salary_employee_id").select2(); + $("#s_rep_position_salary_position_id").select2(); + $("#s_rep_position_salary_org_id").select2(); }); } diff --git a/Views/rep_samanaView/rep_samana_report.cshtml b/Views/rep_samanaView/rep_samana_report.cshtml index d0ffeb4..87ffcc0 100644 --- a/Views/rep_samanaView/rep_samana_report.cshtml +++ b/Views/rep_samanaView/rep_samana_report.cshtml @@ -63,6 +63,8 @@ $(document).ready(function () { rep_samana_InitialForm(); SetupValidationRemark("s_rep_samana"); + $("#s_rep_samana_employee_id").select2(); + $("#s_rep_samana_org_id").select2(); }); } diff --git a/Views/rep_study_historyView/rep_study_history_report.cshtml b/Views/rep_study_historyView/rep_study_history_report.cshtml index 4058888..a1e5335 100644 --- a/Views/rep_study_historyView/rep_study_history_report.cshtml +++ b/Views/rep_study_historyView/rep_study_history_report.cshtml @@ -63,6 +63,10 @@ $(document).ready(function () { rep_study_history_InitialForm(); SetupValidationRemark("s_rep_study_history"); + $("#s_rep_study_history_employee_id").select2(); + $("#s_rep_study_history_org_id").select2(); + $("#s_rep_study_history_position_id").select2(); + $("#s_rep_study_history_study_level_id").select2(); }); } diff --git a/Views/rep_working_typeView/rep_working_type_report.cshtml b/Views/rep_working_typeView/rep_working_type_report.cshtml index 9a548f1..9ffea1b 100644 --- a/Views/rep_working_typeView/rep_working_type_report.cshtml +++ b/Views/rep_working_typeView/rep_working_type_report.cshtml @@ -64,6 +64,8 @@ $(document).ready(function () { rep_working_type_InitialForm(); SetupValidationRemark("s_rep_working_type"); + $("#s_rep_working_type_employee_id").select2(); + $("#s_rep_working_type_org_id").select2(); }); }