Compare commits

..

1134 Commits

Author SHA1 Message Date
Brain ba688a9668
Enable audio streaming 2022-06-20 21:33:40 +02:00
Emanuel Schütze 5a8689827c
Updated translation for delegation of vote (filter) (#6427) 2022-05-21 11:49:25 +02:00
Magnus Schieder 2c1cc31e52
Fix the font the h1 headings in the projector (#6412) 2022-05-02 09:11:03 +02:00
jsangmeister b2d05af928
Remove topic/option_ids from export (#6413) 2022-04-29 09:58:07 +02:00
Magnus Schieder 27682f3742
Make the style of the project titles customizable (#6409)
allow custom font for h1 and h2 projector title
2022-04-26 09:46:31 +02:00
Magnus Schieder 58d5bf7d6c
Fix unwanted line break in pdf export (#6408)
for inactive linenumbering
2022-04-24 17:48:40 +02:00
jsangmeister ff1d5c0c4d
Fix OS3 export to MI 3 (#6404) 2022-04-20 07:37:09 +02:00
jsangmeister 847b61f0ba
Update Readme & fix dependencies (#6401)
* Update Readme

* Fix typo & requirements mismatch

* Fix all dependencies

* Fix bug report typos
2022-04-19 10:27:30 +02:00
Emanuel Schütze 420bef680a
Updated Italian translation (#6392) 2022-03-28 14:19:23 +02:00
Emanuel Schütze d716bd5414
Fix pdf making of a motion with line numbers (#6391)
Fixed line breaks by using change recommendations in li elements.
Migrated from OS4 (see #966)
2022-03-28 14:19:04 +02:00
GabrielInTheWorld 941b0be524
Adjusts docker-dev setup to match docker-prod setup (#6394) 2022-03-28 13:26:07 +02:00
bug0001 a6446ce55c
documentation overhaul (#6353) 2022-02-16 12:52:12 +01:00
bug0001 b24951d806
Dependency resolve (#6359)
* Updated install instructions in Readme

* Fix black version to prevent mismatch with typing-extensions

Co-authored-by: Joshua Sangmeister <joshua.sangmeister@gmail.com>
2022-02-16 10:11:22 +01:00
Jasper Roloff c035839892
Fix build.sh for stable/3.4.x (#6329)
Fix issue where `build.sh all` failed with `unable to prepare context: unable to 'git clone' to temporary context directory: error fetching: fatal: Couldn't find remote ref master`
2022-01-18 20:31:22 +01:00
jsangmeister fceb892005
Fix various exporter issues (#6327)
* Fix various exporter issues

* Fix formatting
2022-01-11 12:47:41 +01:00
Emanuel Schütze 31f59e069d
Merge pull request #6318 from GabrielInTheWorld/fix-candidate-percentbase
Fixes percentbase of candidates in assignments
2022-01-06 18:04:43 +01:00
GabrielInTheWorld 23577be953 Fixes: Percentbases of candidates in assignments 2022-01-06 17:38:32 +01:00
Emanuel Schütze 1e22ffbf7e
Merge pull request #6299 from normanjaeckel/GetUser2
Changed GetUser view. Now it retrieves one or more users.
2021-12-20 08:55:39 +01:00
Norman Jäckel b0bc4129ce Changed GetUser view. Now it retrieves one or more users. 2021-11-30 00:30:54 +01:00
Emanuel Schütze 87b8fcd42b
Merge pull request #6296 from jsangmeister/fix-export
Update exporter to newest backend
2021-11-25 18:32:09 +01:00
Joshua Sangmeister 93e0b53b9e Add chat message collection & fields
Add & update poll backends
2021-11-25 18:00:35 +01:00
Emanuel Schütze 2dfc926ba2
Merge pull request #6294 from emanuelschuetze/translation-20211124
Updated translations and autoupdate service
2021-11-24 23:47:54 +01:00
Emanuel Schütze cbfffddec7 Updated translations and autoupdate service
Fixed #3607
2021-11-24 23:08:20 +01:00
Sean dc555a4116
Merge pull request #6287 from GabrielInTheWorld/of-groups-view
Fixes high amount of groups
2021-11-23 11:54:58 +01:00
Emanuel Schütze d4953ed81a
Merge pull request #6272 from normanjaeckel/GetUser
Added route to get a user e. g. for third-party applications.
2021-11-22 17:32:04 +01:00
Norman Jäckel 9cd0416938 Added route to get a user e. g. for third-party applications. 2021-11-22 17:21:27 +01:00
GabrielInTheWorld 19ea4a312e Fixes high amount of groups 2021-11-19 10:42:44 +01:00
Emanuel Schütze 4efc591d21
Merge pull request #6285 from jsangmeister/restrictions-fix
Various fixes for the exporter
2021-11-18 17:27:29 +01:00
Joshua Sangmeister cc6cf9ea42 Fix various export errors 2021-11-18 17:17:18 +01:00
Joshua Sangmeister 740f164ac3 Fix for motion restrictions in case migrations weren't applied properly 2021-11-18 09:18:30 +01:00
Emanuel Schütze f04d64d48d
Merge pull request #6277 from emanuelschuetze/motion-id-column
Increase motion id column
2021-11-13 23:35:54 +01:00
Emanuel Schütze e8803bde0c Increase motion id column 2021-11-13 22:58:22 +01:00
Emanuel Schütze adb9d95ff3
Merge pull request #6276 from GabrielInTheWorld/motion-block-and-list-width
Makes the motion block detail and motion list more user friendly
2021-11-13 14:48:31 +01:00
GabrielInTheWorld 6ac24f5f6c Bigger meta column width for tables
motion block detail, motion list, user list, user statistics
2021-11-13 12:00:00 +01:00
Emanuel Schütze a3d8dd01da
Merge pull request #6264 from emanuelschuetze/livestream-poster-image-helptext
Fixed livestream poster image size in help text.
2021-10-22 11:06:26 +02:00
Emanuel Schütze 82ad1d2222 Fixed livestream poster image size in help text. 2021-10-22 11:04:27 +02:00
Emanuel Schütze af4ff015ae
Merge pull request #6263 from tsiegleauq/bump-jszip-version
Bump jszip version to 3.7.1
2021-10-21 17:56:53 +02:00
Sean 34f27ea4c0 Bump jszip version to 3.7.1 2021-10-21 17:45:05 +02:00
Emanuel Schütze bbdbdd3c10
Merge pull request #6245 from emanuelschuetze/release3.4
Release 3.4
2021-10-07 08:03:05 +02:00
Emanuel Schütze f2ae6d1cae Update version to 3.4.1-master 2021-10-07 08:00:10 +02:00
Emanuel Schütze 420422e2cf Release 3.4 2021-10-07 07:59:38 +02:00
Emanuel Schütze 8d20c40ca1
Merge pull request #6181 from tsiegleauq/changelog-3.4
Changelog 3.4
2021-10-06 09:28:33 +02:00
Sean 1b3af8cecd Changelog 3.4 2021-10-06 09:27:47 +02:00
Emanuel Schütze bd22957740
Merge pull request #6228 from tsiegleauq/stream-nanocosmos
Add Support for streams from Nanocosmos
2021-09-23 16:04:42 +02:00
Emanuel Schütze 74b1527bbe
Merge pull request #6222 from GabrielInTheWorld/of-fix-settingsgroup
Fixes the usage of groups in the settings
2021-09-23 10:24:56 +02:00
Sean 91a9e19f09 Add Support for streams from Nanocosmos
Add a full nanocosmus stream URL.
The URL has to include: "nanocosmos.de"
the ID will be extracted by looking for an equals symbol.
So: something.nanocosmos.de/somethingelse=1234-5678

will detect 1234-5678 as videoID.
The iframe that will be used is fix.
2021-09-21 18:11:23 +02:00
GabrielMeyer 932eb647ab Fixes the usage of groups in the settings 2021-09-13 11:38:12 +02:00
Emanuel Schütze 0c30be5308
Merge pull request #6219 from emanuelschuetze/stable/3.4.x
Updated autoupdate service
2021-09-06 12:17:51 +02:00
Emanuel Schütze ac5a975a4c Updated autoupdate service 2021-09-06 11:56:41 +02:00
GabrielInTheWorld 70d5b32bd7
Merge pull request #6212 from tsiegleauq/clean-html-on-motion-paste
Clean HTML before pasting in tinymce
2021-08-20 08:30:59 +02:00
Sean eab60ab31a Clean HTML before pasting in tinymce
If the user decides to copy-paste HTML (like from another OpenSlides motion detail)
 - remove all classes
 - remove data-line-number="X"
 - remove contenteditable="false"

Not doing so would save control sequences from diff/linenumbering into the
model which will open pandoras pox during PDF generation (and potentially web view)
2021-08-19 18:55:23 +02:00
Sean 8c7a770f9b
Merge pull request #6202 from tsiegleauq/unhide-help-desk
Show Helpdesk without live streams
2021-08-09 14:16:18 +02:00
Sean b2ae972ce0 Show Helpdesk without live streams 2021-08-09 12:13:12 +02:00
Emanuel Schütze 8d90c6821e
Merge pull request #6193 from emanuelschuetze/translations-20210802
Updated all translations
2021-08-02 14:40:34 +02:00
Emanuel Schütze 2287f3bf4f Updated all translations 2021-08-02 12:59:12 +02:00
Sean 18ffcaca92
Merge pull request #6186 from tsiegleauq/import-supporter
Add CSV import for supporters
2021-07-27 17:54:49 +02:00
Sean 802ac1aee8 Add CSV import for supporters
Supporters can now be imported via csv
this was forgotten before
2021-07-27 17:35:14 +02:00
Emanuel Schütze 759e23e15b
Merge pull request #6184 from tsiegleauq/fix-mat-table-after-upgrade
Fix mat-table no flex class
2021-07-27 16:56:30 +02:00
Sean e8507414d9 Fix mat-table no flex class
After upgrading angular material, mat table had a different set of
classes which would break a view
2021-07-27 16:50:59 +02:00
Emanuel Schütze c48658210b
Merge pull request #6185 from tsiegleauq/agenda-list-error
Fix an error where the workflow would break agenda
2021-07-27 14:31:34 +02:00
Sean 0ee14c9986 Fix an error where the workflow would break agenda
If the projected element was null due to workflow restrictions, the
agenda list would throw an error
2021-07-27 13:07:30 +02:00
Oskar Hahn 6c01c2b99b
Merge pull request #6183 from ostcar/remove_prometus
Update autoupdate, remove prometeus
2021-07-26 11:31:53 +02:00
Oskar Hahn cd7421b732 Update autoupdate, remove prometeus 2021-07-24 07:20:29 +02:00
Emanuel Schütze 1b2169dd45
Merge pull request #6177 from tsiegleauq/jitsi-hide-chat
Hide chat in jitsi iFrame
2021-07-20 16:37:55 +02:00
Sean b2ac759379 Hide chat in jitsi iFrame 2021-07-20 15:21:12 +02:00
Emanuel Schütze 9d60951344
Merge pull request #6176 from tsiegleauq/jitsi-user-scroll
Scrollable sorted jitsi user list
2021-07-20 14:58:11 +02:00
Sean 06a34a8f03 Scrollable sorted jitsi user list
Sorts and scrolls through the jitsi users
2021-07-20 13:22:15 +02:00
Sean 30bf5bc808
Merge pull request #6173 from tsiegleauq/more-special-diff-characters
Add rdquo und Prime to special diff entities
2021-07-19 16:38:18 +02:00
Sean 73f98ff55e
Merge pull request #6172 from tsiegleauq/zip-export-dot
Fix missing zip extension when filename had a dot
2021-07-19 16:30:29 +02:00
Sean d643028410
Merge pull request #6171 from tsiegleauq/hide-generate-button
Hide pw generate button while editing a user
2021-07-19 16:30:15 +02:00
Sean cbb9bd14d8 Add rdquo und Prime to special diff entities 2021-07-19 16:25:22 +02:00
Sean bf7eba603d Fix missing zip extension when filename had a dot
while exporting mediafiles, the zip extension was missing if the file
name hat a dot
2021-07-19 16:01:00 +02:00
Sean 7022ab8cec Hide pw generate button while editing a user 2021-07-19 15:54:37 +02:00
Sean f86f8ec9b4
Merge pull request #6166 from FinnStutzenstein/serverRequirements
Clean up server requirements
2021-07-16 16:10:30 +02:00
Sean 5bb9553cd3
Merge pull request #6161 from gsiv/dev/pg_isready
Avoid triggering errors with pg_isready
2021-07-16 12:37:23 +02:00
Sean d4df7ebaed
Merge pull request #6165 from tsiegleauq/update-dockerfiles-for-node16
Update dockerfiles for node 16 and a12
2021-07-16 11:54:05 +02:00
Finn Stutzenstein b656d354cd
Clean up server requirements 2021-07-16 11:52:37 +02:00
Sean 98e4f05b90 Update dockerfiles for node 16 and a12
adjust the productive dockerfiles to work with angular12 and use node16
2021-07-16 11:21:29 +02:00
Gernot Schulz 301c9bd35a Avoid triggering errors with pg_isready
pg_isready was not connecting to the configured database or as the
configured user.  While that did not cause problems here, it did trigger
error messages on the database side.
2021-07-15 15:27:49 +02:00
Gernot Schulz 7dc35dce40
Merge pull request #6157 from gsiv/dev/db-table-config
Make database table configurable through .env
2021-07-15 10:38:26 +02:00
Gernot Schulz 1d8856b501
Merge pull request #6158 from gsiv/dev/media-service-db-config
Add missing mediafile service DB config parameters
2021-07-15 10:37:16 +02:00
Gernot Schulz 157293530c
Merge pull request #6156 from gsiv/dev/swarm-ip
Docker: Bind to 0.0.0.0 for Docker Swarm
2021-07-15 10:22:20 +02:00
Gernot Schulz ed64e7bd13 Add missing mediafile service DB config parameters 2021-07-14 15:03:22 +02:00
Gernot Schulz f00c4391a2 Make database table configurable through .env 2021-07-14 14:41:38 +02:00
Sean 18f2e3326d
Merge pull request #6146 from tsiegleauq/angular12
Update to Angular12
2021-07-13 14:36:38 +02:00
Gernot Schulz 5b28763bcc Docker: Bind to 0.0.0.0 for Docker Swarm
Swarm uses a cluster-wide ingress network and does not permit binding
ports to localhost.  It simply ignores such a binding and prints
a warning instead.

This patch fixes this recent regression to avoid the warning.
2021-07-12 11:38:59 +02:00
Emanuel Schütze 52f35c856d
Merge pull request #6150 from FinnStutzenstein/fixExporter
Fix exporter
2021-07-09 08:34:53 +02:00
Finn Stutzenstein 1c857fb08c
Fix exporter
poll ids were used for options
2021-07-09 08:18:31 +02:00
Sean 0a3ea54a45 Update to Angular12
Updates the client to auglar12
2021-07-08 18:14:09 +02:00
Emanuel Schütze c593599e10
Merge pull request #6148 from FinnStutzenstein/fixExporter
Fix OS4 exporter
2021-07-08 14:13:22 +02:00
Finn Stutzenstein d17a050d8b
Fix OS4 exporter 2021-07-08 11:34:18 +02:00
Finn Stutzenstein 19a9eedf17
Merge pull request #6026 from FinnStutzenstein/variableMediafileTablename
Setting for the mediafile database tablename
2021-07-08 11:10:40 +02:00
Finn Stutzenstein 27831154fa
Setting for the mediafile database tablename 2021-07-08 10:48:51 +02:00
jsangmeister b4b0a958d5
Merge pull request #6134 from jsangmeister/fix-projected-analog-motion-poll
Fix projection of analog polls & prevent percent base 'entitled' for analog polls
2021-07-05 09:13:34 +02:00
Joshua Sangmeister 5d13f94e40 Fix projection of analog polls & prevent percent base 'entitled' for analog polls 2021-07-01 09:38:00 +02:00
Emanuel Schütze 0322436cf5
Merge pull request #6120 from FinnStutzenstein/os4export
OS4 export
2021-06-24 21:40:28 +02:00
Finn Stutzenstein 272c3de9fc OS4 export 2021-06-24 21:08:24 +02:00
Emanuel Schütze 416b2cc26f
Merge pull request #6130 from jsangmeister/fix-analog-poll-diagramm
Remove chart for analog polls with a majority & fix random TypeError
2021-06-24 21:02:38 +02:00
Joshua Sangmeister 3532c55924 Remove chart for analog polls with a majority & fix random TypeError 2021-06-24 16:32:22 +02:00
Emanuel Schütze f1e2996c6e
Merge pull request #6121 from tsiegleauq/applause-timeout-to-service
Move applause timeout to service
2021-06-24 16:20:23 +02:00
Emanuel Schütze c0582e4b1c
Merge pull request #6129 from tsiegleauq/firefox-stream-no-app-stable
Fix firefox endless spinner in stream
2021-06-24 16:09:33 +02:00
Sean eed3bca25b Fix firefox endless spinner in stream
fix a firefox bug where the spinner would not disappear, apparently when
the user would see a stream.
The reason seems to be ngparticles in combination with firefox, where
firefox would be stuck in never-stable when ngparticles was loaded
before the browser was ready
2021-06-24 15:50:15 +02:00
Sean 57755ebf4b Move applause timeout to service
Fixes a bug where the applaus timeout would require reload to work
Fixes a but where the "Show applause amount" config was ignored

Moves the applause timeout logic to service
comonents can now lazily listen to events from sendsApplauseObservable
to know if their applause is in progress

Show applause level depending on config
2021-06-24 13:20:31 +02:00
Emanuel Schütze c286e0ff76
Merge pull request #6123 from FinnStutzenstein/fixDeletionOfMediafiles
Fix updating logo and font configs when deleting a mediafile
2021-06-23 16:29:45 +02:00
Emanuel Schütze a14ab8c5e2
Merge pull request #6127 from tsiegleauq/stop-vote-show-please-wait
Use vote pending state as subject
2021-06-23 16:18:38 +02:00
Sean 235bbf6c0d Use vote pending state as subject
Fixes an issue where the vote pending state was not updating correctly
when using state changes over the choice service
2021-06-23 13:58:21 +02:00
Finn Stutzenstein 8423433f66
Fix updating logo and font configs when deleting a mediafile 2021-06-21 07:46:13 +02:00
Emanuel Schütze 382fcf4a67
Merge pull request #6056 from ostcar/performance_assignment_poll
Performance assignment poll
2021-06-17 13:11:12 +02:00
Oskar Hahn 9a9ef8e039 performance test for assinment polls 2021-06-17 11:57:06 +02:00
Emanuel Schütze eeb0e54985
Merge pull request #6118 from FinnStutzenstein/fixFontsAndLogos
Automatically write changes to logo and font definitions to configs
2021-06-17 11:51:44 +02:00
Finn Stutzenstein 5d434484b5
Automatically write changes to logo and font definitions to configs 2021-06-17 11:29:54 +02:00
Emanuel Schütze 8d73f08072
Merge pull request #6114 from emanuelschuetze/video-player-height
Use max-height for video js player
2021-06-10 14:18:38 +02:00
Emanuel Schütze d8713dad11 Use max-height for video js player 2021-06-10 13:58:58 +02:00
Emanuel Schütze bf22e1b6e1
Merge pull request #6112 from tsiegleauq/remove-cd-from-ap-completely
Remove CD from Cinema completely
2021-06-10 11:59:25 +02:00
Sean 83949ad402 Remove CD from Cinema completely
removes all manuall CD related code from autopilot
2021-06-10 11:04:55 +02:00
Emanuel Schütze 5a8a87070a
Merge pull request #6113 from FinnStutzenstein/clearEntitledVotesAfterReset
Clear entitled votes after reset
2021-06-10 11:01:38 +02:00
Finn Stutzenstein bd3c8e09d8
Clear entitled votes after reset 2021-06-10 09:14:30 +02:00
Emanuel Schütze d9d07c3c9b
Merge pull request #6110 from tsiegleauq/revert-ap-onpush-cd
Set change detection in cinema to default
2021-06-08 12:14:05 +02:00
Sean 99acdab35f Set change detection in cinema to default 2021-06-08 11:49:08 +02:00
Emanuel Schütze 1daee9c6d6
Merge pull request #6105 from tsiegleauq/limit-filter-update-on-autoupdate
Limit pushing of filter updates in filter service
2021-06-07 15:21:03 +02:00
Emanuel Schütze a8611904cc
Merge pull request #6106 from tsiegleauq/weird-icons-in-contra-speech
Fix some icon error in contra speech
2021-06-07 09:10:17 +02:00
Sean 6d63c90649 Fix some icon error in contra speech
Contra speech hat some undesired icon config
2021-06-04 16:20:23 +02:00
Sean 15fb19ad2f Limit pushing of filter updates in filter service
Limits the pushing updateFilteredData in the baseFilterList service
to only listen for actual changes of the list input data
This should decrease client stress on autoupdates
2021-06-04 14:26:18 +02:00
Emanuel Schütze 136e0a0569
Merge pull request #6103 from tsiegleauq/jitsi-api-update
Update jitsi iFrame and API
2021-06-03 22:30:51 +02:00
Sean 1ed1896653 Update jitsi iFrame and API
Adjst some callbacks and configs to be compatible with the newest jitsi
release. This is compatible with both our current jitsi server as
well as the newest jitsi releases
2021-06-03 22:21:34 +02:00
Emanuel Schütze 7a076b1d2d
Merge pull request #6100 from tsiegleauq/pending-chat
Add pending state for chat message
2021-06-03 20:53:49 +02:00
Emanuel Schütze 4938c34d50
Merge pull request #6102 from tsiegleauq/hide-conf-bar-sometimes
Hide conference bar without interaction
2021-06-03 20:50:24 +02:00
Sean 8b22f5ff0e Hide conference bar without interaction
Hide the conference bar if there is no stream and no entering
permission.

Hides the "see stream" button if use user has no permission to see the
stream (call list window)

Use rxjs combineLatest for easier "dead state" detection with less
change pushing
2021-06-03 15:12:49 +02:00
Sean 6b8ccb8c33 Add pending state for chat message
Waits untill the server answers something before enabling chatting again
shows some spinner to indicate pending chat requests
2021-06-03 11:12:56 +02:00
Emanuel Schütze 7dcdbb4ee1
Merge pull request #6099 from emanuelschuetze/translation-20210602
Updated translations
2021-06-02 17:15:29 +02:00
Emanuel Schütze 51568b652e Updated translations 2021-06-02 16:59:34 +02:00
Emanuel Schütze 8c0aba83bc
Merge pull request #5961 from tsiegleauq/chat-and-rtc-modules
Restructure communication components
2021-06-02 15:29:54 +02:00
Emanuel Schütze cccfec9154
Merge pull request #6098 from emanuelschuetze/link
Fixed faq link
2021-06-02 15:28:42 +02:00
Sean 1504e33607 Restructure communication components
separates the "Jitsi component" into an own module, several services and components.
2021-06-02 15:09:26 +02:00
Emanuel Schütze d570ed2b72 Fixed faq link 2021-06-02 13:27:00 +02:00
Emanuel Schütze 5f8bb17cac
Merge pull request #6097 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-06-01 16:27:47 +02:00
Emanuel Schütze 654162dbce Updated autoupdate service 2021-06-01 14:45:33 +02:00
Emanuel Schütze e0da18a0e6
Merge pull request #6087 from FinnStutzenstein/multiselectListOfSpeakersClosed
Multiselect open/close LOS in agenda
2021-06-01 14:43:35 +02:00
Finn Stutzenstein 946f07f34a Multiselect open/close LOS in agenda 2021-06-01 11:05:25 +02:00
Emanuel Schütze 3a2773aa5d
Merge pull request #6086 from tsiegleauq/motion-nop-nav-regress
Fix non existing top nav for motions
2021-06-01 10:58:27 +02:00
Sean e7448aa378
Merge pull request #6088 from OpenSlides/dependabot/npm_and_yarn/client/tinymce-5.7.1
Bump tinymce from 5.6.0 to 5.7.1 in /client
2021-05-31 11:51:13 +02:00
dependabot[bot] 75ed60168e
Bump tinymce from 5.6.0 to 5.7.1 in /client
Bumps [tinymce](https://github.com/tinymce/tinymce-dist) from 5.6.0 to 5.7.1.
- [Release notes](https://github.com/tinymce/tinymce-dist/releases)
- [Changelog](https://github.com/tinymce/tinymce-dist/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tinymce/tinymce-dist/compare/5.6.0...5.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-28 19:24:33 +00:00
Sean be36a8a40f Fix non existing top nav for motions
fixes a regression where motions had no top-navigation anymore
2021-05-28 14:10:54 +02:00
Emanuel Schütze 37782fcae8
Merge pull request #6083 from FinnStutzenstein/fixCaddyEntrypointForRestarts
Prevent wrong config files for caddy on container restarts (closes #6071)
2021-05-27 21:13:07 +02:00
Emanuel Schütze 5d57301fb0
Merge pull request #6084 from tsiegleauq/cinema-interaction-enhanced
Refine AP Interaction
2021-05-27 21:10:29 +02:00
Emanuel Schütze bf209d023c
Merge pull request #6082 from emanuelschuetze/translations-20210527
Updated translations and autoupdate serivce
2021-05-27 16:17:16 +02:00
Emanuel Schütze f3b6ceb9af Updated translations and autoupdate serivce 2021-05-27 16:07:17 +02:00
Sean e7dd5d87a2 Refine AP Interaction
In auto pilot view:
klicking the projector opens the content object (rather than the
projector detail view)
clicking AP title now opens the content objects as normal link, rather
than having an "open external" icon
clicking the projector name opens the projector detail view
add "readd last speaker" in AP

Some CD Enhancements for AP Projector
2021-05-27 11:57:15 +02:00
Finn Stutzenstein 899257791d
Prevent wrong config files for caddy on container restarts 2021-05-27 10:21:53 +02:00
Emanuel Schütze 3eb7386a58
Merge pull request #6081 from tsiegleauq/enum-assignment-candidates-again
Respect candidate enumeration per assignment
2021-05-26 18:35:00 +02:00
Emanuel Schütze c60553e376
Merge pull request #6070 from tsiegleauq/stop-voting-publish-prompt
stop-voting shows prompt
2021-05-26 18:13:00 +02:00
Sean 8734e48aef Respect candidate enumeration per assignment
Uses candidate enum per assignment as given in the form.
Changes enumeration in drag-list and poll-meta-info
2021-05-26 18:12:41 +02:00
Emanuel Schütze 79e5b8e337
Merge pull request #6078 from tsiegleauq/count-poos-in-statistics
Show point-of-order amount in speaker statistics
2021-05-26 17:56:09 +02:00
Sean 6dc5c3bfa9 stop-voting shows prompt
Stop voting shows options to either simply stop, publish directly or
abort. Was done using choice service.
Alter vote repo to simply choose with voting state to adress rather than
calculate the next state

Add server-side option to publish a poll in the started state
2021-05-26 17:53:46 +02:00
Sean d4025296fe Show point-of-order amount in speaker statistics
Shows the amount of point of orders in speaker statistics
2021-05-26 17:38:26 +02:00
Emanuel Schütze a7f392b997
Merge pull request #6074 from tsiegleauq/show-unpublish-ap
Show "unpublished" for finished polls in AP
2021-05-26 17:35:42 +02:00
Sean 6451cdf590 Show "unpublished" for finished polls in AP
Also: Change APs change detection to onPush.
This is the last possible option to enhance AP performance
2021-05-26 17:07:40 +02:00
Emanuel Schütze 2eda8fea22
Merge pull request #6063 from tsiegleauq/cryon-font
Add own font for chyron
2021-05-26 16:59:03 +02:00
Sean 74b32af293 Add own font for chyron
Alters Current Speakery Chyron, optionally shows the structure level in
a new line (slightly smaler, faint)
Font for user name in chyron can be configured
Support way more font mime types
Adds an own font for chyron (server, client)
Extends loads-font service
Cleanup countdown-time component from font loading
2021-05-26 16:41:27 +02:00
Emanuel Schütze 43d73a87f1
Merge pull request #6076 from tsiegleauq/more-lenient-word-breaking
Add some hyphenation
2021-05-25 21:49:16 +02:00
Emanuel Schütze 66945231f4
Merge pull request #6075 from tsiegleauq/poo-dialog-cannot-enter
Enhance point-of-order dialog
2021-05-25 21:40:50 +02:00
Emanuel Schütze 5a9767004d
Merge pull request #6073 from tsiegleauq/keep-poo-infos
Keep point-of-order infos
2021-05-25 21:37:15 +02:00
Emanuel Schütze a0c9f3b6da
Merge pull request #6066 from tsiegleauq/fullscreen-projector-cursor
Hide cursor in full screen projector
2021-05-25 21:37:01 +02:00
Sean f05dd8c448 Keep point-of-order infos
Keeps pro, contra, poo infos in active speaker and finished speakers.
Cleans up a lot of template related code
2021-05-25 20:59:18 +02:00
Emanuel Schütze 14fe614c4d
Merge pull request #6072 from tsiegleauq/client-chat-enter-limit
Restrict Chat message length in client
2021-05-25 20:47:39 +02:00
Sean 7a6b31d8f8 Hide cursor in full screen projector
Hides the cursor when hovering over the full screen projectors
containers
2021-05-25 20:41:15 +02:00
Sean f707615875 Add some hyphenation
Use hyphenation for motion details poll display.
More lenient display of lpng poll names using hyphenation
2021-05-25 15:56:12 +02:00
Sean fbb60cb0b6 Enhance point-of-order dialog
Escape and enter do what they should
2021-05-25 15:15:08 +02:00
Sean 861726fb9c Restrict Chat message length in client
Restricts Chat Messages in client to enforce a maximum length of 512
characters
enhance chat form validation
show chat message length and characters left if close to the limit of
512
2021-05-21 13:14:03 +02:00
Sean 4d4a3bb0db
Merge pull request #6067 from FinnStutzenstein/httpsDevSetup
Reenable https in dev mode
2021-05-20 13:41:59 +02:00
Finn Stutzenstein 9a7c9c19a0
Reenable https in dev mode 2021-05-20 12:51:10 +02:00
Finn Stutzenstein f4c237a18e
Merge pull request #5998 from FinnStutzenstein/421
Add ALLOWED_HOSTS
2021-05-17 07:55:23 +02:00
Emanuel Schütze 710e825961
Merge pull request #6060 from emanuelschuetze/los-issues
Fixed minor list of speakers issues
2021-05-16 20:23:48 +02:00
Emanuel Schütze cb13c8cd47 Always allow speakers to remove from list of speakers (button always enabled) 2021-05-10 21:40:38 +02:00
Emanuel Schütze 83efb19562
Merge pull request #6053 from tsiegleauq/motion-poll-has-general-x
remove Motion polls show global values
2021-05-06 17:53:49 +02:00
Emanuel Schütze 964a41386d
Merge pull request #6054 from FinnStutzenstein/speedupPollStop
Speed up stopping a poll
2021-05-06 17:49:42 +02:00
Finn Stutzenstein 1e78f2a534 Speed up stopping a poll
Reduced the amount of queries in BasePoll.stop from 4+<amount entitled
users> to 3.
2021-05-06 16:49:07 +02:00
Sean 3402928935 remove Motion polls show global values
Motion polls were displaying global abstain, etc
2021-05-06 14:21:04 +02:00
Emanuel Schütze 2a7b55f11e
Merge pull request #6051 from tsiegleauq/enumerate-all-assignments
Enumber Voting results
2021-05-05 14:57:23 +02:00
Sean 18c75a6d12 Enumber Voting results
Enumber the rank of voting results in PDF, Projector and Detail View
2021-05-05 14:49:42 +02:00
Emanuel Schütze 7cf22b86ab
Merge pull request #6050 from tsiegleauq/assignment-analog-general-selection
Add General x to analog polls
2021-05-05 14:08:01 +02:00
Sean 0011d63a40 Add General x to analog polls
Adds general approval/rejection/abstain to analog polls
Fix a bug where the 100% base "Entitled" would render analog polls unusable
enumerate poll candidates
2021-05-05 12:03:41 +02:00
Sean 08fa38a89c
Merge pull request #6049 from tsiegleauq/users-cannot-see-candidate-names
Fix user cannot see candidate names
2021-05-04 16:23:39 +02:00
Emanuel Schütze 5cee662058
Merge pull request #5915 from gsiv/dev/prom
Docker: Improve Prometheus integration
2021-05-04 16:08:04 +02:00
Sean 0b23806db6 Fix user cannot see candidate names
Assignment detail view sort list "getTitle" was hidden behind
"assignment_can_manage", thus users could not see the names of candidates
2021-05-04 15:47:15 +02:00
Emanuel Schütze acf416b024
Merge pull request #6048 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-05-03 13:56:30 +02:00
Emanuel Schütze ec2c905f7d Updated autoupdate 2021-05-03 13:13:49 +02:00
Emanuel Schütze 74981e26c0
Merge pull request #6037 from tsiegleauq/poll-progress-speaker-manage
Allow LOS-Manager to see poll progress
2021-05-03 13:11:30 +02:00
Emanuel Schütze 261c69387f
Merge pull request #6047 from CatoTH/bugfix-6030-amending-list-items
Fixes #6030 - amending a list item does not show the change inline in…
2021-05-03 13:01:49 +02:00
Tobias Hößl 705c42bd11
Fixes #6030 - amending a list item does not show the change inline in diff box 2021-05-02 20:10:19 +02:00
Emanuel Schütze d86fcd80b7
Merge pull request #6031 from jsangmeister/fix-entitled-users
Fix entitled user calculation and display of voting banner in case of vote delegations
2021-04-29 15:38:49 +02:00
Emanuel Schütze 88e870c9df
Merge pull request #6040 from tsiegleauq/search-cannot-find-uml
Find umlauts using search
2021-04-29 15:38:29 +02:00
Emanuel Schütze 325469bc82
Merge pull request #6038 from FinnStutzenstein/fix-los
Fix LOS (closes #6035)
2021-04-29 15:03:54 +02:00
Emanuel Schütze 14687bba0e
Merge pull request #6042 from emanuelschuetze/new-languages
Added new translations (it, es).
2021-04-29 14:35:36 +02:00
Emanuel Schütze db4c593adf Added new translations (it, es). 2021-04-29 14:12:52 +02:00
Finn Stutzenstein 75bd3c50e5
Fix LOS (closes #6035) 2021-04-29 13:46:36 +02:00
Sean d08752db21 Find umlauts using search
TinyMCE currently escapes all special chatacters pretty unconviniently.
We now try to parse HTML using DOMParser and extract the text content so
we can actually search for it
2021-04-29 11:09:53 +02:00
Sean 85bb9f751d Allow LOS-Manager to see poll progress
Adjust poll progress bar to be visible for LOS-Manager.
Cleans up redundant permission asking
Adds push CD to progress bar to react better on permission changs
2021-04-28 13:10:29 +02:00
Emanuel Schütze d030925e14
Merge pull request #6036 from emanuelschuetze/translation-20210427
Updated translations
2021-04-27 23:53:20 +02:00
Emanuel Schütze 22df847c78 Updated translations 2021-04-27 23:05:23 +02:00
Emanuel Schütze 672e5ca544
Merge pull request #6017 from FinnStutzenstein/samlGroups
Adding attribute matchers for group assignments to SAML
2021-04-27 21:30:38 +02:00
Emanuel Schütze 9f543697ad
Merge pull request #6023 from FinnStutzenstein/proContraNoteMarkSpeakers
pro/contra speakers and notes for point of order speakers
2021-04-27 20:45:02 +02:00
Finn Stutzenstein c9c90cd4a3 pro/contra speakers and notes for point of order speakers
Enhance Pro Contra UI/UX by Sean
2021-04-27 19:53:17 +02:00
Finn Stutzenstein 91a15d24a8
Add ALLOWED_HOSTS
the proxy responds with a 421, if a host header with an invalid host
name is encountered. If nothing is provided (see default .env) all hosts
are allowed. Examples:

ALLOWED_HOSTS="localhost:8000 127.0.0.1:8000"

ALLOWED_HOSTS="some.domain.example.com"

Add EXTERNAL_HTTPS_PORT. See .env for the configuration.
2021-04-26 16:01:35 +02:00
Joshua Sangmeister 8ad008d9de Fix entitled user calculation and display of voting banner in case of vote delegations 2021-04-26 15:44:42 +02:00
Finn Stutzenstein ee8702aff1
Merge pull request #5921 from gsiv/dev/yml-image-override
Docker: Allow overriding image names from .env
2021-04-26 10:16:02 +02:00
Finn Stutzenstein 0d4673d182
Merge pull request #6028 from FinnStutzenstein/updateBlack
Update black
2021-04-26 09:30:07 +02:00
Finn Stutzenstein f9d19db9e2
Update black 2021-04-26 09:00:04 +02:00
Emanuel Schütze 7315626e18
Merge pull request #6024 from jsangmeister/vote-delegaton-error
Fix vote delegation update error
2021-04-22 21:10:30 +02:00
Joshua Sangmeister e2d4fafe6d Fix vote delegation update error 2021-04-22 20:51:44 +02:00
Emanuel Schütze fafcf5d583
Merge pull request #6025 from FinnStutzenstein/fromEmailValidation
Validate the from email for invalid characters
2021-04-22 15:34:15 +02:00
Finn Stutzenstein 0a2483a94b
Adding attribute matchers for group assignments to SAML 2021-04-22 14:53:26 +02:00
Finn Stutzenstein a8e329253c
Validate the from email for invalid characters
This might not be sufficient for all cases. If some other strange
IndexErrors appear, more validation has to be done. For now, it catches
all observed cases.
2021-04-22 12:33:33 +02:00
Emanuel Schütze 4f35770769
Merge pull request #6009 from tsiegleauq/some-vscroll-for-motion
Some enhancements for motion detail
2021-04-15 21:21:11 +02:00
Sean 697177640b Some enhancements for motion detail
Vscroll for the list of changes
List of changes can collapse
direct link to an amendment over the list of changes
Vscroll for the amendment create wizzard
Line numbers in the amendment create wizzard
Some css cleanup
2021-04-15 20:58:08 +02:00
Emanuel Schütze 196e39ad15
Merge pull request #6006 from jsangmeister/fix-voting-race-condition
Lock poll to prevent race conditions
2021-04-15 20:46:43 +02:00
Joshua Sangmeister ee31c1e633 Lock poll to prevent race conditions
Add migrations
2021-04-15 15:19:30 +02:00
Emanuel Schütze bdbb5839cc
Merge pull request #6007 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-04-13 08:46:43 +02:00
Emanuel Schütze dff5ae4a89 Updated autoupdate service 2021-04-12 21:13:52 +02:00
Finn Stutzenstein 79d9781a1b
Merge pull request #6005 from FinnStutzenstein/updateDeps
Update dependencies
2021-04-12 14:04:05 +02:00
Finn Stutzenstein e3c627b504
Update dependencies
Update DRF to resolve https://github.com/advisories/GHSA-fx83-3ph3-9j2q

-> https://www.django-rest-framework.org/community/3.9-announcement/
replaces `list_route` and `detail_route`

Update autoupdate submodule
2021-04-12 13:36:46 +02:00
Emanuel Schütze 963986b91d
Merge pull request #6004 from FinnStutzenstein/smallFixes
Small fixes
2021-04-12 12:14:17 +02:00
Finn Stutzenstein 2b3d1db3bf
Merge pull request #5952 from Piratenpartei/server_setup_env
Add ENV for server-setup host and port
2021-04-12 08:04:58 +02:00
Finn Stutzenstein a1e7920b34
Small fixes 2021-04-12 07:52:47 +02:00
Emanuel Schütze feb54c52a3
Merge pull request #6002 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-04-08 21:18:04 +02:00
Emanuel Schütze bb651b67eb Updated autoupdate service 2021-04-08 19:05:04 +02:00
Emanuel Schütze 5b58730cca
Merge pull request #5995 from ostcar/performance_create_motions
Create amendments
2021-04-08 18:57:53 +02:00
Oskar Hahn 23fcc3a7d0 Create dummy amendments with performance test script. 2021-04-08 18:38:25 +02:00
Emanuel Schütze d80919f0e7
Merge pull request #6001 from jsangmeister/fix-recommendation-extension-bug
Recommendation extension can be set with can_manage_metadata
2021-04-08 18:30:08 +02:00
Joshua Sangmeister 8891a52bdc State and recommendation extension can be set with can_manage_metadata 2021-04-08 17:47:11 +02:00
Emanuel Schütze 26d5d81b6f
Merge pull request #5997 from jsangmeister/remove-duplicates-from-entitled-users
Prevent multiple entries in entitled_users_at_stop
2021-04-08 15:39:14 +02:00
Joshua Sangmeister 1e6b042d71 Add migrations to remove duplicates from existing polls 2021-04-08 11:33:26 +02:00
Joshua Sangmeister f54050a83c Prevent multiple entries in entitled_users_at_stop 2021-04-08 11:12:13 +02:00
Finn Stutzenstein a94f00672b
Merge pull request #5996 from FinnStutzenstein/fixDeps
Locked mypy, added new OS4 files to gitignore
2021-04-08 10:51:05 +02:00
Finn Stutzenstein 7ca761bdb0
Locked mypy, added new OS4 files to gitignore 2021-04-08 09:01:02 +02:00
Emanuel Schütze 1edf4437a0
Merge pull request #5992 from CatoTH/bugfix/diff-only-formatting-changes
Allow formatting-only-changes without breaking the inline diff
2021-04-06 22:35:07 +02:00
Tobias Hößl ba177a89d4
Allow formatting-only-changes without breaking the inline diff 2021-04-05 11:58:09 +02:00
Emanuel Schütze d059afac5a
Merge pull request #5989 from emanuelschuetze/translations-20210401
Updated translations
2021-04-01 18:02:10 +02:00
Emanuel Schütze 045648eddb Updated translations 2021-04-01 17:45:29 +02:00
jsangmeister 787390c899
Merge pull request #5978 from jsangmeister/voting-changes
Implement voting changes
2021-04-01 16:12:31 +02:00
Joshua Sangmeister 4b13ff681e user_token, single votes table, entitled_users server changes
server changes finished, tests, cleanup

Add entitled user table

Fix formatting

Finish entitled users table & implement new percent base

Fix typing

Fixed remarks & errors

Fix new precent base representation

Update autoupdate service

Remove unneeded prettier entry

Remove unneeded css
2021-04-01 16:02:47 +02:00
Adrian Nöthlich 6430727590
Use ENV for redis in db-setup and fix defaults (#5951)
* Use ENV for redis in db-setup and fix defaults

* Add default value for `DATABASE_HOST`
* Use ENV for `wait-for-it` redis and redis-slave

Signed-off-by: Adrian Nöthlich <git@promasu.tech>

* Match default value for DATABASE_HOST
2021-04-01 13:10:19 +02:00
Emanuel Schütze 83549ce02b
Merge pull request #5916 from ostcar/performance
Performance
2021-04-01 10:02:26 +02:00
Oskar Hahn dca6143041 Add performance tool 2021-04-01 09:19:21 +02:00
Emanuel Schütze 2d4419530e
Merge pull request #5987 from CatoTH/bugfix/escape-special-characters
Bugfix: change detection for additional special characters
2021-04-01 09:08:44 +02:00
Finn Stutzenstein 28980afbd5
Merge pull request #5981 from FinnStutzenstein/spinnerErrors
Do not show old errors on the spinner
2021-04-01 09:02:57 +02:00
Tobias Hößl 7275aa69af
Bugfix: change detection for additional special characters 2021-03-31 21:44:53 +02:00
Gernot Schulz 1ad0a61524 Docker: Simplify image name/registry handling
For a subset of the images required by a Compose or Swarm Setup,
non-default names can be configured in .env.  Originally, the names were
treated as the images' complete names, i.e., including an optional
registry domain.  Using this setup, it was possible to pull the
irregularly updated auxiliary images from a default registry while, at
the same time, obtaining certain images from different registries.

Commit e225a57f97 changed this behavior.  Since then, the names in .env
can only be used to change part of the image name, excluding the
registry.  If a default registry is configured it is always prepended to
the given image name, breaking the original use case.

This patch removes the ability to override image names in .env.
Instead, the registry of each image can be customized.

The reasoning here is that the only common reason to change an image
name is to change its Docker registry.  For example, while the default
registry may be set to default.example.com, it may be necessary to
obtain the backend image private.example.com/openslides-server.  With
this patch, that would be achieved by the following configuration in
.env:

    DOCKER_OPENSLIDES_BACKEND_REGISTRY="private.example.com"

For special cases, for which the images' basename must indeed be changed
as well, the template would need to be customized.

The templates are not backwards-compatible.
2021-03-31 15:08:32 +02:00
Finn Stutzenstein ca298960ae
Do not show old errors on the spinner 2021-03-25 15:23:06 +01:00
Emanuel Schütze 2f9b6aba95
Merge pull request #5979 from tsiegleauq/poll-method-makes-sense
Disable general no/yes depending on poll method
2021-03-25 10:06:58 +01:00
Sean 49dba31d56 Disable general no/yes depending on poll method
During the creation of an assignment poll:
Disable and unset the general yes control if the poll method is "yes"
Disables and unset the general no control if the poll method if "no"
2021-03-25 09:55:13 +01:00
Emanuel Schütze f68fca8c83
Merge pull request #5980 from emanuelschuetze/translations-20210322
Updated translations
2021-03-22 21:39:29 +01:00
Emanuel Schütze 2e43a17987 Updated translations 2021-03-22 21:20:15 +01:00
Emanuel Schütze 2e5cea512e
Merge pull request #5957 from CatoTH/bugfix/add-warning-when-editing-motion-with-amendments
Add a warning when editing a motion with existing amendments
2021-03-22 21:15:02 +01:00
Tobias Hößl 9c2e49692c Add a warning when editing a motion with existing amendments 2021-03-22 21:00:04 +01:00
Emanuel Schütze c9b924d79a
Merge pull request #5976 from FinnStutzenstein/fixListOfSpeakerInitialClosed
Fix LOS initially closed migration issue
2021-03-22 20:48:47 +01:00
Finn Stutzenstein 644d3b2fee
Merge pull request #5977 from FinnStutzenstein/enablePytestInDocker
Enable pytest in docker
2021-03-22 13:17:30 +01:00
Finn Stutzenstein f897bb01a3
Enable pytest in docker
The DJANGO_SETTINGS_MODULE is set in the develop container, so the
tests.settings from the setup.cfg was ignored. Executing pytest with

    DJANGO_SETTINGS_MODULE=tests.settings pytest

works fine. The line added in the setup.cfg takes over precedence: It
auto-adds the --ds parameter which has a higher precedence than the
environment variable.

Also removed an unnecessary setting.
2021-03-22 13:01:26 +01:00
Finn Stutzenstein 41a3447357
Fix LOS initially closed migration issue 2021-03-22 08:54:16 +01:00
Finn Stutzenstein 7bbd8688a2
Merge pull request #5970 from FinnStutzenstein/updateClientDeps
Client dependencies
2021-03-22 08:52:31 +01:00
Finn Stutzenstein c10a0ad70d
Client dependencies:
- Update ng2-pdf-viewer
- Lock down tsparticles and ng-particles to the version in the
package-lock.json. In fresh installs newer versions do not work
currently
2021-03-22 07:55:37 +01:00
Emanuel Schütze 3595245663
Merge pull request #5972 from emanuelschuetze/translations20210319
Updated translations
2021-03-19 14:39:00 +01:00
Emanuel Schütze bd29777d83 Updated translations 2021-03-19 14:20:15 +01:00
Emanuel Schütze eadb0e2f0e
Merge pull request #5971 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-03-19 10:01:13 +01:00
Emanuel Schütze d1aba2ef94 Updated autoupdate service 2021-03-19 09:46:07 +01:00
Emanuel Schütze 2e1690d2d0
Merge pull request #5967 from FinnStutzenstein/loginErrorNonActive
Add login errors for inactive users
2021-03-19 09:42:44 +01:00
Finn Stutzenstein a48fe86791
Add login errors for inactive users 2021-03-19 07:35:45 +01:00
Finn Stutzenstein 63132fdbc5
Merge pull request #5966 from FinnStutzenstein/smallMediafileFixes
Small mediafile fixes
2021-03-19 07:34:02 +01:00
Finn Stutzenstein e45d83de5a
Small mediafile fixes 2021-03-18 15:21:00 +01:00
Finn Stutzenstein 365d0d55ea
Merge pull request #5937 from FinnStutzenstein/deleteUnusedCode
Delete unused code
2021-03-15 14:52:04 +01:00
Adrian Nöthlich 52108cd0c4
Add ENV for server-setup host and port
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
2021-03-12 01:07:39 +01:00
Finn Stutzenstein 520915c3f5
Merge pull request #5910 from mdickopp/mdickopp/list-of-speakers-inital-state-configurable
Make configurable whether a newly created list of speakers is initial…
2021-03-11 08:56:29 +01:00
Emanuel Schütze b76e75ae96
Merge pull request #5948 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-03-09 21:08:27 +01:00
Emanuel Schütze 1a538e241d Updated autoupdate service 2021-03-09 20:49:52 +01:00
Martin Dickopp a9d223121e Make configurable whether a newly created list of speakers is initially open or closed 2021-03-08 16:28:00 +01:00
Emanuel Schütze 4d706f648f
Merge pull request #5943 from emanuelschuetze/translationDiffService
Add translation service to DiffService.
2021-03-08 13:28:59 +01:00
Emanuel Schütze ba0e9b3bc6 Add translation service to DiffService. 2021-03-08 12:54:22 +01:00
Emanuel Schütze 92afd07b62
Merge pull request #5940 from CatoTH/bugfix/dont-show-diff-view-with-no-crs-on-slides
Don't show diff view on slides if no change recos exist
2021-03-08 11:49:05 +01:00
Finn Stutzenstein 3ba4f99876
Delete unused code
@oscar: Only the user restricter is still present in the code since it is needed for whoami
2021-03-08 08:57:21 +01:00
Tobias Hößl bef322d0a4
Don't show diff view on slides if no change recos exist 2021-03-06 19:16:22 +01:00
Emanuel Schütze a11682a708
Merge pull request #5939 from emanuelschuetze/translation-20210304
Updated translations
2021-03-05 08:33:10 +01:00
Emanuel Schütze bc9b028624 Updated translations 2021-03-05 07:44:49 +01:00
Emanuel Schütze 291402e159
Merge pull request #5920 from CatoTH/bugfix/inconsistency-amendment-paragraphs
Bugfix: better handling of inconsistent states in amendments if the b…
2021-03-04 21:26:12 +01:00
Emanuel Schütze bd7fa9b3db
Merge pull request #5935 from FinnStutzenstein/userAutoupdateOnPermissionChange
Update users on can_see_extra_data permission change
2021-03-04 21:23:04 +01:00
Tobias Hößl ac50d6f8dc Bugfix: better handling of inconsistent states in amendments if the base motion has shrunk 2021-03-04 21:17:14 +01:00
Finn Stutzenstein 265145f001
Merge pull request #5936 from FinnStutzenstein/redisTimeoutErrors
Attempt on handling timeout errors
2021-03-04 09:09:38 +01:00
Finn Stutzenstein 39fb2fadec
Attempt on handling timeout errors
This code retries to load sessions three times. If not an error will be
thrown. There are other solutions (Like not throwing the error), but
I would like to see errors in production usage to see, if this helps or
not.
2021-03-04 08:45:45 +01:00
Finn Stutzenstein d62d1a687b
Merge pull request #5918 from FinnStutzenstein/removeVotedIds
Remove voted_ids
2021-03-04 08:20:19 +01:00
Finn Stutzenstein d0c1879521
Update users on can_see_extra_data permission change 2021-03-04 08:20:05 +01:00
Finn Stutzenstein 93da435e7c
Remove voted_id for ongoing polls 2021-03-04 07:56:11 +01:00
Emanuel Schütze 45948c47fb
Merge pull request #5881 from FinnStutzenstein/updateDeps
Update Dependencies
2021-03-02 23:15:53 +01:00
Finn Stutzenstein 3504a87295 Update Dependencies 2021-03-02 22:53:48 +01:00
Emanuel Schütze d83b7c0ea9
Merge pull request #5933 from emanuelschuetze/translations-20210302
Updated translations
2021-03-02 22:48:41 +01:00
Emanuel Schütze 155ade1a8c Updated translations 2021-03-02 22:27:45 +01:00
Emanuel Schütze f80ac1d9c5
Merge pull request #5932 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-03-01 20:45:56 +01:00
Emanuel Schütze 2c7196493d Updated autoupdate service 2021-03-01 20:24:19 +01:00
Emanuel Schütze 46223328f7
Merge pull request #5926 from FinnStutzenstein/quotaexceedederror
Error handling
2021-03-01 17:38:55 +01:00
Finn Stutzenstein 619a698272 Error handling:
- catch QuotaExceededError
- add generic error message to the spinner
2021-03-01 17:10:22 +01:00
GabrielInTheWorld a450a1dff5
Merge pull request #5898 from GabrielInTheWorld/cleanup-fix-spinner
Some cleanup in favor of spinner-fixes
2021-03-01 16:49:02 +01:00
Emanuel Schütze d73b2142b7
Merge pull request #5928 from FinnStutzenstein/orderAssignmentOptions
order assignment options by weight
2021-03-01 16:25:14 +01:00
Emanuel Schütze 05fcf40b51
Merge pull request #5929 from FinnStutzenstein/chatPersistance
Do not clear chat notifications from local storage
2021-03-01 16:19:28 +01:00
Emanuel Schütze 83ff7b938c
Merge pull request #5927 from FinnStutzenstein/pointOfOrderOnlyCanSpeak
Point of order only for agenda.can_be_speaker
2021-03-01 16:12:44 +01:00
GabrielMeyer 7314bf0999 Cleanup spinner-fixes
- Rename: noop-interceptor -> stable-interceptor
- Put logic from stable.service to openslides-status.service
2021-03-01 16:11:08 +01:00
Emanuel Schütze d3530a3657
Merge pull request #5931 from emanuelschuetze/caddy-dev
Disabled caddy debug mode in dev setup.
2021-03-01 15:49:30 +01:00
Emanuel Schütze 3d8f3a69af Disabled caddy debug mode in dev setup. 2021-03-01 15:39:51 +01:00
Emanuel Schütze 7dcc0ad42a
Merge pull request #5924 from emanuelschuetze/agenda-config
Fixed showSubtitle config. Reordered agenda config.
2021-03-01 15:37:17 +01:00
Finn Stutzenstein c35cacebb1
Merge pull request #5930 from FinnStutzenstein/losPermissions
Fix usage of osPerms
2021-03-01 15:37:06 +01:00
Gernot Schulz 614e0f2d5f Docker: Add Prometheus as an optional service 2021-03-01 15:24:06 +01:00
Emanuel Schütze 4e6f0850c4 Fixed showSubtitle config. Reordered agenda config. 2021-03-01 15:21:43 +01:00
Finn Stutzenstein 33fca309c4
Fix usage of osPerms 2021-03-01 15:14:13 +01:00
Finn Stutzenstein b13732f9ec
Do not clear chat notifications from local storage 2021-03-01 15:00:47 +01:00
Finn Stutzenstein 0a8274e6e2
order assignment options by weight 2021-03-01 14:40:06 +01:00
Finn Stutzenstein a9045b6a1c
Point of order only for agenda.can_be_speaker 2021-03-01 14:31:40 +01:00
Emanuel Schütze 2d4ece84a0
Merge pull request #5922 from gsiv/dev/build-proxy-default
Docker: Remove proxy as a default build target
2021-03-01 13:26:36 +01:00
Emanuel Schütze a796b2a8b8
Merge pull request #5923 from gsiv/dev/yml-nocmd
Docker: Remove server command override examples
2021-03-01 13:25:17 +01:00
Gernot Schulz cd98502b1c Docker: Remove server command override examples
The YAML configuration files include comments outlining how to override
the server image's default command.  They are supposed to help with, for
example, replacing gunicorn with daphne.

These comments have diverged from the actual command used in current
images.  Furthermore, at least to my knowledge, the setup has not been
used or tested with daphne in a long time.  For these reasons, this
patch removes the comments without a replacement.

If there still is, in fact, a use case for the instructions, they would
need to be updated and their location should be reconsidered.
2021-03-01 11:06:52 +01:00
Gernot Schulz 8d393ba17f Docker: Remove proxy as a default build target
The proxy image is not going to be subject to regular change and is
instead more similar to services such as the database.  Therefore, it
does not need to be a default build target of build.sh.
2021-03-01 10:48:47 +01:00
Emanuel Schütze e75bdeb0f7
Merge pull request #5913 from FinnStutzenstein/fixPointOfOrderWeighting
Fix point of order weighting
2021-02-23 11:11:51 +01:00
Finn Stutzenstein f8446ee609
Fix point of order weighting 2021-02-22 13:33:36 +01:00
Emanuel Schütze baad950698
Merge pull request #5902 from FinnStutzenstein/ChatAccessGroups
Change chat access groups
2021-02-19 15:18:08 +01:00
Finn Stutzenstein 4929e2b6f6 Change chat access groups
Adjust some client chat feature

- Cleanup some stuff
- Read and write chatting
2021-02-19 15:08:02 +01:00
Emanuel Schütze e72cebca4a
Merge pull request #5909 from emanuelschuetze/autoupdate-20210219
Updated autoupdate service
2021-02-19 13:20:15 +01:00
Emanuel Schütze e11f0f6f25
Merge pull request #5908 from fwolfst/README-IMPROVEMENTS
improve links in README
2021-02-19 13:20:03 +01:00
Emanuel Schütze 9f16bfee21 Updated autoupdate service 2021-02-19 13:01:07 +01:00
Felix Wolfsteller 5152a448be improve links in README 2021-02-19 12:52:17 +01:00
Emanuel Schütze 500b773ee1
Merge pull request #5903 from emanuelschuetze/autoupdate
Updated autoupdate service
2021-02-18 11:52:48 +01:00
Emanuel Schütze a8fcb89f48 Updated autoupdate service 2021-02-18 11:39:20 +01:00
Finn Stutzenstein 085ada3dc4
Merge pull request #5894 from FinnStutzenstein/caddyHttps
add optional https for caddy
2021-02-17 08:56:20 +01:00
Finn Stutzenstein ce3e2588c5
add optional https for caddy 2021-02-17 08:28:47 +01:00
Emanuel Schütze 7e875c45db
Merge pull request #5897 from GabrielInTheWorld/fix-spinner
Fixes an infinite running spinner
2021-02-15 15:35:29 +01:00
GabrielMeyer e74df38a0f Fixes an infinite running spinner
The ApplicationRef propagates never a stable state, when in cinema mode. This is, because in the `cinema.component.ts` asynchronous requests are made, before the app was getting stable.
2021-02-15 15:18:10 +01:00
Emanuel Schütze ef451afae1
Merge pull request #5896 from tsiegleauq/more-jitsi-cd
More change detection in jitsi bar
2021-02-15 14:50:09 +01:00
Sean 4490ee91d0 More change detection in jitsi bar 2021-02-15 14:34:36 +01:00
Emanuel Schütze 3012fabf4f
Merge pull request #5895 from FinnStutzenstein/removeDebugPrints
Remove debug prints
2021-02-15 12:56:23 +01:00
Finn Stutzenstein fe0f8d28f4
Remove debug prints 2021-02-15 11:32:24 +01:00
Emanuel Schütze a3a126f930
Merge pull request #5891 from ostcar/prometheus
Prometheus
2021-02-15 11:07:26 +01:00
Oskar Hahn 69bf46a5ff Prometheus 2021-02-15 10:50:12 +01:00
Finn Stutzenstein 5b91ba4597
Merge pull request #5850 from FinnStutzenstein/ownSessionRedis
Own session redis
2021-02-15 08:14:04 +01:00
Finn Stutzenstein 35e8f84fda
Own session redis
- removed big mode artifacts
- removed django_session_redis
- Enforce newly created settings.py when invalid options are set:
  * OPENSLIDES_USER_DATA_DIR
  * SESSION_ENGINE
- Overwrites the secret key during development to "development"
2021-02-15 07:37:46 +01:00
Finn Stutzenstein 05ec54927b
Merge pull request #5892 from FinnStutzenstein/PdfKeyError
Catch pyPDF2 key error
2021-02-15 07:37:10 +01:00
Finn Stutzenstein e9c2dc90d5
Catch pyPDF2 key error 2021-02-15 07:22:38 +01:00
Emanuel Schütze 7af39a5570
Merge pull request #5888 from tsiegleauq/some-iOS-for-fixes
Fix paragraph based amendments in iOS
2021-02-12 14:58:53 +01:00
Sean eda242e83f Fix paragraph based amnedments in iOS
Fixes an issue on iOS devices regarding click-bindings in structural
loops.
iOS devices did not respond to any touch inputs in the given view.
The same behavious was observed in #5351
This is most a bug in angular or iOS webkit
2021-02-12 13:11:46 +01:00
Emanuel Schütze c1b4d3154d
Merge pull request #5886 from emanuelschuetze/translations-20210211
Updated translations
2021-02-11 21:57:54 +01:00
Emanuel Schütze 1cf2763ed6 Updated translations 2021-02-11 21:33:18 +01:00
Emanuel Schütze c0dad72eb4
Merge pull request #5882 from FinnStutzenstein/fixPointOfOrderSorting
Fix point of order sorting
2021-02-11 21:15:42 +01:00
Emanuel Schütze aac8ec8f2e
Merge pull request #5876 from tsiegleauq/chat
Chat
2021-02-11 20:42:36 +01:00
Sean 69adc1d41c Add Chat UI Components
Add Chat User Interface
Restructure some services
Virtual Scrolling
Manual change detection for message updates
Enhanced Date pipe
Message layout
Tabbed reusable chat window
Deleting messages
Further permission checks
Delete-prompts
Mobile friendly chat usage
automatically scroll to bottom
2021-02-11 17:10:25 +01:00
Finn Stutzenstein b0ccb1ea7e
Fix point of order sorting 2021-02-10 15:58:01 +01:00
Finn Stutzenstein 7fffffb497
Merge pull request #5877 from FinnStutzenstein/fixCaddyDevSetup
fix Caddy dev setup
2021-02-10 07:55:12 +01:00
Finn Stutzenstein f65e8ae819
fix Caddy dev setup 2021-02-10 07:30:36 +01:00
Finn Stutzenstein 8e5b1fa99d Add Chat on Server and client as draft 2021-02-09 16:07:52 +01:00
Emanuel Schütze 8e98966db2
Merge pull request #5875 from gsiv/fix/caddy-builddev
Update Makefiles for Caddy
2021-02-08 18:01:57 +01:00
Gernot Schulz 0ed4e27725 Update Makefiles for Caddy
The reload-haproxy target has simply been removed due to time
constraints.
2021-02-08 17:42:56 +01:00
Emanuel Schütze 5910d2c914
Merge pull request #5874 from emanuelschuetze/translations-20210208
Updated translations
2021-02-08 17:22:17 +01:00
Emanuel Schütze 612bf78871 Updated translations 2021-02-08 17:07:32 +01:00
Emanuel Schütze c569835ce1
Merge pull request #5872 from gsiv/dev/caddy
Docker: Rename proxy-related variables
2021-02-08 16:42:09 +01:00
Gernot Schulz a1e65e8a47 Docker: Rename proxy-related variables
HAProxy was replaced by Caddy, so obviously variables should not longer
carry HAPROXY in their names to avoid confusion.

To hopefully make future changes less likely to break configurations,
we'll keep variable and image names generic (proxy instead of caddy).
2021-02-08 14:53:45 +01:00
Gernot Schulz 67202a4a4b Remove haproxy
Replaced by Caddy
2021-02-08 13:45:36 +01:00
Emanuel Schütze ac0a27276c
Merge pull request #5862 from ostcar/caddy-dev
Use https in dev mode
2021-02-06 14:28:25 +01:00
Oskar Hahn ab2a8ca419 Use https in dev mode 2021-02-06 11:47:38 +01:00
Emanuel Schütze 180de2d3a9
Merge pull request #5860 from ostcar/fix_development
Fix Development
2021-02-05 22:10:34 +01:00
Oskar Hahn d7d8dcb3c9 Fix Development 2021-02-05 19:26:04 +01:00
Emanuel Schütze d05958ca10
Merge pull request #5851 from ostcar/caddy
Use caddy
2021-02-05 18:17:51 +01:00
Gernot Schulz f7d228a600 Docker: Update build scripts for Caddy
For now, keep using HAProxy's name in most places, e.g.,
DOCKER_OPENSLIDES_HAPROXY_NAME.  To avoid confusion, the specific
mentions of HAProxy should be made more generic, e.g.,
DOCKER_OPENSLIDES_PROXY_NAME.
2021-02-05 18:00:04 +01:00
Gernot Schulz 40dc0e08fa Caddy: Add config to image instead of using a volume 2021-02-05 17:59:57 +01:00
Gernot Schulz 470168c58c Caddy: Do not use TLS for autoupdate connection 2021-02-05 17:59:36 +01:00
Emanuel Schütze b08948f3e5
Merge pull request #5857 from normanjaeckel/HistoryReally
Added information to poll start and stop.
2021-02-05 15:37:40 +01:00
Norman Jäckel c3de6dc870 Added information to poll start and stop. 2021-02-05 15:28:37 +01:00
Emanuel Schütze 09bc7f093a
Merge pull request #5770 from tsiegleauq/youtube-urls
Support youtube as livestream URL
2021-02-05 14:29:51 +01:00
Sean 372f1eaa7e Support youtube as livestream URL
Allows to use youtube as as live stream url config,
will load the youtube embedded player in an iframe instead
of video.js
2021-02-05 14:00:52 +01:00
Finn Stutzenstein f57fe05e26
Merge pull request #5853 from normanjaeckel/HistoryInformationChanges
Updated README
2021-02-05 13:47:31 +01:00
Emanuel Schütze 26744fde9f
Merge pull request #5856 from FinnStutzenstein/updateClient
update client
2021-02-05 13:04:07 +01:00
Finn Stutzenstein 1b482871ac
update client 2021-02-05 12:54:09 +01:00
Finn Stutzenstein 8746496d2d
Merge pull request #5852 from emanuelschuetze/removed-setuppy
Removed pip support
2021-02-05 12:03:58 +01:00
Norman Jäckel cc5bcf1a81 Updated README 2021-02-05 12:01:48 +01:00
Norman Jäckel f74cf10ff3
Merge pull request #5854 from FinnStutzenstein/fixDockercomposeDev
Fix docker compose dev
2021-02-05 12:00:43 +01:00
Finn Stutzenstein 9e38ed955f
Fix docker compose dev 2021-02-05 12:00:11 +01:00
Sean 058a7f71ae
Merge pull request #5823 from tsiegleauq/fix-group-import
Fix csv importing users with groups
2021-02-05 10:38:36 +01:00
Oskar Hahn 799dd08e0d client listens 4200 in prod 2021-02-05 09:47:04 +01:00
Emanuel Schütze 3b1b396e9a Removed setup.py and MANIFEST
Reason: pip supported is dropped for next OpenSlides release (3.4)
because the python server cannot run stand-alone anymore. You will cannot
install OpenSlides 3.4 via 'pip install openslides'.
2021-02-04 22:17:46 +01:00
Emanuel Schütze 72b7162eeb
Merge pull request #5842 from FinnStutzenstein/sortPooSpeakers
Order point of order speakers in the request order (closes #5816)
2021-02-04 22:03:11 +01:00
Oskar Hahn dc58752575 Use caddy 2021-02-04 20:54:57 +01:00
Finn Stutzenstein 5b2f8409e4
Merge pull request #5847 from FinnStutzenstein/loadingIndicator
Wait for a stable app (closes #5813)
2021-02-04 13:08:05 +01:00
Finn Stutzenstein a839294add
Wait for a stable app (closes #5813) 2021-02-04 12:33:20 +01:00
Emanuel Schütze e5f0ebd6e5
Merge pull request #5832 from tsiegleauq/jitsi-helpdesk
Add helpdesk icon and feature
2021-02-03 11:42:59 +01:00
Sean bd65b5d41c
Merge pull request #5841 from tsiegleauq/clean-some-applause
Cleanup some applause code
2021-02-03 10:02:39 +01:00
Finn Stutzenstein 94c943cdb5
Order point of order speakers in the request order (closes #5816) 2021-02-03 09:15:28 +01:00
Sean 04eedc7c37 Cleanup some applause code
Cleans some applause code
2021-02-02 15:52:55 +01:00
Finn Stutzenstein a20641fe44
Merge pull request #5828 from FinnStutzenstein/offlineBarReconnect
Fixes offline bar on successful reconnections (closes #5810).
2021-02-02 13:12:09 +01:00
Sean 024b9c74e6 Add helpdesk icon and feature
Adds a "helpdesk" Jitsi room feature.
Can be enabled using the OpenSlides config page

Shows a 'Call support' button in the conference control bar
clicking the support button will connect the user
to a "support" jitsi room
The name of the support room will be
`JITSI_ROOM_NAME`-SUPPORT
2021-02-02 13:03:30 +01:00
Finn Stutzenstein 1380812924
Fixes offline bar on successful reconnections (closes #5810). 2021-02-02 11:56:04 +01:00
Sean cc65b756c7
Merge pull request #5811 from tsiegleauq/applause-client
Add applause in client
2021-02-01 13:34:30 +01:00
Sean e3d718cad0 Add applause in client
Applause button in Jitsi Bar,
Add Applause Service,
Add Applause Display component,
Add Config varriables,
Integrate applause display component in Jitsi bar,
Integrate custom vertical progress bar as own component,
  - vertical and more customizable than the mat-progress-bar
  - includes an optional end icon
  - animated and themed
Add custom clapping icon
applause particles using tsparticles
custom particle component
dynamic add and remove functions to alter particles in runtime
Set own particle shape
Use smooth emitter for clean particle spawning
2021-01-28 15:42:19 +01:00
Finn Stutzenstein 47a2204921
Merge pull request #5822 from mdickopp/mdickopp/pwGeneration
Improve client-side password generation
2021-01-26 11:21:55 +01:00
Sean 878f3a7ab3 Fix csv importing users with groups
old groups
new groups created on the fly
2021-01-26 11:11:05 +01:00
Finn Stutzenstein 676bda8cc3
Merge pull request #5821 from danilobuerger/django-env
Allow preset env variable for django secret
2021-01-26 09:19:48 +01:00
Martin Dickopp 2130f4970f Improve password generation
Generating an 8-bit random number and reducing it modulo 56
(characters.length) does not choose all numbers 0 to 55 with equal
probability, but chooses 0 to 31 with higher probability than 32 to 55.
This change improves the password generation algorithms by choosing all
characters with equal probability.
2021-01-24 19:14:20 +01:00
Danilo Bürger 11d7f7b888
Allow preset env variable for django secret
The source command fails if /run/secrets/django does not exist. This is however not important if DJANGO_SECRET_KEY is already set. This is checked in the next step
2021-01-22 21:08:34 +01:00
Gernot Schulz 7e67e0db12
Merge pull request #5815 from gsiv/fix/entrypoint-db
server: Fix database config in Docker entrypoint
2021-01-22 16:33:42 +01:00
Emanuel Schütze 97950d5baa
Merge pull request #5817 from FinnStutzenstein/debugging
Performance improvements for OS3+
2021-01-21 13:35:03 +01:00
Finn Stutzenstein 8049bfa91e
Performance improvements for OS3+
- Cleans up log messages in the client
- Refactored the autoupdate bundle code into an own file
- Added bulk creates for History in Postgresql. This is the only database system
  that supports returning all ids whan multiple elements are inserted. We can
  make usage out of it.
- Added a `disable_history`, that is request-wide
- Disabled history on poll vote requests
- Removed unnecessary user ordering
- Reduced the queries for creating motion vote objects by one
- removed final_data: This was not prefetched. Using the normal data collection
  the data is prefetched
- removed unnecessary user query if vore delegation is not used
2021-01-21 12:53:51 +01:00
Gernot Schulz 0f0d750d83 server: Fix database config in Docker entrypoint
Firstly, this patch ensures that the server connects to the database
according to the given configuration variables.  Up until now, there was
a pg_isready check for the hard-coded hostname "db".  While this
generally worked in the default setup – db is an alias for pgbouncer in
the provided YAML configuration files – it is obviously wrong and would
lead to unexpected behavior in customized setups.

Secondly, the .pgpass setup, which was a remnant of another time and not
used anymore, has been removed.
2021-01-18 14:00:58 +01:00
Finn Stutzenstein 4f4bff9bb3
Merge pull request #5814 from FinnStutzenstein/docs
Docs and security email
2021-01-18 07:25:57 +01:00
Finn Stutzenstein b2e6d2f2ac Docs and security email 2021-01-17 21:18:52 +01:00
Finn Stutzenstein b200cfbd07
Merge pull request #5533 from FinnStutzenstein/externalAutoupdateService
External autoupdate service
2021-01-14 13:39:32 +01:00
FinnStutzenstein e225a57f97
OpenSlides3+: External Autoupdate Service
- Removing channels. Going back to a wsgi deployment
- Removed server projector code
- Autoupdate throttling is now in the client
- New communication stack in the client
- Adopted all deployment methods: Docker stack and docker compose (prod and dev)
- Added autoupdate service as submodule
2021-01-14 07:55:41 +01:00
Sean 1145ae1460
Merge pull request #5719 from FinnStutzenstein/minVotesAmount
Minimum amount of votes
2021-01-13 11:23:49 +01:00
Sean bc382df68f Client: Add form validation and request handling 2021-01-13 11:14:12 +01:00
Finn Stutzenstein ea180246c7
fixed server, rebased on current master 2021-01-12 09:50:13 +01:00
Sean 0b01b5576b
Fixing min amounts in assignment meta info 2021-01-12 09:29:28 +01:00
Finn Stutzenstein 7e763e8c07
Minumum amount of votes
renamed votes_amount to max_votes_amount
2021-01-12 09:29:24 +01:00
Emanuel Schütze 010b61cce2
Merge pull request #5800 from FinnStutzenstein/fixUserUpdateVoteDelegations
Fix vote_delegated_from_user_ids on user update
2021-01-08 15:39:05 +01:00
Emanuel Schütze 8542817129
Merge pull request #5791 from FinnStutzenstein/pwGeneration
Change PW generation to a secure method
2021-01-08 15:37:38 +01:00
Finn Stutzenstein b0ba30b454
Fix vote_delegated_from_user_ids on user update 2021-01-08 08:24:34 +01:00
Finn Stutzenstein 183c511046
Change PW generation to a secure method 2021-01-05 07:42:19 +01:00
Emanuel Schütze ea277adf9e
Merge pull request #5784 from emanuelschuetze/release3.3
Release3.3
2020-12-18 01:04:36 +01:00
Emanuel Schütze ef135837f7 Update version to 3.4-master 2020-12-18 00:43:02 +01:00
Emanuel Schütze a37e2196b3 Release 3.3 2020-12-18 00:43:02 +01:00
Emanuel Schütze 273debf99a Readded setup.py 2020-12-18 00:42:59 +01:00
Emanuel Schütze ab2fbaac79
Merge pull request #5778 from tsiegleauq/changelog-3.3
Add Changelog for 3.3 release
2020-12-17 23:56:00 +01:00
Emanuel Schütze aeaedabb87
Merge pull request #5780 from emanuelschuetze/translation20201216
Updated translations
2020-12-17 23:23:28 +01:00
Sean 52c4aa6c58 Updated Changelog for 3.3 release 2020-12-17 23:22:46 +01:00
Emanuel Schütze 227dfd0c26 Updated translations 2020-12-17 10:30:46 +01:00
Emanuel Schütze b179930cc8
Merge pull request #5779 from tsiegleauq/add-more-server-messages-to-translations
Add more server messages to translations
2020-12-16 20:05:33 +01:00
Sean 3b062a52e7 Add more server messages to translations
Adds some ValidationErrors send from the server to the translations in
the client
2020-12-16 16:21:56 +01:00
Emanuel Schütze 266c129e04
Merge pull request #5777 from tsiegleauq/see-own-vote-delegations-in-profile
Show vote delegations to users on ownPage
2020-12-16 13:35:35 +01:00
Sean f07cc4e176 Show vote delegations to users on ownPage
Users can see vote delegations concerning them if visiting their own
user detail page
2020-12-16 12:37:12 +01:00
Emanuel Schütze 222a2ea581
Merge pull request #5775 from tsiegleauq/more-powerful-vote-delegations
Add more dynamic vote delegations to user list
2020-12-15 17:35:01 +01:00
Emanuel Schütze 057e03a82c
Merge pull request #5774 from tsiegleauq/los-go-button-layouting
Responsive add-self buttons in list-of-speakers
2020-12-15 17:20:54 +01:00
Emanuel Schütze 1ebad842de
Merge pull request #5773 from tsiegleauq/mat-chips-in-search-val
Overwork chip list in search value selector
2020-12-15 17:18:37 +01:00
Sean cb73f52345 Add more dynamic vote delegations to user list
The user list now shows vote delegations from and to in every form and
preview
2020-12-15 16:40:27 +01:00
Sean 53be648c23 Responsive add-self buttons in list-of-speakers 2020-12-15 15:36:45 +01:00
Sean 2a224cb3b5 Overwork chip list in search value selector
Removed the placeholder, fixed the height, made it scrollable like the
filter bars, using elipsis for very long names, inidkated long names
using tooltips
2020-12-15 14:04:11 +01:00
Emanuel Schütze acd33b8207
Merge pull request #5765 from tsiegleauq/poll-create-layout-enhance
Enhance poll dialog layout
2020-12-13 21:37:08 +01:00
Sean e2cabbaf62 Enhance poll dialog layout
declutters the the poll dialogs
2020-12-13 21:27:08 +01:00
Emanuel Schütze 19df8184d0
Merge pull request #5762 from tsiegleauq/poll-progress-bar-ap
Show vote progress in autopilot
2020-12-13 20:56:58 +01:00
Emanuel Schütze 0a80a73f2e
Merge pull request #5761 from jwinzer/poll-progress-users
Fix user filter of poll progress
2020-12-13 20:52:50 +01:00
Sean b9f36f1cea Hide poll progress bar by perms 2020-12-11 11:21:11 +01:00
Emanuel Schütze 5d5a5b3e39
Merge pull request #5755 from FinnStutzenstein/fixUserDelegationSelfvote
Fix user delegation selfvote
2020-12-10 10:10:42 +01:00
Finn Stutzenstein ef42a2293d
Adjust restricter, so poll managers can see the delegation structure 2020-12-10 09:20:50 +01:00
Sean ac63a04666 Show vote progress in autopilot
Shows the vote progress in the autopilot
changes the theme of the progress bar to support its normal buffer color
Shows "autopilot" in browser title
2020-12-09 14:17:27 +01:00
Sean 78cfa4875e
Merge pull request #5683 from jwinzer/bug-fix-perms
Fix unresolved permissions
2020-12-09 12:54:22 +01:00
Jochen Winzer 689bfcac61 Fix unresolved permissions. 2020-12-09 12:36:35 +01:00
Jochen Winzer ec36d4d64e User is only allowed to vote if present and has not delegated his vote or has delegated his vote to a user who is present. 2020-12-09 11:09:11 +01:00
Emanuel Schütze 5cc464b250
Merge pull request #5750 from tsiegleauq/avoid-zombie-jitsi
Avoid stream/jitsi cases without information
2020-12-08 17:40:54 +01:00
Sean 92cf811921 Avoid stream/jitsi cases without information
Rewrites the jitsi/stream state management.
After every reload and after a stream becomes available (while not
currently in a jitsi conference) you will switch to live stream, if
available
2020-12-08 17:15:25 +01:00
Sean 1af78df328
Merge pull request #5742 from tsiegleauq/show-poll-infos-more-present
Add poll meta info component
2020-12-08 16:42:59 +01:00
Sean 9c738b5d8e Add poll meta info component
Adds a component to display the assignment polls meta info
2020-12-08 16:25:08 +01:00
Emanuel Schütze 9ddb3a9179
Merge pull request #5705 from tsiegleauq/show-poll-result-in-ap
Show latest meaningful poll results in autopilot
2020-12-08 16:17:49 +01:00
Sean 10614ca57b Show latest meaningfull poll results in autopilot
Shows the latest meaningfull poll result in autopilot
The last published poll result from the corresponding content object
2020-12-08 14:45:08 +01:00
Finn Stutzenstein 182759e794
Merge pull request #5749 from mathiashro/patch-1
Update DEVELOPMENT.rst
2020-12-08 09:01:34 +01:00
Finn Stutzenstein 78f0b29921
Disallows users, who have delegated their votes to others, to selfvote. It is enforced, that the user who gets the vote right must vote for the right-provder. 2020-12-04 06:52:25 +01:00
Emanuel Schütze 2943c969ab
Merge pull request #5751 from tsiegleauq/motion-to-motion-nav
Reset the CR Mode by motion-motion navigation
2020-12-03 15:02:10 +01:00
Emanuel Schütze ea4ec53fb1
Merge pull request #5746 from tsiegleauq/poster-image
Add poster image in 404 cases
2020-12-03 12:24:57 +01:00
Sean 944685696a
Merge pull request #5739 from tsiegleauq/hide-started-assignment-polls
Hide started assignment polls
2020-12-03 12:19:38 +01:00
Emanuel Schütze 5629c73b4b
Merge pull request #5734 from tsiegleauq/deleted-users-in-polls
Show "Deleted user" if a poll user cannot be found
2020-12-03 12:09:56 +01:00
Sean d0ed5448e8 Add poster image in 404 cases
Shows the assigned poster image if the stream is not
reachable
2020-12-03 12:09:30 +01:00
Emanuel Schütze 00b148edbd
Merge pull request #5736 from tsiegleauq/hide-motion-id-in-pdf
Consider show-seq-number config during pdf export
2020-12-03 11:59:46 +01:00
Sean 5e1b5b5658 Show "Deleted user" if a poll user cannot be found
Fixes an error that would freeze OpenSlides
If a user was deleted but registered as a poll option,
The Assignment Detail View would freeze
2020-12-03 11:51:41 +01:00
Emanuel Schütze 96d464bcfa
Merge pull request #5748 from tsiegleauq/vjs-pip
Re-Enable pip option for VJS
2020-12-03 11:36:43 +01:00
Emanuel Schütze 85de17611f
Merge pull request #5735 from tsiegleauq/trim-vjs-strings
Trim livestream URL
2020-12-03 11:33:05 +01:00
Sean a410083349 Reset the CR Mode by motion-motion navigation
Set the CR mode to default if navigating from one motion
to the other motion instead of keeping the previously selected
CD mode
2020-12-02 12:42:03 +01:00
mathiashro bdd44f78eb
Update DEVELOPMENT.rst 2020-12-01 18:16:08 +01:00
Sean ce2f71a9da Re-Enable pip option for VJS
re enables the previously disabled pip mode for videojs
2020-12-01 17:09:02 +01:00
Sean 90ac27ff43 Hide started assignment polls
Hide assignment polls in started state if user does not have
the manage permission
2020-11-30 15:27:12 +01:00
Finn Stutzenstein 652b727386
Merge pull request #5738 from FinnStutzenstein/fixGetWhoAmIError
Fix error handling in WhoAmI data view
2020-11-30 13:44:29 +01:00
Finn Stutzenstein e1183fff60
Fix error handling in WhoAmI data view 2020-11-30 13:00:03 +01:00
Sean 629ad4ec1f Consider show-seq-number config during pdf export
If not stated in the export dialog, the sequential
motion number will not be printed in the PDF if the config
option is unset
2020-11-27 17:09:33 +01:00
Sean 00066806d6 Trim livestream URL
Trims whitespaces from the livestream URL
2020-11-27 16:58:58 +01:00
Emanuel Schütze 96f96f09ee
Merge pull request #5732 from emanuelschuetze/fixAssignmentManagePermission
Fixed permission for assignment submenu.
2020-11-26 12:44:27 +01:00
Emanuel Schütze 48c09ed4c5
Merge pull request #5731 from emanuelschuetze/translation20201126
Updated translations
2020-11-26 12:39:14 +01:00
Emanuel Schütze c4f37999f3 Fixed permission for assignment submenu. 2020-11-26 12:29:00 +01:00
Emanuel Schütze ad907de958 Updated translations 2020-11-26 12:20:21 +01:00
Emanuel Schütze 8b94829a2c
Merge pull request #5695 from tsiegleauq/active-wait-for-perms
Show "please grant mic access" info
2020-11-26 12:06:27 +01:00
Emanuel Schütze fbed661dfb
Merge pull request #5730 from emanuelschuetze/motionPollTitle
Show motion poll title in motion pdf
2020-11-26 12:05:33 +01:00
Emanuel Schütze b318bfda99
Merge pull request #5729 from FinnStutzenstein/fixAssignmentOptionSorting
Fix sorting of assignment options
2020-11-26 11:55:55 +01:00
Emanuel Schütze 5577bac7c9 Show motion poll title in motion pdf 2020-11-26 11:47:18 +01:00
Finn Stutzenstein c7405c36d8
Fix sorting of assignment options 2020-11-26 11:39:43 +01:00
Joshua Sangmeister fca688a1f7 fix config usage 2020-11-26 10:37:45 +01:00
Sean 26ac618ddf Show "please grant mic access" info
If the browser does not have the permission to use the microphone,
OpenSlides will show a spinner to inform the user to grant
mic access
2020-11-25 15:49:18 +01:00
Emanuel Schütze c323eabd6f
Merge pull request #5727 from FinnStutzenstein/enableIsPresentBulkForSAMLUsers
Enable bulk set presence for non-default auth type users
2020-11-25 15:30:13 +01:00
Sean a51103b7b7
Merge pull request #5707 from tsiegleauq/automatically-join-jitsi
Autoconnect the next X speaker to jitsi
2020-11-25 15:29:24 +01:00
Sean d6467d5bbf Autoconnect the next X speaker to jitsi
In config, set "general_system_conference_auto_connect_next_speakers"
to let the next X speakers on the current list of speakers
automatically join the jitsi conference.
Updates automatically
2020-11-25 15:13:02 +01:00
Emanuel Schütze 00bb266098
Merge pull request #5726 from FinnStutzenstein/fixDebugEmailFlag
enable --debug-email for start and runserver
2020-11-25 15:07:54 +01:00
Finn Stutzenstein 0a67c24138
Enable bulk set presence for non-default auth type users
closes #5715
2020-11-25 15:06:17 +01:00
Finn Stutzenstein 667a841051
enable --debug-email for start and runserver
closes #5702
2020-11-25 14:53:41 +01:00
Finn Stutzenstein fd7a4cb64b
Merge pull request #5725 from FinnStutzenstein/hotfixUserRestrictor
Hotfix user restrictor. Wrong usage of set's add method
2020-11-25 12:28:50 +01:00
Finn Stutzenstein 4f24a38da8
Hotfix user restrictor. Wrong usage of set's add method 2020-11-25 12:04:24 +01:00
Emanuel Schütze 03cb8592fe
Merge pull request #5724 from emanuelschuetze/translation20201125
Updated translations
2020-11-25 11:49:22 +01:00
Emanuel Schütze 1f302b466a Updated translations 2020-11-25 11:39:57 +01:00
Sean 65c7d3491c
Merge pull request #5717 from emanuelschuetze/listType
Add ol list type.
2020-11-25 11:23:50 +01:00
Emanuel Schütze b611642ecb
Merge pull request #5721 from FinnStutzenstein/fixGroupDeletionInConfig
Fix group deletion for config variables
2020-11-25 10:39:08 +01:00
Sean 1eee3bc56d
Merge pull request #5718 from tsiegleauq/negative-voting
Allow negative voting
2020-11-25 10:01:12 +01:00
Sean b5cb694fc7 Allow negative voting
Adds "no" as the opposite of "votes" as assignment poll method
Added global_yes, enabled new voting mode `N` in the server
Layout, Tables, Charts, Projector, Vote CSS, Cleanups, Percent bases,
analog votes and more
2020-11-24 23:14:12 +01:00
Finn Stutzenstein f609e6362f
Fix group deletion for config variables 2020-11-24 13:43:05 +01:00
Emanuel Schütze 36506a7383
Merge pull request #5720 from FinnStutzenstein/fixSelectableNonAnalogPollsIfDisabled
Remove the possibility to select default non-analog poll types, if el…
2020-11-24 11:37:16 +01:00
Finn Stutzenstein 07a003717d
Remove the possibility to select default non-analog poll types, if electronic voting is disabled 2020-11-24 10:28:56 +01:00
Emanuel Schütze ab230fe7a9 Allowed ol list types (in html and pdf). 2020-11-23 20:40:22 +01:00
jsangmeister 26e414e3d1
Merge pull request #5714 from jsangmeister/fix-html-validation
Fixed HTML attribute validation
2020-11-20 16:23:16 +01:00
Joshua Sangmeister f3809fc8a9 Fixed HTML attribute validation 2020-11-20 16:10:32 +01:00
Sean bed9b3a958
Merge pull request #5709 from tsiegleauq/replace-travis-with-github-actions
Replace travis with github actions
2020-11-19 09:29:30 +01:00
Sean 5b2fe01965 Replace travis with github actions
Remove travis, add github actions
2020-11-18 18:35:13 +01:00
Finn Stutzenstein 38534d4e01
Include vote_delegated_from_users_id in required users (#5706)
* Include vote_delegated_from_users_id in required users

* Fix restrictors if users do not have base perms

* Fix from username building in the projector
2020-11-18 08:14:33 +01:00
Norman Jäckel 6c35e225a5
Merge pull request #5700 from bernhardreiter/patch-1
README: fix (minor) typo
2020-11-13 09:35:45 +01:00
Bernhard E. Reiter 6abaeb2155
README: fix (minor) typo 2020-11-12 11:20:45 +01:00
Emanuel Schütze d446382f70
Merge pull request #5694 from tsiegleauq/po-order-closed-lists
Allow point-of-order on closed list of speakers
2020-11-11 21:04:38 +01:00
Emanuel Schütze 34070843c2
Merge pull request #5690 from tsiegleauq/search-value-single-val
Fix non-multipl os-search-val-selector
2020-11-11 20:54:36 +01:00
Finn Stutzenstein 01206cb7c6
Merge pull request #5689 from FinnStutzenstein/fixManageSpeakerValidation
Add user_id validation for LOS and assignment candidates
2020-11-11 08:44:45 +01:00
Sean 2736917c7e Allow point-of-order on closed list of speakers
Allows to submit a new point of order even though the list of
speakers is closed
2020-11-10 13:10:35 +01:00
Finn Stutzenstein 72dc55558f
Add user_id validation for LOS and assignment candidates 2020-11-10 12:30:54 +01:00
Sean 9ce8fe8233
Merge pull request #5692 from tsiegleauq/quick-toggle-los-open-ap
Add los-close toggle to autopilot
2020-11-10 12:09:00 +01:00
Sean dd3dbea482
Merge pull request #5691 from tsiegleauq/fix-remove-all-speakers
Fix "remove all speaker" button
2020-11-10 12:08:30 +01:00
Sean a188abed48 Fix non-multipl os-search-val-selector
Fixes a bug there non multiple uses of search value
selector was submitting the value twice due to late
alterations of internal form objects
2020-11-10 11:14:28 +01:00
Sean ade2d4b977 Add los-close toggle to autopilot
Adds a open/close list-of-speakers toggle option to autopilot component
Also: hides the list of speakers if the current content object does not
allow a list-of-speakers (mediafiles, users)
2020-11-09 19:06:41 +01:00
Sean be0deefdce Fix "remove all speaker" button
Remove all speakers was always deactivated
2020-11-09 16:18:26 +01:00
Emanuel Schütze 7b0f8e3c25
Merge pull request #5687 from emanuelschuetze/translation-20201107
Updated translations
2020-11-08 20:15:14 +01:00
Emanuel Schütze 88b25acd0a Updated translations 2020-11-07 18:36:07 +01:00
Emanuel Schütze 22f9108b49
Merge pull request #5684 from tsiegleauq/vscroll-selection-bugs
Fix a bug where vscroll select lists lost content
2020-11-07 18:26:39 +01:00
Emanuel Schütze 019c097c26
Merge pull request #5685 from emanuelschuetze/point-of-order-on-projector
Show point of order icon on projector (los slide)
2020-11-07 18:09:27 +01:00
Emanuel Schütze f9796027ef Show point of order icon on projector (los slide) 2020-11-07 17:19:59 +01:00
Sean 2364ed66ff Fix a bug where vscroll select lists lost content
Large virtual scroll select lists lost the
content after scrolling. Form values
were removed from the component if the
buffer was exceeding the view
2020-11-06 18:33:13 +01:00
Emanuel Schütze 9fcb6cdcba
Merge pull request #5676 from tsiegleauq/show-vote-totals-in-user-list
Show vote weight totals in user list
2020-11-06 11:16:16 +01:00
Emanuel Schütze 5b84bddc2a
Merge pull request #5680 from jwinzer/presence-disabled-fix
Disable presence checkbox
2020-11-05 22:55:32 +01:00
Emanuel Schütze def6e8d59d
Merge pull request #5682 from emanuelschuetze/translation-20201105
Updated translations
2020-11-05 22:54:23 +01:00
Emanuel Schütze a49ed17b45
Merge pull request #5674 from jwinzer/cinema-speaker-list
Cinema needs perm to show list of speakers. Use content-container.
2020-11-05 22:48:00 +01:00
Emanuel Schütze 7d97cede2d
Merge pull request #5672 from jwinzer/assignment-update
Call assignment details from new route after a route change.
2020-11-05 22:39:09 +01:00
Sean 17e5d42d17 Show vote weight totals in user list
Shows the total vote weight in user list
2020-11-05 22:33:15 +01:00
Emanuel Schütze 4c7bf0a203
Merge pull request #5677 from FinnStutzenstein/envMedia
Add env variables for media cache
2020-11-05 22:24:28 +01:00
Emanuel Schütze 85852d158a
Merge pull request #5678 from jsangmeister/deactivate-empty-votes
Deactivate empty votes for assignment polls
2020-11-05 22:23:04 +01:00
Emanuel Schütze beb59cee73 Updated translations 2020-11-05 22:03:00 +01:00
Jochen Winzer d89c7cfdb0 Disable checkbox if user is not permitted to change presence. 2020-11-05 21:33:04 +01:00
Joshua Sangmeister 883463ea87 Deactivate empty votes for assignment polls 2020-11-05 16:44:22 +01:00
Finn Stutzenstein 0c66afc34a
Add env variables for media cache 2020-11-05 16:19:44 +01:00
Jochen Winzer 513f1477af Call assignment details from new route after a route change.
Make private.
2020-11-04 18:05:10 +01:00
Jochen Winzer 837af97d57 Need perm to show list of speakers. Use content-container.
Fix link.
2020-11-04 18:01:38 +01:00
Sean 6bc2c104b1
Merge pull request #5673 from jwinzer/poll-collection-refresh
Bug fix preventing undesired recreation of poll-collection
2020-11-04 16:23:51 +01:00
Sean d4b92a2b4e
Merge pull request #5628 from tsiegleauq/vjs-404
catch and refresh unreachable video streams
2020-11-04 16:15:01 +01:00
Sean 7ad3b78eb2
Merge pull request #5644 from tsiegleauq/point-of-order-in-listofspeakers
Add "point of order" feature to ListOfSpeakers
2020-11-04 14:36:40 +01:00
Jochen Winzer 5ef1869a10 Bug fix preventing undesired recreation of poll-collection and poll-votes on poll change. 2020-11-04 09:38:53 +01:00
Sean ccc48e6b3f
Add "point of order" feature to ListOfSpeakers
Adds the option "point of order" to the list of speakers
- You can make a point of order even though you normally have no
permission to add yourself to the ListOfSpeakers
- You can make a point of order even though you are already on theListOfSpeakers (but you may only be there once)
- new points of order will be on top of the list of speakers
- Point of orders will be highlighted by a red triangle

This feature can be used to request to speak with a higher level of
urgency
2020-11-03 12:40:36 +01:00
Finn Stutzenstein 866acfe7f5
Merge pull request #5658 from FinnStutzenstein/exposeMoreEmailSettings
Expose more email settings
2020-11-02 07:49:21 +01:00
Finn Stutzenstein 6943c3d18f
Expose more email settings 2020-11-02 07:26:09 +01:00
Sean b391ed0dfe catch and refresh unreachable video streams
Detects if a live stream is reachable or not.
Adds a refresh key to recheck if a stream can be reached
Live adding and removing streams made easier
2020-10-29 09:20:18 +01:00
Finn Stutzenstein 06044e81c0
Merge pull request #5651 from simonla82/armSupport
Update Dockerfile to allow build via docker-compose on arm architectures
2020-10-29 07:56:36 +01:00
Finn Stutzenstein eacccd8f5c
Merge pull request #5657 from FinnStutzenstein/smallFixes
Catch some tracebacks
2020-10-29 07:50:13 +01:00
Finn Stutzenstein 61c5f77d29
Merge pull request #5548 from FinnStutzenstein/createinitialuser
Create initial user command
2020-10-29 07:50:00 +01:00
simonla82 5502e5337a
Update Dockerfile to allow build via docker-compose on arm architectures
As stated in issue #5638 the installation via docker-compose fails on arm architectures since two librariers are not correctly installed. This is fixed by installing those manually in the /server/docker/Dockerfile
2020-10-28 13:16:38 +01:00
Finn Stutzenstein 0956153ea4
Create initial user command 2020-10-28 08:22:32 +01:00
Finn Stutzenstein 266f9b73e9
Merge pull request #5639 from FinnStutzenstein/useCacheInManagementCommands
Use cache in management commands
2020-10-28 08:20:01 +01:00
Finn Stutzenstein d4577ed8aa
Merge pull request #5656 from FinnStutzenstein/SmtpException
Improve reporting of SMTP exception
2020-10-28 08:18:43 +01:00
Finn Stutzenstein 582215042d
Catch some tracebacks 2020-10-28 08:18:20 +01:00
Finn Stutzenstein 1dd86a29be
Improve reporting of SMTP exception 2020-10-27 07:59:37 +01:00
Finn Stutzenstein 961a2da888
Merge pull request #5655 from ManniLoe/fix-saml-bulk
no exclustion of SAML Users on bulk-alter-group
2020-10-27 07:25:37 +01:00
Manfred Löbling 2b5abf72a4 no exclustion of SAML Users on bulk-alter-group 2020-10-25 20:25:43 +01:00
Finn Stutzenstein 7277a1bb01
Merge pull request #5647 from bahuma20/patch-1
saml: commands: create-saml-settings: Fix check on wrong variable
2020-10-20 15:46:50 +02:00
Max Bachhuber b214a69136
Fix check on wrong variable 2020-10-20 14:53:21 +02:00
Finn Stutzenstein b864d67cda
Merge pull request #5645 from gsiv/fix/m4-quote-env
Docker config: Quote env vars read by m4
2020-10-20 12:59:25 +02:00
Gernot Schulz 2305ca9d21 Docker config: Quote env vars read by m4 2020-10-20 12:05:11 +02:00
Finn Stutzenstein ca56b4f8b4
Use cache in management commands
This requires to have a correct setup when using these commands
2020-10-19 15:29:59 +02:00
Finn Stutzenstein d2043f508c
Merge pull request #5633 from FinnStutzenstein/fixMigrations
Fix migrations to not use the cache
2020-10-14 08:05:01 +02:00
Finn Stutzenstein d317e032e7
Fix migrations to not use the cache 2020-10-14 07:48:40 +02:00
Finn Stutzenstein 6c60834f37
Merge pull request #5627 from jwinzer/saml
Correct sp attributes
2020-10-13 07:57:18 +02:00
Jochen Winzer 4fef8ed4dc Correct sp attributes. 2020-10-12 16:03:35 +02:00
Finn Stutzenstein b9f78f501d
Merge pull request #5607 from FinnStutzenstein/fixTbs
Attempt to fix some tracebacks
2020-10-08 10:52:06 +02:00
Finn Stutzenstein f809db0430
Attempt to fix some tracebacks 2020-10-08 10:28:27 +02:00
Finn Stutzenstein 1707c1f4fd
Merge pull request #5545 from FinnStutzenstein/atomicSpeakers
Add a transaction to speaker handling
2020-10-08 09:44:34 +02:00
Finn Stutzenstein 12e6090fa7
Merge pull request #5546 from FinnStutzenstein/checkForCookies
Added missing client part for cookie checking on login
2020-10-08 09:17:02 +02:00
Finn Stutzenstein d739d401c4
Add a transaction to speaker handling
to prevent adding a users multiple times to the waiting queue of a list of speakers
2020-10-08 09:14:43 +02:00
Emanuel Schütze b050a87bb2
Merge pull request #5618 from emanuelschuetze/translations-20201007
Updated translations
2020-10-08 08:04:53 +02:00
Emanuel Schütze e77b2518d5 Updated translations 2020-10-07 23:32:28 +02:00
Emanuel Schütze 21990aa568
Merge pull request #5602 from FinnStutzenstein/addDemoModeToDocker
Add demo mode to all docker setups
2020-10-07 23:30:35 +02:00
Emanuel Schütze 58db337a40
Merge pull request #5617 from tsiegleauq/only-non-stable-slides-in-ap
Show first unstable element in autopilot
2020-10-07 23:30:19 +02:00
Sean 70ea4f3658
Merge pull request #5568 from tsiegleauq/show-amendment-cr-in-lead-motion-slide
Add amendment cr to lead motion slide
2020-10-07 18:17:52 +02:00
Emanuel Schütze 25d83b4419
Merge pull request #5609 from tsiegleauq/show-delegations-in-single-vote-table
Add "represented by" to single votes table
2020-10-07 17:35:20 +02:00
Sean 22a318bde2 Show first unstable element in autopilot
Skips all unstable elements in autopilot
2020-10-07 17:24:44 +02:00
Finn Stutzenstein fd2fd8d73a Add demo mode to all docker setups 2020-10-07 16:50:08 +02:00
Sean Engelhardt 823a87c164 Add amendment cr to lead motion slide
Adds amendment cr to the lead motion slide.
Previously the amendmet cr was only present in the amendment slide but was forgotten in the motion slide
2020-10-07 16:47:16 +02:00
Sean 2162f2b049 Add "represented by" to single votes table
Adds a "represented by" field to the single votes table, to indicate a
vote delegation.
Also fixes an height issue that occured in large single vote tables when
the user was navigating from a list view table to a single vote table
2020-10-07 16:45:31 +02:00
Emanuel Schütze 28be46cf5a
Merge pull request #5603 from tsiegleauq/poll-values-on-projector
Use numbers exclusively in PollNumberPipe
2020-10-07 16:37:59 +02:00
Finn Stutzenstein 435bb59472 Add parsing of decimal fields for projector data
Fixes an issue where the projector would not show special poll values,
such as "majority" or "not counted"
2020-10-07 15:01:58 +02:00
Sean de474e9eae
Merge pull request #5613 from tsiegleauq/invisible-agenda-item-issue
Fix hidden motions in agenda list
2020-10-07 10:29:31 +02:00
Emanuel Schütze 706c1d9e36
Merge pull request #5592 from tsiegleauq/assignment-projector-percentage
Fix assignment polldata discovery in percent pipe
2020-10-06 22:33:34 +02:00
Emanuel Schütze e6fc32b9b4
Merge pull request #5598 from tsiegleauq/export-vote-weight
Export users with username and vote weight
2020-10-06 22:31:03 +02:00
Emanuel Schütze 2bb0134cd8
Merge pull request #5610 from tsiegleauq/mediafile-multi-download-perms
Fix mediafile multi download permission
2020-10-06 22:26:04 +02:00
Emanuel Schütze be3fafd907
Merge pull request #5608 from tsiegleauq/vote-delegation-search-filter
Add search and filter for vote delegation
2020-10-06 22:13:20 +02:00
Sean daaf404756 Fix hidden motions in agenda list
Fixes an error where hidden motions in the agenda list would throw an
error
2020-10-06 16:11:17 +02:00
Sean d22e0bf2f6 Fix mediafile multi download permission
Fixes a permission issue in the mediafile list.
Without manage right, the vertical dot menu was not visible.
Also allows multi selection and selective download without manage
rights.

Fixes a ngrid css error in mediafile list
2020-10-05 17:28:22 +02:00
Sean ed1c3eaa7a Add search and filter for vote delegation
Adds a new filter "Vote delegation" to user list:
Transferred vote right
Received vote reight
neither received not transferred vote right

Adjusts the user list search and the global search to include vote
deligations
2020-10-05 12:39:17 +02:00
Sean 9607f05454
Merge pull request #5507 from tsiegleauq/repair-compodoc
Update and fix compodoc generation
2020-10-05 11:05:20 +02:00
Sean 2ca157bb7c
Merge pull request #5604 from tsiegleauq/select-search-throws-errors
Fix mat select search errors
2020-10-05 10:47:05 +02:00
Sean 25878f297f Fix mat select search errors
Mat select search wants a mat-option now
2020-10-02 15:27:30 +02:00
Finn Stutzenstein 8d2a7f1b12
Merge pull request #5541 from jsangmeister/vote-delegation
Add vote delegation
2020-10-02 14:15:06 +02:00
Manfred a94ce67c22
Update saml-setup.sh (#5580)
* Update saml-setup.sh

create symbolic link fails when container is restarted
2020-10-02 07:40:04 +02:00
Finn Stutzenstein deddd68121
Merge pull request #5591 from ManniLoe/admin_secret
admin.env not loaded by m4
2020-10-02 07:31:20 +02:00
Sean 28bac117be Export users with username and vote weight
Importer expects both username and vote weight,
Thus, exported csv could not easily be reimported
2020-10-01 15:44:20 +02:00
Sean 98a8de3c2d Fix assignment polldata discovery in percent pipe
Fixes an issue where projector data was not delivering enough
information to guess if a poll data belongs to an assignment or a
motion.
This error resultet that the percent base pipe used the percent bases
for motions to calculate for assignments
2020-10-01 13:51:25 +02:00
Manfred Löbling 49a3bcd930 admin.env is not loaded. docker-*.m4 defines ADMIN_SECRET_AVAILABLE if adminsecret.env is present 2020-10-01 13:30:25 +02:00
Sean 8c28b03ffc Vote delegations on client
Add "your vote was delegated" error

Observe operator alterations during vote

Add "canVoteFor" getter

Adjust poll progress bars
2020-10-01 12:18:44 +02:00
Joshua Sangmeister 3ac8569712
Add vote delegation on server side
Add user_has_voted_for_delegations. Add tests

Prevent self delegation

Make delegated_user visible
2020-09-30 14:05:22 +02:00
Finn Stutzenstein c0fb65316c
Merge pull request #5584 from FinnStutzenstein/updateDockerignore
Update .dockerignore to reduce the context size
2020-09-29 17:05:25 +02:00
Finn Stutzenstein 90e13a0f8e
Update .dockerignore to reduce the context size 2020-09-29 16:16:58 +02:00
topelrapha 88994efac3
Fix server stop working because of changed python package (#5582)
* Fix server stop working because of changed python package

* Update AUTHORS
2020-09-29 16:06:28 +02:00
Finn Stutzenstein ed2c298928
Merge pull request #5555 from jsangmeister/fix-non-nominal-votes-assignment-poll
Fix non-nominal voting on assignment polls with type votes
2020-09-28 15:26:09 +02:00
Sean 677a93e2ca Update and fix compodoc generation
Fixes and updates compodoc.
2020-09-28 13:02:56 +02:00
Sean 991c08d57d
Merge pull request #5534 from tsiegleauq/protected-values-cause-user-error
Cleanup previous return statements in void functions
2020-09-28 11:53:57 +02:00
Sean adcf98a69b
Merge pull request #5575 from tsiegleauq/packagelock-to-dockerfile
Add package lock to dockerfile
2020-09-23 15:49:56 +02:00
Sean 6606e46f68 Add package lock to dockerfile
Adds the package-lock file to the clients dockerfile, so npm-ci works
2020-09-23 14:44:33 +02:00
Emanuel Schütze e1d4a4152a
Merge pull request #5537 from tsiegleauq/angular-10
Angular 10
2020-09-23 11:18:25 +02:00
Sean 42dd397fae Update to Angular 10
Update @angular/core @angular/cli
Update material, search-select, cdk, ngrid
Update localstorage
Update rxjs
Update ngx-translate
Update ngx-translate-extract
Update @schematics/angular
Update some deps
Update dev deps
Fix css imports, lint
Downgrad CDK and Material for ngrid
Update docker
Provide pdf worker
Move static file output to django folder
Update readme / used files
Update package-lock.json for npm ci
2020-09-23 10:29:57 +02:00
Emanuel Schütze 3b2fbe8915
Merge pull request #5574 from emanuelschuetze/translation20200923
Updated translations
2020-09-23 09:55:19 +02:00
Emanuel Schütze 69299808b6 Updated translations 2020-09-23 09:36:57 +02:00
Emanuel Schütze cf4573cb54
Merge pull request #5515 from tsiegleauq/lazy-user-mode
Implement cinema mode (autopilot)
2020-09-23 08:37:33 +02:00
Emanuel Schütze b392ac83aa
Merge pull request #5570 from tsiegleauq/vjs-poster-url-config
Add vjs live steam poster url as config
2020-09-23 08:22:37 +02:00
Sean Engelhardt 7f53636b7b Add vjs live steam poster url as config
Adds a new config to show a poster url in the live stream view
2020-09-22 14:53:31 +02:00
Emanuel Schütze 40c2a7fae4
Merge pull request #5569 from tsiegleauq/scss-fix-for-change-recommendation-overview
fix white change-recommendation-overview
2020-09-18 16:44:34 +02:00
Sean Engelhardt bc540180dd fix white change-recommendation-overview
Fixes a bug where a white or blank change-recommendation-overview appeared
2020-09-18 16:29:13 +02:00
Sean ec13ab56e8 Implement cinema mode
Implements a viewer mode containing the most important information and
Heavily refactors ListOfSpeaker and CurrentListOfSpeaker
interaction heavy components on a single view:

Current List of Speakers
Currently Open Polls
Current projector

Permission in migration
2020-09-17 18:38:57 +02:00
Emanuel Schütze acbddd3c53
Merge pull request #5567 from tsiegleauq/pdf-list-cr-amendment-fixes
More reliable text/stack defintion in cr pdf
2020-09-17 18:31:28 +02:00
Sean 6007799f1d More reliable text/stack defintion in cr pdf
Motion pdfs with line numbers, CR/Amendment and bullet points with
multiple changes have a better chance to produce expected results
2020-09-17 18:11:45 +02:00
Emanuel Schütze 2687d1abba
Merge pull request #5564 from tsiegleauq/amendment-projection-default
Add amendment projection defaults
2020-09-17 17:26:29 +02:00
Emanuel Schütze c4a2b02f5d
Merge pull request #5565 from CatoTH/bugfix/show-changed-amendment-in-slides
Fix changed amendment in slides
2020-09-17 16:54:10 +02:00
Emanuel Schütze e8e39b1e89
Merge pull request #5550 from tsiegleauq/vscroll-selector-component
Add virtual scrolling for search value selector
2020-09-17 16:48:12 +02:00
Sean a42205e47f Hide diff-box in projector 2020-09-17 15:40:43 +02:00
Emanuel Schütze 855db8241b
Merge pull request #5542 from tsiegleauq/vscroll-user-import
Vscroll for user import
2020-09-17 15:14:01 +02:00
Emanuel Schütze 688b1b276d
Merge pull request #5563 from tsiegleauq/hide-id-in-amendment-list
Show or hide motion id in amendment list by config
2020-09-17 15:03:42 +02:00
Emanuel Schütze 3d7bfe652c
Merge pull request #5562 from tsiegleauq/amendment-filter-new-workflow
Evaluate default amendment workflow in list
2020-09-17 15:00:57 +02:00
Tobias Hößl 1a0e017f80
Fix changed amendment in slides 2020-09-16 19:52:37 +02:00
Sean df2e26c3ed Show or hide motion id in amendment list by config
Hides the motion id in the list of amendments if the given config was
enabled or disabled
2020-09-16 15:51:03 +02:00
Sean 4712707d6b Add amendment projection defaults
Creates projection defaults for (paragraph based) amendments.
Adds a migration to add amendments as projection defaults.

Will only work for paragraph based amendments, other amendments will
still be considered motions
2020-09-16 15:41:11 +02:00
Emanuel Schütze 909a7539c5
Merge pull request #5561 from tsiegleauq/fix-csv
Adjust the example csv gender fields
2020-09-16 14:21:56 +02:00
Sean 51512fd589 Evaluate default amendment workflow in list
Evaluates the default amendment workflow in the amendment list so users
can se the filters accordingly
2020-09-16 11:55:02 +02:00
Sean 34f23b3d0e Adjust the example csv gender fields
The example fields are now as they would be expected by the OpenSlides
translation
2020-09-15 17:44:47 +02:00
Joshua Sangmeister 8d92353047 Fix non-nominal voting on assignment polls with type votes 2020-09-15 14:48:26 +02:00
Emanuel Schütze 04477d9ebd
Merge pull request #5559 from tsiegleauq/no-final-version-in-amendments
Avoid final version to amendments
2020-09-15 09:31:45 +02:00
Sean bc333a6b51 Avoid final version to amendments
If the motion is a paragraph based amendment the user cannot create a
final version anymore
2020-09-14 16:40:08 +02:00
Sean 594777960b Adjust code style in user repo
Cleans up return statements in void functions
2020-09-14 12:29:21 +02:00
Emanuel Schütze 2759f8ce2b
Merge pull request #5551 from FinnStutzenstein/crInProjector
Always include CRs in motion slide
2020-09-11 11:38:57 +02:00
Emanuel Schütze b555de8510
Merge pull request #5556 from tsiegleauq/accepted-amendment-cr-in-main-motion
Show amendments change reco in main motion
2020-09-11 09:59:51 +02:00
Sean b596bf0ca5 Show amendments change reco in main motion
Fixes a bug which was preventing change recos from amendments to display
in main motions
2020-09-11 00:07:33 +02:00
Finn Stutzenstein d893f3dbe5 Always include CRs in motion slide
Show Amendment CR in Projector

Shows the amendment CR in the projector if the projected slide is in
diff version.
Only shows direct Change recos to amended paragraphs
2020-09-10 19:38:25 +02:00
Emanuel Schütze 9148d97f7a
Merge pull request #5554 from gsiv/dev/templ-no-none
Docker templates: Set empty values instead of None
2020-09-10 14:31:16 +02:00
Gernot Schulz ed9e50a1b4 Docker templates: Set empty values instead of None 2020-09-10 10:12:16 +02:00
Sean eb98289b84 Add virtual scrolling for search value selector
Adds virtual scrolling for the search value selector.
2020-09-08 12:57:27 +02:00
Sean f3fe98436e Vscroll for user import
Allows to import giant sets of users as CSV.
Tested 500k. The client is fine. The python server and the SQL data base really do not like that.
2020-09-07 16:00:11 +02:00
Finn Stutzenstein 5b63809b12
Merge pull request #5547 from gsiv/master
Docker build.sh: Run aux build scripts in subshell
2020-09-07 11:21:41 +02:00
Gernot Schulz a408ee62ee Docker build.sh: Run aux build scripts in subshell 2020-09-07 10:29:18 +02:00
Finn Stutzenstein 7446effe0f
Added missing client part for cookie checking on login 2020-09-07 08:36:02 +02:00
Emanuel Schütze fb27f8ce8a
Merge pull request #5519 from tsiegleauq/fix-jitsi-password-doc
Change jitsi_password to jitsi_room_password
2020-09-04 15:10:09 +02:00
Emanuel Schütze 792f0e5d06
Merge pull request #5543 from tsiegleauq/adjust-live-conf-perms
Adjust live stream permission
2020-09-04 15:01:39 +02:00
Emanuel Schütze 392c32fd92
Merge pull request #5544 from tsiegleauq/firefox-80-state-issues
Fix Firefox indexedDB state change issue
2020-09-04 14:43:47 +02:00
Sean 28878a0b12 Fix Firefox indexedDB state change issue
Firefox ignores the state change of the conf state
after reloading
2020-09-04 14:19:50 +02:00
Sean 059ace3a11 Adjust live stream permission
New rules to show the live stream and jitsi bar
2020-09-04 14:14:36 +02:00
Emanuel Schütze 06974b559e
Merge pull request #5536 from tsiegleauq/pdf-line-number-in-long-lists
PDF line number alignment
2020-09-01 15:47:37 +02:00
Emanuel Schütze 7a1e7c298d
Merge pull request #5530 from FinnStutzenstein/hotfix
Fixed errors in client
2020-09-01 10:06:13 +02:00
Sean ef87f05454 PDF line number alignment
- Aligns line number for long lists
- Better support for changes to the default font
2020-08-31 15:15:00 +02:00
Finn Stutzenstein a329031942
Fixed errors in client 2020-08-31 13:45:59 +02:00
Finn Stutzenstein 0367398cb5
Merge pull request #5535 from FinnStutzenstein/fix-black
Fixing black
2020-08-31 13:41:03 +02:00
Finn Stutzenstein 325c5ea1f4
Fixing black 2020-08-31 13:24:16 +02:00
Emanuel Schütze 9a4f8e1781
Merge pull request #5514 from CatoTH/create-line-number-performance-tweak
Performance tweak for creating line numbers
2020-08-27 09:01:25 +02:00
Emanuel Schütze 38af3d3b8a
Merge pull request #5529 from tsiegleauq/export-dialog-supporter
Add "supporter" to motion export dialog
2020-08-27 08:35:23 +02:00
Emanuel Schütze 4960a8f115
Merge pull request #5516 from tsiegleauq/no-final-may-decide
Hide motion preamble in final state
2020-08-27 08:28:59 +02:00
Sean 0d16b487d5 Add "supporter" to motion export dialog
Allows PDF, CSV and XLSX to export the supporter manually
2020-08-26 15:52:08 +02:00
Sean 756fdc9c66
Merge pull request #5522 from tsiegleauq/clean-submitter-component
Fix selector with in submitter component
2020-08-26 11:05:52 +02:00
Tobias Hößl fcdfad1c2e
Improve performance of line range detection + html2fragment / avoid recalculation of full changeset 2020-08-25 19:53:10 +02:00
Sean 5070069910 Fix selector with in submitter component
Fixes the too small search value selector in the submitter component

fixed the ad-hoc creation
2020-08-24 14:08:58 +02:00
Sean a9c1578ebb Hide motion preamble in final state
If a motion is in final state, the preamble does not get shown in detail
view and pdf
2020-08-24 13:57:09 +02:00
Emanuel Schütze aed17360e6
Merge pull request #5517 from tsiegleauq/motion-projection-controls
Allow motion of non existing change recos
2020-08-21 18:23:08 +02:00
Emanuel Schütze d8f62a05ba
Merge pull request #5520 from tsiegleauq/more-permission-checks
Hide group selector without manage rights
2020-08-21 17:49:04 +02:00
Emanuel Schütze 1b6b70c080
Merge pull request #5521 from tsiegleauq/update-supported-browsers
Update supported browsers
2020-08-21 17:29:35 +02:00
Sean 7bf8e880fd Update supported browsers
Push latest Firefox ESR as latest supported browser
Push opera 70 as latest supported browser
2020-08-21 16:15:50 +02:00
Sean 7af65f790e Hide group selector without manage rights
Fixes a bug where the user group selector was shown even though the user
had not permission to manage the users
2020-08-21 16:09:06 +02:00
Sean 0933bb6abd Change jitsi_password to jitsi_room_password
Fixes false naming in both documentation, template
and docker
2020-08-21 15:46:43 +02:00
Finn Stutzenstein 216e4f00a3
Merge pull request #5440 from FinnStutzenstein/restructure
WIP: Repository restructure
2020-08-21 08:36:27 +02:00
Gernot Schulz 8faa2ad38f
Docker: Add --ask-push option to build.sh 2020-08-21 08:11:16 +02:00
Finn Stutzenstein 9ddf9ddb8c
fixed lost changes 2020-08-21 08:11:16 +02:00
Gernot Schulz 251296f42f
Docker: No longer install Vim in server 2020-08-21 08:11:16 +02:00
Gernot Schulz 9a2d3a3760
Docker: Add SAML configuration
To configure SAML, ENABLE_SAML must be set to True in .env.
Additionally, the following files must be provided in ./secrets/saml/:

  - sp.crt
  - sp.key
  - saml_settings.json

The files will be added as Docker secrets.

Even though saml_settings.json does not contain secret information
per se it is nonetheless added as a secret for simplicity.  Technically,
the file is equally suited to be configured as a "Docker config".

Please note:

  - This patch has not been tested yet.
  - python3-saml's version should probably be pinned.
2020-08-21 08:11:16 +02:00
Gernot Schulz 3cb3ef2974
README: Include production setup info
Now that this repository has become the entry point through which
OpenSlides instances are configured, this patch transfers some relevant
information formerly included in
https://github.com/OpenSlides/openslides-docker-compose/ to this
repository's README file.
2020-08-21 08:11:16 +02:00
Gernot Schulz 2b7e4d3d19
Docker: Add backend variables to .env and templates
This setup chooses to avoid the env_file option available for Docker
Compose files.  Docker has a peculiar way of parsing variables which
makes it, for example, include quotes verbatim.

This is both confusing and incompatible with shells parsing the same
file which is a requirement.  For this reason, the configuration does
not import the complete environment using env_file but assigns variables
explicitly on a need-to-know basis in the YAML file, much like Docker
secrets.

Since the configuration is generated automatically, the burden on users
is the same as with env_file: they only need to edit .env for
customizations.
2020-08-21 08:11:15 +02:00
Gernot Schulz d1640bc98d
Docker: Add .env
This file was copied from
https://github.com/OpenSlides/openslides-docker-compose/
and still needs to be adjusted for the present setup.
2020-08-21 08:11:15 +02:00
Gernot Schulz 1c0724341c
build.sh: More convenient way to push images
Since build.sh now builds more than just two images, individual queries
whether to push each image to a registry may become tedious.  This patch
replaces the queries with a single checklist menu.  After making
a selection, the images get pushed all at once.

In the menu, all images are unchecked by default in order to prevent
accidental uploads.  This, too, may become tedious.  In that case, the
default could be flipped or a new option could be introduced.
2020-08-21 08:11:15 +02:00
Gernot Schulz 418480bff5
build.sh: Make build script more useful
build.sh replaces docker-compose as an image build tool.  Instead, all
OpenSlides services can be built using this script which offers various
important options such as tagging and configurable defaults.

The now-redundant build instructions have been removed from the YAML
templates.

The almost identical server and client build scripts have been made
fully identical.
2020-08-21 08:11:15 +02:00
Gernot Schulz 9c9f268fbf
Docker: Shorten server-db-setup service name 2020-08-21 08:11:15 +02:00
Gernot Schulz f694e9b2c4
Update AUTHORS 2020-08-21 08:11:15 +02:00
Gernot Schulz 774fa4c204
README: Typos, language, formatting 2020-08-21 08:11:15 +02:00
Gernot Schulz 13db5687cb
README: Add Django secret info 2020-08-21 08:11:14 +02:00
Gernot Schulz 63c4bc3ff7
build.sh: Build config from template 2020-08-21 08:11:14 +02:00
Gernot Schulz 4f194a8794
Docker: Add a Docker secret for the Django key
We have decided against including an insecure default key with a mere
warning.  Therefore, unlike the admin and user secrets, the availability
of this secret is a hard requirement.  The instance will not be able to
start before a secret has been generated manually or by a management
tool.
2020-08-21 08:11:14 +02:00
Gernot Schulz d48794ae8a
Docker: Add YAML templates
These templates were copied from
https://github.com/OpenSlides/openslides-docker-compose and adapted for
the new server-db-setup service.
2020-08-21 08:11:14 +02:00
Gernot Schulz 683aed56bb
server: Fix exec args in entrypoint 2020-08-21 08:11:14 +02:00
Finn Stutzenstein 030378b48a
Rebase changes for current master 2020-08-21 08:11:14 +02:00
FinnStutzenstein 2bcab5d098
Repository restructure
- moved all server related things into the folder `server`, so this
configuration is parallel to the client.
- All main "services" are now folders in the root directory
- Added Dockerfiles to each service (currently server and client)
- Added a docker compose configuration to start everything together.
Currently there are heavy dependencies into https://github.com/OpenSlides/openslides-docker-compose
- Resturctured the .gitignore. If someone needs something excluded,
please add it to the right section.
- Added initial build setup with Docker and docker-compose.
- removed setup.py. We won't deliver OpenSlides via pip anymore.
2020-08-21 08:11:13 +02:00
Finn Stutzenstein 2c85bb28f1
Merge pull request #5504 from tsiegleauq/demo-mode
Add demo mode
2020-08-21 08:10:45 +02:00
Sean 2b55388870 Allow motion of non existing change recos
Allows to project any version of the motions, event if they do not yet
exist.
Gives the user more control about the content they want to project.
Currently, if a motion has no logical changed version, they would
always project the original version which does not automatically
update if a changed version exists. This behaviour would require the
user to update their current projection
2020-08-20 13:22:47 +02:00
Sean fbf424e570
Add demo mode
Adds a demo mode in the settings.py to prevent certain obvious
kinds of vandalism on public openslides testing instances
2020-08-17 07:25:53 +02:00
Finn Stutzenstein 2e8e32454e
Merge pull request #5508 from FinnStutzenstein/restartPostgresIdSequence
Fixed errors while creating countdown due to postgres id sequences
2020-08-14 11:15:09 +02:00
Finn Stutzenstein 389a244615
Fixed errors while creating countdown due to postgres id sequences 2020-08-14 10:30:33 +02:00
Emanuel Schütze a46d8ec7ad
Merge pull request #5506 from tsiegleauq/update-to-tinymce-5.4.1
Update TinyMCE and TinyMCE angular
2020-08-13 20:03:02 +02:00
Sean b59c69e086 Update TinyMCE and TinyMCE angular
Updates TinyMCE and TinyMCE angular to the latest version
2020-08-13 12:27:14 +02:00
Emanuel Schütze 2b3766b758
Merge pull request #5502 from tsiegleauq/enter-animation-without-css
Replace meeting room keyframe animation
2020-08-12 18:43:50 +02:00
Sean c0f5c7b548 Replace meeting room keyframe animation
Replaces the meeting room keyframe css animation with anuglar
animations.
The css keyframe animation declaration was
"optimized away" on prod build
2020-08-12 18:18:04 +02:00
Emanuel Schütze c6abbb629e
Merge pull request #5505 from tsiegleauq/multiple-file-download
Download mutliple files as zip
2020-08-12 17:13:41 +02:00
Emanuel Schütze a40657e153
Merge pull request #5495 from FinnStutzenstein/redisConnectionError
Ping redis connection when popped from pool
2020-08-12 17:00:13 +02:00
Sean e75573e139 Download mutliple files as zip
Adds the possitibility to download folders
and multiple files as zip.
2020-08-12 15:24:37 +02:00
Emanuel Schütze 5f5f704057
Merge pull request #5498 from tsiegleauq/jitsi-meet-api-update
Update jitsi-meet external api
2020-08-12 15:05:29 +02:00
Emanuel Schütze b726801747
Merge pull request #5500 from tsiegleauq/crate-users-svc
Add "create user" to more search value selectors
2020-08-12 15:00:55 +02:00
Emanuel Schütze a48592af50
Merge pull request #5497 from tsiegleauq/fix-parent-motion-title-change-error
Cleaner pdf getUnifiedChanges solution
2020-08-12 14:49:33 +02:00
Emanuel Schütze 72a53c5cd0
Merge pull request #5501 from FinnStutzenstein/fixes
Fixed poll required users and motion state extension selector
2020-08-12 14:43:25 +02:00
Finn Stutzenstein d682d0d134
Fixed poll required users and motion state extension selector 2020-08-11 13:21:51 +02:00
Sean bfe72497cd Add "create user" to more search value selectors
Adds the "create new user" function to more search value
selectors.
2020-08-11 12:15:47 +02:00
Finn Stutzenstein c6bc5978e2
Ping redis connection when popped from pool 2020-08-10 16:31:38 +02:00
Sean 65ee468c21 Update jitsi-meet external api
Updates jitsi-meet external api the the current version
Hide "security" and "invite" in jitsi-iFrame
2020-08-10 15:37:14 +02:00
Sean 09a10c7e92 Cleaner pdf getUnifiedChanges solution
Fixes a bug where cercain amendments where causing an
"titleChange of undefined" error
2020-08-10 14:17:43 +02:00
Finn Stutzenstein ccc3e38427
Merge pull request #5494 from manuelgrabowski/patch-1
Fix typo
2020-08-10 10:06:36 +02:00
Manu 8d25f6ae15
Fix typo 2020-08-09 00:21:33 +02:00
Emanuel Schütze 23ae32a758
Merge pull request #5480 from tsiegleauq/amendment-without-parent-motion
Detect if the parent motion was deleted
2020-07-17 16:55:47 +02:00
Emanuel Schütze fbbcd6fa94
Merge pull request #5479 from tsiegleauq/config-amendments-workflow
Add "motions_amendments_workflow" config
2020-07-17 16:51:34 +02:00
Sean 2c17d7b7aa Add "motions_amendments_workflow" config
Adds a config for the default workflow for amendments and maked the
necessary changes to motion detail and amendment wizzard
2020-07-17 16:10:45 +02:00
Sean e268903536 Detect if the parent motion was deleted
Fixes an error where the motion detail page would not open if the parent
motion to an amendment was deleted.
Show a warning if the parent motion to an amendment is missing
2020-07-17 16:08:15 +02:00
Emanuel Schütze 6e2e1ebe7a
Merge pull request #5473 from emanuelschuetze/release3.2
Release 3.2
2020-07-15 16:56:33 +02:00
Emanuel Schütze 30e8f7d87f Updated to version 3.3-master 2020-07-15 16:19:05 +02:00
Emanuel Schütze 9aefb122e6 Release 3.2 2020-07-15 16:16:00 +02:00
Emanuel Schütze 5618c04416 Use twisted[tls] in production.txt to install required packages. 2020-07-15 16:15:39 +02:00
Emanuel Schütze ee344032b7
Merge pull request #5472 from emanuelschuetze/changelog
Updated Changelog for 3.2
2020-07-15 14:15:52 +02:00
Emanuel Schütze 6e80ff5f00 Updated Changelog for 3.2 2020-07-15 12:45:16 +02:00
Emanuel Schütze 47113f14fc
Merge pull request #5470 from tsiegleauq/cannot-click-bg
Fix clicking behind conference bar
2020-07-15 12:43:10 +02:00
Sean 7d912d82de Fix clicking behind conference bar
Fixes an issue with the live stream.
Clicks in the background were falsely cought.
2020-07-14 15:10:01 +02:00
Emanuel Schütze ebf8325ded
Merge pull request #5468 from tsiegleauq/safari-list-views
Fix list views for safari
2020-07-14 14:28:08 +02:00
Emanuel Schütze 03acae26ff
Merge pull request #5465 from tsiegleauq/better-jitsi-icons
Add link to CLOS to meeting room indicator
2020-07-14 14:24:54 +02:00
Emanuel Schütze 271ccdd46a
Merge pull request #5467 from tsiegleauq/pdf-error-free-text-amendment
Fix PDF generation for motion with free amendments
2020-07-14 14:15:47 +02:00
Sean 109fea791d Fix list views for safari
Usually useless hight information fixes rendering issues on safari
browsers
2020-07-14 13:13:49 +02:00
Sean c2bd7c16a9 Fix PDF generation for motion with free amendments
Fixes an issue where motions which had free form amendments were not be
able to render as pdf
2020-07-14 12:34:05 +02:00
Sean 7ded2cd8a1 Add link to CLOS to meeting room indicator
Links the "cannot enter meeting room"-indicator to the CLOS.
Changes the minimize icon
2020-07-14 10:53:02 +02:00
Emanuel Schütze 85a22ed99c
Merge pull request #5329 from tsiegleauq/changelog-3.2
Changelog for 3.2
2020-07-13 14:59:57 +02:00
Sean e2597002e2 Changelog for 3.2 2020-07-12 22:13:20 +02:00
Emanuel Schütze 01ce1409d3
Merge pull request #5463 from emanuelschuetze/translations-20200712
Updated translations (DE, CZ, RU)
2020-07-12 18:04:17 +02:00
Emanuel Schütze 74e3ea119e Updated translations (DE, CZ, RU) 2020-07-12 17:41:06 +02:00
Emanuel Schütze 9e55cb1480
Merge pull request #5462 from tsiegleauq/more-jitsi-improvements
Improve Jitsi UI
2020-07-12 17:22:32 +02:00
Emanuel Schütze 20175a1a6b
Merge pull request #5461 from tsiegleauq/list-of-speaker-slide-fix
Add prefix to topic list of speaker slide
2020-07-12 17:16:53 +02:00
Sean 719d1d1cf1 Improve Jitsi UI
Some slight jitsi/stream look and feel improvements

The "closed door" now has a tooltip "add yourseld to los to enter
conference"
Use "keyboard_hide" to indicate minimize/hide
Hide the potentially obsolete quick controls when the full jitsi dialog
is open
Use the "voice_chat" icon to indicate showing the full jitsi dialog
Remove "hangup" "raise hand" and "help" from the jitsi iframe
Add hangup and leave to the jitsi dialog in replacement of hangup in the
iFrame
The "enter live conference" icon is now highlighted by a fade animation
2020-07-10 16:46:29 +02:00
Sean 2835e746e8 Add prefix to topic list of speaker slide
The topics prefix (number) was missing in the list of speakers slide
2020-07-09 12:56:58 +02:00
Emanuel Schütze a7703a5557
Merge pull request #5454 from tsiegleauq/whole-agenda-slide-misses-top
Add top to agenda projection
2020-07-09 09:25:36 +02:00
Emanuel Schütze da4092768e
Merge pull request #5453 from tsiegleauq/use-a-tag-for-external-jitsi
Use a-tag for external link
2020-07-09 08:31:06 +02:00
Sean 32775b0a2a Add top to agenda projection
Show the agenda title prefix in the whole agenda slide projection
2020-07-09 08:16:57 +02:00
Sean 011c23093f Use a-tag for external link
Allows to left-click, right-click and middle-click the "open external"
button. Left clicking will disconnect from the current jitsi connection
in OpenSlides. Useful for tests and power using, such as multiple jitsi
connections or easier copying the link.
2020-07-09 08:11:39 +02:00
Emanuel Schütze 3063a9e9fc
Merge pull request #5452 from tsiegleauq/tiny-jitsi
Improve Jitsi on mobile
2020-07-09 08:10:23 +02:00
Sean 656fcccee1 Improve Jitsi on mobile
Improves Jitsi and various other stuff for small to smallest devices.
The mobile main action button is a little higher and aligns with the
jitsi bar.
Some mat-cards have extra space to be more jitsi-bar-friendly.
Hides the list filter option on phones
2020-07-08 13:43:54 +02:00
Emanuel Schütze e35b658731
Merge pull request #5456 from emanuelschuetze/fixTypo
Remove debug output
2020-07-08 11:58:46 +02:00
Emanuel Schütze d76d74e225 Remove debug output 2020-07-08 11:43:39 +02:00
Finn Stutzenstein 9eeb287425
Merge pull request #5455 from tsiegleauq/another-travis-fix
Pin isort, repair tests
2020-07-08 07:16:27 +02:00
Sean 5666749e62 Pin isort, repair tests
Pins isort for testing and execute all tests
2020-07-07 16:14:08 +02:00
Finn Stutzenstein eeb97c44fd
Merge pull request #5450 from ApolloLV/patch-1
Update nodeJS to 12.x in Dockerfile
2020-07-03 13:57:55 +02:00
Emanuel Schütze fa1347f611
Merge pull request #5451 from emanuelschuetze/default-workflow
Fixed config value for default workflow
2020-07-03 09:14:14 +02:00
Emanuel Schütze 278b33c2d7 Fixed config value for default workflow 2020-07-02 23:47:26 +02:00
ApolloLV 1cb8ef2d14
Update nodeJS to 12.x in Dockerfile
The Angular CLI requires a minimum Node.js version of either v10.13 or v12.0
2020-07-02 22:25:49 +02:00
Emanuel Schütze ba3c5e07f7
Merge pull request #5449 from emanuelschuetze/translations-20200702
Updated translations
2020-07-02 22:05:25 +02:00
Emanuel Schütze 55f1d02fcc
Merge pull request #5429 from tsiegleauq/main-page-cleanup
Cleanup main routing page and ngrid lists
2020-07-02 22:04:53 +02:00
Emanuel Schütze 378d091dbd
Merge pull request #5448 from tsiegleauq/fix-duration-for-ff-headless
Fix duration service for non chrome browsers
2020-07-02 21:46:38 +02:00
Emanuel Schütze cb8f219163 Updated translations 2020-07-02 21:44:22 +02:00
Emanuel Schütze 66757b04ae
Merge pull request #5446 from tsiegleauq/login-ignore-warning
Add "login anyway" button
2020-07-02 21:38:35 +02:00
Sean 346413fbb0 Fix duration service for non chrome browsers
-0, 0 and other uses of negative values in the duration service hat a
change of producing undesired results.
Added tests and fixed the function
2020-07-02 15:52:31 +02:00
Finn Stutzenstein cb190331f3
Merge pull request #5447 from tsiegleauq/allow-negative-duration
Allow negative duration
2020-07-02 11:43:25 +02:00
Sean 23ee6a2951 Allow negative duration
Allow negative values for durationToString.
The use case is fairly constructed, but now logically correct
2020-07-01 17:44:33 +02:00
Sean f59ce9ef3b
Merge pull request #5444 from FinnStutzenstein/fixDependencyFromCoreToSite
Fixed import of the clos into the operator
2020-07-01 13:26:26 +02:00
Sean f5654f3a8c Add "login anyway" button
Skip browser warning easier.
2020-07-01 12:22:37 +02:00
FinnStutzenstein 4a96aa31c1
Fixed import of the clos into the operator 2020-06-29 09:25:50 +02:00
Emanuel Schütze fab51091b1
Merge pull request #5443 from tsiegleauq/pdf-left-footer
Render left pdf footer image and page number
2020-06-27 12:59:55 +02:00
Emanuel Schütze c1d63b320d
Merge pull request #5442 from tsiegleauq/jitsi-iframe-control-adjustment
Always show the toolbar in jitsi iframe
2020-06-27 12:55:37 +02:00
Sean 988ee0fe93 Render left pdf footer image and page number
Using the web worker, the PDF page number in combination with a left
footer image could not be rendered together.
2020-06-26 14:31:22 +02:00
Sean 3d252060c9 Always show the toolbar in jitsi iframe
Try to prevent that the toolbar hides itself
2020-06-26 10:35:26 +02:00
Emanuel Schütze 6898458695
Merge pull request #5437 from tsiegleauq/another-fake-dialog
Replace jitsi mat dialog
2020-06-25 17:50:39 +02:00
Sean c2a1b62c8b Replace jitsi mat dialog
Replace Jitsis Mat Dialog with an div container
Fixes an issue where observables in jitsi would register multiple times
Clear the IndexedDB on logout
2020-06-25 16:34:36 +02:00
Sean bb10c25974
Merge pull request #5438 from tsiegleauq/clean-deps
Updates some npm deps, fixes travis
2020-06-23 12:28:27 +02:00
Sean fde745530e Updates some npm deps, fixes travis
Another thing for travis
2020-06-23 12:12:01 +02:00
Emanuel Schütze 9a47cff7fa
Merge pull request #5435 from emanuelschuetze/translations20200619
Updated translations
2020-06-19 17:29:04 +02:00
Sean 22a374a150 Cleanup main routing page and ngrid lists
Sets the main container to absolute,
makes it easier to detect the pages height
ngrid lists can dynamically detect the page height using flexbox,
remove external class injection from list-views,
add "spacer-bottom-60" class for the jitsi-container,
add it everywhere where the jitsi container could hide the content.
2020-06-19 16:47:40 +02:00
Emanuel Schütze f70953f454
Merge pull request #5434 from tsiegleauq/fix-poll-progress
Fix poll progress
2020-06-19 16:37:56 +02:00
Emanuel Schütze 435f555559 Updated translations 2020-06-19 16:29:52 +02:00
Sean 9cf602f0c1 Fix poll progress
Fixes a regression in the poll progress.
Poll progress war no longer working for assignments
2020-06-19 13:26:23 +02:00
Emanuel Schütze 2fd4e70b0c
Merge pull request #5433 from tsiegleauq/import-doubled-topics
Allow to import the same topic multiple times
2020-06-18 23:05:03 +02:00
Emanuel Schütze 81b021ab47
Merge pull request #5432 from FinnStutzenstein/fixSaml
Fix SAML default group ids setting
2020-06-18 17:56:50 +02:00
FinnStutzenstein fd371b87e4
Fix SAML default group ids setting 2020-06-18 15:58:19 +02:00
Emanuel Schütze e20c93d445
Merge pull request #5430 from tsiegleauq/stream-jitsi-perms
separate stream permission from jitsi
2020-06-18 15:57:15 +02:00
Sean 55f65576f0 Allow to import the same topic multiple times
Remove checking for duplicated topic names.
Allows to import topics more than once, usefull if you have to import an
agenda over and over again.
2020-06-18 15:51:51 +02:00
Emanuel Schütze d558c293b2
Merge pull request #5424 from jsangmeister/delegate-view-fixes
Fix some delegate view bugs
2020-06-18 15:51:08 +02:00
Joshua Sangmeister 44f1d1e819 Fix some delegate view bugs 2020-06-18 15:26:50 +02:00
Sean 677595fe5b
Merge pull request #5431 from tsiegleauq/dark-theme-improvements
Improve dark themes
2020-06-18 13:35:17 +02:00
Sean 912a528f8a Improve dark themes
Add better contrast to dark themes on various instances
Add yellow as accent color for red themes
2020-06-18 13:11:45 +02:00
Sean 9feaa59ebb Seperate stream permission from jitsi
Allows jitsi conferences without stream permission,
allowing detailed speration from users who can jitsi streams and see
stream
2020-06-18 12:06:59 +02:00
Emanuel Schütze b712af2d6d
Merge pull request #5427 from tsiegleauq/amendments-without-id
Use title for amendments if an id does not exist
2020-06-17 15:56:37 +02:00
Emanuel Schütze 81c2df3458
Merge pull request #5428 from FinnStutzenstein/fixAsgirefVersion
Use newer asgiref release than the broken 3.2.8 one
2020-06-17 15:51:02 +02:00
FinnStutzenstein 6a59e678a9
Use newer asgiref release than the broken 3.2.8 one 2020-06-17 15:38:07 +02:00
Sean 00e644292d Use title for amendments if an id does not exist
Also some slight head-bar cleanups
2020-06-17 11:08:22 +02:00
Emanuel Schütze b43151fd59
Merge pull request #5425 from tsiegleauq/motion-csv-impexp
Export motion id latest
2020-06-16 22:17:04 +02:00
Sean fbbc4389fb Export motion id latest
Put the motion id to the end of all export used.
Solves the issue that users cannot re-import CSVs if they export them
with sequential numbers
2020-06-16 21:35:24 +02:00
Emanuel Schütze d53e85b853
Merge pull request #5423 from emanuelschuetze/rename-permission
Rename and check "can see extra data" permission.
2020-06-16 21:15:56 +02:00
Emanuel Schütze 68c77fe52c Rename and check "can see extra data" permission. 2020-06-16 21:00:37 +02:00
Sean bc1373b696
Merge pull request #5416 from tsiegleauq/solarized-dark-theme
Enhance dark theme
2020-06-16 13:25:43 +02:00
Sean b9fbf4209b Cleanup theming related code
Enhance color usage, add more default themes, add solarized theme
2020-06-16 12:56:08 +02:00
Sean ec2ec08333
Merge pull request #5422 from tsiegleauq/some-python-updates
Fix python 3.6 and 3.7 tests
2020-06-16 12:50:27 +02:00
Sean 958f0fb786 Fix python 3.6 and 3.7 tests
Hotfix for python tests
2020-06-16 12:36:25 +02:00
Emanuel Schütze ac4cb39105
Merge pull request #5419 from tsiegleauq/agenda-slide-distance
Add more distance for topics in agenda slide
2020-06-15 15:12:52 +02:00
Emanuel Schütze b5bc855dfe
Merge pull request #5417 from tsiegleauq/agenda-numbered-topics-pdf
Prevent double "TOP" in agenda PDF
2020-06-15 15:10:22 +02:00
Sean 1f876ec6dd Prevent double "TOP" in agenda pdf
Also: changes the definition of "getTitle" and "getAgendaTitle" to be more
consistent and easier to guess. getTitle will simply return the title, while getAgendaTitle
returns the title with the agenda-prefix
2020-06-12 16:18:57 +02:00
Emanuel Schütze c1605929e9
Merge pull request #5410 from tsiegleauq/better-login-page
Add better login page
2020-06-12 15:13:41 +02:00
Emanuel Schütze 2ea95937d7
Merge pull request #5420 from tsiegleauq/user-set-present-link-dup
Remove presence link in user multi select mode
2020-06-12 15:09:50 +02:00
Emanuel Schütze a80915397d
Merge pull request #5418 from FinnStutzenstein/fixSamlUserCreation
Fix Saml II and saml default groups
2020-06-12 14:55:51 +02:00
Sean f06f2dee9f Remove presence link in user multi select mode
Removes the link to "users/presence" while in the user lists multi
selection view. The link was duplicated to be present in both multi
select and single selct view
2020-06-12 14:51:05 +02:00
Sean 33ba8c4628 Add more distance for topics in agenda slide
Makes the projection of the agenda looks cleaner and more relaxed
2020-06-12 14:43:40 +02:00
FinnStutzenstein dc7dfc1936
Fix Saml II and saml default groups 2020-06-12 14:37:43 +02:00
Sean 7d3280707d
Merge pull request #5414 from tsiegleauq/support-chrome-80
Lower chrome/chromium support version to version
2020-06-12 11:08:26 +02:00
Sean 13cbece9d9 Lower chrome/chromium support version to version
Lowers the supported version for chrome and chromium based browsers to
80. Keep in mind that you can always skip the checks!
2020-06-12 10:50:36 +02:00
Sean 5ed9c88ae4 Add better login page
Themes now cover the login page
more responsive on both large, small and smalest screens
the footer behaves like a footer
2020-06-12 10:23:10 +02:00
Finn Stutzenstein 5239e40858
Merge pull request #5412 from FinnStutzenstein/fixMigrationPath
Fix migration path for non-existing fonts
2020-06-12 08:13:11 +02:00
FinnStutzenstein 081f13e2ff
Fix migration path for non-existing fonts 2020-06-12 07:26:29 +02:00
Emanuel Schütze 438b3558bf
Merge pull request #5411 from emanuelschuetze/translations-20200511
Updated translations.
2020-06-11 17:46:13 +02:00
Emanuel Schütze ff4324117e Updated translations. 2020-06-11 17:23:42 +02:00
Emanuel Schütze f590994875
Merge pull request #5403 from tsiegleauq/blacklist-browsers
Catch unsupported browsers
2020-06-11 15:42:45 +02:00
Emanuel Schütze 2cdb3f4ef3
Merge pull request #5407 from tsiegleauq/assignment-pdf-reduce
Fix assignment pdf results
2020-06-11 15:10:36 +02:00
Emanuel Schütze e3c1d5432b
Merge pull request #5408 from tsiegleauq/monospace-font-fix
Add roboto-condensed-bold as default
2020-06-11 15:04:28 +02:00
Sean 9387a3f394 Catch unsupported browsers
unspoorted browsers trying to access the login mask will be forwarded to
an info page.
The info page shows that the browser is not suppoted and hints the smallest
supported version of their current browser.
As it works best and might prevent some support calls, I added an hint
for chrome as the favored browser by OpenSlides (debateable)

To update/downgrade the supported versions, simply edit the enum in the
service.

If we cannot detect the browser, we assume it was supported.
2020-06-11 14:39:14 +02:00
Sean 1853028cf0 Add roboto-condensed-bold as default
Fixes a severe regression. New databases could not generate any PDF or use
the countdown.
2020-06-11 14:30:01 +02:00
Sean 56b47214bc Fix assignment pdf results
Filters out results unfitting to the current election method.
2020-06-11 14:12:10 +02:00
Emanuel Schütze 43b13e314e
Merge pull request #5376 from tsiegleauq/integrate-streams
Integrate streams
2020-06-11 13:53:04 +02:00
Sean 0d9738b72d Integrate streams
Integrate live streaming inside the jitsi/rtc components.
Live streaming works without jitsi, but is using the same components for
a fluid integration.
A streaming URL can be set in the settings page.
Users EITHER consume the live stream OR are presend in a jitsi live
conference.

To consume both the live stream and the jitsi conference, users may use
a dedicated jitsi tab in their session.

The jitsi users can be restricted to only allow thouse with the right
the manage speakers or being present on the "current list of speakers",
automatically simulating a virtual plenum
2020-06-11 11:20:00 +02:00
Emanuel Schütze 47795b57d1
Merge pull request #5405 from FinnStutzenstein/fixSamlUserCreation
Fix the creation of saml users
2020-06-10 15:32:03 +02:00
FinnStutzenstein 7d455b34f5
Fix the creation of saml users
When created, they are put into the cache.
Also allows bulk-delete for saml users.
2020-06-10 15:06:13 +02:00
Emanuel Schütze fbb0be6fb4
Merge pull request #5404 from emanuelschuetze/whitelist
Updated server whitelist of allowed styles.
2020-06-09 23:15:17 +02:00
Emanuel Schütze acf499f6e1
Merge pull request #5378 from jsangmeister/monospace-countdown
Replaces the countdown font with a monospaced one
2020-06-09 23:15:06 +02:00
Emanuel Schütze 79e3780a26 Updated server whitelist of allowed styles.
added 'vertical-align'
2020-06-09 22:59:41 +02:00
Joshua Sangmeister e653021eff Add a configurable monospace font for the countdown
use Roboto Condensed bold by default
2020-06-09 22:54:31 +02:00
Emanuel Schütze aeb893a8d9
Merge pull request #5399 from tsiegleauq/normal-amendments-in-list
Fix error for freely editable amendments
2020-06-09 21:48:13 +02:00
Emanuel Schütze 82efbe76bd
Merge pull request #5356 from flowluap/patch-2
added proxy pass to nginx configuration file
2020-06-09 21:22:08 +02:00
Emanuel Schütze ff9125fb9f
Merge pull request #5401 from tsiegleauq/assignment-poll-chart-abstain
Hide abstain bar in assignment polls chart
2020-06-09 21:20:54 +02:00
Sean d4f211e344 Fix error for freely editable amendments
Recent changes to amendment had various bugs.
This one regarded the amendment list, where amendments without amendmend
paragraphs returned several errors.
2020-06-09 21:16:04 +02:00
Emanuel Schütze 4673c741e9
Merge pull request #5402 from jsangmeister/fix-tiny-mce
Fix change detection for Tiny MCE
2020-06-09 20:56:29 +02:00
Emanuel Schütze e1345cb808
Merge pull request #5398 from CatoTH/bugfix-non-paragraph-based-amendments
Bugfix non paragraph based amendments
2020-06-09 20:53:03 +02:00
Joshua Sangmeister bf35c55956 Fix change detection for Tiny MCE 2020-06-09 13:14:05 +02:00
Sean 6efdc9a3dd Hide abstain bar in assignment polls chart
If the percent base does not include "abstain", the grey abstain bar
will not be shown in the assignment poll chart
2020-06-09 12:47:38 +02:00
Tobias Hößl cadef6d42e
Don't show amendment CR-diff-view if no CRs exist 2020-06-07 15:02:35 +02:00
Tobias Hößl bc3b8be78d
Increase recalculation performance by additional caching 2020-06-07 11:44:07 +02:00
Tobias Hößl 18bc495bd8
Bugfix: errors with non-paragraph-based amendments 2020-06-07 10:54:57 +02:00
Emanuel Schütze 8451cd2d88
Merge pull request #5395 from emanuelschuetze/translation-20200604
Updated translations
2020-06-04 17:06:55 +02:00
Emanuel Schütze 5072e66a7e Updated translations 2020-06-04 17:06:08 +02:00
Emanuel Schütze 3109337004
Merge pull request #5394 from tsiegleauq/jitsi-iframe-dialog
Show Jitsi iFrame in Dialog
2020-06-04 16:37:01 +02:00
Sean 3ca4714812 Show Jitsi iFrame in Dialog
Replace the external link button with a (real) Dialog containing the
jitsi iFrame.
The dialog can be hidden but not entirly closed.
Replace all dialogService.closeAll() functions by closing the specific
dialog rather than all of them.
2020-06-04 16:29:35 +02:00
FinnStutzenstein 429473dcf9
Merge branch 'pollprogressCd' 2020-06-04 15:16:20 +02:00
FinnStutzenstein c186a575f6
Fixed incomplete autoupdates
A conceptional issue in `get_data_since` leads to incomplete
autoupdates. The behaviour was long time in the code, but only with a
lot of autoupdates (high concurrency) and the autoupdate delay I noticed
the bug during testing. I'm sure, that this issue might have caused
incomplete autoupdates (which the user may experience as "lost
autoupdates") in previous productive instances. Instead of quering a
range (from_change_id to to_change_id) one now can only get data from a
change id up to the max change id in the element cache. The max change
id gets now returned by `get_data_since`.

I also added a get_all_data with the capability of returning the
max_change_id at this point of time.

As a usability-"fix" (more like a fix the result of a bug, not the bug
itself) a refresh button for a poll was added, that issues an autoupdate
for the poll and all options.
2020-06-04 15:16:05 +02:00
Emanuel Schütze c4f482b70c
Merge pull request #5391 from jsangmeister/update-poll-slide
Fixes motion poll slide icon size & rounding
2020-06-03 19:16:29 +02:00
Emanuel Schütze 0275df6ab2
Merge pull request #5392 from tsiegleauq/vote-await-server-answer
Wait for server while voting
2020-06-03 17:35:19 +02:00
Sean dced8fbcc7 Wait for server while voting
Blocks voting state changes and prevents the user from sending multiple
vote values while the server is not responding during voting
2020-06-03 14:53:31 +02:00
Joshua Sangmeister f4907e6604 Fixes motion poll slide icon size & rounding 2020-06-02 22:41:23 +02:00
Emanuel Schütze d7408b40f9
Merge pull request #5390 from jsangmeister/hide-amendments-when-deactivated
Hides amendments entry in menu if deactivated
2020-06-02 22:26:14 +02:00
Finn Stutzenstein e215a23b80
Merge pull request #5389 from jsangmeister/reverse-motion-relations
Adds reverse relations for motions and blocks
2020-06-02 16:26:07 +02:00
Joshua Sangmeister a31fa7dda6 Adds reverse relations for motions and blocks 2020-06-02 14:44:56 +02:00
Emanuel Schütze 7665634d42
Merge pull request #5375 from FinnStutzenstein/autoupdatePerformance
Autoupdate performance
2020-05-29 17:31:32 +02:00
Finn Stutzenstein 9c7b9b0920
Merge pull request #5387 from FinnStutzenstein/hugeautoupdatesInRedis
Inserting changed and deleted elements into redis in batches (fixes #5386)
2020-05-29 15:48:21 +02:00
FinnStutzenstein 0eee839736
Small improvements and first attempt to make to poll progress responsive
to massive autoupdates. The "optimization" didn't help, so this has to
be continued in another PR.
2020-05-29 15:46:19 +02:00
Joshua Sangmeister a84bfccd07 Hides amendments entry in menu if deactivated 2020-05-28 15:26:56 +02:00
FinnStutzenstein 600b9c148b
Inserting changed and deleted elements into redis in batches (fixes #5386) 2020-05-28 14:00:57 +02:00
FinnStutzenstein d8b21c5fb5
(WIP) Ordered and delayed autoupdates:
- Extracted autoupdate code from consumers
- collect autoupdates until a AUTOUPDATE_DELAY is reached (since the first autoupdate)
- Added the AUTOUPDATE_DELAY parameter in the settings.py
- moved some autoupdate code to utils/autoupdate
- moved core/websocket to utils/websocket_client_messages
- add the autoupdate in the response (there are some todos left)
- do not send autoupdates on error (4xx, 5xx)
- the client blindly injects the autoupdate in the response
- removed the unused autoupdate on/off feature
- the clients sends now the maxChangeId (instead of maxChangeId+1) on connection
- the server accepts this.
2020-05-27 16:05:27 +02:00
Emanuel Schütze dcf5d5316c
Merge pull request #5384 from FinnStutzenstein/logErrorsOnServer
Log APIExceptions on the server
2020-05-25 14:52:34 +02:00
FinnStutzenstein fba043fedf
Log APIExceptions on the server 2020-05-25 09:16:37 +02:00
Emanuel Schütze 762d1f9912
Merge pull request #5382 from topelrapha/master
Fix tinymce version to 5.2.2
2020-05-23 10:37:34 +02:00
Raphael Topel 60621bf4d0 Fix tinymce version to 5.2.2 2020-05-22 22:19:45 +02:00
FinnStutzenstein bf88cea200
Rewrite projector code to be cache friendly
This speeds up the requests/seconds by a factor of 100
2020-05-22 15:23:54 +02:00
FinnStutzenstein 23842fd496
Synchronize autoupdate code in the client
If autoupdates are too fast, the first one may not be fully executed. Especially when the maxChangeId is not yet updated, the second Autoupdate will trigger a refresh, because for the client it "lay in the future". This can be prevented by synchronizing the autoupdate-handling code with a mutex.
2020-05-22 15:23:53 +02:00
Sean 4ac7b1eb4b
Merge pull request #5380 from FinnStutzenstein/closService
Fix the CLOS service to trigger on CLOS updates
2020-05-20 18:29:11 +02:00
FinnStutzenstein 17049cc0f3 Fix the CLOS service to trigger on CLOS updates
additionally fixed some naming issues
2020-05-20 18:09:50 +02:00
Emanuel Schütze fd026e165f
Merge pull request #5377 from jsangmeister/migrate-deprecated-slides
Adds migration to remove deprecated slides
2020-05-19 14:35:07 +02:00
Joshua Sangmeister e52697ad7e Adds migration to remove deprecated slides 2020-05-19 12:55:47 +02:00
Emanuel Schütze 0c93c44f0d
Merge pull request #5374 from emanuelschuetze/translations-20200514
Updated translations
2020-05-14 20:09:36 +02:00
Emanuel Schütze 4b95398ac1
Merge pull request #5371 from jsangmeister/jitsi-settings
Added jitsi settings to template and readme
2020-05-14 19:59:28 +02:00
Emanuel Schütze 37c3ac5aff Updated translations 2020-05-14 19:52:18 +02:00
Joshua Sangmeister 3f03f27cdb added jitsi settings to template and readme 2020-05-14 19:41:35 +02:00
Emanuel Schütze f694e2355d
Merge pull request #5373 from tsiegleauq/assignment-poll-card-with-table
Show assignment poll result table instad of chart
2020-05-14 19:36:43 +02:00
Sean 3820e09b89 Show assignment poll result table instad of chart
Replaces the assignment result chart with the result table from the
detail view and projector
2020-05-14 16:40:19 +02:00
Emanuel Schütze 1ca3196a75
Merge pull request #5370 from tsiegleauq/tags-for-agenda
Add tags for agenda items
2020-05-14 15:23:55 +02:00
Emanuel Schütze ee6076f168
Merge pull request #5372 from tsiegleauq/unset-gender
Allow unset gender in user form
2020-05-14 15:18:00 +02:00
Sean b6bb1fe767 Add tags for agenda items
Adds tags for agnda items, adds tag filter in agenda list view, server
changes, client relations, adjust agenda csv exporter
2020-05-14 15:07:59 +02:00
Sean 7609a0c3db Allow unset gender in user form
Fixes a bug that prevented the form from unsetting the gender value
2020-05-14 14:53:44 +02:00
Emanuel Schütze b090e46b66
Merge pull request #5359 from tsiegleauq/clean-projector-permissions
Add permission as lookup object
2020-05-14 14:48:37 +02:00
Emanuel Schütze ca039860f7
Merge pull request #5365 from jsangmeister/default-voting-type
Added config for default poll type
2020-05-14 13:02:51 +02:00
Sean fca4154bb5 Add permission as lookup object
Adds a lookup object for a more solid approach to handling permissions.
Permissions are now an actual type rather than just a string.
2020-05-14 10:12:22 +02:00
Emanuel Schütze 621d0f4e1a
Merge pull request #5366 from tsiegleauq/motion-not-switching-state
Change motion cr mode view behavior
2020-05-14 08:25:01 +02:00
Emanuel Schütze d1b6ed8d29
Merge pull request #5367 from tsiegleauq/hide-submitter-in-projector
Hide the submitter-box in motion slide if empty
2020-05-14 08:22:28 +02:00
Emanuel Schütze 8058a4d695
Merge pull request #5369 from FinnStutzenstein/fixProjectorSubtitle
Fix projector subtitles for items without agenda items
2020-05-14 08:20:55 +02:00
Sean 853bc31e21 Change motion cr mode view behavior
if the default cr mode is 'original' nothing really happens
if the default cr mode is 'changed' you will stay in original view after
creating cr's. That's due to the autoupdate limitation. Changing this
would mean that you cannot change the view anymore
if the default cd mode is 'diff' you will switch to diff view after
creating a cr. It seems that the diff view has an automatic fallback to
the original view if no cr exists, perhaps Tobias knows more about that.
If the default cr mode if 'final' you will try to change to
mod-final-version if it exists. If there is no change-reco, you will
fall back to original version.
2020-05-14 07:42:25 +02:00
Joshua Sangmeister fa63ef0307 added config for default poll type 2020-05-14 07:38:14 +02:00
Sean fef3cf41bb Hide the submitter-box in motion slide if empty
Hides the "submitter" text and corresponding boxes if they are empty
2020-05-14 07:37:18 +02:00
FinnStutzenstein 34d85c996c Fix projector subtitles for items without agenda items 2020-05-14 07:32:44 +02:00
Emanuel Schütze b7b27d2e88
Merge pull request #5368 from jsangmeister/fix-flake
Fixed formatting after flake update
2020-05-14 07:31:15 +02:00
Joshua Sangmeister b0bf4990f8 fixed formatting after flake update 2020-05-13 16:16:03 +02:00
Emanuel Schütze 0ee70b7434
Merge pull request #5363 from emanuelschuetze/translation-20200511
Updated translations
2020-05-11 15:45:29 +02:00
Emanuel Schütze 9938a68865 Updated translations 2020-05-11 15:33:58 +02:00
Sean 3e19840b08
Merge pull request #5352 from tsiegleauq/speaker-list-change-detection
Manual cd for list of speakers
2020-05-11 11:19:55 +02:00
Sean 7a31cff612
Merge pull request #5347 from GabrielInTheWorld/statistics
Create statistics of closed list of speakers
2020-05-11 11:07:53 +02:00
GabrielMeyer e7de593b54 Create statistics of closed list of speakers 2020-05-11 07:56:50 +02:00
Sean 602d1c8e7b Manual cd for lost of speakers
Adds better cd for list of speakers
2020-05-08 12:20:15 +02:00
Emanuel Schütze c5dd2ea261
Merge pull request #5348 from CatoTH/toggle-show-all-amendments
Toggle to show all amendments in diff view
2020-05-08 08:50:47 +02:00
Paul Wolf 8796eeeb62
added proxy pass to nginx configuration file
prevent request hostname being localhost:8000 | passthrough server hostname from nginx
2020-05-07 07:42:48 +02:00
Tobias Hößl 25839ea709
Toggle to show all amendments in diff view 2020-05-06 20:28:19 +02:00
Emanuel Schütze ea830f53b0
Merge pull request #5355 from FinnStutzenstein/SamlInfitySpinnerFix
fixed endless spinner on SAML login
2020-05-06 19:20:28 +02:00
FinnStutzenstein c643a233ae
fixed endless spinner on SAML login 2020-05-06 18:23:38 +02:00
Emanuel Schütze 5aa895bda2
Merge pull request #5354 from FinnStutzenstein/fixUnnenessaryBrokenLock
Fix unnecessary and unfunctional lock for production usage with gunicorn
2020-05-06 17:29:28 +02:00
FinnStutzenstein 2910701422
Fix unnecessary and unfunctional lock for production usage with gunicorn 2020-05-06 16:57:50 +02:00
Sean 1e2395c1e6
Merge pull request #5351 from tsiegleauq/ios-touch-callout
Fix poll results under iOS
2020-05-06 15:07:34 +02:00
Sean fede11b59f Fix poll results under iOS
Fixes an issue on iOS devices regarding click-bindungs in structural
loops. iOS devices did not respond to touch inputs in the given view
2020-05-06 14:32:46 +02:00
Emanuel Schütze 77cf3e2785
Merge pull request #5321 from tsiegleauq/projector-indicator-on-agenda
Projector indicator list view tables
2020-05-05 17:50:27 +02:00
Sean 4e624384e7 Projector indicator list view tables
Shows a projector indicator in the list view tables.
Width is 24px, just as small as mat-icon needs.
Works in every list view that allows projector buttons (which should
cover everything where an indicator could be demanded)
2020-05-05 16:08:32 +02:00
Emanuel Schütze f9cd3ebd89
Merge pull request #5304 from CatoTH/change-recommendations-for-amendments
Change recommendations for amendments
2020-05-05 15:46:00 +02:00
Emanuel Schütze 6a6e90067a
Merge pull request #5349 from tsiegleauq/tinymce-link-settings
Set tinymce urls to absolute
2020-05-05 15:41:52 +02:00
Sean 1a653c3fa7 Set tinymce urls to absolute
Potentially fixes a deeper TinyMCE issue that causes TinyMCE to remove
important parts of pasted URLs
2020-05-04 17:19:05 +02:00
Tobias Hößl b51787129b
Change recommendations for amendments 2020-05-02 18:40:59 +02:00
Emanuel Schütze e0069f734a
Merge pull request #5346 from emanuelschuetze/translations-20200430
Updated translations
2020-04-30 19:29:59 +02:00
Emanuel Schütze f415fd0554 Updated translations 2020-04-30 17:43:48 +02:00
Emanuel Schütze c6836ff6c5
Merge pull request #5294 from GabrielInTheWorld/sort-speakers
Changes workflow for sorting speakers
2020-04-30 16:42:52 +02:00
GabrielMeyer 4a24da12da Changes workflow for sorting speakers 2020-04-30 15:58:49 +02:00
Emanuel Schütze 3842f66877
Merge pull request #5330 from tsiegleauq/mark-first-time-speaker
Show first contribution hint in list of speaker
2020-04-30 15:03:55 +02:00
Sean 38ee6bb2f1 Show first contribution hint in list of speaker
Shows a hint in the list of speakers if a speaker contributes for the
first time.
2020-04-30 14:06:37 +02:00
Emanuel Schütze a47285c0ff
Merge pull request #5309 from tsiegleauq/integrate-jitsi-meet-client
Integrate jitsi-meet in OpenSlides
2020-04-30 13:05:12 +02:00
Sean 1439444b2e Integrate jitsi-meet in OpenSlides
- minimal jitsi client in the bottom right of the screen
- can be shown and hidden like a messenger
- allows to mute, unmute, call, stop call
- automatically connects to a conference
- shows a list of users connected to the room
- jitsi iframe is currently hidden
- "open in jitsi meet" link
- only one connection will be opened if using multiple tabs
- JITSI_DOMAIN and JITSI_ROOM_NAME must be present in the settings.py
- config variables in settings
2020-04-30 11:07:32 +02:00
Emanuel Schütze cce76118c3
Merge pull request #5344 from FinnStutzenstein/voteWeight
Removed vote weight from votes_cast
2020-04-30 10:54:28 +02:00
FinnStutzenstein aa1a2cec89
Removed vote weight from votes_cast 2020-04-30 08:10:39 +02:00
Emanuel Schütze 46d0bbd8f5
Merge pull request #5341 from FinnStutzenstein/loadConfigsBeforeModels
Load configs before models
2020-04-27 10:00:53 +02:00
FinnStutzenstein b78372f8a3
Load configs before models 2020-04-27 09:41:23 +02:00
Emanuel Schütze fd9b8b1c5c
Merge pull request #5340 from emanuelschuetze/translations-20200424
Updated German translations.
2020-04-24 14:40:40 +02:00
Emanuel Schütze 7a25a2496d Updated German translations. 2020-04-24 14:28:26 +02:00
Emanuel Schütze ddfe7d0c5a
Merge pull request #5295 from GabrielInTheWorld/duplicate-topics
Duplicates single and multiple items in the agenda
2020-04-24 14:03:44 +02:00
FinnStutzenstein 152401a9a3
Duplicates single and multiple topics in the agenda 2020-04-24 12:34:22 +02:00
Emanuel Schütze 2057150076
Merge pull request #5322 from FinnStutzenstein/delete-all-speakers
delete all speakers of all lists of speakers
2020-04-24 12:25:49 +02:00
Emanuel Schütze cb52347354
Merge pull request #5328 from FinnStutzenstein/projectorSubtitles
Subtitles for projected elements in the projector detail view
2020-04-24 12:12:22 +02:00
Emanuel Schütze 3169e4f30b
Merge pull request #5336 from FinnStutzenstein/fixVoting
Fixed validation of options in asignment polls
2020-04-24 12:10:04 +02:00
FinnStutzenstein 4221351223 Fixed validation of options in asignment polls
Also fixed #5334
2020-04-24 09:31:39 +02:00
Emanuel Schütze 0c6da9799c
Merge pull request #5335 from GabrielInTheWorld/fixTopicPreview
Fixes preview of topics in global search
2020-04-24 09:13:36 +02:00
Emanuel Schütze a71e36c861
Merge pull request #5331 from emanuelschuetze/translations-20200423
Updated German translations
2020-04-24 08:55:39 +02:00
GabrielMeyer 41b9065807 Fixes preview of topics in global search 2020-04-23 23:36:10 +02:00
Emanuel Schütze 527f947143 Updated German translations 2020-04-23 20:35:59 +02:00
FinnStutzenstein c8faa982ac Subtitles for projected elements in the projector detail view 2020-04-23 16:01:18 +02:00
FinnStutzenstein 38486463bc delete all speakers of all lists of speakers 2020-04-23 09:43:04 +02:00
Finn Stutzenstein 6a488eb78e
Merge pull request #5323 from tsiegleauq/linter-prettier-updates
Update linting rules
2020-04-22 17:32:42 +02:00
Emanuel Schütze 0aef3f79ce
Merge pull request #5305 from tsiegleauq/weight-votes
Implement vote weight in client
2020-04-22 17:28:02 +02:00
Sean 97c2299aec Implement vote weight in client
Implements vote weight in client
The user detail page has a new property
change deserialize to parse floats
change "yes"-voting to send "Y" and "0" instead of "1" and "0"
add vote weight to user list, filter, sort
add vote weight to single voting result
votesvalid and votescast respect the individual vote weight
fix parse-poll pipe and null in pdf
2020-04-22 16:54:50 +02:00
Sean e702843f07 Update linting rules
Includes strickt(er) tslint line-length of 120, with an exception
for import statements (prettier does not like these)
2020-04-22 16:24:08 +02:00
Emanuel Schütze 0f3d07f151
Merge pull request #5324 from tsiegleauq/another-round-of-python-travis-fixes
Set version of pytest-django and pytest-asyncio
2020-04-22 16:09:23 +02:00
Sean aa097ee689 Set version of pytest-django and pytest-asyncio
Apparently, updates in these two libraries are not compatible
with out current testing setup
2020-04-22 14:56:25 +02:00
Sean f7a97cf886
Merge pull request #5299 from CatoTH/delete-obsolete-tests
Delete old test files that are reimplemented in Typescript by now
2020-04-21 13:21:16 +02:00
Emanuel Schütze 25f8f42c92
Merge pull request #5320 from sarah-github/sarah-github-typo-settings-rst
typo with brackets in settings.rst for logging config
2020-04-21 12:49:04 +02:00
Sarah 523eb96f9d
typo with brackets 2020-04-20 22:37:01 +02:00
Emanuel Schütze 2c548d2dfb
Merge pull request #5319 from tsiegleauq/fix-admin-self-set-present
Fixes an issue regarding self-set-present
2020-04-20 19:38:11 +02:00
Sean 91d4b3c7af Fixes an issue regarding self-set-present 2020-04-20 19:17:03 +02:00
Emanuel Schütze d210496146
Merge pull request #5293 from GabrielInTheWorld/subline-comment
Adds a third line for comments
2020-04-20 18:09:52 +02:00
Emanuel Schütze 35ce596706
Merge pull request #5317 from tsiegleauq/set_presence_on_userlist
Allow set present on user list if config was set
2020-04-20 17:13:48 +02:00
Tobias Hößl f007e07544
Delete old test files that are reimplemented in Typescript by now 2020-04-20 15:15:00 +02:00
Sean 70aadcdd28
Merge pull request #5307 from GabrielInTheWorld/no-found-button
Adds a 'not found'-button to search-value-selector
2020-04-20 14:52:46 +02:00
Sean 9ffbb39e95 Allow set present on user list if config was set
Depending on "selt self presence" config, allow users to set
themselves as present on the user list
2020-04-20 13:46:14 +02:00
GabrielMeyer 170aa1c8f0 Adds a third line for comments 2020-04-20 07:46:37 +02:00
jsangmeister ad4ed3443a
Merge pull request #5316 from jsangmeister/voting-autoupdate-fix
Fixes the voting autoupdate bug
2020-04-17 16:58:50 +02:00
Joshua Sangmeister 42fbe93314 fixes the voting autoupdate bug 2020-04-17 16:38:38 +02:00
Emanuel Schütze 6cdf9a5582
Merge pull request #5315 from emanuelschuetze/prepare-3.2
Prepare new 3.2 release
2020-04-16 13:55:24 +02:00
Emanuel Schütze 75ebf5bc77 Prepare new 3.2 release 2020-04-16 13:41:56 +02:00
Emanuel Schütze c26ef8c0bb
Merge pull request #5314 from jsangmeister/permissiveHtmlValidation
Adds more permissive html validation for topics and welcome page
2020-04-16 10:57:43 +02:00
Joshua Sangmeister 6eae497abe adds more permissive html validation 2020-04-16 10:26:48 +02:00
Finn Stutzenstein 1570b5b806
Merge pull request #5313 from jsangmeister/fix-user-import
Fixed user import
2020-04-15 13:44:30 +02:00
Emanuel Schütze 537eeadce4
Merge pull request #5312 from jsangmeister/adjustSettingsReadme
Add ENABLE_ELECTRONIC_VOTING to settings readme
2020-04-15 11:09:48 +02:00
Joshua Sangmeister 96ee1c0af3 fixed user import 2020-04-15 10:27:07 +02:00
Joshua Sangmeister 99416e3043 added ENABLE_ELECTRONIC_VOTING to settings readme 2020-04-15 10:15:19 +02:00
Emanuel Schütze 0f8167e39c
Merge pull request #5311 from jsangmeister/fixPseudoanonymize
Fix pseudoanonymize on client
2020-04-15 09:54:21 +02:00
Joshua Sangmeister 9864ff3847 fixed pseudoanonymize on client 2020-04-15 09:42:22 +02:00
Emanuel Schütze a7518ed5b6
Merge pull request #5310 from tsiegleauq/better-category-sorting
Sort motions in categories by inner weight (again)
2020-04-15 09:25:19 +02:00
Sean 5b7bbfd0bb Sort motions in categories by inner weight (again)
Fixes sorting categories by inner weight
2020-04-14 15:01:42 +02:00
Emanuel Schütze b7566fcc69
Merge pull request #5308 from tsiegleauq/sort-categories-by-weight
Sort motion list by category weight
2020-04-08 22:35:31 +02:00
Sean 82c6929a8d Sort motion list by category weight
Sorts the motion list by the weight of the category
rather than by name
2020-04-08 22:22:02 +02:00
GabrielMeyer 35a67017a3 Adds a 'not found'-button to search-value-selector 2020-04-08 11:48:18 +02:00
Finn Stutzenstein 4841343c02
Merge pull request #5303 from FinnStutzenstein/fixVoting
Cleanup for #5300
2020-04-07 10:07:07 +02:00
FinnStutzenstein 7a97aa1b79 Cleanup for #5300 2020-04-07 09:53:16 +02:00
Emanuel Schütze 12bc926b44
Merge pull request #5302 from emanuelschuetze/translations-20200407
Updated translations.
2020-04-07 09:40:02 +02:00
Emanuel Schütze 53b4b1c1f9 Updated translations. 2020-04-07 07:56:51 +02:00
Emanuel Schütze cc372cfba5
Merge pull request #5300 from FinnStutzenstein/fixVoting
Added vote weight and fixed named voting
2020-04-07 07:47:12 +02:00
Joshua Sangmeister b7b8620153 removed race condition & cleanup 2020-04-07 07:27:54 +02:00
FinnStutzenstein 7882ea1a25 Added vote weight and fixed named voting 2020-04-07 07:27:54 +02:00
Sean 04a7ce22fd
Merge pull request #5297 from tsiegleauq/esr-cd
Fix malfunctions in Firefox ESR
2020-04-06 23:34:32 +02:00
Sean 820a47123a Fix malfunctions in Firefox ESR
Various cryptic issues that had no usefull debug output.

ngx-translates "translate" directive was causing Firefox ESR
to jump in the "drainMicroTaskQueue" infinite recursion when
using the directive in the same component as nGrid.

Therefore, I changed all uses of the translate directive
to the pipe (arround 700 or so, regex is my best friend now)

open todo: adjust the linter that we may never use the translate
directive again.

There was another cryptic issue with the current version
of exceljs which was also causing firefox to go crash
when loading a workbook object. It was sufficient to
have any Workbook() function declared in a module to cause
firefox to crash.
2020-04-06 20:36:24 +02:00
Emanuel Schütze 42af962248
Merge pull request #5301 from tsiegleauq/new-extract-function
Update translation extractor
2020-04-06 17:52:16 +02:00
Sean 7b5f2648af Update translation extractor 2020-04-06 17:18:04 +02:00
Sean a1e2c49815
Merge pull request #5234 from tsiegleauq/angular9
Migrate to angular 9
2020-04-01 18:12:34 +02:00
Sean Engelhardt e1acf6e9d6 Update to Anulgar 9
Updates Angular to version 9.1
Updates most-to-all npm components
Removes deprecated components and npm commands
Updates travis node version
Adjust the whole code base to angular 9 standard
Increase TypeScipt version to 3.8
2020-04-01 14:50:15 +02:00
Finn Stutzenstein 83d57e9da7
Merge pull request #5290 from FinnStutzenstein/redisWaitForReplication
Redis: Wait for replication on writes
2020-04-01 13:32:11 +02:00
FinnStutzenstein bb2f958eb5 Redis: Wait for replication on writes
Since channels_redis does not support dedicated read-redis instances, the
autoupdate message may be received before the data was replicated. All workers
read the autoupdate message from the write host, so there is a race between
getting this message and a finished replication. For large payloads, the
replication is slower in the most cases (even more in a distributed setup, where
the master and replica are on different nodes). The easy way is to wait for
replication. But there is one difficulty: The number of replicas has to be
known. There is a new settings-variable "AMOUNT_REPLICAS" which defaults to 1.
It needs to be set correctly! If it is too high, every autoupdate will be
delayed by 1 seconds because of a timeout witing for non-existent replicas. If
it is too low, some autoupdates may be wrong (and not detectable by the client!)
becuase of reading from non-synchronised relicas.

The other possibility is to fork channel_redis and add the feature of a
read-only redis. This ould help, because on a single redis instance all commands
are ordered: First, the data is synced, then the autoupdate message. Attention:
This means, if redis-replicas are scaled up, one must make sure to read from the
same instance. I think this is not possible in the way how dockers overlay
networks work. The only way would be to open one connection and reuse the
connection from channels_redis in OpenSlides. This would mean a heavy
integration of channels_redis (meaning including the source code in our repo).

For the first fix, this one is easy and should work.
2020-04-01 13:09:48 +02:00
Emanuel Schütze 7b0a2d8ec2
Merge pull request #5291 from FinnStutzenstein/updateTwisted
Update Twisted
2020-04-01 10:46:17 +02:00
FinnStutzenstein b2d05f81fe Update Twisted 2020-04-01 10:33:18 +02:00
Emanuel Schütze 4419e76223
Merge pull request #5289 from FinnStutzenstein/fixMissingMigrations
Added missing migrations
2020-03-30 11:16:38 +02:00
Emanuel Schütze 1e3c83babc
Merge pull request #5288 from emanuelschuetze/translations-20200330
Updated Translations
2020-03-30 11:08:32 +02:00
FinnStutzenstein 3be28ec50a Added missing migrations 2020-03-30 10:58:42 +02:00
Emanuel Schütze baa1787189 Updated Translations 2020-03-30 10:57:10 +02:00
Emanuel Schütze 8119507b8a
Merge pull request #5283 from tsiegleauq/user-active-toggle
Add set present toggle in user menu
2020-03-30 10:14:27 +02:00
Sean 39ccfe3147 Add set present toggle in user menu
adds a "is present" toggle to the user menu
Refactor user menu into own component
Add a config variable to determine if the user is allowed
to set themselve as present
2020-03-30 09:57:57 +02:00
Emanuel Schütze 106816a733
Merge pull request #5286 from emanuelschuetze/translations-20200326
Updated translations.
2020-03-26 18:42:44 +01:00
Emanuel Schütze c257baa14b Updated translations. 2020-03-26 18:21:36 +01:00
Emanuel Schütze 04c625b3d5
Merge pull request #5282 from tsiegleauq/dynamic-bar-chart-aspect-ratio
Define chart height
2020-03-26 17:58:48 +01:00
Sean d646691961 Define chart height
Bar chart height will be calculated by the number of labels to show
Circle chart height should scale with their container
2020-03-26 17:39:47 +01:00
Emanuel Schütze aaea4ec2e9
Merge pull request #5284 from tsiegleauq/clickable-motion-charts
Remove tooltips for charts
2020-03-26 17:19:19 +01:00
Emanuel Schütze 5b878f4814
Merge pull request #5285 from tsiegleauq/untranslated-comment-field
Fix untranslateable motion comment section dialog
2020-03-26 17:17:01 +01:00
Sean 5bdbe4778a Remove tooltips for charts
Removes all hover-tooltips for charts
Add detail link to motion poll chart
2020-03-26 17:04:17 +01:00
Sean fbff4de431 Fix untranslateable motion comment section dialog
Missing translation tags in comment section dialog
2020-03-26 16:37:47 +01:00
Sean af6c5faac8
Merge pull request #5281 from tsiegleauq/poll-list-filter
Filter only evoting polls, change filter options
2020-03-26 12:27:33 +01:00
Sean 14de67a09d Filter only evoting polls, change filter options
Pre filters all analog polls from poll list.
Creates a filter to find thouse with open polls for the user
2020-03-26 11:54:05 +01:00
Emanuel Schütze 6f7c6036c2
Merge pull request #5280 from tsiegleauq/workflow-manager-scrolling
Enhance workflow matrix for small screens
2020-03-25 15:26:18 +01:00
Emanuel Schütze 19af02a315
Merge pull request #5278 from tsiegleauq/tinymce-in-settings-page
Manual change detection for config list
2020-03-25 15:21:41 +01:00
Emanuel Schütze d50899c407
Merge pull request #5279 from tsiegleauq/less-verbose-user-count
Remove counting of IndexedDB and LocalStore
2020-03-25 13:10:00 +01:00
Sean 73fc936306 Enhance workflow matrix for small screens
makes scrolling horizontally in the workflow manager easier.
The offline banner and the voting banner will lead to unwanted results.
2020-03-25 13:01:25 +01:00
Sean c2406fcc03 Remove counting of IndexedDB and LocalStore
Mainly simplify the user counting component.

It seems that counting IndexedDB has no value anymore,
since even Firefox ESR uses IndexedDB just fine and the LS fallback
proves to be reliable enough
2020-03-25 12:18:57 +01:00
Sean 557824f5f1 Manual change detection for config list
Adds manual change detection to the config page.
Behaves better regarding "changed after checked" errors
2020-03-25 11:22:54 +01:00
Emanuel Schütze 91be76a263
Merge pull request #5276 from tsiegleauq/changeable-created-polls
Remove pseudo-disabled values in poll form
2020-03-24 16:01:17 +01:00
Emanuel Schütze eadc09dc56
Merge pull request #5271 from tsiegleauq/reset-workflow-reco
Allow empty input values in recommendation
2020-03-24 15:58:43 +01:00
Emanuel Schütze c43e180494
Merge pull request #5277 from FinnStutzenstein/removeCheckUpdate
Remove Check update for others feature
2020-03-24 15:56:50 +01:00
Sean 6fddddd9f4 Allow empty input values in recommendation
Allows the client to send empty values as workflow
recommendation label in the workflow detail view.
This is required to remove a recommendation from a
workflow
2020-03-24 15:44:46 +01:00
FinnStutzenstein cf50295ca4 Remove Check update for others feature 2020-03-24 15:25:47 +01:00
Sean 7af2f70494 Remove pseudo-disabled values in poll form
Removed the previously disabled-looking poll options from the poll form
component.
I figguered that it would be more intuitive and closer to my
expectations if I could change the poll values even if the poll was
already created.
2020-03-24 14:22:59 +01:00
Emanuel Schütze cd3435064c
Merge pull request #5275 from FinnStutzenstein/default169projector
Changed the default projector aspect ratio to 16:9 on initial databas…
2020-03-24 12:44:05 +01:00
FinnStutzenstein 123df7660f Changed the default projector aspect ratio to 16:9 on initial database creation 2020-03-24 12:09:11 +01:00
Sean 2fb372ead9
Merge pull request #5274 from tsiegleauq/untranslated-default-projector
Show translated values in projector preview
2020-03-23 17:57:09 +01:00
Sean 7d86f62e2d
Merge pull request #5273 from tsiegleauq/new-projector-reference
Create new projectors with clos reference
2020-03-23 17:31:13 +01:00
Sean d92622410f Show translated values in projector preview
Shows the translated value of "default projector"
in projector preview component.
I reomved a observable that I suppose was outdated
2020-03-23 17:28:09 +01:00
Sean 99c3afb417 Create new projectors with clos reference
New projectors will be created on a reference to the current list of
of speakers
2020-03-23 16:57:29 +01:00
Emanuel Schütze 23a105bdb8
Merge pull request #5272 from tsiegleauq/los-select-speaker-css
Full width for LOS search user
2020-03-23 16:57:01 +01:00
Sean bf0eadebb7 Full width for LOS search user
Puts the List-Of-Speakers search user section to full width
2020-03-23 16:32:48 +01:00
Sean fe71322199
Merge pull request #5270 from tsiegleauq/hotkey-for-poll-dialogs
Fix Shift-Enter to save poll
2020-03-23 14:45:54 +01:00
Sean 5bf3dfadff Fix Shift-Enter to save poll
Fixes a bug which caused the event listener not to register
in BasePollDialog

Also hot fixes a bug in babel
2020-03-23 14:26:38 +01:00
Emanuel Schütze 5617b02804
Merge pull request #5266 from emanuelschuetze/translations-20200320
Updated translations
2020-03-20 21:00:10 +01:00
Emanuel Schütze 5a6d2d2e42 Updated translations 2020-03-20 17:19:12 +01:00
Sean 661fd55c67
Merge pull request #5265 from tsiegleauq/assignment-poll-slide-rework
Rework assignment poll slide
2020-03-20 17:14:44 +01:00
Sean 072ec937a1 Rework assignment poll slide
Reworked assignment poll slide
and refactored the assignment poll detail table
into an own component
2020-03-20 16:53:31 +01:00
Emanuel Schütze b873dc156b
Merge pull request #5264 from tsiegleauq/bar-chart-rework
Rework Chart component
2020-03-20 13:31:20 +01:00
Emanuel Schütze 4acadd33ca
Merge pull request #5262 from FinnStutzenstein/catchErrorOnInvalidCache
Catch error on invalid cache data
2020-03-20 13:24:53 +01:00
Sean f0e396b3a4 Rework Chart component
Cleans up the chart component
Speed up the rendering using async pipe instead of passing obserbables
Thiner bar-charts.
Fixes some bugs, some bugs are still present.
2020-03-20 10:28:59 +01:00
FinnStutzenstein 73eff81edd Catch error on invalid cache data 2020-03-19 14:00:56 +01:00
Emanuel Schütze 54dd97399e
Merge pull request #5260 from tsiegleauq/various-voting-issues
Various small fixes
2020-03-17 21:53:40 +01:00
Sean ee07e8f0ce Various small fixes
- Fix an issue in motion PDF which affected motion result percent
  values
- Fix an issue where the voting result bar chart hat a chance to show
  "null"
- Change the available votes display to count down instead of up
- Add the correct button class to the global abstain button
- Add some translatable strings
2020-03-17 21:33:46 +01:00
Sean d12e052030
Merge pull request #5259 from tsiegleauq/clean-usage-of-pollservice
Refactor usage of PollService
2020-03-17 18:39:18 +01:00
Sean 0ab4532ac8 Refactor usage of PollService
prevents the direct use of the abstract
"PollService".
2020-03-17 18:21:13 +01:00
Finn Stutzenstein 58483d7024
Merge pull request #5255 from OpenSlides/development
Voting 🎉
2020-03-17 07:48:00 +01:00
Sean 3c9f6ed278 Some overall improvements
Common:
	delete unused motion poll list

Poll Create form:
	Fix ugly multi line mat hints
	(workaround, see https://github.com/angular/components/issues/5227 )

Poll List:
	Fix too tiny column size
	user_has_voted_valid (ceck icon) was not shown

Motion Poll Card:
	Enhance subtitle layout (type + state)

Assignment Poll Card:
	Open warning after clicking the hint icon

Assignment Poll Chart:
	Show Absolute values and percents in chart label

Assignment Detail:
	Add new ballot button with plus icon instead of chart icon
2020-03-17 07:24:50 +01:00
FinnStutzenstein 64f2720b1a Last changes and cleanup some todos 2020-03-17 07:24:50 +01:00
Emanuel Schütze d15c9892ed Updated translation strings and German translation. 2020-03-17 07:24:49 +01:00
Sean Engelhardt ee4c6aa0bf Even more voting refinement
Various additional refinements for a more well rounded
voting experience
2020-03-17 07:24:49 +01:00
FinnStutzenstein a05662a0f8 Show global votes in the single votes table 2020-03-17 07:24:49 +01:00
Sean Engelhardt 29a9a09bc6 Motion poll detail als slide
Refactor the code to use the motion poll detail als slide component
2020-03-17 07:24:49 +01:00
Sean Engelhardt 3c36441967 Add global no and abstain to form
Minur UI changes
Minor Chart enhancements
Server Changes
2020-03-17 07:24:48 +01:00
Sean Engelhardt 8fe5a0c9f4 Rework assignment voting
- Remove "assignments.can_manage_polls" permission
- Let the client handle some user errors
- Add a send button to manually submit polls
- Show a hint that the user already submitted a vote
  - will not (and should not) work for non-nominal voting
- submitting a vote cannot be changed anymore
  - user will have to confirm sending
- enable deselecting YNA-votings
- nomainal voting will behace the same as non nominal voting
- submitting empty votes should be possible

Perhaps server side adjustments might still be required
2020-03-17 07:24:48 +01:00
Sean Engelhardt 61b7731073 Enhance charts and tables for assignments
Also some various improvements
2020-03-17 07:24:48 +01:00
FinnStutzenstein e2feeb4b65 Fixed pseudoanonymous voting for motions 2020-03-17 07:24:47 +01:00
Sean Engelhardt 53b9ce73f2 Enhance table layouts
Enhance the result table layout for assignments
2020-03-17 07:24:47 +01:00
Joshua Sangmeister 9d7028ea5f now filters percent bases correctly 2020-03-17 07:24:47 +01:00
Joshua Sangmeister 72678770bb table update on pseudoanonymize, view base classes for votes and
options, renaming for assignment percent bases
2020-03-17 07:24:46 +01:00
Joshua Sangmeister 82c8ade0ba adds all user that voted to required users for single votes table 2020-03-17 07:24:46 +01:00
Emanuel Schütze 2d13519c35 Updated voting strings for translation 2020-03-17 07:24:46 +01:00
Joshua Sangmeister e72bcc1eaf removed default group from 'entitled to vote' selection 2020-03-17 07:24:46 +01:00
Sean Engelhardt 97a5bb4aa6 Cleanup Voting, enhance UI and UX
removed certain unnecesary fields
cleaned up a lot of code
redone some of the UI
some database and server adjustments
2020-03-17 07:24:45 +01:00
Joshua Sangmeister 7598fc5367 Fixed the numbering of assignment candidates for projector and PDF 2020-03-17 07:24:45 +01:00
Joshua Sangmeister b48ca8c434 added chart projection for polls 2020-03-17 07:24:45 +01:00
Sean Engelhardt 6ba0d0c5e6 Client side changes 2020-03-17 07:24:44 +01:00
FinnStutzenstein 0b37c5a857 WIP: Partial requests 2020-03-17 07:24:44 +01:00
Joshua Sangmeister d4599a435b added virtual scrolling for single votes tables 2020-03-17 07:24:44 +01:00
Sean Engelhardt 93dc78c7d6 Result PDF for Voting
- Add result PDF for Motion and Assignments
- Add "getPercentBase" for Assignment
2020-03-17 07:24:44 +01:00
Sean Engelhardt 6044c63c28 Enhance Assignment Voting
- repaired the PDF Service for ballots
- fixed some permission errors
- analog voting has no "started" option anymore
- more-link as button
- named voting has a progress bar
- Shows the poll type for eVoting
- Moves and declutters meta info
- Enhance the grid and the layout in detail view
- declutter and enhance the dot-menus
- some other layout changes
- remove breadcrumbs in assignment detail
- other cleanups refinements
- Voting in Assignment over instead of forms
(requires more server changes)
2020-03-17 07:24:43 +01:00
Sean 524a97cdcc Enhance voting
- cleaned up a lot of code
- removed required majotiry from forms
- renamed verbose "Majority method" to "Required majority"
- poll-progress-bar only counts present user
- enhanced motion poll tile chart layout
- removed PercentBase.Votes
- added pollPercentBase pipe
- Show the voting percent next to chart in motion detail
- change the head bar to "Voting is open"
  and "Ballot is open"
- merged the voting configs to their corresponding config-categories
- re-add ballot paper configs
- Add "more" button to motion polls
- Adjusted the motion results table
  - Hide entries without information
  - Show icons for Y N A
  - Show percentage next to Y N A
2020-03-17 07:24:43 +01:00
GabrielMeyer 6c1317e25f Fixes labelling for charts 2020-03-17 07:24:43 +01:00
GabrielMeyer 294b75c320 Replaces the mat-table with a classic table 2020-03-17 07:24:42 +01:00
GabrielMeyer 09b0d19de0 Fixes permissions for assignments
- There were some fields that user could see/click/handle, although the user has not the correct permission for the action
2020-03-17 07:24:42 +01:00
Joshua Sangmeister df1047fc76 various improvements for polls 2020-03-17 07:24:42 +01:00
Joshua Sangmeister bc54a6eb46 improved 'votes' pollmethod 2020-03-17 07:24:42 +01:00
Joshua Sangmeister 1de73d5701 improved shared poll list 2020-03-17 07:24:41 +01:00
GabrielMeyer a0c3a28456 Adds a chart for assignment-poll-detail 2020-03-17 07:24:41 +01:00
GabrielMeyer c46369c6a7 Reworks the banner showing if there are polls
- Makes it higher on mobilephones
- Changes title, if there is only one poll
2020-03-17 07:24:41 +01:00
Joshua Sangmeister b16afaa285 number poll candidates depending on setting 2020-03-17 07:24:40 +01:00
FinnStutzenstein e2585fb757 Projector for polls: Server, client structure and data modeling 2020-03-17 07:24:40 +01:00
Sean Engelhardt 84a39ccb62 More voting UI improvements
For Motion poll:
- Overworked how motion poll chart displays the legend
- Added the vote counter to the motion detail
- Added a progress bar to the vote counter
- Fixed some perm errors with the chart
- Show a "Singe Votes" link as button for published named polls
- Replace the edit-button with a dot-menu
  - Having project, Edit, PDF and Delete

For Motion Poll detail:
- enhance search panel
- Remove the breadcrumbs
- Remove the vote counter
- Enhanced the single-vote grid, table and filter bar
- Enhance how the poll state enum was checkend

For the Motion Poll Create/Update Form:
- Remove the selection of poll-methode (whenever possible)
- only show "publish imediately" during creation
2020-03-17 07:24:40 +01:00
Joshua Sangmeister 682db96b7c added vote per user table and progress for polls
added update for options after stopping a poll
2020-03-17 07:24:39 +01:00
Sean 604df9d48b Enhance voting ux 2020-03-17 07:24:39 +01:00
FinnStutzenstein 7ab5346198 disable caching for reverse relations 2020-03-17 07:24:39 +01:00
Joshua Sangmeister e67ca77ad1 default motion poll method set, changed permission from 'can_manage_metadata' to 'can_manage' 2020-03-17 07:24:39 +01:00
GabrielMeyer fff1f15b6c Polls for motions and assignments
- Adds charts to assignments
- Creates base-classes for polls
2020-03-17 07:24:38 +01:00
GabrielMeyer 96aa3b0084 Adds the chart and dialog for analog voting 2020-03-17 07:24:38 +01:00
jsangmeister 72ff1b1f09 api changes to allow some edits on finished polls 2020-03-17 07:24:38 +01:00
FinnStutzenstein fafb81daca Fix assignment access permissions
Also improves unnecessary history-savings of users in the list of speakers
2020-03-17 07:24:37 +01:00
FinnStutzenstein b50cf42543 Prevent stopping an analog poll
Fixed too much logging with the new autoupdate bundling
2020-03-17 07:24:37 +01:00
jsangmeister 90b04366b5 added option to number poll cadidates 2020-03-17 07:24:37 +01:00
GabrielMeyer 8d77c0495b Initial polling 2020-03-17 07:24:36 +01:00
jsangmeister 1b761d31c0 added tests for user creation and try-catch for a probably race-based IntegrityError 2020-03-17 07:24:36 +01:00
jsangmeister 09ef3c5071 add settings variable ENABLE_ELECTRONIC_VOTING 2020-03-17 07:24:36 +01:00
FinnStutzenstein 046a152ec5 generate less queries in the autoupdate system 2020-03-17 07:24:36 +01:00
jsangmeister 6605934a33 added count query decorator 2020-03-17 07:24:35 +01:00
FinnStutzenstein 1246dd54ad majorities in polls 2020-03-17 07:24:35 +01:00
jsangmeister 5fa8341614 added testing for named and pseudoanonymous assignment voting
added queries count tests for assignment and motion polls and votes
2020-03-17 07:24:35 +01:00
FinnStutzenstein ce171980e8 Relations in the client 2020-03-17 07:24:34 +01:00
FinnStutzenstein ced40cab74 Initial work for supporting voting 2020-03-17 07:24:34 +01:00
Emanuel Schütze 4d4697eee0
Merge pull request #5246 from jsangmeister/motion-block-check
Added an indicator if all motions of a block are finished
2020-03-12 21:24:01 +01:00
Joshua Sangmeister aa46922c8b added an indicator if all motions of a block are finished 2020-03-12 16:21:41 +01:00
Emanuel Schütze ec17376e8e
Merge pull request #5245 from jsangmeister/amendment-navigation
Added navigation between amendments when not shown in main list
2020-03-12 15:39:26 +01:00
Emanuel Schütze 35d9fd9d8e
Merge pull request #5244 from jsangmeister/fix-final-print-template
Fix the error when creating a final print template after a title change recommendation
2020-03-12 15:14:58 +01:00
Joshua Sangmeister 7acf2157fa added navigation between amendments when not shown in main list 2020-03-12 11:53:29 +01:00
Joshua Sangmeister 70fc5a69ab fix the error when creating a final print template after a title change recommendation 2020-03-12 09:39:56 +01:00
Emanuel Schütze 3ad8944b9c
Merge pull request #5230 from FinnStutzenstein/exportMediafiles
Export mediafiles to the media service
2020-03-06 10:56:53 +01:00
Emanuel Schütze 847482bb5f
Merge pull request #5228 from GabrielInTheWorld/updatingDarkTheme
Updates dark-theme
2020-02-27 18:40:17 +01:00
FinnStutzenstein 219103129d Export mediafiles to the media service 2020-02-26 15:15:45 +01:00
GabrielMeyer 13de88c136 Updates dark-theme 2020-02-26 13:39:07 +01:00
Sean 98146a29c7
Merge pull request #5227 from FinnStutzenstein/projectorLoadChildrenCallback
Use LoadChildrenCallback instead of deprecated NgModuleFactoryLoader
2020-02-25 10:50:19 +01:00
Finn Stutzenstein 758e059f9b
Merge pull request #5153 from FinnStutzenstein/mediafilesInPostgresql
External postgres as mediafile store
2020-02-20 08:01:39 +01:00
FinnStutzenstein 7204d59d66 [WIP] External postgres as mediafile store 2020-02-17 14:38:32 +01:00
FinnStutzenstein 76bd184ff4 Use LoadChildrenCallback instead of deprecated NgModuleFactoryLoader 2020-02-17 14:38:02 +01:00
Emanuel Schütze fbe5ea2056
Merge pull request #5209 from tsiegleauq/hide-create-final-version-button
Hide print-template button
2020-01-30 14:18:31 +01:00
Sean Engelhardt 2236f63fe9 Hide print-template button
Hides the "create final print template" button if
a print template exists.
Should be more user friendly and less dangerous to use.
2020-01-30 13:13:52 +01:00
Emanuel Schütze ec79f70648
Merge pull request #5206 from emanuelschuetze/translation202001
Updated German translation
2020-01-30 09:48:46 +01:00
Emanuel Schütze 0267b0cb42 Updated German translation 2020-01-30 09:35:57 +01:00
Emanuel Schütze 2ac01a5ea3
Merge pull request #5193 from tsiegleauq/final-version-without-reco
Allow final versions without change reco
2020-01-30 09:31:36 +01:00
Sean a51720e18b
Merge pull request #5191 from tsiegleauq/pdf-catalog-optional-page-breaks
Add option to export motions with pagebreaks
2020-01-29 16:33:37 +01:00
Sean Engelhardt 27e8301131 Allow final versions without change reco
Alters the creation process of final versions
in a way one can create them independantly
of change recomendations.
2020-01-29 16:28:36 +01:00
Sean Engelhardt 407a430419 Add option to export motions with pagebreaks
Adds an option to the PDF motion list exporter
that allows users to explicitly enforce or prevent
page breaks before a new motion was printed.

The option is enabled by default
2020-01-29 15:18:56 +01:00
Emanuel Schütze a6bdaedff1
Merge pull request #5192 from tsiegleauq/reco-and-state-in-pdf-toc
Show final state in Motion PDF toc
2020-01-29 15:09:50 +01:00
Sean 59795f32e3
Merge pull request #5195 from tsiegleauq/fix-flat-map-function
Fix flat map
2020-01-29 15:03:49 +01:00
Sean Engelhardt a161bca028 Show final state in Motion PDF toc
Renamed the option
"Show submitters and recommendation in table of contents"
to
"Show submitters and recommendation/state in table of contents"
If the option is selected, the PDF-TOC for motions will print
the name of the current state (if final) rather than the
current recomendation
2020-01-29 14:28:56 +01:00
Sean Engelhardt 6f114d0072 Fix flat map
Fixes a bug which was breaking flatMap
2020-01-29 12:47:42 +01:00
Sean 8012bfbfc0
Merge pull request #5187 from tsiegleauq/ngrid-updates
Update ngrid, redefine prototypes of datatypes
2020-01-23 15:10:18 +01:00
Sean d311042806
Merge pull request #5173 from tsiegleauq/amendment-wizzard-for-amendments
Use amendmend wizzard for amendments
2020-01-23 13:06:54 +01:00
Sean Engelhardt faf8004280 Use amendmend wizzard for amendments
Allows paragraph based amendments for other paragraph based
amendments.
Amendments to amendments will be amended to the main motion,
but will contain all the changes to the amendments they were
refering to

solves #5171
2020-01-23 12:46:19 +01:00
Sean Engelhardt c2ad39a2c5 Update ngrid, redefine prototypes of datatypes
Updates ngrid to the latest version
Use Object.defineProperty instead of
Number.prototype to safer extend native datatypes
2020-01-23 12:38:46 +01:00
Emanuel Schütze 7a23139f5e
Merge pull request #5168 from FinnStutzenstein/validateHtml
Validate Config HTML
2020-01-08 13:36:17 +01:00
Emanuel Schütze b9e40717de
Merge pull request #5172 from tsiegleauq/fix-group-creation
Fix group creation
2020-01-08 13:34:04 +01:00
Sean Engelhardt 5f8e64140a Fix group creation
Fixes an error that was preventing groups from being created.
Groups did require a list of permissions which is now optional
2020-01-08 10:46:11 +01:00
Emanuel Schütze a2d561f667
Merge pull request #5167 from emanuelschuetze/createopenslidesusercommand
Added optional argument '--email' for createopenslidesuser command.
2020-01-07 08:55:32 +01:00
Emanuel Schütze b3c98dd207 Added optional argument '--email' for createopenslidesuser command. 2020-01-05 15:17:09 +01:00
FinnStutzenstein a35fa105ed Validate Config HTML 2020-01-04 16:58:11 +01:00
1853 changed files with 212220 additions and 6107 deletions

View File

@ -10,11 +10,12 @@ assignees: ""
A clear and concise description of what the bug is.
**How to Reproduce**
Steps to reproduce the behavior: preferably on [nighty](https://nightly.demo.openslides.org)
Steps to reproduce the behavior: preferably on [nightly](https://nightly.demo.openslides.org) (for
3.4) or the [OS4 demo](https://demo.os4.openslides.com/).
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
2. Click on '...'
3. Scroll down to '...'
4. See error
**Expected behavior**
@ -22,16 +23,16 @@ A clear and concise description of what you expected to happen.
**System information**
- OpenSlides-Version: [e.g. 2.1, 2.2, 2.3, 3,0]
- Additional version information (if any): [e.g. commit hash or installation-month]
- Python Version: [e.g. 3,5, 3.6, 3.7]
- Device: [e.g. iPhone6, Notebook]
- OS: [e.g. Andoird 7, iOS8.1, Windows 10]
- OpenSlides-Version: [e.g. 3.4, 4.0-beta]
- Additional version information (if any): [e.g. commit hash or installation month]
- Python Version: [e.g. 3.6, 3.7, 3.8]
- Device: [e.g. iPhone 6, Notebook]
- OS: [e.g. Android 7, iOS 8.1, Windows 10]
- Browser: [e.g. chrome, firefox, opera, edge, safari]
- Browser-Version: [e.g. 22]
**Additional context**
Add any other information to comprehend your problem
Add any other information to comprehend your problem.
**Screenshots**
If applicable, add screenshots to help explain your problem.

View File

@ -1,39 +0,0 @@
version: "3"
services:
backend:
image: openslides-backend
ports:
- "9002:9002"
environment:
- DATASTORE_READER_HOST=reader
- DATASTORE_READER_PORT=9010
- DATASTORE_WRITER_HOST=writer
- DATASTORE_WRITER_PORT=9011
depends_on:
- writer
- reader
reader:
image: openslides-datastore-reader
environment:
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
depends_on:
- postgresql
ports:
- "9010:9010"
writer:
image: openslides-datastore-writer
environment:
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
- MESSAGE_BUS_HOST=redis
- MESSAGE_BUS_PORT=6379
depends_on:
- postgresql
- redis
postgresql:
image: postgres:11
environment:
- POSTGRES_USER=openslides
- POSTGRES_PASSWORD=openslides
- POSTGRES_DB=openslides
redis:
image: redis:alpine

View File

@ -1,90 +0,0 @@
---
name: Build Docker images for all OpenSlides services
on: [push, workflow_dispatch]
env:
IMAGE_VERSION: 4.0.0-beta
TAG_SUFFIX: -$(date +%Y%m%d)-${GITHUB_SHA::7}
jobs:
build:
name: Builds Docker images
runs-on: ubuntu-latest
strategy:
matrix:
service:
- name: openslides-proxy
directory: proxy
- name: openslides-client
directory: openslides-client
- name: openslides-backend
directory: openslides-backend
- name: openslides-datastore-reader
directory: openslides-datastore-service
args:
MODULE: reader
PORT: 9010
- name: openslides-datastore-writer
directory: openslides-datastore-service
args:
MODULE: writer
PORT: 9011
- name: openslides-autoupdate
directory: openslides-autoupdate-service
- name: openslides-auth
directory: openslides-auth-service
- name: openslides-vote
directory: openslides-vote-service
- name: openslides-icc
directory: openslides-icc-service
- name: openslides-media
directory: openslides-media-service
- name: openslides-manage
directory: openslides-manage-service
steps:
- name: Check out code
uses: actions/checkout@v2
with:
submodules: true
- name: Build image
working-directory: ${{ matrix.service.directory }}
env:
DOCKER_BUILDKIT: 1
run: |
if [ "${{ matrix.service.name }}" = "openslides-client" ]
then
eval echo ${IMAGE_VERSION}${TAG_SUFFIX} > client/src/assets/version.txt
fi
if [ "${{ matrix.service.args }}" != "" ]
then
export BUILD_ARGS="--build-arg MODULE=${{ matrix.service.args.MODULE }}
--build-arg PORT=${{ matrix.service.args.PORT }}"
fi
docker build . --tag ${{ matrix.service.name }} $BUILD_ARGS
- name: Log into registry
run: echo "${{ secrets.GITHUB_TOKEN }}" |
docker login ghcr.io --username ${{ github.actor }} --password-stdin
- name: Push image
run: |
IMAGE_ID=ghcr.io/${{ github.repository }}/${{ matrix.service.name }}
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
docker tag ${{ matrix.service.name }} ${IMAGE_ID}:$(eval echo ${IMAGE_VERSION}${TAG_SUFFIX})
docker tag ${{ matrix.service.name }} ${IMAGE_ID}:latest
docker push ${IMAGE_ID}:$(eval echo ${IMAGE_VERSION}${TAG_SUFFIX})
docker push ${IMAGE_ID}:latest

133
.github/workflows/run-tests.yml vendored Normal file
View File

@ -0,0 +1,133 @@
name: CI
on:
pull_request:
jobs:
test-server:
runs-on: ubuntu-latest
env:
USING_COVERAGE: "3.6,3.8"
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8"]
defaults:
run:
working-directory: ./server
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "${{ matrix.python-version }}"
- name: install python dependencies
run: |
pip install --upgrade pip
pip install --upgrade --requirement requirements.txt
pip freeze
- name: lint with flake8
run: flake8 openslides tests
- name: lint with isort
run: isort --check-only --diff --recursive openslides tests
- name: lint with black
run: black --check --diff openslides tests
- name: test using mypy
run: mypy openslides/ tests/
- name: test using pytest
run: pytest --cov --cov-fail-under=73
install-client-dependencies:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./client
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
id: node-module-cache
with:
path: |
**/node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
node_modules-
- uses: actions/setup-node@v2-beta
with:
node-version: "14"
- name: install client dependencies
if: steps.node-module-cache.outputs.cache-hit != 'true'
run: npm ci
check-client-code:
needs: install-client-dependencies
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./client
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
**/node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- name: check code using linter
run: npm run lint-check
- name: check code using prettify
run: npm run prettify-check
test-client:
needs: install-client-dependencies
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./client
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
**/node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- name: test client
run: npm run test-silently
build-client-debug:
needs: install-client-dependencies
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./client
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
**/node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- name: build client debug
run: npm run build-debug
build-client-prod:
needs: install-client-dependencies
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./client
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
**/node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- name: build client prod
run: npm run build

View File

@ -1,25 +0,0 @@
---
name: Run integration tests (cypress)
on: [push, pull_request]
jobs:
run-cypress:
name: 'Runs integration tests in cypress'
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
with:
submodules: recursive
- name: Build and run OS4 Dev
run: make run-dev ARGS="-d"
- name: Run integration tests (cypress)
uses: cypress-io/github-action@v2
with:
working-directory: integration
wait-on: 'https://localhost:8000'
wait-on-timeout: 300
env:
NODE_TLS_REJECT_UNAUTHORIZED: 0

118
.gitignore vendored
View File

@ -1,49 +1,87 @@
# General
## General
*.pyc
*.swp
*.swo
*.log
*~
.DS_Store
.idea
# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
.vscode/*
*.code-workspace
# System Files
.DS_Store
Thumbs.db
# Virtual Environment
.virtualenv*
.venv
# docs
docs/modelsvalidator/modelsvalidator
dev-commands/export.json
# certs
*.pem
# Deployment
/docker/docker-compose.yml
/docker/docker-stack.yml
## Compatibility
# OS4-Submodules and aux-directories
/openslides-*/
/docker/keys/
/docker/secrets/auth_*_key
docker/secrets/*.env
# Integration testing
/integration/results
/integration/cypress/downloads
/integration/cypress/screenshots
/integration/cypress/videos
/integration/node_modules
# Old OS3 files and folders
.coverage
.mypy_cache
Compodoc
__pycache__
bower_components
client
make
openslides_*
openslides
personal_data
tests
.launch/
.venv/
.virtualenv/
.vscode/
client/package-lock.json
server/
/docs/
# OS3+-Submodules
/autoupdate/
# Plugin development
openslides_*
# Old OS3 stuff
/tests/
## Server
# Local user data (settings, database, media, search index, static files)
personal_data/*
server/personal_data/*
server/openslides/static/*
# Unit test and coverage reports
.coverage
server/tests/file/*
server/tests/db.sqlite3.test
.pytest_cache
# Package building
*.egg-info
# Mypy cache for typechecking
.mypy_cache
## OpenSlides 3 Client
# Javascript tools and libraries
**/node_modules/*
**/bower_components/*
# compiled output
client/dist
client/static
client/tmp
client/out-tsc
# docs
client/documentation
Compodoc
Compodocmodules
CHANGELOG.md
# build artifacts
client/.sass-cache
client/connect.lock
client/coverage
client/libpeerconnection.log
client/npm-debug.log
client/yarn-error.log
client/testem.log
client/typings
client/yarn.lock
package-lock.json
client/package-lock.json
cypress.json
## Deployment
# Docker build artifacts
docker/docker-compose.yml
docker/docker-stack.yml
*-version.txt
*.pem
# secrets
docker/secrets/*.env

39
.gitmodules vendored
View File

@ -1,36 +1,3 @@
[submodule "openslides-datastore-service"]
path = openslides-datastore-service
url = https://github.com/OpenSlides/openslides-datastore-service.git
branch = main
[submodule "openslides-client"]
path = openslides-client
url = https://github.com/OpenSlides/openslides-client.git
branch = main
[submodule "openslides-backend"]
path = openslides-backend
url = https://github.com/OpenSlides/openslides-backend.git
branch = main
[submodule "openslides-autoupdate-service"]
path = openslides-autoupdate-service
url = https://github.com/OpenSlides/openslides-autoupdate-service.git
branch = main
[submodule "openslides-auth-service"]
path = openslides-auth-service
url = https://github.com/OpenSlides/openslides-auth-service.git
branch = main
[submodule "openslides-media-service"]
path = openslides-media-service
url = https://github.com/OpenSlides/openslides-media-service.git
branch = main
[submodule "openslides-manage-service"]
path = openslides-manage-service
url = https://github.com/OpenSlides/openslides-manage-service.git
branch = main
[submodule "openslides-icc-service"]
path = openslides-icc-service
url = https://github.com/OpenSlides/openslides-icc-service.git
branch = main
[submodule "openslides-vote-service"]
path = openslides-vote-service
url = https://github.com/OpenSlides/openslides-vote-service.git
branch = main
[submodule "autoupdate"]
path = autoupdate
url = https://github.com/OpenSlides/openslides3-autoupdate-service.git

64
ADVANCED.rst Normal file
View File

@ -0,0 +1,64 @@
Advanced configuration
======================
Docker Swarm Mode
-----------------
OpenSlides may also be deployed in Swarm mode. Distributing instances over
multiple nodes may increase performance and offer failure resistance.
An example configuration file, ``docker-stack.yml.m4``, is provided. Unlike
the Docker Compose setup, this configuration will most likely need to be
customized, especially its placement constraints and database-related
preferences.
Before deploying an instance on Swarm, please see `Database Configuration`_ and
`Backups`_, and review your ``docker-stack.yml``
Database Configuration
----------------------
It is fairly easy to get an OpenSlides instance up an running; however, for
production setups it is strongly advised to review the database configuration.
By default, the primary database cluster will archive all WAL files in its
volume. Regularly pruning old data is left up to the host system, i.e., you.
Alternatively, you may disable WAL archiving by setting
``PGNODE_WAL_ARCHIVING=off`` in ``.env`` before starting the instance.
The provided ``docker-stack.yml.m4`` file includes additional database
services which can act as hot standby clusters with automatic failover
functionality. To take advantage of this setup, the database services need to
be configured with proper placement constraints. Before relying on this setup,
please familiarize yourself with `repmgr <https://repmgr.org/>`_.
Backups
-------
All important data is stored in the database. Additionally, the project
directory should be included in backups to ensure a smooth recovery.
The primary database usually runs in the ``pgnode1`` service (but see `Database
Configuration`_ above).
In some cases, it may be sufficient to generate SQL dumps with ``pg_dump``
through ``docker exec`` to create backups. However, for proper incremental
backups, the host system can backup the cluster's data directory and WAL
archives.
The cluster's data directory is available as a volume on the host system.
Additionally, the database archives its WAL files in the same volume by
default. This way, the host system can include the database volume in its
regular filesystem-based backup routine and create efficient database backups
suitable for point-in-time recovery.
The `former management repository
<https://github.com/OpenSlides/openslides-docker-compose/>`_ provides the
script `openslides-pg-mgr.sh` which can enable Postgres' backup mode in all
OpenSlides database containers.
In Swarm mode, the primary database cluster may get placed on a number of
nodes. It is, therefore, crucial to restrict the placement of database
services to nodes on which appropriate backups have been configured.

View File

@ -30,10 +30,7 @@ Authors of OpenSlides in chronological order of first contribution:
Jochen Saalfeld <jochen.saalfeld@intevation.de>
Fadi Abbud <fmfn13@hotmail.com>
Gabriel Meyer <meyergabriel@live.de>
Gernot Schulz <gernot@intevation.de>
Joshua Sangmeister <joshua.sangmeister@gmail.com>
Ralf Peschke <rpeschke@peschke-it.de>
Ludwig Reiter <ludwig.reiter@intevation.de>
Adrian Richter <adrian@intevation.de>
Camille Akmut
Johannes Rolf <johannes.rolf@rwth-aachen.de>
Gernot Schulz <gernot@intevtion.de>
Raphael Topel <info@rtopel.de>
Martin Dickopp <martin@zero-based.org>

View File

@ -1,964 +0,0 @@
# CHANGELOG of OpenSlides
https://openslides.com
## Version 3.1 (2019-12-13)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/3.0)
**General:**
- Improved loading time of OpenSlides [#5061, #5087, #5110, #5146 - Breaks IE11].
- Improved Websocket reconnection - works now more reliable [#5060].
- Improved performance by replacing deprecated encode and decode library with faster manual approaches [#5085, #5092].
- Improved mobile views for small devices [#5106].
- Improved virtual scrolling behavior of tables: remember last scroll position [#5156].
- New SingleSignOn login method via SAML [#5000].
- New inline editing for start page, legal notice and privacy policy [#5086].
- Reordered settings in subpages for better overview [#4878, #5083, #5096].
- Added html meta noindex tag to prevent search engines finding instances of OpenSlides [#5061].
- Added server log entries for usage of notify feature [#5066].
- Added server-side HTML validation for personal notes (motions) and about me field (users) [#5121].
- Fixed an issue where projector button in lists was always not indicating the projected element [#5055].
- Fixed issues where search-filter, property-filter and property-sort in list views does not work correctly [#5065].
- Fixed an issues where list view entries using virtual scrolling become invisible [#5072].
- Fixed an error where loading spinner would not disappear while offline mode [#5151].
- Various cleanups and improvements to usability, performance and translation.
**Agenda:**
- New config option to show motion submitters as subtitle in agenda list [#5002, #5094].
- New view to sort sepakers of a list - preventing unwanted changes esp. using mobile devices [#5069].
- New button to readd the last speaker to the top of the list [#5069, #5067].
- New agenda list filter 'item type' (topic, motion, motion block, election) [#5084].
- Changed window title for current list of speakers [#5037].
- Added motion title in agenda list [#5063].
**Motions:**
- New option to export personal notes [#5075].
- New amendment filter for motion list [#5056, #5157].
- New possibility to change state and recommendation in motion list using quick edit [#5071].
- Added multi select actions to amendment list [#5041].
- Added search value selector in multi select action dialogs [#5058].
- Added support for nested lists with line numbers in PDF export [#5138].
- Improved scaling of motion tile view [#5038].
- Improved performance for large motions with dozens of amendments by implementing manual change detection in motion detail [#5074, #5139].
- Improved display of long names for states and recommendations in drop down menu in motion detail view [#5079].
- Improved amendment slide by showing only changed line(s)s without surrounding paragraph [#5144].
- Fixed line number errors during creation of amendments [#5023].
- Fixed an issue that ol/ul lists are not printed in amendment PDF [#5051].
- Fixed the amendment option "Show entire motion text" [#5052].
- Fixed a rare bug in final version where change recommendations or amendments would have been hidden [#5070].
- Fixed PDF export in final version: use modified final version if available [#5139].
- Fixes a bug where the event name was printed twice in the PDF header [#5155].
**Elections:**
- Fixed errors by entering votes and sorting candidates [#5129, #5125].
- Fixed a permission issue that prevented nominating another participants for elections [#5154].
**Users:**
- Fixed wrong permission check for set password [#5128].
**Mediafiles:**
- Fixed mediafile upload path [#4710].
- Fixed double slash in mediafile URL [#5031].
- Original filename must now be unique for files [#5123].
**Projector:**
- New projector edit dialog with preview [#5043].
- Added support for custom aspect ratios in projector edit dialog; database migration required [#5141].
- Added missing autoupdates for changed projection defaults [#5045].
- Added scaleable tile for projector list [#5043].
- Added a lock icon on the list of speaker slide if list has been closed [#5154].
- Improved autoupdates for projectors by using changeIDs [#5064].
- Improved performance by preventing high CPU usage on Firefox in projector detail view [#5022].
- Changed config option to show nice horizontal meta box on motion slide [#5088].
- Changed config option "Event date" back to string format [#5042].
- Saved countdown settings [#5053].
**Breaking Changes:**
- Due to faster model handling (using the 'Proxy' function) Internet Explorer 11 cannot be supported anymore!
## Version 3.0 (2019-09-13)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/3.0)
**General (Client):**
- OpenSlides client completely rewritten, based on Angular 8 and Material Design.
- OpenSlides is now a Progressive Web App (PWA).
- New browser caching via IndexedDB (one cache store for all browser tabs).
- New list views optimized with virtual scrolling (improved performance for long lists).
- New global quick search using by shortcut 'Alt+Shift+F'.
- New built-in design themes for customizing user interface.
- New update notification if OpenSlides static files are updated.
- New config option for pdf page size (DIN A4 or A5).
- Added TinyMCE 5 editor (switched from CKEditor caused by changed license).
- Switched from yarn/gulp to npm.
- Improved pdf gerneration with progress bar and cancel option.
- Translations available for EN, DE, RU and CS.
**General (Server):**
- New websocket protocol for server client communication using JSON schema.
- New change-id system to send only updated elements to client.
- New global history mode (useable for admin group only).
- Updated to Channels 2.
- Dropped support for Python 3.5.
- Dropped support for Geiss.
- Complete rework of startup and caching system. Dropped restricted data cache.
- Changed URL schema.
- Changed personal settings.py.
- Changed format for elements send via autoupdate.
- Changed projector concept.
- Compressed autoupdates before sending to clients (reduced traffic).
- Fixed autoupdate system for related objects.
- Fixed logo configuration if logo file is deleted.
- Added several bulk views for motions and users (one request for updating multiple selected elements).
- Added docs for using OpenSlides in 'big mode' with Gunicorn and Uvicorn.
- Added docs for configure OpenSlides in settingy.py.
- Dropped chat functionality.
- Server performance improvements.
**Agenda:**
- Agenda items are now optional (for motions, elections and mediafiles). New config to set default behavior.
- New drag&drop view to sort agenda items.
- New config option: only present participants can be added to list of speakers.
- New config option to hide number of speakers on projector.
**Motions:**
- New call list for custom sort of motions.
- New tile layout view with all categories (each category a tile).
- New statute motions with managing statute paragraphs.
- New permission to manage metadata (state, recommendation, submitters and supporters, category, motion block and polls).
- New permission to create amendments.
- New permission to see motions in internal states.
- New access restrictions definable for each motion state in workflow.
- New 'internal' option for motion blocks.
- New sorting view for categories to create subcategories.
- New custom comment fields for all motions (read/write access can be managed via permission groups).
- New motion history (each action is stored in global OpenSlides history which can be restored any time, replaced old motion version and log features).
- New XLSX export (docx support is dropped).
- New navigation for next/previous motion in detail view (shortcut: 'Alt+Shift+Left/Right').
- New multi select actions.
- New timestampes for motions (for sorting by creation date and last modified).
- New config option to set reason as required field.
- New config option to change multiple paragraphs with an amendment.
- New config option to hide motion text on projector.
- New config option to show sequential number.
- New config option to show all motions which are referred to a special motion.
- New config option to show submitters and recommendation in table of contents of PDF.
- New config options to control identifier generation - number of digits and blanks (moved from settings.py).
- Improved PDF export (optional with toc, page numbers, date, comments and meta information)
- Improved motion numbering in (sub)categories: Motions of subcategories are also numbered, and parents of amendments needs to be in the numbered category or any subcategory.
- Improved projection layout of motion blocks.
- Changed default workflows: Allowed submitters to set state of new motions in complex and customized workflow. No migration provided.
- Change CSV import to add tags.
**User:**
- New admin group which grants all permissions. Users of existing group 'Admin' or 'Staff' are move to the new group during migration.
- New gender field.
- New password forget/reset function via email.
- New permission to change own password.
- New config option for sender name and reply email address (From address is defined in settings.py).
**Mediafiles:**
- New support for (sub)folders and permission groups.
**Projector:**
- New views to list, manage and control created OpenSlides projectors.
- New projector queue (add slide to queue), all projected slides are logged.
- New chyron for current speaker.
- New color settings for each projector.
## Version 2.3 (2018-09-20)
[Release notes](https://github.com/OpenSlides/OpenSlides/wiki/OpenSlides-2.3) · [Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.3)
**Agenda:**
- New item type 'hidden'. New visibilty filter in agenda [#3790].
**Motions:**
- New feature to scroll the projector to a specific line [#3748].
- New possibility to sort submitters [#3647].
- New representation of amendments (paragraph based creation, new diff and list views for amendments) [#3637].
- New feature to customize workflows and states [#3772, #3785].
- New table of contents with page numbers and categories in PDF [#3766].
- New teporal field "modified final version" where the final version can be edited [#3781].
- New config options to show logos on the right side in PDF [#3768].
- New config to show amendments also in motions table [#3792].
- Support to change decimal places for polls with a plugin [#3803].
**Elections:**
- Support to change decimal places for elections with a plugin [#3803]
**Core:**
- Updated Django to 2.1 [#3777, #3786].
- Support for Python 3.7 [#3786].
- Python 3.4 is not supported anymore [#3777].
- Updated pdfMake to 0.1.37 [#3766].
- Changed behavior of collectstatic management command [#3804].
## Version 2.2 (2018-06-06)
[Release notes](https://github.com/OpenSlides/OpenSlides/wiki/OpenSlides-2.2) · [Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.2)
**Agenda:**
- New permission for managing lists of speakers [#3366].
- New DOCX export of agenda [#3569].
- New collapsable agenda overview [#3567].
- New feature: mark speakers (e.g. as submitter) [#3570].
- New config option to enable numbering of items [#3697].
- New config option to hide internal items when projecting subitems [#3701].
- Hide closed agenda items in the item slide [#3567].
- Fixed wrong sorting of last speakers [#3193].
- Fixed issue when sorting a new inserted speaker [#3210].
- Fixed multiple request on creation of agenda related items [#3341].
- Autoupdates for all children if the item type has changed [#3659].
**Motions:**
- New export dialog for managers only [#3185].
- New personal note field for each motions [#3190, #3267, #3404].
- New navigation between single motions [#3459].
- New possibility to create change recommendations for motion titles [#3626].
- New support for export motions in a ZIP archive [#3189, #3251].
- New PDF export for personal note and comments [#3239].
- New config option for customize sorting of category list in pdf/docx export [#3329].
- New config optoin for pagenumber alignment in PDF [#3327].
- New config options to hide reason, recommendation and meta data box on projector [#3432, #3692].
- New inline editing for motion reason [#3361].
- New multiselect filter for motion comments [#3372].
- New support for pinning personal notes to the window [#3360].
- New warning message if an edit dialog was already opened by another client [#3212].
- New change recommendation type "other" [#3495].
- Fixed issue when creating/deleting motion comment fields in the settings [#3187].
- Fixed empty motion comment field in motion update form [#3194].
- Fixed error on category sort [#3318].
- Bugfix: Changing motion line length did not invalidate cache [#3202].
- Bugfix: Added more distance in motion PDF for DEL-tags in new lines [#3211].
- Bugfix: Creating colliding change recommendation is now prevented on server side [#3304].
- Bugfix: Several bugfixes regarding splitting list items in change recommendations [#3288].
- Bugfix: Several bugfixes regarding diff version [#3407, #3408, #3410, #3440, #3450, #3465, #3537, #3546, #3548, #3644, #3656].
- Improved the multiselect state filter [#3459].
- Save pagination state to session storage [#3569].
- Allow to delete own motions [#3516].
- Reference to motions by id in state and recommendation special field [#3498].
- Log which comment was updated [#3569].
- Split up 'can_see_and_manage_comments' permission in two seperate ones [#3565].
- Combined all boolean filters into one dropdown menu and added a filter for amendments [#3501].
- Show motion identifier in (current) list of speakers [#3442]
- Show the number of next speakers in motion list view [#3470].
- Added (shortened) motion title to motion block slide [#3700].
- Clear identifier on state reset [#3356].
- Reworked DOCX export parser and added comments to DOCX [#3258].
- Removed server side image to base64 transformation and added local transformation [#3181].
- Added karma:watch command [#3466].
**Elections:**
- New pagination for list view [#3393].
**Users:**
- New fast mass import for users [#3290].
- New default user group 'admin' [#3621].
- New feature to send invitation emails with OpenSlides login data [#3503, #3525].
- New view to toggle presence by entering participant number (can be used with barcode scanner) [#3496].
- New support for password validation using Django or custom validators
5. 7. for minimum password length [#3200].
- Hide password in change password view [#3417].
- Users without the permission 'can see users' can now see agenda item speakers, motion submitters and supporters, assignment candidates, mediafile uploader and chat message users if they have the respective permissions [#3191, #3233].
- Fixed compare of duplicated users while CSV user import [#3201].
- Added settings option to enable updating the last_login field in the database. The default is now disabled [#3400].
- Removed OPTIONS request. All permissions are now provided on startup [#3306].
**Mediafiles:**
- New form for uploading multiple files [#3650].
- New custom CKEditor plugin for browsing mediafiles [#3337].
- Project images always in fullscreen [#3355].
- Protect mediafiles for forbidden access [#3384].
- Fixed reloading of PDF on page change [#3274].
**Core:**
- New settings to upload custom fonts (for projector and pdf) [#3568].
- New custom translations to use custom wordings [#3383].
- New support for choosing image files as logos for projector, PDF and web interface header [#3184, #3207, #3208, #3310].
- New notify system [#3212].
- New config option for standard font size in PDF [#3332].
- New config option for disabling header and footer in the projector [#3357].
- New dynamic webpage title [#3404].
- New 'go to top'-link [#3404].
- New custom format cleanup plugin for CKEditor [#3576].
- Reset scroll level for each new projection [#3686].
- Scroll to top on every state change [#3689].
- Added pagination on top of lists [#3698].
- Improved performance for PDF generation significantly (by upgrading to pdfmake 0.1.30) [#3278, #3285].
- Enhanced performance esp. for server restart and first connection of all clients by refactoring autoupdate, Collection and AccessPermission [#3223, #3539].
- Improved reconnect handling if the server was flushed [#3297].
- No reload on logoff. OpenSlides is now a full single page application [#3172].
- Highlight list entries in a light blue, if a related object is projected (e. g. a list of speakers of a motion) [#3301].
- Select the projector resolution with a slider and an aspect ratio [#3311].
- Delay the 'could not load projector' error 3 seconds to not irritate users with a slow internet connection [#3323].
- Added default sorting for agenda, motions, elections, mediafiles and users [#3334, 3348].
- Added caching for the index views [#3419, #3424].
- Added projector prioritization [#3425].
- Added --debug-email flag to print all emails to stdout [#3530].
- Added --no-template-caching flag to disable template caching for easier development [#3566].
- Updated CKEditor to 4.7 [#3375].
- Reduced ckeditor toolbar for inline editing [#3368].
- New api route to project items with just one request needed [#3713].
- Use native twisted mode for daphne [#3487].
- Saved language selection to session storage [#3543].
- Set default of projector resolution to 1220x915 [#2549].
- Preparations for the SAML plugin; Fixed caching of main views [#3535].
- Removed unnecessary OPTIONS request in config [#3541].
- Switched from npm to Yarn [#3188].
- Improvements for plugin integration [#3330].
- Cleanups for the collection and autoupdate system [#3390]
- Bugfixes for PDF creation [#3227, #3251, #3279, #3286, #3346, #3347, #3342].
- Fixed error when clearing empty chat [#3199].
- Fixed autoupdate bug for a user without user.can_see_name permission [#3233].
- Fixed bug the elements are projected and the deleted [#3336].
- Several bugfixes and minor improvements.
*[#xxxx] = Pull request number to get more details on https://github.com/OpenSlides/OpenSlides/pulls*
## Version 2.1.1 (2017-04-05)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.1.1)
**Agenda:**
- Fixed issue #3173 that the agenda item text cannot be changed.
**Other:**
- Set required version for optional Geiss support to <1.0.0.
## Version 2.1 (2017-03-29)
[Release notes](https://github.com/OpenSlides/OpenSlides/wiki/OpenSlides-2.1) · [Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.1)
**Agenda:**
- Added button to remove all speakers from a list of speakers.
- Added option to create or edit agenda items as subitems of others.
- Fixed security issue: Comments were shown for unprivileged users.
- Added option to choose whether to show the current list of speakers slide as a slide or an overlay.
- Manage speakers on the current list of speakers view.
- List of speakers for hidden items is always visible.
**Core:**
- Added support for multiple projectors.
- Added control for the resolution of the projectors.
- Added smooth projector scroll.
- Set the projector language in the settings.
- Added migration path from OpenSlides 2.0.
- Added support for big assemblies with lots of users.
- Django 1.10 is now supported. Dropped support for Django 1.8 and 1.9.
- Used Django Channels instead of Tornado. Refactoring of the autoupdate process. Added retry with timeout in case of ChannelFull exception.
- Made a lot of autoupdate improvements for projector and site.
- Added new caching system with support for Redis.
- Support https as websocket protocol (wss).
- Accelerated startup process (send all data to the client after login).
- Add the command getgeiss to download the latest version of Geiss.
- Add a version of has_perm that can work with cached users.
- Removed our AnonymousUser. Make sure not to use user.has_perm() anymore.
- Added function utils.auth.anonymous_is_enabled which returns true, if it is.
- Changed has_perm to support an user id or None (for anyonmous) as first argument.
- Cache the group with there permissions.
- Added watching permissions in client and change the view immediately on changes.
- Used session cookies and store filter settings in session storage.
- Removed our db-session backend and added possibility to use any django session backend.
- Added template hook system for plugins.
- Used Roboto font in all templates.
- Added HTML support for messages on the projector.
- Moved custom slides to own app "topics". Renamed it to "Topic".
- Added button to clear the chatbox.
- Better dialog handling. Show dialog just in forground without changing the state url. Added new dialog for profile, change password, tag and category update view.
- Switched editor back from TinyMCE to CKEditor which provides a better copy/paste support from MS Word.
- Validate HTML strings from CKEditor against XSS attacks.
- Use a separate dialog with CKEditor for editing projector messages.
- Use CKEditor in settings for text markup.
- Used pdfMake for clientside generation of PDFs. Run pdf creation in background (in a web worker thread).
- Introduced new table design for list views with serveral filters and CSV export.
- New CSV import layout.
- Replaced angular-csv-import by Papa Parse for CSV parsing.
- Added UTF-8 byte order mark for every CSV export.
- Removed config cache to support multiple threads or processes.
- Added success/error symbol to config to show if saving was successful.
- Fixed bug, that the last change of a config value was not send via autoupdate.
- Moved full-text search to client-side (removed the server-side search engine Whoosh).
- Made a lot of code clean up, improvements and bug fixes in client and backend.
**Motions:**
- Added adjustable line numbering mode (outside, inside, none) for each motion text.
- Allowed to add change recommendations for special motion text lines (with diff mode).
- Added projection support for change recommendations.
- Added button to sort and number all motions in a category.
- Added recommendations for motions.
- Added options to calculate percentages on different bases.
- Added calculation for required majority.
- Added blocks for motions which can be used in agenda. Set states for multiple motions of a motion block by following the recommendation for each motion.
- Used global config variable for preamble.
- Added configurable fields for comments.
- Added new origin field.
- Reimplemented amendments.
- New PDF layout.
- Added DOCX export with docxtemplater.
- Changed label of former state "commited a bill" to "refered to committee".
- Number of ballots printed can now be set in config.
- Add new personal settings to remove all whitespaces from motion identifier.
- Add new personal settings to allow amendments of amendments.
- Added inline editing for comments.
**Elections:**
- Added options to calculate percentages on different bases.
- Added calculation for required majority.
- Candidates are now sortable.
- Removed unused assignment config to publish winner election results only.
- Number of ballots printed can now be set in config.
- Added inline edit field for a specific hint on ballot papers.
**Users:**
- Added new matrix-interface for managing groups and their permissions.
- Added autoupdate on permission change (permission added).
- Improved password reset view for administrators.
- Changed field for initial password to an unchangeable field.
- Added new field for participant number.
- Added new field 'is_committee' and new default group 'Committees'.
- Improved users CSV import (use group names instead of id).
- Allowed to import/export initial user password.
- Added more multiselect actions.
- Added QR code in users access pdf.
**Mediafiles:**
- Allowed to project uploaded images (png, jpg, gif) and video files (e. g. mp4, wmv, flv, quicktime, ogg).
- Allowed to hide uploaded files in overview list for non authorized users.
- Enabled removing of files from filesystem on model instance delete.
**Other:**
- Added Russian translation (Thanks to Andreas Engler).
- Added command to create example data.
## Version 2.0 (2016-04-18)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.0)
*OpenSlides 2.0 is essentially not compatible to OpenSlides 1.7. E. g. customized templates, databases and plugins can not be reused without adaption.*
**Agenda:**
- Updated the tests and changed internal parts of method of the agenda model.
- Changed API of related objects. All assignments, motions and custom slides are now agenda items and can be hidden.
- Removed django-mptt.
- Added attachments to custom sldies.
- Improved CSV import.
**Assignments:**
- Renamed app from assignment to assignments.
- Removed possibility to block candidates.
- Massive refactoring and cleanup of the app.
**Motions:**
- Renamed app from motion to motions.
- Massive refactoring and cleanup of the app.
**Mediafiles:**
- Renamed app from mediafile to mediafiles.
- Used improved pdf presentation with angular-pdf.
- Massive refactoring and cleanup of the app.
**Users:**
- Massive refactoring of the participant app. Now called 'users'.
- Used new anonymous user object instead of an authentification backend. Used special authentication class for REST requests.
- Used authentication frontend via AngularJS.
- Improved CSV import.
**Other:**
- New OpenSlides logo.
- New design for web interface.
- Added multiple countdown support.
- Added colored countdown for the last n seconds (configurable).
- Switched editor from CKEditor to TinyMCE.
- Changed supported Python version to >= 3.4.
- Used Django 1.8 as lowest requirement.
- Django 1.9 is supported
- Added Django's application configuration. Refactored loading of signals and projector elements/slides.
- Setup migrations.
- Added API using Django REST Framework 3.x. Added several views and mixins for generic Django REST Framework views in OpenSlides apps.
- Removed most of the Django views and templates.
- Removed Django error pages.
- Added page for legal notice.
- Refactored projector API using metaclasses now.
- Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API).
- Refactored config API and moved it into the core app.
- Removed old style personal info page, main menu entries and widget API.
- Used AngularJS with additional libraries for single page frontend.
- Removed use of 'django.views.i18n.javascript_catalog'. Used angular-gettext now.
- Updated to Bootstrap 3.
- Used SockJS for automatic update of AngularJS driven single page frontend.
- Refactored plugin API.
- Refactored start script and management commands. Changed command line option and path for local installation.
- Refactored tests.
- Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries.
- Used setup.cfg for development tools.
- Removed code for documentation and for Windows portable version with GUI. Used new repositories for this. Cleaned up main repository.
- Updated all dependencies.
**Translations:**
- Updated DE, FR, CS and PT translations.
- Added ES translations.
## Version 1.7 (2015-02-16)
https://github.com/OpenSlides/OpenSlides/milestones/1.7
**Core:**
- New feature to tag motions, agenda and assignments.
- Fixed search index problem to index contents of many-to-many tables (e. g. tags of a motion).
- Fixed AttributeError in chatbox on_open method.
**Motions:**
- New Feature to create amendments, which are related to a parent motion.
- Added possibility to hide motions from non staff users in some states.
**Assignments:**
- Fixed permissions to alter assignment polls.
**Other:**
- Cleaned up utils.views to increase performance when fetching single objects from the database for a view (#1378).
- Fixed bug on projector which was not updated when an object was deleted.
- Fixed bug and show special characters in PDF like ampersand (#1415).
- Updated pdf.js to 1.0.907.
- Improve the usage of bsmselect jquery plugin.
- Updated translations.
## Version 1.6.1 (2014-12-08)
https://github.com/OpenSlides/OpenSlides/milestones/1.6.1
**Agenda:**
- Fixed error in item numbers.
**Motions:**
- Show supporters on motion slide if available.
- Fixed motion detail view template. Added block to enable extra content via plugins.
**Assignments:**
- Fixed PDF build error when an election has more than 20 posts or candidates.
**Participants:**
- Fixed participant csv import with group ids:
- Allowed to add multiple groups in csv group id field, e. g. "3,4".
- Fixed bug that group ids greater than 9 can not be imported.
- Updated error message if group id does not exists.
**Other:**
- Fixed CKEditor stuff (added insertpre plugin and removed unused code).
- Updated French, German and Czech translation.
## Version 1.6 (2014-06-02)
https://github.com/OpenSlides/OpenSlides/milestones/1.6
**Dashboard:**
- Added shortcuts for the countdown.
- Enabled copy and paste in widgets.
**Agenda:**
- New projector view with the current list of speakers.
- Added CSV import of agenda items.
- Added automatic numbering of agenda items.
- Fixed organizational item structuring.
**Motions:**
- New slide for vote results.
- Created new categories during CSV import.
**Assignments/Elections:**
- Coupled assignment candidates with list of speakers.
- Created a poll description field for each assignment poll.
- New slide for election results.
**Participants:**
- Disabled dashboard widgets by default.
- Added form field for multiple creation of new participants.
**Files:**
- Enabled update and delete view for uploader refering to his own files.
**Other:**
- Added global chatbox for managers.
- New config option to set the 100 % base for polls (motions/elections).
- Changed api for plugins. Used entry points to detect them automaticly. Load them automaticly from plugin directory of Windows portable version.
- Added possibility to use custom templates and static files in user data path directory.
- Changed widget api. Used new metaclass.
- Changed api for main menu entries. Used new metaclass.
- Inserted api for the personal info widget. Used new metaclass.
- Renamed config api classes. Changed permission system for config pages.
- Regrouped config collections and pages.
- Renamed some classes of the poll api.
- Renamed method and attribute of openslides.utils.views.PermissionMixin.
- Added api for absolute urls in models.
- Inserted command line option to translate config strings during database setup.
- Enhanced http error pages.
- Improved responsive design for templates.
- Fixed headings on custom slides without text.
- Moved dashboard and select widgets view from projector to core app.
- Renamed and cleaned up static direcories.
- Used jsonfield as required package. Removed jsonfield code.
- Added new package backports.ssl_match_hostname for portable build script.
- Used new app "django-ckeditor-updated" to render WYSIWYG html editors. Removed CKEditor from sources.
- Only reload the webserver in debug-mode.
## Version 1.5.1 (2014-03-31)
https://github.com/OpenSlides/OpenSlides/milestones/1.5.1
**Projector:**
- Fixed path and config help text for logo on the projector.
**Agenda:**
- Fixed permission error in the list of speakers widget.
- Fixed Item instance method is_active_slide().
**Motion:**
- Fixed sorting of motions concerning the identifier. Used natsort and DataTables Natural Sort Plugin.
**Participant:**
- Added permission to see participants to the manager group.
- Fixed user status view for use without Javascript.
**Files:**
- Fixed error when an uploaded file was removed from filesystem.
**Other:**
- Set minimum Python version to 2.6.9. Fixed setup file for use with Python 2.6.
- Used unicode font for circle in ballot pdf. Removed Pillow dependency package.
- Fixed http status code when requesting a non-existing static page using Tornado web server.
- Fixed error in main script when using other database engine.
- Fixed error on motion PDF with nested lists.
## Version 1.5 (2013-11-25)
https://github.com/OpenSlides/OpenSlides/milestones/1.5
**Projector:**
- New feature: Show PDF presentations on projector (with included pdf.js).
- Improved projector update process via new websocket API (using sockjs and tornado).
- New projector template with twitter bootstrap.
- Improved projector zoom and scroll behaviour.
**Agenda:**
- New config option: couple countdown with list of speakers.
- Used HTML editor (CKEditor) for agenda item text field.
- Added additional input format for agenda item duration field.
**Motions:**
- Enabled attachments for motions.
- Refactored warnings on CSV import view.
**Elections:**
- Refactored assignment app to use class based views instead of functions.
**Polls:**
- Added percent base to votes cast values.
**Participants:**
- Updated access data PDF: WLAN access (with QRCode for WLAN ssid/password) and OpenSlides access (with QRCode for system URL), printed on a single A4 page for each participant.
**Other:**
- Full text search integration (with Haystack and Whoosh).
- New start script with new command line options (see python manage.py --help)
- Fixed keyerror on user settings view.
- New messages on success or error of many actions like creating or editing objects.
- Changed messages backend, used Django's default now.
- A lot of template fixes and improvements.
- Extended css style options in CKEditor.
- Added feature to config app to return the default value for a key.
- Cleaned up OpenSlides utils views.
- Improved README (now with install instructions and used components).
- Updated all required package versions.
- Used flake8 instead of pep8 for style check, sort all import statements with isort.
- Added Portuguese translation (Thanks to Marco A. G. Pinto).
- Switched to more flexible versions of required third party packages.
- Updated to Django 1.6.x.
- Updated German documentation.
- Change license from GPLv2+ to MIT, see LICENSE file.
## Version 1.4.2 (2013-09-10)
https://github.com/OpenSlides/OpenSlides/milestones/1.4.2
- Used jQuery plugin bsmSelect for better ``<select multiple>`` form elements.
- New config option to disable paragraph numbering in motion pdf. (Default value: disabled.)
- Removed max value limitation in config field 'motion_min_supporters'.
- Removed supporters signature field in motion pdf.
- Fixed missing creation time of motion version. Show now string if identifier is not set (in widgets and motion detail).
- Fixed error when a person is deleted.
- Fixed deleting of assignments with related agenda items.
- Fixed wrong ordering of agenda items after order change.
- Fixed error in portable version: Open browser on localhost when server listens to 0.0.0.0.
- Fixed typo and updated translations.
- Updated CKEditor from 4.1.1 to 4.2. Fixed errors in MS Internet Explorer.
- Updated to Django 1.5.2.
## Version 1.4.1 (2013-07-29)
https://github.com/OpenSlides/OpenSlides/milestones/1.4.1
- Fixed tooltip which shows the end of each agenda item.
- Fixed duration of agenda with closed agenda items.
- Disabled deleting active version of a motion.
- Start browser on custom IP address.
- Fixed wrong URLs to polls in motion detail view.
- Added Czech translation.
## Version 1.4 (2013-07-10)
https://github.com/OpenSlides/OpenSlides/milestones/1.4
**Agenda:**
- New feature: list of speakers for each agenda item which saves begin and end time of each speaker; added new widget and overlay on the dashboard for easy managing and presenting lists of speakers.
- New item type: organisational item (vs. agenda item).
- New duration field for each item (with total time calculation for end time of event).
- Better drag'n'drop sorting of agenda items (with nestedSortable jQuery plugin).
**Motions:**
- Integrated CKEditor to use allowed HTML formatting in motion text/reason. With server-side whitelist filtering of HTML tags (with bleach) and HTML support for reportlab in motion pdf.
- New motion API.
- Support for serveral submitters.
- New workflow concept with two built-in workflows:
1) complex workflow (like in OpenSlides <= v1.3)
2) simple workflow (only 4 states: submitted -> acceptednot decided; no versioning)
- Categories for grouping motions.
- New modifiable identifier.
- New motion version diff view. Improved history table in motion detail view.
- New config variable 'Stop submitting of new motions' (for non-manager users).
- Updated motion status log.
- Updated csv import.
**Participants:**
- New feature: qr-code for system url on participants password pdf.
- Update default groups and permissions.
- New participant field: 'title'.
- Removed participants field 'type'. Use 'group' field instead. Updated csv import.
- Added warning if non-superuser removes his last group containing permission to manage participants.
**Other:**
- New html template based on twitter bootstrap.
- New GUI frontend for the Windows portable version.
- New command to backup sqlite database.
- New mediafile app (files) to upload/download files via frontend.
- Used Tornado web server (instead of Django's default development server).
- Updated win32 portable version to use Tornado.
- Integrated DataTables jQuery plugin for overview tables of motions, elections and participants (for client side sorting/filtering/pagination).
- New overlay API for projector view.
- New config app: Apps have to define config vars only once; config pages and forms are created automatically.
- Moved version page out of the config app.
- Changed version number api for plugins.
- Moved widget with personal info to account app. Inserted info about lists of speakers.
- Updated to Django 1.5.
- Dropped support for python 2.5.
- Updated packaging (setup.py and portable).
- Open all PDFs in a new tab.
- Changed Doctype to HTML5.
- Updated German documentation (especially sections about agenda and motions).
- Several minor fixes and improvements.
## Version 1.3.1 (2013-01-09)
https://github.com/OpenSlides/OpenSlides/milestones/1.3.1
- Fixed unwanted automatical language switching on projector view if more than one browser languages send projector request to OpenSlides (#434)
## Version 1.3 (2012-12-10)
https://github.com/OpenSlides/OpenSlides/milestones/1.3
**Projector:**
- New public dashboard which allows access for all users per default. (#361) (changed from the old, limited projector control page)
- New dashboard widgets:
- welcome widget (shows static welcome title and text)
- participant widget
- group widget
- personal widget (shows my motions and my elections)
- Hide scrollbar in projector view.
- Added cache for AJAX version of the projector view.
- Moved projector control icons into projector live widget. (#403)
- New weight field for custom slides (to order custom slides in widget).
- Fixed drag'n'drop behaviour of widgets into empty dashboard column.
- Fixed permissions for agenda, motion and assignment widgets (set to projector.can_manage_projector).
**Agenda:**
- Fixed slide error if agenda item deleted. (#330)
**Motions:**
- Translation: Changed 'application' to 'motion'.
- Fixed: Manager could not edit supporters. (#336)
- Fixed attribute error for anonymous users in motion view. (#329)
- Set default sorting of motions by number (in widget).
- CSV import allows to import group as submitter. (#419)
- Updated motion code for new user API.
- Rewrote motion views as class based views.
**Elections:**
- User can block himself/herself from candidate list after delete his/her candidature.
- Show blocked candidates in separate list.
- Mark elected candidates in candidate list. (#374)
- Show linebreaks in description. (#392)
- Set default sorting of elections by name (in widget).
- Fixed redirect from a poll which does not exists anymore.
- Changed default permissions of anonymous user to see elections. (#334)
- Updated assignment code for new user API.
**Participants:**
- New user and group API.
- New group option to handle a group as participant (and thus e.g. as submitter of motion).
- CSV import does not delete existing users anymore and append users as new users.
- New user field 'about me'. (#390)
- New config option for sorting users by first or last name (in participant lists, elections and motions). (#303)
- Allowed whitespaces in username, default: ``<firstname lastname>`` (#326)
- New user and group slides. (#176)
- Don't allow to deactivate the administrator or themself.
- Don't allow to delete themself.
- Renamed participant field 'groups' to 'structure level' (German: Gliederungsebene).
- Rewrote participant views as class based views.
- Made OpenSlides user a child model of Django user model.
- Appended tests.
- Fixed error to allow admins to delete anonymous group
**Other:**
- Added French translation (Thanks to Moira).
- Updated setup.py to make an openslides python package.
- Removed frontpage (welcome widget contains it's content) and redirect '/' to dashboard url.
- Added LOCALE_PATHS to openslides_settings to avoid deprecation in Django 1.5.
- Redesigned the DeleteView (append QuestionMixin to send question via the django message API).
- Fixed encoding error in settings.py. (#349)
- Renamed openslides_settings.py to openslides_global_settings.py.
- New default path to database file (XDG_DATA_HOME, e.g. ~/.local/share/openslides/).
- New default path to settings file (XDG_CONFIG_HOME, e.g. ~/.config/openslides/).
- Added special handling to determine location of database and settings file in portable version.
- Don't use similar characters in generated passwords (no 'Il10oO').
- Localised the datetime in PDF header. (#296)
- Used specific session cookie name. (#332)
- Moved code repository from hg to git (incl. some required updates, e.g. version string function).
- Updated German translations.
- Several code optimizations.
- Several minor and medium issues and errors were fixed.
## Version 1.2 (2012-07-25)
https://github.com/OpenSlides/OpenSlides/milestones/1.2
**General:**
- New welcome page with customizable title and text.
- OpenSlides portable win32 binary distribution.
- New start script (start.py) to automatically create the default settings and the database, start the server and the default browser.
- Add plugin system. Allow other django-apps to interact with OpenSlides.
**Projector:**
- New projector dashboard to control all slides on projector.
- New projector live view on projector dashboard.
- Countdown calculation works now on server-side.
- New Overlay messages to show additional information on a second projector layer.
- Add custom slides.
- Add a welcome slide.
- Project application and assignment slides without an agenda item.
- Update the projector once per second (only).
**Agenda:**
- Add new comment field for agenda items.
**Elections (Assignments):**
- New config option to publish voting results for selected winners only.
**Applications:**
- Now, it's possible to deactivate the whole supporter system.
- New import option: set status of all imported applications to 'permit'.
- More log entries for all application actions.
**Participant:**
- Add new comment field for participants.
- Show translated permissions strings in user rols form.
- Admin is redirect to 'change password' page.
- New default user name: "firstname lastname".
**Other:**
- Use Django's class based views.
- Update to Django 1.4. Drop python 2.4 support for this reason.
- Separate the code for the projector.
- Rewrite the vote results table.
- Rewrite the poll API.
- Rewrite the config API. (Now any data which are JSON serializable can be stored.)
- Improved CSV import for application and participants.
- GUI improvements of web interface (e.g. sub navigations, overview tables).
- Several minor and medium issues and errors were fixed.
## Version 1.1 (2011-11-15)
https://github.com/OpenSlides/OpenSlides/milestones/1.1
**Agenda:**
- [Feature] Agenda overview: New item-done-column for all non-manager (#7)
- [Feature] Allow HTML-Tags in agenda item of text (#12)
- [Feature] Split up hidden agenda items in new agenda table section (#13)
**Projector:**
- [Feature] Assignment projector view layout improvements (#9)
- [Bugfix] Zoom problem for sidebar div in beamer view (#5)
- [Bugfix] Blue 'candidate elected line' not visible in projector ajax view (#6)
- [Bugfix] Assignment projector view: Show results for elected candidates only (#11)
- [Bugfix] Missing beamer scaling (#2)
- [Bugfix] Assigment projector view: Removed empty character for no results cell. (#10)
**Applications:**
- [Feature] Import applications (#55)
- [Feature] Support trivial changes to an application (#56)
- [Bugfix] Order submitter and supporter form fields by full name (#53)
- [Bugfix] Application: Show profile instead of submitter username (#15)
- [Bugfix] "Application: Only check enough supports in status ""pub""" (#16)
**Elections:**
- [Feature] New button to show agenda item of selected application/assignment (#54)
- [Feature] Open add-user-url in new tab. (#32)
**Applications/Elections:**
- [Feature] Show voting results in percent (#48)
**Participants:**
- [Feature] Filter displayed permissions in group editor (#59)
- [Feature] Generate password after user creation automatically (#58)
- [Bugfix] Encoding error (#1)
- [Bugfix] List of participants (pdf) link not visible for users with see-particiants-permissions (#3)
- [Bugfix] Use user.profile.get_type_display() instead of user.profile.type (#4)
**PDF:**
- [Feature] Mark elected candidates in PDF (#31)
- [Feature] New config option to set title and preamble text for application and assignment pdf (#33)
- [Feature] New config option to set number of ballots in PDF (#26)
- [Bugfix] Assignment ballot pdf: Wrong line break in group name with brackets (#8)
- [Bugfix] Print available candidates in assignment pdf (#14)
- [Bugfix] Show "undocumented" for result "-2" in application and assignment pdf (#17)
**Other:**
- [Feature] Rights for anonymous (#45)
- [Feature] Show counter for limited speaking time (#52)
- [Feature] Reorderd config tab subpages (#61)
- [Localize] i18n German: Use gender-specific strings (#51)
- [Bugfix] ``<button>`` inside ``<a>`` tag not working in IE (#57)
- [Bugfix] Change default sort for tables of applications, assignments, participants (#27)
## Version 1.0 (2011-09-12)
https://github.com/OpenSlides/OpenSlides/tree/1.0/

1215
CHANGELOG.rst Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,159 +0,0 @@
# Development of OpenSlides 4
## Requirements
You need git, bash, docker, docker-compose, make and openssl installed.
Go is needed to install https://github.com/FiloSottile/mkcert (but Go is not a requirement to start the development server). The development setup uses HTTPS per default. OpenSlides does not work with HTTP anymore since features are required (like http2) that only works in a secure environment.
## Before starting the development
Clone this repository:
$ git clone --recurse-submodules git@github.com:OpenSlides/OpenSlides.git
After cloning you need to initialize all submodules:
$ git submodule update --init
Finally, start the development server:
$ make run-dev
(This command won't run without sudo, or without having set up Docker to run without sudo - see their documentation)
You can access the services independently using their corresponding ports
or access the full stack on
$ https://localhost:8000
## Running tests
To run all tests of all services, execute `run-service-tests`. TODO: Systemtests in this repo.
## Adding a new Service
$ git submodule add <git@myrepo.git>
Append `branch = main` to the new entry in the `.gitmodules` file. Verify,
that it is there (the folder should have 160000 permissions: Submodule) with the
current commit:
$ git diff --cached
Then, commit changes and create a pull request.
## Work in submodules
Create your own fork at github.
Remove the upstream repo as the origin in the submodule:
$ cd <submodule>
$ git remote remove origin
Add your fork and the main repo as origin and upstream
$ git remote add origin `<your fork>`
$ git remote add upstream `<main repo>`
$ git fetch --all
$ git checkout origin main
You can verify that your setup is correct using
$ git remote -v
The output should be similar to
origin git@github.com:<GithubUsername>/OpenSlides.git (fetch)
origin git@github.com:<GithubUsername>/OpenSlides.git (push)
upstream git@github.com:OpenSlides/OpenSlides.git (fetch)
upstream git@github.com:OpenSlides/OpenSlides.git (push)
## Requirements for services
### Environment variables
These environment variables are available:
- `<SERVICE>_HOST`: The host from a required service
- `<SERVICE>_PORT`: The port from a required service
Required services can be `MESSAGE_BUS`, `DATASTORE_WRITER`, `PERMISSION`, `AUTOUPDATE`,
etc. For private services (e.g. a database dedicated to exactly one service),
use the following syntax: `<SERVICE>_<PRIV_SERVICE>_<ATTRIBUTE>`, e.g. the
Postgresql user for the datastore: `DATASTORE_POSTGRESQL_USER`.
### Makefile
A makefile must be provided at the root-level of the service. The currently
required (phony) targets are:
- `run-tests`: Execute all tests from the submodule
- `build-dev`: Build an image with the tag `openslides-<service>-dev`
### Build arguments in the Dockerfile
These build arguments should be supported by every service:
- `REPOSITORY_URL`: The git-url for the repository to use
- `GIT_CHECKOUT`: A branch/tag/commit to check out during the build
Note that meaningful defaults should be provided in the Dockerfile.
## Developing on a single service
Go to the serivce and create a new branch (from main):
$ cd my-service
$ git status # -> on main?
$ git checkout -b my-feature
Run OpenSlides in development mode (e.g. in a new terminal):
$ make run-dev
After making some changes in my-service, create a commit and push to your fork
$ git add -A
$ git commit -m "A meaningful commit message here"
$ git push origin -u my-feature
As the last step, you can create a PR on Github. After merging, these steps are
required to be executed in the main repo:
$ cd my-service
$ git pull upstream main
$ cd ..
$ git diff # -> commit hash changed for my-service
If the update commit should be a PR:
$ git checkout -b updated-my-service
$ git commit -am "Updated my-service"
$ git push origin updated-my-service
Or a direct push on main:
$ git commit -am "Updated my-service"
$ git push origin main
## Working with Submodules
After working in many services with different branches, this command checks
out `main` (or the given branch in the .gitmodules) in all submodules and
pulls main from upstream (This requres to have `upstream`set up as a remote
in all submodules):
$ git submodule foreach -q --recursive 'git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo main); git pull upstream $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo main)'
This command has can also be called from the makefile using:
$ make services-to-main
When changing the branch in the main repo (this one), the submodules do not
automatically gets changed. THis ocmmand checks out all submodules to the given
commits in the main repo:
$ git submodule update

93
DEVELOPMENT.rst Normal file
View File

@ -0,0 +1,93 @@
========================
OpenSlides Development
========================
Check requirements
''''''''''''''''''
- ``docker``
- ``docker-compose``
- ``git``
- ``make``
**Note about migrating from development setups before version 3.4**: You must set the
``OPENSLIDES_USER_DATA_DIR`` variable in your ``server/personal_data/var/settings.py``
to ``'/app/personal_data/var'``. Another way is to just delete this file. It is
recreated with the right paths afterwards.
Get OpenSlides source code
''''''''''''''''''''''''''
Clone current master version from `OpenSlides GitHub repository
<https://github.com/OpenSlides/OpenSlides/>`_::
git clone https://github.com/OpenSlides/OpenSlides.git --recurse-submodules
cd OpenSlides
When updating the repository, submodules must be updated explicitly, too::
git submodule update
Start the development setup
'''''''''''''''''''''''''''
Use `make` to start the setup::
make run-dev
All your data (database, config, mediafiles) is stored in ``server/personal_data/var``.
To stop the setup press Ctrl+C. To clean up the docker containers run::
make stop-dev
Running the test cases
''''''''''''''''''''''
For all services in submodules check out the documentation there.
Server tests and scripts
------------------------
You need to have python (>=3.8) and python-venv installed. Change your workdirectory to the server::
cd server
Setup an python virtual environment. If you have already done it, you can skip this step::
python3 -m venv .venv
source .venv/bin/activate
pip install -U -r requirements.txt
Make sure you are using the correct python version (e.g. try with explicit minor version: ``python3.8``). Activate it::
source .venv/bin/activate
To deactivate it type ``deactivate``. Running all tests and linters::
black openslides/ tests/
flake8 openslides/ tests/
mypy openslides/ tests/
isort -rc openslides/ tests/
pytest tests/
Client tests
------------
You need `node` and `npm` installed. Change to the client's directory. For the first time, install all dependencies::
cd client/
npm install
Run client tests::
npm test
Fix the code format and lint it with::
npm run cleanup
To extract translations run::
npm run extract

View File

@ -1,6 +1,6 @@
MIT License
The MIT License (MIT)
Copyright (c) Since 2011 Authors of OpenSlides, see AUTHORS
Copyright (c) 2011-2021 Authors of OpenSlides, see AUTHORS
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@ -1,52 +1,23 @@
run-integration-tests:
@echo "Start OpenSlides Dev"
make run-dev ARGS="-d"
@echo "Start integration tests"
make cypress-docker
docker-compose -f integration/docker-compose.yml up
@echo "Stop OpenSlides Dev"
make stop-dev
run-service-tests:
git submodule foreach 'make run-tests'
build-dev:
./dev-commands/submodules-do.sh 'make build-dev'
make -C proxy build-dev
make -C caddy build-dev
git submodule foreach 'make build-dev'
docker-compose -f docker/docker-compose.dev.yml build
run-dev: | build-dev
docker-compose -f docker/docker-compose.dev.yml up $(ARGS)
run-dev-otel: | build-dev
docker-compose -f docker/docker-compose.dev.yml -f docker/dc.otel.dev.yml up $(ARGS)
USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker-compose -f docker/docker-compose.dev.yml up
stop-dev:
docker-compose -f docker/docker-compose.dev.yml down --volumes --remove-orphans
docker-compose -f docker/docker-compose.dev.yml down
stop-dev-otel:
docker-compose -f docker/docker-compose.dev.yml -f docker/dc.otel.dev.yml down --volumes --remove-orphans
copy-node-modules:
docker-compose -f docker/docker-compose.dev.yml exec client bash -c "cp -r /app/node_modules/ /app/src/"
mv openslides-client/client/src/node_modules/ openslides-client/client/
server-shell:
docker-compose -f docker/docker-compose.dev.yml run --entrypoint="" server docker/wait-for-dev-dependencies.sh
USER_ID=$$(id -u $${USER}) GROUP_ID=$$(id -g $${USER}) docker-compose -f docker/docker-compose.dev.yml run --entrypoint="" server bash
docker-compose -f docker/docker-compose.dev.yml down
reload-proxy:
docker-compose -f docker/docker-compose.dev.yml exec -w /etc/caddy proxy caddy reload
services-to-main:
./services-to-main.sh
submodules-origin-to-upstream:
# You may only use this one time after cloning this repository.
# Will set the upstream remote to "origin"
git submodule foreach -q --recursive 'git remote rename origin upstream'
cypress-open:
cd integration; npm run cypress:open
cypress-run:
cd integration; npm run cypress:run
cypress-docker:
docker-compose -f integration/docker-compose.yml build
docker-compose -f integration/docker-compose.yml up
clear-cache:
docker-compose -f docker/docker-compose.dev.yml exec redis redis-cli flushall
docker-compose -f docker/docker-compose.dev.yml restart autoupdate
docker-compose -f docker/docker-compose.dev.yml restart server

View File

@ -1,57 +0,0 @@
# OpenSlides
## What is OpenSlides?
OpenSlides is a free, web based presentation and assembly system for
managing and projecting agenda, motions and elections of an assembly. See
https://openslides.com for more information.
## Using OpenSlides productively
__OpenSlides 4 (this) is currently in beta version!__
If you are just looking to use OpenSlides in a productive manner, please refer
to the [OpenSlides 3.4 (stable)](https://github.com/OpenSlides/OpenSlides/tree/stable/3.4.x)
## Installation
### Requirements
You need [Docker](https://docs.docker.com/engine/install/) and [Docker
Compose](https://docs.docker.com/compose/install/).
### Setup OpenSlides
For a productive setup of OpenSlides get the [OpenSlides manage
tool](https://github.com/OpenSlides/openslides-manage-service/releases/tag/latest)
from GitHub and make it executable. E. g. run:
$ wget https://github.com/OpenSlides/openslides-manage-service/releases/download/latest/openslides
$ chmod +x openslides
Then follow the instructions outlined in the [OpenSlides Manage
Service](https://github.com/OpenSlides/openslides-manage-service).
## Development
For further information about developing OpenSlides, refer to [the development
readme](DEVELOPMENT.md).
### Architecture of OpenSlides 4
![System architecture of OpenSlides 4](https://raw.githubusercontent.com/wiki/OpenSlides/OpenSlides/OS4/img/OpenSlides4.svg)
Read more about our [concept of OpenSlides 4.0](https://github.com/OpenSlides/OpenSlides/wiki/DE%3AKonzept-OpenSlides-4).
The technical documentation about the internals, requests and functionality can
be found [in the wiki](https://github.com/OpenSlides/OpenSlides/wiki/DE%3AKonzept-OpenSlides-4).
## License and authors
OpenSlides is Free/Libre Open Source Software (FLOSS), and distributed
under the MIT License, see ``LICENSE`` file. The authors of OpenSlides are
mentioned in the ``AUTHORS`` file.

159
README.rst Normal file
View File

@ -0,0 +1,159 @@
============
OpenSlides
============
What is OpenSlides?
===================
OpenSlides is a free, web-based presentation and assembly system for
managing and projecting agenda, motions, and elections of assemblies. See
https://openslides.com for more information.
Installation
============
The main deployment method is using Git, Docker and Docker Compose. You only need
to have these tools installed and no further dependencies (m4 may not come preinstalled on your system). If you want a simpler
setup or are interested in developing, please refer to `development
instructions <DEVELOPMENT.rst>`_.
Get OpenSlides
--------------
First, you have to clone this repository to the latest stable branch::
git clone -b stable/3.4.x --single-branch https://github.com/OpenSlides/OpenSlides.git --recurse-submodules
**Note about migrating from version 3.3 or earlier**: With OpenSlides 3.4 submodules
and a Docker setup were introduced. If you ran into problems try to delete your
``settings.py``. If you have an old checkout you need to check out the current master
first and initialize all submodules::
git submodule update --init
Setup Docker Compose
--------------------
You need to build the Docker images and have to setup some configuration. First,
configure HTTPS by checking the `Using HTTPS`_ section. In this section are
reasons why HTTPS is required for large deployments.
Go to ``docker`` subdirectory::
cd docker
Then build all images with this script::
./build.sh all
You must define a Django secret key in ``secrets/django.env``, for example::
printf "DJANGO_SECRET_KEY='%s'\n" \
"$(tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 64)" > secrets/django.env
We also strongly recommend that you set a secure admin password but it is not
strictly required. If you do not set an admin password, the default login
credentials will be displayed on the login page. Setting the admin password::
cp secrets/adminsecret.env.example secrets/adminsecret.env
vi secrets/adminsecret.env
Afterwards, generate the configuration file::
m4 docker-compose.yml.m4 > docker-compose.yml
You can configure OpenSlides using the `.env` file. See `More settings`_. Another
hint: If you choose to deploy the default configuration, a https certificate is
needed, so make sure you have set it up beforehand.
Finally, you can start the instance using ``docker-compose``::
docker-compose up
OpenSlides is accessible on https://localhost/ (or https, if configured).
You can also use daemonized instance::
docker-compose up -d
docker-compose logs
docker-compose down
Using HTTPS
-----------
The main reason (next to obviously security ones) HTTPS is required originates
from the need of HTTP/2. OpenSlides uses streaming responses to asynchronously
send data to the client. With HTTP/1.1 one TCP-Connection per request is opened.
Browsers limit the amount of concurrent connections
(`reference <https://docs.pushtechnology.com/cloud/latest/manual/html/designguide/solution/support/connection_limitations.html>`_),
so you are limited in opening tabs. HTTPS/2 just uses one connection per browser
and eliminates these restrictions. The main point to use HTTPS is that browsers
only use HTTP/2 if HTTPS is enabled.
Setting up HTTPS
""""""""""""""""
Use common providers for retrieving a certificate and private key for your
deployment. Place the certificate and private key in ``caddy/certs/cert.pem``
and ``caddy/certs/key.pem``. To use a self-signed localhost certificate, you can
execute ``caddy/make-localhost-cert.sh``.
The certificate and key are put into the docker image into ``/certs/``, so
setting up these files needs to be done before calling ``./build.sh``. When you
update the files, you must run ``./build.sh proxy`` again. If you want to have a
more flexible setup without the files in the image, you can also mount the
folder or the certificate and key into the running containers if you wish to do
so.
If both files are not present, OpenSlides will be configured to run with HTTP
only. When mounting the files make sure, that they are present during the
container startup.
Caddy, the proxy used, wants the user to persist the ``/data`` directory. If you
are going to use HTTPS add a volume in your ``docker-compose.yml`` /
``docker-stack.yml`` persisting the ``/data`` directory.
More settings
-------------
When generating the ``docker-compose.yml``, more settings can be adjusted in the
``docker/.env`` file. All changes for the backend are passed into djangos ``settings.py``.
You can find more information about most settings in the `settings documentation
<server/SETTINGS.rst>`_. To generate the ``docker-compose.yml`` use this command::
cd docker
( set -a; source .env; m4 docker-compose.yml.m4 ) > docker-compose.yml
For an advanced database setup refer to the `advanced configuration
<ADVANCED.rst>`_.
Bugs, features and development
================================
Feel free to open issues here on GitHub! Please use the right templates for
bugs and features, and use them correctly. Pull requests are also welcome. For
a general overview of the development setup refer the `development instructions
<DEVELOPMENT.rst>`_.
For security relevant issues **do not** create public issues and refer to
our `security policy <SECURITY.md>`_.
Used software
=============
OpenSlides uses the following projects or parts of them:
* several Python packages (see ``server/requirements/production.txt``)
* several JavaScript packages (see ``client/package.json``)
License and authors
===================
OpenSlides is Free/Libre Open Source Software (FLOSS), and distributed
under the MIT License, see `LICENSE file <LICENSE>`_. The authors of OpenSlides are
mentioned in the `AUTHORS file <AUTHORS>`_.

14
SECURITY.md Normal file
View File

@ -0,0 +1,14 @@
# Security Policy
## Supported Versions
Currently the recent versions (a year old at max) of the current major
release are supported to get security fixes. For older versions we urge
you to update to the most recent version of OpenSlides.
## Reporting a Vulnerability
Please let us know about the vulnerability by an email to
[security@openslides.com](mailto:security@openslides.com). Do not create
public issues for such issues. We will get in touch with you after reporting
the issue.

1
autoupdate Submodule

@ -0,0 +1 @@
Subproject commit fa74dfe888dfeb4d071279eeaff5bc221ecf85f8

20
caddy/Caddyfile Normal file
View File

@ -0,0 +1,20 @@
import endpoint
import invalid_host*
reverse_proxy /system/* autoupdate:8002 {
flush_interval -1
}
@server {
path /apps/*
path /rest/*
path /server-version.txt
}
reverse_proxy @server server:8000
reverse_proxy /media/* media:8000
reverse_proxy client:4200
}
import redirect*

15
caddy/Caddyfile.dev Normal file
View File

@ -0,0 +1,15 @@
localhost:8000 {
reverse_proxy /system/* autoupdate:8002 {
flush_interval -1
}
@server {
path /apps/*
path /rest/*
path /server-version.txt
path /media/*
}
reverse_proxy @server server:8000
reverse_proxy client:4200
}

8
caddy/Dockerfile Normal file
View File

@ -0,0 +1,8 @@
FROM caddy:2.3.0-alpine
COPY Caddyfile /etc/caddy/Caddyfile
COPY entrypoint /entrypoint
COPY certs /certs
ENTRYPOINT ["/entrypoint"]
CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]

3
caddy/Dockerfile.dev Normal file
View File

@ -0,0 +1,3 @@
FROM caddy:2.3.0-alpine
COPY Caddyfile.dev /etc/caddy/Caddyfile

2
caddy/Makefile Normal file
View File

@ -0,0 +1,2 @@
build-dev:
docker build -t os3-proxy-dev -f Dockerfile.dev .

78
caddy/entrypoint Executable file
View File

@ -0,0 +1,78 @@
#!/bin/sh
set -e
if [[ -z "$EXTERNAL_HTTP_PORT" ]] && [[ -z "$EXTERNAL_HTTPS_PORT" ]]; then
echo "EXTERNAL_HTTP_PORT and EXTERNAL_HTTPS_PORT are not set. Aborting."
exit 1
fi
if [[ -f "/certs/key.pem" ]] && [[ -f "/certs/cert.pem" ]]; then
certs_exists=1
fi
if [[ -n "$EXTERNAL_HTTPS_PORT" ]] && [[ -z "$certs_exists" ]]; then
echo "Configured https, but no certificates found. Aborting"
exit 1
fi
# config: https
if [[ -n "$EXTERNAL_HTTPS_PORT" ]] ; then
cat <<EOF > /etc/caddy/endpoint
https://:8001 {
tls /certs/cert.pem /certs/key.pem
EOF
echo "Configured https"
fi
# config: http and no https
if [[ -n "$EXTERNAL_HTTP_PORT" ]] && [[ -z "$EXTERNAL_HTTPS_PORT" ]] ; then
echo "http://:8000 {" > /etc/caddy/endpoint
echo "Configured http only"
fi
# config: https and additionally http -> create redirect-file
if [[ -n "$EXTERNAL_HTTP_PORT" ]] && [[ -n "$EXTERNAL_HTTPS_PORT" ]] ; then
cat <<EOF > /etc/caddy/redirect
http://:8000 {
redir https://$INSTANCE_DOMAIN{uri}
}
EOF
echo "Configured http to https redirect"
fi
# Add allowed hosts from $ALLOWED_HOSTS
# If the variable is empty, all hosts are allowed.
# The hosts are ORed, so the request is valid, if one host matches.
# Example: ALLOWED_HOSTS="localhost:8000 127.0.0.1:8000"
#
# @invalid-host {
# not {
# header Host localhost:8000
# header Host 127.0.0.1:8000
# }
# }
# respond @invalid-host "Misdirected Request" 421 {
# close
# }
if [[ ! -z "$ALLOWED_HOSTS" ]]; then
cat <<EOF > /etc/caddy/invalid_host
@invalid-host {
not {
EOF
for host in $ALLOWED_HOSTS; do
echo " host $host" >> /etc/caddy/invalid_host
done
cat <<EOF >> /etc/caddy/invalid_host
}
}
respond @invalid-host "Misdirected Request" 421 {
close
}
EOF
echo "Configured allowed hosts: $ALLOWED_HOSTS"
else
echo "All hosts allowed"
fi
exec "$@"

View File

@ -4,8 +4,8 @@ set -e
cd "$(dirname "$0")"
if [[ -f "certs/key.pem" ]] || [[ -f "certs/cert.pem" ]]; then
echo "Certificate already exists."
exit 0
echo >&2 "Error: Certificate already exists."
exit 1
fi
if ! type 2>&1 >/dev/null openssl ; then

22
changelog-config.toml Normal file
View File

@ -0,0 +1,22 @@
Owner = "OpenSlides"
RepositoryName = "OpenSlides"
OutputType = "file"
FileName = "CHANGELOG.md"
CurrentRef = "master"
BaseBranch = "master"
PreviousRef = "3.3"
FutureCurrentRefName = "3.4"
ThresholdPreviousRef = 10
ThresholdCurrentRef = 10
Debug = false
DisplayLabel = false
# ignore everything labeld as "meta"
LabelExcludes = ["meta"]
LabelEnhancement = "feature"
LabelDocumentation = "documentation"
LabelBug = "bug"

7
client/.browserslistrc Normal file
View File

@ -0,0 +1,7 @@
last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
not IE 11

10
client/.compodocrc.json Normal file
View File

@ -0,0 +1,10 @@
{
"name": "OpenSlides Client Documentation",
"output": "../Compodoc/",
"tsconfig": "./tsconfig.json",
"disableCoverage": true,
"hideGenerator": true,
"theme": "material",
"customLogo": "./src/assets/img/openslides-logo.svg",
"customFavicon": "./src/assets/img/favicon.png"
}

4
client/.dockerignore Normal file
View File

@ -0,0 +1,4 @@
.git
**/node_modules
**/.vscode
build.sh

13
client/.editorconfig Normal file
View File

@ -0,0 +1,13 @@
# Editor configuration, see http://editorconfig.org
root = true
[*]
charset = utf-8
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
max_line_length = off
trim_trailing_whitespace = false

11
client/.prettierrc Normal file
View File

@ -0,0 +1,11 @@
{
"printWidth": 120,
"tabWidth": 4,
"singleQuote": true,
"useTabs": false,
"bracketSpacing": true,
"htmlWhitespaceSensitivity": "css",
"semi": true,
"trailingComma": "none",
"arrowParens": "avoid"
}

101
client/README.md Normal file
View File

@ -0,0 +1,101 @@
# OpenSlides 3 Client
### Documentation Info
The documentation can be generated by running `npm run compodoc`.
A new web server will be started on http://localhost:8080
Once running, the documentation will be updated automatically.
You can run it on another port, with adding your local port after the
command. If no port specified, it will try to use 8080.
Please document new code using JSDoc tags.
See https://compodoc.app/guides/jsdoc-tags.html for details.
### Translation
We are using ngx-translate for translation purposes.
Use `npm run extract` to extract strings and update elements an with translation functions.
Language files can be found in `/src/assets/i18n`.
### Used software
OpenSlides uses the following software or parts of them:
- [@angular/animations@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/cdk-experimental@12.1.1](https://github.com/angular/components), License: MIT
- [@angular/cdk@12.1.1](https://github.com/angular/components), License: MIT
- [@angular/common@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/compiler@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/core@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/forms@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/material-moment-adapter@12.1.1](https://github.com/angular/components), License: MIT
- [@angular/material@12.1.1](https://github.com/angular/components), License: MIT
- [@angular/platform-browser-dynamic@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/platform-browser@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/router@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/service-worker@12.1.1](https://github.com/angular/angular), License: MIT
- [@ngx-pwa/local-storage@12.0.0](https://github.com/cyrilletuzi/angular-async-local-storage), License: MIT
- [@ngx-translate/core@13.0.0](https://github.com/ngx-translate/core), License: MIT
- [@ngx-translate/http-loader@6.0.0](https://github.com/ngx-translate/http-loader), License: MIT
- [@pebula/ngrid-material@4.0.0-alpha.3](undefined), License: UNKNOWN
- [@pebula/ngrid@4.0.0-alpha.3](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/utils@1.0.2](undefined), License: UNKNOWN
- [@tinymce/tinymce-angular@4.2.4](https://github.com/tinymce/tinymce-angular), License: Apache-2.0
- [@videojs/http-streaming@2.9.1](https://github.com/videojs/http-streaming), License: Apache-2.0
- [acorn@8.4.1](https://github.com/acornjs/acorn), License: MIT
- [chart.js@2.9.4](https://github.com/chartjs/Chart.js), License: MIT
- [core-js@3.15.1](https://github.com/zloirock/core-js), License: MIT
- [css-element-queries@1.2.3](https://github.com/marcj/css-element-queries), License: MIT
- [exceljs@4.1.1](https://github.com/exceljs/exceljs), License: MIT
- [file-saver@2.0.2](https://github.com/eligrey/FileSaver.js), License: MIT
- [jszip@3.5.0](https://github.com/Stuk/jszip), License: (MIT OR GPL-3.0)
- [lz4js@0.2.0](https://github.com/Benzinga/lz4js), License: ISC
- [material-design-icons-iconfont@6.1.0](https://github.com/jossef/material-design-icons-iconfont), License: Apache-2.0
- [moment@2.27.0](https://github.com/moment/moment), License: MIT
- [ng-particles@2.6.0](https://github.com/matteobruni/tsparticles), License: MIT
- [ng2-charts@2.4.0](https://github.com/valor-software/ng2-charts), License: ISC
- [ng2-pdf-viewer@6.4.1](git+https://vadimdez@github.com/VadimDez/ng2-pdf-viewer), License: MIT
- [ngx-device-detector@2.0.0](undefined), License: MIT*
- [ngx-file-drop@11.1.0](https://github.com/georgipeltekov/ngx-file-drop), License: MIT
- [ngx-mat-select-search@3.3.0](https://github.com/bithost-gmbh/ngx-mat-select-search), License: MIT
- [ngx-material-timepicker@5.5.3](https://github.com/Agranom/ngx-material-timepicker), License: MIT
- [ngx-papaparse@4.0.4](https://github.com/alberthaff/ngx-papaparse), License: MIT
- [npm-license-crawler@0.2.1](http://github.com/mwittig/npm-license-crawler), License: BSD-3-Clause
- [pdfjs-dist@2.5.207](https://github.com/mozilla/pdfjs-dist), License: Apache-2.0
- [pdfmake@0.1.68](https://github.com/bpampuch/pdfmake), License: MIT
- [po2json@1.0.0-beta-2](https://github.com/mikeedwards/po2json), License: LGPL-2.0-or-later
- [rxjs@6.6.7](https://github.com/reactivex/rxjs), License: Apache-2.0
- [tinymce@5.7.1](https://github.com/tinymce/tinymce-dist), License: LGPL-2.1
- [tslib@2.3.0](https://github.com/Microsoft/tslib), License: 0BSD
- [tsparticles@1.23.0](https://github.com/matteobruni/tsparticles), License: MIT
- [video.js@7.13.3](https://github.com/videojs/video.js), License: Apache-2.0
- [zone.js@0.11.4](https://github.com/angular/angular), License: MIT
- [@angular-devkit/build-angular@12.1.1](https://github.com/angular/angular-cli), License: MIT
- [@angular-devkit/schematics@12.1.1](https://github.com/angular/angular-cli), License: MIT
- [@angular/cli@12.1.1](https://github.com/angular/angular-cli), License: MIT
- [@angular/compiler-cli@12.1.1](https://github.com/angular/angular), License: MIT
- [@angular/language-service@12.1.1](https://github.com/angular/angular), License: MIT
- [@biesbjerg/ngx-translate-extract-marker@1.0.0](https://github.com/biesbjerg/ngx-translate-extract-marker), License: MIT
- [@biesbjerg/ngx-translate-extract@7.0.4](https://github.com/biesbjerg/ngx-translate-extract), License: MIT
- [@compodoc/compodoc@1.0.9](https://github.com/compodoc/compodoc), License: MIT
- [@schematics/angular@10.0.8](https://github.com/angular/angular-cli), License: MIT
- [@types/jasmine@3.6.11](https://github.com/DefinitelyTyped/DefinitelyTyped), License: MIT
- [@types/node@14.6.2](https://github.com/DefinitelyTyped/DefinitelyTyped), License: MIT
- [@types/yargs@15.0.5](https://github.com/DefinitelyTyped/DefinitelyTyped), License: MIT
- [codelyzer@6.0.0](https://github.com/mgechev/codelyzer), License: MIT
- [husky@4.2.5](https://github.com/typicode/husky), License: MIT
- [jasmine-core@3.8.0](https://github.com/jasmine/jasmine), License: MIT
- [karma-chrome-launcher@3.1.0](https://github.com/karma-runner/karma-chrome-launcher), License: MIT
- [karma-coverage@2.0.3](https://github.com/karma-runner/karma-coverage), License: MIT
- [karma-jasmine-html-reporter@1.5.4](https://github.com/dfederm/karma-jasmine-html-reporter), License: MIT
- [karma-jasmine@4.0.1](https://github.com/karma-runner/karma-jasmine), License: MIT
- [karma@6.3.4](https://github.com/karma-runner/karma), License: MIT
- [prettier@2.3.2](https://github.com/prettier/prettier), License: MIT
- [protractor@7.0.0](https://github.com/angular/protractor), License: MIT
- [resize-observer-polyfill@1.5.1](https://github.com/que-etc/resize-observer-polyfill), License: MIT
- [ts-node@9.0.0](https://github.com/TypeStrong/ts-node), License: MIT
- [tslint@6.1.3](https://github.com/palantir/tslint), License: Apache-2.0
- [tsutils@3.17.1](https://github.com/ajafff/tsutils), License: MIT
- [typescript@4.3.5](https://github.com/Microsoft/TypeScript), License: Apache-2.0

174
client/angular.json Normal file
View File

@ -0,0 +1,174 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"client": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"root": "",
"sourceRoot": "src",
"prefix": "os",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "../server/openslides/static",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"assets": [
"src/assets",
"src/manifest.json",
{
"glob": "**/*",
"input": "node_modules/tinymce",
"output": "/tinymce/"
},
{
"glob": "pdf.worker.min.js",
"input": "node_modules/pdfjs-dist/build/",
"output": "/assets/js/"
}
],
"styles": ["src/styles.scss"],
"scripts": [
"node_modules/tinymce/tinymce.min.js",
"node_modules/video.js/dist/video.min.js",
"src/assets/jitsi/external_api.js"
],
"webWorkerTsConfig": "tsconfig.worker.json",
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"serviceWorker": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "5mb",
"maximumError": "10mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
},
"es5": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"tsConfig": "./tsconfig-es5.app.json"
},
"development": {}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
},
"configurations": {
"production": {
"browserTarget": "client:build:production"
},
"es5": {
"browserTarget": "client:build:es5"
},
"development": {
"browserTarget": "client:build:development"
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "client:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": ["src/styles.scss"],
"scripts": ["node_modules/tinymce/tinymce.min.js"],
"assets": [
"src/assets",
"src/manifest.json",
{
"glob": "**/*",
"input": "node_modules/tinymce/skins",
"output": "/tinymce/skins/"
},
{
"glob": "**/*",
"input": "node_modules/tinymce/themes",
"output": "/tinymce/themes/"
},
{
"glob": "**/*",
"input": "node_modules/tinymce/plugins",
"output": "/tinymce/plugins/"
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "tsconfig.spec.json",
"format": "stylish",
"exclude": ["**/node_modules/**"]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js"
},
"configurations": {
"production": {
"devServerTarget": "client:serve:production"
},
"development": {
"devServerTarget": "client:serve:development"
}
},
"defaultConfiguration": "development"
}
}
}
},
"defaultProject": "client"
}

1
client/build.sh Symbolic link
View File

@ -0,0 +1 @@
../server/build.sh

24
client/docker/Dockerfile Normal file
View File

@ -0,0 +1,24 @@
FROM node:16 AS nodejs
RUN mkdir -p /build/app
WORKDIR /build/app
RUN useradd -m openslides
RUN chown -R openslides /build/app
USER root
RUN npm install -g @angular/cli@^12
RUN ng config -g cli.warnings.versionMismatch false
USER openslides
COPY package.json package-lock.json ./
RUN npm -v
RUN npm ci
COPY .browserslistrc *.json ./
COPY src ./src
RUN npm run build-to-dir /build/app/static
COPY docker/client-version.txt static/
FROM nginx
COPY --from=nodejs /build/app/static /usr/share/nginx/html
COPY docker/nginx.conf /etc/nginx/nginx.conf

View File

@ -0,0 +1,12 @@
FROM node:16
WORKDIR /app
COPY package.json .
COPY package-lock.json .
RUN npm ci
RUN npm run postinstall
COPY . .
CMD npm start

33
client/docker/nginx.conf Normal file
View File

@ -0,0 +1,33 @@
worker_processes auto;
events {
worker_connections 32000;
}
http {
server {
listen 4200;
server_name localhost;
root /usr/share/nginx/html;
index index.html index.htm;
include /etc/nginx/mime.types;
# Optimizations for OpenSlides
client_max_body_size 100M;
proxy_connect_timeout 300s;
proxy_read_timeout 300s;
proxy_set_header Host $http_host;
gzip on;
gzip_min_length 1000;
gzip_proxied expired no-cache no-store private auth;
gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
location / {
try_files $uri $uri/ /index.html;
}
}
}

View File

@ -0,0 +1,26 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = {
allScriptsTimeout: 11000,
specs: ['./src/**/*.e2e-spec.ts'],
capabilities: {
browserName: 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
onPrepare() {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.e2e.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};

View File

@ -0,0 +1,14 @@
import { AppPage } from './app.po';
describe('workspace-project App', () => {
let page: AppPage;
beforeEach(() => {
page = new AppPage();
});
it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to client!');
});
});

11
client/e2e/src/app.po.ts Normal file
View File

@ -0,0 +1,11 @@
import { browser, by, element } from 'protractor';
export class AppPage {
navigateTo() {
return browser.get('/');
}
getParagraphText() {
return element(by.css('os-root h1')).getText();
}
}

View File

@ -0,0 +1,9 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": ["jasmine", "jasminewd2", "node"]
}
}

47
client/karma.conf.js Normal file
View File

@ -0,0 +1,47 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/1.0/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
jasmine: {
// you can add configuration options for Jasmine here
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
// for example, you can disable the random execution with `random: false`
// or set a specific seed with `seed: 4321`
},
},
jasmineHtmlReporter: {
suppressAll: true // removes the duplicated traces
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage/Test'),
subdir: '.',
reporters: [{ type: 'html' }, { type: 'text-summary' }]
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
customLaunchers: {
ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
}
},
singleRun: false,
restartOnFileChange: true
});
};

40
client/ngsw-config.json Normal file
View File

@ -0,0 +1,40 @@
{
"index": "/index.html",
"assetGroups": [
{
"name": "app",
"installMode": "prefetch",
"resources": {
"files": [
"/favicon.png",
"/index.html",
"/*.css",
"/*.js",
"/fira-sans*",
"/Material-Icons-Baseline.*"
]
}
},
{
"name": "assets",
"installMode": "lazy",
"updateMode": "prefetch",
"resources": {
"files": [
"/assets/**"
]
}
}
],
"dataGroups": [
{
"name": "api",
"urls": ["/rest/*", "/apps/*", "/system/*", "/stats"],
"cacheConfig": {
"maxSize": 0,
"maxAge": "0u",
"strategy": "freshness"
}
}
]
}

37662
client/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

117
client/package.json Normal file
View File

@ -0,0 +1,117 @@
{
"name": "OpenSlides3-Client",
"version": "3.4.0",
"repository": {
"type": "git",
"url": "git://github.com/OpenSlides/OpenSlides.git"
},
"license": "MIT",
"description": "OpenSlides 3.0 (Client)",
"README": "https://github.com/OpenSlides/OpenSlides/blob/master/client/README.md",
"scripts": {
"ng": "ng",
"ng-high-memory": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng",
"start": "npm run ng-high-memory -- serve --proxy-config proxy.conf.json --host=0.0.0.0",
"start-https": "npm run ng-high-memory -- serve --ssl --ssl-cert localhost.pem --ssl-key localhost-key.pem --proxy-config proxy.conf.json --host=0.0.0.0",
"start-es5": "npm run ng-high-memory -- serve --proxy-config proxy.conf.json --host=0.0.0.0 --configuration es5",
"build": "npm run ng-high-memory -- build --configuration production",
"build-to-dir": "npm run build -- --output-path",
"postinstall": "ngcc",
"build-debug": "npm run ng-high-memory -- build",
"test": "npm run ng-high-memory -- test",
"test-silently": "npm run test -- --watch=false --no-progress --browsers=ChromeHeadlessNoSandbox",
"test-live": "npm run test -- --watch=true --browsers=ChromeHeadlessNoSandbox",
"lint-check": "ng lint",
"lint-write": "ng lint --fix",
"e2e": "ng e2e",
"licenses": "node src/crawler.js",
"doc-serve": "./node_modules/.bin/compodoc -c .compodocrc.json -s -o -r",
"doc-build": "./node_modules/.bin/compodoc -c .compodocrc.json",
"extract": "ngx-translate-extract -i ./src -o ./src/assets/i18n/template-en.pot --clean --sort --format pot",
"po2json": "./node_modules/.bin/po2json -f mf src/assets/i18n/de.po src/assets/i18n/de.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/cs.po src/assets/i18n/cs.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/ru.po src/assets/i18n/ru.json",
"po2json-tempfix": "./node_modules/.bin/po2json -f mf src/assets/i18n/de.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/de.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/cs.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/cs.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/ru.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/ru.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/it.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/it.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/es.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/es.json",
"prettify-check": "prettier --config ./.prettierrc --list-different \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"",
"prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"",
"cleanup": "npm run prettify-write; npm run lint-write",
"cleanup-win": "npm run prettify-write & npm run lint-write"
},
"dependencies": {
"@angular/animations": "~12.1.1",
"@angular/cdk": "~12.1.1",
"@angular/cdk-experimental": "~12.1.1",
"@angular/common": "~12.1.1",
"@angular/compiler": "~12.1.1",
"@angular/core": "~12.1.1",
"@angular/forms": "~12.1.1",
"@angular/material": "~12.1.1",
"@angular/material-moment-adapter": "~12.1.1",
"@angular/platform-browser": "~12.1.1",
"@angular/platform-browser-dynamic": "~12.1.1",
"@angular/router": "~12.1.1",
"@angular/service-worker": "~12.1.1",
"@ngx-pwa/local-storage": "~12.0.0",
"@ngx-translate/core": "~13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"@pebula/ngrid": "4.0.0-alpha.3",
"@pebula/ngrid-material": "4.0.0-alpha.3",
"@pebula/utils": "1.0.2",
"@tinymce/tinymce-angular": "^4.2.4",
"@videojs/http-streaming": "^2.9.1",
"acorn": "^8.0.1",
"chart.js": "^2.9.3",
"core-js": "^3.6.5",
"css-element-queries": "^1.2.3",
"exceljs": "4.1.1",
"file-saver": "^2.0.2",
"jszip": "^3.7.1",
"lz4js": "^0.2.0",
"material-design-icons-iconfont": "6.1.0",
"moment": "^2.27.0",
"ng-particles": "^2.6.0",
"ng2-charts": "^2.4.0",
"ng2-pdf-viewer": "^6.4.1",
"ngx-device-detector": "^2.0.0",
"ngx-file-drop": "^11.1.0",
"ngx-mat-select-search": "^3.3.0",
"ngx-material-timepicker": "^5.5.3",
"ngx-papaparse": "^4.0.4",
"pdfjs-dist": "2.5.207",
"pdfmake": "^0.1.68",
"po2json": "^1.0.0-beta-2",
"rxjs": "^6.6.2",
"tinymce": "5.7.1",
"tslib": "^2.0.0",
"tsparticles": "^1.23.0",
"video.js": "^7.8.4",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~12.1.1",
"@angular-devkit/schematics": "^12.1.1",
"@angular/cli": "~12.1.1",
"@angular/compiler-cli": "~12.1.1",
"@angular/language-service": "~12.1.1",
"@biesbjerg/ngx-translate-extract": "^7.0.4",
"@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
"@compodoc/compodoc": "^1.0.9",
"@schematics/angular": "^10.0.8",
"@types/jasmine": "~3.6.0",
"@types/node": "^14.6.2",
"@types/yargs": "^15.0.4",
"codelyzer": "^6.0.0",
"husky": "^4.2.3",
"jasmine-core": "~3.8.0",
"karma": "^6.3.4",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"prettier": "2.3.2",
"protractor": "^7.0.0",
"resize-observer-polyfill": "^1.5.1",
"ts-node": "~9.0.0",
"tslint": "~6.1.3",
"tsutils": "3.17.1",
"typescript": "~4.3.5"
}
}

23
client/proxy.conf.json Normal file
View File

@ -0,0 +1,23 @@
{
"/apps/": {
"target": "http://localhost:8000",
"secure": false
},
"/media/": {
"target": "http://localhost:8000",
"secure": false
},
"/rest/": {
"target": "http://localhost:8000",
"secure": false
},
"/ws/": {
"target": "ws://localhost:8000",
"secure": false,
"ws": true
},
"/system/": {
"target": "https://localhost:8002",
"secure": false
}
}

4
client/sed_replacements Normal file
View File

@ -0,0 +1,4 @@
s/\\\\{/{/g
s/\\\\}/}/g
s/{0}ser%/%user%/g
s/{0}um%/%num%/g

View File

@ -0,0 +1,13 @@
import { AppRoutingModule } from './app-routing.module';
describe('AppRoutingModule', () => {
let appRoutingModule: AppRoutingModule;
beforeEach(() => {
appRoutingModule = new AppRoutingModule();
});
it('should create an instance', () => {
expect(appRoutingModule).toBeTruthy();
});
});

View File

@ -0,0 +1,42 @@
import { NgModule } from '@angular/core';
import { Route, RouterModule } from '@angular/router';
import { LoginLegalNoticeComponent } from './site/login/components/login-legal-notice/login-legal-notice.component';
import { LoginMaskComponent } from './site/login/components/login-mask/login-mask.component';
import { LoginPrivacyPolicyComponent } from './site/login/components/login-privacy-policy/login-privacy-policy.component';
import { LoginWrapperComponent } from './site/login/components/login-wrapper/login-wrapper.component';
import { ResetPasswordConfirmComponent } from './site/login/components/reset-password-confirm/reset-password-confirm.component';
import { ResetPasswordComponent } from './site/login/components/reset-password/reset-password.component';
import { UnsupportedBrowserComponent } from './site/login/components/unsupported-browser/unsupported-browser.component';
/**
* Global app routing
*/
const routes: Route[] = [
{
path: 'login',
component: LoginWrapperComponent,
children: [
{ path: '', component: LoginMaskComponent, pathMatch: 'full' },
{ path: 'reset-password', component: ResetPasswordComponent },
{ path: 'reset-password-confirm', component: ResetPasswordConfirmComponent },
{ path: 'legalnotice', component: LoginLegalNoticeComponent },
{ path: 'privacypolicy', component: LoginPrivacyPolicyComponent },
{ path: 'unsupported-browser', component: UnsupportedBrowserComponent }
]
},
{
path: 'projector',
loadChildren: () =>
import('./fullscreen-projector/fullscreen-projector.module').then(m => m.FullscreenProjectorModule),
data: { noInterruption: true }
},
{ path: '', loadChildren: () => import('./site/site.module').then(m => m.SiteModule) },
{ path: '**', redirectTo: '' }
];
@NgModule({
imports: [RouterModule.forRoot(routes, { onSameUrlNavigation: 'reload', relativeLinkResolution: 'legacy' })],
exports: [RouterModule]
})
export class AppRoutingModule {}

View File

@ -0,0 +1,3 @@
<div class="content">
<router-outlet></router-outlet>
</div>

View File

@ -0,0 +1,4 @@
.content {
flex: 1;
height: 100vh;
}

View File

@ -0,0 +1,247 @@
import { ApplicationRef, Component } from '@angular/core';
import { MatIconRegistry } from '@angular/material/icon';
import { DomSanitizer } from '@angular/platform-browser';
import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { first, tap } from 'rxjs/operators';
import { ChatNotificationService } from './site/chat/services/chat-notification.service';
import { ConfigService } from './core/ui-services/config.service';
import { ConstantsService } from './core/core-services/constants.service';
import { CountUsersService } from './core/ui-services/count-users.service';
import { DataStoreUpgradeService } from './core/core-services/data-store-upgrade.service';
import { LoadFontService } from './core/ui-services/load-font.service';
import { LoginDataService } from './core/ui-services/login-data.service';
import { OfflineService } from './core/core-services/offline.service';
import { OpenSlidesStatusService } from './core/core-services/openslides-status.service';
import { OpenSlidesService } from './core/core-services/openslides.service';
import { OperatorService } from './core/core-services/operator.service';
import { OverlayService } from './core/ui-services/overlay.service';
import { RoutingStateService } from './core/ui-services/routing-state.service';
import { ServertimeService } from './core/core-services/servertime.service';
import { ThemeService } from './core/ui-services/theme.service';
import { VotingBannerService } from './core/ui-services/voting-banner.service';
declare global {
/**
* Enhance array with own functions
* TODO: Remove once flatMap made its way into official JS/TS (ES 2019?)
*/
interface Array<T> {
flatMap(o: any): any[];
intersect(a: T[]): T[];
mapToObject(f: (item: T) => { [key: string]: any }): { [key: string]: any };
}
interface Set<T> {
equals(other: Set<T>): boolean;
}
/**
* Enhances the number object to calculate real modulo operations.
* (not remainder)
*/
interface Number {
modulo(n: number): number;
}
interface String {
decode(): string;
}
}
/**
* May only be created once since this thing is fat
*/
const domParser = new DOMParser();
/**
* Angular's global App Component
*/
@Component({
selector: 'os-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
})
export class AppComponent {
/**
* Master-component of all apps.
*
* Inits the translation service, the operator, the login data and the constants.
*
* Handles the altering of Array.toString()
*
* Most of the injected service are not used - this is ok. It is needed to definitly
* run their constructors at app loading time
*/
public constructor(
private matIconRegistry: MatIconRegistry,
private domSanitizer: DomSanitizer,
translate: TranslateService,
appRef: ApplicationRef,
servertimeService: ServertimeService,
openslidesService: OpenSlidesService,
openslidesStatus: OpenSlidesStatusService,
router: Router,
offlineService: OfflineService,
operator: OperatorService,
loginDataService: LoginDataService,
constantsService: ConstantsService,
themeService: ThemeService,
overlayService: OverlayService,
countUsersService: CountUsersService, // Needed to register itself.
configService: ConfigService,
loadFontService: LoadFontService,
dataStoreUpgradeService: DataStoreUpgradeService, // to start it.
routingState: RoutingStateService,
votingBannerService: VotingBannerService, // needed for initialisation,
chatNotificationService: ChatNotificationService
) {
// manually add the supported languages
translate.addLangs(['en', 'de', 'it', 'es', 'cs', 'ru']);
// this language will be used as a fallback when a translation isn't found in the current language
translate.setDefaultLang('en');
// get the browsers default language
const browserLang = translate.getBrowserLang();
// try to use the browser language if it is available. If not, uses english.
translate.use(translate.getLangs().includes(browserLang) ? browserLang : 'en');
// change default JS functions
this.overloadArrayFunctions();
this.overloadSetFunctions();
this.overloadModulo();
this.loadCustomIcons();
this.overloadDecodeString();
// Wait until the App reaches a stable state.
// Required for the Service Worker.
appRef.isStable
.pipe(
// take only the stable state
first(stable => stable),
tap(() => console.debug('App is now stable!'))
)
.subscribe(() => {
openslidesStatus.setStable();
servertimeService.startScheduler();
});
}
private overloadArrayFunctions(): void {
Object.defineProperty(Array.prototype, 'toString', {
value: function (): string {
let string = '';
const iterations = Math.min(this.length, 3);
for (let i = 0; i <= iterations; i++) {
if (i < iterations) {
string += this[i];
}
if (i < iterations - 1) {
string += ', ';
} else if (i === iterations && this.length > iterations) {
string += ', ...';
}
}
return string;
},
enumerable: false
});
Object.defineProperty(Array.prototype, 'flatMap', {
value: function (o: any): any[] {
const concatFunction = (x: any, y: any[]) => x.concat(y);
const flatMapLogic = (f: any, xs: any) => xs.map(f).reduce(concatFunction, []);
return flatMapLogic(o, this);
},
enumerable: false
});
Object.defineProperty(Array.prototype, 'intersect', {
value: function <T>(other: T[]): T[] {
let a = this;
let b = other;
// indexOf to loop over shorter
if (b.length > a.length) {
[a, b] = [b, a];
}
return a.filter(e => b.indexOf(e) > -1);
},
enumerable: false
});
Object.defineProperty(Array.prototype, 'mapToObject', {
value: function <T>(f: (item: T) => { [key: string]: any }): { [key: string]: any } {
return this.reduce((aggr, item) => {
const res = f(item);
for (const key in res) {
if (res.hasOwnProperty(key)) {
aggr[key] = res[key];
}
}
return aggr;
}, {});
},
enumerable: false
});
}
/**
* Adds some functions to Set.
*/
private overloadSetFunctions(): void {
Object.defineProperty(Set.prototype, 'equals', {
value: function <T>(other: Set<T>): boolean {
const difference = new Set(this);
for (const elem of other) {
if (difference.has(elem)) {
difference.delete(elem);
} else {
return false;
}
}
return !difference.size;
},
enumerable: false
});
}
/**
* This is not the fastest solution but the most reliable one.
* Certain languages and TinyMCE do not follow the any predictable
* behaviour when it comes to encoding UTF8.
* decodeURI and decodeURIComponent were not able to successfully
* replace any ;&*uml with something meaningfull.
*/
private overloadDecodeString(): void {
Object.defineProperty(String.prototype, 'decode', {
enumerable: false,
value(): string {
const doc = domParser.parseFromString(this, 'text/html');
return doc.body.textContent || '';
}
});
}
/**
* Enhances the number object with a real modulo operation (not remainder).
* TODO: Remove this, if the remainder operation is changed to modulo.
*/
private overloadModulo(): void {
Object.defineProperty(Number.prototype, 'modulo', {
value: function (n: number): number {
return ((this % n) + n) % n;
},
enumerable: false
});
}
private loadCustomIcons(): void {
this.matIconRegistry.addSvgIcon(
`clapping_hands`,
this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/svg/clapping_hands.svg')
);
}
}

View File

@ -0,0 +1,56 @@
import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
import { APP_INITIALIZER, ErrorHandler, NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ServiceWorkerModule } from '@angular/service-worker';
import { StorageModule } from '@ngx-pwa/local-storage';
import { AppLoadService } from './core/core-services/app-load.service';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { CoreModule } from './core/core.module';
import { environment } from '../environments/environment';
import { ErrorService } from './core/core-services/error.service';
import { httpInterceptorProviders } from './core/core-services/http-interceptors';
import { LoginModule } from './site/login/login.module';
import { OpenSlidesTranslateModule } from './core/translate/openslides-translate-module';
import { SlidesModule } from './slides/slides.module';
/**
* Returns a function that returns a promis that will be resolved, if all apps are loaded.
* @param appLoadService The service that loads the apps.
*/
export function AppLoaderFactory(appLoadService: AppLoadService): () => Promise<void> {
return () => appLoadService.loadApps();
}
/**
* Global App Module. Keep it as clean as possible.
*/
@NgModule({
declarations: [AppComponent],
imports: [
BrowserModule,
HttpClientModule,
HttpClientXsrfModule.withOptions({
cookieName: 'OpenSlidesCsrfToken',
headerName: 'X-CSRFToken'
}),
BrowserAnimationsModule,
OpenSlidesTranslateModule.forRoot(),
AppRoutingModule,
CoreModule,
LoginModule,
ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
SlidesModule.forRoot(),
StorageModule.forRoot({ IDBNoWrap: false })
],
providers: [
{ provide: APP_INITIALIZER, useFactory: AppLoaderFactory, deps: [AppLoadService], multi: true },
httpInterceptorProviders,
{ provide: ErrorHandler, useClass: ErrorService }
],
bootstrap: [AppComponent]
})
export class AppModule {}

View File

@ -0,0 +1,140 @@
import { Title } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { Permission } from './core/core-services/operator.service';
/**
* Provides functionalities that will be used by most components
* currently able to set the title with the suffix ' - OpenSlides'
*
* A BaseComponent is an OpenSlides Component.
* Components in the 'Side'- or 'projector' Folder are BaseComponents
*/
export abstract class BaseComponent {
/**
* To check permissions in templates using permission.[...]
*/
public permission = Permission;
/**
* To manipulate the browser title bar, adds the Suffix "OpenSlides"
*
* Might be a config variable later at some point
*/
private titleSuffix = ' - OpenSlides';
/**
* Holds the coordinates where a swipe gesture was used
*/
protected swipeCoord?: [number, number];
/**
* Holds the time when the user was swiping
*/
protected swipeTime?: number;
/**
* Determine to display a save hint
*/
public saveHint: boolean;
/**
* Settings for the TinyMCE editor selector
*/
public tinyMceSettings = {
base_url: '/tinymce', // Root for resources
suffix: '.min', // Suffix to use when loading resources
theme: 'silver',
language: null,
language_url: null,
inline: false,
statusbar: false,
browser_spellcheck: true,
image_advtab: true,
image_description: false,
link_title: false,
height: 320,
plugins: `autolink charmap code fullscreen image imagetools
lists link paste searchreplace`,
menubar: false,
contextmenu: false,
toolbar: `styleselect | bold italic underline strikethrough |
forecolor backcolor removeformat | bullist numlist |
link image charmap | code fullscreen`,
mobile: {
theme: 'mobile',
plugins: ['autosave', 'lists', 'autolink']
},
relative_urls: false,
remove_script_host: true,
paste_preprocess: this.pastePreprocess
};
public constructor(protected titleService: Title, protected translate: TranslateService) {
this.tinyMceSettings.language_url = '/assets/tinymce/langs/' + this.translate.currentLang + '.js';
this.tinyMceSettings.language = this.translate.currentLang;
}
/**
* Clean pasted HTML.
* If the user decides to copy-paste HTML (like from another OpenSlides motion detail)
* - remove all classes
* - remove data-line-number="X"
* - remove contenteditable="false"
*
* Not doing so would save control sequences from diff/linenumbering into the
* model which will open pandoras pox during PDF generation (and potentially web view)
* @param _
* @param args
*/
private pastePreprocess(_: any, args: any): void {
const getClassesRe: RegExp = new RegExp(/\s*class\=\"[\w\W]*?\"/, 'gi');
const getDataLineNumberRe: RegExp = new RegExp(/\s*data-line-number\=\"\d+\"/, 'gi');
const getContentEditableRe: RegExp = new RegExp(/\s*contenteditable\=\"\w+\"/, 'gi');
const cleanedContent = (args.content as string)
.replace(getClassesRe, '')
.replace(getDataLineNumberRe, '')
.replace(getContentEditableRe, '');
args.content = cleanedContent;
}
/**
* Set the title in web browser using angulars TitleService
* @param prefix The title prefix. Should be translated here.
*/
public setTitle(prefix: string): void {
const translatedPrefix = this.translate.instant(prefix);
this.titleService.setTitle(translatedPrefix + this.titleSuffix);
}
/**
* Helper for indexed *ngFor components
*
* @param index
*/
public trackByIndex(index: number): number {
return index;
}
/**
* TinyMCE Init callback. Used for certain mobile editors
* @param event
*/
protected onInitTinyMce(event: any): void {
console.log('tinyMCE event: ', event);
if (event.event.target.settings.theme === 'mobile') {
console.log('is mobile editor');
this.saveHint = true;
} else {
console.log('is no mobile editor');
event.editor.focus();
}
}
protected onLeaveTinyMce(event: any): void {
console.log('tinyevent:', event.event.type);
this.saveHint = false;
}
}

View File

@ -0,0 +1,16 @@
import { inject, TestBed } from '@angular/core/testing';
import { AppLoadService } from './app-load.service';
import { E2EImportsModule } from '../../../e2e-imports.module';
describe('AppLoadService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [AppLoadService]
});
});
it('should be created', inject([AppLoadService], (service: AppLoadService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,117 @@
import { Injectable, Injector } from '@angular/core';
import { AgendaAppConfig } from '../../site/agenda/agenda.config';
import { AppConfig, ModelEntry, SearchableModelEntry } from '../definitions/app-config';
import { BaseRepository } from 'app/core/repositories/base-repository';
import { ChatAppConfig } from 'app/site/chat/chat.config';
import { CinemaAppConfig } from 'app/site/cinema/cinema.config';
import { HistoryAppConfig } from 'app/site/history/history.config';
import { ProjectorAppConfig } from 'app/site/projector/projector.config';
import { TopicsAppConfig } from 'app/site/topics/topics.config';
import { AssignmentsAppConfig } from '../../site/assignments/assignments.config';
import { CollectionStringMapperService } from './collection-string-mapper.service';
import { CommonAppConfig } from '../../site/common/common.config';
import { ConfigAppConfig } from '../../site/config/config.config';
import { ServicesToLoadOnAppsLoaded } from '../core.module';
import { FallbackRoutesService } from './fallback-routes.service';
import { MainMenuService } from './main-menu.service';
import { MediafileAppConfig } from '../../site/mediafiles/mediafile.config';
import { MotionsAppConfig } from '../../site/motions/motions.config';
import { OnAfterAppsLoaded } from '../definitions/on-after-apps-loaded';
import { SearchService } from '../ui-services/search.service';
import { isSearchable } from '../../site/base/searchable';
import { TagAppConfig } from '../../site/tags/tag.config';
import { UsersAppConfig } from '../../site/users/users.config';
/**
* A list of all app configurations of all delivered apps.
*/
const appConfigs: AppConfig[] = [
CommonAppConfig,
ConfigAppConfig,
AgendaAppConfig,
AssignmentsAppConfig,
MotionsAppConfig,
MediafileAppConfig,
TagAppConfig,
UsersAppConfig,
HistoryAppConfig,
ProjectorAppConfig,
TopicsAppConfig,
CinemaAppConfig,
ChatAppConfig
];
/**
* Handles loading of all apps during the bootup process.
*/
@Injectable({
providedIn: 'root'
})
export class AppLoadService {
/**
* Constructor.
*
* @param modelMapper
* @param mainMenuService
* @param searchService
*/
public constructor(
private modelMapper: CollectionStringMapperService,
private mainMenuService: MainMenuService,
private searchService: SearchService,
private injector: Injector,
private fallbackRoutesService: FallbackRoutesService
) {}
public async loadApps(): Promise<void> {
const repositories: OnAfterAppsLoaded[] = [];
appConfigs.forEach((config: AppConfig) => {
if (config.models) {
config.models.forEach(entry => {
let repository: BaseRepository<any, any, any> = null;
repository = this.injector.get(entry.repository);
repositories.push(repository);
this.modelMapper.registerCollectionElement(entry.model, entry.viewModel, repository);
if (this.isSearchableModelEntry(entry)) {
this.searchService.registerModel(
entry.model.COLLECTIONSTRING,
repository,
entry.searchOrder,
entry.openInNewTab
);
}
});
}
if (config.mainMenuEntries) {
this.mainMenuService.registerEntries(config.mainMenuEntries);
this.fallbackRoutesService.registerFallbackEntries(config.mainMenuEntries);
}
});
// Collect all services to notify for the OnAfterAppsLoadedHook
const onAfterAppsLoadedItems = ServicesToLoadOnAppsLoaded.map(service => {
return this.injector.get(service);
}).concat(repositories);
// Notify them.
onAfterAppsLoadedItems.forEach(repo => {
repo.onAfterAppsLoaded();
});
}
private isSearchableModelEntry(entry: ModelEntry | SearchableModelEntry): entry is SearchableModelEntry {
if ((<SearchableModelEntry>entry).searchOrder !== undefined) {
// We need to double check, because Typescipt cannot check contructors. If typescript could differentiate
// between (ModelConstructor<BaseModel>) and (new (...args: any[]) => (BaseModel & Searchable)),
// we would not have to check if the result of the contructor (the model instance) is really a searchable.
if (!isSearchable(new entry.viewModel())) {
throw Error(
`Wrong configuration for ${entry.model.COLLECTIONSTRING}: you gave a searchOrder, but the model is not searchable.`
);
}
return true;
}
return false;
}
}

View File

@ -0,0 +1,91 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router } from '@angular/router';
import { FallbackRoutesService } from './fallback-routes.service';
import { OpenSlidesService } from './openslides.service';
import { OperatorService, Permission } from './operator.service';
/**
* Classical Auth-Guard. Checks if the user has to correct permissions to enter a page, and forwards to login if not.
*/
@Injectable({
providedIn: 'root'
})
export class AuthGuard implements CanActivate, CanActivateChild {
/**
* Constructor
*
* @param router To navigate to a target URL
* @param operator Asking for the required permission
* @param openSlidesService Handle OpenSlides functions
*/
public constructor(
private router: Router,
private operator: OperatorService,
private openSlidesService: OpenSlidesService,
private fallbackRoutesService: FallbackRoutesService
) {}
/**
* Checks of the operator has the required permission to see the state.
*
* One can set extra data to the state with `data: {basePerm: '<perm>'}` or
* `data: {basePerm: ['<perm1>', '<perm2>']}` to lock the access to users
* only with the given permission(s).
*
* @param route the route the user wants to navigate to
*/
public canActivate(route: ActivatedRouteSnapshot): boolean {
const basePerm: Permission | Permission[] = route.data.basePerm;
if (!basePerm) {
return true;
} else if (basePerm instanceof Array) {
return this.operator.hasPerms(...basePerm);
} else {
return this.operator.hasPerms(basePerm);
}
}
/**
* Calls {@method canActivate}. Should have the same logic.
*
* @param route the route the user wants to navigate to
*/
public async canActivateChild(route: ActivatedRouteSnapshot): Promise<boolean> {
await this.operator.loaded;
if (this.canActivate(route)) {
return true;
} else {
this.handleForbiddenRoute(route);
}
}
/**
* Handles a forbidden route. If the route is "/" (start page), It is tried to
* use a fallback route provided by AuthGuardFallbackRoutes. If this won't work
* or it wasn't the start page in the first place, the operator will be redirected
* to an error page.
*/
private handleForbiddenRoute(route: ActivatedRouteSnapshot): void {
if (route.url.length === 0) {
// start page
const fallbackRoute = this.fallbackRoutesService.getFallbackRoute();
if (fallbackRoute) {
this.router.navigate([fallbackRoute]);
return;
}
}
// Fall-through: If the url is the start page, but no other fallback was found,
// navigate to the error page.
this.openSlidesService.redirectUrl = location.pathname;
this.router.navigate(['/error'], {
queryParams: {
error: 'Authentication Error',
msg: route.data.basePerm
}
});
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { AuthService } from './auth.service';
import { E2EImportsModule } from '../../../e2e-imports.module';
describe('ConfigService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [AuthService]
});
});
it('should be created', inject([AuthService], (service: AuthService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,133 @@
import { Injectable } from '@angular/core';
import { Router } from '@angular/router';
import { environment } from 'environments/environment';
import { OperatorService, WhoAmI } from 'app/core/core-services/operator.service';
import { DEFAULT_AUTH_TYPE, UserAuthType } from 'app/shared/models/users/user';
import { DataStoreService } from './data-store.service';
import { HttpService } from './http.service';
import { OpenSlidesService } from './openslides.service';
import { StorageService } from './storage.service';
interface LoginData {
username: string;
password: string;
cookies?: boolean;
}
/**
* Authenticates an OpenSlides user with username and password
*/
@Injectable({
providedIn: 'root'
})
export class AuthService {
/**
* Initializes the httpClient and the {@link OperatorService}.
*
* @param http HttpService to send requests to the server
* @param operator Who is using OpenSlides
* @param OpenSlides The openslides service
* @param router To navigate
*/
public constructor(
private http: HttpService,
private operator: OperatorService,
private OpenSlides: OpenSlidesService,
private router: Router,
private DS: DataStoreService,
private storageService: StorageService
) {}
/**
* Try to log in a user with a given auth type
*
* - Type "default": username and password needed; the earlySuccessCallback will be called.
* - Type "saml": The windows location will be changed to the single-sign-on service initiator.
*/
public async login(
authType: UserAuthType,
username: string,
password: string,
earlySuccessCallback: () => void
): Promise<void> {
if (authType === 'default') {
const data: LoginData = {
username: username,
password: password
};
if (!navigator.cookieEnabled) {
data.cookies = false;
}
const response = await this.http.post<WhoAmI>(environment.urlPrefix + '/users/login/', data);
earlySuccessCallback();
await this.OpenSlides.shutdown();
await this.operator.setWhoAmI(response);
await this.OpenSlides.afterLoginBootup(response.user_id);
await this.redirectUser(response.user_id);
} else if (authType === 'saml') {
await this.operator.clearWhoAmIFromStorage(); // This is important:
// Then returning to the page, we do not want to have anything cached so a
// fresh whoami is executed.
window.location.href = environment.urlPrefix + '/saml/?sso'; // Bye
} else {
throw new Error(`Unsupported auth type "${authType}"`);
}
}
/**
* Redirects the user to the page where he came from. Boots OpenSlides,
* if it wasn't done before.
*/
public async redirectUser(userId: number): Promise<void> {
if (!this.OpenSlides.isBooted) {
await this.OpenSlides.afterLoginBootup(userId);
}
let redirect = this.OpenSlides.redirectUrl ? this.OpenSlides.redirectUrl : '/';
const excludedUrls = ['login'];
if (excludedUrls.some(url => redirect.includes(url))) {
redirect = '/';
}
this.router.navigate([redirect]);
}
/**
* Login for guests.
*/
public async guestLogin(): Promise<void> {
this.redirectUser(null);
}
/**
* Logout function for both the client and the server.
*
* Will clear the datastore, update the current operator and
* send a `post`-request to `/apps/users/logout/'`. Restarts OpenSlides.
*/
public async logout(): Promise<void> {
const authType = this.operator.authType.getValue();
if (authType === DEFAULT_AUTH_TYPE) {
let response = null;
try {
response = await this.http.post<WhoAmI>(environment.urlPrefix + '/users/logout/', {});
} catch (e) {
// We do nothing on failures. Reboot OpenSlides anyway.
}
this.router.navigate(['/']);
await this.storageService.clear();
await this.DS.clear();
await this.operator.setWhoAmI(response);
await this.OpenSlides.reboot();
} else if (authType === 'saml') {
await this.storageService.clear();
await this.DS.clear();
await this.operator.setWhoAmI(null);
window.location.href = environment.urlPrefix + '/saml/?slo'; // Bye
} else {
throw new Error(`Unsupported auth type "${authType}"`);
}
}
}

View File

@ -0,0 +1,177 @@
import { EventEmitter, Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { AutoupdateFormat } from 'app/core/definitions/autoupdate-format';
import { trailingThrottleTime } from 'app/core/rxjs/trailing-throttle-time';
import { Identifiable } from 'app/shared/models/base/identifiable';
import { ConstantsService } from './constants.service';
import { HttpService } from './http.service';
interface ThrottleSettings {
AUTOUPDATE_DELAY?: number;
}
@Injectable({
providedIn: 'root'
})
export class AutoupdateThrottleService {
private readonly _autoupdatesToInject = new Subject<AutoupdateFormat>();
public get autoupdatesToInject(): Observable<AutoupdateFormat> {
return this._autoupdatesToInject.asObservable();
}
private readonly receivedAutoupdate = new EventEmitter<void>();
private pendingAutoupdates = [];
private disabledUntil: number | null = null;
private delay = 0;
private maxSeenChangeId = 0;
private get isActive(): boolean {
return this.delay !== 0;
}
public constructor(private constantsService: ConstantsService, private httpService: HttpService) {
this.constantsService.get<ThrottleSettings>('Settings').subscribe(settings => {
// This is a one-shot. If the delay was set one time >0, it cannot be changed afterwards.
// A change is more complicated since you have to unsubscribe, clean pending autoupdates,
// subscribe again and make sure, that no autoupdate is missed.
if (this.delay === 0 && settings.AUTOUPDATE_DELAY) {
this.delay = 1000 * settings.AUTOUPDATE_DELAY;
console.log(`Configured autoupdate delay: ${this.delay}ms`);
this.receivedAutoupdate
.pipe(trailingThrottleTime(this.delay))
.subscribe(() => this.processPendingAutoupdates());
} else if (this.delay === 0) {
console.log('No autoupdate delay');
}
});
this.httpService.responseChangeIds.subscribe(changeId => this.disableUntil(changeId));
}
public newAutoupdate(autoupdate: AutoupdateFormat): void {
if (autoupdate.to_change_id > this.maxSeenChangeId) {
this.maxSeenChangeId = autoupdate.to_change_id;
}
if (!this.isActive) {
this._autoupdatesToInject.next(autoupdate);
} else if (this.disabledUntil !== null) {
this._autoupdatesToInject.next(autoupdate);
if (autoupdate.to_change_id >= this.disabledUntil) {
this.disabledUntil = null;
console.log('Throttling autoupdates again');
}
} else if (autoupdate.all_data) {
// all_data=true (aka initial data) should be processed immediatly
// but since there can be pending autoupdates, add it there and
// process them now!
this.pendingAutoupdates.push(autoupdate);
this.processPendingAutoupdates();
} else {
this.pendingAutoupdates.push(autoupdate);
this.receivedAutoupdate.emit();
}
}
public disableUntil(changeId: number): void {
// Wait for an autoupdate with to_id >= changeId.
if (!this.isActive) {
return;
}
this.processPendingAutoupdates();
// Checking with maxSeenChangeId is for the following race condition:
// If the autoupdate comes before the response, it must not be throttled.
// But flushing pending autoupdates is important since *if* the autoupdate
// was early, it is in the pending queue.
if (changeId <= this.maxSeenChangeId) {
return;
}
console.log('Disable autoupdate until change id', changeId);
this.disabledUntil = changeId;
}
/**
* discard all pending autoupdates and resets the timer
*/
public discard(): void {
this.pendingAutoupdates = [];
}
private processPendingAutoupdates(): void {
if (this.pendingAutoupdates.length === 0) {
return;
}
const autoupdates = this.pendingAutoupdates;
this.discard();
console.log(`Processing ${autoupdates.length} pending autoupdates`);
const autoupdate = this.mergeAutoupdates(autoupdates);
this._autoupdatesToInject.next(autoupdate);
}
private mergeAutoupdates(autoupdates: AutoupdateFormat[]): AutoupdateFormat {
const mergedAutoupdate: AutoupdateFormat = {
changed: {},
deleted: {},
from_change_id: autoupdates[0].from_change_id,
to_change_id: autoupdates[autoupdates.length - 1].to_change_id,
all_data: false
};
let lastToChangeId = null;
for (const au of autoupdates) {
if (lastToChangeId === null) {
lastToChangeId = au.to_change_id;
} else {
if (au.from_change_id !== lastToChangeId) {
console.warn('!!!', autoupdates, au);
}
lastToChangeId = au.to_change_id;
}
this.applyAutoupdate(au, mergedAutoupdate);
}
return mergedAutoupdate;
}
private applyAutoupdate(from: AutoupdateFormat, into: AutoupdateFormat): void {
if (from.all_data) {
into.all_data = true;
into.changed = from.changed;
into.deleted = from.deleted;
return;
}
for (const collection of Object.keys(from.deleted)) {
for (const id of from.deleted[collection]) {
if (into.changed[collection]) {
into.changed[collection] = into.changed[collection].filter(obj => (obj as Identifiable).id !== id);
}
if (!into.deleted[collection]) {
into.deleted[collection] = [];
}
into.deleted[collection].push(id);
}
}
for (const collection of Object.keys(from.changed)) {
for (const obj of from.changed[collection]) {
if (into.deleted[collection]) {
into.deleted[collection] = into.deleted[collection].filter(id => id !== (obj as Identifiable).id);
}
if (!into.changed[collection]) {
into.changed[collection] = [];
}
into.changed[collection].push(obj);
}
}
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { AutoupdateService } from './autoupdate.service';
import { E2EImportsModule } from '../../../e2e-imports.module';
describe('AutoupdateService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [AutoupdateService]
});
});
it('should be created', inject([AutoupdateService], (service: AutoupdateService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,178 @@
import { Injectable } from '@angular/core';
import { AutoupdateFormat } from '../definitions/autoupdate-format';
import { AutoupdateThrottleService } from './autoupdate-throttle.service';
import { BaseModel } from '../../shared/models/base/base-model';
import { CollectionStringMapperService } from './collection-string-mapper.service';
import { CommunicationManagerService, OfflineError } from './communication-manager.service';
import { DataStoreService, DataStoreUpdateManagerService } from './data-store.service';
import { HttpService } from './http.service';
import { Mutex } from '../promises/mutex';
/**
* Handles the initial update and automatic updates
* Incoming objects, usually BaseModels, will be saved in the dataStore (`this.DS`)
* This service usually creates all models
*/
@Injectable({
providedIn: 'root'
})
export class AutoupdateService {
private mutex = new Mutex();
private streamCloseFn: () => void | null = null;
private lastMessageContainedAllData = false;
public constructor(
private DS: DataStoreService,
private modelMapper: CollectionStringMapperService,
private DSUpdateManager: DataStoreUpdateManagerService,
private communicationManager: CommunicationManagerService,
private autoupdateThrottle: AutoupdateThrottleService
) {
this.communicationManager.startCommunicationEvent.subscribe(() => this.startAutoupdate());
this.autoupdateThrottle.autoupdatesToInject.subscribe(autoupdate => this.storeAutoupdate(autoupdate));
}
public async startAutoupdate(changeId?: number): Promise<void> {
this.stopAutoupdate();
try {
this.streamCloseFn = await this.communicationManager.subscribe<AutoupdateFormat>(
'/system/autoupdate',
autoupdate => {
this.autoupdateThrottle.newAutoupdate(autoupdate);
},
() => ({ change_id: (changeId ? changeId : this.DS.maxChangeId).toString() })
);
} catch (e) {
if (!(e instanceof OfflineError)) {
console.error(e);
}
}
}
public stopAutoupdate(): void {
if (this.streamCloseFn) {
this.streamCloseFn();
this.streamCloseFn = null;
}
this.autoupdateThrottle.discard();
}
/**
* Handle the answer of incoming data, after it was throttled.
*
* Detects the Class of an incomming model, creates a new empty object and assigns
* the data to it using the deserialize function. Also models that are flagged as deleted
* will be removed from the data store.
*
* Handles the change ids of all autoupdates.
*/
private async storeAutoupdate(autoupdate: AutoupdateFormat): Promise<void> {
const unlock = await this.mutex.lock();
this.lastMessageContainedAllData = autoupdate.all_data;
if (autoupdate.all_data) {
await this.storeAllData(autoupdate);
} else {
await this.storePartialAutoupdate(autoupdate);
}
unlock();
}
/**
* Stores all data from the autoupdate. This means, that the DS is resetted and filled with just the
* given data from the autoupdate.
* @param autoupdate The autoupdate
*/
private async storeAllData(autoupdate: AutoupdateFormat): Promise<void> {
let elements: BaseModel[] = [];
Object.keys(autoupdate.changed).forEach(collection => {
elements = elements.concat(this.mapObjectsToBaseModels(collection, autoupdate.changed[collection]));
});
const updateSlot = await this.DSUpdateManager.getNewUpdateSlot(this.DS);
await this.DS.set(elements, autoupdate.to_change_id);
this.DSUpdateManager.commit(updateSlot, autoupdate.to_change_id, true);
}
/**
* handles a normal autoupdate that is not a full update (all_data=false).
* @param autoupdate The autoupdate
*/
private async storePartialAutoupdate(autoupdate: AutoupdateFormat): Promise<void> {
const maxChangeId = this.DS.maxChangeId;
if (autoupdate.from_change_id <= maxChangeId && autoupdate.to_change_id <= maxChangeId) {
console.log(`Ignore. Clients change id: ${maxChangeId}`);
return; // Ignore autoupdates, that lay full behind our changeid.
}
// Normal autoupdate
if (autoupdate.from_change_id <= maxChangeId + 1 && autoupdate.to_change_id > maxChangeId) {
await this.injectAutupdateIntoDS(autoupdate, true);
} else {
// autoupdate fully in the future. we are missing something!
console.log('Autoupdate in the future', maxChangeId, autoupdate.from_change_id, autoupdate.to_change_id);
this.startAutoupdate(); // restarts it.
}
}
private async injectAutupdateIntoDS(autoupdate: AutoupdateFormat, flush: boolean): Promise<void> {
const updateSlot = await this.DSUpdateManager.getNewUpdateSlot(this.DS);
// Delete the removed objects from the DataStore
for (const collection of Object.keys(autoupdate.deleted)) {
await this.DS.remove(collection, autoupdate.deleted[collection]);
}
// Add the objects to the DataStore.
for (const collection of Object.keys(autoupdate.changed)) {
await this.DS.add(this.mapObjectsToBaseModels(collection, autoupdate.changed[collection]));
}
if (flush) {
await this.DS.flushToStorage(autoupdate.to_change_id);
}
this.DSUpdateManager.commit(updateSlot, autoupdate.to_change_id);
}
/**
* Creates baseModels for each plain object. If the collection is not registered,
* A console error will be issued and an empty list returned.
*
* @param collection The collection all models have to be from.
* @param models All models that should be mapped to BaseModels
* @returns A list of basemodels constructed from the given models.
*/
private mapObjectsToBaseModels(collection: string, models: object[]): BaseModel[] {
if (this.modelMapper.isCollectionRegistered(collection)) {
const targetClass = this.modelMapper.getModelConstructor(collection);
return models.map(model => new targetClass(model));
} else {
console.error(`Unregistered collection "${collection}". Ignore it.`);
return [];
}
}
/**
* Does a full update: Requests all data from the server and sets the DS to the fresh data.
*/
public async doFullUpdate(): Promise<void> {
if (this.lastMessageContainedAllData) {
console.log('full update requested. Skipping, last message already contained all data');
} else {
console.log('requesting full update.');
// The mutex is needed, so the DS is not cleared, if there is
// another autoupdate running.
const unlock = await this.mutex.lock();
this.stopAutoupdate();
await this.DS.clear();
this.startAutoupdate();
unlock();
}
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { CollectionStringMapperService } from './collection-string-mapper.service';
import { E2EImportsModule } from '../../../e2e-imports.module';
describe('CollectionStringMapperService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [CollectionStringMapperService]
});
});
it('should be created', inject([CollectionStringMapperService], (service: CollectionStringMapperService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,139 @@
import { Injectable } from '@angular/core';
import { BaseRepository } from 'app/core/repositories/base-repository';
import { BaseViewModel, TitleInformation, ViewModelConstructor } from 'app/site/base/base-view-model';
import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model';
/**
* Unifies the ModelConstructor and ViewModelConstructor.
*/
interface UnifiedConstructors {
COLLECTIONSTRING: string;
new (...args: any[]): any;
}
/**
* Every types supported: (View)ModelConstructors, repos and collectionstrings.
*/
type TypeIdentifier = UnifiedConstructors | BaseRepository<any, any, any> | string;
type CollectionStringMappedTypes = [
ModelConstructor<BaseModel>,
ViewModelConstructor<BaseViewModel>,
BaseRepository<BaseViewModel<any>, BaseModel<any>, TitleInformation>
];
/**
* Registeres the mapping between collection strings, models constructors, view
* model constructors and repositories.
* All models need to be registered!
*/
@Injectable({
providedIn: 'root'
})
export class CollectionStringMapperService {
/**
* Maps collection strings to mapping entries
*/
private collectionStringMapping: {
[collectionString: string]: CollectionStringMappedTypes;
} = {};
public constructor() {}
/**
* Registers the combination of a collection string, model, view model and repository
* @param collectionString
* @param model
*/
public registerCollectionElement<V extends BaseViewModel<M>, M extends BaseModel>(
model: ModelConstructor<M>,
viewModel: ViewModelConstructor<V>,
repository: BaseRepository<V, M, TitleInformation>
): void {
this.collectionStringMapping[model.COLLECTIONSTRING] = [model, viewModel, repository];
}
/**
* @param obj The object to get the collection string from.
* @returns the collectionstring
*/
public getCollectionString(obj: TypeIdentifier): string {
if (typeof obj === 'string') {
return obj;
} else {
return obj.COLLECTIONSTRING;
}
}
/**
* @returns true, if the given collection is known by this service.
*/
public isCollectionRegistered(collectionString: string): boolean {
return !!this.collectionStringMapping[collectionString];
}
/**
* @param obj The object to get the model constructor from.
* @returns the model constructor
*/
public getModelConstructor<M extends BaseModel>(obj: TypeIdentifier): ModelConstructor<M> | null {
if (this.isCollectionRegistered(this.getCollectionString(obj))) {
return this.collectionStringMapping[this.getCollectionString(obj)][0] as ModelConstructor<M>;
}
}
/**
* @param obj The object to get the view model constructor from.
* @returns the view model constructor
*/
public getViewModelConstructor<M extends BaseViewModel>(obj: TypeIdentifier): ViewModelConstructor<M> | null {
if (this.isCollectionRegistered(this.getCollectionString(obj))) {
return this.collectionStringMapping[this.getCollectionString(obj)][1] as ViewModelConstructor<M>;
}
}
/**
* @param obj The object to get the repository from.
* @returns the repository
*/
public getRepository<V extends BaseViewModel, M extends BaseModel, T extends TitleInformation>(
obj: TypeIdentifier
): BaseRepository<V & T, M, T> | null {
if (this.isCollectionRegistered(this.getCollectionString(obj))) {
return this.collectionStringMapping[this.getCollectionString(obj)][2] as BaseRepository<V & T, M, T>;
}
}
/**
* @returns all registered repositories.
*/
public getAllRepositories(): BaseRepository<any, any, any>[] {
return Object.values(this.collectionStringMapping).map((types: CollectionStringMappedTypes) => types[2]);
}
/**
* Validates the given element id. It must have the form `<collection>:<id>`, with
* <collection> being a registered collection and the id a valid integer greater then 0.
*
* @param elementId The element id.
* @returns true, if the element id is valid.
*/
public isElementIdValid(elementId: any): boolean {
if (!elementId || typeof elementId !== 'string') {
return false;
}
const splitted = elementId.split(':');
if (splitted.length !== 2) {
return false;
}
const id = parseInt(splitted[1], 10);
if (isNaN(id) || id <= 0) {
return false;
}
return Object.keys(this.collectionStringMapping).some(collection => collection === splitted[0]);
}
}

View File

@ -0,0 +1,191 @@
import { HttpParams } from '@angular/common/http';
import { EventEmitter, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpService } from './http.service';
import { OfflineBroadcastService, OfflineReason } from './offline-broadcast.service';
import { OperatorService } from './operator.service';
import { SleepPromise } from '../promises/sleep';
import {
CommunicationError,
ErrorType,
Stream,
StreamContainer,
StreamingCommunicationService,
verboseErrorType
} from './streaming-communication.service';
type HttpParamsGetter = () => HttpParams | { [param: string]: string | string[] };
const MAX_STREAM_FAILURE_RETRIES = 3;
export class OfflineError extends Error {
public constructor() {
super('');
this.name = 'OfflineError';
}
}
interface StreamConnectionWrapper {
id: number;
url: string;
messageHandler: (message: any) => void;
params: HttpParamsGetter;
stream?: Stream<any>;
hasErroredAmount: number;
}
@Injectable({
providedIn: 'root'
})
export class CommunicationManagerService {
private communicationAllowed = false;
private readonly _startCommunicationEvent = new EventEmitter<void>();
public get startCommunicationEvent(): Observable<void> {
return this._startCommunicationEvent.asObservable();
}
private readonly _stopCommunicationEvent = new EventEmitter<void>();
public get stopCommunicationEvent(): Observable<void> {
return this._stopCommunicationEvent.asObservable();
}
private streamContainers: { [id: number]: StreamContainer<any> } = {};
public constructor(
private streamingCommunicationService: StreamingCommunicationService,
private offlineBroadcastService: OfflineBroadcastService,
private http: HttpService,
private operatorService: OperatorService
) {
this.offlineBroadcastService.goOfflineObservable.subscribe(() => this.closeConnections());
}
public async subscribe<T>(
url: string,
messageHandler: (message: T) => void,
params?: HttpParamsGetter
): Promise<() => void> {
if (!params) {
params = () => null;
}
const streamContainer = new StreamContainer(url, messageHandler, params);
return await this.connectWithWrapper(streamContainer);
}
public startCommunication(): void {
if (this.communicationAllowed) {
console.error('Illegal state! Do not emit this event multiple times');
} else {
this.communicationAllowed = true;
this._startCommunicationEvent.emit();
}
}
private async connectWithWrapper<T>(streamContainer: StreamContainer<T>): Promise<() => void> {
console.log('connect', streamContainer, streamContainer.stream);
const errorHandler = (type: ErrorType, error: CommunicationError, message: string) =>
this.handleError(streamContainer, type, error, message);
this.streamingCommunicationService.subscribe(streamContainer, errorHandler);
this.streamContainers[streamContainer.id] = streamContainer;
return () => this.close(streamContainer);
}
private async handleError<T>(
streamContainer: StreamContainer<T>,
type: ErrorType,
error: CommunicationError,
message: string
): Promise<void> {
console.log('handle Error', streamContainer, streamContainer.stream, verboseErrorType(type), error, message);
streamContainer.stream.close();
streamContainer.stream = null;
streamContainer.hasErroredAmount++;
if (streamContainer.hasErroredAmount > MAX_STREAM_FAILURE_RETRIES) {
this.goOffline(streamContainer, OfflineReason.ConnectionLost);
} else if (type === ErrorType.Client && error.type === 'auth_required') {
this.goOffline(streamContainer, OfflineReason.WhoAmIFailed);
} else {
// retry it after some time:
console.log(
`Retry no. ${streamContainer.hasErroredAmount} of ${MAX_STREAM_FAILURE_RETRIES} for ${streamContainer.url}`
);
try {
await this.delayAndCheckReconnection(streamContainer);
await this.connectWithWrapper(streamContainer);
} catch (e) {
// delayAndCheckReconnection can throw an OfflineError,
// which are just an 'abord mission' signal. Here, those errors can be ignored.
}
}
}
private async delayAndCheckReconnection<T>(streamContainer: StreamContainer<T>): Promise<void> {
let delay;
if (streamContainer.hasErroredAmount === 1) {
delay = 500; // the first error has a small delay since these error can happen normally.
} else {
delay = Math.floor(Math.random() * 3000 + 2000);
}
console.log(`retry again in ${delay} ms`);
await SleepPromise(delay);
// do not continue, if we are offline!
if (this.offlineBroadcastService.isOffline()) {
console.log('we are offline?');
throw new OfflineError();
}
// do not continue, if we are offline!
if (!this.shouldRetryConnecting()) {
console.log('operator changed, do not rety');
throw new OfflineError(); // TODO: This error is not really good....
}
}
public closeConnections(): void {
for (const streamWrapper of Object.values(this.streamContainers)) {
if (streamWrapper.stream) {
streamWrapper.stream.close();
}
}
this.streamContainers = {};
this.communicationAllowed = false;
this._stopCommunicationEvent.emit();
}
private goOffline<T>(streamContainer: StreamContainer<T>, reason: OfflineReason): void {
delete this.streamContainers[streamContainer.id];
this.closeConnections(); // here we close the connections early.
this.offlineBroadcastService.goOffline(reason);
}
private close(streamConnectionWrapper: StreamConnectionWrapper): void {
if (this.streamContainers[streamConnectionWrapper.id]) {
this.streamContainers[streamConnectionWrapper.id].stream.close();
delete this.streamContainers[streamConnectionWrapper.id];
}
}
// Checks the operator: If we do not have a valid user,
// do not even try to connect again..
private shouldRetryConnecting(): boolean {
return this.operatorService.guestsEnabled || !!this.operatorService.user;
}
public async isCommunicationServiceOnline(): Promise<boolean> {
try {
const response = await this.http.get<{ healthy: boolean }>('/system/health');
return !!response.healthy;
} catch (e) {
return false;
}
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { ConstantsService } from './constants.service';
import { E2EImportsModule } from '../../../e2e-imports.module';
describe('ConstantsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [ConstantsService]
});
});
it('should be created', inject([ConstantsService], (service: ConstantsService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,60 @@
import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { BehaviorSubject, Observable } from 'rxjs';
import { filter } from 'rxjs/operators';
import { CommunicationManagerService } from './communication-manager.service';
import { HttpService } from './http.service';
/**
* constants have a key associated with the data.
*/
interface Constants {
[key: string]: any;
}
/**
* Get constants from the server.
*
* @example
* ```ts
* this.constantsService.get('Settings').subscribe(constant => {
* console.log(constant);
* });
* ```
*/
@Injectable({
providedIn: 'root'
})
export class ConstantsService {
/**
* The constants
*/
private constants: Constants = {};
/**
* Pending requests will be notified by these subjects, one per key.
*/
private subjects: { [key: string]: BehaviorSubject<any> } = {};
public constructor(communicationManager: CommunicationManagerService, private http: HttpService) {
communicationManager.startCommunicationEvent.subscribe(async () => {
this.constants = await this.http.get<Constants>(environment.urlPrefix + '/core/constants/');
Object.keys(this.subjects).forEach(key => {
this.subjects[key].next(this.constants[key]);
});
});
}
/**
* Get the constant named by key.
* @param key The constant to get.
*/
public get<T>(key: string): Observable<T> {
if (!this.subjects[key]) {
this.subjects[key] = new BehaviorSubject<any>(this.constants[key]);
}
return this.subjects[key].asObservable().pipe(filter(x => !!x));
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { DataSendService } from './data-send.service';
import { E2EImportsModule } from '../../../e2e-imports.module';
describe('DataSendService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [DataSendService]
});
});
it('should be created', inject([DataSendService], (service: DataSendService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,62 @@
import { Injectable } from '@angular/core';
import { BaseModel } from '../../shared/models/base/base-model';
import { HttpService } from './http.service';
import { Identifiable } from '../../shared/models/base/identifiable';
/**
* Send data back to server. Cares about the right REST routes.
*
* Contrast to dataStore service
*/
@Injectable({
providedIn: 'root'
})
export class DataSendService {
/**
* Construct a DataSendService
*
* @param httpService The HTTP Service
*/
public constructor(private httpService: HttpService) {}
/**
* Sends a post request with the model to the server to create it.
*
* @param model The model to create.
*/
public async createModel(model: BaseModel): Promise<Identifiable> {
const restPath = `/rest/${model.collectionString}/`;
return await this.httpService.post<Identifiable>(restPath, model);
}
/**
* Function to fully update a model on the server.
*
* @param model The model that is meant to be changed.
*/
public async updateModel(model: BaseModel): Promise<void> {
const restPath = `/rest/${model.collectionString}/${model.id}/`;
await this.httpService.put(restPath, model);
}
/**
* Updates a model partially on the server.
*
* @param model The model to partially update.
*/
public async partialUpdateModel(model: BaseModel): Promise<void> {
const restPath = `/rest/${model.collectionString}/${model.id}/`;
await this.httpService.patch(restPath, model);
}
/**
* Deletes the given model on the server.
*
* @param model the model that shall be deleted.
*/
public async deleteModel(model: BaseModel): Promise<void> {
const restPath = `/rest/${model.collectionString}/${model.id}/`;
await this.httpService.delete(restPath);
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { DataStoreUpgradeService } from './data-store-upgrade.service';
import { E2EImportsModule } from '../../../e2e-imports.module';
describe('DataStoreUpgradeService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [DataStoreUpgradeService]
});
});
it('should be created', inject([DataStoreUpgradeService], (service: DataStoreUpgradeService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,91 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { AutoupdateService } from './autoupdate.service';
import { ConstantsService } from './constants.service';
import { StorageService } from './storage.service';
interface SchemaVersion {
db: string;
config: number;
migration: number;
}
function isSchemaVersion(obj: any): obj is SchemaVersion {
if (!obj || typeof obj !== 'object') {
return false;
}
return obj.db !== undefined && obj.config !== undefined && obj.migration !== undefined;
}
const SCHEMA_VERSION = 'SchemaVersion';
/**
* Manages upgrading the DataStore, if the migration version from the server is higher than the current one.
*/
@Injectable({
providedIn: 'root'
})
export class DataStoreUpgradeService {
/**
* Notify, when upgrade has checked.
*/
public readonly upgradeChecked = new BehaviorSubject(false);
/**
* @param autoupdateService
* @param constantsService
* @param storageService
*/
public constructor(
private autoupdateService: AutoupdateService,
private constantsService: ConstantsService,
private storageService: StorageService
) {
// Prevent the schema version to be cleard. This is important
// after a reset from OpenSlides, because the complete data is
// queried from the server and we do not want also to trigger a reload
// by changing the schema from null -> <schema>.
this.storageService.addNoClearKey(SCHEMA_VERSION);
this.constantsService
.get<SchemaVersion>(SCHEMA_VERSION)
.subscribe(serverVersion => this.checkForUpgrade(serverVersion));
}
public async checkForUpgrade(serverVersion: SchemaVersion): Promise<boolean> {
this.upgradeChecked.next(false);
console.log('Server schema version:', serverVersion);
const clientVersion = await this.storageService.get<SchemaVersion>(SCHEMA_VERSION);
await this.storageService.set(SCHEMA_VERSION, serverVersion);
let doUpgrade = false;
if (isSchemaVersion(clientVersion)) {
if (clientVersion.db !== serverVersion.db) {
console.log(`\tDB id changed from ${clientVersion.db} to ${serverVersion.db}`);
doUpgrade = true;
}
if (clientVersion.config !== serverVersion.config) {
console.log(`\tConfig changed from ${clientVersion.config} to ${serverVersion.config}`);
doUpgrade = true;
}
if (clientVersion.migration !== serverVersion.migration) {
console.log(`\tMigration changed from ${clientVersion.migration} to ${serverVersion.migration}`);
doUpgrade = true;
}
} else {
console.log('\tNo client schema version.');
doUpgrade = true;
}
if (doUpgrade) {
console.log('\t-> In result of a schema version change: Do full update.');
await this.autoupdateService.doFullUpdate();
} else {
console.log('\t-> No upgrade needed.');
}
this.upgradeChecked.next(true);
return doUpgrade;
}
}

View File

@ -0,0 +1,11 @@
import { TestBed } from '@angular/core/testing';
import { DataStoreService } from './data-store.service';
describe('DS', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [DataStoreService]
});
});
});

View File

@ -0,0 +1,684 @@
import { EventEmitter, Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { BaseModel, ModelConstructor } from '../../shared/models/base/base-model';
import { CollectionStringMapperService } from './collection-string-mapper.service';
import { Deferred } from '../promises/deferred';
import { OpenSlidesStatusService } from './openslides-status.service';
import { RelationCacheService } from './relation-cache.service';
import { StorageService } from './storage.service';
/**
* Represents information about a deleted model.
*
* As the model doesn't exist anymore, just the former id and collection is known.
*/
export interface DeletedInformation {
collection: string;
id: number;
}
export interface CollectionIds {
[collection: string]: number[];
}
/**
* Helper class for collecting data during the update phase of the DataStore.
*/
export class UpdateSlot {
/**
* Count instnaces of this class to easily compare them.
*/
private static ID_COUTNER = 1;
/**
* Mapping of changed model ids to their collection.
*/
private changedModels: CollectionIds = {};
/**
* Mapping of deleted models to their collection.
*/
private deletedModels: CollectionIds = {};
/**
* The object's id.
*/
private _id: number;
/**
* @param DS Carries the DataStore: TODO (see below `DataStoreUpdateManagerService.getNewUpdateSlot`)
*/
public constructor(public readonly DS: DataStoreService) {
this._id = UpdateSlot.ID_COUTNER++;
}
/**
* Adds changed model information
*
* @param collection The collection
* @param id The id
*/
public addChangedModel(collection: string, id: number): void {
if (!this.changedModels[collection]) {
this.changedModels[collection] = [];
}
this.changedModels[collection].push(id);
}
/**
* Adds deleted model information
*
* @param collection The collection
* @param id The id
*/
public addDeletedModel(collection: string, id: number): void {
if (!this.deletedModels[collection]) {
this.deletedModels[collection] = [];
}
this.deletedModels[collection].push(id);
}
/**
* @param collection The collection
* @returns the list of changed model ids for the collection
*/
public getChangedModelIdsForCollection(collection: string): number[] {
return this.changedModels[collection] || [];
}
/**
* @returns the mapping of all changed models
*/
public getChangedModels(): CollectionIds {
return this.changedModels;
}
/**
* @param collection The collection
* @returns the list of deleted model ids for the collection
*/
public getDeletedModelIdsForCollection(collection: string): number[] {
return this.deletedModels[collection] || [];
}
/**
* @returns the mapping of all deleted models
*/
public getDeletedModels(): CollectionIds {
return this.deletedModels;
}
/**
* @returns all changed and deleted model ids in one array. If an id was
* changed and deleted, it will be there twice! But this should not be the case.
*/
public getAllModelsIdsForCollection(collection: string): number[] {
return this.getDeletedModelIdsForCollection(collection).concat(
this.getChangedModelIdsForCollection(collection)
);
}
/**
* Compares this object to another update slot.
*/
public equal(other: UpdateSlot): boolean {
return this._id === other._id;
}
}
/**
* represents a collection on the Django server, uses an ID to access a {@link BaseModel}.
*
* Part of {@link DataStoreService}
*/
interface ModelCollection {
[id: number]: BaseModel;
}
/**
* Represents a serialized collection.
*/
interface JsonCollection {
[id: number]: string;
}
/**
* The actual storage that stores collections, accessible by strings.
*
* {@link DataStoreService}
*/
interface ModelStorage {
[collectionString: string]: ModelCollection;
}
/**
* A storage of serialized collection elements.
*/
interface JsonStorage {
[collectionString: string]: JsonCollection;
}
/**
* TODO: Avoid circular dependencies between `DataStoreUpdateManagerService` and
* `DataStoreService` and split them into two files
*/
@Injectable({
providedIn: 'root'
})
export class DataStoreUpdateManagerService {
/**
* The current update slot
*/
private currentUpdateSlot: UpdateSlot | null = null;
/**
* Requests for getting an update slot.
*/
private updateSlotRequests: Deferred[] = [];
/**
* @param mapperService
*/
public constructor(
private mapperService: CollectionStringMapperService,
private relationCacheService: RelationCacheService
) {}
/**
* Retrieve the current update slot.
*/
public getCurrentUpdateSlot(): UpdateSlot | null {
return this.currentUpdateSlot;
}
/**
* Get a new update slot. Returns a promise that must be awaited, if there is another
* update in progress.
*
* @param DS The DataStore. This is a hack, becuase we cannot use the DataStore
* here, because these are cyclic dependencies... --> TODO
*/
public async getNewUpdateSlot(DS: DataStoreService): Promise<UpdateSlot> {
if (this.currentUpdateSlot) {
const request = new Deferred();
this.updateSlotRequests.push(request);
await request;
}
this.currentUpdateSlot = new UpdateSlot(DS);
return this.currentUpdateSlot;
}
/**
* Commits the given update slot. This slot must be the current one. If there are requests
* for update slots queued, the next one will be served.
*
* Note: I added this param to make sure, that only the user of the slot
* can commit the update and no one else.
*
* @param slot The slot to commit
*/
public commit(slot: UpdateSlot, changeId: number, resetCache: boolean = false): void {
if (!this.currentUpdateSlot || !this.currentUpdateSlot.equal(slot)) {
throw new Error('No or wrong update slot to be finished!');
}
this.currentUpdateSlot = null;
// notify repositories in two phases
const repositories = this.mapperService.getAllRepositories();
if (resetCache) {
this.relationCacheService.reset();
}
// Phase 1: deleting and creating of view models (in this order)
repositories.forEach(repo => {
const deletedModelIds = slot.getDeletedModelIdsForCollection(repo.collectionString);
repo.deleteModels(deletedModelIds);
this.relationCacheService.registerDeletedModels(repo.collectionString, deletedModelIds);
const changedModelIds = slot.getChangedModelIdsForCollection(repo.collectionString);
repo.changedModels(changedModelIds);
this.relationCacheService.registerChangedModels(repo.collectionString, changedModelIds, changeId);
});
// Phase 2: updating all repositories
repositories.forEach(repo => {
repo.commitUpdate(slot.getAllModelsIdsForCollection(repo.collectionString));
});
slot.DS.triggerModifiedObservable();
this.serveNextSlot();
}
public dropUpdateSlot(): void {
this.currentUpdateSlot = null;
this.serveNextSlot();
}
private serveNextSlot(): void {
if (this.updateSlotRequests.length > 0) {
console.log('Concurrent update slots');
const request = this.updateSlotRequests.pop();
request.resolve();
}
}
}
/**
* All mighty DataStore that comes with all OpenSlides components.
* Use this.DS in an OpenSlides Component to Access the store.
* Used by a lot of components, classes and services.
* Changes can be observed
*/
@Injectable({
providedIn: 'root'
})
export class DataStoreService {
private static cachePrefix = 'DS:';
/** We will store the data twice: One as instances of the actual models in the _store
* and one serialized version in the _serializedStore for the cache. Both should be updated in
* all cases equal!
*/
private modelStore: ModelStorage = {};
private jsonStore: JsonStorage = {};
/**
* Subjects for changed elements (notified, even if there is a current update slot) for
* a specific collection.
*/
private changedSubjects: { [collection: string]: Subject<BaseModel> } = {};
/**
* Observable subject for changed or deleted models in the datastore.
*/
private readonly modifiedSubject: Subject<void> = new Subject<void>();
/**
* Observe the datastore for changes and deletions.
*
* @return an observable for changed and deleted objects.
*/
public get modifiedObservable(): Observable<void> {
return this.modifiedSubject.asObservable();
}
/**
* Observable subject for changed or deleted models in the datastore.
*/
private readonly clearEvent: EventEmitter<void> = new EventEmitter<void>();
/**
* Observe the datastore for changes and deletions.
*
* @return an observable for changed and deleted objects.
*/
public get clearObservable(): Observable<void> {
return this.clearEvent.asObservable();
}
/**
* The maximal change id from this DataStore.
*/
private _maxChangeId = 0;
/**
* returns the maxChangeId of the DataStore.
*/
public get maxChangeId(): number {
return this._maxChangeId;
}
/**
* @param storageService use StorageService to preserve the DataStore.
* @param modelMapper
* @param DSUpdateManager
*/
public constructor(
private storageService: StorageService,
private modelMapper: CollectionStringMapperService,
private DSUpdateManager: DataStoreUpdateManagerService,
private statusService: OpenSlidesStatusService
) {}
/**
* Get an model observable for models from a given collection. These observable will be notified,
* even if there is an active update slot. So use this with caution (-> only collections with less models).
*
* @param collectionType The collection
*/
public getChangeObservable<T extends BaseModel>(collectionType: ModelConstructor<T> | string): Observable<T> {
const collection = this.getCollectionString(collectionType);
if (!this.changedSubjects[collection]) {
this.changedSubjects[collection] = new Subject();
}
return this.changedSubjects[collection].asObservable() as Observable<T>;
}
/**
* Gets the DataStore from cache and instantiate all models out of the serialized version.
* If something fails, the DS is cleared, so fresh data can be requrested from the server.
*
* @returns The max change id.
*/
public async initFromStorage(): Promise<void> {
// This promise will be resolved with cached datastore.
const store = await this.storageService.get<JsonStorage>(DataStoreService.cachePrefix + 'DS');
if (!store) {
await this.clear();
return;
}
const updateSlot = await this.DSUpdateManager.getNewUpdateSlot(this);
try {
// There is a store. Deserialize it
this.jsonStore = store;
this.modelStore = this.deserializeJsonStore(this.jsonStore);
// Get the maxChangeId from the cache
let maxChangeId = await this.storageService.get<number>(DataStoreService.cachePrefix + 'maxChangeId');
if (!maxChangeId) {
maxChangeId = 0;
}
this._maxChangeId = maxChangeId;
// update observers
Object.keys(this.modelStore).forEach(collection => {
Object.keys(this.modelStore[collection]).forEach(id => {
this.publishChangedInformation(this.modelStore[collection][id]);
});
});
this.DSUpdateManager.commit(updateSlot, maxChangeId, true);
} catch (e) {
this.DSUpdateManager.dropUpdateSlot();
await this.clear();
}
}
/**
* Deserialze the given serializedStorage and returns a Storage.
* @param serializedStore The store to deserialize
* @returns The serialized storage
*/
private deserializeJsonStore(serializedStore: JsonStorage): ModelStorage {
const storage: ModelStorage = {};
Object.keys(serializedStore).forEach(collectionString => {
storage[collectionString] = {} as ModelCollection;
const target = this.modelMapper.getModelConstructor(collectionString);
if (target) {
Object.keys(serializedStore[collectionString]).forEach(id => {
const data = JSON.parse(serializedStore[collectionString][id]);
storage[collectionString][id] = new target(data);
});
}
});
return storage;
}
/**
* Clears the complete DataStore and Cache.
*/
public async clear(): Promise<void> {
this.modelStore = {};
this.jsonStore = {};
this._maxChangeId = 0;
await this.storageService.remove(DataStoreService.cachePrefix + 'DS');
await this.storageService.remove(DataStoreService.cachePrefix + 'maxChangeId');
this.clearEvent.next();
}
/**
* Returns the collection _string_ based on the model given. If a string is given, it's just returned.
* @param collectionType Either a Model constructor or a string.
* @returns the collection string
*/
private getCollectionString<T extends BaseModel<T>>(collectionType: ModelConstructor<T> | string): string {
if (typeof collectionType === 'string') {
return collectionType;
} else {
return this.modelMapper.getCollectionString(collectionType);
}
}
/**
* Read one model based on the collection and id from the DataStore.
*
* @param collectionType The desired BaseModel or collectionString to be read from the dataStore
* @param ids One ID of the BaseModel
* @return The given BaseModel-subclass instance
* @example: this.DS.get(User, 1)
* @example: this.DS.get<Countdown>('core/countdown', 2)
*/
public get<T extends BaseModel<T>>(collectionType: ModelConstructor<T> | string, id: number): T {
const collectionString = this.getCollectionString<T>(collectionType);
const collection: ModelCollection = this.modelStore[collectionString];
if (!collection) {
return;
} else {
return collection[id] as T;
}
}
/**
* Read multiple ID's from dataStore.
*
* @param collectionType The desired BaseModel or collectionString to be read from the dataStore
* @param ids Multiple IDs as a list of IDs of BaseModel
* @return The BaseModel-list corresponding to the given ID(s)
* @example: this.DS.getMany(User, [1,2,3,4,5])
* @example: this.DS.getMany<User>('users/user', [1,2,3,4,5])
*/
public getMany<T extends BaseModel<T>>(collectionType: ModelConstructor<T> | string, ids: number[]): T[] {
const collectionString = this.getCollectionString<T>(collectionType);
const collection: ModelCollection = this.modelStore[collectionString];
if (!collection) {
return [];
}
const models = ids
.map(id => {
return collection[id];
})
.filter(model => !!model); // remove non valid models.
return models as T[];
}
/**
* Get all models of the given collection from the DataStore.
*
* @param collectionType The desired BaseModel or collectionString to be read from the dataStore
* @return The BaseModel-list of all instances of T
* @example: this.DS.getAll(User)
* @example: this.DS.getAll<User>('users/user')
*/
public getAll<T extends BaseModel<T>>(collectionType: ModelConstructor<T> | string): T[] {
const collectionString = this.getCollectionString<T>(collectionType);
const collection: ModelCollection = this.modelStore[collectionString];
if (!collection) {
return [];
} else {
return Object.values(collection);
}
}
/**
* Filters the dataStore by type.
*
* @param collectionType The desired BaseModel type to be read from the dataStore
* @param callback a filter function
* @return The BaseModel-list corresponding to the filter function
* @example this.DS.filter<User>(User, myUser => myUser.first_name === "Max")
*/
public filter<T extends BaseModel<T>>(
collectionType: ModelConstructor<T> | string,
callback: (model: T) => boolean
): T[] {
return this.getAll<T>(collectionType).filter(callback);
}
/**
* Finds a model item in the dataStore by type.
*
* @param collectionType The desired BaseModel type to be read from the dataStore
* @param callback a find function
* @return The first BaseModel item matching the filter function
* @example this.DS.find<User>(User, myUser => myUser.first_name === "Jenny")
*/
public find<T extends BaseModel<T>>(
collectionType: ModelConstructor<T> | string,
callback: (model: T) => boolean
): T {
return this.getAll<T>(collectionType).find(callback);
}
/**
* Add one or multiple models to dataStore.
*
* @param models BaseModels to add to the store
* @param changeId The changeId of this update. If given, the storage will be flushed to the
* cache. Else one can call {@method flushToStorage} to do this manually.
* @example this.DS.add([new User(1)])
* @example this.DS.add([new User(2), new User(3)])
* @example this.DS.add(arrayWithUsers, changeId)
*/
public async add(models: BaseModel[], changeId?: number): Promise<void> {
models.forEach(model => {
const collection = model.collectionString;
if (this.modelStore[collection] === undefined) {
this.modelStore[collection] = {};
}
this.modelStore[collection][model.id] = model;
if (this.jsonStore[collection] === undefined) {
this.jsonStore[collection] = {};
}
this.jsonStore[collection][model.id] = JSON.stringify(model);
this.publishChangedInformation(model);
});
if (changeId) {
await this.flushToStorage(changeId);
}
}
/**
* removes one or multiple models from dataStore.
*
* @param collectionString The desired BaseModel type to be removed from the datastore
* @param ids A list of IDs of BaseModels to remove from the datastore
* @param changeId The changeId of this update. If given, the storage will be flushed to the
* cache. Else one can call {@method flushToStorage} to do this manually.
* @example this.DS.remove('users/user', [myUser.id, 3, 4])
*/
public async remove(collectionString: string, ids: number[], changeId?: number): Promise<void> {
ids.forEach(id => {
if (this.modelStore[collectionString]) {
delete this.modelStore[collectionString][id];
}
if (this.jsonStore[collectionString]) {
delete this.jsonStore[collectionString][id];
}
this.publishDeletedInformation({
collection: collectionString,
id: id
});
});
if (changeId) {
await this.flushToStorage(changeId);
}
}
/**
* Resets the DataStore and set the given models as the new content.
* @param models A list of models to set the DataStore to.
* @param newMaxChangeId Optional. If given, the max change id will be updated
* and the store flushed to the storage
*/
public async set(models?: BaseModel[], newMaxChangeId?: number): Promise<void> {
const modelStoreReference = this.modelStore;
this.modelStore = {};
this.jsonStore = {};
// Inform about the deletion
Object.keys(modelStoreReference).forEach(collectionString => {
Object.keys(modelStoreReference[collectionString]).forEach(id => {
this.publishDeletedInformation({
collection: collectionString,
id: +id // needs casting, because Objects.keys gives all keys as strings...
});
});
});
if (models && models.length) {
await this.add(models, newMaxChangeId);
}
}
/**
* Informs the changed and changedOrDeleted subject about a change.
*
* @param model The model to publish
*/
private publishChangedInformation(model: BaseModel): void {
const slot = this.DSUpdateManager.getCurrentUpdateSlot();
if (slot) {
slot.addChangedModel(model.collectionString, model.id);
// triggerModifiedObservable will be called by committing the update slot.
} else {
this.triggerModifiedObservable();
}
if (this.changedSubjects[model.collectionString]) {
this.changedSubjects[model.collectionString].next(model);
}
}
/**
* Informs the deleted and changedOrDeleted subject about a deletion.
*
* @param information The information about the deleted model
*/
private publishDeletedInformation(information: DeletedInformation): void {
const slot = this.DSUpdateManager.getCurrentUpdateSlot();
if (slot) {
slot.addDeletedModel(information.collection, information.id);
// triggerModifiedObservable will be called by committing the update slot.
} else {
this.triggerModifiedObservable();
}
}
/**
* Triggers the modified subject.
*/
public triggerModifiedObservable(): void {
this.modifiedSubject.next();
}
/**
* Updates the cache by inserting the serialized DataStore. Also changes the chageId, if it's larger
* @param changeId The changeId from the update. If it's the highest change id seen, it will be set into the cache.
*/
public async flushToStorage(changeId: number): Promise<void> {
this._maxChangeId = changeId;
try {
await this.storageService.set(DataStoreService.cachePrefix + 'DS', this.jsonStore);
await this.storageService.set(DataStoreService.cachePrefix + 'maxChangeId', changeId);
} catch (e) {
if (e?.name === 'QuotaExceededError') {
this.statusService.setTooLessLocalStorage();
} else {
throw e;
}
}
}
public print(): void {
console.log('Max change id', this.maxChangeId);
console.log(JSON.stringify(this.jsonStore));
console.log(JSON.parse(JSON.stringify(this.modelStore)));
}
}

View File

@ -0,0 +1,36 @@
import { ErrorHandler, Injectable } from '@angular/core';
import { OpenSlidesStatusService } from './openslides-status.service';
@Injectable({
providedIn: 'root'
})
export class ErrorService extends ErrorHandler {
// TODO: This service cannot be injected into other services since it is constructed twice.
public constructor(private statusService: OpenSlidesStatusService) {
super();
}
public handleError(error: any): void {
const errorInformation = {
error,
name: this.guessName(error)
};
this.statusService.currentError.next(errorInformation);
super.handleError(error);
}
private guessName(error: any): string | null {
if (!error) {
return;
}
if (error.rejection?.name) {
return error.rejection.name;
}
if (error.name) {
return error.name;
}
}
}

View File

@ -0,0 +1,43 @@
import { Injectable } from '@angular/core';
import { OperatorService, Permission } from './operator.service';
export interface AuthGuardFallbackEntry {
route: string;
weight: number;
permission: Permission;
}
/**
* Classical Auth-Guard. Checks if the user has to correct permissions to enter a page, and forwards to login if not.
*/
@Injectable({
providedIn: 'root'
})
export class FallbackRoutesService {
private fallbackEntries: AuthGuardFallbackEntry[] = [];
/**
* Constructor
*
* @param operator Asking for the required permission
*/
public constructor(private operator: OperatorService) {}
/**
* Adds fallback navigation entries for the start page.
* @param entries The entries to add
*/
public registerFallbackEntries(entries: AuthGuardFallbackEntry[]): void {
this.fallbackEntries.push(...entries);
this.fallbackEntries = this.fallbackEntries.sort((a, b) => a.weight - b.weight);
}
public getFallbackRoute(): string | null {
for (const entry of this.fallbackEntries) {
if (this.operator.hasPerms(entry.permission)) {
return entry.route;
}
}
}
}

View File

@ -0,0 +1,7 @@
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { StableInterceptorService } from './stable-interceptor.service';
export const httpInterceptorProviders = [
{ provide: HTTP_INTERCEPTORS, useClass: StableInterceptorService, multi: true }
];

View File

@ -0,0 +1,36 @@
import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { first, mergeMap } from 'rxjs/operators';
import { OpenSlidesStatusService } from '../openslides-status.service';
/**
* An http interceptor to make sure, that every request is made
* only when this application is stable.
*/
@Injectable({
providedIn: 'root'
})
export class StableInterceptorService implements HttpInterceptor {
private readonly stableSubject = new BehaviorSubject<boolean>(false);
public constructor(private openslidesStatus: OpenSlidesStatusService) {
this.update();
}
public intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
return this.stableSubject.pipe(
first(stable => stable),
mergeMap(() => {
return next.handle(req);
})
);
}
private async update(): Promise<void> {
await this.openslidesStatus.stable;
this.stableSubject.next(true);
}
}

View File

@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { HttpService } from './http.service';
describe('HttpService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [HttpService]
});
});
// TODO: Write a working Test
// it('should be created', () => {
// const service: HttpService = TestBed.inject(HttpService);
// expect(service).toBeTruthy();
// });
});

View File

@ -0,0 +1,295 @@
import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { Subject } from 'rxjs';
import { AutoupdateFormat } from '../definitions/autoupdate-format';
import { AutoupdateThrottleService } from './autoupdate-throttle.service';
import { HTTPMethod } from '../definitions/http-methods';
import { OpenSlidesStatusService } from './openslides-status.service';
import { formatQueryParams, QueryParams } from '../definitions/query-params';
export interface ErrorDetailResponse {
detail: string | string[];
args?: string[];
}
function isErrorDetailResponse(obj: any): obj is ErrorDetailResponse {
return (
obj &&
typeof obj === 'object' &&
(typeof obj.detail === 'string' || obj.detail instanceof Array) &&
(!obj.args || obj.args instanceof Array)
);
}
interface AutoupdateResponse {
change_id: number;
data?: any;
}
function isAutoupdateReponse(obj: any): obj is AutoupdateResponse {
return obj && typeof obj === 'object' && typeof (obj as AutoupdateResponse).change_id === 'number';
}
/**
* Service for managing HTTP requests. Allows to send data for every method. Also (TODO) will do generic error handling.
*/
@Injectable({
providedIn: 'root'
})
export class HttpService {
/**
* http headers used by most requests
*/
private defaultHeaders: HttpHeaders;
public readonly responseChangeIds = new Subject<number>();
/**
* Construct a HttpService
*
* Sets the default headers to application/json
*
* @param http The HTTP Client
* @param translate
* @param timeTravel requests are only allowed if history mode is disabled
*/
public constructor(
private http: HttpClient,
private translate: TranslateService,
private OSStatus: OpenSlidesStatusService
) {
this.defaultHeaders = new HttpHeaders().set('Content-Type', 'application/json');
}
/**
* Send the a http request the the given path.
* Optionally accepts a request body.
*
* @param path the target path, usually starting with /rest
* @param method the required HTTP method (i.e get, post, put)
* @param data optional, if sending a data body is required
* @param queryParams optional queryparams to append to the path
* @param customHeader optional custom HTTP header of required
* @param responseType optional response type, default set to json (i.e 'arraybuffer')
* @returns a promise containing a generic
*/
private async send<T>(
path: string,
method: HTTPMethod,
data?: any,
queryParams?: QueryParams,
customHeader?: HttpHeaders,
responseType?: string
): Promise<T> {
// end early, if we are in history mode
if (this.OSStatus.isInHistoryMode && method !== HTTPMethod.GET) {
throw this.processError('You cannot make changes while in history mode');
}
// there is a current bug with the responseType.
// https://github.com/angular/angular/issues/18586
// castting it to 'json' allows the usage of the current array
if (!responseType) {
responseType = 'json';
}
let url = path + formatQueryParams(queryParams);
if (url[0] !== '/') {
console.warn(`Please prefix the URL "${url}" with a slash.`);
url = '/' + url;
}
if (this.OSStatus.isPrioritizedClient) {
url = '/prioritize' + url;
}
const options = {
body: data,
headers: customHeader ? customHeader : this.defaultHeaders,
responseType: responseType as 'json'
};
try {
const responseData: T = await this.http.request<T>(method, url, options).toPromise();
return this.processResponse(responseData);
} catch (error) {
throw this.processError(error);
}
}
/**
* Takes an error thrown by the HttpClient. Processes it to return a string that can
* be presented to the user.
* @param e The error thrown.
* @returns The prepared and translated message for the user
*/
private processError(e: any): string {
let error = this.translate.instant('Error') + ': ';
// If the error is a string already, return it.
if (typeof e === 'string') {
return error + e;
}
// If the error is no HttpErrorResponse, it's not clear what is wrong.
if (!(e instanceof HttpErrorResponse)) {
console.error('Unknown error thrown by the http client: ', e);
error += this.translate.instant('An unknown error occurred.');
return error;
}
if (e.status === 405) {
// this should only happen, if the url is wrong -> a bug.
error += this.translate.instant(
'The requested method is not allowed. Please contact your system administrator.'
);
} else if (!e.error) {
error += this.translate.instant("The server didn't respond.");
} else if (typeof e.error === 'object') {
if (isErrorDetailResponse(e.error)) {
error += this.processErrorDetailResponse(e.error);
} else {
const errorList = Object.keys(e.error).map(key => {
const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
let detail = e.error[key];
if (detail instanceof Array) {
detail = detail.join(' ');
} else {
detail = this.processErrorDetailResponse(detail);
}
return `${this.translate.instant(capitalizedKey)}: ${detail}`;
});
error = errorList.join(', ');
}
} else if (e.status === 500) {
error += this.translate.instant('A server error occured. Please contact your system administrator.');
} else if (e.status > 500) {
error += this.translate.instant('The server could not be reached.') + ` (${e.status})`;
} else {
error += e.message;
}
return error;
}
/**
* Errors from the servers may be string or array of strings. This function joins the strings together,
* if an array is send.
* @param str a string or a string array to join together.
* @returns Error text(s) as single string
*/
private processErrorDetailResponse(response: ErrorDetailResponse): string {
let message: string;
if (response.detail instanceof Array) {
message = response.detail.join(' ');
} else {
message = response.detail;
}
message = this.translate.instant(message);
if (response.args && response.args.length > 0) {
for (let i = 0; i < response.args.length; i++) {
message = message.replace(`{${i}}`, response.args[i].toString());
}
}
return message;
}
private processResponse<T>(responseData: T): T {
if (isAutoupdateReponse(responseData)) {
this.responseChangeIds.next(responseData.change_id);
return responseData.data;
}
return responseData;
}
/**
* Executes a get on a path with a certain object
* @param path The path to send the request to.
* @param data An optional payload for the request.
* @param queryParams Optional params appended to the path as the query part of the url.
* @param header optional HTTP header if required
* @param responseType option expected response type by the request (i.e 'arraybuffer')
* @returns A promise holding a generic
*/
public async get<T>(
path: string,
data?: any,
queryParams?: QueryParams,
header?: HttpHeaders,
responseType?: string
): Promise<T> {
return await this.send<T>(path, HTTPMethod.GET, data, queryParams, header, responseType);
}
/**
* Executes a post on a path with a certain object
* @param path The path to send the request to.
* @param data An optional payload for the request.
* @param queryParams Optional params appended to the path as the query part of the url.
* @param header optional HTTP header if required
* @returns A promise holding a generic
*/
public async post<T>(path: string, data?: any, queryParams?: QueryParams, header?: HttpHeaders): Promise<T> {
return await this.send<T>(path, HTTPMethod.POST, data, queryParams, header);
}
/**
* Executes a put on a path with a certain object
* @param path The path to send the request to.
* @param data An optional payload for the request.
* @param queryParams Optional params appended to the path as the query part of the url.
* @param header optional HTTP header if required
* @returns A promise holding a generic
*/
public async patch<T>(path: string, data?: any, queryParams?: QueryParams, header?: HttpHeaders): Promise<T> {
return await this.send<T>(path, HTTPMethod.PATCH, data, queryParams, header);
}
/**
* Executes a put on a path with a certain object
* @param path The path to send the request to.
* @param data An optional payload for the request.
* @param queryParams Optional params appended to the path as the query part of the url.
* @param header optional HTTP header if required
* @returns A promise holding a generic
*/
public async put<T>(path: string, data?: any, queryParams?: QueryParams, header?: HttpHeaders): Promise<T> {
return await this.send<T>(path, HTTPMethod.PUT, data, queryParams, header);
}
/**
* Makes a delete request.
* @param url The path to send the request to.
* @param data An optional payload for the request.
* @param queryParams Optional params appended to the path as the query part of the url.
* @param header optional HTTP header if required
* @returns A promise holding a generic
*/
public async delete<T>(path: string, data?: any, queryParams?: QueryParams, header?: HttpHeaders): Promise<T> {
return await this.send<T>(path, HTTPMethod.DELETE, data, queryParams, header);
}
/**
* Retrieves a binary file from the url and returns a base64 value
*
* @param url file url
* @returns a promise with a base64 string
*/
public async downloadAsBase64(url: string): Promise<string> {
return new Promise<string>(async (resolve, reject) => {
const headers = new HttpHeaders();
const file = await this.get<Blob>(url, {}, {}, headers, 'blob');
const reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = () => {
const resultStr: string = reader.result as string;
resolve(resultStr.split(',')[1]);
};
reader.onerror = error => {
reject(error);
};
});
}
}

View File

@ -0,0 +1,15 @@
import { inject, TestBed } from '@angular/core/testing';
import { MainMenuService } from './main-menu.service';
describe('MainMenuService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [MainMenuService]
});
});
it('should be created', inject([MainMenuService], (service: MainMenuService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,78 @@
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs';
import { Permission } from './operator.service';
/**
* This represents one entry in the main menu
*/
export interface MainMenuEntry {
/**
* The route for the router to navigate to on click.
*/
route: string;
/**
* The display string to be shown.
*/
displayName: string;
/**
* The font awesom icon to display.
*/
icon: string;
/**
* For sorting the entries.
*/
weight: number;
/**
* The permission to see the entry.
*/
permission: Permission;
}
/**
* Collects main menu entries and provides them to the main menu component.
*/
@Injectable({
providedIn: 'root'
})
export class MainMenuService {
/**
* A list of sorted entries.
*/
private _entries: MainMenuEntry[] = [];
/**
* Observed by the site component.
* If a new value appears the sideNavContainer gets toggled
*/
public toggleMenuSubject = new Subject<void>();
/**
* Make the entries public.
*/
public get entries(): MainMenuEntry[] {
return this._entries;
}
public constructor() {}
/**
* Adds entries to the mainmenu.
* @param entries The entries to add
*/
public registerEntries(entries: MainMenuEntry[]): void {
this._entries.push(...entries);
this._entries = this._entries.sort((a, b) => a.weight - b.weight);
}
/**
* Emit signal to toggle the main Menu
*/
public toggleMenu(): void {
this.toggleMenuSubject.next();
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from '../../../e2e-imports.module';
import { NotifyService } from './notify.service';
describe('NotifyService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [NotifyService]
});
});
it('should be created', inject([NotifyService], (service: NotifyService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,230 @@
import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { CommunicationManagerService, OfflineError } from './communication-manager.service';
import { HttpService } from './http.service';
import { OperatorService } from './operator.service';
/**
* Encapslates the name and content of every message regardless of being a request or response.
*/
interface NotifyBase<T> {
/**
* The name of the notify message.
*/
name: string;
/**
* The content to send.
*/
message: T;
}
function isNotifyBase(obj: object): obj is NotifyResponse<any> {
const base = obj as NotifyBase<any>;
return !!obj && base.message !== undefined && base.name !== undefined;
}
/**
* This interface has all fields for a notify request to the server. Next to name and content
* one can give an array of user ids (or the value `true` for all users) and an array of
* channel names.
*/
export interface NotifyRequest<T> extends NotifyBase<T> {
channel_id: string;
to_all?: boolean;
/**
* User ids (or `true` for all users) to send this message to.
*/
to_users?: number[];
/**
* An array of channels to send this message to.
*/
to_channels?: string[];
}
/**
* This is the notify-format one recieves from the server.
*/
export interface NotifyResponse<T> extends NotifyBase<T> {
/**
* This is the channel name of the one, who sends this message. Can be use to directly
* answer this message.
*/
sender_channel_id: string;
/**
* The user id of the user who sends this message. It is 0 for Anonymous.
*/
sender_user_id: number;
/**
* This is validated here and is true, if the senderUserId matches the current operator's id.
* It's also true, if one recieves a request from an anonymous and the operator itself is the anonymous.
*/
sendByThisUser: boolean;
}
function isNotifyResponse(obj: object): obj is NotifyResponse<any> {
const response = obj as NotifyResponse<any>;
// Note: we do not test for sendByThisUser, since it is set later in our code.
return isNotifyBase(obj) && response.sender_channel_id !== undefined && response.sender_user_id !== undefined;
}
interface ChannelIdResponse {
channel_id: string;
}
function isChannelIdResponse(obj: object): obj is ChannelIdResponse {
return !!obj && (obj as ChannelIdResponse).channel_id !== undefined;
}
/**
* Handles all incoming and outgoing notify messages via {@link WebsocketService}.
*/
@Injectable({
providedIn: 'root'
})
export class NotifyService {
/**
* A general subject for all messages.
*/
private notifySubject = new Subject<NotifyResponse<any>>();
/**
* Subjects for specific messages.
*/
private messageSubjects: {
[name: string]: Subject<NotifyResponse<any>>;
} = {};
private channelId: string;
public constructor(
private communicationManager: CommunicationManagerService,
private http: HttpService,
private operator: OperatorService
) {
this.communicationManager.startCommunicationEvent.subscribe(() => this.startListening());
this.communicationManager.stopCommunicationEvent.subscribe(() => (this.channelId = null));
}
private async startListening(): Promise<void> {
try {
await this.communicationManager.subscribe<NotifyResponse<any> | ChannelIdResponse>(
'/system/notify',
notify => {
if (isChannelIdResponse(notify)) {
this.channelId = notify.channel_id;
} else if (isNotifyResponse(notify)) {
notify.sendByThisUser =
notify.sender_user_id === (this.operator.user ? this.operator.user.id : 0);
this.notifySubject.next(notify);
if (this.messageSubjects[notify.name]) {
this.messageSubjects[notify.name].next(notify);
}
} else {
console.error('Unknwon notify message', notify);
}
}
);
} catch (e) {
if (!(e instanceof OfflineError)) {
console.error(e);
}
}
}
/**
* Sents a notify message to all users (so all clients that are online).
* @param name The name of the notify message
* @param content The payload to send
*/
public async sendToAllUsers<T>(name: string, content: T): Promise<void> {
await this.send(name, content, true);
}
/**
* Sends a notify message to all open clients with the given users logged in.
* @param name The name of th enotify message
* @param content The payload to send.
* @param users Multiple user ids.
*/
public async sendToUsers<T>(name: string, content: T, ...users: number[]): Promise<void> {
if (users.length < 1) {
throw new Error('You have to provide at least one user');
}
await this.send(name, content, false, users);
}
/**
* Sends a notify message to all given channels.
* @param name The name of th enotify message
* @param content The payload to send.
* @param channels Multiple channels to send this message to.
*/
public async sendToChannels<T>(name: string, content: T, ...channels: string[]): Promise<void> {
if (channels.length < 1) {
throw new Error('You have to provide at least one channel');
}
await this.send(name, content, false, null, channels);
}
/**
* General send function for notify messages.
* @param name The name of the notify message
* @param message The payload to send.
* @param users Either an array of IDs or `true` meaning of sending this message to all online users clients.
* @param channels An array of channels to send this message to.
*/
private async send<T>(
name: string,
message: T,
toAll?: boolean,
users?: number[],
channels?: string[]
): Promise<void> {
if (!this.channelId) {
throw new Error('No channel id!');
}
const notify: NotifyRequest<T> = {
name: name,
message: message,
channel_id: this.channelId
};
if (toAll === true) {
notify.to_all = true;
}
if (users) {
notify.to_users = users;
}
if (channels) {
notify.to_channels = channels;
}
console.debug('send notify', notify);
await this.http.post<unknown>('/system/notify/send', notify);
}
/**
* Returns a general observalbe of all notify messages.
*/
public getObservable(): Observable<NotifyResponse<any>> {
return this.notifySubject.asObservable();
}
/**
* Returns an observable for a specific type of messages.
* @param name The name of all messages to observe.
*/
public getMessageObservable<T>(name: string): Observable<NotifyResponse<T>> {
if (!this.messageSubjects[name]) {
this.messageSubjects[name] = new Subject<NotifyResponse<any>>();
}
return this.messageSubjects[name].asObservable() as Observable<NotifyResponse<T>>;
}
}

View File

@ -0,0 +1,37 @@
import { EventEmitter, Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
export enum OfflineReason {
WhoAmIFailed,
ConnectionLost
}
@Injectable({
providedIn: 'root'
})
export class OfflineBroadcastService {
public readonly isOfflineSubject = new BehaviorSubject<boolean>(false);
public get isOfflineObservable(): Observable<boolean> {
return this.isOfflineSubject.asObservable();
}
private readonly _goOffline = new EventEmitter<OfflineReason>();
public get goOfflineObservable(): Observable<OfflineReason> {
return this._goOffline.asObservable();
}
public constructor() {}
public goOffline(reason: OfflineReason): void {
this._goOffline.emit(reason);
}
public isOffline(): boolean {
return this.isOfflineSubject.getValue();
}
public isOnline(): boolean {
return !this.isOffline();
}
}

View File

@ -0,0 +1,18 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from 'e2e-imports.module';
import { OfflineService } from './offline.service';
describe('OfflineService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [OfflineService]
});
});
it('should be created', inject([OfflineService], (service: OfflineService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,125 @@
import { Injectable } from '@angular/core';
import { CommunicationManagerService } from './communication-manager.service';
import { OfflineBroadcastService, OfflineReason } from './offline-broadcast.service';
import { OpenSlidesService } from './openslides.service';
import { OperatorService, WhoAmI } from './operator.service';
/**
* This service handles everything connected with being offline.
*
* TODO: This is just a stub. Needs to be done in the future; Maybe we cancel this whole concept
* of this service. We'll see what happens here..
*/
@Injectable({
providedIn: 'root'
})
export class OfflineService {
private reason: OfflineReason | null;
public constructor(
private OpenSlides: OpenSlidesService,
private offlineBroadcastService: OfflineBroadcastService,
private operatorService: OperatorService,
private communicationManager: CommunicationManagerService
) {
this.offlineBroadcastService.goOfflineObservable.subscribe((reason: OfflineReason) => this.goOffline(reason));
}
/**
* Helper function to set offline status
*/
public goOffline(reason: OfflineReason): void {
if (this.offlineBroadcastService.isOffline()) {
return;
}
this.reason = reason;
if (reason === OfflineReason.ConnectionLost) {
console.log('offline because connection lost.');
} else if (reason === OfflineReason.WhoAmIFailed) {
console.log('offline because whoami failed.');
} else {
console.error('No such offline reason', reason);
}
this.offlineBroadcastService.isOfflineSubject.next(true);
this.checkStillOffline();
}
private checkStillOffline(): void {
const timeout = Math.floor(Math.random() * 3000 + 2000);
console.log(`Try to go online in ${timeout} ms`);
setTimeout(async () => {
let online: boolean;
let whoami: WhoAmI | null = null;
if (this.reason === OfflineReason.ConnectionLost) {
online = await this.communicationManager.isCommunicationServiceOnline();
console.log('is communication online? ', online);
} else if (this.reason === OfflineReason.WhoAmIFailed) {
const result = await this.operatorService.whoAmI();
online = result.online;
whoami = result.whoami;
console.log('is whoami reachable?', online);
}
if (online) {
await this.goOnline(whoami);
// TODO: check all other reasons -> e.g. if the
// connection was lost, the operator must be checked and the other way
// around the comminucation must be started!!
// stop trying.
} else {
// continue trying.
this.checkStillOffline();
}
}, timeout);
}
/**
* Function to return to online-status.
*
* First, we have to check, if all other sources (except this.reason) are online, too.
* This results in definetly having a whoami response at this point.
* If this is the case, we need to setup everything again:
* 1) check the operator. If this allowes for an logged in state (or anonymous is OK), do
* step 2, otherwise done.
* 2) enable communications.
*/
private async goOnline(whoami?: WhoAmI): Promise<void> {
console.log('go online!', this.reason, whoami);
if (this.reason === OfflineReason.ConnectionLost) {
// now we have to check whoami
const result = await this.operatorService.whoAmI();
if (!result.online) {
console.log('whoami down.');
this.reason = OfflineReason.WhoAmIFailed;
this.checkStillOffline();
return;
}
whoami = result.whoami;
} else if (this.reason === OfflineReason.WhoAmIFailed) {
const online = await this.communicationManager.isCommunicationServiceOnline();
if (!online) {
console.log('communication down.');
this.reason = OfflineReason.ConnectionLost;
this.checkStillOffline();
return;
}
}
console.log('we are online!');
// Ok, we are online now!
const isLoggedIn = await this.OpenSlides.checkWhoAmI(whoami);
console.log('logged in:', isLoggedIn);
if (isLoggedIn) {
this.communicationManager.startCommunication();
}
console.log('done');
this.offlineBroadcastService.isOfflineSubject.next(false);
}
}

View File

@ -0,0 +1,18 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from 'e2e-imports.module';
import { OpenSlidesStatusService } from './openslides-status.service';
describe('OpenSlidesStatusService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [OpenSlidesStatusService]
});
});
it('should be created', inject([OpenSlidesStatusService], (service: OpenSlidesStatusService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,92 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { History } from 'app/shared/models/core/history';
import { BannerDefinition, BannerService } from '../ui-services/banner.service';
import { Deferred } from '../promises/deferred';
export interface ErrorInformation {
error: any;
name?: string;
}
/**
* Holds information about OpenSlides. This is not included into other services to
* avoid circular dependencies.
*/
@Injectable({
providedIn: 'root'
})
export class OpenSlidesStatusService {
/**
* in History mode, saves the history point.
*/
private history: History = null;
private historyBanner: BannerDefinition = {
type: 'history'
};
private tooLessLocalStorage = false;
/**
* Returns, if OpenSlides is in the history mode.
*/
public get isInHistoryMode(): boolean {
return !!this.history;
}
public get stable(): Promise<void> {
return this._stable;
}
public isPrioritizedClient = false;
public readonly currentError = new BehaviorSubject<ErrorInformation | null>(null);
private _stable = new Deferred();
private _bootedSubject = new BehaviorSubject<boolean>(false);
/**
* Ctor, does nothing.
*/
public constructor(private banner: BannerService) {}
public setStable(): void {
this._stable.resolve();
this._bootedSubject.next(true);
}
/**
* Calls the getLocaleString function of the history object, if present.
*
* @param format the required date representation format
* @returns the timestamp as string
*/
public getHistoryTimeStamp(format: string): string {
return this.history ? this.history.getLocaleString(format) : null;
}
/**
* Enters the history mode
*/
public enterHistoryMode(history: History): void {
this.history = history;
this.banner.addBanner(this.historyBanner);
}
/**
* Leaves the history mode
*/
public leaveHistoryMode(): void {
this.history = null;
this.banner.removeBanner(this.historyBanner);
}
public setTooLessLocalStorage(): void {
if (!this.tooLessLocalStorage) {
this.tooLessLocalStorage = true;
this.banner.addBanner({ type: 'tooLessLocalStorage' });
}
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from '../../../e2e-imports.module';
import { OpenSlidesService } from './openslides.service';
describe('OpenSlidesService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [OpenSlidesService]
});
});
it('should be created', inject([OpenSlidesService], (service: OpenSlidesService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,186 @@
import { Injectable } from '@angular/core';
import { Router } from '@angular/router';
import { BehaviorSubject } from 'rxjs';
import { CommunicationManagerService } from './communication-manager.service';
import { DataStoreService } from './data-store.service';
import { OfflineBroadcastService, OfflineReason } from './offline-broadcast.service';
import { OpenSlidesStatusService } from './openslides-status.service';
import { OperatorService, WhoAmI } from './operator.service';
import { StorageService } from './storage.service';
/**
* Handles the bootup/showdown of this application.
*/
@Injectable({
providedIn: 'root'
})
export class OpenSlidesService {
/**
* If the user tries to access a certain URL without being authenticated, the URL will be stored here
*/
public redirectUrl: string;
/**
* Subject to hold the flag `booted`.
*/
public readonly booted = new BehaviorSubject(false);
/**
* Saves, if OpenSlides is fully booted. This means, that a user must be logged in
* (Anonymous is also a user in this case). This is the case after `afterLoginBootup`.
*/
public get isBooted(): boolean {
return this.booted.value;
}
public constructor(
private storageService: StorageService,
private operator: OperatorService,
private openslidesStatus: OpenSlidesStatusService,
private router: Router,
private DS: DataStoreService,
private communicationManager: CommunicationManagerService,
private offlineBroadcastService: OfflineBroadcastService
) {
this.bootup();
}
/**
* the bootup-sequence: Do a whoami request and if it was successful, do
* {@method afterLoginBootup}. If not, redirect the user to the login page.
*/
public async bootup(): Promise<void> {
// start autoupdate if the user is logged in:
let whoami = await this.operator.whoAmIFromStorage();
const needToCheckOperator = !!whoami;
if (!whoami) {
const response = await this.operator.whoAmI();
if (!response.online) {
this.offlineBroadcastService.goOffline(OfflineReason.WhoAmIFailed);
}
whoami = response.whoami;
}
if (!whoami.user && !whoami.guest_enabled) {
if (!location.pathname.includes('error')) {
this.redirectUrl = location.pathname;
}
this.redirectToLoginIfNotSubpage();
} else {
await this.afterLoginBootup(whoami.user_id);
}
if (needToCheckOperator) {
// Check for the operator via a async whoami (so no await here)
// to validate, that the cache was correct.
this.checkOperator(false);
}
}
/**
* Redirects the user to /login, if he isn't on a subpage.
*/
private redirectToLoginIfNotSubpage(): void {
if (!this.redirectUrl || !this.redirectUrl.includes('/login/')) {
// Goto login, if the user isn't on a subpage like
// legal notice or reset passwort view.
// If other routing requests are active (e.g. to `/` or `/error`)
// wait for the authguard to finish to navigate to /login. This
// redirect is more important than the other ones.
setTimeout(() => {
this.router.navigate(['/login']);
});
}
}
/**
* the login bootup-sequence: Check (and maybe clear) the cache und setup the DataStore
* and websocket. This "login" also may be the "login" of an anonymous when he is using
* OpenSlides as a guest.
* @param userId the id or null for guest
*/
public async afterLoginBootup(userId: number | null): Promise<void> {
// Check, which user was logged in last time
const lastUserId = await this.storageService.get<number>('lastUserLoggedIn');
// if the user changed, reset the cache and save the new user.
if (userId !== lastUserId) {
await this.DS.clear();
await this.storageService.set('lastUserLoggedIn', userId);
}
await this.setupDataStoreAndStartCommunication();
// Now finally booted.
this.booted.next(true);
}
/**
* Init DS from cache and after this start the websocket service.
*/
private async setupDataStoreAndStartCommunication(): Promise<void> {
await this.DS.initFromStorage();
await this.openslidesStatus.stable;
this.communicationManager.startCommunication();
}
/**
* Shuts down OpenSlides.
*/
public async shutdown(): Promise<void> {
this.communicationManager.closeConnections();
this.booted.next(false);
}
/**
* Shutdown and bootup.
*/
public async reboot(): Promise<void> {
await this.shutdown();
await this.bootup();
}
/**
* Clears the client cache and restarts OpenSlides. Results in "flickering" of the
* login mask, because the cached operator is also cleared.
*/
public async reset(): Promise<void> {
await this.shutdown();
await this.storageService.clear();
await this.bootup();
}
public async checkOperator(requestChanges: boolean = true): Promise<void> {
const response = await this.operator.whoAmI();
if (!response.online) {
this.offlineBroadcastService.goOffline(OfflineReason.WhoAmIFailed);
}
await this.checkWhoAmI(response.whoami, requestChanges);
}
/**
* Verify that the operator is the same as it was before. Should be alled on a reconnect.
*
* @returns true, if the user is still logged in
*/
public async checkWhoAmI(whoami: WhoAmI, requestChanges: boolean = true): Promise<boolean> {
let isLoggedIn = false;
// User logged off.
if (!whoami.user && !whoami.guest_enabled) {
await this.shutdown();
this.redirectToLoginIfNotSubpage();
} else {
isLoggedIn = true;
if (
(this.operator.user && this.operator.user.id !== whoami.user_id) ||
(!this.operator.user && whoami.user_id)
) {
// user changed
await this.DS.clear();
await this.reboot();
}
}
return isLoggedIn;
}
}

View File

@ -0,0 +1,17 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from '../../../e2e-imports.module';
import { OperatorService } from './operator.service';
describe('OperatorService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [OperatorService]
});
});
it('should be created', inject([OperatorService], (service: OperatorService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,483 @@
import { Injectable } from '@angular/core';
import { environment } from 'environments/environment';
import { BehaviorSubject, Observable, Subscription } from 'rxjs';
import { auditTime, filter } from 'rxjs/operators';
import { Group } from 'app/shared/models/users/group';
import { ViewUser } from 'app/site/users/models/view-user';
import { CollectionStringMapperService } from './collection-string-mapper.service';
import { DataStoreService } from './data-store.service';
import { Deferred } from '../promises/deferred';
import { HttpService } from './http.service';
import { OnAfterAppsLoaded } from '../definitions/on-after-apps-loaded';
import { OpenSlidesStatusService } from './openslides-status.service';
import { StorageService } from './storage.service';
import { DEFAULT_AUTH_TYPE, User, UserAuthType } from '../../shared/models/users/user';
import { UserRepositoryService } from '../repositories/users/user-repository.service';
/**
* Permissions on the client are just strings. This makes clear, that
* permissions instead of arbitrary strings should be given.
*/
export enum Permission {
agendaCanManage = 'agenda.can_manage',
agendaCanSee = 'agenda.can_see',
agendaCanSeeInternalItems = 'agenda.can_see_internal_items',
agendaCanManageListOfSpeakers = 'agenda.can_manage_list_of_speakers',
agendaCanSeeListOfSpeakers = 'agenda.can_see_list_of_speakers',
agendaCanBeSpeaker = 'agenda.can_be_speaker',
assignmentsCanManage = 'assignments.can_manage',
assignmentsCanNominateOther = 'assignments.can_nominate_other',
assignmentsCanNominateSelf = 'assignments.can_nominate_self',
assignmentsCanSee = 'assignments.can_see',
coreCanManageConfig = 'core.can_manage_config',
coreCanManageLogosAndFonts = 'core.can_manage_logos_and_fonts',
coreCanSeeHistory = 'core.can_see_history',
coreCanManageProjector = 'core.can_manage_projector',
coreCanSeeFrontpage = 'core.can_see_frontpage',
coreCanSeeProjector = 'core.can_see_projector',
coreCanManageTags = 'core.can_manage_tags',
coreCanSeeLiveStream = 'core.can_see_livestream',
coreCanSeeAutopilot = 'core.can_see_autopilot',
mediafilesCanManage = 'mediafiles.can_manage',
mediafilesCanSee = 'mediafiles.can_see',
motionsCanCreate = 'motions.can_create',
motionsCanCreateAmendments = 'motions.can_create_amendments',
motionsCanManage = 'motions.can_manage',
motionsCanManageMetadata = 'motions.can_manage_metadata',
motionsCanManagePolls = 'motions.can_manage_polls',
motionsCanSee = 'motions.can_see',
motionsCanSeeInternal = 'motions.can_see_internal',
motionsCanSupport = 'motions.can_support',
usersCanChangePassword = 'users.can_change_password',
usersCanManage = 'users.can_manage',
usersCanSeeExtraData = 'users.can_see_extra_data',
usersCanSeeName = 'users.can_see_name',
chatCanManage = 'chat.can_manage'
}
/**
* Response format of the WhoAmI request.
*/
export interface WhoAmI {
user_id: number;
guest_enabled: boolean;
user: User;
auth_type: UserAuthType;
permissions: Permission[];
}
function isWhoAmI(obj: any): obj is WhoAmI {
if (!obj) {
return false;
}
const whoAmI = obj as WhoAmI;
return (
whoAmI.guest_enabled !== undefined &&
whoAmI.user !== undefined &&
whoAmI.user_id !== undefined &&
whoAmI.permissions !== undefined &&
whoAmI.auth_type !== undefined
);
}
const WHOAMI_STORAGE_KEY = 'whoami';
/**
* The operator represents the user who is using OpenSlides.
*
* Changes in operator can be observed, directives do so on order to show
* or hide certain information.
*/
@Injectable({
providedIn: 'root'
})
export class OperatorService implements OnAfterAppsLoaded {
/**
* The operator.
*/
private _user: User;
public get user(): User {
return this._user;
}
/**
* The operator as a view user. We need a separation here, because
* we need to acces the operators permissions, before we get data
* from the server to build the view user.
*/
private _viewUser: ViewUser;
/**
* Get the user that corresponds to operator.
*/
public get viewUser(): ViewUser {
return this._viewUser;
}
/**
* Returns 0 for the anonymous
*/
public get userId(): number {
return this.user?.id || 0;
}
public get isAnonymous(): boolean {
return !this.user || this.user.id === 0;
}
public get isSuperAdmin(): boolean {
return this.isInGroupIdsNonAdminCheck(2);
}
public readonly authType: BehaviorSubject<UserAuthType> = new BehaviorSubject(DEFAULT_AUTH_TYPE);
/**
* Save, if guests are enabled.
*/
public get guestsEnabled(): boolean {
return this.currentWhoAmI ? this.currentWhoAmI.guest_enabled : false;
}
/**
* The permissions of the operator. Updated via {@method updatePermissions}.
*/
private permissions: Permission[] = [];
/**
* The subject that can be observed by other instances using observing functions.
*/
private operatorSubject: BehaviorSubject<User> = new BehaviorSubject<User>(null);
/**
* Subject for the operator as a view user.
*/
private viewOperatorSubject: BehaviorSubject<ViewUser> = new BehaviorSubject<ViewUser>(null);
/**
* Do not access the repo before it wasn't loaded. Will be true after `onAfterAppsLoaded`.
*/
private userRepository: UserRepositoryService | null;
private _currentWhoAmI: WhoAmI | null = null;
private _defaultWhoAmI: WhoAmI = {
user_id: null,
guest_enabled: false,
user: null,
auth_type: DEFAULT_AUTH_TYPE,
permissions: []
};
/**
* The current WhoAmI response to extract the user (the operator) from.
*/
private get currentWhoAmI(): WhoAmI {
return this._currentWhoAmI || this._defaultWhoAmI;
}
private set currentWhoAmI(value: WhoAmI | null) {
this._currentWhoAmI = value;
// Resetting the default whoami, when the current whoami isn't there. This
// is for a fresh restart and do not have (old) changed values in this.defaultWhoAmI
if (!value) {
this._defaultWhoAmI = this.getDefaultWhoAmIResponse();
}
}
private readonly _loaded: Deferred<void> = new Deferred();
public get loaded(): Promise<void> {
return this._loaded;
}
/**
* This is for the viewUser check, if the user id has changed, on a user update.
*/
private lastUserId: number | null = null;
/**
* The subscription to the viewuser from the user repository.
*/
private viewOperatorSubscription: Subscription;
/**
* Sets up an observer for watching changes in the DS. If the operator user or groups are changed,
* the operator's permissions are updated.
*
* @param http
* @param DS
* @param offlineService
*/
public constructor(
private http: HttpService,
private DS: DataStoreService,
private collectionStringMapper: CollectionStringMapperService,
private storageService: StorageService,
private OSStatus: OpenSlidesStatusService
) {
this.DS.getChangeObservable(User).subscribe(newModel => {
if (this._user && this._user.id === newModel.id) {
this._user = newModel;
this.updateUserInCurrentWhoAmI();
}
});
this.DS.getChangeObservable(Group)
.pipe(
filter(
model =>
// Any group has changed if we have an operator or
// group 1 (default) for anonymous changed
!!this._user || model.id === 1
),
auditTime(10)
)
.subscribe(() => this.updatePermissions());
// Watches the user observable to update the viewUser for the operator.
this.getUserObservable().subscribe(user => {
const userId = user ? user.id : null;
if ((!user && this.lastUserId === null) || userId === this.lastUserId) {
return; // The user didn't changed.
}
this.lastUserId = userId;
// User changed: clear subscription and subscribe to the new user (if there is one)
if (this.viewOperatorSubscription) {
this.viewOperatorSubscription.unsubscribe();
}
if (user && this.userRepository) {
this.viewOperatorSubscription = this.userRepository
.getViewModelObservable(user.id)
.subscribe(viewUser => {
this._viewUser = viewUser;
this.viewOperatorSubject.next(viewUser);
});
} else {
// The operator is anonymous.
this.viewOperatorSubject.next(null);
}
});
}
/**
* Load the repo to get a view user.
*/
public onAfterAppsLoaded(): void {
this.userRepository = this.collectionStringMapper.getRepository(ViewUser) as UserRepositoryService;
if (this.user) {
this._viewUser = this.userRepository.getViewModel(this.user.id);
}
this.viewOperatorSubject.next(this._viewUser);
}
/**
* Gets the current WhoAmI response from the storage.
*/
public async whoAmIFromStorage(): Promise<WhoAmI | null> {
let response: WhoAmI | null = null;
try {
response = await this.storageService.get<WhoAmI>(WHOAMI_STORAGE_KEY);
if (!isWhoAmI(response)) {
response = null;
}
} catch (e) {}
if (response) {
await this.updateCurrentWhoAmI(response);
}
return response;
}
public async clearWhoAmIFromStorage(): Promise<void> {
await this.storageService.remove(WHOAMI_STORAGE_KEY);
}
/**
* Sets the operator user. Will be saved to storage
* @param user The new operator.
*/
public async setWhoAmI(whoami: WhoAmI | null): Promise<void> {
if (whoami === null) {
whoami = this.getDefaultWhoAmIResponse();
}
await this.updateCurrentWhoAmI(whoami);
}
/**
* Calls `/apps/users/whoami` to find out the real operator.
*
* @returns The response of the WhoAmI request.
*/
public async whoAmI(): Promise<{ whoami: WhoAmI; online: boolean }> {
let online = true;
try {
const response = await this.http.get(environment.urlPrefix + '/users/whoami/');
if (isWhoAmI(response)) {
await this.updateCurrentWhoAmI(response);
} else {
online = false;
}
} catch (e) {
online = false;
}
return { whoami: this.currentWhoAmI, online };
}
/**
* Saves the user to storage by wrapping it into a (maybe existing)
* WhoAMI response.
*/
private async updateUserInCurrentWhoAmI(): Promise<void> {
if (this.isAnonymous) {
this.currentWhoAmI.user_id = null;
this.currentWhoAmI.user = null;
} else {
this.currentWhoAmI.user_id = this.user.id;
this.currentWhoAmI.user = this.user;
}
this.currentWhoAmI.permissions = this.permissions;
await this.updateCurrentWhoAmI();
}
/**
* Updates the user and update the permissions.
*/
private async updateCurrentWhoAmI(whoami?: WhoAmI): Promise<void> {
if (whoami) {
this.currentWhoAmI = whoami;
} else {
whoami = this.currentWhoAmI;
}
this._user = whoami ? whoami.user : null;
this.authType.next(whoami ? whoami.auth_type : DEFAULT_AUTH_TYPE);
await this.updatePermissions();
this._loaded.resolve();
}
/**
* @returns an observable for the operator as a user.
*/
public getUserObservable(): Observable<User> {
return this.operatorSubject.asObservable();
}
/**
* @returns an observable for the operator as a viewUser. Note, that
* the viewUser might not be there, so for reliable (and not display) information,
* use the `getUserObservable`.
*/
public getViewUserObservable(): Observable<ViewUser> {
return this.viewOperatorSubject.asObservable();
}
/**
* Checks, if the operator has at least one of the given permissions.
* @param checkPerms The permissions to check, if at least one matches.
*/
public hasPerms(...checkPerms: Permission[]): boolean {
if (this._user && this._user.groups_id.includes(2)) {
return true;
}
return checkPerms.some(permission => {
return this.permissions.includes(permission);
});
}
/**
* Returns true, if the operator is in at least one group or he is in the admin group.
* @param groups The groups to check
*/
public isInGroup(...groups: Group[]): boolean {
return this.isInGroupIds(...groups.map(group => group.id));
}
/**
* Returns true, if the operator is in at least one group or he is in the admin group.
* @param groups The group ids to check
*/
public isInGroupIds(...groupIds: number[]): boolean {
if (!this.isInGroupIdsNonAdminCheck(...groupIds)) {
// An admin has all perms and is technically in every group.
return this.user && this.user.groups_id.includes(2);
}
return true;
}
/**
* Returns true, if the operator is in at least one group.
* @param groups The group ids to check
*/
public isInGroupIdsNonAdminCheck(...groupIds: number[]): boolean {
if (!this.user) {
return groupIds.includes(1); // any anonymous is in the default group.
}
return groupIds.some(id => this.user.groups_id.includes(id));
}
/**
* Update the operators permissions and publish the operator afterwards.
* Saves the current WhoAmI to storage with the updated permissions
*/
private async updatePermissions(): Promise<void> {
this.permissions = [];
// If we do not have any groups, take the permissions from the
// latest WhoAmI response.
if (this.DS.getAll(Group).length === 0) {
if (this.currentWhoAmI) {
this.permissions = this.currentWhoAmI.permissions;
}
} else {
// Anonymous or users in the default group.
if (!this.user || this.user.groups_id.length === 0) {
const defaultGroup: Group = this.DS.get<Group>('users/group', 1);
if (defaultGroup && defaultGroup.permissions instanceof Array) {
this.permissions = defaultGroup.permissions;
}
} else {
const permissionSet = new Set<Permission>();
this.DS.getMany(Group, this.user.groups_id).forEach(group => {
group.permissions.forEach(permission => {
permissionSet.add(permission);
});
});
this.permissions = Array.from(permissionSet.values());
}
}
// Save perms to current WhoAmI
this.currentWhoAmI.permissions = this.permissions;
if (!this.OSStatus.isInHistoryMode) {
await this.storageService.set(WHOAMI_STORAGE_KEY, this.currentWhoAmI);
}
// publish changes in the operator.
this.operatorSubject.next(this.user);
}
/**
* Set the operators presence to isPresent
*/
public async setPresence(isPresent: boolean): Promise<void> {
await this.http.post(environment.urlPrefix + '/users/setpresence/', isPresent);
}
/**
* Returns a default WhoAmI response
*/
private getDefaultWhoAmIResponse(): WhoAmI {
return {
user_id: null,
guest_enabled: false,
user: null,
auth_type: DEFAULT_AUTH_TYPE,
permissions: []
};
}
}

View File

@ -0,0 +1,16 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from '../../../e2e-imports.module';
import { ProjectorDataService } from './projector-data.service';
describe('ProjectorDataService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [ProjectorDataService]
});
});
it('should be created', inject([ProjectorDataService], (service: ProjectorDataService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,179 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable, Subject } from 'rxjs';
import { auditTime } from 'rxjs/operators';
import { Projector, ProjectorElement } from 'app/shared/models/core/projector';
import { CommunicationManagerService, OfflineError } from './communication-manager.service';
export interface SlideData<T = { error?: string }, P extends ProjectorElement = ProjectorElement> {
data: T;
element: P;
error?: string;
}
export type ProjectorData = SlideData[];
interface AllProjectorData {
[id: number]: ProjectorData;
}
/**
* Received data from server.
*/
interface ProjectorDataMessage {
/**
* The `change_id` of the current update.
*/
change_id: number;
/**
* The necessary new projector-data.
*/
data: AllProjectorData;
}
/**
* This service handles the websocket connection for the projector data.
* Each projector instance registers itself by calling `getProjectorObservable`.
* A projector should deregister itself, when the component is destroyed.
*/
@Injectable({
providedIn: 'root'
})
export class ProjectorDataService {
/**
* Counts the open projector instances per projector id.
*/
private openProjectorInstances: { [id: number]: number } = {};
/**
* Holds the current projector data for each projector.
*/
private currentProjectorData: { [id: number]: BehaviorSubject<ProjectorData | null> } = {};
/**
* When multiple projectory are requested, debounce these requests to just issue
* one request, with all the needed projectors.
*/
private readonly updateProjectorDataDebounceSubject = new Subject<void>();
/**
* Holds the current change id to check, if the update contains new content or a deprecated one.
*/
private currentChangeId = 0;
private streamCloseFn: () => void | null = null;
public constructor(private communicationManager: CommunicationManagerService) {
this.communicationManager.startCommunicationEvent.subscribe(() => this.updateProjectorDataSubscription());
// With a bit of debounce, update the needed projectors.
this.updateProjectorDataDebounceSubject.pipe(auditTime(10)).subscribe(() => {
const allActiveProjectorIds = Object.keys(this.openProjectorInstances)
.map(id => parseInt(id, 10))
.filter(id => this.openProjectorInstances[id] > 0);
this.requestProjectors(allActiveProjectorIds);
});
}
public async requestProjectors(allActiveProjectorIds: number[]): Promise<void> {
this.cancelCurrentServerSubscription();
if (allActiveProjectorIds.length === 0) {
return;
}
try {
this.streamCloseFn = await this.communicationManager.subscribe<ProjectorDataMessage>(
'/system/projector',
message => {
this.handleMesage(message);
},
() => ({ projector_ids: allActiveProjectorIds.join(',') })
);
} catch (e) {
if (!(e instanceof OfflineError)) {
console.error(e);
}
}
}
public cancelCurrentServerSubscription(): void {
if (this.streamCloseFn) {
this.streamCloseFn();
this.streamCloseFn = null;
}
}
private handleMesage(message: ProjectorDataMessage): void {
if (this.currentChangeId > message.change_id) {
console.log('Projector: Change id too low:', this.currentChangeId, message.change_id);
return;
}
Object.keys(message.data).forEach(_id => {
const id = parseInt(_id, 10);
if (this.currentProjectorData[id]) {
this.currentProjectorData[id].next(message.data[id] as ProjectorData);
}
});
this.currentChangeId = message.change_id;
}
/**
* Gets an observable for the projector data.
*
* @param projectorId The requested projector
* @return an observable for the projector data of the given projector.
*/
public getProjectorObservable(projectorId: number): Observable<ProjectorData | null> {
// Count projectors.
if (!this.openProjectorInstances[projectorId]) {
this.openProjectorInstances[projectorId] = 1;
if (!this.currentProjectorData[projectorId]) {
this.currentProjectorData[projectorId] = new BehaviorSubject<ProjectorData | null>(null);
}
} else {
this.openProjectorInstances[projectorId]++;
}
// Projector opened the first time.
if (this.openProjectorInstances[projectorId] === 1) {
this.updateProjectorDataSubscription();
}
return this.currentProjectorData[projectorId].asObservable();
}
/**
* Unsubscribe data from the server, if the last projector was closed.
*
* @param projectorId the projector.
*/
public projectorClosed(projectorId: number): void {
if (this.openProjectorInstances[projectorId]) {
this.openProjectorInstances[projectorId]--;
}
if (this.openProjectorInstances[projectorId] === 0) {
this.updateProjectorDataSubscription();
this.currentProjectorData[projectorId].next(null);
}
}
/**
* Requests to update the data subscription to the server.
*/
private updateProjectorDataSubscription(): void {
this.updateProjectorDataDebounceSubject.next();
}
/**
* @returns the available projectior data for the given projector. Note that the data
* might not be there, if there is no subscribtion for this projector. But the
* data, if exist, is always the current data.
*/
public getAvailableProjectorData(projector: Projector): ProjectorData | null {
if (this.currentProjectorData[projector.id]) {
return this.currentProjectorData[projector.id].getValue();
}
}
}

View File

@ -0,0 +1,18 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from 'e2e-imports.module';
import { ProjectorService } from './projector.service';
describe('ProjectorService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [ProjectorService]
});
});
it('should be created', inject([ProjectorService], (service: ProjectorService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,430 @@
import { Injectable } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { BaseModel } from 'app/shared/models/base/base-model';
import { ProjectionDefault } from 'app/shared/models/core/projection-default';
import {
elementIdentifies,
IdentifiableProjectorElement,
Projector,
ProjectorElement,
ProjectorElements
} from 'app/shared/models/core/projector';
import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model';
import {
isProjectable,
isProjectorElementBuildDeskriptor,
Projectable,
ProjectorElementBuildDeskriptor
} from 'app/site/base/projectable';
import { SlideManager } from 'app/slides/services/slide-manager.service';
import { ConfigService } from '../ui-services/config.service';
import { DataStoreService } from './data-store.service';
import { HttpService } from './http.service';
import { ProjectorDataService } from './projector-data.service';
import { ViewModelStoreService } from './view-model-store.service';
export interface ProjectorTitle {
title: string;
subtitle?: string;
}
/**
* This service cares about Projectables being projected and manage all projection-related
* actions.
*
* We cannot access the ProjectorRepository here, so we will deal with plain projector objects.
*/
@Injectable({
providedIn: 'root'
})
export class ProjectorService {
public constructor(
private DS: DataStoreService,
private http: HttpService,
private slideManager: SlideManager,
private viewModelStore: ViewModelStoreService,
private translate: TranslateService,
private configService: ConfigService,
private projectorDataService: ProjectorDataService
) {}
/**
* Retusn the identifiable projector element from the given types of slides/elements/descriptors
*
* @param obj Something related to IdentifiableProjectorElement
* @returns the identifiable projector element from obj.
*/
private getProjectorElement(
obj: Projectable | ProjectorElementBuildDeskriptor | IdentifiableProjectorElement
): IdentifiableProjectorElement {
if (isProjectable(obj)) {
return obj.getSlide(this.configService).getBasicProjectorElement({});
} else if (isProjectorElementBuildDeskriptor(obj)) {
return obj.getBasicProjectorElement({});
} else {
return obj;
}
}
/**
* Checks, if a given object is projected.
*
* @param obj The object in question
* @returns true, if the object is projected on one projector.
*/
public isProjected(obj: Projectable | ProjectorElementBuildDeskriptor | IdentifiableProjectorElement): boolean {
const element = this.getProjectorElement(obj);
if (element?.getIdentifiers) {
return this.DS.getAll<Projector>('core/projector').some(projector => {
return projector.isElementShown(element);
});
}
return false;
}
/**
* Get all projectors where the object is prejected on.
*
* @param obj The object in question
* @return All projectors, where this Object is projected on
*/
public getProjectorsWhichAreProjecting(
obj: Projectable | ProjectorElementBuildDeskriptor | IdentifiableProjectorElement
): Projector[] {
const element = this.getProjectorElement(obj);
return this.DS.getAll<Projector>('core/projector').filter(projector => {
return projector.isElementShown(element);
});
}
/**
* Checks, if the object is projected on the given projector.
*
* @param obj The object
* @param projector The projector to test
* @returns true, if the object is projected on the projector.
*/
public isProjectedOn(
obj: Projectable | ProjectorElementBuildDeskriptor | IdentifiableProjectorElement,
projector: Projector
): boolean {
return projector.isElementShown(this.getProjectorElement(obj));
}
/**
* Projects the given ProjectorElement on the given projectors. Removes the element
* from all non-given projectors
*
* @param projectors All projectors where to add the element.
* @param element The element in question.
*/
public projectOnMultiple(projectors: Projector[], element: IdentifiableProjectorElement): void {
this.DS.getAll<Projector>('core/projector').forEach(projector => {
if (projectors.includes(projector)) {
this.projectOn(projector, element);
} else if (projector.isElementShown(element)) {
this.removeFrom(projector, element);
}
});
}
/**
* Projcets the given object on the projector. If the object is non-stable, all other non-stable
* elements will be removed and added to the history.
*
* @param projector The projector to add the object to.
* @param obj The object to project
*/
public async projectOn(
projector: Projector,
obj: Projectable | ProjectorElementBuildDeskriptor | IdentifiableProjectorElement
): Promise<void> {
const element = this.getProjectorElement(obj);
if (element.stable) {
// remove the same element, if it is currently projected
projector.removeElements(element);
// Add this stable element
projector.addElement(element);
await this.projectRequest(projector, projector.elements);
} else {
// For non-stable elements remove all other non-stable elements, add them to the history and
// add the one new element to the projector.
const removedElements = projector.removeAllNonStableElements();
let changed = removedElements.length > 0;
if (element) {
projector.addElement(element);
changed = true;
}
if (changed) {
await this.projectRequest(projector, projector.elements, null, removedElements, false, true);
}
}
}
/**
* Removes the given object from the projector. Non stable elements will be added to the history.
*
* @param projector The projector
* @param obj the object to unproject
*/
public async removeFrom(
projector: Projector,
obj: Projectable | ProjectorElementBuildDeskriptor | IdentifiableProjectorElement
): Promise<void> {
const element = this.getProjectorElement(obj);
const removedElements = projector.removeElements(element);
if (removedElements.length > 0) {
if (element.stable) {
await this.projectRequest(projector, projector.elements);
} else {
// For non-stable elements: Add removed elements to the history.
await this.projectRequest(projector, projector.elements, null, removedElements);
}
}
}
public async updateElement(
projector: Projector,
obj: Projectable | ProjectorElementBuildDeskriptor | IdentifiableProjectorElement
): Promise<void> {
const element = this.getProjectorElement(obj);
projector.replaceElements(element);
await this.projectRequest(projector, projector.elements, projector.elements_preview);
}
/**
* Executes the request to change projector elements.
*
* Note: Just one of `appendToHistory` and `deleteLastHistoryElement` can be given.
*
* @param projector The affected projector
* @param elements (optional) Elements to set.
* @param preview (optional) preview to set
* @param appendToHistory (optional) Elements to be appended to the history
* @param deleteLastHistroyElement (optional) If given, the last history element will be removed.
*/
private async projectRequest(
projector: Projector,
elements?: ProjectorElements,
preview?: ProjectorElements,
appendToHistory?: ProjectorElements,
deleteLastHistroyElement?: boolean,
resetScroll?: boolean
): Promise<void> {
const requestData: any = {};
if (elements) {
requestData.elements = this.cleanupElements(projector, elements);
}
if (preview) {
requestData.preview = preview;
}
if (appendToHistory && appendToHistory.length) {
requestData.append_to_history = appendToHistory;
}
if (deleteLastHistroyElement) {
requestData.delete_last_history_element = true;
}
if (appendToHistory && appendToHistory.length && deleteLastHistroyElement) {
throw new Error('You cannot append to the history and delete the last element at the same time');
}
if (resetScroll) {
requestData.reset_scroll = resetScroll;
}
await this.http.post(`/rest/core/projector/${projector.id}/project/`, requestData);
}
/**
* Cleans up stable elements with errors from the projector
*
* @param projector The projector
* @param elements The elements to clean up
* @reutns the cleaned up elements.
*/
private cleanupElements(projector: Projector, elements: ProjectorElements): ProjectorElements {
const projectorData = this.projectorDataService.getAvailableProjectorData(projector);
if (projectorData) {
projectorData.forEach(entry => {
if (entry.data.error && entry.element.stable) {
// Remove this element
const idElementToRemove = this.slideManager.getIdentifiableProjectorElement(entry.element);
elements = elements.filter(element => {
return !elementIdentifies(idElementToRemove, element);
});
}
});
}
return elements;
}
/**
* Given a projectiondefault, we want to retrieve the projector, that is assigned
* to this default.
*
* @param projectiondefault The projection default
* @return the projector associated to the given projectiondefault.
*/
public getProjectorForDefault(projectiondefault: string): Projector | null {
const pd = this.DS.find(ProjectionDefault, _pd => _pd.name === projectiondefault);
if (pd) {
return this.DS.get<Projector>(Projector, pd.projector_id);
} else {
return null;
}
}
/**
* Asserts, that the given element is mappable to a model or view model.
* Throws an error, if this assertion fails.
*
* @param element The element to check
*/
private assertElementIsMappable(element: IdentifiableProjectorElement): void {
if (!this.slideManager.canSlideBeMappedToModel(element.name)) {
throw new Error('This projector element cannot be mapped to a model');
}
const identifiers = element.getIdentifiers();
if (!identifiers.includes('name') || !identifiers.includes('id')) {
throw new Error('To map this element to a model, a name and id is needed.');
}
}
/**
* Returns a model associated with the identifiable projector element. Throws an error,
* if the element is not mappable.
*
* @param element The projector element
* @returns the model from the projector element
*/
public getModelFromProjectorElement<T extends BaseModel>(element: IdentifiableProjectorElement): T {
this.assertElementIsMappable(element);
return this.DS.get<T>(element.name, element.id);
}
/**
* Returns a view model associated with the identifiable projector element. Throws an error,
* if the element is not mappable.
*
* @param element The projector element
* @returns the view model from the projector element
*/
public getViewModelFromIdentifiableProjectorElement<T extends BaseProjectableViewModel>(
element: IdentifiableProjectorElement
): T {
this.assertElementIsMappable(element);
const viewModel = this.viewModelStore.get<T>(element.name, element.id);
if (viewModel && !isProjectable(viewModel)) {
console.error('The view model is not projectable', viewModel, element);
}
return viewModel;
}
public getViewModelFromProjectorElement<T extends BaseProjectableViewModel>(element: ProjectorElement): T {
const idElement = this.slideManager.getIdentifiableProjectorElement(element);
return this.getViewModelFromIdentifiableProjectorElement(idElement);
}
/**
*/
public getSlideTitle(element: ProjectorElement): ProjectorTitle {
if (this.slideManager.canSlideBeMappedToModel(element.name)) {
const viewModel = this.getViewModelFromProjectorElement(element);
if (viewModel) {
return viewModel.getProjectorTitle();
}
}
const configuration = this.slideManager.getSlideConfiguration(element.name);
if (configuration.getSlideTitle) {
return configuration.getSlideTitle(element, this.translate, this.viewModelStore);
}
return { title: this.translate.instant(this.slideManager.getSlideVerboseName(element.name)) };
}
/**
* Projects the next slide in the queue. Moves all currently projected
* non-stable slides to the history.
*
* @param projector The projector
*/
public async projectNextSlide(projector: Projector): Promise<void> {
await this.projectPreviewSlide(projector, 0);
}
/**
* Projects one slide (given by the index of the preview) on the given projector. Moves
* all current projected non-stable elements to the history.
*
* @param projector The projector
* @param previewIndex The index in the `elements_preview` array.
*/
public async projectPreviewSlide(projector: Projector, previewIndex: number): Promise<void> {
if (projector.elements_preview.length === 0 || previewIndex >= projector.elements_preview.length) {
return;
}
const removedElements = projector.removeAllNonStableElements();
projector.addElement(projector.elements_preview.splice(previewIndex, 1)[0]);
await this.projectRequest(
projector,
projector.elements,
projector.elements_preview,
removedElements,
false,
true
);
}
/**
* Projects the last slide of the history. This slide will be removed from the history.
*
* @param projector The projector
*/
public async projectPreviousSlide(projector: Projector): Promise<void> {
if (projector.elements_history.length === 0) {
return;
}
// Get the last element from the history
const lastElements: ProjectorElements = projector.elements_history[projector.elements_history.length - 1];
let lastElement: ProjectorElement = null;
if (lastElements.length > 0) {
lastElement = lastElements[0];
}
// Add all current elements to the preview.
const removedElements = projector.removeAllNonStableElements();
removedElements.forEach(e => projector.elements_preview.unshift(e));
// Add last element
if (lastElement) {
projector.addElement(lastElement);
}
await this.projectRequest(projector, projector.elements, projector.elements_preview, null, true, true);
}
/**
* Saves the preview of the projector
*
* @param projector The projector to save the preview.
*/
public async savePreview(projector: Projector): Promise<void> {
await this.projectRequest(projector, null, projector.elements_preview);
}
/**
* Appends the given element to the preview.
*
* @param projector The projector
* @param element The element to add to the preview.
*/
public async addElementToPreview(projector: Projector, element: ProjectorElement): Promise<void> {
projector.elements_preview.push(element);
await this.projectRequest(projector, null, projector.elements_preview);
}
}

View File

@ -0,0 +1,18 @@
import { inject, TestBed } from '@angular/core/testing';
import { E2EImportsModule } from 'e2e-imports.module';
import { PwaService } from './pwa.service';
describe('PwaService', () => {
beforeEach(() =>
TestBed.configureTestingModule({
imports: [E2EImportsModule],
providers: [PwaService]
})
);
it('should be created', inject([PwaService], (service: PwaService) => {
expect(service).toBeTruthy();
}));
});

View File

@ -0,0 +1,25 @@
import { Injectable } from '@angular/core';
import { SwUpdate } from '@angular/service-worker';
/**
* Service for Progressive Web App options
*/
@Injectable({
providedIn: 'root'
})
export class PwaService {
public promptEvent;
public constructor(swUpdate: SwUpdate) {
// check if an update is available
swUpdate.available.subscribe(event => {
// TODO: ask user if app should update now
window.location.reload();
});
// install button
window.addEventListener('beforeinstallprompt', event => {
this.promptEvent = event;
});
}
}

Some files were not shown because too many files have changed in this diff Show More