diff --git a/.github/workflows/md5_check_initial-data.yml b/.github/workflows/md5_check_initial-data.yml index ce178ecd7..9c4644850 100644 --- a/.github/workflows/md5_check_initial-data.yml +++ b/.github/workflows/md5_check_initial-data.yml @@ -21,4 +21,4 @@ jobs: run: md5sum docker/initial-data.json - name: Validate and protect initial-data.json - run: echo "f6274a3f6f638f55a4c66f963d3abbca docker/initial-data.json" | md5sum -c - + run: echo "6516e4a8d29c623d301c0c463e3d1db5 docker/initial-data.json" | md5sum -c - diff --git a/docker/initial-data.json b/docker/initial-data.json index a4fee73a4..f528ab87c 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -1,5 +1,5 @@ { - "_migration_index": 4, + "_migration_index": 5, "organization": { "1": { "id": 1, @@ -477,6 +477,7 @@ "1": { "id": 1, "name": "submitted", + "weight": 1, "recommendation_label": null, "css_class": "lightblue", "restrictions": [], @@ -503,6 +504,7 @@ "2": { "id": 2, "name": "accepted", + "weight": 2, "recommendation_label": "Acceptance", "css_class": "green", "restrictions": [], @@ -527,6 +529,7 @@ "3": { "id": 3, "name": "rejected", + "weight": 3, "recommendation_label": "Rejection", "css_class": "red", "restrictions": [], @@ -551,6 +554,7 @@ "4": { "id": 4, "name": "not decided", + "weight": 4, "recommendation_label": "No decision", "css_class": "grey", "restrictions": [], @@ -575,6 +579,7 @@ "5": { "id": 5, "name": "in_progress", + "weight": 5, "recommendation_label": null, "css_class": "lightblue", "restrictions": [], @@ -600,6 +605,7 @@ "6": { "id": 6, "name": "submitted", + "weight": 6, "recommendation_label": null, "css_class": "lightblue", "restrictions": [], @@ -628,6 +634,7 @@ "7": { "id": 7, "name": "permitted", + "weight": 7, "recommendation_label": "Permission", "css_class": "lightblue", "restrictions": [], @@ -660,6 +667,7 @@ "8": { "id": 8, "name": "accepted", + "weight": 8, "recommendation_label": "Acceptance", "css_class": "green", "restrictions": [], @@ -684,6 +692,7 @@ "9": { "id": 9, "name": "rejected", + "weight": 9, "recommendation_label": "Rejection", "css_class": "red", "restrictions": [], @@ -707,7 +716,8 @@ }, "10": { "id": 10, - "name": "withdrawed", + "name": "withdrawn", + "weight": 10, "recommendation_label": null, "css_class": "grey", "restrictions": [], @@ -734,6 +744,7 @@ "11": { "id": 11, "name": "adjourned", + "weight": 11, "recommendation_label": "Adjournment", "css_class": "grey", "restrictions": [], @@ -758,6 +769,7 @@ "12": { "id": 12, "name": "not concerned", + "weight": 12, "recommendation_label": "No concernment", "css_class": "grey", "restrictions": [], @@ -781,7 +793,8 @@ }, "13": { "id": 13, - "name": "refered to committee", + "name": "referred to committee", + "weight": 13, "recommendation_label": "Referral to committee", "css_class": "grey", "restrictions": [], @@ -806,6 +819,7 @@ "14": { "id": 14, "name": "needs review", + "weight": 14, "recommendation_label": null, "css_class": "grey", "restrictions": [], @@ -830,6 +844,7 @@ "15": { "id": 15, "name": "rejected (not authorized)", + "weight": 15, "recommendation_label": "Rejection (not authorized)", "css_class": "grey", "restrictions": [], diff --git a/docs/example-data.json b/docs/example-data.json index b5fb3fb49..071fe4a97 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -2036,6 +2036,7 @@ "1": { "id": 1, "name": "submitted", + "weight": 1, "recommendation_label": null, "css_class": "lightblue", "restrictions": [], @@ -2066,6 +2067,7 @@ "2": { "id": 2, "name": "accepted", + "weight": 2, "recommendation_label": "Acceptance", "css_class": "green", "restrictions": [], @@ -2090,6 +2092,7 @@ "3": { "id": 3, "name": "rejected", + "weight": 3, "recommendation_label": "Rejection", "css_class": "red", "restrictions": [], @@ -2114,6 +2117,7 @@ "4": { "id": 4, "name": "not decided", + "weight": 4, "recommendation_label": "No decision", "css_class": "grey", "restrictions": [], @@ -2138,6 +2142,7 @@ "5": { "id": 5, "name": "in_progress", + "weight": 5, "recommendation_label": null, "css_class": "lightblue", "restrictions": [], @@ -2160,6 +2165,7 @@ "6": { "id": 6, "name": "submitted", + "weight": 6, "recommendation_label": null, "css_class": "lightblue", "restrictions": [], @@ -2182,6 +2188,7 @@ "7": { "id": 7, "name": "permitted", + "weight": 7, "recommendation_label": "Permission", "css_class": "lightblue", "restrictions": [], @@ -2204,6 +2211,7 @@ "8": { "id": 8, "name": "accepted", + "weight": 8, "recommendation_label": "Acceptance", "css_class": "green", "restrictions": [], @@ -2226,6 +2234,7 @@ "9": { "id": 9, "name": "rejected", + "weight": 9, "recommendation_label": "Rejection", "css_class": "red", "restrictions": [], @@ -2247,7 +2256,8 @@ }, "10": { "id": 10, - "name": "withdrawed", + "name": "withdrawn", + "weight": 10, "recommendation_label": null, "css_class": "grey", "restrictions": [], @@ -2270,6 +2280,7 @@ "11": { "id": 11, "name": "adjourned", + "weight": 11, "recommendation_label": "Adjournment", "css_class": "grey", "restrictions": [], @@ -2292,6 +2303,7 @@ "12": { "id": 12, "name": "not concerned", + "weight": 12, "recommendation_label": "No concernment", "css_class": "grey", "restrictions": [], @@ -2313,7 +2325,8 @@ }, "13": { "id": 13, - "name": "refered to committee", + "name": "referred to committee", + "weight": 13, "recommendation_label": "Referral to committee", "css_class": "grey", "restrictions": [], @@ -2336,6 +2349,7 @@ "14": { "id": 14, "name": "needs review", + "weight": 14, "recommendation_label": null, "css_class": "grey", "restrictions": [], @@ -2358,6 +2372,7 @@ "15": { "id": 15, "name": "rejected (not authorized)", + "weight": 15, "recommendation_label": "Rejection (not authorized)", "css_class": "grey", "restrictions": [], diff --git a/docs/models.yml b/docs/models.yml index 2169c7a7f..79900a833 100644 --- a/docs/models.yml +++ b/docs/models.yml @@ -2119,6 +2119,10 @@ motion_state: type: string required: true restriction_mode: A + weight: + type: number + required: true + restriction_mode: A recommendation_label: type: string restriction_mode: A diff --git a/openslides-backend b/openslides-backend index 406f4127f..82a2c3eeb 160000 --- a/openslides-backend +++ b/openslides-backend @@ -1 +1 @@ -Subproject commit 406f4127fb92ae33054abbee59c09e50bdcaf7d0 +Subproject commit 82a2c3eeb50852605d127a9e2b5bf49ea57aeb64