Merge pull request #3735 from FinnStutzenstein/improvements

Fixed percentage for special values (fixes #3736), added config to couple the candidates with the list of speakers (closes #3737)

openslides/assignments/config_variables.py

@@ -55,6 +55,15 @@ def get_config_variables():
         group='Elections',
         subgroup='Ballot and ballot papers')
 
+    yield ConfigVariable(
+        name='assignments_add_candidates_to_list_of_speakers',
+        default_value=True,
+        input_type='boolean',
+        label='Put all candidates on the list of speakers',
+        weight=428,
+        group='Elections',
+        subgroup='Ballot and ballot papers')
+
     yield ConfigVariable(
         name='assignments_pdf_ballot_papers_selection',
         default_value='CUSTOM_NUMBER',

openslides/assignments/models.py

@@ -285,14 +285,15 @@ class Assignment(RESTModelMixin, models.Model):
 
         # Add all candidates to list of speakers of related agenda item
         # TODO: Try to do this in a bulk create
-        for candidate in self.candidates:
+        if config['assignments_add_candidates_to_list_of_speakers']:
-            try:
+            for candidate in self.candidates:
-                Speaker.objects.add(candidate, self.agenda_item, skip_autoupdate=True)
+                try:
-            except OpenSlidesError:
+                    Speaker.objects.add(candidate, self.agenda_item, skip_autoupdate=True)
-                # The Speaker is already on the list. Do nothing.
+                except OpenSlidesError:
-                # TODO: Find a smart way not to catch the error concerning AnonymousUser.
+                    # The Speaker is already on the list. Do nothing.
-                pass
+                    # TODO: Find a smart way not to catch the error concerning AnonymousUser.
-        inform_changed_data(self.agenda_item)
+                    pass
+            inform_changed_data(self.agenda_item)
 
         return poll
 

openslides/assignments/static/js/assignments/base.js

@@ -72,7 +72,9 @@ angular.module('OpenSlidesApp.assignments', [])
 
                         if (base && !skipPercents) {
                             percentNumber = Math.round(vote.weight * 100 / base * 100) / 100;
-                            percentStr = "(" + percentNumber + "%)";
+                            if (percentNumber >= 0) {
+                                percentStr = '(' + percentNumber + ' %)';
+                            }
                         }
                         votes.push({
                             'order': order,

openslides/assignments/static/js/assignments/site.js

@@ -875,6 +875,7 @@ angular.module('OpenSlidesApp.assignments.site', [
         gettext('Two-thirds majority');
         gettext('Three-quarters majority');
         gettext('Disabled');
+        gettext('Put all candidates on the list of speakers');
         gettext('Title for PDF document (all elections)');
         gettext('Preamble text for PDF document (all elections)');
         //other translations