2 değiştirilmiş dosya ile 82 ekleme ve 59 silme
Görünümü Böl
Diff Seçenekleri
-
+36 -32Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs
-
+46 -27Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/Index.js
+ 36
- 32
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs
Dosyayı Görüntüle
| @@ -243,7 +243,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||
| { | |||
| return JsonResult(noDataResult); | |||
| } | |||
| var formatDataa = from d in timeTables | |||
| var leaveList = stuAttendanceLeaveIBLL.GetList(); | |||
| var formatData = from d in timeTables | |||
| let tt = d.LessonTime.Substring(1) | |||
| group d by tt into g | |||
| orderby g.Key | |||
| @@ -270,43 +271,46 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||
| classRoomNo = e?.ClassRoomNo.Trim(), | |||
| lessonSortNo = e.LessonSortNo, | |||
| e.OLPEId, | |||
| className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName | |||
| className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName, | |||
| leaveType = leaveList.Any(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime) ? 1 : 0, | |||
| checkType = leaveList.FirstOrDefault(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime)?.IsCheck, | |||
| } | |||
| } | |||
| ; | |||
| var leaveList = stuAttendanceLeaveIBLL.GetList(); | |||
| var formatData = timeTables.OrderBy(a => a.LessonTime.Substring(1)) | |||
| .Select(a => new | |||
| { | |||
| time = a.LessonTime.Substring(1), | |||
| list = timeTables.Where(b => b.LessonTime.Substring(1) == a.LessonTime.Substring(1)) | |||
| .Select(b => new | |||
| { | |||
| day = b.LessonTime.ToCharArray()[0], | |||
| curriculum = string.IsNullOrEmpty(b.EnName) ? (b.LessonSortNo == "2" ? b.LessonName + "[选修]" : b.LessonName) : (b.LessonSortNo == "2" ? b.EnName + "[选修]" : b.EnName), | |||
| lessonName = b.LessonName, | |||
| teacher = b.EmpName, | |||
| classRoom = b.ClassroomName.Trim(), | |||
| academicyear = semesterAndYear.AcademicYearShort, | |||
| semester = strSemester, | |||
| lessonNo = b?.LessonNo, | |||
| teachClassNo = b?.TeachClassNo, | |||
| empno = b?.EmpNo, | |||
| lessonTime = b.LessonTime, | |||
| lessonDate = b.LessonDate.ToString("yyyy-MM-dd"), | |||
| classRoomNo = b?.ClassRoomNo.Trim(), | |||
| lessonSortNo = b.LessonSortNo, | |||
| b.OLPEId, | |||
| className = string.IsNullOrEmpty(b.ClassName) ? "" : b.ClassName, | |||
| leaveType = leaveList.Any(c => c.LessonNo == b.LessonNo && c.StuNo == userInfo.account && c.LessonDate == b.LessonDate && c.LessonTime == b.LessonTime) ? 1 : 0, | |||
| checkType = leaveList.FirstOrDefault(c => c.LessonNo == b.LessonNo && c.StuNo == userInfo.account && c.LessonDate == b.LessonDate && c.LessonTime == b.LessonTime)?.IsCheck, | |||
| }) | |||
| }); | |||
| // var leaveList = stuAttendanceLeaveIBLL.GetList(); | |||
| //var formatData = timeTables.OrderBy(a => a.LessonTime.Substring(1)) | |||
| // .Select(a => new | |||
| // { | |||
| // time = a.LessonTime.Substring(1), | |||
| // list = timeTables.Where(b => b.LessonTime.Substring(1) == a.LessonTime.Substring(1)) | |||
| // .Select(b => new | |||
| // { | |||
| // day = b.LessonTime.ToCharArray()[0], | |||
| // curriculum = string.IsNullOrEmpty(b.EnName) ? (b.LessonSortNo == "2" ? b.LessonName + "[选修]" : b.LessonName) : (b.LessonSortNo == "2" ? b.EnName + "[选修]" : b.EnName), | |||
| // lessonName = b.LessonName, | |||
| // teacher = b.EmpName, | |||
| // classRoom = b.ClassroomName.Trim(), | |||
| // academicyear = semesterAndYear.AcademicYearShort, | |||
| // semester = strSemester, | |||
| // lessonNo = b?.LessonNo, | |||
| // teachClassNo = b?.TeachClassNo, | |||
| // empno = b?.EmpNo, | |||
| // lessonTime = b.LessonTime, | |||
| // lessonDate = b.LessonDate.ToString("yyyy-MM-dd"), | |||
| // classRoomNo = b?.ClassRoomNo.Trim(), | |||
| // lessonSortNo = b.LessonSortNo, | |||
| // b.OLPEId, | |||
| // className = string.IsNullOrEmpty(b.ClassName) ? "" : b.ClassName, | |||
| // leaveType = leaveList.Any(c => c.LessonNo == b.LessonNo && c.StuNo == userInfo.account && c.LessonDate == b.LessonDate && c.LessonTime == b.LessonTime) ? 1 : 0, | |||
| // checkType = leaveList.FirstOrDefault(c => c.LessonNo == b.LessonNo && c.StuNo == userInfo.account && c.LessonDate == b.LessonDate && c.LessonTime == b.LessonTime)?.IsCheck, | |||
| // }) | |||
| // }); | |||
| //foreach (var item in formatData.list) | |||
| //{ | |||
+ 46
- 27
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/Index.js
Dosyayı Görüntüle
| @@ -69,6 +69,16 @@ var bootstrap = function ($, learun) { | |||
| return flog; | |||
| } | |||
| function flogs2(num, data, obj) { | |||
| var arr = new Array(); | |||
| $.each(data, | |||
| function (i, n) { | |||
| if (n[obj] == num) { | |||
| arr.push(n); | |||
| } | |||
| }) | |||
| return arr; | |||
| } | |||
| //某节课空 | |||
| function tdHandle() { | |||
| var html = ''; | |||
| @@ -84,39 +94,48 @@ var bootstrap = function ($, learun) { | |||
| for (var k = 1; k < 8; k++) { | |||
| (function (arg) { | |||
| var args = arg - 1; | |||
| var datas = flogs(arg, lists, 'day'); | |||
| if (datas) { | |||
| html += '<td class="active"><div>课程：' + | |||
| datas.curriculum + | |||
| '</div>' + | |||
| //'<div>教师：' + | |||
| //datas.teacher + | |||
| //'</div>' + | |||
| '<div>班级：' + | |||
| datas.className + | |||
| '</div>' + | |||
| '<div>教室：' + | |||
| datas.classRoom; | |||
| var loginInfo = learun.clientdata.get(['userinfo']); | |||
| if (loginInfo.Description == "学生") { | |||
| if (datas.leaveType == 1) { | |||
| if (datas.checkType == 1) { | |||
| html += '</div><span>请假通过</span></td>'; | |||
| } else if (datas.checkType == 2) { | |||
| html += '</div><span>请假未通过</span></td>'; | |||
| var datas = flogs2(arg, lists, 'day'); | |||
| if (datas.length > 0) { | |||
| html += '<td class="active">'; | |||
| $.each(datas, function (i, item) { | |||
| if (i > 0) { | |||
| html += '<hr>'; | |||
| } | |||
| html += '<div>课程：' + | |||
| item.curriculum + | |||
| '</div>' + | |||
| '<div>教师：' + | |||
| item.teacher + | |||
| '</div>' + | |||
| '<div>班级：' + | |||
| item.className + | |||
| '</div>' + | |||
| '<div>教室：' + | |||
| item.classRoom + | |||
| '</div>'; | |||
| var loginInfo = learun.clientdata.get(['userinfo']); | |||
| if (loginInfo.Description == "学生") { | |||
| if (item.leaveType == 1) { | |||
| if (item.checkType == 1) { | |||
| html += '</div><span>请假通过</span></td>'; | |||
| } else if (item.checkType == 2) { | |||
| html += '</div><span>请假未通过</span></td>'; | |||
| } else { | |||
| html += '</div><span>请假申请中</span></td>'; | |||
| } | |||
| } else { | |||
| html += '</div><span>请假申请中</span></td>'; | |||
| html += '</div><span class="leave" lessonNo="' + item.lessonNo + '" lessonTime="' + item.lessonTime + '" lessonDate="' + item.lessonDate + '" lessonName="' + item.curriculum + '" empNo="' + item.empno + '" academicyear="' + item.academicyear + '" semester="' + item.semester + '" lessonSortNo="' + item.lessonSortNo + '" classRoomNo="' + item.classRoomNo + '" teachClassNo="' + item.teachClassNo + '">请假</span></td>'; | |||
| } | |||
| } else { | |||
| html += '</div><span class="leave" lessonNo="' + datas.lessonNo + '" lessonTime="' + datas.lessonTime + '" lessonDate="' + datas.lessonDate + '" lessonName="' + datas.curriculum + '" empNo="' + datas.empno + '" academicyear="' + datas.academicyear + '" semester="' + datas.semester + '" lessonSortNo="' + datas.lessonSortNo + '" classRoomNo="' + datas.classRoomNo + '" teachClassNo="' + datas.teachClassNo + '">请假</span></td>'; | |||
| } | |||
| } | |||
| }); | |||
| html += '</td>'; | |||
| html += "</td>"; | |||
| } else { | |||
| html += '<td><div></div><div></div><div></div></td>'; | |||
| html += '<td><div></div><div></div><div></div><div></div></td>'; | |||
| } | |||
| })(k); | |||
| } | |||
| return html; | |||