ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,836 Commits 6 Branches 42 Tags 64 MiB
2c43bfee47
Commit Graph

256 Commits

Author SHA1 Message Date
Emanuel Schütze
4faf580239 Validates open posts field of assignment form (Fixes #2623) 2017-01-14 15:30:02 +01:00
Emanuel Schütze
527f949968 Assignment list: Used number of candidates, removed number of needed candidates (Fixes #2142) 2017-01-14 12:55:51 +01:00
Emanuel Schütze
113aac59b3 Added text to empty assignment poll result slide (Fixed #2421) 2017-01-14 10:21:19 +01:00
Oskar Hahn
728576d514 Performance improvements 
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
 2017-01-13 13:37:18 +01:00
Maximilian Krambach
a31ffd1009 print correct number of ballots (closes #2504) 2017-01-06 11:39:55 +01:00
FinnStutzenstein
3b1ab265eb Sort candidates in assignments 2016-12-19 16:03:45 +01:00
Sean Engelhardt
41ceb4ef9d add special voting values for missed options (fixes #2709) 2016-12-14 14:05:03 +01:00
Norman Jäckel
3096958ba9 Prepare migrations for 2.1b1. 
Agenda, Assignments, Core, Mediafiles, Motions, Users.

Topics are already done.
 2016-12-13 11:58:36 +01:00
Norman Jäckel
c1d4927a9b Merge pull request #2764 from FinnStutzenstein/Issue2754 
More motion select mode options and layout changes for guests
 2016-12-13 11:57:51 +01:00
FinnStutzenstein
dbdaa9748c More motion select mode options and layout changes for guests 2016-12-13 11:27:44 +01:00
Emanuel Schütze
8780c47fc1 Minor fixes (Fixes #2750) 
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750).
- Apply category and motion block for new amendments.
 2016-12-12 12:58:58 +01:00
Emanuel Schütze
8289306569 Merge pull request #2746 from emanuelschuetze/fonts 
Use Roboto font in all templates.
 2016-12-09 22:26:38 +01:00
Emanuel Schütze
0bef3d751e Merge pull request #2742 from emanuelschuetze/missing-translations 
Mark missing translation strings in table headers.
 2016-12-09 15:22:03 +01:00
Emanuel Schütze
f6d01c1d17 Mark missing translation strings in table headers. 2016-12-09 15:13:35 +01:00
Emanuel Schütze
fb7b265826 Use Roboto font in all templates. 
- Only install needed font files for Roboto and Roboto Condensed
  which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
  in app.css and projector.css.
- Remove Open Sans font.
 2016-12-09 15:10:31 +01:00
Emanuel Schütze
c363fff3ba Remove sidebox from assignment slide 
Feedback from serveral users: open posts and state are not very
useful on slide and should be removed.
 2016-12-07 21:00:13 +01:00
Norman Jäckel
b27a975075 Merge pull request #2737 from FinnStutzenstein/Issue2730 
Use session cookies and store filter settings in sessionStorage
 2016-12-07 11:25:06 +01:00
FinnStutzenstein
acb5a6dcf9 Use session cookies and store filter settings in sessionStorage 2016-12-07 08:01:33 +01:00
FinnStutzenstein
29ae600194 Dynamic webpage title 2016-12-05 18:00:52 +01:00
Emanuel Schütze
486f0601eb Merge pull request #2721 from FinnStutzenstein/AgendaTable 
Agenda table
 2016-12-02 15:59:57 +01:00
FinnStutzenstein
ee5adb8fd2 New AgendaTable 2016-12-02 15:18:32 +01:00
Emanuel Schütze
65337ae2d2 Rename 'posts' to 'persons' in assigment templates. 2016-12-02 14:41:34 +01:00
Norman Jäckel
639978a5dc Refactor motion ans assignment percent and majority calculation. 2016-12-01 14:35:35 +01:00
Maximilian Krambach
32aaaf5b9e Majority calculation for assignments. 
Majorities when config YN(A) and simple voting method.
 2016-12-01 14:35:35 +01:00
Norman Jäckel
510d60ef0f Merge pull request #2702 from tsiegleauq/assignmentImprove2559 
improves the assignments (fixes #2559)
 2016-12-01 10:25:57 +01:00
Emanuel Schütze
17c464bafa Merge pull request #2688 from FinnStutzenstein/AssignmentsTable 
New assignment and mediafile tables and table generics
 2016-11-30 14:29:13 +01:00
Sean Engelhardt
2bb440b2aa improves the assignments (fixes #2559) 2016-11-30 10:57:51 +01:00
FinnStutzenstein
4f717b6610 New assignment and mediafile tables and table generics 2016-11-29 16:29:29 +01:00
Emanuel Schütze
e865cfe105 Improved forms in ng-dialogs. 
- users: use form field in grid layout and add more option
  to reduce scrolling of long dialog.
- agenda/motions/assignment: show parent agenda item field for create
  dialog only (to prevent corrupt agenda by action 'set my child item as my new
  parent item')
- refactor ng dialog and formly code.
 2016-11-27 22:57:56 +01:00
Emanuel Schütze
4e1fdc6b22 Updated PDF layout 
- use default font for pdf from vfs_font.js
  remove base64 encoding function on server side
- use recommendation config value in motion detail template
 2016-11-14 18:52:50 +01:00
Emanuel Schütze
18accc58ae Merge pull request #2610 from tsiegleauq/electionListPdfMake 
ElectionList over PdfMake
 2016-11-14 18:05:03 +01:00
Emanuel Schütze
ff359ea629 Improved assignments and motions pdf. 
Load all users in pdfmake function - not in state resolver of
assignment list.
 2016-11-14 17:55:50 +01:00
Emanuel Schütze
e49411250a Merge pull request #2558 from FinnStutzenstein/Issue2462 
change all isProjected functions (closes #2462)
 2016-11-11 15:57:56 +01:00
FinnStutzenstein
af9755cb9a changed all project functions 2016-11-11 09:37:37 +01:00
Sean Engelhardt
7069326655 ElectionList over PdfMake 2016-11-09 20:23:01 +01:00
Oskar Hahn
7281aa57b8 Removed old code needed be the server to serve pdf 2016-11-07 15:54:29 +01:00
Norman Jäckel
19a76f5d3d Changed label and help text of assignment config for 100-%-base. 2016-11-04 12:02:16 +01:00
Emanuel Schütze
b08ca4be02 Merge pull request #2534 from tsiegleauq/electionsListPdfMake 
Creates the Election documents using PdfMake
 2016-11-01 23:40:42 +01:00
Sean Engelhardt
14ca655aa2 Creates the Election documents using PdfMake 2016-11-01 23:18:19 +01:00
FinnStutzenstein
58dd2f2b30 change all isProjected functions (closes #2462) 2016-11-01 10:31:28 +01:00
Emanuel Schütze
21e6903368 Fix to show election results without ng-init. 
ng-init does not watch for autoupdates.
 2016-10-25 10:44:17 +02:00
FinnStutzenstein
7fcbed051c Rename AdditionalId to arg (closes #2465) 2016-10-17 08:10:52 +02:00
Maximilian Krambach
88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Emanuel Schuetze
d2acbdda70 Fixed autoupdate for motion and assigment polls. 
Send autoupdate once only after all votes are saved. Disable
autoupdate for saving incompleted vote results.
 2016-10-12 11:23:53 +02:00
Emanuel Schütze
e64a1bf19c Merge pull request #2478 from emanuelschuetze/ui-improvements 
UI improvements
 2016-10-04 10:59:21 +02:00
Emanuel Schuetze
bc72089973 UI improvements 
- item list: reorder buttons
- motion list:
  * move hover menu for edit/delete below submitters
  * limit submitters to one
- motion detail:
  * show ol flush left
  * use 2 or 3 columns in meta box
  * use small buttons for line numbering controls
  * group line number controls in grey tool bar.
  * Show motion comments div only if user is allowed.
- motion config:
  * Deativate comments by default.
  * Deactivate recommendations for motions by default.
- item detail: Show needed buttons only.
- assignment detail: Improve ballot tabs.
- general:
  * move pdf button to right
  * move 'back to overview' button to left
  * update label vor countdown option
 2016-10-04 10:51:19 +02:00
Oskar Hahn
98bab9b358 Fix tests and remove old code. 2016-10-01 01:49:27 +02:00
Norman Jäckel
039795beb7 Refactored projector requirements system for autoupdate. 2016-10-01 01:49:17 +02:00
Norman Jäckel
7cd70a568c Added docstrings. Small changes. 2016-10-01 01:48:18 +02:00
Oskar Hahn
368873e738 Adds a cache system to the CollectionElement and add 
a Collection class that can be used to call a collection
used this for the list and receive rest api.
 2016-09-30 21:37:52 +02:00
Finn Stutzenstein
e6b9b21d41 Added support for multiple projectors. 2016-09-30 18:58:59 +02:00
FinnStutzenstein
84cd3dbc77 little fixes 2016-09-28 19:27:40 +02:00
Emanuel Schuetze
841ec00b22 Fix to show invalid/valid/casted votes on assignment slide. 2016-09-26 20:41:42 +02:00
Norman Jäckel
495ddb7d2d Updated server logic for assignment detail and poll slide. Fixed #2422. 2016-09-23 22:09:38 +02:00
Norman Jäckel
e340d83777 Merge pull request #2319 from matakuka/assignment_withoutabstains 
Calculate assignment without abstains (if one candidate) (issue #2182)
 2016-09-23 16:01:04 +02:00
Norman Jäckel
256a8d9203 Small style changes. 2016-09-23 15:53:04 +02:00
Maximilian Krambach
e8fa0eca5a New calculate percentage options (fixes issue #2182) 2016-09-23 14:45:49 +02:00
Norman Jäckel
dc404d21f6 Implemented need_full_update check. Fixed #2396. 2016-09-23 14:36:26 +02:00
Norman Jäckel
cab53f0434 Moved custom slides to own app topics for better app structure. 
Renamed model to Topic. Added migrations file. Fixed #2402.
 2016-09-21 15:00:23 +02:00
FinnStutzenstein
c3e511628f Confirm multiple deletions (fixes #2399) 2016-09-21 14:43:46 +02:00
Norman Jäckel
858f4a2b43 Merge pull request #2405 from emanuelschuetze/fixAlerts 
Fixed syntax of all uib-alerts.
 2016-09-18 22:54:29 +02:00
Emanuel Schuetze
a7f5d4dd3c Fixed syntax of all uib-alerts. 
Required after ui-bootstrap upgrade.
 2016-09-18 21:09:37 +02:00
Norman Jäckel
76250c5851 Changed loading of JavaScript files. 2016-09-18 11:23:51 +02:00
Emanuel Schuetze
852b175f3e Upgraded a lot of javascript libs. 
Some template fixes required for upgrading ui-bootstrap.
 2016-09-18 00:45:00 +02:00
Oskar Hahn
6abb0976c2 Change system for autoupdate on the projector (#2394) 
* Second websocket channel for the projector

* Removed use of projector requirements for REST API requests.

Refactored data serializing for projector websocket connection.

* Refactor the way that the projector autoupdate get its data.

* Fixed missing assignment slide title for hidden items.

* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.

* Created CollectionElement class which helps to handle autoupdate.
 2016-09-17 22:26:23 +02:00
Emanuel Schuetze
c55e55e91b Template checks if user has no permission to see agenda items. 2016-09-17 10:17:40 +02:00
Norman Jäckel
ab845b4137 Added generic fields for comments for motions. 2016-09-07 20:43:00 +02:00
Emanuel Schuetze
d7b092300d Fixed missing translation and form errors. 2016-09-05 23:13:07 +02:00
Norman Jäckel
70dfe8f525 Merge pull request #2331 from emanuelschuetze/issue2182b 
Motion config: 'calculate % without abstains' (Fixes #2182)
 2016-08-29 16:59:12 +02:00
Emanuel Schuetze
65b0772556 Some clean up and styling work for motion config 'without abstains'. 
Manage all config strings in site.js of each app.
 2016-08-29 16:40:27 +02:00
Emanuel Schuetze
344d9329f9 Added template hook for each poll in assignment detail. 2016-08-29 16:26:13 +02:00
Maximilian Krambach
fc1ce3d90d added option to calculate % based on Yes/No (for motions) (fixes #2182) 2016-08-29 13:07:57 +02:00
Emanuel Schuetze
f0ca4a0d98 Added template hook for assignment poll form. 2016-08-26 06:33:27 +02:00
Maximilian Krambach
126cfb9000 Parent items for Agenda items (fixes #2213) 2016-08-25 13:51:54 +02:00
Finn Stutzenstein
bf3a1ce714 New matrix interface for group editing (closes #435) 2016-08-22 15:05:06 +02:00
Maximilian Krambach
350a60722c repairs ballots for candidates with structure_level 2016-08-05 09:53:10 +02:00
Norman Jäckel
e688a345c0 Merge pull request #2230 from emanuelschuetze/remove-assignment-config 
Remove unused assignment config to publish winner results only.
 2016-08-03 15:58:35 +02:00
joelmacht
19592f1eea Add tags for assingments 2016-08-03 14:48:12 +02:00
Maximilian Krambach
f2f7ddf072 translations issue #2197 2016-08-01 16:23:20 +02:00
Emanuel Schuetze
8d52d4a1c6 Remove unused assignment config to publish winner results only. (Fixes #2145) 2016-07-29 12:29:53 +02:00
Norman Jäckel
b45e0ea09f Fixed coding style. 2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda Config translations moved to client side (Issue #2093) 2016-06-12 11:46:46 +02:00
Maximilian Krambach
3157ac59f2 adding option "yes/no for each candidate" 2016-06-10 14:13:01 +02:00
Maximilian Krambach
5061ea1770 typo fixing (issue #2181) 2016-06-08 22:18:35 +02:00
Oskar Hahn
2221b23447 Redesign of the config variables. 
Removed the config cache and created files for each app in which the
config variables are defined.
 2016-06-03 13:47:54 +02:00
Emanuel Schuetze
06d333c067 Template fixes for better smartphone usage. 
- Remove on-focus-me directive on every list view.
  (Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
  on small devices.
- Add z-index for projector sidebar. Show it in full width on small
  devices.
- Remove padding on small devices.
 2016-04-17 19:56:38 +02:00
Emanuel Schuetze
7e5ea61b34 Hide candidate list if assignment phase is finished (2). 2016-04-12 22:41:15 +02:00
Norman Jäckel
5af25351fa Merge pull request #2049 from emanuelschuetze/fix2028 
Catch 404 errors in resolve promise if user has not all required permissions
 2016-03-20 20:48:58 +01:00
Emanuel Schuetze
03f08628c7 Catch 404 errors in resolve promise if user has not all required permissions. 
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string

Fixes #2028. Fixes #2038.
 2016-03-18 21:41:16 +01:00
Emanuel Schuetze
140869ebd7 Fix translation strings. 2016-03-18 20:11:04 +01:00
Emanuel Schuetze
89446ce4f6 Use angular-chosen instead of ui-select for better performance. 
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/

Use input delay on users filter field with 'debounce'.

Fixed #2006.
 2016-03-18 14:37:03 +01:00
Norman Jäckel
132c6e81ec Forwarding JSON instead of Django model instances to autoupdate loop. 
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
 2016-03-06 14:24:53 +01:00
Norman Jäckel
4daa61888f Massive refactoring for autoupdate optimization. 2016-03-06 14:22:40 +01:00
André Böhlke
3db2f2fc16 "durchstich" for autoupdate optimization 2016-03-06 14:22:40 +01:00
Norman Jäckel
de871f3f9c Squished migrations files. 2016-03-02 14:26:47 +01:00
Norman Jäckel
a2a6637c89 Rename and refactor some ProjectorElement methods. Fixed #1631. 2016-02-27 20:56:03 +01:00
Emanuel Schuetze
16fd87cc93 Use a global variable for the limiting number of users in select fields. (Fixed #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
2473a6ef69 Updated angular-gettext EN source. 2016-02-17 17:58:04 +01:00
Emanuel Schuetze
84ea0bf1f5 Several important fixes for beta4 
- Fix socket error in autoupdate (Check if socket exists)
- Add missing translation string for core permission
- Fix KeyError in extract_default_password function in users/views.py
- Improve Pagination. Fix users list for users without can_see_extra_data permissions.
- Limit the number of users in ui-select field
- Fix csv header names in users import help text.
- Use config options (enable logo/title) on projector.
- Nicer font style for main and sub items on agenda slide.
- Fix JS error if this.groups is undefined for anonymous.
 2016-02-17 17:49:44 +01:00
Norman Jäckel
75f4a2e62d Work on JavaScript coding style. 2016-02-16 00:56:56 +01:00