diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js index ae406d73e8eb8bcb12bab94c16088026b3ca4c0b..77bd28ad114e8de33d54c031b80018c76b7f3580 100644 --- a/app/static/scripts/function.js +++ b/app/static/scripts/function.js @@ -1,3 +1,9 @@ +function check() { + var submitButton = document.getElementById("submit"); + let ckbox = document.getElementById('agree'); + submitButton.disabled = !ckbox.checked; +}; + function displayloading1() { $('#overlayModal').modal('show'); } @@ -12,7 +18,8 @@ function request_account() { fullname: document.getElementById("fullname").value, email: document.getElementById("email").value, reason: document.getElementById("reason").value, - username: document.getElementById("username").value + username: document.getElementById("username").value, + aup: document.getElementById("agree").checked }) } diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html index 34b18484af8a36cae894a7a0a43100d7505b46e9..bc48390540c0ac03329d895d23aa56d22b42acc7 100644 --- a/app/templates/auth/SignUp.html +++ b/app/templates/auth/SignUp.html @@ -97,8 +97,9 @@ </div> <br> <div class="col-md-7 col-sm-7 my-col"> + <br><input class="checks" id ="agree" type="checkbox" name="agree" value="agree" onchange= check() />Agree to proceed<br/> <button class="btn btn-danger btn-md" id="cancel" name="cancel" type="button" onClick="renderDom('Account Creation Cancelled','{{ cancel_msg |safe }}', null)">Cancel</button> - <button class="btn btn-primary btn-md" id="submit" name="submit" type="button" value="Submit" onclick="displayloading1();request_account()"> Create Account</button> + <button class="btn btn-primary btn-md" disabled id="submit" name="submit" type="button" value="Submit" onclick="displayloading1();request_account()"> Create Account</button> </div> </form> </div> diff --git a/tasks.py b/tasks.py index acf38186af98bb565c808bbd72c59b32e9d12faf..300a58cec84162213a749dbe825746299a59f3a9 100644 --- a/tasks.py +++ b/tasks.py @@ -51,12 +51,13 @@ def celery_create_account(json, session): email= json['email'] fullname= json['fullname'] reason= json['reason'] + aup= json['aup'] queuename= rc_util.encode_name(username) print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' added to queue') send_msg('creating account', room) print(username) - rc_util.add_account(username, queuename, email, fullname, reason) + rc_util.add_account(username, queuename, email, fullname, reason, aup) print('sent account info') print('Waiting for completion...') rc_util.consume(queuename, routing_key=f'complete.{queuename}', callback=gen_f(room))