diff --git a/client/src/app/domain/models/mediafiles/mediafile.constants.ts b/client/src/app/domain/models/mediafiles/mediafile.constants.ts index ee0fe045db..a969532ca8 100644 --- a/client/src/app/domain/models/mediafiles/mediafile.constants.ts +++ b/client/src/app/domain/models/mediafiles/mediafile.constants.ts @@ -37,7 +37,7 @@ export const FontDefaults: { [place in FontPlace]: string } = { export const FONT_PLACES = Object.keys(FontDisplayNames) as FontPlace[]; export type ViewMediafileMeetingUsageKey = - | `used_as_logo_${LogoPlace | FontPlace}_in_meeting` + | `used_as_logo_${LogoPlace}_in_meeting` | `used_as_font_${FontPlace}_in_meeting`; export type MediafileMeetingUsageIdKey = `${ViewMediafileMeetingUsageKey}_id`; diff --git a/client/src/app/domain/models/meeting-users/meeting-user.ts b/client/src/app/domain/models/meeting-users/meeting-user.ts index 53142cef33..3b9cb26d52 100644 --- a/client/src/app/domain/models/meeting-users/meeting-user.ts +++ b/client/src/app/domain/models/meeting-users/meeting-user.ts @@ -28,8 +28,6 @@ export class MeetingUser extends BaseDecimalModel { public vote_delegations_from_ids!: Id[]; // meeting_user/vote_delegated_to_id; public chat_message_ids!: Id[]; // (chat_message/meeting_user_id)[]; - public projection_ids!: any[]; - public constructor(input?: Partial) { super(MeetingUser.COLLECTION, input); } diff --git a/client/src/app/domain/models/meetings/meeting.ts b/client/src/app/domain/models/meetings/meeting.ts index e68f1fed32..1d80ab31af 100644 --- a/client/src/app/domain/models/meetings/meeting.ts +++ b/client/src/app/domain/models/meetings/meeting.ts @@ -31,7 +31,6 @@ export class Settings { // TODO: Move to meeting. these are not settings anymore, if the meeting-detail-view // in the committee-list-view is finished. - public is_template!: boolean; // Unique within a committee public enable_anonymous!: boolean; public language!: boolean; @@ -40,9 +39,6 @@ export class Settings { public jitsi_room_name!: string; public jitsi_room_password!: string; - // Chat - public enable_chat!: boolean; - public conference_show!: boolean; public conference_auto_connect!: boolean; public conference_los_restriction!: boolean; @@ -175,22 +171,11 @@ export class Settings { public assignment_poll_default_backend!: PollBackendDurationType; //topic poll - topic_poll_ballot_paper_selection: BallotPaperSelection; - topic_poll_ballot_paper_number: number; - topic_poll_add_candidates_to_list_of_speakers: boolean; - topic_poll_enable_max_votes_per_option: boolean; - topic_poll_sort_poll_result_by_votes: boolean; - topic_poll_default_type: PollType; - topic_poll_default_method: PollMethod; - topic_poll_default_onehundred_percent_base: PollPercentBase; topic_poll_default_group_ids: Id[]; // (group/used_as_poll_default_id)[]; - topic_poll_default_backend: PollBackendDurationType; //default poll poll_ballot_paper_selection: BallotPaperSelection; poll_ballot_paper_number: number; - poll_add_candidates_to_list_of_speakers: boolean; - poll_enable_max_votes_per_option: boolean; poll_sort_poll_result_by_votes: boolean; poll_default_type: PollType; poll_default_method: PollMethod; diff --git a/client/src/app/domain/models/motions/motion-workflow.ts b/client/src/app/domain/models/motions/motion-workflow.ts index 6ad55dc13f..719ff54883 100644 --- a/client/src/app/domain/models/motions/motion-workflow.ts +++ b/client/src/app/domain/models/motions/motion-workflow.ts @@ -14,7 +14,6 @@ export class MotionWorkflow extends BaseModel { public state_ids!: Id[]; // (motion_state/workflow_id)[]; public first_state_id!: Id; // motion_state/first_state_of_workflow_id; - public motion_ids!: Id[]; // (motion/workflow_id)[]; public default_workflow_meeting_id!: Id; // meeting/motions_default_workflow_id; public default_amendment_workflow_meeting_id!: Id; // meeting/motions_default_amendment_workflow_id; public default_statute_amendment_workflow_meeting_id!: Id; // meeting/motions_default_statute_amendments_workflow_id; diff --git a/client/src/app/domain/models/topics/topic.ts b/client/src/app/domain/models/topics/topic.ts index 9fae412f53..73a45ef047 100644 --- a/client/src/app/domain/models/topics/topic.ts +++ b/client/src/app/domain/models/topics/topic.ts @@ -5,7 +5,6 @@ import { HasAgendaItemId } from '../../interfaces/has-agenda-item-id'; import { HasAttachmentIds } from '../../interfaces/has-attachment-ids'; import { HasListOfSpeakersId } from '../../interfaces/has-list-of-speakers-id'; import { HasMeetingId } from '../../interfaces/has-meeting-id'; -import { HasTagIds } from '../../interfaces/has-tag-ids'; import { BaseModel } from '../base/base-model'; /** @@ -38,6 +37,5 @@ export interface Topic HasAgendaItemId, HasListOfSpeakersId, HasAttachmentIds, - HasTagIds, HasSequentialNumber, HasPollIds {} diff --git a/client/src/app/domain/models/users/user.ts b/client/src/app/domain/models/users/user.ts index f855351eff..4edac37618 100644 --- a/client/src/app/domain/models/users/user.ts +++ b/client/src/app/domain/models/users/user.ts @@ -2,7 +2,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { Id } from '../../definitions/key-types'; import { OMLMapping } from '../../definitions/organization-permission'; -import { HasProjectionIds } from '../../interfaces/has-projectable-ids'; import { BaseDecimalModel } from '../base/base-decimal-model'; /** * Key to sort users by @@ -95,4 +94,4 @@ export class User extends BaseDecimalModel { `organization_id` ]; } -export interface User extends HasProjectionIds {} +export interface User {} diff --git a/client/src/app/gateways/repositories/meeting-repository.service.ts b/client/src/app/gateways/repositories/meeting-repository.service.ts index 04f21be08e..8181760088 100644 --- a/client/src/app/gateways/repositories/meeting-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting-repository.service.ts @@ -55,7 +55,6 @@ export class MeetingRepositoryService extends BaseRepository = [ - `is_template`, `default_meeting_for_committee_id`, `jitsi_domain`, `jitsi_room_name`, diff --git a/client/src/app/gateways/repositories/topics/topic-repository.service.ts b/client/src/app/gateways/repositories/topics/topic-repository.service.ts index cb1c5452ac..1aad58b00c 100644 --- a/client/src/app/gateways/repositories/topics/topic-repository.service.ts +++ b/client/src/app/gateways/repositories/topics/topic-repository.service.ts @@ -30,8 +30,7 @@ export class TopicRepositoryService extends BaseAgendaItemAndListOfSpeakersConte id: viewModel.id, text: update.text, title: update.title, - attachment_ids: update.attachment_ids || [], - tag_ids: update.tag_ids || [] + attachment_ids: update.attachment_ids || [] }; return this.sendActionToBackend(TopicAction.UPDATE, payload); } diff --git a/client/src/app/infrastructure/definitions/relations/relations.ts b/client/src/app/infrastructure/definitions/relations/relations.ts index ffdc211975..e7099353f4 100644 --- a/client/src/app/infrastructure/definitions/relations/relations.ts +++ b/client/src/app/infrastructure/definitions/relations/relations.ts @@ -651,7 +651,7 @@ export const RELATIONS: Relation[] = [ // ########## Tags ...makeGenericM2M({ viewModel: ViewTag, - possibleViewModels: [ViewAgendaItem, ViewAssignment, ViewMotion, ViewTopic], + possibleViewModels: [ViewAgendaItem, ViewAssignment, ViewMotion], viewModelField: `tagged`, viewModelIdField: `tagged_ids`, possibleViewModelsField: `tags` diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts index f0dc153234..8270be7d26 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts @@ -257,9 +257,13 @@ export abstract class BasePollFormComponent extends BaseComponent implements OnI } private checkPollBackend(): void { + const pollType = this.data.content_object?.collection as PollClassType; if (!this.data.backend) { - const pollType = this.data.content_object?.collection as PollClassType; - this.data.backend = this.meetingSettingService.instant(`${pollType}_poll_default_backend`); + if (pollType !== `topic`) { + this.data.backend = this.meetingSettingService.instant(`${pollType}_poll_default_backend`); + } else { + this.data.backend = this.meetingSettingService.instant(`poll_default_backend`); + } } } diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts index 0e5178d206..c1db0e3124 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts @@ -53,7 +53,7 @@ export class TopicPollService extends PollService { super(organizationSettingsService, translate, pollKeyVerbose, parsePollNumber, themeService); pollServiceMapper.registerService(ViewTopic.COLLECTION, this); this.meetingSettingsService - .get(`topic_poll_default_onehundred_percent_base`) + .get(`poll_default_onehundred_percent_base`) .subscribe(base => (this.defaultPercentBase = base ?? PollPercentBase.Y)); this.meetingSettingsService @@ -61,20 +61,14 @@ export class TopicPollService extends PollService { .subscribe(ids => (this.defaultGroupIds = ids ?? [])); this.meetingSettingsService - .get(`topic_poll_default_method`) + .get(`poll_default_method`) .subscribe(method => (this.defaultPollMethod = method ?? PollMethod.Y)); this.meetingSettingsService - .get(`topic_poll_default_type`) + .get(`poll_default_type`) .subscribe(type => (this.defaultPollType = type ?? PollType.Pseudoanonymous)); - this.meetingSettingsService - .get(`topic_poll_sort_poll_result_by_votes`) - .subscribe(sort => (this.sortByVote = sort)); - - this.meetingSettingsService - .get(`topic_poll_enable_max_votes_per_option`) - .subscribe(enable_max_votes_per_option => (this.enableMaxVotesPerOption = enable_max_votes_per_option)); + this.meetingSettingsService.get(`poll_sort_poll_result_by_votes`).subscribe(sort => (this.sortByVote = sort)); } public getDefaultPollData(contentObject?: Topic): Partial { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts index 4c808990a1..a3b441dc51 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/view-models/view-topic.ts @@ -5,7 +5,6 @@ import { BaseProjectableViewModel } from 'src/app/site/pages/meetings/view-model import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; import { HasAttachment } from '../../../../mediafiles/view-models/has-attachment'; -import { HasTags } from '../../../../motions/modules/tags/view-models/has-tags'; import { HasPolls, VotingTextContext } from '../../../../polls'; export class ViewTopic extends BaseProjectableViewModel { @@ -42,7 +41,6 @@ export class ViewTopic extends BaseProjectableViewModel { export interface ViewTopic extends Topic, HasAttachment, - HasTags, HasAgendaItem, HasListOfSpeakers, HasMeeting, diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts index 41b5b9e206..ee2ed529b0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts @@ -1,6 +1,6 @@ import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow'; import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { ViewMotion, ViewMotionState } from 'src/app/site/pages/meetings/pages/motions'; +import { ViewMotionState } from 'src/app/site/pages/meetings/pages/motions'; import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; @@ -19,7 +19,6 @@ export class ViewMotionWorkflow extends BaseViewModel { interface IWorkflowRelations { states: ViewMotionState[]; first_state: ViewMotionState; - motions: ViewMotion[]; default_workflow_meeting?: ViewMeeting; default_amendment_workflow_meeting?: ViewMeeting; default_statute_amendment_workflow_meeting?: ViewMeeting; diff --git a/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts b/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts index 040bef0504..21492155a7 100644 --- a/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts @@ -55,7 +55,6 @@ export const getMotionListSubscriptionConfig: SubscriptionConfigGenerator = (id: `state_extension_reference_ids`, `state_id`, `submitter_ids`, - `supporter_ids`, `tag_ids`, `title` ], @@ -74,8 +73,7 @@ export const getMotionListSubscriptionConfig: SubscriptionConfigGenerator = (id: } ] } - ], - additionalFields: [`origin_id`, `origin_meeting_id`, `derived_motion_ids`] + ] }, subscriptionName: MOTION_LIST_SUBSCRIPTION }); diff --git a/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts b/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts index 62c6f9f2c7..350257cc74 100644 --- a/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts +++ b/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts @@ -19,7 +19,6 @@ export function getActiveMeetingSubscriptionConfig(id: Id, settingsKeys: string[ `start_time`, `end_time`, `is_active_in_organization_id`, - `is_archived_organization_id`, `template_for_organization_id`, `user_ids`, `description`, diff --git a/client/src/app/site/pages/meetings/view-models/view-meeting.ts b/client/src/app/site/pages/meetings/view-models/view-meeting.ts index e2c376989a..56619c220c 100644 --- a/client/src/app/site/pages/meetings/view-models/view-meeting.ts +++ b/client/src/app/site/pages/meetings/view-models/view-meeting.ts @@ -83,7 +83,7 @@ export class ViewMeeting extends BaseHasMeetingUsersViewModel { } public get isTemplate(): boolean { - return this.is_template || !!this.template_for_organization_id; + return !!this.template_for_organization_id; } public get relatedTime(): RelatedTime { diff --git a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts index 65ccca0e5a..ed535ea913 100644 --- a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts +++ b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts @@ -46,7 +46,6 @@ export const getCommitteeMeetingDetailSubscriptionConfig: SubscriptionConfigGene ids: [id], fieldset: [], additionalFields: [ - `is_template`, `default_meeting_for_committee_id`, `jitsi_domain`, `jitsi_room_name`, diff --git a/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts b/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts index 9daeb4bcfd..a038fc9c7b 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts +++ b/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts @@ -12,7 +12,6 @@ export const meetingFields: (keyof Meeting)[] = [ `end_time`, `committee_id`, `is_active_in_organization_id`, - `is_archived_organization_id`, `template_for_organization_id`, `description`, `location`,