Add default countdowns

docker/initial-data.json

@@ -109,7 +109,7 @@
         "conference_open_video": true,
         "conference_auto_connect_next_speakers": true,
 
-        "projector_default_countdown_time": 60,
+        "projector_countdown_default_time": 60,
         "projector_countdown_warning_time": 0,
 
         "export_csv_encoding": "utf-8",
@@ -128,7 +128,7 @@
 
         "list_of_speakers_amount_last_on_projector": 1,
         "list_of_speakers_amount_next_on_projector": -1,
-        "list_of_speakers_couple_countdown": false,
+        "list_of_speakers_couple_countdown": true,
         "list_of_speakers_show_amount_of_speakers_on_slide": true,
         "list_of_speakers_present_users_only": false,
         "list_of_speakers_show_first_contribution": false,
@@ -209,11 +209,12 @@
         "poll_default_100_percent_base": "valid",
         "poll_default_majority_method": "simple",
         "poll_default_group_ids": [5],
+        "poll_couple_countdown": true,
 
         "projector_ids": [1],
         "all_projection_ids": [],
         "projector_message_ids": [],
-        "projector_countdown_ids": [],
+        "projector_countdown_ids": [1, 2],
         "tag_ids": [],
         "agenda_item_ids": [],
         "list_of_speakers_ids": [],
@@ -248,6 +249,8 @@
         "guest_ids": [],
         "user_ids": [1],
         "reference_projector_id": 1,
+        "list_of_speakers_countdown_id": 1,
+        "poll_countdown_id": 2,
 
         "default_$_projector_id": [
             "agenda_all_items",
@@ -613,5 +616,31 @@
     }],
 "projection": [],
 "projector_message": [],
-"projector_countdown": []
+"projector_countdown": [
+    {
+        "id": 1,
+        "title": "List of speaker countdown",
+        "description": "",
+        "default_time": 60,
+        "countdown_time": 60,
+        "running": false,
+
+        "projection_ids": [],
+        "used_as_list_of_speaker_countdown_meeting_id": 1,
+        "used_as_poll_countdown_meeting_id": null,
+        "meeting_id": 1
+    },
+    {
+        "id": 2,
+        "title": "Voting countdown",
+        "description": "",
+        "default_time": 60,
+        "countdown_time": 60,
+        "running": false,
+
+        "projection_ids": [],
+        "used_as_list_of_speaker_countdown_meeting_id": null,
+        "used_as_poll_countdown_meeting_id": 1,
+        "meeting_id": 1
+    }]
 }

docs/example-data.json

@@ -241,7 +241,7 @@
         "jitsi_domain": "",
         "jitsi_room_password": "",
 
-        "projector_default_countdown_time": 60,
+        "projector_countdown_default_time": 60,
         "projector_countdown_warning_time": 0,
 
         "export_csv_encoding": "utf-8",
@@ -260,7 +260,7 @@
 
         "list_of_speakers_amount_last_on_projector": 1,
         "list_of_speakers_amount_next_on_projector": -1,
-        "list_of_speakers_couple_countdown": false,
+        "list_of_speakers_couple_countdown": true,
         "list_of_speakers_show_amount_of_speakers_on_slide": true,
         "list_of_speakers_present_users_only": false,
         "list_of_speakers_show_first_contribution": false,
@@ -342,11 +342,12 @@
         "poll_default_100_percent_base": "valid",
         "poll_default_majority_method": "simple",
         "poll_default_group_ids": [3],
+        "poll_couple_countdown": true,
 
         "projector_ids": [1, 2],
         "all_projection_ids": [1, 2, 3, 4],
         "projector_message_ids": [1],
-        "projector_countdown_ids": [1],
+        "projector_countdown_ids": [1, 2],
         "tag_ids": [1, 2, 3],
         "agenda_item_ids": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
         "list_of_speakers_ids": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18],
@@ -382,6 +383,8 @@
         "guest_ids": [3],
         "user_ids": [1, 2, 3],
         "reference_projector_id": 2,
+        "list_of_speakers_countdown_id": 1,
+        "poll_countdown_id": 2,
 
         "default_$_projector_id": [
             "agenda_all_items",
@@ -2644,13 +2647,28 @@
 "projector_countdown": [
     {
         "id": 1,
-        "title": "Countdown 1",
+        "title": "List of speaker countdown",
         "description": "",
         "default_time": 60,
         "countdown_time": 60,
         "running": false,
 
         "projection_ids": [],
+        "used_as_list_of_speaker_countdown_meeting_id": 1,
+        "used_as_poll_countdown_meeting_id": null,
+        "meeting_id": 1
+    },
+    {
+        "id": 2,
+        "title": "Voting countdown",
+        "description": "",
+        "default_time": 60,
+        "countdown_time": 60,
+        "running": false,
+
+        "projection_ids": [],
+        "used_as_list_of_speaker_countdown_meeting_id": null,
+        "used_as_poll_countdown_meeting_id": 1,
         "meeting_id": 1
     }]
 }

docs/models.yml

@@ -356,8 +356,8 @@ meeting:
     type: number
     default: 0
 
-  # Projector
-  projector_default_countdown_time:
+  # Projector countdown
+  projector_countdown_default_time:
     type: number
     default: 60
   projector_countdown_warning_time:
@@ -689,6 +689,9 @@ meeting:
   poll_default_group_ids:
     type: relation-list
     to: group/used_as_poll_default_id
+  poll_couple_countdown:
+    type: boolean
+    default: True
 
   # Relations
   projector_ids:
@@ -840,6 +843,12 @@ meeting:
   reference_projector_id:
     type: relation
     to: projector/used_as_reference_projector_meeting_id
+  list_of_speakers_countdown_id:
+    type: relation
+    to: projector_countdown/used_as_list_of_speaker_countdown_meeting_id
+  poll_countdown_id:
+    type: relation
+    to: projector_countdown/used_as_poll_countdown_meeting_id
 
   default_projector_$_id:
     type: template
@@ -2091,6 +2100,12 @@ projector_countdown:
     type: relation-list
     to: projection/content_object_id
     equal_fields: meeting_id
+  used_as_list_of_speaker_countdown_meeting_id:
+    type: relation
+    to: meeting/list_of_speakers_countdown_id
+  used_as_poll_countdown_meeting_id:
+    type: relation
+    to: meeting/poll_countdown_id
   meeting_id:
     type: relation
     to: meeting/projector_countdown_ids