Commit graph

11 commits

Author SHA1 Message Date
Rumperuu
08b5985396 ajg 2018-09-19 08:38:50 +01:00
Rumperuu
dff885437e eat 2018-09-15 16:25:36 +01:00
vince0656
a168ba9e28 Fixed a number of bugs that arose from merging the code from Bens fork. Added an extra step when voting which asks the user to confirm their voting choices. The voter now gets an email when they've successfully submitted thier vote. 2018-08-31 19:39:12 +01:00
Vincent
ac38a58a38
Merge branch 'master' into master 2018-08-29 17:58:29 +01:00
Rumperuu
9ea59723a5 I really ought to be using branches 2018-08-29 14:29:27 +01:00
vince0656
572600408c Updated polls/models to include a field for storing the ballot selected by the user on the front end. A few bugs have been fixed on the event voting page and new functionality has been added which allows a voter to restart the voting process. 2018-08-22 17:39:41 +01:00
Rumperuu
89533a54b1 Going home 2018-08-16 22:17:16 +01:00
Rumperuu
77508479b4 Added QR codes to ballot selection, and a couple other minor chchanges 2018-07-23 14:08:17 +01:00
vince0656
d4756bb734 Added ballot choice UI that allows the user to choose between 2 generated ballots whilst showing the ballot's hash. When the user makes their choice, then the ballot is sent to server 2018-07-17 09:57:09 +01:00
vince0656
ff967877cb Made a number of small enhancements. The django-recaptcha fields have been removed from the django forms as they're a dependency nightmare. The module isn't really required and the same functionality can be serviced using HTML and JS and it also paves the way to perform testing with python 3 over python 2.7. The about page has been removed for now as it's not prod ready and all it currently does it mention the software used to build DEMOS2. 2018-07-16 10:16:06 +01:00
vince0656
745fdf06b1 Updated the voting and event decryption pages. On the voting page, added the ability to vote by selecting checkboxes instead of a drop down select menu. This adds flexibility at event creation to specify a wide range of min and max option selections for polls. On the event decryption page, SK validation was added based on the stored trustee PK as well as a dialog to display any validation errors. Most of the updates took place behind the scenes at the backend. 2018-07-13 17:19:35 +01:00