Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
448 changes: 138 additions & 310 deletions data/example-data.json

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions docs/Actions-Overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,21 +242,3 @@ A more general format description see in [Action-Service](https://github.com/Ope
- [account.import](actions/account.import.md)
- [participant.json_upload](actions/participant.json_upload.md)
- [participant.import](actions/participant.import.md)

## Voting

- [option.update](actions/option.update.md)
- [poll.create](actions/poll.create.md)
- [poll.delete](actions/poll.delete.md)
- [poll.update](actions/poll.update.md)
- [poll.start](actions/poll.start.md)
- [poll.stop](actions/poll.stop.md)
- [poll.publish](actions/poll.publish.md)
- [poll.reset](actions/poll.reset.md)
- [poll.anonymize](actions/poll.anonymize.md)
- [poll.vote](actions/poll.vote.md)
- [poll_candidate_list.create](actions/poll_candidate_list.create.md)
- [poll_candidate_list.delete](actions/poll_candidate_list.delete.md)
- [poll_candidate.create](actions/poll_candidate.create.md)
- [poll_candidate.delete](actions/poll_candidate.delete.md)

2 changes: 1 addition & 1 deletion docs/actions/meeting.update.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@

topic_poll_default_group_ids: Id[];

poll_default_backend: string;
poll_default_live_voting_enabled: boolean;
poll_default_allow_invalid: boolean;

// Group B
present_user_ids: user/is_present_in_meeting_ids;
Expand Down
5 changes: 5 additions & 0 deletions docs/actions/meeting_user.update.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
id: Id;

// Optional
poll_option_ids: Id[];
poll_voted_ids: Id[];
acting_ballot_ids: Id[];
represented_ballot_ids: Id[];

// Group A
number: string;
structure_level_ids: Id[];
Expand Down
23 changes: 0 additions & 23 deletions docs/actions/option.update.md

This file was deleted.

15 changes: 0 additions & 15 deletions docs/actions/poll.anonymize.md

This file was deleted.

77 changes: 0 additions & 77 deletions docs/actions/poll.create.md

This file was deleted.

13 changes: 0 additions & 13 deletions docs/actions/poll.delete.md

This file was deleted.

13 changes: 0 additions & 13 deletions docs/actions/poll.publish.md

This file was deleted.

15 changes: 0 additions & 15 deletions docs/actions/poll.reset.md

This file was deleted.

15 changes: 0 additions & 15 deletions docs/actions/poll.start.md

This file was deleted.

19 changes: 0 additions & 19 deletions docs/actions/poll.stop.md

This file was deleted.

52 changes: 0 additions & 52 deletions docs/actions/poll.update.md

This file was deleted.

14 changes: 0 additions & 14 deletions docs/actions/poll_candidate.create.md

This file was deleted.

13 changes: 0 additions & 13 deletions docs/actions/poll_candidate.delete.md

This file was deleted.

17 changes: 0 additions & 17 deletions docs/actions/poll_candidate_list.create.md

This file was deleted.

12 changes: 0 additions & 12 deletions docs/actions/poll_candidate_list.delete.md

This file was deleted.

11 changes: 4 additions & 7 deletions docs/actions/user.merge_together.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ An error is thrown if:
- Any of the secondary users have a `saml_id`
- There are multiple different `member_number`s between the selected users (empty does not count)
- There are conflicts regarding polls, i.e. two or more of the selected users...
- are option content_objects (not counting poll_candidate_list membership) on the same poll
- are candidates on the same poll_candidate_list
- have voted on the same poll (delegated or not)
- Any affected meeting_users have groups that are currently entitled to work on any poll
- Any affected meeting_users _who share a meeting_:
- are meeting_users of the poll_config_option on the same poll
- have voted on the same poll (delegated or not)
- have running speakers
- are in a meeting without `list_of_speakers_allow_multiple_speakers` and have waiting speakers on the same list who cannot be merged together into at most one point_of_order and one normal speech. Speeches may not be merged if there are multiple different values (empty does count) within any of the fields:
- `speech_state`
Expand All @@ -70,8 +69,6 @@ Any date in the custom payload data from the request overwrites anything that wo
Data validity of the results is checked according to user.update rules.

The secondary users are deleted.

Any poll that contains the id of any secondary user in its `entitled_users_at_stop` list will have it re-written to _additionally_ contain the new user id.
This means that a line
`{"voted": false, "present": true, "user_id": 4, "vote_delegated_to_user_id": 7}`
becomes
Expand All @@ -80,7 +77,7 @@ after two merges where for the first `user/4` was merged into `user/2` and for t
This is to ensure that the client can recognize where users were merged, as simply replacing the ids may cause situations where a user is present on a list twice and not replacing them would mean that the user that voted would not be recognizable anymore.

#### Merging of sub-collections
Relation lists where simple unification does not suffice (usually because the target collections function mostly as a type of m:n connection between two other collections) are merged.
Relation lists where simple unification does not suffice (usually because the target collections function mostly as a type of m:n connection between two other collections) are merged.

For that purpose, target models for these relations are compared and those that are judged to fulfill equivalent roles are grouped together.

Expand Down Expand Up @@ -141,7 +138,7 @@ He also needs a organization management level that is equal or higher than that

The client could/should fill the optional fields from a chosen "main" user to not force the editor to rewrite all the data.

Warnings should be shown alerting the user that
Warnings should be shown alerting the user that
- this action is not reversable,
- will potentially change/overwrite data in archived meetings and
- will neither port the history information of the secondary users to the new ones nor rewrite the user id in the "Changed by" column
Loading