Added QR codes to ballot selection, and a couple other minor chchanges

This commit is contained in:
Rumperuu 2018-07-23 14:08:17 +01:00
parent 4f1bf927bb
commit 77508479b4
9 changed files with 81 additions and 43 deletions

View file

@ -30,7 +30,6 @@ def param():
jsondict = json.load(urllib2.urlopen(url))
return json.dumps(jsondict)
def combpk(pks):
url = 'http://localhost:8080/cmpkstring'

View file

@ -16,7 +16,7 @@ from .crypto_rpc import param, combpk, add_ciphers, get_tally
The following tasks were re-implemented by Thomas Smith: generate_event_param, tally_results, generate_combpk, generate_enc
This file was also updated by Vincent de Almeida
This file was also updated by Vincent de Almeida and Ben Goldsworthy
'''
# Will store the result of the initial cal to param() from .cpp_calls

View file

@ -17,6 +17,7 @@
integrity="sha256-VazP97ZCwtekAsvgPBSUwPFKdrwD3unUfSGVYrahUqU="
crossorigin="anonymous"></script>
<script src="{% static 'js/papaparse.min.js' %}" type="text/javascript"></script>
<script src="{% static 'js/qrcode.min.js' %}" type="text/javascript"></script>
<script src="{% static 'js/create-event-poll.js' %}" type="text/javascript"></script>
<script src="{% static 'js/decrypt_event.js' %}" type="text/javascript"></script>
<script src="{% static 'js/event_vote.js' %}" type="text/javascript"></script>