ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5460 from jsangmeister/update-models

Browse Source 
Add new settings to meeting model
This commit is contained in:
Finn Stutzenstein 2020-07-09 12:53:00 +02:00 committed by GitHub
commit 89f4323d11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/example-data.json
View File

@ -194,6 +194,8 @@
"conference_show": false, "conference_show": false,
"conference_auto_connect": false, "conference_auto_connect": false,
"conference_los_restriction": false,
"conference_stream_url": "",
"projector_default_countdown_time": 60, "projector_default_countdown_time": 60,
"projector_countdown_warning_time": 0, "projector_countdown_warning_time": 0,
@ -217,6 +219,7 @@
"list_of_speakers_couple_countdown": false, "list_of_speakers_couple_countdown": false,
"list_of_speakers_show_amount_of_speakers_on_slide": true, "list_of_speakers_show_amount_of_speakers_on_slide": true,
"list_of_speakers_present_users_only": false, "list_of_speakers_present_users_only": false,
"list_of_speakers_show_first_contribution": false,
"motions_default_workflow_id": 1, "motions_default_workflow_id": 1,
"motions_statute_amendments_workflow_id": 2, "motions_statute_amendments_workflow_id": 2,
@ -253,6 +256,7 @@
"motion_poll_ballot_paper_selection": "CUSTOM_NUMBER", "motion_poll_ballot_paper_selection": "CUSTOM_NUMBER",
"motion_poll_ballot_paper_number": 8, "motion_poll_ballot_paper_number": 8,
"motion_poll_default_type": "analog",
"motion_poll_default_100_percent_base": "YNA", "motion_poll_default_100_percent_base": "YNA",
"motion_poll_default_majority_method": "simple", "motion_poll_default_majority_method": "simple",
"motion_poll_default_group_ids": [2, 3], "motion_poll_default_group_ids": [2, 3],
@ -276,6 +280,7 @@
"assignments_export_preamble": "", "assignments_export_preamble": "",
"assignment_poll_add_candidates_to_list_of_speakers": true, "assignment_poll_add_candidates_to_list_of_speakers": true,
"assignment_poll_sort_poll_result_by_votes": true, "assignment_poll_sort_poll_result_by_votes": true,
"assignment_poll_default_type": "nominal",
"assignment_poll_default_method": "votes", "assignment_poll_default_method": "votes",
"assignment_poll_default_100_percent_base": "valid", "assignment_poll_default_100_percent_base": "valid",
"assignment_poll_default_majority_method": "simple", "assignment_poll_default_majority_method": "simple",

22
docs/models.txt
View File

@ -139,22 +139,27 @@ Interface committee {
Interface meeting { Interface meeting {
id: number; id: number;
url_name: string; // For unique urls. welcome_title: string;
is_template: boolean; // Unique within a committee welcome_text: HTML;
enable_anonymous: boolean;
// Old "general_*" configs // General
name: string; name: string;
description: string; description: string;
location: string; location: string;
start_time: datetime; start_time: datetime;
end_time: datetime; end_time: datetime; // TODO: is this needed?
welcome_title: string;
welcome_text: HTML;
custom_translations: JSON; 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_show: boolean: boolean;
conference_auto_connect: boolean; conference_auto_connect: boolean;
conference_los_restriction: boolean;
conference_stream_url: string;
// Projector // Projector
projector_default_countdown_time: number; projector_default_countdown_time: number;
@ -182,6 +187,7 @@ Interface meeting {
list_of_speakers_couple_countdown: boolean; list_of_speakers_couple_countdown: boolean;
list_of_speakers_show_amount_of_speakers_on_slide: boolean; list_of_speakers_show_amount_of_speakers_on_slide: boolean;
list_of_speakers_present_users_only: boolean; list_of_speakers_present_users_only: boolean;
list_of_speakers_show_first_contribution: boolean;
// Motions // Motions
motions_default_workflow_id: workflow/default_workflow_meeting_id; 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_selection: string;
motion_poll_ballot_paper_number: number; motion_poll_ballot_paper_number: number;
motion_poll_default_type: string;
motion_poll_default_100_percent_base: string; motion_poll_default_100_percent_base: string;
motion_poll_default_majority_method: string; motion_poll_default_majority_method: string;
motion_poll_default_group_ids: (group/used_as_motion_poll_default_id)[]; motion_poll_default_group_ids: (group/used_as_motion_poll_default_id)[];
@ -244,6 +251,7 @@ Interface meeting {
assignments_export_preamble: string; assignments_export_preamble: string;
assignment_poll_add_candidates_to_list_of_speakers: boolean; assignment_poll_add_candidates_to_list_of_speakers: boolean;
assignment_poll_sort_poll_result_by_votes: boolean; assignment_poll_sort_poll_result_by_votes: boolean;
assignment_poll_default_type: string;
assignment_poll_default_method: string; assignment_poll_default_method: string;
assignment_poll_default_100_percent_base: string; assignment_poll_default_100_percent_base: string;
assignment_poll_default_majority_method: string; assignment_poll_default_majority_method: string;