From ae0e8c52984dc88cb75b44a120e5308c4740a5eb Mon Sep 17 00:00:00 2001
From: root <root@login001.cm.cluster>
Date: Fri, 12 Nov 2021 10:05:32 -0600
Subject: [PATCH 1/4] added checkbox to be checked before account creation
---
app/static/scripts/function.js | 5 +++++
app/templates/auth/SignUp.html | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js
index ae406d7..d68c816 100644
--- a/app/static/scripts/function.js
+++ b/app/static/scripts/function.js
@@ -1,3 +1,8 @@
+function check() {
+ var submitButton = document.getElementById("submit");
+ submitButton.disabled = false;
+};
+
function displayloading1() {
$('#overlayModal').modal('show');
}
diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html
index bf35e19..ed9d64c 100644
--- a/app/templates/auth/SignUp.html
+++ b/app/templates/auth/SignUp.html
@@ -98,8 +98,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>
--
GitLab
From 9656a061188639f94409a0049d81afde9fee812e Mon Sep 17 00:00:00 2001
From: root <root@login001.cm.cluster>
Date: Thu, 18 Nov 2021 13:26:53 -0600
Subject: [PATCH 2/4] unpacked new field aup from json object and sent to
celery
---
tasks.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tasks.py b/tasks.py
index acf3818..300a58c 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))
--
GitLab
From 16b3fc1c5e918064daa76d774379fb47ad7a1ed1 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Thu, 18 Nov 2021 13:30:09 -0600
Subject: [PATCH 3/4] 1. added aup flag to json object 2. added new function
check() to enable/disable submit button based on status of checkbox
---
app/static/scripts/function.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js
index d68c816..45f61e8 100644
--- a/app/static/scripts/function.js
+++ b/app/static/scripts/function.js
@@ -1,6 +1,8 @@
-function check() {
+var check_counter =0;
+function check() {
var submitButton = document.getElementById("submit");
- submitButton.disabled = false;
+ if ((check_counter+=1)%2) submitButton.disabled = false;
+ else submitButton.disabled = true;
};
function displayloading1() {
@@ -17,7 +19,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: 1
})
}
--
GitLab
From 389cfaefd5a8d2ca61538df123b45f673739b965 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Thu, 18 Nov 2021 15:22:18 -0600
Subject: [PATCH 4/4] 1. improved submit button toggle case wrt checkbox value
2. send checkbox value instead of a hardcoded value
---
app/static/scripts/function.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js
index 45f61e8..77bd28a 100644
--- a/app/static/scripts/function.js
+++ b/app/static/scripts/function.js
@@ -1,8 +1,7 @@
-var check_counter =0;
function check() {
var submitButton = document.getElementById("submit");
- if ((check_counter+=1)%2) submitButton.disabled = false;
- else submitButton.disabled = true;
+ let ckbox = document.getElementById('agree');
+ submitButton.disabled = !ckbox.checked;
};
function displayloading1() {
@@ -20,7 +19,7 @@ function request_account() {
email: document.getElementById("email").value,
reason: document.getElementById("reason").value,
username: document.getElementById("username").value,
- aup: 1
+ aup: document.getElementById("agree").checked
})
}
--
GitLab