Merge branch 'main' into 4345-empty-reason-not-displayed

client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts

@@ -128,13 +128,13 @@ export const listOfSpeakersSpeakerCountSubscription = {
     follow: [
         {
             idField: `speaker_ids`,
+            fieldset: [`begin_time`, `end_time`],
             follow: [
                 {
                     idField: `point_of_order_category_id`,
                     fieldset: FULL_FIELDSET
                 }
-            ],
-            fieldset: [`begin_time`, `end_time`]
+            ]
         }
     ]
 };
@@ -151,11 +151,11 @@ export const getListOfSpeakersDetailSubscriptionConfig: SubscriptionConfigGenera
                 follow: [
                     {
                         idField: `meeting_user_id`,
+                        fieldset: [`number`, `vote_weight`],
                         follow: [
                             { idField: `user_id`, ...UserFieldsets.FullNameSubscription },
                             { idField: `structure_level_ids`, fieldset: [`name`] }
-                        ],
-                        fieldset: [`number`, `vote_weight`]
+                        ]
                     },
                     {
                         idField: `structure_level_list_of_speakers_id`,

client/src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription.ts

@@ -43,7 +43,7 @@ export const getMediafilesListMinimalSubscriptionConfig: SubscriptionConfigGener
     modelRequest: {
         viewModelCtor: ViewMeeting,
         ids: [id],
-        follow: [`mediafile_ids`, `meeting_mediafile_ids`]
+        follow: [{ idField: `mediafile_ids` }, { idField: `meeting_mediafile_ids` }]
     },
     subscriptionName: MEDIAFILES_LIST_MINIMAL_SUBSCRIPTION
 });

client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts

@@ -119,12 +119,12 @@ export const getMotionWorkflowDetailSubscriptionConfig: SubscriptionConfigGenera
     modelRequest: {
         ids: [id],
         viewModelCtor: ViewMotionWorkflow,
+        fieldset: [],
         follow: [
             {
                 idField: `state_ids`
             }
-        ],
-        fieldset: ``
+        ]
     },
     subscriptionName: MOTION_WORKFLOW_DETAIL_SUBSCRIPTION
 });
@@ -189,13 +189,13 @@ export const getMotionDetailSubscriptionConfig: SubscriptionConfigGenerator = (.
             { idField: `comment_ids`, fieldset: FULL_FIELDSET },
             {
                 idField: `supporter_meeting_user_ids`,
+                fieldset: `participantListMinimal`,
                 follow: [
                     {
                         idField: `user_id`,
                         fieldset: `participantList`
                     }
-                ],
-                fieldset: `participantListMinimal`
+                ]
             }
         ],
         fieldset: [

client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-view/participant-detail-view.component.html

@@ -279,8 +279,7 @@ <h4>{{ 'Voting right delegated to (proxy)' | translate }}</h4>
             @if (showVoteDelegations && user!.vote_delegations_from().length > 0) {
                 <div>
                     <h4>
-                        {{ 'Voting right received from ' | translate }}{{ user!.vote_delegations_from().length
-                        }}{{ ' principals' | translate }}
+                        {{ 'Principals' | translate }}
                     </h4>
                     <os-expandable-content-wrapper
                         [biggerHeight]="true"
@@ -335,10 +334,10 @@ <h4>{{ 'Comment' | translate }}</h4>
                     <!-- Locked out? -->
                     @if (isAllowed('seeSensitiveData')) {
                         <mat-icon class="margin-4" [class.red-warning-text]="user!.isLockedOutOfMeeting()">
-                            {{ user!.isLockedOutOfMeeting() ? 'visibility_off' : 'check_box_outline_blank' }}
+                            {{ user!.isLockedOutOfMeeting() ? 'visibility_off' : '' }}
                         </mat-icon>
                         <span>
-                            {{ (user?.isLockedOutOfMeeting() ? 'Is locked out' : 'Is not locked out') | translate }}
+                            {{ (user?.isLockedOutOfMeeting() ? 'Is locked out' : '') | translate }}
                         </span>
                     }
                 </div>

client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html

@@ -80,7 +80,7 @@ <h2>{{ 'Participants' | translate }}</h2>
                         @if (isInPolldefaultGroup(user)) {
                             {{ 'Vote weight' | translate }}: {{ user.vote_weight() }}
                             @if (user.hasVoteRightFromOthers()) {
-                                + {{ sumOfDelegatedVoteWeight(user) }} {{ ' from delegated votes' | translate }}
+                                + {{ sumOfDelegatedVoteWeight(user) }} {{ 'from delegated votes' | translate }}
                             }
                         }
                     </div>

client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts

@@ -37,8 +37,8 @@ export const getParticipantVoteInfoSubscriptionConfig: SubscriptionConfigGenerat
                     },
                     {
                         idField: `vote_delegated_to_id`,
-                        follow: [{ idField: `user_id`, fieldset: [`is_present_in_meeting_ids`] }],
-                        fieldset: [`meeting_id`]
+                        fieldset: [`meeting_id`],
+                        follow: [{ idField: `user_id`, fieldset: [`is_present_in_meeting_ids`] }]
                     }
                 ]
             }

client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts

@@ -24,6 +24,7 @@ export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = (
     modelRequest: {
         viewModelCtor: ViewMeeting,
         ids: [id],
+        additionalFields: [`reference_projector_id`],
         follow: [
             {
                 idField: `projector_ids`,
@@ -61,14 +62,13 @@ export const getProjectorListSubscriptionConfig: SubscriptionConfigGenerator = (
                     }
                 ]
             },
-            `projector_countdown_ids`,
-            `projector_message_ids`,
-            ...MEETING_DEFAULT_PROJECTOR_IDS_KEYS,
+            { idField: `projector_countdown_ids` },
+            { idField: `projector_message_ids` },
             { idField: `speaker_ids`, additionalFields: [`meeting_user_id`] },
-            `list_of_speakers_ids`,
-            { idField: `agenda_item_ids`, fieldset: [`item_number`, `content_object_id`] }
-        ],
-        additionalFields: [`reference_projector_id`]
+            { idField: `list_of_speakers_ids` },
+            { idField: `agenda_item_ids`, fieldset: [`item_number`, `content_object_id`] },
+            ...MEETING_DEFAULT_PROJECTOR_IDS_KEYS
+        ]
     },
     subscriptionName: PROJECTOR_LIST_SUBSCRIPTION
 });

client/src/app/site/pages/meetings/services/active-meeting.subscription.ts

@@ -54,14 +54,14 @@ export function getActiveMeetingSubscriptionConfig(id: Id, settingsKeys: string[
                 }, // TODO: Remove and count unread messages by chat_group_ids/chat_message_ids
                 {
                     idField: `poll_ids`,
+                    fieldset: [`title`, `state`, `entitled_group_ids`],
                     follow: [
                         {
                             idField: `content_object_id`,
                             fieldset: [`title`],
                             follow: [{ idField: `agenda_item_id`, fieldset: [`item_number`, `content_object_id`] }]
                         }
-                    ],
-                    fieldset: [`title`, `state`, `entitled_group_ids`]
+                    ]
                 },
                 {
                     idField: `point_of_order_category_ids`,

client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts

@@ -1006,14 +1006,16 @@ export const meetingSettings: SettingsGroup[] = fillInSettingsDefaults([
                     {
                         key: `users_email_subject`,
                         label: _(`Email subject`),
-                        helpText: _(`You can use {event_name} and {username} as placeholder.`)
+                        helpText: _(
+                            `Possible placeholders for email subject and body: {title}, {first_name}, {last_name}, {groups}, {structure_levels}, {event_name}, {url}, {username} and {password}`
+                        )
                     },
                     {
                         key: `users_email_body`,
                         label: _(`Email body`),
                         type: `text`,
                         helpText: _(
-                            `Use these placeholders: {name}, {event_name}, {url}, {username}, {password}. The url referrs to the system url.`
+                            `Possible placeholders for email subject and body: {title}, {first_name}, {last_name}, {groups}, {structure_levels}, {event_name}, {url}, {username} and {password}`
                         )
                     }
                 ]

client/src/app/site/pages/organization/organization.subscription.ts

@@ -56,11 +56,11 @@ function getMeetingListFollowConfig(
 ): any {
     return {
         idField: idField,
+        fieldset: `list`,
         follow: [
             { idField: `committee_id`, fieldset: `name` },
             { idField: `organization_tag_ids`, fieldset: FULL_FIELDSET }
-        ],
-        fieldset: `list`
+        ]
     };
 }
 

client/src/app/site/pages/organization/pages/accounts/accounts.subscription.ts

@@ -16,8 +16,8 @@ export const getAccountDetailSubscriptionConfig: SubscriptionConfigGenerator = (
             { idField: `committee_ids`, fieldset: [`name`, `manager_ids`] },
             {
                 idField: `meeting_ids`,
-                follow: [{ idField: `group_ids`, fieldset: [`name`], isFullList: false }],
-                fieldset: [`name`, `committee_id`]
+                fieldset: [`name`, `committee_id`],
+                follow: [{ idField: `group_ids`, fieldset: [`name`], isFullList: false }]
             },
             { idField: `gender_id`, fieldset: [`name`] }
         ]

client/src/app/site/pages/organization/pages/organization-tags/organization-tags.subscription.ts

@@ -9,6 +9,6 @@ export const getOrganizationTagListSubscriptionConfig: SubscriptionConfigGenerat
     modelRequest: {
         viewModelCtor: ViewOrganization,
         ids: [ORGANIZATION_ID],
-        follow: [`organization_tag_ids`]
+        follow: [{ idField: `organization_tag_ids` }]
     }
 });

client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html

@@ -107,7 +107,7 @@ <h2>{{ 'Superadmin settings' | translate }}</h2>
 
                     <section>
                         <mat-checkbox formControlName="enable_anonymous">
-                            {{ 'Meetings can be public' | translate }}
+                            {{ 'Enable public meetings' | translate }}
                         </mat-checkbox>
                     </section>
 

client/src/assets/i18n/de.po

@@ -830,10 +830,10 @@ msgid "Ballot reset"
 msgstr "Wahlgang zurückgesetzt"
 
 msgid "Ballot started"
-msgstr "Wahlgang gestarted"
+msgstr "Wahlgang gestartet"
 
 msgid "Ballot stopped"
-msgstr "Wahlgeang beendet"
+msgstr "Wahlgang beendet"
 
 msgid "Ballot stopped/published"
 msgstr "Wahlgang beendet/veröffentlicht"
@@ -2059,6 +2059,9 @@ msgstr "Geschäftsordnungsanträge aktivieren"
 msgid "Enable point of orders for other participants"
 msgstr "Stellen eines GO-Antrags für andere Teilnehmende erlauben"
 
+msgid "Enable public meetings"
+msgstr "Öffentliche Veranstaltungen aktivieren"
+
 msgid "Enable specifications and ranking for possible motions"
 msgstr "Vorgaben und Reihung für mögliche GO-Anträge aktivieren"
 
@@ -3951,6 +3954,15 @@ msgstr "GO-Antrag"
 msgid "Polls"
 msgstr "Umfragen"
 
+msgid ""
+"Possible placeholders for email subject and body: {title}, {first_name}, "
+"{last_name}, {groups}, {structure_levels}, {event_name}, {url}, {username} "
+"and {password}"
+msgstr ""
+"Mögliche Platzhalter für E-Mail-Betreff und -Inhalt: {title}, {first_name}, "
+"{last_name}, {groups}, {structure_levels}, {event_name}, {url}, {username} "
+"und {password}"
+
 msgid "Possible points of order"
 msgstr "Mögliche GO-Anträge"
 
@@ -5347,13 +5359,6 @@ msgstr "Farbe verwenden"
 msgid "Use the following custom number"
 msgstr "Verwende die folgende benutzerdefinierte Anzahl"
 
-msgid ""
-"Use these placeholders: {name}, {event_name}, {url}, {username}, {password}."
-" The url referrs to the system url."
-msgstr ""
-"Verwendbare Platzhalter: {name}, {event_name}, {url}, {username}, "
-"{password}. Die URL bezieht sich auf die System-URL."
-
 msgid "Used for WLAN QRCode projection."
 msgstr "Wird für die Projektion des WLAN-QR-Codes verwendet."
 
@@ -5479,6 +5484,9 @@ msgstr "Stimmrecht für"
 msgid "Voting right received from (principals)"
 msgstr "Stimmrecht erhalten von (Vollmachtgeber*in)"
 
+msgid "Voting rights"
+msgstr "Stimmrechte"
+
 msgid "Voting started"
 msgstr "Abstimmung gestartet"
 
@@ -5667,9 +5675,6 @@ msgstr ""
 msgid "You can only anonymize named polls."
 msgstr "Sie können nur namentliche Stimmabgaben anonymisieren."
 
-msgid "You can use {event_name} and {username} as placeholder."
-msgstr "Sie können {event_name} und {username} als Platzhalter verwenden."
-
 msgid ""
 "You cannot change the recommendation of motions in different workflows!"
 msgstr ""
@@ -5890,6 +5895,9 @@ msgstr "weiblich"
 msgid "finished (unpublished)"
 msgstr "abgeschlossen (unveröffentlicht)"
 
+msgid "from delegated votes"
+msgstr "aus Stimmrechtsübertragungen"
+
 msgid "fullscreen"
 msgstr "Vollbild"
 

client/src/assets/i18n/template-en.pot

@@ -1994,6 +1994,10 @@ msgstr ""
 msgid "Enable point of orders for other participants"
 msgstr ""
 
+#: /app/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html
+msgid "Enable public meetings"
+msgstr ""
+
 msgid "Enable specifications and ranking for possible motions"
 msgstr ""
 
@@ -3941,6 +3945,13 @@ msgstr ""
 msgid "Polls"
 msgstr ""
 
+#: /app/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
+msgid ""
+"Possible placeholders for email subject and body: {title}, {first_name}, "
+"{last_name}, {groups}, {structure_levels}, {event_name}, {url}, {username} "
+"and {password}"
+msgstr ""
+
 msgid "Possible points of order"
 msgstr ""
 
@@ -5323,11 +5334,6 @@ msgstr ""
 msgid "Use the following custom number"
 msgstr ""
 
-msgid ""
-"Use these placeholders: {name}, {event_name}, {url}, {username}, "
-"{password}. The url referrs to the system url."
-msgstr ""
-
 msgid "Used for WLAN QRCode projection."
 msgstr ""
 
@@ -5450,6 +5456,11 @@ msgstr ""
 msgid "Voting right received from (principals)"
 msgstr ""
 
+#: /app/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html
+#: /app/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html
+msgid "Voting rights"
+msgstr ""
+
 msgid "Voting started"
 msgstr ""
 
@@ -5623,9 +5634,6 @@ msgstr ""
 msgid "You can only anonymize named polls."
 msgstr ""
 
-msgid "You can use {event_name} and {username} as placeholder."
-msgstr ""
-
 msgid "You cannot change the recommendation of motions in different workflows!"
 msgstr ""
 
@@ -5832,6 +5840,10 @@ msgstr ""
 msgid "finished (unpublished)"
 msgstr ""
 
+#: /app/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.html
+msgid "from delegated votes"
+msgstr ""
+
 msgid "fullscreen"
 msgstr ""