首页 探索 帮助
注册 登录
Hanyuan
/
hanyuan
关注 2
点赞 0
派生 0

浏览代码
:art: PEP8 & iSort

huangqimin001 3 年之前
父节点
9a7c0fd865
当前提交
9d162170ce
共有 4 个文件被更改，包括 13 次插入 和 10 次删除
显示文件统计
  1. 2 1
      api/course_field_views.py
  2. 8 5
      api/course_register_views.py
  3. 1 1
      api/urls.py
  4. 2 3
      registration/models.py

+ 2 - 1
api/course_field_views.py
查看文件 

@@ -82,6 +82,7 @@ def delete_course_field(request):
82 82
83 83 
     return response()
84 84
85 
+
85 86 
 # 小程序获取报名字段列表
86 87 
 def mp_get_course_field(request):
87 88 
     field_id = request.POST.get('field_id', '')
 
@@ -93,4 +94,4 @@ def mp_get_course_field(request):
93 94
94 95 
     return response(data={
95 96 
         'field': field.data,
96 
-    })
97 
+    })

+ 8 - 5
api/course_register_views.py
查看文件 

@@ -57,7 +57,7 @@ def course_register(request):
57 57 
     #     'course_name': course_name,
58 58 
     #     'fields': registers,
59 59 
     # })
60 
-
60 
+
61 61 
     user_course_register, _ = UserCourseRegisterInfo.objects.get_or_create(user_id=user_id, course_id=course_id)
62 62 
     if not user_course_register.campus_id:
63 63 
         user_course_register.campus_id = admin.campus_id if admin else ''
 
@@ -73,13 +73,14 @@ def course_register(request):
73 73
74 74 
     return response()
75 75
76 
+
76 77 
 def course_field_register(request):
77 78 
     user_id = request.POST.get('user_id', '')
78 79 
     field_id = request.POST.get('field_id', '')
79 80
80 81 
     try:
81 82 
         info = CourseRegisterInfo.objects.get(user_id=user_id, field_id=field_id)
82 
-    except:
83 
+    except CourseRegisterInfo.DoesNotExist:
83 84 
         return response()
84 85
85 86 
     fields = info.data.get('fields')
 
@@ -92,6 +93,7 @@ def course_field_register(request):
92 93 
         'logs': registers,
93 94 
     })
94 95
96 
+
95 97 
 def course_register_list(request):
96 98 
     admin_id = request.POST.get('admin_id', '')
97 99 
     course_id = request.POST.get('course_id', '')
 
@@ -106,7 +108,7 @@ def course_register_list(request):
106 108 
     campus = BranchCampusInfo.objects.get(campus_id=admin.campus_id)
107 109 
     if campus.campus_type == BranchCampusInfo.BRANCH:
108 110 
         registers = UserCourseRegisterInfo.objects.filter(campus_id=admin.campus_id)
109 
-
111 
+
110 112 
     if course_id:
111 113 
         registers = UserCourseRegisterInfo.objects.filter(course_id=course_id)
112 114 
 
@@ -120,6 +122,7 @@ def course_register_list(request):
120 122 
         'left': left,
121 123 
     })
122 124
125 
+
123 126 
 def update_course_registers_status(request):
124 127 
     admin_id = request.POST.get('admin_id', '')
125 128 
     course_id = request.POST.get('course_id', '')
 
@@ -141,5 +144,5 @@ def update_course_registers_status(request):
141 144 
     if (user_status == UserCourseRegisterInfo.GRADUATED) or (user_status == UserCourseRegisterInfo.CERTIFICATE and campus.campus_type == BranchCampusInfo.MAIN):
142 145 
         user_course_register.user_status = user_status
143 146 
         user_course_register.save()
144 
-
145 
-    return response()
147 
+
148 
+    return response()

+ 1 - 1
api/urls.py
查看文件 

@@ -79,4 +79,4 @@ urlpatterns += [
79 79
80 80 
 urlpatterns += [
81 81 
     url(r'^mp/branch/campus/list$', branch_campus_views.get_branch_campus_list, name='get_branch_campus_list'),
82 
-]
82 
+]

+ 2 - 3
registration/models.py
查看文件 

@@ -246,11 +246,11 @@ class UserCourseRegisterInfo(BaseModelMixin):
246 246 
     CERTIFICATE = 'certificate'
247 247
248 248 
     USER_STATUS_TUPLE = (
249 
-        (INCLASS,  '上课中'),
249 
+        (INCLASS, '上课中'),
250 250 
         (GRADUATED, '已毕业'),
251 251 
         (CERTIFICATE, '已发证'),
252 252 
     )
253 
-
253 
+
254 254 
     campus_id = models.CharField(_('campus_id'), max_length=32, blank=True, null=True, help_text='分院唯一标识', db_index=True)
255 255 
     campus_name = models.CharField(_('campus_name'), max_length=255, blank=True, null=True, help_text='分院名称')
256 256 
 
@@ -264,7 +264,6 @@ class UserCourseRegisterInfo(BaseModelMixin):
264 264
265 265 
     user_status = models.CharField(_('user_status'), max_length=32, choices=USER_STATUS_TUPLE, default=INCLASS, help_text='用户状态')
266 266
267 
-
268 267 
     # {
269 268 
     #     'field_id': '',
270 269 
     #     'fields': []