Skip to content

No deag ui #118

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

Merged
p-flock merged 4 commits into from
Feb 27, 2019
Merged

No deag ui #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f276a3
remove drag and drop for UI study
p-flock Feb 26, 2019
39429f2
remove text alluding to drag and drop option
p-flock Feb 26, 2019
59798e8
remove text alluding to drag and drop option from instructions
p-flock Feb 26, 2019
715b13d
stop checking for prefilled data
p-flock Feb 26, 2019
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
4 changes: 2 additions & 2 deletions client/app/controllers/clientController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ define(['jquery', 'controllers/tableController', 'controllers/jiffController', '
data_submission[tables_data[i].name] = tables_data[i].data;
}

if (document.getElementById('choose-file').files.length > 0) {
/*if (document.getElementById('choose-file').files.length > 0) {
usabilityController.dataPrefilled();
}
}*/

data_submission['usability'] = usabilityController.analytics;

Expand Down
10 changes: 5 additions & 5 deletions client/app/views/clientView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ define(['jquery', 'controllers/clientController', 'controllers/tableController',
}
};

var _target = document.getElementById('drop-area');
var _choose = document.getElementById('choose-file-button');
//var _target = document.getElementById('drop-area');
//var _choose = document.getElementById('choose-file-button');
var spinner;
var _workstart = function () {
spinner = new Spinner().spin(_target);
Expand Down Expand Up @@ -202,17 +202,17 @@ define(['jquery', 'controllers/clientController', 'controllers/tableController',
calculateSize();
};

DropSheet({
/*DropSheet({
drop: _target,
choose: _choose,
tables: tables,
tables_def: table_template,
on: {workstart: _workstart, workend: _workend, sheet: _onsheet},
errors: {badfile: _badfile, pending: _pending, failed: _failed, large: _large}
});
});*/

// Table accordion.
$('#tables-area').hide();
//$('#tables-area').hide();

$('#expand-table-button').click(function (e) {
$('#tables-area').slideToggle(function () {
Expand Down
13 changes: 6 additions & 7 deletions client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ <h1>{{ title }}<br/>
<h2 class="text-center">Input your data</h2>
<p class="text-center">Please make sure your session key and participation code match the ones provided in the
email
sent to you by the Greater Boston Chamber of Commerce. Drag and drop your completed template file to encrypt and include your submission in
the
aggregate data.</p>
sent to you by the Greater Boston Chamber of Commerce.
</p>
<hr/>
<div class="row">
<div class="col-md-6">
Expand Down Expand Up @@ -100,24 +99,24 @@ <h2 class="text-center">Input your data</h2>
</div>
</form>
</div>
<div class="col-md-6">
<!--<div class="col-md-6">
<div id="drop-area">
Drag and drop your completed template file here
<br/>
<p>&mdash;or&mdash;</p><br/>
<button id="choose-file-button" class="btn btn-primary">Choose file</button>
</div>
<input type="file" id="choose-file" accept=".xlsx,.xls">
</div>
</div>-->
</div>
</section>
</div>

<div class="row">
<section id="instructions" class="card col-md-10 col-md-offset-1">
<h2 class="text-center">View your data</h2>
<p class="text-center">Your data will appear here after you drag/drop or browse to find your completed Excel
template file above.</p>
<!--<p class="text-center">Your data will appear here after you drag/drop or browse to find your completed Excel
template file above.</p>-->
<span id="expand-table-button" class="arrow-down"></span>

<div id="tables-area">
Expand Down