Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ interface GetForwardMeetingsPresenterPayload {
export interface GetForwardingMeetingsPresenterMeeting {
id: string;
name: string;
start_time: number;
end_time: number;
start_time: string;
end_time: string;
}

export interface GetForwardingMeetingsPresenter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,14 @@ export class AgendaForwardDialogComponent implements OnInit {

private getMeetingsSorted(committee: GetForwardingMeetingsPresenter): GetForwardingMeetingsPresenterMeeting[] {
return committee.meetings.sort((a, b) => {
const end_time = b.end_time - a.end_time;
const a_end_time = Date.parse(a.end_time);
const b_end_time = Date.parse(b.end_time);
const end_time = b_end_time - a_end_time;
if (Number.isNaN(end_time)) {
if (b.end_time) {
return b.end_time;
} else if (a.end_time) {
return -a.end_time;
if (b_end_time) {
return b_end_time;
} else if (a_end_time) {
return -a_end_time;
}
return a.name.localeCompare(b.name);
} else if (end_time === 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class AgendaForwardDialogService
?.group_ids.includes((meeting as any).admin_group_id)
) ||
this._forwardingMeeting.meetings.some(
meeting => meeting.end_time && meeting.end_time * 1000 < Date.now()
meeting => meeting.end_time && Date.parse(meeting.end_time) < Date.now()
))
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,14 @@ export class MotionForwardDialogComponent implements OnInit {

private getMeetingsSorted(committee: GetForwardingMeetingsPresenter): GetForwardingMeetingsPresenterMeeting[] {
return committee.meetings.sort((a, b) => {
const end_time = b.end_time - a.end_time;
const a_end_time = Date.parse(a.end_time);
const b_end_time = Date.parse(b.end_time);
const end_time = b_end_time - a_end_time;
if (Number.isNaN(end_time)) {
if (b.end_time) {
return b.end_time;
} else if (a.end_time) {
return -a.end_time;
if (b_end_time) {
return b_end_time;
} else if (a_end_time) {
return -a_end_time;
}
return a.name.localeCompare(b.name);
} else if (end_time === 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class MotionForwardDialogService extends BaseDialogService<
return (
+meetingData.id !== this.activeMeeting.meetingId &&
meetingData.end_time &&
new Date() <= endOfDay(fromUnixTime(meetingData.end_time))
new Date() <= endOfDay(fromUnixTime(Date.parse(meetingData.end_time)))
);
}

Expand Down
Loading