Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show/hide topic navigation meeting setting #3582

Merged
merged 4 commits into from
Apr 19, 2024
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 @@ -20,6 +20,7 @@ export const meetingSettingsDefaults: { [key: string]: any } = {
agenda_item_creation: `default_no`,
agenda_new_items_default_visibility: `internal`,
agenda_show_internal_items_on_projector: false,
agenda_show_topic_navigation_on_detail_view: false,
agenda_show_subtitles: false,
list_of_speakers_enable_point_of_order_speakers: true,
list_of_speakers_enable_pro_contra_speech: false,
Expand Down
2 changes: 2 additions & 0 deletions client/src/app/domain/models/meetings/meeting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export class Settings {
public agenda_item_creation!: AgendaItemCreation;
public agenda_new_items_default_visibility!: AgendaItemType;
public agenda_show_internal_items_on_projector!: boolean;
public agenda_show_topic_navigation_on_detail_view!: boolean;

// List of speakers
public list_of_speakers_amount_last_on_projector!: number;
Expand Down Expand Up @@ -336,6 +337,7 @@ export class Meeting extends BaseModel<Meeting> {
`agenda_item_creation`,
`agenda_new_items_default_visibility`,
`agenda_show_internal_items_on_projector`,
`agenda_show_topic_navigation_on_detail_view`,
`list_of_speakers_amount_last_on_projector`,
`list_of_speakers_amount_next_on_projector`,
`list_of_speakers_couple_countdown`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class TopicDetailComponent extends BaseMeetingComponent implements OnInit
public getTitleFn = () => this.topic.getListTitle();

public get showNavigateButtons(): boolean {
return !!this.previousTopic || !!this.nextTopic;
return this.enableNavigation && (!!this.previousTopic || !!this.nextTopic);
}

public get nextTopic(): ViewTopic | null {
Expand All @@ -97,6 +97,8 @@ export class TopicDetailComponent extends BaseMeetingComponent implements OnInit

private _sortedTopics: ViewTopic[] = [];

private enableNavigation = false;

/**
* Constructor for the topic detail page.
*/
Expand Down Expand Up @@ -149,7 +151,10 @@ export class TopicDetailComponent extends BaseMeetingComponent implements OnInit
}
this.setSurroundingTopics();
}
})
}),
this.meetingSettingsService
.get(`agenda_show_topic_navigation_on_detail_view`)
.subscribe(show => (this.enableNavigation = show))
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
key: `agenda_show_subtitles`,
label: _(`Show motion submitters in the agenda`),
type: `boolean`
},
{
key: `agenda_show_topic_navigation_on_detail_view`,
label: _(`Show topic navigation in detail view`),
type: `boolean`
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion client/src/meta
Submodule meta updated 1 files
+4 −0 models.yml
Loading