Merge pull request #5524 from FinnStutzenstein/update

Update models.txt
This commit is contained in:
Finn Stutzenstein 2020-08-24 15:57:13 +02:00 committed by GitHub
commit 5846838a04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 27 deletions

View File

@ -226,7 +226,7 @@
"list_of_speakers_show_first_contribution": false,
"motions_default_workflow_id": 1,
"motions_statute_amendments_workflow_id": 2,
"motions_statute_amendment_workflow_id": 2,
"motions_preamble": "The assembly may decide:",
"motions_default_line_numbering": "none",
"motions_line_length": 90,
@ -239,7 +239,7 @@
"motions_show_sequential_numbers": true,
"motions_recommendations_by": "",
"motions_statute_recommendations_by": "",
"motions_recommendation_text_mode": "normal",
"motions_recommendation_text_mode": "original",
"motions_default_sorting": "number",
"motions_number_type": "per_category",
"motions_number_min_digits": 1,
@ -310,9 +310,9 @@
"assignment_ids": [1, 2],
"assignment_poll_ids": [1, 2, 3],
"logo_$": ["web_header"],
"logo_web_header": 3,
"font_$": [],
"logo_$_id": ["web_header"],
"logo_web_header_id": 3,
"font_$_id": [],
"committee_id": 1,
"default_meeting_for_committee_id": 1,
@ -2136,7 +2136,6 @@
"mimetype": null,
"pdf_information": {},
"create_timestamp": 1584513763,
"path": "logos/",
"has_inherited_access_groups": true,
"access_group_ids": [2, 3],
@ -2149,8 +2148,8 @@
"attachment_ids": [],
"meeting_id": 1,
"used_as_logo_$_in_meeting": [],
"used_as_font_$_in_meeting": []
"used_as_logo_$_in_meeting_id": [],
"used_as_font_$_in_meeting_id": []
},
{
"id": 2,
@ -2161,7 +2160,6 @@
"mimetype": "text/plain",
"pdf_information": {},
"create_timestamp": 1584513771,
"path": "A.txt",
"has_inherited_access_groups": false,
"access_group_ids": [],
@ -2174,8 +2172,8 @@
"attachment_ids": ["motion/4"],
"meeting_id": 1,
"used_as_logo_$_in_meeting": [],
"used_as_font_$_in_meeting": []
"used_as_logo_$_in_meeting_id": [],
"used_as_font_$_in_meeting_id": []
},
{
"id": 3,
@ -2186,7 +2184,6 @@
"mimetype": "image/png",
"pdf_information": {},
"create_timestamp": 1584513791,
"path": "logos/in.jpg",
"has_inherited_access_groups": true,
"access_group_ids": [],
@ -2199,9 +2196,9 @@
"attachment_ids": [],
"meeting_id": 1,
"used_as_logo_$_in_meeting": ["web_header"],
"used_as_logo_web_header_in_meeting": 1,
"used_as_font_$_in_meeting": []
"used_as_logo_$_in_meeting_id": ["web_header"],
"used_as_logo_web_header_in_meeting_id": 1,
"used_as_font_$_in_meeting_id": []
}],
"projector": [
{

View File

@ -189,7 +189,8 @@ Interface meeting {
// Motions
motions_default_workflow_id: workflow/default_workflow_meeting_id;
motions_default_statute_amendments_workflow_id: workflow/default_statute_amendments_meeting_id;
motions_default_amendment_workflow_id: workflow/default_amendment_workflow_meeting_id;
motions_default_statute_amendment_workflow_id: workflow/default_statute_amendment_workflow_meeting_id;
motions_preamble: string;
motions_default_line_numbering: string;
motions_line_length: number;
@ -247,6 +248,9 @@ Interface meeting {
// Assignments
assignemnts_export_title: string;
assignments_export_preamble: string;
assignment_poll_ballot_paper_selection: string;
assignment_poll_ballot_paper_number: number;
assignment_poll_add_candidates_to_list_of_speakers: boolean;
assignment_poll_sort_poll_result_by_votes: boolean;
assignment_poll_default_type: string;
@ -291,13 +295,13 @@ Interface meeting {
// assignment_vote
// Logos and Fonts
logo_$<token>: mediafile/used_as_logo_$<token>_in_meeting;
font_$<token>: mediafile/used_as_font_$<token>_in_mmeting;
logo_$<place>_id: mediafile/used_as_logo_$<place>_in_meeting_id;
font_$<place>_id: mediafile/used_as_font_$<place>_in_mmeting_id;
// Examples:
// logo_web_header: Mediafile;
// font_italic_pdf: Mediafile;
// The client can define these resources. There is no need
// to have whitelist/blacklist on the server. The tokens must
// to have whitelist/blacklist on the server. The places must
// be checked: They must match `[a-z]([a-z_]*[a-z])?` and must
// not be longer than 32 characters.
@ -408,7 +412,7 @@ Interface topic {
Interface motion {
id: number;
number: string;
sequential_number: number;
sequential_number: number; // Calculated
title: string;
text: HTML;
amendment_paragraph_$<paragraph_number>: HTML;
@ -546,7 +550,8 @@ Interface motion_workflow {
state_ids: (motion_state/workflow_id)[];
first_state_id: motion_state/first_state_of_workflow_id;
default_workflow_meeting_id: meeting/motions_default_workflow_id;
default_statute_amendments_meeting_id: meeting/motions_default_statute_amendments_workflow_id;
default_amendment_workflow_meeting_id: meeting/motions_default_amendment_workflow_id;
default_statute_amendment_workflow_meeting_id: meeting/motions_default_statute_amendment_workflow_id;
meeting_id: meeting/motion_workflow_ids;
}
@ -683,15 +688,13 @@ Interface assignment_vote {
// `<media-prefix>/media/<meeting_id>/path`
Interface mediafile {
id: number;
title: string;
title: string; // title and parent_id must be unique.
is_directory: boolean;
filesize: number; // Note: in bytes, not the human readable format anymore
filename: string; // Note: The uploaded filename. Filename and parent_id
// must be unique as well as title and parent_id must be unique.
filename: string; // Note: The uploaded filename. will be used for downloading. Only writeable on create.
mimetype: string;
pdf_information: JSON;
create_timestamp: datetime;
path: string; // Note: calculated
has_inherited_access_groups: boolean; // Note: calculated
inherited_access_group_ids: (group/mediafile_inherited_access_group_ids)[]; // Note: calculated
@ -705,8 +708,8 @@ Interface mediafile {
meeting_id: meeting/mediafile_ids;
// Reverse relations for meetings, if a mediafile is used as a special resource
used_as_logo_$<token>_in_meeting: meeting/logo_$<token>;
used_as_font_$<token>_in_meeting: meeting/font_$<token>;
used_as_logo_$<place>_in_meeting_id: meeting/logo_$<place>_id;
used_as_font_$<place>_in_meeting_id: meeting/font_$<place>_id;
}
Interface projector {