fix(plugins/score): 修复了「预期成绩估计」功能无法正常使用的bug

修复了教务系统更新后，「预期成绩估计」功能无法正常使用的bug

fix #45

Author: frederick-wang

src/plugins/score/ExpectedGradesEstimation.vue

@@ -56,7 +56,7 @@
             title='提示',
             type='info',
             description='您现在还没有添加预期课程~点击下面按钮新增预期课程，就可以估计预期成绩了！',
-            :show-icon='true'
+            :show-icon='true',
             :closable='false'
           )
         .input-line-list(v-for='(v, i) in newCourses', :key='i')
@@ -156,10 +156,12 @@ import {
   getAllCoursesGPA,
   getAllCoursesScore,
   getCompulsoryCourses,
-  getPointByScore
+  getPointByScore,
+  reserveHigherCoursesForRetakenCourses,
+  removeMinorCourses
 } from '@/plugins/score/utils'
 import { pluck, sum } from 'ramda'
-import { requestAllTermsCourseScoreInfoList } from '@/store/actions/request'
+import { requestAllPassingScores } from '@/store/actions/request'
 import { notifyError } from '@/helper/util'
 
 type NewCourseType = 'compulsory' | 'optional'
@@ -235,13 +237,17 @@ export default class ExpectedGradeEstimation extends Vue {
   }
 
   get hasNoError(): boolean {
-    return this.alerts.every(v => v.type !== 'error')
+    return this.alerts.every((v) => v.type !== 'error')
   }
 
   get allCourses(): CourseScoreRecord[] {
-    return this.records.reduce(
-      (acc, cur) => acc.concat(cur.courses),
-      [] as CourseScoreRecord[]
+    return reserveHigherCoursesForRetakenCourses(
+      removeMinorCourses(
+        this.records.reduce(
+          (acc, cur) => acc.concat(cur.courses),
+          [] as CourseScoreRecord[]
+        )
+      )
     )
   }
 
@@ -349,7 +355,7 @@ export default class ExpectedGradeEstimation extends Vue {
   async created(): Promise<void> {
     try {
       const records = await convertCourseScoreInfoListToScoreRecords(
-        await requestAllTermsCourseScoreInfoList()
+        await requestAllPassingScores()
       )
       this.records = records
       this.loadingIsDone = true

src/plugins/score/components/ExpectedGradesEstimation/FourTypeGradeLabels.vue

@@ -1,25 +1,25 @@
 <template lang="pug">
 .four-type-grade-labels
   span.gpa-st-tag.label.label-success(
-    :title='isTipsShown ? `您一共修读了 ${compulsoryCoursesQuantity} 门必修课程，必修加权平均分为 ${compulsoryCoursesScore}` : null'
+    :title='isTipsShown ? `您一共修读了 ${compulsoryCoursesQuantity} 门属于主修培养方案的必修课程，必修加权平均分为 ${compulsoryCoursesScore}` : null'
   )
     | 必修平均分：{{ compulsoryCoursesScore }}
   |
   |
   span.gpa-st-tag.label.label-success(
-    :title='isTipsShown ? `您一共修读了 ${compulsoryCoursesQuantity} 门必修课程，必修加权平均绩点为 ${compulsoryCoursesGPA}` : null'
+    :title='isTipsShown ? `您一共修读了 ${compulsoryCoursesQuantity} 门属于主修培养方案的必修课程，必修加权平均绩点为 ${compulsoryCoursesGPA}` : null'
   )
     | 必修绩点：{{ compulsoryCoursesGPA }}
   |
   |
   span.gpa-st-tag.label.label-purple(
-    :title='isTipsShown ? `您一共修读了 ${allCoursesQuantity} 门课程，加权平均分为 ${allCoursesScore}` : null'
+    :title='isTipsShown ? `您一共修读了 ${allCoursesQuantity} 门属于主修培养方案的课程，加权平均分为 ${allCoursesScore}` : null'
   )
     | 全部平均分：{{ allCoursesScore }}
   |
   |
   span.gpa-st-tag.label.label-purple(
-    :title='isTipsShown ? `您一共修读了 ${allCoursesQuantity} 门课程，加权平均绩点为 ${allCoursesGPA}` : null'
+    :title='isTipsShown ? `您一共修读了 ${allCoursesQuantity} 门属于主修培养方案的课程，加权平均绩点为 ${allCoursesGPA}` : null'
   )
     | 全部绩点：{{ allCoursesGPA }}
 </template>