From 4b1c9bc1901b48d6e6f9db891098f05d65599769 Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Mon, 30 Mar 2020 09:35:00 +0200 Subject: [PATCH] Small fixes for models and example data --- docs/example-data.json | 182 +++++++++++++++++++++-------------------- docs/models.txt | 87 ++++++++++---------- 2 files changed, 138 insertions(+), 131 deletions(-) diff --git a/docs/example-data.json b/docs/example-data.json index 5e1b2cf6d..c82be3e4b 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -29,6 +29,7 @@ "structure_level": "", "email": "", "last_email_send": null, + "vote_weight": "1.000000", "role_id": 1, @@ -77,6 +78,7 @@ "structure_level": "", "email": "", "last_email_send": null, + "vote_weight": "1.000000", "role_id": null, @@ -121,6 +123,7 @@ "structure_level": "", "email": "", "last_email_send": null, + "vote_weight": "1.000000", "role_id": null, @@ -249,10 +252,11 @@ "motion_poll_ballot_paper_number": 8, "motion_poll_default_100_percent_base": "YNA", "motion_poll_default_majority_method": "simple", - "motion_poll_default_groups": [2, 3], + "motion_poll_default_group_ids": [2, 3], "users_sort_by": "first_name", - "users_enable_presence_view": false, + "users_enable_presence_view": true, + "users_allow_self_set_present": true, "users_pdf_welcometitle": "Welcome to OpenSlides", "users_pdf_welcometext": "[Place for your welcome and help text.]", "users_pdf_url": "http://example.com:8000", @@ -271,7 +275,7 @@ "assignment_poll_default_method": "votes", "assignment_poll_default_100_percent_base": "valid", "assignment_poll_default_majority_method": "simple", - "assignment_poll_default_groups": [3, 5], + "assignment_poll_default_group_ids": [3, 5], "projector_ids": [1, 2], "projectiondefault_ids": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13], @@ -293,7 +297,7 @@ "assignment_ids": [1, 2], "assignment_poll_ids": [1, 2, 3], - "logo_$": ["logo_web_header"], + "logo_$": ["web_header"], "logo_web_header": 3, "font_$": [], @@ -327,8 +331,8 @@ "write_comment_section_ids": [], "motion_poll_ids": [], "assignment_poll_ids": [], - "used_as_motion_poll_default": null, - "used_as_assignment_poll_default": null, + "used_as_motion_poll_default_id": null, + "used_as_assignment_poll_default_id": null, "meeting_id": 1 }, { @@ -344,8 +348,8 @@ "write_comment_section_ids": [], "motion_poll_ids": [], "assignment_poll_ids": [3], - "used_as_motion_poll_default": 1, - "used_as_assignment_poll_default": null, + "used_as_motion_poll_default_id": 1, + "used_as_assignment_poll_default_id": null, "meeting_id": 1 }, { @@ -382,8 +386,8 @@ "write_comment_section_ids": [1], "motion_poll_ids": [], "assignment_poll_ids": [], - "used_as_motion_poll_default": 1, - "used_as_assignment_poll_default": 1, + "used_as_motion_poll_default_id": 1, + "used_as_assignment_poll_default_id": 1, "meeting_id": 1 }, { @@ -410,8 +414,8 @@ "write_comment_section_ids": [], "motion_poll_ids": [], "assignment_poll_ids": [], - "used_as_motion_poll_default": null, - "used_as_assignment_poll_default": 1, + "used_as_motion_poll_default_id": null, + "used_as_assignment_poll_default_id": 1, "meeting_id": 1 }, { @@ -442,8 +446,8 @@ "write_comment_section_ids": [1], "motion_poll_ids": [], "assignment_poll_ids": [], - "used_as_motion_poll_default": null, - "used_as_assignment_poll_default": null, + "used_as_motion_poll_default_id": null, + "used_as_assignment_poll_default_id": null, "meeting_id": 1 }], "personal_note": [ @@ -477,7 +481,7 @@ "tagged_ids": ["motion/2", "motion/3"], "meeting_id": 1 }], -"angeda_item": [ +"agenda_item": [ { "id": 3, "item_number": "", @@ -492,7 +496,7 @@ "content_object_id": "topic/1", "parent_id": null, - "children_ids": [14], + "child_ids": [14], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -512,7 +516,7 @@ "content_object_id": "assignment/2", "parent_id": 3, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -531,7 +535,7 @@ "content_object_id": "topic/2", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -550,7 +554,7 @@ "content_object_id": "topic/3", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -569,7 +573,7 @@ "content_object_id": "topic/4", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -588,7 +592,7 @@ "content_object_id": "topic/5", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -607,7 +611,7 @@ "content_object_id": "topic/6", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -626,7 +630,7 @@ "content_object_id": "topic/7", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -645,7 +649,7 @@ "content_object_id": "topic/8", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -664,7 +668,7 @@ "content_object_id": "motion/1", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -683,7 +687,7 @@ "content_object_id": "motion/2", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -702,7 +706,7 @@ "content_object_id": "assignment/1", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -721,7 +725,7 @@ "content_object_id": "motion/3", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -740,7 +744,7 @@ "content_object_id": "motion/4", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -759,7 +763,7 @@ "content_object_id": "motion_block/1", "parent_id": null, - "children_ids": [], + "child_ids": [], "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -1152,17 +1156,17 @@ "created": 1584512346, "last_modified": 1584512346, - "parent_id": null, - "children_ids": [2], + "lead_motion_id": null, + "amendment_ids": [2], "sort_parent_id": null, - "sort_children_ids": [], + "sort_child_ids": [], "origin_id": null, "derived_motion_ids": [], "state_id": 1, "workflow_id": 1, "recommendation_id": null, "category_id": 2, - "motion_block_id": null, + "block_id": null, "submitter_ids": [1], "supporter_ids": [], "poll_ids": [1, 2], @@ -1194,8 +1198,8 @@ "created": 1584512346, "last_modified": 1584512346, - "parent_id": 1, - "children_ids": [], + "lead_motion_id": 1, + "amendment_ids": [], "sort_parent_id": null, "sort_chldren_ids": [], "origin_id": null, @@ -1204,7 +1208,7 @@ "workflow_id": 1, "recommendation_id": null, "category_id": 1, - "motion_block_id": null, + "block_id": null, "submitter_ids": [2], "supporter_ids": [], "poll_ids": [], @@ -1229,15 +1233,15 @@ "amendment_paragraph_$": [], "modified_final_version": "", "reason": "", - "category_weight": 10000, + "category_weight": 100, "state_extension": null, "recommendation_extension": null, "sort_weight": 10000, "created": 1584512346, "last_modified": 1584512346, - "parent_id": null, - "children_ids": [], + "lead_motion_id": null, + "amendment_ids": [], "sort_parent_id": null, "sort_chldren_ids": [], "origin_id": null, @@ -1246,7 +1250,7 @@ "workflow_id": 1, "recommendation_id": null, "category_id": 2, - "motion_block_id": 1, + "block_id": 1, "submitter_ids": [3], "supporter_ids": [3], "poll_ids": [], @@ -1278,8 +1282,8 @@ "created": 1584512346, "last_modified": 1584512346, - "parent_id": null, - "children_ids": [], + "lead_motion_id": null, + "amendment_ids": [], "sort_parent_id": null, "sort_chldren_ids": [], "origin_id": null, @@ -1288,7 +1292,7 @@ "workflow_id": 2, "recommendation_id": null, "category_id": null, - "motion_block_id": 1, + "block_id": 1, "submitter_ids": [4], "supporter_ids": [], "poll_ids": [], @@ -1352,7 +1356,7 @@ "write_groups_id": [3, 6], "meeting_id": 1 }], -"category": [ +"motion_category": [ { "id": 1, "name": "Cad", @@ -1361,7 +1365,7 @@ "level": 0, "parent_id": null, - "children_ids": [2], + "child_ids": [2], "motion_ids": [2], "meeting_id": 1 }, @@ -1373,7 +1377,7 @@ "level": 1, "parent_id": 1, - "children_ids": [], + "child_ids": [], "motion_ids": [1, 3], "meeting_id": 1 }], @@ -1432,7 +1436,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [2, 3, 4], + "next_state_ids": [2, 3, 4], "previous_state_ids": [], "motion_ids": [1, 2, 3], "motion_recommendation_ids": [], @@ -1453,7 +1457,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [1], "motion_ids": [], "motion_recommendation_ids": [], @@ -1474,7 +1478,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [1], "motion_ids": [], "motion_recommendation_ids": [], @@ -1495,7 +1499,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [1], "motion_ids": [], "motion_recommendation_ids": [], @@ -1516,7 +1520,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [6, 9, 14], + "next_state_ids": [6, 9, 14], "previous_state_ids": [], "motion_ids": [], "motion_recommendation_ids": [], @@ -1537,7 +1541,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [7, 8, 9, 10, 11, 12, 13], + "next_state_ids": [7, 8, 9, 10, 11, 12, 13], "previous_state_ids": [5], "motion_ids": [4], "motion_recommendation_ids": [], @@ -1558,7 +1562,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [6], "motion_ids": [], "motion_recommendation_ids": [], @@ -1579,7 +1583,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [6], "motion_ids": [], "motion_recommendation_ids": [], @@ -1600,7 +1604,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [5, 6], "motion_ids": [], "motion_recommendation_ids": [], @@ -1621,7 +1625,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [6], "motion_ids": [], "motion_recommendation_ids": [], @@ -1642,7 +1646,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [6], "motion_ids": [], "motion_recommendation_ids": [], @@ -1663,7 +1667,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [6], "motion_ids": [], "motion_recommendation_ids": [], @@ -1684,7 +1688,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [6], "motion_ids": [], "motion_recommendation_ids": [], @@ -1705,7 +1709,7 @@ "merge_amendment_into_final": 0, "show_recommendation_extension_field": false, - "next_states_id": [], + "next_state_ids": [], "previous_state_ids": [5], "motion_ids": [], "motion_recommendation_ids": [], @@ -1833,7 +1837,7 @@ "default_poll_description": "", "number_poll_candidates": false, - "assignment_candidate_ids": [1, 2, 3], + "candidate_ids": [1, 2, 3], "polls_id": [1, 2], "agenda_item_id": 11, "list_of_speakers_id": 11, @@ -1852,7 +1856,7 @@ "default_poll_description": "", "number_poll_candidates": true, - "assignment_candidate_ids": [4, 5], + "candidate_ids": [4, 5], "polls_id": [3], "agenda_item_id": 14, "list_of_speakers_id": 14, @@ -2098,15 +2102,15 @@ "access_groups_id": [2, 3], "parent_id": null, - "children_ids": [3], + "child_ids": [3], "list_of_speakers_id": 16, "projection_ids": [], "current_projector_ids": [], "attachment_ids": [], "meeting_id": 1, - "logo_$": [], - "font_$": [] + "used_as_logo_$_in_meeting": [], + "used_as_font_$_in_meeting": [] }, { "id": 2, @@ -2122,15 +2126,15 @@ "access_groups_id": [], "parent_id": null, - "children_ids": [], + "child_ids": [], "list_of_speakers_id": 17, "projection_ids": [], "current_projector_ids": [], "attachment_ids": ["motion/4"], "meeting_id": 1, - "logo_$": [], - "font_$": [] + "used_as_logo_$_in_meeting": [], + "used_as_font_$_in_meeting": [] }, { "id": 3, @@ -2146,16 +2150,16 @@ "access_groups_id": [], "parent_id": 1, - "children_ids": [], + "child_ids": [], "list_of_speakers_id": 18, "projection_ids": [], "current_projector_ids": [], "attachment_ids": [], "meeting_id": 1, - "logo_$": ["logo_web_header"], - "logo_web_header": 1, - "font_$": [] + "used_as_logo_$_in_meeting": ["web_header"], + "used_as_logo_web_header_in_meeting": 1, + "used_as_font_$_in_meeting": [] }], "projector": [ { @@ -2179,8 +2183,8 @@ "current_projection_ids": [4], "current_element_ids": ["assignment/1"], - "elements_preview": [1, 2], - "elements_history": [], + "preview_projection_ids": [1, 2], + "history_projection_ids": [], "used_as_reference_projector_meeting_id": null, "projectiondefaults_id": [1, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13], "meeting_id": 1 @@ -2206,8 +2210,8 @@ "current_projection_ids": [6], "current_element_ids": ["clock/1"], - "elements_preview": [], - "elements_history": [], + "preview_projection_ids": [], + "history_projection_ids": [], "used_as_reference_projector_meeting_id": 1, "projectiondefaults_id": [2, 3], "meeting_id": 1 @@ -2215,17 +2219,17 @@ "projection": [ { "id": 1, - "projector_id": null, - "projector_history_id": null, - "projector_preview_id": 1, + "current_projector_id": null, + "preview_projector_id": 1, + "history_projector_id": null, "element_id": "motion_block/1", "options": {} }, { "id": 2, - "projector_id": null, - "projector_history_id": null, - "projector_preview_id": 1, + "current_projector_id": null, + "preview_projector_id": 1, + "history_projector_history_id": null, "element_id": "motion/4", "options": { "mode": "diff" @@ -2233,17 +2237,17 @@ }, { "id": 4, - "projector_id": 1, - "projector_history_id": null, - "projector_preview_id": null, + "current_projector_id": 1, + "preview_projector_id": null, + "history_projector_id": null, "element_id": "assignment/1", "options": {} }, { "id": 6, - "projector_id": 1, - "projector_history_id": null, - "projector_preview_id": null, + "current_projector_id": 1, + "preview_projector_id": null, + "history_projector_id": null, "element_id": "clock/1", "_comment": "there is no clock model, but it should just not be resolved.", "options": { diff --git a/docs/models.txt b/docs/models.txt index 134ca2d5b..4ed37a747 100644 --- a/docs/models.txt +++ b/docs/models.txt @@ -57,6 +57,7 @@ Interface user { structure_level: string; email: string; last_email_send: string; + vote_weight: decimal; role_id: role/user_ids; // Attention: prevent impelenting a "default-role" or let a // user create such a role! This would cause the user_ids-array for this @@ -91,7 +92,7 @@ Interface user { motion_vote_$_ids: (motion_vote/user_id)[]; assignment_candidate_$_ids: (assignment_candidate/user_id)[]; assignment_poll_voted_$_ids: (assignment_poll/voted_ids)[]; - assignment_option_$_ids: (assignment_option/user_ids)[]; + assignment_option_$_ids: (assignment_option/user_id)[]; assignment_vote_$_ids: (assignment_vote/user_id)[]; } @@ -128,7 +129,7 @@ Interface committee { description: HTML; meeting_ids: (meeting/committee_id)[]; - default_meting_id: meeting/default_meeting_for_committee_id; + default_meeting_id: meeting/default_meeting_for_committee_id; member_ids: (user/committee_as_memeber_ids)[]; manager_ids: (user/committee_as_manager_ids)[]; forward_to_committee_ids: (committee/receive_forwardings_from_committee_ids)[]; @@ -160,7 +161,7 @@ Interface meeting { export_csv_encoding: string; export_csv_separator: string; export_pdf_pagenumber_alignment: string; - export pdf_fontsize: number; + export_pdf_fontsize: number; export_pdf_pagesize: string; // Agenda @@ -214,20 +215,21 @@ Interface meeting { motions_export_follow_recommendation: boolean; motion_poll_ballot_paper_selection: string; - motion_poll_ballot_paper_number: number, + motion_poll_ballot_paper_number: number; motion_poll_default_100_percent_base: string; - motion_poll_default_majority_method:string; - motion_poll_default_groups: (group/used_as_motion_poll_default)[]; + motion_poll_default_majority_method: string; + motion_poll_default_group_ids: (group/used_as_motion_poll_default_id)[]; // Users users_sort_by: string; users_enable_presence_view: boolean; + users_allow_self_set_present: boolean; users_pdf_welcometitle: string; users_pdf_welcometext: string; users_pdf_url: string; users_pdf_wlan_ssid: string; users_pdf_wlan_password: string; - users_pdf_wlan_encryption": string; + users_pdf_wlan_encryption: string; users_email_sender: string; users_email_replyto: string; users_email_subject: string; @@ -241,7 +243,7 @@ Interface meeting { assignment_poll_default_method: string; assignment_poll_default_100_percent_base: string; assignment_poll_default_majority_method: string; - assignment_poll_default_groups: (group/used_as_assignment_poll_default)[]; + assignment_poll_default_group_ids: (group/used_as_assignment_poll_default_id)[]; projector_ids: (projector/meeting_id)[]; projectiondefault_ids: (projectiondefault/meeting_id)[]; @@ -258,7 +260,7 @@ Interface meeting { motion_category_ids: (motion_category/meeting_id)[]; motion_block_ids: (motion_block/meeting_id)[]; motion_workflow_ids: (motion_workflow/meeting_id)[]; - motion_statute_paragraph_ids: (motion_statute_paragraph/meetin_id)[]; + motion_statute_paragraph_ids: (motion_statute_paragraph/meeting_id)[]; motion_poll_ids: (motion_poll/meeting_id)[]; assignment_ids: (assignment/meeting_id)[]; assignment_poll_ids: (assignment_poll/meeting_id)[]; @@ -279,8 +281,8 @@ Interface meeting { // assignment_vote // Logos and Fonts - logo_$: mediafile/logo_$; - font_$: mediafile/font_$; + logo_$: mediafile/used_as_logo_$_in_meeting; + font_$: mediafile/used_as_font_$_in_mmeting; // Examples: // logo_web_header: Mediafile; // font_italic_pdf: Mediafile; @@ -293,7 +295,7 @@ Interface meeting { committee_id: committee/meeting_ids; default_meeting_for_committee_id: committee/default_meeting_id; present_user_ids: (user/is_present_in_meeting_ids)[]; - temorary_user_ids: (user/meeting_id)[]; + temporary_user_ids: (user/meeting_id)[]; guest_ids: (user/guest_meeting_ids)[]; reference_projector_id: projector/used_as_reference_projector_meeting_id; } @@ -311,8 +313,8 @@ Interface group { write_comment_section_ids: (motion_comment_section/write_group_ids)[]; motion_poll_ids: (motion_poll/entitled_group_ids)[]; assignment_poll_ids: (assignment_poll/entitled_group_ids)[]; - used_as_motion_poll_default: meeting/motion_poll_default_groups; - used_as_assignment_poll_default: meeting/assignment_poll_default_groups; + used_as_motion_poll_default_id: meeting/motion_poll_default_group_ids; + used_as_assignment_poll_default_id: meeting/assignment_poll_default_group_ids; meeting_id: meeting/group_ids; } @@ -346,8 +348,8 @@ Interface agenda_item { level: number; // calculated. content_object_id: */agenda_item_id; - parent_id: agenda_item/children_ids; - children_ids: (agenda_item/parent_id)[]; + parent_id: agenda_item/child_ids; + child_ids: (agenda_item/parent_id)[]; projection_ids: (projection/element_id)[]; current_projector_ids: (projector/current_element_ids)[] meeting_id: meeting/agenda_item_ids; @@ -380,7 +382,7 @@ Interface topic { title: string; text: HTML; - attachments_id: (mediafile/attachement_ids)[]; + attachment_ids: (mediafile/attachement_ids)[]; agenda_item_id: agenda_item/content_object_id; list_of_speakers_id: list_of_speakers/content_object_id; tag_ids: (tag/tagged_ids)[]; @@ -400,20 +402,20 @@ Interface motion { state_extension: string; recommendation_extension: string; sort_weight: number; - created: string; - last_modified: string; + created: datetime; + last_modified: datetime; - parent_id: motion/children_ids; - children_ids: (motion/parent_id)[]; - sort_parent_id: motion/sort_children_ids; - sort_children_ids: (motion/parent_id)[]; + lead_motion_id: motion/amendment_ids; + amendment_ids: (motion/lead_motion_id)[]; + sort_parent_id: motion/sort_child_ids; + sort_child_ids: (motion/parent_id)[]; origin_id: motion/derived_motion_ids; // Note: The related motions may not be in the same meeting derived_motion_ids: (motion/origin_id)[]; // Note: The related motions may not be in the same meeting state_id: motion_state/motion_ids; workflow_id: motion_workflow/motion_ids; recommendation_id: motion_state/motion_recommendation_ids; category_id: category/motion_ids; - motion_block_id: motion_block/motion_ids; + block_id: motion_block/motion_ids; submitter_ids: (motion_submitter/motion_id)[]; supporter_ids: (user/supported_motion_$_ids)[]; poll_ids: (motion_poll/motion_id)[]; @@ -434,7 +436,7 @@ Interface motion_submitter { id: number; weight: number; - user_id: (user/submitted_motion_$_ids)[]; + user_id: user/submitted_motion_$_ids; motion_id: motion/submitter_ids; } @@ -464,8 +466,8 @@ Interface motion_category { weight: number; level: number; - parent_id: motion_category/children_ids; - children_ids: (motion_category/parent_id)[]; + parent_id: motion_category/child_ids; + child_ids: (motion_category/parent_id)[]; motion_ids: (motion/category_id)[]; meeting_id: meeting/category_ids; } @@ -475,7 +477,7 @@ Interface motion_block { title: string; internal: boolean; - motion_ids: (motion/motion_block_id)[]; + motion_ids: (motion/block_id)[]; agenda_item_id: agenda_item/content_object_id; list_of_speakers_id: list_of_speakers/content_object_id; projection_ids: (projection/element_id)[]; @@ -591,7 +593,7 @@ Interface assignment { default_poll_description: string; number_poll_candidates: boolean; - assignment_candidate_ids: (assignment_candidate/assignment_id)[]; + candidate_ids: (assignment_candidate/assignment_id)[]; poll_ids: (assignment_poll/assignment_id)[]; agenda_item_id: agenda_item/content_object_id; list_of_speakers_id: list_of_speakers/content_object_id; @@ -606,7 +608,7 @@ Inteface assignment_candidate { id: number; weight: number; - assignment_id: assignment/assignment_candidate_ids; + assignment_id: assignment/candidate_ids; user_id: user/assignment_candidate_$_ids; } @@ -677,8 +679,8 @@ Interface mediafile { // reverse-relation for the group ids. access_group_ids: (group/mediafile_access_group_ids)[]; - parent_id: mediafile/children_ids; - children_ids: (mediafile/parent_id)[]; + parent_id: mediafile/child_ids; + child_ids: (mediafile/parent_id)[]; list_of_speakers_id: list_of_speakers/content_object_id; projection_ids: (projection/element_id)[]; current_projector_ids: (projector/current_element_ids)[] @@ -686,8 +688,8 @@ Interface mediafile { meeting_id: meeting/mediafile_ids; // Reverse relations for meetings, if a mediafile is used as a special resource - logo_$: meeting/logo_$; - font_$: meeting/font_$; + used_as_logo_$_in_meeting: meeting/logo_$; + used_as_font_$_in_meeting: meeting/font_$; } Interface projector { @@ -709,12 +711,12 @@ Interface projector { show_title: boolean; show_logo: boolean - current_projection_ids: (projection/current_projector_ids)[]; + current_projection_ids: (projection/current_projector_id)[]; // A relation to the currently projected elements to get a direct link, if // the element is projected. - current_element_ids: (*/projector_ids)[]; - elements_preview: (projection/projector_preview_ids)[]; - elements_history: (projection/projector_history_ids)[]; + current_element_ids: (*/current_projector_ids)[]; + preview_projection_ids: (projection/projector_preview_id)[]; + history_projection_ids: (projection/projector_history_id)[]; used_as_reference_projector_meeting_id: meeting/reference_projector_id; projectiondefault_ids: projectiondefault[]; meeting_id: meeting/projector_ids; @@ -727,11 +729,12 @@ Interface projector { // and element, these references will not change. Interface projection { id: number; - current_projector_id: projector/current_projection_ids; - projector_history_id: projector/elements_preview; - projector_preview_id: projector/elements_history; - element_id: */projection_ids; options: JSON; + + current_projector_id: projector/current_projection_ids; + preview_projector_id: projector/preview_projection_ids; + history_projector_id: projector/history_projection_ids; + element_id: */projection_ids; } Interface projectiondefault {