Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check for new participant number between 1 and 100 on tracking page #84

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

check for new participant number between 1 and 100 on tracking page #84

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a19b78d
checks for new participant number between 1 and 100
lucyq Oct 26, 2017
4d7ad71
Merge branch 'master' of github.com:multiparty/web-mpc into issue76
lucyq Dec 12, 2017
613d6a1
Merge branch 'master' of github.com:multiparty/web-mpc into issue76
lucyq Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions client/app/views/trackView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(['jquery', 'controllers/analystController', 'Ladda', 'bootstrap'], function ($, analystController, Ladda) {
define(['jquery', 'controllers/analystController', 'Ladda', 'alertify', 'bootstrap'], function ($, analystController, Ladda, alertify) {

function trackView() {

Expand Down Expand Up @@ -104,14 +104,25 @@ define(['jquery', 'controllers/analystController', 'Ladda', 'bootstrap'], functi
}






// Generate new participation links
$('#participants-submit').on('click', function (e) {
e.preventDefault();

var pc = parseInt($('#participants-count').val());

if (pc < 1.0 || pc > 100.00) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just use the number type with min and max? https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/number

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the min/max only limits using the up/down arrows within the input box.
A user could still type in something below 1 or above 100.
the parseInt is to ensure that the participant count is an integer since users can input a fraction. should I floor/ceil instead?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't believe I'm linking to W3Schools, but ... https://www.w3schools.com/html/tryit.asp?filename=tryhtml_input_number

The user can input a higher number, but when trying to submit the browser should stop them. Of course this is only a client-side check, and browser-dependent, so if we care enough we should implement the same check on the server.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have already discussed this but the code above is doing the client-side check.
Otherwise just setting max/min doesn't execute a check.

alertify.alert('<img src="/images/cancel.png" alt="Error">Error!', "Please enter a valid number between 1 and 100");
return;
}

var la = Ladda.create(document.getElementById('participants-submit'));
la.start();

analystController.generateUrls(session, password, $('#participants-count').val())
analystController.generateUrls(session, password, pc)
.then(function (urls) {
var $newParticipants = $('#participants-new');
if ($newParticipants.html() !== '') {
Expand Down
11 changes: 9 additions & 2 deletions client/track.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/Ladda/1.0.0/ladda-themeless.min.css"
integrity="sha256-d7VZTlP9P3ZTCZ3Bkl8aGZ/+Vs4i+bpcOGNfibU7+LU=" crossorigin="anonymous"/>

<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/AlertifyJS/1.10.0/css/alertify.min.css"
integrity="sha256-bNEFYRlNlnu0CH4DIKCXv0F6JVl/DdA2M9XVZn317q0=" crossorigin="anonymous"/>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/AlertifyJS/1.10.0/css/themes/bootstrap.min.css"
integrity="sha256-vt37wNLVK8ICNWGrl+1MLb+pjq33sn6v37Q/7OPgkSU=" crossorigin="anonymous"/>



<link rel="stylesheet" href="/styles/style.css">

</head>
Expand Down Expand Up @@ -111,8 +118,8 @@ <h2 class="text-center">Add participants</h2>
<form>
<div class="form-group">
<label class="control-label" for="participants-count">New participants</label>
<input type="number" id="participants-count" class="form-control" placeholder="0" pattern="^[1-9]\d*{1,5}$"
autocomplete="off" required/>
<input type="number" id="participants-count" class="form-control" min="1" placeholder="0" pattern="^[1-9]\d*{1,5}$"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't match the JS check

autocomplete="off" required/>
<span id="new-participants-success" class="success-icon glyphicon glyphicon-ok form-control-feedback hidden"
aria-hidden="true"></span>
<span id="new-participants-fail" class="fail-icon glyphicon glyphicon-remove form-control-feedback hidden"
Expand Down