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

Merge pull request #5499 from FinnStutzenstein/moreCalculatedFields

Browse Source 
Add calculated fields
This commit is contained in:
Finn Stutzenstein 2020-08-17 12:10:24 +02:00 committed by GitHub
commit cb894c9d99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/example-data.json
View File

@ -10,6 +10,7 @@
"committee_ids": [1], "committee_ids": [1],
"role_ids": [1], "role_ids": [1],
"superadmin_role_id": 1,
"resource_ids": [] "resource_ids": []
}], }],
"user": [ "user": [
@ -159,9 +160,9 @@
"id": 1, "id": 1,
"name": "Superadmin role", "name": "Superadmin role",
"permissions": [], "permissions": [],
"is_superadmin_role": true,
"organisation_id": 1, "organisation_id": 1,
"superadmin_role_for_organisation_id": 1,
"user_ids": [1] "user_ids": [1]
}], }],
"resource": [], "resource": [],
@ -318,6 +319,7 @@
"present_user_ids": [1], "present_user_ids": [1],
"temorary_user_ids": [], "temorary_user_ids": [],
"guest_ids": [3], "guest_ids": [3],
"user_ids": [1, 2, 3],
"reference_projector_id": 2, "reference_projector_id": 2,
"default_group_id": 1, "default_group_id": 1,
@ -1193,8 +1195,11 @@
"sort_child_ids": [], "sort_child_ids": [],
"origin_id": null, "origin_id": null,
"derived_motion_ids": [], "derived_motion_ids": [],
"forwarding_tree_motion_ids": [],
"state_id": 1, "state_id": 1,
"recommendation_id": null, "recommendation_id": null,
"recommendation_extension_reference_ids": [],
"referenced_in_motion_recommendation_extension_ids": [],
"category_id": 2, "category_id": 2,
"block_id": null, "block_id": null,
"submitter_ids": [1], "submitter_ids": [1],
@ -1231,11 +1236,14 @@
"lead_motion_id": 1, "lead_motion_id": 1,
"amendment_ids": [], "amendment_ids": [],
"sort_parent_id": null, "sort_parent_id": null,
"sort_chldren_ids": [], "sort_child_ids": [],
"origin_id": null, "origin_id": null,
"derived_motion_ids": [], "derived_motion_ids": [],
"forwarding_tree_motion_ids": [],
"state_id": 1, "state_id": 1,
"recommendation_id": null, "recommendation_id": null,
"recommendation_extension_reference_ids": [],
"referenced_in_motion_recommendation_extension_ids": [],
"category_id": 1, "category_id": 1,
"block_id": null, "block_id": null,
"submitter_ids": [2], "submitter_ids": [2],
@ -1272,11 +1280,14 @@
"lead_motion_id": null, "lead_motion_id": null,
"amendment_ids": [], "amendment_ids": [],
"sort_parent_id": null, "sort_parent_id": null,
"sort_chldren_ids": [], "sort_child_ids": [],
"origin_id": null, "origin_id": null,
"derived_motion_ids": [], "derived_motion_ids": [],
"forwarding_tree_motion_ids": [],
"state_id": 1, "state_id": 1,
"recommendation_id": null, "recommendation_id": null,
"recommendation_extension_reference_ids": [],
"referenced_in_motion_recommendation_extension_ids": [],
"category_id": 2, "category_id": 2,
"block_id": 1, "block_id": 1,
"submitter_ids": [3], "submitter_ids": [3],
@ -1306,6 +1317,8 @@
"category_weight": 10000, "category_weight": 10000,
"state_extension": null, "state_extension": null,
"recommendation_extension": null, "recommendation_extension": null,
"recommendation_extension_reference_ids": [],
"referenced_in_motion_recommendation_extension_ids": [],
"sort_weight": 10000, "sort_weight": 10000,
"created": 1584512346, "created": 1584512346,
"last_modified": 1584512346, "last_modified": 1584512346,
@ -1313,9 +1326,10 @@
"lead_motion_id": null, "lead_motion_id": null,
"amendment_ids": [], "amendment_ids": [],
"sort_parent_id": null, "sort_parent_id": null,
"sort_chldren_ids": [], "sort_child_ids": [],
"origin_id": null, "origin_id": null,
"derived_motion_ids": [], "derived_motion_ids": [],
"forwarding_tree_motion_ids": [],
"state_id": 6, "state_id": 6,
"recommendation_id": null, "recommendation_id": null,
"category_id": null, "category_id": null,

7
docs/models.txt
View File

@ -37,6 +37,7 @@ Interface organisation {
committee_ids: (committee/organisation_id)[]; committee_ids: (committee/organisation_id)[];
role_ids: (role/organisation_id)[]; role_ids: (role/organisation_id)[];
superadmin_role_id: role/superadmin_role_for_organisation_id;
resource_ids: (resource/organisation_id)[]; resource_ids: (resource/organisation_id)[];
} }
@ -100,9 +101,9 @@ Interface role {
id: number; id: number;
name: string; name: string;
permissions: string[]; permissions: string[];
is_superadmin_role: boolean;
organisation_id: organisation/role_ids; organisation_id: organisation/role_ids;
superadmin_role_for_organisation_id: organisation/superadmin_role_id;
user_ids: (user/role_id)[]; user_ids: (user/role_id)[];
} }
@ -306,6 +307,7 @@ Interface meeting {
present_user_ids: (user/is_present_in_meeting_ids)[]; present_user_ids: (user/is_present_in_meeting_ids)[];
temporary_user_ids: (user/meeting_id)[]; temporary_user_ids: (user/meeting_id)[];
guest_ids: (user/guest_meeting_ids)[]; guest_ids: (user/guest_meeting_ids)[];
user_ids: (Id)[]; // Calculated: All ids from temporary_user_ids, guest_ids and all users assigned to groups.
reference_projector_id: projector/used_as_reference_projector_meeting_id; reference_projector_id: projector/used_as_reference_projector_meeting_id;
default_group_id: group/default_group_for_meeting_id; default_group_id: group/default_group_for_meeting_id;
@ -425,8 +427,11 @@ Interface motion {
sort_child_ids: (motion/parent_id)[]; sort_child_ids: (motion/parent_id)[];
origin_id: motion/derived_motion_ids; // Note: The related motions may not be in the same meeting 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 derived_motion_ids: (motion/origin_id)[]; // Note: The related motions may not be in the same meeting
forwarding_tree_motion_ids: (Id)[]; // Calculated: All children (derived_motion_ids), grand children, ... and all parents (origin_id).
state_id: motion_state/motion_ids; state_id: motion_state/motion_ids;
recommendation_id: motion_state/motion_recommendation_ids; recommendation_id: motion_state/motion_recommendation_ids;
recommendation_extension_reference_ids: (*/referenced_in_motion_recommendation_extension_ids)[]; // current option: motion
referenced_in_motion_recommendation_extension_ids: (motion/recommendation_extension_reference_ids)[];
category_id: motion_category/motion_ids; category_id: motion_category/motion_ids;
block_id: motion_block/motion_ids; block_id: motion_block/motion_ids;
submitter_ids: (motion_submitter/motion_id)[]; submitter_ids: (motion_submitter/motion_id)[];