Merge pull request #6041 from FinnStutzenstein/os4-pro-contra-note

Pro/contra/marked/note for OS4

docker/initial-data.json

@@ -136,6 +136,9 @@
         "list_of_speakers_present_users_only": false,
         "list_of_speakers_show_first_contribution": false,
         "list_of_speakers_enable_point_of_order_speakers": false,
+        "list_of_speakers_enable_pro_contra_speech": false,
+        "list_of_speakers_can_set_contribution_self": false,
+        "list_of_speakers_speaker_note_for_everyone": false,
         "list_of_speakers_initially_closed": false,
 
         "motions_default_workflow_id": 1,

docs/example-data.json

@@ -276,6 +276,9 @@
         "list_of_speakers_present_users_only": false,
         "list_of_speakers_show_first_contribution": false,
         "list_of_speakers_enable_point_of_order_speakers": true,
+        "list_of_speakers_enable_pro_contra_speech": true,
+        "list_of_speakers_can_set_contribution_self": true,
+        "list_of_speakers_speaker_note_for_everyone": true,
         "list_of_speakers_initially_closed": true,
 
         "motions_default_workflow_id": 1,
@@ -1065,7 +1068,8 @@
         "begin_time": 1584512636,
         "end_time": 1584512638,
         "weight": null,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 1,
@@ -1077,7 +1081,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 2,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 1,
@@ -1089,7 +1094,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 3,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 1,
@@ -1101,7 +1107,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 1,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 3,
@@ -1113,7 +1120,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 0,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 3,
@@ -1125,7 +1133,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 1,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 7,
@@ -1137,7 +1146,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 2,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 7,
@@ -1149,7 +1159,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 1,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 8,
@@ -1161,7 +1172,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 1,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 11,
@@ -1173,7 +1185,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 2,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 11,
@@ -1185,7 +1198,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 3,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 11,
@@ -1197,7 +1211,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 1,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 14,
@@ -1209,7 +1224,8 @@
         "begin_time": null,
         "end_time": null,
         "weight": 2,
-        "marked": false,
+        "speech_state": null,
+        "note": null,
         "point_of_order": false,
 
         "list_of_speakers_id": 14,

docs/models.yml

@@ -486,10 +486,20 @@ meeting:
   list_of_speakers_enable_point_of_order_speakers:
     type: boolean
     default: False
+  list_of_speakers_enable_pro_contra_speech:
+    type: boolean
+    default: False
+  list_of_speakers_can_set_contribution_self:
+    type: boolean
+    default: False
+  list_of_speakers_speaker_note_for_everyone:
+    type: boolean
+    default: False
   list_of_speakers_initially_closed:
     type: boolean
     default: False
 
+
   # Motions
   motions_default_workflow_id:
     type: relation
@@ -515,7 +525,7 @@ meeting:
     default: outside
   motions_line_length:
     type: number
-    minimium: 40
+    minimum: 40
     default: 85
   motions_reason_required:
     type: boolean
@@ -1163,7 +1173,15 @@ speaker:
   weight:
     type: number
     default: 10000
-  marked: boolean
+  speech_state:
+    type: string
+    enum:
+      - contribution
+      - pro
+      - contra
+  note:
+    type: string
+    maxLength: 250
   point_of_order: boolean
 
   list_of_speakers_id: