From bedbb75c697baa82775c2580dd66692b399eb9c2 Mon Sep 17 00:00:00 2001
From: Joshua Sangmeister <joshua.sangmeister@gmail.com>
Date: Thu, 9 Jul 2020 12:32:11 +0200
Subject: [PATCH] Add new settings to meeting model

---
 docs/example-data.json |  5 +++++
 docs/models.txt        | 22 +++++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/docs/example-data.json b/docs/example-data.json
index 3bccd066b..90d85b2d6 100644
--- a/docs/example-data.json
+++ b/docs/example-data.json
@@ -194,6 +194,8 @@
 
         "conference_show": false,
         "conference_auto_connect": false,
+        "conference_los_restriction": false,
+        "conference_stream_url": "",
 
         "projector_default_countdown_time": 60,
         "projector_countdown_warning_time": 0,
@@ -217,6 +219,7 @@
         "list_of_speakers_couple_countdown": false,
         "list_of_speakers_show_amount_of_speakers_on_slide": true,
         "list_of_speakers_present_users_only": false,
+        "list_of_speakers_show_first_contribution": false,
 
         "motions_default_workflow_id": 1,
         "motions_statute_amendments_workflow_id": 2,
@@ -253,6 +256,7 @@
 
         "motion_poll_ballot_paper_selection": "CUSTOM_NUMBER",
         "motion_poll_ballot_paper_number": 8,
+        "motion_poll_default_type": "analog",
         "motion_poll_default_100_percent_base": "YNA",
         "motion_poll_default_majority_method": "simple",
         "motion_poll_default_group_ids": [2, 3],
@@ -276,6 +280,7 @@
         "assignments_export_preamble": "",
         "assignment_poll_add_candidates_to_list_of_speakers": true,
         "assignment_poll_sort_poll_result_by_votes": true,
+        "assignment_poll_default_type": "nominal",
         "assignment_poll_default_method": "votes",
         "assignment_poll_default_100_percent_base": "valid",
         "assignment_poll_default_majority_method": "simple",
diff --git a/docs/models.txt b/docs/models.txt
index d6b5d8887..e2f8dc0f9 100644
--- a/docs/models.txt
+++ b/docs/models.txt
@@ -139,22 +139,27 @@ Interface committee {
 
 Interface meeting {
     id: number;
-    url_name: string; // For unique urls.
-    is_template: boolean; // Unique within a committee
-    enable_anonymous: boolean;
+    welcome_title: string;
+    welcome_text: HTML;
 
-    // Old "general_*" configs
+    // General
     name: string;
     description: string;
     location: string;
     start_time: datetime;
-    end_time: datetime;
-    welcome_title: string;
-    welcome_text: HTML;
+    end_time: datetime; // TODO: is this needed?
     custom_translations: JSON;
 
+    // System
+    url_name: string; // For unique urls.
+    is_template: boolean; // Unique within a committee
+    enable_anonymous: boolean;
+
+    // Jitsi/Livestream settings
     conference_show: boolean: boolean;
     conference_auto_connect: boolean;
+    conference_los_restriction: boolean;
+    conference_stream_url: string;
 
     // Projector
     projector_default_countdown_time: number;
@@ -182,6 +187,7 @@ Interface meeting {
     list_of_speakers_couple_countdown: boolean;
     list_of_speakers_show_amount_of_speakers_on_slide: boolean;
     list_of_speakers_present_users_only: boolean;
+    list_of_speakers_show_first_contribution: boolean;
 
     // Motions
     motions_default_workflow_id: workflow/default_workflow_meeting_id;
@@ -219,6 +225,7 @@ Interface meeting {
 
     motion_poll_ballot_paper_selection: string;
     motion_poll_ballot_paper_number: number;
+    motion_poll_default_type: string;
     motion_poll_default_100_percent_base: string;
     motion_poll_default_majority_method: string;
     motion_poll_default_group_ids: (group/used_as_motion_poll_default_id)[];
@@ -244,6 +251,7 @@ Interface meeting {
     assignments_export_preamble: string;
     assignment_poll_add_candidates_to_list_of_speakers: boolean;
     assignment_poll_sort_poll_result_by_votes: boolean;
+    assignment_poll_default_type: string;
     assignment_poll_default_method: string;
     assignment_poll_default_100_percent_base: string;
     assignment_poll_default_majority_method: string;