Fix #30: wrong time description for assignments

robertying · Apr 11, 2019 · 6fd1304 · 6fd1304
1 parent 02bbc02
commit 6fd1304
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/components/AssignmentCard.tsx b/src/components/AssignmentCard.tsx
@@ -71,7 +71,9 @@ const AssignmentCard: FunctionComponent<IAssignmentCardProps> = props => {
               {attachment ? "附件 " + attachment : "无附件"}
             </Text>
             <Text style={{ color: "grey", fontSize: 12 }}>
-              {"还剩 " + dayjs().to(dayjs(date), true)}
+              {dayjs().isAfter(dayjs(date))
+                ? dayjs().to(dayjs(date)) + "截止"
+                : "还剩 " + dayjs().to(dayjs(date), true)}
             </Text>
           </View>
         </View>

diff --git a/src/screens/CourseDetailScreen.tsx b/src/screens/CourseDetailScreen.tsx
@@ -89,12 +89,7 @@ const CourseDetailScreen: INavigationScreen<
 
   const notices = rawNotices.filter(item => item.courseId === courseId);
   const files = rawFiles.filter(item => item.courseId === courseId);
-  const assignments = [...rawAssignments]
-    .filter(
-      item =>
-        item.courseId === courseId && dayjs(item.deadline).isAfter(dayjs())
-    )
-    .sort((a, b) => dayjs(a.deadline).unix() - dayjs(b.deadline).unix());
+  const assignments = rawAssignments.filter(item => item.courseId === courseId);
 
   const [index, setIndex] = useState(0);
   const routes: any = [