mirror of https://gitlab.com/ceda_ei/sonzai.git
Sort timetable entries by start time.
This commit is contained in:
parent
dedf976c95
commit
7d5d680a68
|
@ -15,6 +15,18 @@ import {
|
||||||
} from "react-native";
|
} from "react-native";
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
|
|
||||||
|
function sortTimes(t1, t2) {
|
||||||
|
if (t1.getHours() > t2.getHours())
|
||||||
|
return 1;
|
||||||
|
if (t1.getHours() < t2.getHours())
|
||||||
|
return -1;
|
||||||
|
if (t1.getMinute() > t2.getMinute())
|
||||||
|
return 1;
|
||||||
|
if (t1.getMinute() < t2.getMinute())
|
||||||
|
return -1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
function HomeScreen({ theme, timetable, subjects, navigation, days }) {
|
function HomeScreen({ theme, timetable, subjects, navigation, days }) {
|
||||||
return (<ScrollView>
|
return (<ScrollView>
|
||||||
{timetable.map((day, dayIdx) => (
|
{timetable.map((day, dayIdx) => (
|
||||||
|
@ -29,7 +41,7 @@ function HomeScreen({ theme, timetable, subjects, navigation, days }) {
|
||||||
>
|
>
|
||||||
<Card.Title title={days[dayIdx]} />
|
<Card.Title title={days[dayIdx]} />
|
||||||
<Card.Content>
|
<Card.Content>
|
||||||
{day.map((cls, idx) => {
|
{[...day].sort((i, j) => sortTimes(i.start, j.start)).map((cls, idx) => {
|
||||||
const subject = subjects.find(i => i.id === cls.sub_id);
|
const subject = subjects.find(i => i.id === cls.sub_id);
|
||||||
return (<View key={idx} style={style.class}>
|
return (<View key={idx} style={style.class}>
|
||||||
<Text>{format(cls.start, "HH:mm")} to {format(cls.end, "HH:mm")}</Text>
|
<Text>{format(cls.start, "HH:mm")} to {format(cls.end, "HH:mm")}</Text>
|
||||||
|
|
Loading…
Reference in New Issue