Merge branch 'main' into rename-internal-recommendations

OpenSlides · Feb 14, 2024 · 259dbe2 · 259dbe2
2 parents 85106e0 + 734d089
commit 259dbe2
Show file tree

Hide file tree

Showing 4 changed files with 145 additions and 11 deletions.
diff --git a/VERSION b/VERSION
diff --git a/models.yml b/models.yml
@@ -276,9 +276,6 @@ user:
   default_number:
     type: string
     restriction_mode: A
-  default_structure_level:
-    type: string
-    restriction_mode: A
   default_vote_weight:
     type: decimal(6)
     default: "1.000000"
@@ -382,9 +379,6 @@ meeting_user:
   number:
     type: string
     restriction_mode: A
-  structure_level:
-    type: string
-    restriction_mode: A
   about_me:
     type: HTMLStrict
     restriction_mode: A
@@ -463,6 +457,11 @@ meeting_user:
     to: group/meeting_user_ids
     equal_fields: meeting_id
     restriction_mode: A
+  structure_level_ids:
+    type: relation-list
+    equal_fields: meeting_id
+    restriction_mode: A
+    to: structure_level/meeting_user_ids
 
 organization_tag:
   id:
@@ -1043,6 +1042,18 @@ meeting:
     type: boolean
     default: False
     restriction_mode: B
+  list_of_speakers_default_structure_level_time:
+    type: number
+    minimum: 0
+    restriction_mode: B
+    description: 0 disables structure level countdowns.
+  list_of_speakers_enable_interposed_question:
+    type: boolean
+    restriction_mode: B
+  list_of_speakers_intervention_time:
+    type: number
+    restriction_mode: B
+    description: 0 disables intervention speakers.
 
   # Motions
   motions_default_workflow_id:
@@ -1495,6 +1506,11 @@ meeting:
     to: list_of_speakers/meeting_id
     on_delete: CASCADE
     restriction_mode: B
+  structure_level_list_of_speakers_ids:
+    type: relation-list
+    to: structure_level_list_of_speakers/meeting_id
+    on_delete: CASCADE
+    restriction_mode: B
   point_of_order_category_ids:
     type: relation-list
     to: point_of_order_category/meeting_id
@@ -1615,6 +1631,11 @@ meeting:
     to: chat_message/meeting_id
     on_delete: CASCADE
     restriction_mode: B
+  structure_level_ids:
+    type: relation-list
+    to: structure_level/meeting_id
+    on_delete: CASCADE
+    restriction_mode: B
 
   # Logos and Fonts
   logo_projector_main_id:
@@ -1803,6 +1824,38 @@ meeting:
     to: group/admin_group_for_meeting_id
     restriction_mode: B
 
+structure_level:
+  id:
+    type: number
+    required: true
+    restriction_mode: A
+  name:
+    type: string
+    required: true
+    restriction_mode: A
+  color:
+    type: color
+    restriction_mode: A
+  default_time:
+    type: number
+    minimum: 0
+    restriction_mode: A
+  meeting_user_ids:
+    type: relation-list
+    equal_fields: meeting_id
+    restriction_mode: A
+    to: meeting_user/structure_level_ids
+  structure_level_list_of_speakers_ids:
+    type: relation-list
+    equal_fields: meeting_id
+    restriction_mode: A
+    to: structure_level_list_of_speakers/structure_level_id
+  meeting_id:
+    type: relation
+    required: true
+    to: meeting/structure_level_ids
+    restriction_mode: A
+
 group:
   id:
     type: number
@@ -1823,6 +1876,8 @@ group:
         - agenda_item.can_manage
         - agenda_item.can_see
         - agenda_item.can_see_internal
+        - agenda_item.can_manage_moderator_notes
+        - agenda_item.can_see_moderator_notes
         - assignment.can_manage
         - assignment.can_nominate_other
         - assignment.can_nominate_self
@@ -2024,6 +2079,9 @@ agenda_item:
     description: Given in seconds
     minimum: 0
     restriction_mode: B
+  moderator_notes:
+    type: HTMLStrict
+    restriction_mode: D
   is_internal:
     type: boolean
     description: Calculated by the server
@@ -2121,6 +2179,12 @@ list_of_speakers:
     on_delete: CASCADE
     equal_fields: meeting_id
     restriction_mode: A
+  structure_level_list_of_speakers_ids:
+    type: relation-list
+    restriction_mode: A
+    equal_fields: meeting_id
+    to: structure_level_list_of_speakers/list_of_speakers_id
+    on_delete: CASCADE
   projection_ids:
     type: relation-list
     to: projection/content_object_id
@@ -2134,6 +2198,53 @@ list_of_speakers:
     restriction_mode: A
     constant: true
 
+structure_level_list_of_speakers:
+  id:
+    type: number
+    required: true
+    restriction_mode: A
+  structure_level_id:
+    type: relation
+    required: true
+    equal_fields: meeting_id
+    restriction_mode: A
+    to: structure_level/structure_level_list_of_speakers_ids
+  list_of_speakers_id:
+    type: relation
+    required: true
+    equal_fields: meeting_id
+    restriction_mode: A
+    to: list_of_speakers/structure_level_list_of_speakers_ids
+  speaker_ids:
+    type: relation-list
+    equal_fields: meeting_id
+    restriction_mode: A
+    to: speaker/structure_level_list_of_speakers_id
+  initial_time:
+    type: number
+    minimum: 1
+    required: true
+    restriction_mode: A
+    description: The initial time of this structure_level for this LoS
+  additional_time:
+    type: float
+    restriction_mode: A
+    description: The summed added time of this structure_level for this LoS
+  remaining_time:
+    type: float
+    required: true
+    restriction_mode: A
+    description: The currently remaining time of this structure_level for this LoS
+  current_start_time:
+    type: timestamp
+    restriction_mode: A
+    description: The current start time of a speaker for this structure_level. Is only set if a currently speaking speaker exists
+  meeting_id:
+    type: relation
+    to: meeting/structure_level_list_of_speakers_ids
+    required: true
+    restriction_mode: A
+
 point_of_order_category:
   id:
     type: number
@@ -2172,6 +2283,18 @@ speaker:
     type: timestamp
     read_only: true
     restriction_mode: A
+  pause_time:
+    type: timestamp
+    read_only: true
+    restriction_mode: A
+  unpause_time:
+    type: timestamp
+    read_only: true
+    restriction_mode: A
+  total_pause:
+    type: number
+    read_only: true
+    restriction_mode: A
   weight:
     type: number
     default: 10000
@@ -2182,6 +2305,8 @@ speaker:
       - contribution
       - pro
       - contra
+      - intervention
+      - interposed_question
     restriction_mode: A
   note:
     type: string
@@ -2199,12 +2324,16 @@ speaker:
     equal_fields: meeting_id
     restriction_mode: A
     constant: true
+  structure_level_list_of_speakers_id:
+    type: relation
+    equal_fields: meeting_id
+    restriction_mode: A
+    to: structure_level_list_of_speakers/speaker_ids
   meeting_user_id:
     type: relation
     to: meeting_user/speaker_ids
     equal_fields: meeting_id
     restriction_mode: A
-    constant: true
   point_of_order_category_id:
     type: relation
     to: point_of_order_category/speaker_ids

diff --git a/permission.yml b/permission.yml
@@ -10,6 +10,9 @@ agenda_item:
     can_manage:
         can_see_internal:
             can_see:
+    can_manage_moderator_notes:
+        can_see_moderator_notes:
+            can_see:
 assignment:
     can_manage:
         can_nominate_other:

diff --git a/search.yml b/search.yml
@@ -114,7 +114,12 @@ motion:
           fields:
             id: null
             number: null
-            structure_level: null
+            structure_level_ids:
+              type: relation
+              collection: structure_level
+              fields:
+                id: null
+                name: null
             vote_weight: null
             user_id:
               type: relation
@@ -247,8 +252,6 @@ user:
     - last_name
     - gender
     - email
-    - default_number
-    - default_structure_level
     - organization_management_level
     - meeting_ids
     - owner_id