|
|
@@ -6,7 +6,7 @@ from django_query import get_query_value
|
6
|
6
|
from django_response import response
|
7
|
7
|
from paginator import pagination
|
8
|
8
|
|
9
|
|
-from registration.models import BranchCampusAdministratorInfo, CourseRegisterInfo, UserCourseRegisterInfo
|
|
9
|
+from registration.models import BranchCampusAdministratorInfo, CourseRegisterInfo, UserCourseRegisterInfo, BranchCampusInfo
|
10
|
10
|
|
11
|
11
|
|
12
|
12
|
def course_register(request):
|
|
|
@@ -55,7 +55,7 @@ def course_register(request):
|
55
|
55
|
# 'course_name': course_name,
|
56
|
56
|
# 'fields': registers,
|
57
|
57
|
# })
|
58
|
|
-
|
|
58
|
+
|
59
|
59
|
user_course_register, _ = UserCourseRegisterInfo.objects.get_or_create(user_id=user_id, course_id=course_id)
|
60
|
60
|
if not user_course_register.campus_id:
|
61
|
61
|
user_course_register.campus_id = admin.campus_id if admin else ''
|
|
|
@@ -73,11 +73,21 @@ def course_register(request):
|
73
|
73
|
|
74
|
74
|
|
75
|
75
|
def course_register_list(request):
|
|
76
|
+ admin_id = request.POST.get('admin_id', '')
|
76
|
77
|
course_id = request.POST.get('course_id', '')
|
77
|
78
|
page = request.POST.get('page', 1)
|
78
|
79
|
num = request.POST.get('num', 20)
|
79
|
80
|
|
80
|
|
- registers = UserCourseRegisterInfo.objects.filter(course_id=course_id, status=True).order_by('-pk')
|
|
81
|
+ registers = UserCourseRegisterInfo.objects.filter(status=True).order_by('-pk')
|
|
82
|
+
|
|
83
|
+ admin = BranchCampusAdministratorInfo.objects.get(admin_id=admin_id)
|
|
84
|
+ campus = BranchCampusInfo.objects.get(campus_id=admin.campus_id)
|
|
85
|
+ if campus.campus_type == BranchCampusInfo.BRANCH:
|
|
86
|
+ registers = UserCourseRegisterInfo.objects.filter(campus_id=admin.campus_id)
|
|
87
|
+
|
|
88
|
+ if course_id:
|
|
89
|
+ registers = UserCourseRegisterInfo.objects.filter(course_id=course_id)
|
|
90
|
+
|
81
|
91
|
count = registers.count()
|
82
|
92
|
registers, left = pagination(registers, page, num)
|
83
|
93
|
registers = [register.data for register in registers]
|