From a8f097ded4198c35ffc8283b6f228e57b5aaa6fa Mon Sep 17 00:00:00 2001 From: Finn Stutzenstein Date: Thu, 3 Dec 2020 10:40:47 +0100 Subject: [PATCH] Refine poll modelling --- docs/example-data.json | 156 +++++++++++++++++++++++++++++---------- docs/modellierung.drawio | 2 +- docs/models.yml | 15 ++-- 3 files changed, 127 insertions(+), 46 deletions(-) diff --git a/docs/example-data.json b/docs/example-data.json index c8f13f15c..82fd98161 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -331,8 +331,8 @@ "motion_workflow_ids": [1, 2], "motion_statute_paragraph_ids": [], "poll_ids": [1, 2, 3, 4, 5], - "option_ids": [1, 2, 3, 4, 5, 6, 7, 8], - "vote_ids": [1, 2, 3, 4, 5, 6, 7], + "option_ids": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13], + "vote_ids": [1, 2, 3, 4, 5, 6, 7, 8, 9], "assignment_ids": [1, 2], "assignment_candidate_ids": [1, 2, 3, 4, 5], "personal_note_ids": [1], @@ -1907,9 +1907,6 @@ "global_abstain": false, "onehundred_percent_base": "YNA", "majority_method": "simple", - "amount_global_yes": null, - "amount_global_no": null, - "amount_global_abstain": null, "votesvalid": "2.000000", "votesinvalid": "9.000000", "votescast": "2.000000", @@ -1917,6 +1914,7 @@ "content_object_id": "motion/1", "option_ids": [1], + "global_option_id": 2, "voted_ids": [], "entitled_group_ids": [], "projection_ids": [], @@ -1938,16 +1936,14 @@ "global_abstain": false, "onehundred_percent_base": "YNA", "majority_method": "simple", - "amount_global_yes": null, - "amount_global_no": null, - "amount_global_abstain": null, "votesvalid": null, "votesinvalid": null, "votescast": null, "user_has_voted": false, "content_object_id": "motion/1", - "option_ids": [2], + "option_ids": [3], + "global_option_id": 4, "voted_ids": [], "entitled_group_ids": [], "projection_ids": [], @@ -1969,9 +1965,6 @@ "global_abstain": true, "onehundred_percent_base": "YNA", "majority_method": "simple", - "amount_global_yes": null, - "amount_global_no": null, - "amount_global_abstain": null, "votesvalid": null, "votesinvalid": null, "votescast": null, @@ -1980,7 +1973,8 @@ "content_object_id": "assignment/1", "voted_ids": [], "entitled_group_ids": [], - "option_ids": [3], + "option_ids": [5], + "global_option_id": 6, "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -2000,9 +1994,6 @@ "global_abstain": true, "onehundred_percent_base": "Y", "majority_method": "simple", - "amount_global_yes": null, - "amount_global_no": "2.000000", - "amount_global_abstain": "1.000000", "votesvalid": "9.000000", "votesinvalid": "2.000000", "votescast": "16.000000", @@ -2011,7 +2002,8 @@ "content_object_id": "assignment/1", "voted_ids": [], "entitled_group_ids": [], - "option_ids": [4, 5, 6], + "option_ids": [7, 8, 9], + "global_option_id": 10, "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -2031,9 +2023,6 @@ "global_abstain": false, "onehundred_percent_base": "valid", "majority_method": "simple", - "amount_global_yes": null, - "amount_global_no": "0.000000", - "amount_global_abstain": null, "votesvalid": "1.000000", "votesinvalid": "0.000000", "votescast": "1.000000", @@ -2042,7 +2031,8 @@ "content_object_id": "assignment/2", "voted_ids": [1], "entitled_group_ids": [2], - "option_ids": [7, 8], + "option_ids": [11, 12], + "global_option_id": 13, "projection_ids": [], "current_projector_ids": [], "meeting_id": 1 @@ -2053,21 +2043,35 @@ "yes": "2.000000", "no": "4.000000", "abstain": "1.000000", - "weight": 10000, + "weight": 1, "poll_id": 1, + "used_as_global_option_in_poll_id": null, "content_object_id": "motion/1", "vote_ids": [1, 2, 3], "meeting_id": 1 }, { - "id": 2, + "id": 1, "yes": "0.000000", "no": "0.000000", "abstain": "0.000000", - "weight": 10000, + "weight": 1, + + "poll_id": null, + "used_as_global_option_in_poll_id": 1, + "vote_ids": [0], + "meeting_id": 1 + }, + { + "id": 3, + "yes": "0.000000", + "no": "0.000000", + "abstain": "0.000000", + "weight": 1, "poll_id": 2, + "used_as_global_option_in_poll_id": null, "content_object_id": "motion/1", "vote_ids": [], "meeting_id": 1 @@ -2079,69 +2083,123 @@ "abstain": "0.000000", "weight": 1, + "poll_id": null, + "used_as_global_option_in_poll_id": 2, + "vote_ids": [], + "meeting_id": 1 + }, + { + "id": 5, + "yes": "0.000000", + "no": "0.000000", + "abstain": "0.000000", + "weight": 1, + "poll_id": 3, + "used_as_global_option_in_poll_id": null, "content_object_id": "user/1", "vote_ids": [], "meeting_id": 1 }, { - "id": 4, + "id": 6, + "yes": "0.000000", + "no": "0.000000", + "abstain": "0.000000", + "weight": 1, + + "poll_id": null, + "used_as_global_option_in_poll_id": 3, + "vote_ids": [], + "meeting_id": 1 + }, + { + "id": 7, "yes": "3.000000", "no": "0.000000", "abstain": "0.000000", "weight": 1, "poll_id": 4, + "used_as_global_option_in_poll_id": null, "content_object_id": "user/1", - "vote_ids": [1], + "vote_ids": [4], "meeting_id": 1 }, { - "id": 5, + "id": 8, "yes": "7.000000", "no": "0.000000", "abstain": "0.000000", "weight": 2, "poll_id": 4, + "used_as_global_option_in_poll_id": null, "content_object_id": "user/3", - "vote_ids": [3], + "vote_ids": [5], "meeting_id": 1 }, { - "id": 6, + "id": 9, "yes": "2.000000", "no": "0.000000", "abstain": "0.000000", "weight": 3, "poll_id": 4, + "used_as_global_option_in_poll_id": null, "content_object_id": "user/2", - "vote_ids": [2], + "vote_ids": [6], "meeting_id": 1 }, { - "id": 7, + "id": 10, + "yes": "0.000000", + "no": "2.000000", + "abstain": "1.000000", + "weight": 1, + + "poll_id": null, + "used_as_global_option_in_poll_id": 4, + "vote_ids": [7, 8], + "meeting_id": 1 + }, + { + "id": 11, "yes": "0.000000", "no": "0.000000", "abstain": "0.000000", "weight": 1, "poll_id": 5, + "used_as_global_option_in_poll_id": null, "content_object_id": "user/3", "vote_ids": [], "meeting_id": 1 }, { - "id": 8, + "id": 12, "yes": "1.000000", "no": "0.000000", "abstain": "0.000000", "weight": 2, "poll_id": 5, + "used_as_global_option_in_poll_id": null, "content_object_id": "user/2", - "vote_ids": [4], + "vote_ids": [9], + "meeting_id": 1 + }, + { + "id": 13, + "yes": "0.000000", + "no": "0.000000", + "abstain": "0.000000", + "weight": 1, + + "poll_id": null, + "used_as_global_option_in_poll_id": 5, + "vote_ids": [], "meeting_id": 1 }], "vote": [ @@ -2182,37 +2240,57 @@ "user_id": null, "delegated_user_id": null, - "option_id": 4, + "option_id": 7, "meeting_id": 1 }, { "id": 5, "value": "Y", - "weight": "2.000000", + "weight": "7.000000", "user_id": null, "delegated_user_id": null, - "option_id": 6, + "option_id": 8, "meeting_id": 1 }, { "id": 6, "value": "Y", - "weight": "7.000000", + "weight": "2.000000", "user_id": null, "delegated_user_id": null, - "option_id": 5, + "option_id": 9, "meeting_id": 1 }, { "id": 7, + "value": "N", + "weight": "2.000000", + + "user_id": null, + "delegated_user_id": null, + "option_id": 10, + "meeting_id": 1 + }, + { + "id": 8, + "value": "A", + "weight": "1.000000", + + "user_id": null, + "delegated_user_id": null, + "option_id": 10, + "meeting_id": 1 + }, + { + "id": 9, "value": "Y", "weight": "1.000000", "user_id": 1, "delegated_user_id": 1, - "option_id": 8, + "option_id": 12, "meeting_id": 1 }], "assignment": [ diff --git a/docs/modellierung.drawio b/docs/modellierung.drawio index 283559931..697c1b54d 100644 --- a/docs/modellierung.drawio +++ b/docs/modellierung.drawio @@ -1 +1 @@ -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 \ No newline at end of file +7V1dd5s8Ev41udlznAMSn5dNmqR9u3nbvsl2297kEFux2WJwANtxfv1CjGyQJhjbIIk2N234sA2j5xnNjGZGJ/h8+nQVe7PJdTQiwQnSRk8n+P0JQrqhO9l/+ZnV+oxtmesT49gfFTdtT9z4z6Q4qRVn5/6IJJUb0ygKUn9WPTmMwpAM08o5L46jZfW2hyio/urMGxPuxM3QC/iz//VH6aQ4a5nG9sIH4o8nxU8jjK31lalH7y5eJZl4o2hZOoUvTvB5HEXp+q/p0zkJculRwaw/d/nK1c2TxSRMm3zg77/ipfOYvEuW9mL448eTOfsaDPIP5F+z8IJ58crF06YrKoM4mocjkn+LfoLPlhM/JTczb5hfXWajnp2bpNOguDzyksnmXv4Ri6dekDglT6VTxSNfkWhK0niV3VJcde1CfAWAdLsA0LI0HG5xz6Q0EphCyCsgMN5891ZI2R+FnPaQGcU0KCIte+0oTifROAq94N9RNCtk8T+SpqsC4N48japiI09++j3/+Ckyi8Mfxbflf79/Kh+s6EGYvc76UyY9/EG/MD/YfuzlaPu50bucG9lhGIVkfebSz6Xwcv3VYUuieTwkdaIpKOrFY5LW3FdIkIwq7ONBEJPAS/1FlYytDyiFWIkEU26I82e9KQ4LqbU46uVB1w8adE35QbfchqNeUF871TVDr7C/wE1jWBTf/SXys5fa3hI9PCTZo7K42TxCIyg5q08ffy7+urwOr7+Fj2cPs/DyaoBMicD5DbQFLFRdlroAH8dwOXWhCx11vTzmGwTsGvWKsthCQNlRN5pOEoW6GGinhqsZyuoL/DM8+/51fnt/vni+dvwQP0YXA/tt5jkDh7k1bIFiN3dMPAaidjA1O3WFkFT36iUkXcVk6s95PFXBs8Oeb8GEN3DVhEcOYMIjwIS3urLgDd6C75ZktiosO4RUqKF9Z1hKWfW8Z/uNxF6YpF6QzsOxdFrYumq0sEQbr6jPtMANaWFJs17hx7H+UAOj0zHGSo2xwwc0QqGjXvVQ7L65KE2H3TYaDvvWRXEcipVC7Q9U8lFgNGGl0IR+VzQ5aG802ZunoH4KUh1Nrlq66bcF057B1gxMmQVqVcBkK4Slh/OHX8/ep8FTMv7+8G1xOfzP4/3AeINSu1ACpdzUtinF4bBbVUsDSyEogdFGnY+f1GNpC5uL7dmz4TxebJY/2zOiDzKndIWBBo7B/irLseliLAUadaqVQBoYe7QkKy111oxaCfkC4Doo5KszS40DUyEg1b15CUh/z9NnEnNokh3wNaRHthxeVN6U8LQLAn+WEDFCYsN/2OCEZEN5LZ2ltfAB0/5ZU0jeLOfyiqhuoaZ5FoTpaqgCFd1QXTXpvG6qX9eEramODCg5hjoJ7l8u5irCH3oBay0qiDzLdKrIG+gq+YR1wighb0kyXR4H+b+8Qosn0fR+nghR+cg1qyrf5OdFB1D5TlcqH/GxGLGZLAfxUhm/Ru9O5Ws0+FJARSX/GYbSvv6zitZDD6C0Z4w4T2XRqlBS37HReR0+8VKpqtvSqqobI151WyI9GsRbWO8yrHry8xp0jTFXEZbt/tHBKgnrk5eScRT7vBMoXV5Yky4vPkZ1Fc9nMyWEVXWbMVQPIlZYfA7n6ekpJ6nsBdOqOLzAH4fZ38NMHCTOTlDP4F1xYeqPRms/iCT+s3f/8lW5nGe5Kn55D/PsxHyfizb7umxqTNazZGdMpsIvCRsDskadyZoP5PyusjZMybLGb87BUVmTbVt0Sq5wwMiR5gt0Fbo5wMcQgRyzIXRKK7PIditqxu0KTNt7aCUnsyqAWc21FkzxqQ5QiYVqr377o80x2HrmY0P0GILRY7yhpwP0tF4yoCZ6kHoRDYcprIfKD4RGNDDvdPKU4yALJjhoma4v88fZQaDs4AuJ/ew9ct/g5Vylj8Gh1uURDHKaMqhp0kxpWE1gWM0jrUpKNKOKKoOFyytE25+xa8l0p+95r74BGiuogQzTfd2TAtKZ5VadEfD+iD4CjHY/wbjpC0IXUdiFtN6AkQ97nCDrcZ63jjn7fIMHH/OytvB5e5LDai9DIhajTICQCNT6pbOQiAnoAEFGYO8qp9oOf4ipnMK8oXabWWIBP+4CU8VsVF180l3eVANTxcyueKByDWFXiKb5oV37KvZrhrmgycbgo3c32U/y3opQCjhVoeimfSqbBGIjAlqPJwMD9XIyoI9dYsJFNphSieAwcwHSdMk0ENw04BAa2KrwwOgnD/g6uzOSDCcx8e+hThpi+cDMlvRhd+RUdscHQYukW3SjVtF9iNF1BCNMWYx4xfgyq9X5G10qKFBs8JlKmVMf5K77PPtjnP/xcURPZT+xOSvXPEOM2AzeUzcgT93pSmXxweRplPpRmNz9i0rvPqay85LEH4fT7P2hq/OExMldFI9I7OfaDr4+i8mQhENyt/DJEviJIIiWd15GudU0mif8DVAei0wLGzv8EOrQGLqdaVLRXboO6lSjim1hNg3SqtWOyITi7OorPJM1O+jqlSyFZ/Feex/kyFZBmoDWgVYhUVdKx+LzqnP9HkovF3VZQaGmAZCuouG2/DSvdgMcYk1fq2mEfP/+G7ptowpaju2/QbUew1bDYmi4c0Gt++RDi4/gX/vpOPAzxLHgFJlvYWibiOUmdd2BKGzyFLbx8RQGW7vwDN7VLlZyTpMtL6nJbhy8aZrUtKnRcjGu8lX5cj+bDwn5Sf7TvtwSW9uocsykghXAMLjzBC8osR2+D2MdE1SSt0cALUBvvzBSd2gfBbqmpKvOOiqMcl2Wl0iujGQWJLCLgVmN+vKVLJ+ufCG3ybSmDud2GKUHtmA6gnKd1SKbLmOXHlmK/MqKOXabpWcJpS5vlnrhkiTZYMulr8mY9ECxLp0cK2nALTjgoEnKB8C101OxhWcHTpniZ8y6do3ts9fOiFbBilrdYOqEUUJTSqazKD45xyfvjFgu9RyH8QihRmldkc/CYfglur7Vg6vhh+efoflz4AN7JtQzr+O2TW0QUUhEHhSm3pSIewZ4MiZaRpWJKvUQB2WxbwtxJfuBtbzSriSybLvaUFWpauM6YZSg9YHEv+bhg1y/iCvoB3R7V82+4A7H+9bzi+xw3Jt6R1i0PB9banBsIrcapBgc2+F/BX6gw8bafK74H9gX+yjY0DiVIvtfUqv/bZuoVge5qT8maJB7kXzTtzGWtk0UvK+uJniM+7IN4nGD3HSWF0Rkzur7JwoCBTq5MRlUpgVV9HTWyg3ecrgVC/nNKF5rl4Z82T+9hamGVMlDhSUhaC4FDdxjA9GHbBvSPWhQ69YSvLTEthDAZmf1ADA5+GUjsWsh6uwW06kOsvdWQjZmdksbqLQYUieNEpY+x2Mv9BMvr4xQziIwgG6jYu0Bfi1yl5T+iESdumm8/V74jkkt6t5M+Pxqh+xuX8jZzS0LyIvrjFp8R5sOqdXv6ILVcBLbm1kadqtLFCrtK1QnCoWIpTu7l/CFEos3GJVIzEXbepVah7+rloO1MVeV9oVjel5ZFq+ooWXDNgrLamOWleL/mAwnqT+eh2NgSyWR0mJtRstxOHHpekdVUbWLNT0rxGM63FnAHhRQcVkbdXi1UdSSGD++6LGb+YzE3mjqhzEYxxQpNMRsRmHR7gEVjwXQ/m10n4BdPD7c+/kmeyhtGIUP/jiRKi6DaQ6KoI1ONJEoQ/wEoExnk9fapcsTlth134O6H0rI0IJl1XTP6wKAiiwWAbtKSTeIjFcisALKnmEZCW5+eFhYSEJbClhaQNVkH4jQTysOMdUcmNbbCGhLAUfCxKYY9HzFFCi86gNXeFM9IGMvuAuj1M9emGt1NIv9hTdc3c2iwB+u+OtBNPbDu5eO1dy1dEJkzUeUU9Bu9pAhZndliBlid7JhEvD6tgZId6PavQioVpolbWSo9EJv34ZYrQQ8YKO0f0hSvC47+KKXY9klI92Qnp6FpBkTvXNAad+L3ZRoumwkiBJ8RObqpVrzzMr/dS8lR/zYVvyaLrANV61O65mrgg1WklBDM7HOCu/03Ua/JK9wbPprFnKyLWjVDIgxdxYHpBsE9MinQ/KcOhrq750i5pOfblczuVTQGJUBWCTQdlLdMYEvqRTUAfG47ExlcsaAnrXHcWObNYaZ8luaGKFucguw5dzzPHuieBQSydljzDon1N4b7KrWWWKm7L3J+x1oNBrvLrkv7bBjVLOilU+KNvhMxG9RHHhjwAMX2RyGmeuQKTlXildOPOPeEjb3qjrYs0/oIN/206putHBsY99W+YV/hmffv85v788Xz9eOH+LH6ALIhf5TC1iYcd6JLVCcTbGFYCi17juAD7lvHeXvW00udMxF+Yt1D1ka82STqXfsTMpNm4AcX08RZZuWC8zQBiXFO9bXXpjZG7FUMZkamzrQYXfy7DCO8o2KtzNN9k6T62hE8jv+Dw== \ No newline at end of file diff --git a/docs/models.yml b/docs/models.yml index 88c4c84f1..f0091a6af 100644 --- a/docs/models.yml +++ b/docs/models.yml @@ -1547,14 +1547,9 @@ poll: - two_thirds - three_quarters - disabled - amount_global_yes: decimal(6) - amount_global_no: decimal(6) - amount_global_abstain: decimal(6) votesvalid: decimal(6) votesinvalid: decimal(6) votescast: decimal(6) - user_has_voted: boolean # This is user specific and set during restriction - user_has_voted_for_delegations: number[] # This is user specific and set during restriction content_object_id: # Note: must not be set - it is allowed to have standalone polls type: generic-relation @@ -1569,6 +1564,11 @@ poll: to: option/poll_id on_delete: CASCADE equal_fields: meeting_id + global_option_id: + type: relation + to: option/used_as_global_option_in_poll_id + on_delete: CASCADE + equal_fields: meeting_id voted_ids: type: relation-list to: @@ -1607,7 +1607,10 @@ option: type: relation to: poll/option_ids equal_fields: meeting_id - required: true + used_as_global_option_in_poll_id: + type: relation + to: poll/global_option_id + equal_fields: meeting_id vote_ids: type: relation-list to: vote/option_id