Commit Graph

6529 Commits

Author SHA1 Message Date
Emanuel Schütze d62f1538ab
Merge pull request #4489 from GabrielInTheWorld/tree-sort-agenda
Replaces the DragDrop-Tree
2019-03-19 19:46:03 +01:00
Sean 5fbf682754
Merge pull request #4472 from tsiegleauq/countdown-control-component
Add Countdowns in projector detail
2019-03-19 17:52:08 +01:00
Sean Engelhardt 183d2738e0 Add Countdowns in projector detail
Adds Pretty countdown controls, detetion and edit in
Projector template.

Countdown list was removed
2019-03-19 17:20:38 +01:00
GabrielMeyer 76d760bd41 Replaces the old `angular2tree` with a custom drag&drop tree
Calculates the direction of the moving.

Finishes the moving of nodes in same level

Adds some style

Sets the padding dynamically

Adds placeholder depends on the horizontal movement

Set the placeholder at the correct place, so the user can see, where he will drop the moved node

Finishes moving of nodes

- Old parents change their option to expand.
- New parents change their option to expand.
- If the user moves a node between nodes with a higher level, the node will be moved to the next index with same or lower level.

Fixes the visibility of moved node

- If the new parent is not visible, the moved node will not be seen.

If the user moves an expanded node, the new parent should expanded, too, if it's not already.

Sending successfully data to the server

- Sorting the items

Handles moving nodes between parent and children

- If the user moves a node between a parent and its children, the children will be relinked to the moved node as their new parent.

Replaces the old `sorting-tree` to a new one

- The new `sorted-tree` replaces the old `sorting-tree`.
- The old package `angular-tree-component` was removed.
- The user will only see the buttons to save or cancel his changes, if he made changes.
- The buttons, that do not work currently, were removed.

Adds a guard to check if the user made changes.

- If the user made changes but he has not saved them, then there is a dialog that will prompt to ask for confirmation.

Before cancelling the changes the user has to confirm this.
2019-03-19 13:19:35 +01:00
Emanuel Schütze 5d045a894a
Merge pull request #4514 from CatoTH/amendmentsInViewMotion
Add amendments as dependencies in ViewMotion [2]
2019-03-17 22:04:22 +01:00
Tobias Hößl 5d9128403a
Bugfix: Diff 2019-03-17 20:31:25 +01:00
FinnStutzenstein 6cb4b9a691 Add amendments as dependencies in ViewMotion 2019-03-17 18:01:10 +01:00
Emanuel Schütze 1c02d5f496
Merge pull request #4513 from CatoTH/OS3-Bugfix-Amendment-Diff-Extraction
Bugfix in motion's diff-view: correct amendment diff
2019-03-16 20:43:54 +01:00
Emanuel Schütze 5482157536
Merge pull request #4510 from CatoTH/OS3-Line-Highlighting-Bugfixes
Bugfixes: Highlighting wo CRs, better scrolling
2019-03-16 20:39:39 +01:00
Tobias Hößl 1764447704
Bugfix in motion's diff-view: correct amendment diff 2019-03-16 14:07:05 +01:00
Tobias Hößl e62648c719
Bugfixes: Highlighting wo CRs, better scrolling 2019-03-16 13:34:55 +01:00
Emanuel Schütze e03ec00567
Merge pull request #4512 from FinnStutzenstein/fixOpenSlidesServiceOnLogin
Fixed errors on login
2019-03-16 12:11:44 +01:00
FinnStutzenstein cd7b700aea Fixed errors on login 2019-03-15 15:29:02 +01:00
Sean 398ffc30ea
Merge pull request #4411 from MaximilianKrambach/sort_alternative
fix sort performance issues for dropdowns
2019-03-15 09:58:32 +01:00
Maximilian Krambach 9c67b1c773 sorting from inside base repositories
Authors: FinnStutzenstein, MaximilianKrambach, tsiegleauq
2019-03-15 08:12:50 +01:00
Emanuel Schütze ccc81df434
Merge pull request #4509 from tsiegleauq/more-user-permission-fixes
Fix certain permission checks
2019-03-14 18:22:29 +01:00
Sean Engelhardt 5d35a0fa5f Fix certain permission checks
Fixed permissions in topic detail, agenda list and user detail.
Fixes Z-Level of head bar and mat-spinner.
2019-03-14 17:50:33 +01:00
Sean 09ddc83d30
Merge pull request #4508 from tsiegleauq/cleanup-motion-detail-ds-repos
Cleanup Repos
2019-03-14 11:40:56 +01:00
Emanuel Schütze 4950ca084f
Merge pull request #4507 from normanjaeckel/ManyToManyMigrationsFix
Hotfix for #4501: Skipped many to many related objects autoupdate sig…
2019-03-14 11:34:48 +01:00
Emanuel Schütze 52be65a315
Merge pull request #4506 from normanjaeckel/Hotfix4491
Hotfix for #4491: Autoupdate for motion when change recommendation ch…
2019-03-14 11:34:34 +01:00
Sean Engelhardt d4e10702cc Cleanup Repos
Add an getViewModelListBehaviorSubject that simplifies
how to get most model lists in the view

unified update, delete and create methods and removed redundant code from the repos
(where it was possible)

cleaned up the motion detail to not directly use the DataStore

Add information about the "main model" to all ViewModels, to call the
correct constructor in the BaseRepo
2019-03-14 10:46:33 +01:00
Sean 74bcc4bcea
Merge pull request #4500 from tsiegleauq/workflow-order
workflow table state sort
2019-03-13 16:09:44 +01:00
Sean ae3ce54f57 workflow table state sort
Sorts the Workflow table to be more predictable

Adds new shared SCSS table rules.
Adds a default with as 100% (there have never been half tables)
Overwrites the rules for sticky tables
2019-03-13 15:54:35 +01:00
Sean 7734a502d8
Merge pull request #4502 from FinnStutzenstein/fixRedirectionOnDelayedWhoAmI
Fixed redirection on login subpages (fixed #4474)
2019-03-13 15:31:21 +01:00
Norman Jäckel baacda2b8e Hotfix for #4501: Skipped many to many related objects autoupdate signal during migrations. 2019-03-13 10:58:01 +01:00
Norman Jäckel 8f50caf481 Hotfix for #4491: Autoupdate for motion when change recommendation changes. 2019-03-13 09:40:04 +01:00
Finn Stutzenstein 6d66ec5b5d
Merge pull request #4493 from FinnStutzenstein/baseComponent
Cleanup optional parameter from BaseComponent
2019-03-12 12:41:09 +01:00
FinnStutzenstein e6ec164fe9 Fixed redirection on login subpages (fixed #4474) 2019-03-12 12:01:05 +01:00
Emanuel Schütze b30340b72f
Merge pull request #4497 from tsiegleauq/motionslides-linenumber-height
Fix motion slide line number alignment
2019-03-11 14:25:01 +01:00
Finn Stutzenstein 3ac7788fe8
Merge pull request #4471 from FinnStutzenstein/permissionsInWhoAmI
rework login system (again)
2019-03-11 14:03:46 +01:00
Sean 35b27b967f Fix motion line number alignment 2019-03-11 13:56:25 +01:00
FinnStutzenstein eb4537c1bf rework login system (again) 2019-03-11 13:45:17 +01:00
Emanuel Schütze e13a849c19
Merge pull request #4498 from tsiegleauq/fix-path-matching
Fix path matching
2019-03-11 13:23:03 +01:00
Emanuel Schütze 0ac9125d66
Merge pull request #4496 from emanuelschuetze/translation-20190311
Updated translations
2019-03-11 12:58:22 +01:00
Sean 245f3a5a27 Fix path matching
Fixed an error where navigation to not-lazy-loaded was prevented by full
path-matching.
Was preventing the sites for Search, Legal Notice and PP to show up
2019-03-11 12:33:55 +01:00
Emanuel Schütze 5139fe8365 Updated tranlstions 2019-03-11 12:28:34 +01:00
Emanuel Schütze d251bd15e6
Merge pull request #4492 from tsiegleauq/history-filter
Fix history history filter for null
2019-03-11 12:25:37 +01:00
Emanuel Schütze 8ce8286ea2
Merge pull request #4494 from tsiegleauq/agenda-filter-opendone
Fix agenda status filter
2019-03-11 12:23:24 +01:00
Emanuel Schütze 3684701ab6
Merge pull request #4495 from FinnStutzenstein/viewItemTitle
ViewItem title (fixes #4464)
2019-03-11 12:21:21 +01:00
FinnStutzenstein aa81bf38c3 ViewItem title (fixes #4464) 2019-03-11 11:21:34 +01:00
Sean 8ca1a4256c Fix agenda status filter
Fixes an issue where the status filter in the agenda list did not do
nothing
2019-03-11 11:04:29 +01:00
FinnStutzenstein 64eab79d3b Cleanup optionalparameter from BaseComponent 2019-03-11 10:49:57 +01:00
Sean 4e62e9253e Fix history history filter for null
Fixes an issue where the history filter was throwing an error
if there were deleted objectsy
2019-03-11 10:29:12 +01:00
Finn Stutzenstein d10dfb0915
Merge pull request #4469 from MaximilianKrambach/speakertime
clarifying duration service usage
2019-03-11 08:07:41 +01:00
Emanuel Schütze 0419ea629f
Merge pull request #4487 from CatoTH/OS3-Bugfix-Amendment-Status-Handling
Bugfix: Amendment statuses
2019-03-09 23:14:29 +01:00
Tobias Hößl 6b685924d9 Bugfix: Amendment statuses 2019-03-09 22:48:21 +01:00
Emanuel Schütze 1ecc7f4baa
Merge pull request #4485 from tsiegleauq/user-detail-template-fixes
User detail template fixes
2019-03-09 22:06:15 +01:00
Emanuel Schütze f4b798d6a2
Merge pull request #4479 from FinnStutzenstein/losSpeakerCount
(current) list of speakers: show amount of waiting speakers
2019-03-09 21:54:59 +01:00
Emanuel Schütze cee7c39c7d
Merge pull request #4481 from tsiegleauq/speaker-list-perms
Prevent drag and final versions without perms
2019-03-09 21:49:08 +01:00
Emanuel Schütze a26c44ca73
Merge pull request #4483 from tsiegleauq/motion-block-perms
Motion block permission fixes
2019-03-09 21:41:12 +01:00