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

View File

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

View File

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