fix: compare raw points w/ raw pass points (#40)

Damego · May 25, 2023 · 534178f · 534178f
1 parent 364c5f4
commit 534178f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/screens/signs/CardSign.jsx b/screens/signs/CardSign.jsx
@@ -60,9 +60,9 @@ const getSubjectPointsStyle = (subject, totalPoint) => {
   if (subject.info.length === 0) return styles.colorNoMark;
 
   let textStyle;
-  subject.info.forEach(({ passScore, points, currentScore, isAbsent, isIntroductionWork }) => {
+  subject.info.forEach(({ passScore, points, isAbsent, isIntroductionWork }) => {
     if (!isIntroductionWork) {
-      if (isAbsent || currentScore < passScore) textStyle = styles.colorMark2;
+      if (isAbsent || points < passScore) textStyle = styles.colorMark2;
       else if (Number.isNaN(points) && !isAbsent) textStyle = styles.colorNoMark;
     }
   });

diff --git a/screens/signs/Subject.jsx b/screens/signs/Subject.jsx
@@ -27,7 +27,7 @@ const SubjectCheckPoint = ({ data }) => (
         <Text
           style={
             (Number.isNaN(info.points) && info.isAbsent || info.points < info.passScore) &&
-              (info.maxScore !== 0.0)
+              (!info.isIntroductionWork)
               ? styles.markFail
               : styles.markNeutral
           }
@@ -38,4 +38,4 @@ const SubjectCheckPoint = ({ data }) => (
   </View>
 );
 
-export default SubjectCheckPoint;
+export default SubjectCheckPoint;