modify some error

This commit is contained in:
lijingwei 2020-02-09 18:52:51 +08:00
parent 8b780d27f1
commit 64e03210cc

View File

@ -66,6 +66,7 @@ def getGrade(Ip, S):
last_term_total_credit = 0
last_term_total_c_x_g = 0#sum(学分*绩点)
last_term_GPA = 0
last_lesson_name = ''
for item in data['data']['GradeList']:
#如果学期改变
if last_term != item['KSXNXQ']:
@ -94,24 +95,35 @@ def getGrade(Ip, S):
'title': item['LessonInfo']['KCMC'],
'credit': item['XF'],
'grade': item['ShowYXCJ'],
'kill': 'yes' if (item['YXCJ'] > 0) else 'no'
'kill': 'yes' if (item['YXCJ'] >= 60) else 'no',
'class': item['KSXZ']
}
)
if item['YXCJ'] < 60:
last_term_dead += 1
if item['LessonInfo']['KCMC'] == last_lesson_name:
if item['YXCJ'] >= 60:
last_term_dead -= 1
last_term_kill += 1
last_term_total_credit += item['XF']
grade = (item['YXCJ'] - (item['YXCJ'] % 10) - 50) // 10
grade += 0.5 if (item['YXCJ'] % 10 >= 5) else 0
last_term_total_c_x_g += item['XF'] * grade
else:
last_term_kill += 1
last_term_total_credit += item['XF']
grade = (item['YXCJ'] - (item['YXCJ'] % 10) - 50) // 10
grade += 0.5 if (item['YXCJ'] % 10 >= 5) else 0
last_term_total_c_x_g += item['XF'] * grade
last_lesson_name = item['YXCJ']
if item['YXCJ'] < 60:
last_term_dead += 1
else:
last_term_kill += 1
last_term_total_credit += item['XF']
grade = (item['YXCJ'] - (item['YXCJ'] % 10) - 50) // 10
grade += 0.5 if (item['YXCJ'] % 10 >= 5) else 0
last_term_total_c_x_g += item['XF'] * grade
last_term_GPA = last_term_total_c_x_g / last_term_total_credit
grade_list.append(
{
'term_time': last_term,
'term_GPA': last_term_GPA,
'term_total_kill': last_term_kill,
'term_total_dead': last_term_dead,
'term_kill': last_term_kill,
'term_dead': last_term_dead,
'term_credit': last_term_total_credit,
'term_grade': last_term_grade_list
}