Merge pull request #6155 from jsangmeister/remove-majority-method

Remove majority method

docker/initial-data.json

@@ -188,7 +188,6 @@
         "motion_poll_ballot_paper_number": 8,
         "motion_poll_default_type": "analog",
         "motion_poll_default_100_percent_base": "YNA",
-        "motion_poll_default_majority_method": "simple",
         "motion_poll_default_group_ids": [5],
 
         "users_sort_by": "first_name",
@@ -215,7 +214,6 @@
         "assignment_poll_default_type": "nominal",
         "assignment_poll_default_method": "votes",
         "assignment_poll_default_100_percent_base": "valid",
-        "assignment_poll_default_majority_method": "simple",
         "assignment_poll_default_group_ids": [5],
 
         "poll_ballot_paper_selection": "CUSTOM_NUMBER",
@@ -224,7 +222,6 @@
         "poll_default_type": "nominal",
         "poll_default_method": "votes",
         "poll_default_100_percent_base": "valid",
-        "poll_default_majority_method": "simple",
         "poll_default_group_ids": [5],
         "poll_couple_countdown": true,
 

docs/example-data.json

@@ -329,7 +329,6 @@
         "motion_poll_ballot_paper_number": 8,
         "motion_poll_default_type": "analog",
         "motion_poll_default_100_percent_base": "YNA",
-        "motion_poll_default_majority_method": "simple",
         "motion_poll_default_group_ids": [2, 3],
 
         "users_sort_by": "first_name",
@@ -357,7 +356,6 @@
         "assignment_poll_default_type": "nominal",
         "assignment_poll_default_method": "votes",
         "assignment_poll_default_100_percent_base": "valid",
-        "assignment_poll_default_majority_method": "simple",
         "assignment_poll_default_group_ids": [3, 5],
 
         "poll_ballot_paper_selection": "CUSTOM_NUMBER",
@@ -366,7 +364,6 @@
         "poll_default_type": "nominal",
         "poll_default_method": "votes",
         "poll_default_100_percent_base": "valid",
-        "poll_default_majority_method": "simple",
         "poll_default_group_ids": [3],
         "poll_couple_countdown": true,
 
@@ -2006,7 +2003,6 @@
         "global_no": false,
         "global_abstain": false,
         "onehundred_percent_base": "YNA",
-        "majority_method": "simple",
         "votesvalid": "2.000000",
         "votesinvalid": "9.000000",
         "votescast": "2.000000",
@@ -2035,7 +2031,6 @@
         "global_no": false,
         "global_abstain": false,
         "onehundred_percent_base": "YNA",
-        "majority_method": "simple",
         "votesvalid": null,
         "votesinvalid": null,
         "votescast": null,
@@ -2064,7 +2059,6 @@
         "global_no": true,
         "global_abstain": true,
         "onehundred_percent_base": "YNA",
-        "majority_method": "simple",
         "votesvalid": null,
         "votesinvalid": null,
         "votescast": null,
@@ -2093,7 +2087,6 @@
         "global_no": true,
         "global_abstain": true,
         "onehundred_percent_base": "Y",
-        "majority_method": "simple",
         "votesvalid": "9.000000",
         "votesinvalid": "2.000000",
         "votescast": "16.000000",
@@ -2122,7 +2115,6 @@
         "global_no": true,
         "global_abstain": false,
         "onehundred_percent_base": "valid",
-        "majority_method": "simple",
         "votesvalid": "1.000000",
         "votesinvalid": "0.000000",
         "votescast": "1.000000",

docs/models.yml

@@ -661,7 +661,6 @@ meeting:
   motion_poll_default_100_percent_base:
     type: string
     default: YNA
-  motion_poll_default_majority_method: string
   motion_poll_default_group_ids:
     type: relation-list
     to: group/used_as_motion_poll_default_id
@@ -741,7 +740,6 @@ meeting:
   assignment_poll_default_100_percent_base:
     type: string
     default: YNA
-  assignment_poll_default_majority_method: string
   assignment_poll_default_group_ids:
     type: relation-list
     to: group/used_as_assignment_poll_default_id
@@ -762,7 +760,6 @@ meeting:
   poll_default_100_percent_base:
     type: string
     default: YNA
-  poll_default_majority_method: string
   poll_default_group_ids:
     type: relation-list
     to: group/used_as_poll_default_id
@@ -1796,15 +1793,6 @@ poll:
       - entitled
       - disabled
     default: disabled
-  majority_method:
-    type: string
-    required: true
-    enum:
-      - simple
-      - two_thirds
-      - three_quarters
-      - disabled
-    default: disabled
   votesvalid: decimal(6)
   votesinvalid: decimal(6)
   votescast: decimal(6)