UBC/Alley-HSBC-Frontend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

home fix

Browse Source
This commit is contained in:
CodeServer 2022-03-23 06:37:53 +00:00
parent a5467dadab
commit 9c7102dccd
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/home/MeetingsPanel.tsx
View File

@ -25,13 +25,21 @@ const MeetingsPanel: React.FC = () => {
const meetingMembers = useAppSelector((state) =>
selectUsers(state, meeting.liveParticipantIds)
);
return (
<Meeting
meetingName={meeting.topic}
meetingTime={formatTimeFromDate(new Date(meeting.start), 0) + " - " + formatTimeFromDate(new Date(meeting.start), meeting.duration)}
meetingMembers={meetingMembers.map((userLite) => (" " + userLite.name + " ")).toString()}
/>
);
const startDate = new Date(meeting.start);
const startDatemil = startDate.getTime();
const endDatemil = startDatemil + meeting.duration*60000;
const endDate = new Date(endDatemil);
const currentDatemil = Date.now();
if (currentDatemil >= startDatemil && currentDatemil <= endDatemil) {
return (
<Meeting
meetingName={meeting.topic}
meetingTime={formatTimeFromDate(startDate) + " - " + formatTimeFromDate(endDate)}
meetingMembers={meetingMembers.map((userLite) => (" " + userLite.name + " ")).toString()}
/>
);
}
})}
</div>
);

7
src/utils.tsx
View File

@ -14,11 +14,10 @@ const getStatusColor = (ms: MeetingStatus): string => {
}
};
const formatTimeFromDate = (date: Date, offsetMinutes: number): string => {
const newDate = new Date(date.getTime() + offsetMinutes*60000);
let hour = newDate.getHours();
const formatTimeFromDate = (date: Date): string => {
let hour = date.getHours();
let ampm = "";
let minutes = newDate.getMinutes() < 10 ? "0" + newDate.getMinutes() : "" + newDate.getMinutes();
let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes();
if (hour < 12) {
ampm = "am";
} else {