zhaoyingbo/cherry_be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'revert-821f4ef2' into 'master' (merge request !12)

Browse Source 
Revert add judge of grade number
This reverts commit 821f4ef2
This commit is contained in:
RainSun 2020-02-16 09:52:43 +00:00
commit b7b73ecb3d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/__pycache__/db.cpython-37.pyc
View File

Binary file not shown.

BIN
lib/__pycache__/photoUpload.cpython-37.pyc
View File

Binary file not shown.

8
lib/crawler.py
View File

@ -86,7 +86,7 @@ def getGrade(Ip, S):
#如果和上一个课程重名
if item['LessonInfo']['KCMC'] == last_lesson_name:
#判断是否通过
if item['YXCJ'] && item['YXCJ'] >= 60:
if item['YXCJ'] >= 60:
#如果通过贡献1通过
last_lesson_kill += 1
#贡献总学分绩点
@ -122,7 +122,7 @@ def getGrade(Ip, S):
last_term_kill, last_term_dead, last_term_credit = 0, 0, item['XF']
last_term_grade_list = []
#如果通过
if item['YXCJ'] && item['YXCJ'] >= 60:
if item['YXCJ'] >= 60:
#贡献总学分绩点
last_term_c_x_g = item['XF'] * (item['YXCJ'] - 50) / 10
#贡献通过次数
@ -133,7 +133,7 @@ def getGrade(Ip, S):
#贡献总学分
last_term_credit += item['XF']
#如果通过
if item['YXCJ'] && item['YXCJ'] >= 60:
if item['YXCJ'] >= 60:
#贡献通过数
last_lesson_kill += 1
#贡献学分绩点
@ -143,7 +143,7 @@ def getGrade(Ip, S):
'title': item['LessonInfo']['KCMC'],
'credit': item['XF'],
'grade': item['ShowYXCJ'],
'kill': 'yes' if (item['YXCJ'] && item['YXCJ'] >= 60) else 'no',
'kill': 'yes' if (item['YXCJ'] >= 60) else 'no',
'class': item['KSXZ']
})
#补充最后一次遍历的数据