Lancaster-University/DEMOS2
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ready for merge

Browse source
This commit is contained in:
Rumperuu 2018-08-29 14:44:37 +01:00
parent 9ea59723a5
commit de517c19c5
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Node/test/demos2-booth.js
View file

@ -35,7 +35,6 @@ gpGen = function(){
B.rcopy(ctx.ROM_CURVE.CURVE_Pyb); B.rcopy(ctx.ROM_CURVE.CURVE_Pyb);
var Qy=new ctx.FP2(0); Qy.bset(A,B); var Qy=new ctx.FP2(0); Qy.bset(A,B);
var Q=new ctx.ECP2(); var Q=new ctx.ECP2();
var Q=new ctx.ECP2();
Q.setxy(Qy,Qy); Q.setxy(Qy,Qy);
return{ return{

12
README.md
View file

@ -10,11 +10,13 @@ https://github.com/CareyJWilliams/DEMOS2
### Main Application Dependencies ### Main Application Dependencies
* Python: Version 2.7 (anything higher than this will not currently work) * Python
* Python packages: Specified in `requirements.txt` - PyCharm will detect these dependencies and offer installation * Version 2.7; anything higher than this will not currently work
* MySQL Server: Community Edition (initialise with 'legacy password authentication') * All Python packages specified in `requirements.txt`; PyCharm will detect these dependencies and offer installation
* New MySQL DB User: Default username and password specified in `aullauthdemo/settings.py` * MySQL Server: Community Edition
* New MySQL DB: `demos2` (also specified in `aullauthdemo/settings.py`) - make sure to set the charset to 'UTF8' * Initialise with 'legacy password authentication'
* Create a new MySQL DB user with the default username and password specified in `aullauthdemo/settings.py`
* Create a new MySQL DB called `demos2` (also specified in `aullauthdemo/settings.py`), making sure to set the charset to 'UTF8'
### Database setup ### Database setup

1
allauthdemo/polls/crypto_rpc.py
View file

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

12
static/js/create-event-poll.js
View file

@ -235,12 +235,16 @@ function isEventTimingsValid() {
var valid = true; var valid = true;
var helpBlockId = "event-timings-error-block"; var helpBlockId = "event-timings-error-block";
// Extract the dates from the vote start and end input controls // Extract the string val from the vote start and end input controls
var start_date_time = $('#vote-start-input').data('DateTimePicker').date(); var start_date_time = $('#vote-start-input').val();
var end_date_time = $('#vote-end-input').data('DateTimePicker').date(); var end_date_time = $('#vote-end-input').val();
// Convert the string vals to Date objects
var start_dateObj = new Date(start_date_time);
var end_dateObj = new Date(end_date_time);
// Ensure that the start date is before the end date and that the end date is after the start date // Ensure that the start date is before the end date and that the end date is after the start date
if(!(start_date_time < end_date_time && end_date_time > start_date_time)) { if(!(start_dateObj < end_dateObj && end_dateObj > start_dateObj)) {
checkAndAddError({ checkAndAddError({
error: "The start date must be before the end date and the end after the start date.", error: "The start date must be before the end date and the end after the start date.",
helpBlockId: "event-timings-error-block" helpBlockId: "event-timings-error-block"