home fix
This commit is contained in:
parent
a5467dadab
commit
9c7102dccd
@ -25,13 +25,21 @@ const MeetingsPanel: React.FC = () => {
|
|||||||
const meetingMembers = useAppSelector((state) =>
|
const meetingMembers = useAppSelector((state) =>
|
||||||
selectUsers(state, meeting.liveParticipantIds)
|
selectUsers(state, meeting.liveParticipantIds)
|
||||||
);
|
);
|
||||||
|
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 (
|
return (
|
||||||
<Meeting
|
<Meeting
|
||||||
meetingName={meeting.topic}
|
meetingName={meeting.topic}
|
||||||
meetingTime={formatTimeFromDate(new Date(meeting.start), 0) + " - " + formatTimeFromDate(new Date(meeting.start), meeting.duration)}
|
meetingTime={formatTimeFromDate(startDate) + " - " + formatTimeFromDate(endDate)}
|
||||||
meetingMembers={meetingMembers.map((userLite) => (" " + userLite.name + " ")).toString()}
|
meetingMembers={meetingMembers.map((userLite) => (" " + userLite.name + " ")).toString()}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
}
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user