diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js index 6d7ff363b..9ea787362 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ElectiveMerge/Index.js @@ -169,7 +169,11 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function () { - page.search(); + var param = {}; + param.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + param.Semester = $('#Semester').lrselectGet(); + param.LessonName = $('#LessonName').lrselectGet(); + page.search(param); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js index 86dc7a8d9..9bd517a48 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/Index.js @@ -119,8 +119,8 @@ var bootstrap = function ($, learun) { ], mainId: 'Id', isPage: true, - sidx: 'AcademicYearNo,Semester', - sord: 'desc', + sidx: 'AcademicYearNo desc,Semester desc,LessonName asc,EmpName asc,LessonSection asc', + //sord: 'desc', isMultiselect: true }); page.search();